aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES13
-rw-r--r--WWW/Library/Implementation/HTFTP.c7
-rw-r--r--WWW/Library/Implementation/HTTCP.c151
-rw-r--r--WWW/Library/Implementation/HTTP.c3
-rw-r--r--WWW/Library/Implementation/HTUtils.h16
-rw-r--r--WWW/Library/Implementation/makefile.in9
-rwxr-xr-xconfigure4
-rw-r--r--configure.in7
-rw-r--r--lynx.man12
-rw-r--r--lynx_help/Lynx_users_guide.html12
-rw-r--r--src/HTInit.c8
-rw-r--r--src/LYCookie.c124
-rw-r--r--src/LYGetFile.c2
-rw-r--r--src/LYReadCFG.c7
-rw-r--r--src/LYStrings.c21
-rw-r--r--src/LYStyle.c8
-rw-r--r--src/LYUtils.c4
-rw-r--r--src/LYrcFile.c3
-rw-r--r--src/chrtrans/makefile.in5
-rw-r--r--src/makefile.in5
-rw-r--r--userdefs.h4
21 files changed, 244 insertions, 181 deletions
diff --git a/CHANGES b/CHANGES
index d32242bb..3e4fedc8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,19 @@
--- $LynxId: CHANGES,v 1.219 2007/05/16 21:51:47 tom Exp $
+-- $LynxId: CHANGES,v 1.225 2007/05/23 00:55:56 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
+2007-0?-?? (2.8.7dev.6)
+* change order of includes (-I options) in makefiles so build-tree is found
+ first -TD
+* ensure MIME_LIBDIR has a trailing "/" -TD
+* add new -trace-mask codes to cleanup the trace file a little -TD
+* remove redundant call to show_cert_issuer() -TG
+* correct typo in Lynx_users_guide.html (prompted by TG's patch) -TD
+* modify HTDoRead() to add elapsed time to its debug trace -TD
+* fix a case in LYGetfile.c which was broken by 2.8.7dev.3 changes to use
+ LYTildeExpand() to expand embedded "~" -TG
+
2007-05-17 (2.8.7dev.5)
* build/install "en" po file so that GNU gettext LANGUAGE environment variable
can find the corresponding English message file (request by Chuck Houpt) -TD
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 3dc2698a..d4b9d695 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1,4 +1,7 @@
-/* File Transfer Protocol (FTP) Client
+/*
+ * $LynxId: HTFTP.c,v 1.78 2007/05/22 23:47:17 tom Exp $
+ *
+ * File Transfer Protocol (FTP) Client
* for a WorldWideWeb browser
* ===================================
*
@@ -344,7 +347,7 @@ static int next_data_char(void)
if (status == HT_INTERRUPTED)
interrupted_in_next_data_char = 1;
if (status <= 0)
- return -1;
+ return EOF;
data_write_pointer = data_buffer + status;
data_read_pointer = data_buffer;
}
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index f99397a6..c8f7deb6 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,4 +1,7 @@
-/* Generic Communication Code HTTCP.c
+/*
+ * $LynxId: HTTCP.c,v 1.93 2007/05/22 23:54:43 tom Exp $
+ *
+ * Generic Communication Code HTTCP.c
* ==========================
*
* This code is in common between client and server sides.
@@ -1527,6 +1530,24 @@ const char *HTHostName(void)
return hostname;
}
+#ifdef _WINDOWS
+#define SET_EINTR WSASetLastError(EINTR)
+#else
+#define SET_EINTR SOCKET_ERRNO = EINTR
+#endif
+
+static BOOL HTWasInterrupted(int *status)
+{
+ BOOL result = FALSE;
+
+ if (HTCheckForInterrupt()) {
+ result = TRUE;
+ *status = HT_INTERRUPTED;
+ SET_EINTR;
+ }
+ return result;
+}
+
#ifndef MULTINET /* SOCKET_ERRNO != errno ? */
#if !defined(UCX) || !defined(VAXC) /* errno not modifiable ? */
#define SOCKET_DEBUG_TRACE /* show errno status after some system calls */
@@ -1874,14 +1895,8 @@ int HTDoConnect(const char *url,
break;
}
}
- if (HTCheckForInterrupt()) {
+ if (HTWasInterrupted(&status)) {
CTRACE((tfp, "*** INTERRUPTED in middle of connect.\n"));
- status = HT_INTERRUPTED;
-#ifdef _WINDOWS
- WSASetLastError(EINTR);
-#else
- SOCKET_ERRNO = EINTR;
-#endif
break;
}
}
@@ -1947,7 +1962,11 @@ int HTDoRead(int fildes,
void *buf,
unsigned nbyte)
{
- int ready, ret;
+ int result;
+ BOOL ready;
+
+#if !defined(NO_IOCTL)
+ int ret;
fd_set readfds;
struct timeval select_timeout;
int tries = 0;
@@ -1955,10 +1974,9 @@ int HTDoRead(int fildes,
#ifdef USE_READPROGRESS
int otries = 0;
time_t otime = time((time_t *) 0);
+ time_t start = otime;
#endif
-#if defined(UNIX) || defined(UCX)
- int nb;
-#endif /* UCX, BSN */
+#endif /* !NO_IOCTL */
#if defined(UNIX) && !defined(__BEOS__)
if (fildes == 0) {
@@ -1972,34 +1990,28 @@ int HTDoRead(int fildes,
}
} else
#endif
- if (fildes <= 0)
+ if (fildes <= 0) {
+ CTRACE((tfp, "HTDoRead - no file descriptor!\n"));
return -1;
+ }
- if (HTCheckForInterrupt()) {
-#ifdef _WINDOWS
- WSASetLastError(EINTR);
-#else
- SOCKET_ERRNO = EINTR;
-#endif
- return (HT_INTERRUPTED);
+ if (HTWasInterrupted(&result)) {
+ CTRACE((tfp, "HTDoRead - interrupted before starting!\n"));
+ return (result);
}
-#if !defined(NO_IOCTL)
- ready = 0;
+#if defined(NO_IOCTL)
+ ready = TRUE;
#else
- ready = 1;
-#endif /* bypass for NO_IOCTL */
+ ready = FALSE;
while (!ready) {
/*
* Protect against an infinite loop.
*/
if (tries++ >= 180000) {
HTAlert(gettext("Socket read failed for 180,000 tries."));
-#ifdef _WINDOWS
- WSASetLastError(EINTR);
-#else
- SOCKET_ERRNO = EINTR;
-#endif
- return HT_INTERRUPTED;
+ SET_EINTR;
+ result = HT_INTERRUPTED;
+ break;
}
#ifdef USE_READPROGRESS
if (tries - otries > 10) {
@@ -2033,55 +2045,56 @@ int HTDoRead(int fildes,
} while ((ret == -1) && (errno == EINTR));
if (ret < 0) {
- return -1;
+ result = -1;
+ break;
} else if (ret > 0) {
- ready = 1;
- } else if (HTCheckForInterrupt()) {
-#ifdef _WINDOWS
- WSASetLastError(EINTR);
-#else
- SOCKET_ERRNO = EINTR;
-#endif
- return HT_INTERRUPTED;
+ ready = TRUE;
+ } else if (HTWasInterrupted(&result)) {
+ break;
}
}
+#endif /* !NO_IOCTL */
-#if !defined(UCX) || !defined(VAXC)
+ if (ready) {
+#if defined(UCX) && defined(VAXC)
+ /*
+ * VAXC and UCX problem only.
+ */
+ errno = vaxc$errno = 0;
+ result = SOCKET_READ(fildes, buf, nbyte);
+ CTRACE((tfp,
+ "Read - result,errno,vaxc$errno: %d %d %d\n", result, errno, vaxc$errno));
+ if ((result <= 0) && TRACE)
+ perror("HTTCP.C:HTDoRead:read"); /* RJF */
+ /*
+ * An errno value of EPIPE and result < 0 indicates end-of-file on VAXC.
+ */
+ if ((result <= 0) && (errno == EPIPE)) {
+ result = 0;
+ set_errno(0);
+ }
+#else
#ifdef UNIX
- while ((nb = SOCKET_READ(fildes, buf, nbyte)) == -1) {
- if (errno == EINTR)
- continue;
+ while ((result = SOCKET_READ(fildes, buf, nbyte)) == -1) {
+ if (errno == EINTR)
+ continue;
#ifdef ERESTARTSYS
- if (errno == ERESTARTSYS)
- continue;
+ if (errno == ERESTARTSYS)
+ continue;
#endif /* ERESTARTSYS */
- HTInetStatus("read");
- break;
- }
- return nb;
+ HTInetStatus("read");
+ break;
+ }
#else /* UNIX */
- return SOCKET_READ(fildes, buf, nbyte);
+ result = SOCKET_READ(fildes, buf, nbyte);
#endif /* !UNIX */
-
-#else /* UCX && VAXC */
- /*
- * VAXC and UCX problem only.
- */
- errno = vaxc$errno = 0;
- nb = SOCKET_READ(fildes, buf, nbyte);
- CTRACE((tfp,
- "Read - nb,errno,vaxc$errno: %d %d %d\n", nb, errno, vaxc$errno));
- if ((nb <= 0) && TRACE)
- perror("HTTCP.C:HTDoRead:read"); /* RJF */
- /*
- * An errno value of EPIPE and nb < 0 indicates end-of-file on VAXC.
- */
- if ((nb <= 0) && (errno == EPIPE)) {
- nb = 0;
- set_errno(0);
+#endif /* UCX && VAXC */
}
- return nb;
-#endif /* UCX, BSN */
+#ifdef USE_READPROGRESS
+ CTRACE2(TRACE_TIMING, (tfp, "...HTDoRead returns %d (%ld seconds)\n",
+ result, (long) (time((time_t *) 0) - start)));
+#endif
+ return result;
}
#ifdef SVR4_BSDSELECT
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index c0cd6e76..5f262bd5 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: HTTP.c,v 1.85 2007/05/13 21:08:19 tom Exp $
+ * $LynxId: HTTP.c,v 1.86 2007/05/22 22:42:12 Thorsten.Glaser Exp $
*
* HyperText Tranfer Protocol - Client implementation HTTP.c
* ==========================
@@ -788,7 +788,6 @@ static int HTLoadHTTP(const char *arg,
ssl_host, cert_host);
_HTProgress(msg);
FREE(msg);
- show_cert_issuer(SSL_get_peer_certificate(handle));
/* no need to continue the verification loop */
break;
}
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index eda975d6..4d30538f 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,8 +1,10 @@
-/* Utility macros for the W3 code library
- MACROS FOR GENERAL USE
-
- See also: the system dependent file "www_tcp.h", which is included here.
-
+/*
+ * $LynxId: HTUtils.h,v 1.76 2007/05/22 23:51:40 tom Exp $
+ *
+ * Utility macros for the W3 code library
+ * MACROS FOR GENERAL USE
+ *
+ * See also: the system dependent file "www_tcp.h", which is included here.
*/
#ifndef NO_LYNX_TRACE
@@ -523,6 +525,10 @@ extern int WWW_TraceMask;
#define TRACE_TRST (TRACE_bit(2))
#define TRACE_CFG (TRACE_bit(3))
#define TRACE_BSTRING (TRACE_bit(4))
+#define TRACE_COOKIES (TRACE_bit(5))
+#define TRACE_CHARSETS (TRACE_bit(6))
+#define TRACE_GRIDTEXT (TRACE_bit(7))
+#define TRACE_TIMING (TRACE_bit(8))
#if defined(USE_VERTRACE) && !defined(LY_TRACELINE)
#define LY_TRACELINE __LINE__
diff --git a/WWW/Library/Implementation/makefile.in b/WWW/Library/Implementation/makefile.in
index 37e0b4d3..44c94299 100644
--- a/WWW/Library/Implementation/makefile.in
+++ b/WWW/Library/Implementation/makefile.in
@@ -1,5 +1,6 @@
-# Make WWW under unix for a.n.other unix system (bsd)
-# Use this as a template
+# $LynxId: makefile.in,v 1.14 2007/05/23 00:57:38 tom Exp $
+# Make WWW under unix for a.n.other unix system (bsd)
+# Use this as a template
# For W3 distribution, machine type for subdirectories
WWW_MACH = Implementation
@@ -26,12 +27,12 @@ o = .@OBJEXT@
INTLDIR_CPPFLAGS= @INTLDIR_CPPFLAGS@ -I$(top_srcdir)/intl
CPP = @CPP@
-CPPOPTS = $(DEFS) $(EXTRA_CPPFLAGS) $(CPPFLAGS) $(LYFLAGS) \
+CPPOPTS = $(DEFS) $(LYFLAGS) \
-I../../.. \
-I../../../src \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
- $(INTLDIR_CPPFLAGS) -I$(WWWINC)
+ $(INTLDIR_CPPFLAGS) -I$(WWWINC) $(EXTRA_CPPFLAGS) $(CPPFLAGS)
LY_CFLAGS = @CFLAGS@
CFLAGS = $(CPPOPTS) $(LY_CFLAGS)
diff --git a/configure b/configure
index afc34902..49997515 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in 2.8.7dev.4.
+# From configure.in 2.8.7dev.5.
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20061216.
#
@@ -15308,7 +15308,7 @@ MIME_LIBDIR="$withval"
echo "$as_me:15309: result: $MIME_LIBDIR" >&5
echo "${ECHO_T}$MIME_LIBDIR" >&6
-
+MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
cat >>confdefs.h <<EOF
#define MIME_LIBDIR "$MIME_LIBDIR"
EOF
diff --git a/configure.in b/configure.in
index 2a7883fa..4e7d5eb9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,11 @@
-dnl $LynxId: configure.in,v 1.154 2007/05/17 23:10:27 tom Exp $
+dnl $LynxId: configure.in,v 1.155 2007/05/23 00:42:34 tom Exp $
+dnl
dnl Process this file with autoconf to produce a configure script.
+dnl
dnl created jan/1997
dnl by T.E.Dickey <dickey@invisible-island.net>
dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
+dnl
dnl ---------------------------------------------------------------------------
dnl Copyright 1997-2006,2007 by Thomas E. Dickey
dnl
@@ -606,7 +609,7 @@ CF_WITH_PATH(mime-libdir,
MIME_LIBDIR,
[/etc])
AC_MSG_RESULT($MIME_LIBDIR)
-
+MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
AC_DEFINE_UNQUOTED(MIME_LIBDIR,"$MIME_LIBDIR")
dnl --------------------------------------------------------------------------
diff --git a/lynx.man b/lynx.man
index ce482c5a..63284800 100644
--- a/lynx.man
+++ b/lynx.man
@@ -1,4 +1,4 @@
-.\" $LynxId: lynx.man,v 1.73 2007/05/13 22:45:47 Chuck.Houpt Exp $
+.\" $LynxId: lynx.man,v 1.74 2007/05/23 00:53:51 tom Exp $
.nr N -1
.nr D 5
.TH LYNX 1
@@ -758,9 +758,17 @@ Logically OR the values to combine options:
.br
4=TRST (table layout)
.br
-8=config (lynx.cfg and .lynxrc contents)
+8=config (lynx.cfg, .lynxrc, .lynx-keymaps, mime.types and mailcap contents)
.br
16=binary string copy/append, used in form data construction.
+.br
+32=cookies
+.br
+64=character sets
+.br
+128=GridText parsing
+.br
+256=timing
.TP
.B \-traversal
traverse all http links derived from startfile. When used with
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index 94146a61..0cc0949d 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 3.0//EN">
-<!-- $LynxId: Lynx_users_guide.html,v 1.89 2007/05/06 19:17:57 tom Exp $ -->
+<!-- $LynxId: Lynx_users_guide.html,v 1.91 2007/05/22 22:06:06 tom Exp $ -->
<html>
<head>
<title>Lynx Users Guide v2.8.6</title>
@@ -66,7 +66,7 @@ within a single LAN.
<li><a href="#Refresh" NAME="ToC-Refresh">Lynx and Client-Side-Pull</a>
<li><a href="#Cookies" NAME="ToC-Cookies">Lynx and State Management</a> (Me want <em>cookie</em>!)
<li><A HREF="#Invoking" NAME="ToC-Invoking">The Lynx command line</A>
-<li><A HREF="#Environment" NAME="ToC-Environments">Environment variables used by Lynx</A>
+<li><A HREF="#Environment" NAME="ToC-Environment">Environment variables used by Lynx</A>
<li><A HREF="#lynx.cfg" NAME="ToC-lynx.cfg">Main configuration file lynx.cfg</A>
<li><A HREF="#Hist" NAME="ToC-Hist">Lynx development history</A>
</ul>
@@ -790,10 +790,6 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
file, but can enter '<em>=</em>' to invoke the STANDARD selection
menu, or <em>RETURN</em> for the default bookmark file.
- <dt>Password FTP
- <dd>This allows you to change whether Lynx uses passive ftp
- connections.
-
<dt>Password for anonymous ftp
<dd>If this is blank, Lynx will use your personal mail address
as the anonymous ftp password. Though that is the convention,
@@ -962,6 +958,10 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
<dt>Underline links
<dd>Use underline-attribute rather than bold for links.
+ <dt>Use Passive FTP
+ <dd>This allows you to change whether Lynx uses passive ftp
+ connections.
+
<dt>User Agent
<dd>The header string which Lynx sends to HTTP servers to indicate the
User-Agent is displayed here. Changes may be disallowed via
diff --git a/src/HTInit.c b/src/HTInit.c
index 6ede0f3f..b4674422 100644
--- a/src/HTInit.c
+++ b/src/HTInit.c
@@ -1,4 +1,7 @@
-/* Configuration-specific Initialization HTInit.c
+/*
+ * $LynxId: HTInit.c,v 1.67 2007/05/23 00:50:46 tom Exp $
+ *
+ * Configuration-specific Initialization HTInit.c
* ----------------------------------------
*/
@@ -1430,7 +1433,8 @@ static int HTLoadExtensionsConfigFile(char *fn)
HTSprintf0(&ext, ".%s", word);
LYLowerCase(ext);
- CTRACE((tfp, "SETTING SUFFIX '%s' to '%s'.\n", ext, ct));
+ CTRACE2(TRACE_CFG,
+ (tfp, "setting suffix '%s' to '%s'.\n", ext, ct));
if (strstr(ct, "tex") != NULL ||
strstr(ct, "postscript") != NULL ||
diff --git a/src/LYCookie.c b/src/LYCookie.c
index 45f74776..262007ec 100644
--- a/src/LYCookie.c
+++ b/src/LYCookie.c
@@ -1,4 +1,7 @@
-/* Lynx Cookie Support LYCookie.c
+/*
+ * $LynxId: LYCookie.c,v 1.87 2007/05/23 00:21:04 tom Exp $
+ *
+ * Lynx Cookie Support LYCookie.c
* ===================
*
* Author: AMK A.M. Kuchling (amk@magnet.com) 12/25/96
@@ -73,6 +76,8 @@
/* default for new domains, one of the invcheck_behaviour_t values: */
#define DEFAULT_INVCHECK_BV INVCHECK_QUERY
+#define CTrace(p) CTRACE2(TRACE_COOKIES, p)
+
/*
* The first level of the cookie list is a list indexed by the domain
* string; cookies with the same domain will be placed in the same
@@ -168,10 +173,10 @@ static void LYCookieJar_free(void)
HTList *cl = NULL, *next = NULL;
cookie *co = NULL;
- CTRACE((tfp, "LYCookieJar_free\n"));
+ CTrace((tfp, "LYCookieJar_free\n"));
while (dl) {
if ((de = dl->object) != NULL) {
- CTRACE((tfp, "...LYCookieJar_free domain %s\n", de->domain));
+ CTrace((tfp, "...LYCookieJar_free domain %s\n", de->domain));
cl = de->cookie_list;
while (cl) {
next = cl->next;
@@ -303,12 +308,11 @@ static domain_entry *find_domain_entry(const char *name)
for (hl = domain_list; hl != NULL; hl = hl->next) {
de = (domain_entry *) hl->object;
if (de != NULL && de->domain != NULL) {
- CTRACE2(TRACE_CFG,
- (tfp,
- "...test_domain_entry(%s) bv:%u, invcheck_bv:%u\n",
- de->domain,
- de->bv,
- de->invcheck_bv));
+ CTrace((tfp,
+ "...test_domain_entry(%s) bv:%u, invcheck_bv:%u\n",
+ de->domain,
+ de->bv,
+ de->invcheck_bv));
if (!strcasecomp(name, de->domain)) {
break;
}
@@ -316,7 +320,7 @@ static domain_entry *find_domain_entry(const char *name)
de = NULL;
}
}
- CTRACE((tfp, "find_domain_entry(%s) bv:%d, invcheck_bv:%d\n",
+ CTrace((tfp, "find_domain_entry(%s) bv:%d, invcheck_bv:%d\n",
name,
de ? (int) de->bv : -1,
de ? (int) de->invcheck_bv : -1));
@@ -386,7 +390,7 @@ static void store_cookie(cookie * co, const char *hostname,
break; /* will prompt later if we get that far */
case INVCHECK_STRICT:
- CTRACE((tfp,
+ CTrace((tfp,
"store_cookie: Rejecting because '%s' is not a prefix of '%s'.\n",
co->path, path));
freeCookie(co);
@@ -403,7 +407,7 @@ static void store_cookie(cookie * co, const char *hostname,
* The hostname does not contain a dot.
*/
if (strchr(hostname, '.') == NULL) {
- CTRACE((tfp, "store_cookie: Rejecting because '%s' has no dot.\n",
+ CTrace((tfp, "store_cookie: Rejecting because '%s' has no dot.\n",
hostname));
freeCookie(co);
return;
@@ -417,13 +421,13 @@ static void store_cookie(cookie * co, const char *hostname,
* qualified. - FM
*/
if (co->domain[0] != '.' || co->domain[1] == '\0') {
- CTRACE((tfp, "store_cookie: Rejecting domain '%s'.\n", co->domain));
+ CTrace((tfp, "store_cookie: Rejecting domain '%s'.\n", co->domain));
freeCookie(co);
return;
}
ptr = strchr((co->domain + 1), '.');
if (ptr == NULL || ptr[1] == '\0') {
- CTRACE((tfp, "store_cookie: Rejecting domain '%s'.\n", co->domain));
+ CTrace((tfp, "store_cookie: Rejecting domain '%s'.\n", co->domain));
freeCookie(co);
return;
}
@@ -433,7 +437,7 @@ static void store_cookie(cookie * co, const char *hostname,
* domain-match the Domain attribute.
*/
if (!host_matches(hostname, co->domain)) {
- CTRACE((tfp,
+ CTrace((tfp,
"store_cookie: Rejecting domain '%s' for host '%s'.\n",
co->domain, hostname));
freeCookie(co);
@@ -463,7 +467,7 @@ static void store_cookie(cookie * co, const char *hostname,
break; /* will prompt later if we get that far */
case INVCHECK_STRICT:
- CTRACE((tfp,
+ CTrace((tfp,
"store_cookie: Rejecting because '%s' is not a prefix of '%s'.\n",
co->path, path));
freeCookie(co);
@@ -488,7 +492,7 @@ static void store_cookie(cookie * co, const char *hostname,
co->domain,
hostname);
if (!HTForcedPrompt(cookie_noprompt, msg, NO)) {
- CTRACE((tfp,
+ CTrace((tfp,
"store_cookie: Rejecting domain '%s' for host '%s'.\n",
co->domain,
hostname));
@@ -502,7 +506,7 @@ static void store_cookie(cookie * co, const char *hostname,
INVALID_COOKIE_PATH_CONFIRMATION,
co->path, path);
if (!HTForcedPrompt(cookie_noprompt, msg, NO)) {
- CTRACE((tfp,
+ CTrace((tfp,
"store_cookie: Rejecting because '%s' is not a prefix of '%s'.\n",
co->path, path));
freeCookie(co);
@@ -591,7 +595,7 @@ static void store_cookie(cookie * co, const char *hostname,
* Don't add the cookie if we're over the domain's limit. - FM
*/
} else if (HTList_count(cookie_list) > max_cookies_domain) {
- CTRACE((tfp,
+ CTrace((tfp,
"store_cookie: Domain's cookie limit exceeded! Rejecting cookie.\n"));
freeCookie(co);
co = NULL;
@@ -600,7 +604,7 @@ static void store_cookie(cookie * co, const char *hostname,
* Don't add the cookie if we're over the total cookie limit. - FM
*/
} else if (total_cookies > max_cookies_global) {
- CTRACE((tfp,
+ CTrace((tfp,
"store_cookie: Total cookie limit exceeded! Rejecting cookie.\n"));
freeCookie(co);
co = NULL;
@@ -614,7 +618,7 @@ static void store_cookie(cookie * co, const char *hostname,
* - kw 1999-06-24
*/
} else if (co->value == NULL) { /* should not happen - kw */
- CTRACE((tfp, "store_cookie: Value is NULL! Not storing cookie.\n"));
+ CTrace((tfp, "store_cookie: Value is NULL! Not storing cookie.\n"));
freeCookie(co);
co = NULL;
@@ -675,11 +679,11 @@ static char *scan_cookie_sublist(char *hostname,
if ((co) && /* speed-up host_matches() and limit trace output */
(LYstrstr(hostname, co->domain) != NULL)) {
- CTRACE((tfp, "Checking cookie %p %s=%s\n",
+ CTrace((tfp, "Checking cookie %p %s=%s\n",
hl,
(co->name ? co->name : "(no name)"),
(co->value ? co->value : "(no value)")));
- CTRACE((tfp, "\t%s %s %d %s %s %d%s\n",
+ CTrace((tfp, "\t%s %s %d %s %s %d%s\n",
hostname,
(co->domain ? co->domain : "(no domain)"),
host_matches(hostname, co->domain),
@@ -927,7 +931,7 @@ static unsigned parse_attribute(unsigned flags,
url_type == HTTPS_URL_TYPE)) {
*cookie_len += strlen(cur_cookie->commentURL);
} else {
- CTRACE((tfp,
+ CTrace((tfp,
"LYProcessSetCookies: Rejecting commentURL value '%s'\n",
cur_cookie->commentURL));
FREE(cur_cookie->commentURL);
@@ -957,7 +961,7 @@ static unsigned parse_attribute(unsigned flags,
isdigit(UCH(*ptr)))
ptr++;
if (*ptr != '\0') {
- CTRACE((tfp,
+ CTrace((tfp,
"LYProcessSetCookies: Adding lead dot for domain value '%s'\n",
value));
StrAllocCopy(cur_cookie->domain, ".");
@@ -1047,7 +1051,7 @@ static unsigned parse_attribute(unsigned flags,
cur_cookie->expires = (time_t) 0;
} else {
cur_cookie->expires = (time(NULL) + temp);
- CTRACE((tfp, "LYSetCookie: expires %ld, %s",
+ CTrace((tfp, "LYSetCookie: expires %ld, %s",
(long) cur_cookie->expires,
ctime(&cur_cookie->expires)));
}
@@ -1068,7 +1072,7 @@ static unsigned parse_attribute(unsigned flags,
cur_cookie->flags |= COOKIE_FLAG_EXPIRES_SET;
cur_cookie->expires = LYmktime(value, FALSE);
if (cur_cookie->expires > 0) {
- CTRACE((tfp, "LYSetCookie: expires %ld, %s",
+ CTrace((tfp, "LYSetCookie: expires %ld, %s",
(long) cur_cookie->expires,
ctime(&cur_cookie->expires)));
}
@@ -1124,7 +1128,7 @@ static void LYProcessSetCookies(const char *SetCookie,
*/
p = NonNull(SetCookie2);
if (SetCookie && *p) {
- CTRACE((tfp, "LYProcessSetCookies: Using Set-Cookie2 header.\n"));
+ CTrace((tfp, "LYProcessSetCookies: Using Set-Cookie2 header.\n"));
}
while (NumCookies <= max_cookies_domain && *p) {
attr_start = attr_end = value_start = value_end = NULL;
@@ -1341,13 +1345,13 @@ static void LYProcessSetCookies(const char *SetCookie,
}
HTList_appendObject(CombinedCookies, cur_cookie);
} else if (cur_cookie != NULL) {
- CTRACE((tfp,
+ CTrace((tfp,
"LYProcessSetCookies: Rejecting Set-Cookie2: %s=%s\n",
(cur_cookie->name ?
cur_cookie->name : "[no name]"),
(cur_cookie->value ?
cur_cookie->value : "[no value]")));
- CTRACE((tfp,
+ CTrace((tfp,
(parse_flags & FLAGS_INVALID_PORT) ?
" due to excessive length!\n"
: " due to invalid port!\n"));
@@ -1391,10 +1395,10 @@ static void LYProcessSetCookies(const char *SetCookie,
}
HTList_appendObject(CombinedCookies, cur_cookie);
} else if (cur_cookie != NULL && !(parse_flags & FLAGS_INVALID_PORT)) {
- CTRACE((tfp, "LYProcessSetCookies: Rejecting Set-Cookie2: %s=%s\n",
+ CTrace((tfp, "LYProcessSetCookies: Rejecting Set-Cookie2: %s=%s\n",
(cur_cookie->name ? cur_cookie->name : "[no name]"),
(cur_cookie->value ? cur_cookie->value : "[no value]")));
- CTRACE((tfp, " due to excessive %s%s%s\n",
+ CTrace((tfp, " due to excessive %s%s%s\n",
(cookie_len > max_cookies_buffer ? "length" : ""),
(cookie_len > max_cookies_buffer &&
NumCookies > max_cookies_domain
@@ -1404,10 +1408,10 @@ static void LYProcessSetCookies(const char *SetCookie,
freeCookie(cur_cookie);
cur_cookie = NULL;
} else if (cur_cookie != NULL) { /* invalidport */
- CTRACE((tfp, "LYProcessSetCookies: Rejecting Set-Cookie2: %s=%s\n",
+ CTrace((tfp, "LYProcessSetCookies: Rejecting Set-Cookie2: %s=%s\n",
(cur_cookie->name ? cur_cookie->name : "[no name]"),
(cur_cookie->value ? cur_cookie->value : "[no value]")));
- CTRACE((tfp, " due to invalid port!\n"));
+ CTrace((tfp, " due to invalid port!\n"));
NumCookies--;
freeCookie(cur_cookie);
cur_cookie = NULL;
@@ -1422,7 +1426,7 @@ static void LYProcessSetCookies(const char *SetCookie,
cur_cookie = NULL;
p = ((SetCookie && isEmpty(SetCookie2)) ? SetCookie : "");
if (SetCookie2 && *p) {
- CTRACE((tfp, "LYProcessSetCookies: Using Set-Cookie header.\n"));
+ CTrace((tfp, "LYProcessSetCookies: Using Set-Cookie header.\n"));
}
while (NumCookies <= max_cookies_domain && *p) {
attr_start = attr_end = value_start = value_end = NULL;
@@ -1638,13 +1642,13 @@ static void LYProcessSetCookies(const char *SetCookie,
}
HTList_appendObject(CombinedCookies, cur_cookie);
} else if (cur_cookie != NULL) {
- CTRACE((tfp,
+ CTrace((tfp,
"LYProcessSetCookies: Rejecting Set-Cookie: %s=%s\n",
(cur_cookie->name ?
cur_cookie->name : "[no name]"),
(cur_cookie->value ?
cur_cookie->value : "[no value]")));
- CTRACE((tfp,
+ CTrace((tfp,
" due to excessive length!\n"));
freeCookie(cur_cookie);
cur_cookie = NULL;
@@ -1686,10 +1690,10 @@ static void LYProcessSetCookies(const char *SetCookie,
}
HTList_appendObject(CombinedCookies, cur_cookie);
} else if (cur_cookie != NULL) {
- CTRACE((tfp, "LYProcessSetCookies: Rejecting Set-Cookie: %s=%s\n",
+ CTrace((tfp, "LYProcessSetCookies: Rejecting Set-Cookie: %s=%s\n",
(cur_cookie->name ? cur_cookie->name : "[no name]"),
(cur_cookie->value ? cur_cookie->value : "[no value]")));
- CTRACE((tfp, " due to excessive %s%s%s\n",
+ CTrace((tfp, " due to excessive %s%s%s\n",
(cookie_len > max_cookies_buffer ? "length" : ""),
(cookie_len > max_cookies_buffer && NumCookies > max_cookies_domain
? " and "
@@ -1705,11 +1709,11 @@ static void LYProcessSetCookies(const char *SetCookie,
*/
cl = CombinedCookies;
while (NULL != (co = (cookie *) HTList_nextObject(cl))) {
- CTRACE((tfp, "LYProcessSetCookie: attr=value pair: '%s=%s'\n",
+ CTrace((tfp, "LYProcessSetCookie: attr=value pair: '%s=%s'\n",
(co->name ? co->name : "[no name]"),
(co->value ? co->value : "[no value]")));
if (co->expires > 0) {
- CTRACE((tfp, " expires: %ld, %s\n",
+ CTrace((tfp, " expires: %ld, %s\n",
(long) co->expires,
ctime(&co->expires)));
}
@@ -1717,7 +1721,7 @@ static void LYProcessSetCookies(const char *SetCookie,
LYForceSSLCookiesSecure == TRUE &&
!(co->flags & COOKIE_FLAG_SECURE)) {
co->flags |= COOKIE_FLAG_SECURE;
- CTRACE((tfp, " Forced the 'secure' flag on.\n"));
+ CTrace((tfp, " Forced the 'secure' flag on.\n"));
}
store_cookie(co, hostname, path);
}
@@ -1773,17 +1777,17 @@ void LYSetCookie(const char *SetCookie,
*/
BadHeaders = TRUE;
}
- CTRACE((tfp, "LYSetCookie called with host '%s', path '%s',\n",
+ CTrace((tfp, "LYSetCookie called with host '%s', path '%s',\n",
NonNull(hostname),
NonNull(path)));
if (SetCookie) {
- CTRACE((tfp, " and Set-Cookie: '%s'\n", SetCookie));
+ CTrace((tfp, " and Set-Cookie: '%s'\n", SetCookie));
}
if (SetCookie2) {
- CTRACE((tfp, " and Set-Cookie2: '%s'\n", SetCookie2));
+ CTrace((tfp, " and Set-Cookie2: '%s'\n", SetCookie2));
}
if (LYSetCookies == FALSE || BadHeaders == TRUE) {
- CTRACE((tfp, " Ignoring this Set-Cookie/Set-Cookie2 request.\n"));
+ CTrace((tfp, " Ignoring this Set-Cookie/Set-Cookie2 request.\n"));
}
/*
@@ -1817,7 +1821,7 @@ char *LYAddCookieHeader(char *hostname,
HTList *hl = domain_list, *next = NULL;
domain_entry *de;
- CTRACE((tfp, "LYCookie: Searching for '%s:%d', '%s'.\n",
+ CTrace((tfp, "LYCookie: Searching for '%s:%d', '%s'.\n",
NONNULL(hostname),
port,
NONNULL(path)));
@@ -1890,7 +1894,7 @@ void LYLoadCookies(char *cookie_file)
if (!cookie_handle)
return;
- CTRACE((tfp, "LYLoadCookies: reading cookies from %s\n", cookie_file));
+ CTrace((tfp, "LYLoadCookies: reading cookies from %s\n", cookie_file));
number_of_file_cookies = 0;
while (LYSafeGets(&buf, cookie_handle) != 0) {
@@ -1923,11 +1927,11 @@ void LYLoadCookies(char *cookie_file)
* sscanf(buf, "%s\t%s\t%s\t%s\t%d\t%s\t%[ -~]",
* domain, what, path, secure, &expires, name, value);
*/
- CTRACE((tfp, "LYLoadCookies: tokenising %s\n", buf));
+ CTrace((tfp, "LYLoadCookies: tokenising %s\n", buf));
tok_ptr = buf;
tok_out = LYstrsep(&tok_ptr, "\t");
for (tok_loop = 0; tok_out && tok_values[tok_loop].s; tok_loop++) {
- CTRACE((tfp, "\t%d:[%03d]:[%s]\n",
+ CTrace((tfp, "\t%d:[%03d]:[%s]\n",
tok_loop, (int) (tok_out - buf), tok_out));
LYstrncpy(tok_values[tok_loop].s,
tok_out,
@@ -1943,14 +1947,14 @@ void LYLoadCookies(char *cookie_file)
if (tok_values[tok_loop].s) {
/* tok_out in above loop must have been NULL prematurely - kw */
- CTRACE((tfp,
+ CTrace((tfp,
"*** wrong format: not enough tokens, ignoring line!\n"));
continue;
}
expires = atol(expires_a);
- CTRACE((tfp, "expires:\t%s\n", ctime(&expires)));
-/* CTRACE((tfp, "%s\t%s\t%s\t%s\t%ld\t%s\t%s\tREADCOOKIE\n", */
+ CTrace((tfp, "expires:\t%s\n", ctime(&expires)));
+/* CTrace((tfp, "%s\t%s\t%s\t%s\t%ld\t%s\t%s\tREADCOOKIE\n", */
/* domain, what, path, secure, (long) expires, name, value)); */
moo = newCookie();
StrAllocCopy(moo->domain, domain);
@@ -2042,7 +2046,7 @@ void LYStoreCookies(char *cookie_file)
return;
}
- CTRACE((tfp, "LYStoreCookies: save cookies to %s on exit\n", cookie_file));
+ CTrace((tfp, "LYStoreCookies: save cookies to %s on exit\n", cookie_file));
cookie_handle = LYNewTxtFile(cookie_file);
if (cookie_handle == NULL)
@@ -2065,17 +2069,17 @@ void LYStoreCookies(char *cookie_file)
if ((co = (cookie *) cl->object) == NULL)
continue;
- CTRACE((tfp, "LYStoreCookies: %ld cf %ld ",
+ CTrace((tfp, "LYStoreCookies: %ld cf %ld ",
(long) now, (long) co->expires));
if ((co->flags & COOKIE_FLAG_DISCARD)) {
- CTRACE((tfp, "not stored - DISCARD\n"));
+ CTrace((tfp, "not stored - DISCARD\n"));
continue;
} else if (!(co->flags & COOKIE_FLAG_EXPIRES_SET)) {
- CTRACE((tfp, "not stored - no expiration time\n"));
+ CTrace((tfp, "not stored - no expiration time\n"));
continue;
} else if (co->expires <= now) {
- CTRACE((tfp, "not stored - EXPIRED\n"));
+ CTrace((tfp, "not stored - EXPIRED\n"));
continue;
}
@@ -2089,7 +2093,7 @@ void LYStoreCookies(char *cookie_file)
NonNull(co->value),
(co->quoted ? "\"" : ""));
- CTRACE((tfp, "STORED\n"));
+ CTrace((tfp, "STORED\n"));
}
}
LYCloseOutput(cookie_handle);
@@ -2642,7 +2646,7 @@ static void cookie_domain_flag_set(char *domainstr,
de->invcheck_bv = INVCHECK_LOOSE;
break;
}
- CTRACE((tfp,
+ CTrace((tfp,
"cookie_domain_flag_set (%s, bv=%u, invcheck_bv=%u)\n",
strsmall, de->bv, de->invcheck_bv));
}
diff --git a/src/LYGetFile.c b/src/LYGetFile.c
index b3429fa3..a73ddb2a 100644
--- a/src/LYGetFile.c
+++ b/src/LYGetFile.c
@@ -1,3 +1,4 @@
+/* $LynxId: LYGetFile.c,v 1.77 2007/05/20 23:28:43 Thorsten.Glaser Exp $ */
#include <HTUtils.h>
#include <HTTP.h>
#include <HTAnchor.h> /* Anchor class */
@@ -780,6 +781,7 @@ int getfile(DocInfo *doc, int *target)
* relative elements. - FM
*/
LYTildeExpand(&(doc->address), TRUE);
+ WWWDoc.address = doc->address;
}
CTRACE_SLEEP(MessageSecs);
user_message(WWW_WAIT_MESSAGE, doc->address);
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 59f623f6..dcc1b83f 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYReadCFG.c,v 1.122 2007/05/06 18:17:23 tom Exp $ */
+/* $LynxId: LYReadCFG.c,v 1.123 2007/05/23 00:17:02 tom Exp $ */
#ifndef NO_RULES
#include <HTRules.h>
#else
@@ -1117,8 +1117,9 @@ static int parse_html_src_spec(HTlexeme lexeme_code, char *value,
BS();
*ts2 = '\0';
- CTRACE((tfp, "ReadCFG - parsing tagspec '%s:%s' for option '%s'\n",
- value, ts2, option_name));
+ CTRACE2(TRACE_CFG, (tfp,
+ "LYReadCFG - parsing tagspec '%s:%s' for option '%s'\n",
+ value, ts2, option_name));
html_src_clean_item(lexeme_code);
if (!html_src_parse_tagspec(value, lexeme_code, TRUE, TRUE)
|| !html_src_parse_tagspec(ts2, lexeme_code, TRUE, TRUE)) {
diff --git a/src/LYStrings.c b/src/LYStrings.c
index ca9e18c5..d7c5acef 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1,3 +1,4 @@
+/* $LynxId: LYStrings.c,v 1.126 2007/05/23 00:30:24 tom Exp $ */
#include <HTUtils.h>
#include <HTCJK.h>
#include <UCAux.h>
@@ -1232,45 +1233,49 @@ static char *skip_keysym(char *parse)
* The first token is the string to define, the second is the name (of the
* keysym) to define it to.
*/
+#define MY_TRACE(p) CTRACE2(TRACE_CFG, p)
+
static int setkey_cmd(char *parse)
{
char *s, *t;
int keysym;
char buf[BUFSIZ];
- CTRACE((tfp, "KEYMAP(PA): in=%s", parse)); /* \n-terminated */
+ MY_TRACE((tfp, "KEYMAP(PA): in=%s", parse)); /* \n-terminated */
if ((s = skip_keysym(parse)) != 0) {
if (isspace(UCH(*s))) {
*s++ = '\0';
s = LYSkipBlanks(s);
if ((t = skip_keysym(s)) == 0) {
- CTRACE((tfp, "KEYMAP(SKIP) no key expansion found\n"));
+ MY_TRACE((tfp, "KEYMAP(SKIP) no key expansion found\n"));
return -1;
}
if (t != s)
*t = '\0';
if (map_string_to_keysym(s, &keysym) >= 0) {
if (!unescape_string(parse, buf, buf + sizeof(buf) - 1)) {
- CTRACE((tfp, "KEYMAP(SKIP) could unescape key\n"));
+ MY_TRACE((tfp, "KEYMAP(SKIP) could unescape key\n"));
return 0; /* Trace the failure and continue. */
}
if (LYTraceLogFP == 0) {
- CTRACE((tfp, "KEYMAP(DEF) keysym=%#x\n", keysym));
+ MY_TRACE((tfp, "KEYMAP(DEF) keysym=%#x\n", keysym));
} else {
- CTRACE((tfp, "KEYMAP(DEF) keysym=%#x, seq='%s'\n", keysym, buf));
+ MY_TRACE((tfp, "KEYMAP(DEF) keysym=%#x, seq='%s'\n",
+ keysym, buf));
}
return define_key(buf, keysym);
} else {
- CTRACE((tfp, "KEYMAP(SKIP) could not map to keysym\n"));
+ MY_TRACE((tfp, "KEYMAP(SKIP) could not map to keysym\n"));
}
} else {
- CTRACE((tfp, "KEYMAP(SKIP) junk after key description: '%s'\n", s));
+ MY_TRACE((tfp, "KEYMAP(SKIP) junk after key description: '%s'\n", s));
}
} else {
- CTRACE((tfp, "KEYMAP(SKIP) no key description\n"));
+ MY_TRACE((tfp, "KEYMAP(SKIP) no key description\n"));
}
return -1;
}
+#undef MY_TRACE
static int unsetkey_cmd(char *parse)
{
diff --git a/src/LYStyle.c b/src/LYStyle.c
index 40ff1522..e577a256 100644
--- a/src/LYStyle.c
+++ b/src/LYStyle.c
@@ -1,6 +1,6 @@
/* character level styles for Lynx
* (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-)
- * $LynxId: LYStyle.c,v 1.57 2006/10/02 20:07:15 tom Exp $
+ * $LynxId: LYStyle.c,v 1.58 2007/05/23 00:32:21 tom Exp $
*/
#include <HTUtils.h>
#include <HTML.h>
@@ -23,6 +23,8 @@
#include <LYLeaks.h>
#include <LYStrings.h>
+#define CTRACE1(p) CTRACE2(TRACE_CFG || TRACE_STYLE, p)
+
#ifdef USE_COLOR_STYLE
static void style_initialiseHashTable(void);
@@ -451,7 +453,7 @@ static void initialise_default_stylesheet(void)
char *normal = LYgetTableString(0);
char *strong = LYgetTableString(4);
- CTRACE((tfp, "initialise_default_stylesheet\n"));
+ CTRACE1((tfp, "initialise_default_stylesheet\n"));
/*
* For debugging this function, create hash codes for all of the tags.
@@ -575,7 +577,7 @@ static void HStyle_addStyle(char *buffer)
{
char *name = NULL;
- CTRACE((tfp, "HStyle_addStyle(%s)\n", buffer));
+ CTRACE1((tfp, "HStyle_addStyle(%s)\n", buffer));
StrAllocCopy(name, buffer);
TrimLowercase(name);
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 190f1a7f..629f24f6 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,3 +1,4 @@
+/* $LynxId: LYUtils.c,v 1.157 2007/05/20 23:28:43 Thorsten.Glaser Exp $ */
#include <HTUtils.h>
#include <HTTCP.h>
#include <HTParse.h>
@@ -5367,8 +5368,7 @@ char *LYTildeExpand(char **pathname,
if (LYIsTilde(temp[0])) {
CTRACE((tfp, "LYTildeExpand %s\n", *pathname));
- if (LYIsPathSep(temp[1])
- && temp[2] != '\0') {
+ if (LYIsPathSep(temp[1])) {
char *first = NULL;
char *second = NULL;
diff --git a/src/LYrcFile.c b/src/LYrcFile.c
index c3aa1c62..b50bc416 100644
--- a/src/LYrcFile.c
+++ b/src/LYrcFile.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYrcFile.c,v 1.66 2007/05/06 19:22:33 tom Exp $ */
+/* $LynxId: LYrcFile.c,v 1.68 2007/05/23 00:22:06 tom Exp $ */
#include <HTUtils.h>
#include <HTFTP.h>
#include <LYUtils.h>
@@ -986,7 +986,6 @@ int enable_lynxrc(char *value)
for (tbl = Config_Table; tbl->name != 0; tbl++) {
if (!strcasecomp(value, tbl->name)) {
tbl->enabled = getBool(colon);
- CTRACE((tfp, "enable_lynxrc(%s) %s\n", value, putBool(tbl->enabled)));
break;
}
}
diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in
index 166e69db..514636ae 100644
--- a/src/chrtrans/makefile.in
+++ b/src/chrtrans/makefile.in
@@ -1,3 +1,4 @@
+# $LynxId: makefile.in,v 1.33 2007/05/23 00:57:49 tom Exp $
#
# Makefile for the makeuctb and unicode tables.
#
@@ -42,13 +43,13 @@ x = @EXEEXT@
o = .@BUILD_OBJEXT@
BUILD_EXEEXT = @BUILD_EXEEXT@
-CPP_OPTS = $(BUILD_CPPFLAGS) \
+CPP_OPTS = \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/chrtrans \
-I$(top_srcdir)/$(WWWINC) \
-I$(top_srcdir)/ \
- $(INTLDIR_CPPFLAGS) $(SITE_DEFS)
+ $(INTLDIR_CPPFLAGS) $(SITE_DEFS) $(BUILD_CPPFLAGS)
CC_OPTS = $(CPP_OPTS) $(BUILD_CFLAGS)
#
diff --git a/src/makefile.in b/src/makefile.in
index adbd2a04..5e024615 100644
--- a/src/makefile.in
+++ b/src/makefile.in
@@ -1,3 +1,4 @@
+# $LynxId: makefile.in,v 1.50 2007/05/23 00:19:09 tom Exp $
# template-makefile for Lynx src directory
SHELL = @CONFIG_SHELL@
@@ -48,7 +49,7 @@ WWWLIB = $(top_builddir)/WWW/Library/Implementation/libwww.a
INTLLIB = @INTLLIBS@
INTLDIR_CPPFLAGS= @INTLDIR_CPPFLAGS@-I$(top_srcdir)/intl
-CPP_OPTS = $(EXTRA_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CHARSET_DEFS) \
+CPP_OPTS = $(DEFS) $(CHARSET_DEFS) \
-DLOCALEDIR=\"$(localedir)\" \
-I. \
-I$(top_builddir) \
@@ -57,7 +58,7 @@ CPP_OPTS = $(EXTRA_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CHARSET_DEFS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/$(WWWINC) \
- $(INTLDIR_CPPFLAGS) $(SITE_DEFS)
+ $(INTLDIR_CPPFLAGS) $(SITE_DEFS) $(EXTRA_CPPFLAGS) $(CPPFLAGS)
CC_OPTS = $(CPP_OPTS) $(CFLAGS)
LINT = @LINT@
diff --git a/userdefs.h b/userdefs.h
index 9b3067f8..087c1a32 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
/*
- * $LynxId: userdefs.h,v 1.226 2007/05/17 23:10:27 tom Exp $
+ * $LynxId: userdefs.h,v 1.227 2007/05/23 00:38:33 tom Exp $
*
* Lynx - Hypertext navigation system
*
@@ -295,7 +295,7 @@
#endif /* HAVE_CONFIG_H */
#ifndef MIME_LIBDIR
-#define MIME_LIBDIR "/etc"
+#define MIME_LIBDIR "/etc/"
#endif
/**************************