snapshot of project "lynx", label v2-8-5pre_4

6 files changed, 50 insertions, 38 deletions

diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c
index 1e67d478..2177a108 100644
--- a/WWW/Library/Implementation/HTString.c
+++ b/WWW/Library/Implementation/HTString.c
@@ -1001,34 +1001,30 @@ PUBLIC void HTAddXpand ARGS4(
 #endif /* USE_QUOTED_PARAMETER */
 
 /*
- * Append string-parameter to a system command that we are constructing.  The
- * string is a complete parameter (which is a necessary assumption so we can
- * quote it properly).  We're given the index of the newest parameter we're
- * processing.  Zero indicates none, so a value of '1' indicates that we copy
- * from the beginning of the command string up to the first parameter,
- * substitute the quoted parameter and return the result.
+ * Append string to a system command that we are constructing, without quoting. 
+ * We're given the index of the newest parameter we're processing.  Zero
+ * indicates none, so a value of '1' indicates that we copy from the beginning
+ * of the command string up to the first parameter, substitute the quoted
+ * parameter and return the result.
  *
  * Parameters are substituted at "%s" tokens, like printf.  Other printf-style
  * tokens are not substituted; they are passed through without change.
  */
-PUBLIC void HTAddParam ARGS4(
+PUBLIC void HTAddToCmd ARGS4(
     char **,		result,
     CONST char *,	command,
     int,		number,
-    CONST char *,	parameter)
+    CONST char *,	string)
 {
     if (number > 0) {
 	CONST char *last = HTAfterCommandArg(command, number - 1);
 	CONST char *next = last;
-#if USE_QUOTED_PARAMETER
-	char *quoted;
-#endif
 
 	if (number <= 1) {
 	    FREE(*result);
 	}
-	if (parameter == 0)
-	    parameter = "";
+	if (string == 0)
+	    string = "";
 	while (next[0] != 0) {
 	    if (HTIsParam(next)) {
 		if (next != last) {
@@ -1037,13 +1033,7 @@ PUBLIC void HTAddParam ARGS4(
 		    HTSACat(result, last);
 		    (*result)[len] = 0;
 		}
-#if USE_QUOTED_PARAMETER
-		quoted = HTQuoteParameter(parameter);
-		HTSACat(result, quoted);
-		FREE(quoted);
-#else
-		HTSACat(result, parameter);
-#endif
+		HTSACat(result, string);
 		CTRACE((tfp, "PARAM-ADD:%s\n", *result));
 		return;
 	    }
@@ -1053,6 +1043,28 @@ PUBLIC void HTAddParam ARGS4(
 }
 
 /*
+ * Append string-parameter to a system command that we are constructing.  The
+ * string is a complete parameter (which is a necessary assumption so we can
+ * quote it properly).
+ */
+PUBLIC void HTAddParam ARGS4(
+    char **,		result,
+    CONST char *,	command,
+    int,		number,
+    CONST char *,	parameter)
+{
+    if (number > 0) {
+#if USE_QUOTED_PARAMETER
+	char *quoted = HTQuoteParameter(parameter);
+	HTAddToCmd(result, command, number, quoted);
+	FREE(quoted);
+#else
+	HTAddToCmd(result, command, number, parameter);
+#endif
+    }
+}
+
+/*
  * Append the remaining command-string to a system command (compare with
  * HTAddParam).  Any remaining "%s" tokens are copied as empty strings.
  */
diff --git a/WWW/Library/Implementation/HTString.h b/WWW/Library/Implementation/HTString.h
index a93f4a7e..af994c86 100644
--- a/WWW/Library/Implementation/HTString.h
+++ b/WWW/Library/Implementation/HTString.h
@@ -111,6 +111,7 @@ extern void HTAddXpand PARAMS((char ** result, CONST char * command, int number,
 #endif
 
 extern int HTCountCommandArgs PARAMS((CONST char * command));
+extern void HTAddToCmd PARAMS((char ** result, CONST char * command, int number, CONST char * string));
 extern void HTAddParam PARAMS((char ** result, CONST char * command, int number, CONST char * parameter));
 extern void HTEndParam PARAMS((char ** result, CONST char * command, int number));
 
diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h
index 94db09ee..4cd4b76b 100644
--- a/WWW/Library/Implementation/www_tcp.h
+++ b/WWW/Library/Implementation/www_tcp.h
@@ -686,7 +686,7 @@ typedef unsigned short mode_t;
 #include <libgettext.h>
 #endif
 
-#define N_(s) (s)
+#define N_(s) s
 
 #ifndef HAVE_GETTEXT
 #define gettext(s) s
diff --git a/WWW/Library/djgpp/CommonMakefile b/WWW/Library/djgpp/CommonMakefile
index 99dc1f6a..87a9306f 100644
--- a/WWW/Library/djgpp/CommonMakefile
+++ b/WWW/Library/djgpp/CommonMakefile
@@ -69,7 +69,7 @@ include $(ABS)$(WWW)/Library/Implementation/Version.make
 # XMOsAIC hack is only for server to cope with xmosaic kludge for mmedia
 #
 # add -DNEW_GATEWAY here for the new gateway config stuff
-CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DXMOSAIC_HACK -DACCESS_AUTH
+CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DACCESS_AUTH
 
 CERNLIBBIN = $(WWW)/bin
 
diff --git a/WWW/Library/djgpp/makefile b/WWW/Library/djgpp/makefile
index 893f6cdb..f46ad1fc 100644
--- a/WWW/Library/djgpp/makefile
+++ b/WWW/Library/djgpp/makefile
@@ -8,10 +8,7 @@ WWW_MACH = djgpp
 #ASIS_MACH = hardware/os
 
 # Use this option to enable optional and *experimental* color style.
-#ENABLE_COLOR_STYLE = \
- -DUSE_COLOR_STYLE \
- -DUSE_HASH \
- -DLINKEDSTYLES
+#ENABLE_COLOR_STYLE = -DUSE_COLOR_STYLE
 
 # comment this line to suppress DIRED support
 DIRED_DEFS = -DDIRED_SUPPORT
@@ -23,18 +20,16 @@ MCFLAGS = \
  $(ENABLE_COLOR_STYLE) \
  -DDISP_PARTIAL \
  -DDOSPATH \
- -DEXP_FILE_UPLOAD \
+ -DUSE_FILE_UPLOAD \
  -DNOUSERS \
- -DSOURCE_CACHE \
+ -DUSE_SOURCE_CACHE \
  -DUSE_PRETTYSRC \
  -DUSE_ZLIB \
- -DWATT32 \
  -I../Implementation \
  -I../../../src \
  -I../../.. \
- -I/djgpp/pdcur24 \
- -I/djgpp/watt32/inc \
- -I/djgpp/watt32/inc/sys
+ -I/djgpp/pdcur26 \
+ -I/djgpp/watt32/inc
 
 LFLAGS =
 CC = gcc
@@ -44,7 +39,7 @@ CC = gcc
 
 # Uncomment the following to enable SSL.
 #SSLFLAGS = -DUSE_SSL
-#SSLINC = -I/djgpp/include/openssl
+#SSLINC = -I/dev/env/DJDIR/include/openssl
 
 # Directory for installed binary:
 !BINDIR = /usr/local/bin
diff --git a/WWW/Library/djgpp/makefile.sla b/WWW/Library/djgpp/makefile.sla
index 540f9a33..79e87b88 100644
--- a/WWW/Library/djgpp/makefile.sla
+++ b/WWW/Library/djgpp/makefile.sla
@@ -7,17 +7,21 @@ WWW_MACH = djgpp
 # The ASIS repository's name for the machine we are on
 #ASIS_MACH = hardware/os
 
-CFLAGS = -O1 -DUSE_SLANG -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDISP_PARTIAL \
--DDIRED_SUPPORT -DSOURCE_CACHE -DUSE_PRETTYSRC \
--DWATT32 \
+CFLAGS = -O2 -DUSE_SLANG -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDISP_PARTIAL \
+-DDIRED_SUPPORT -DUSE_SOURCE_CACHE -DUSE_PRETTYSRC \
 -I../Implementation \
--I../../../djgpp/watt32/inc -I../../../djgpp/watt32/inc/sys \
+-I/dev/env/DJDIR/watt32/inc \
 -I../../../src \
--I../../.. $(SLANGINC) $(INTLFLAGS)
+-I../../.. $(SLANGINC) $(INTLFLAGS) $(SSLFLAGS) $(SSLINC)
+
 LFLAGS =
 CC = gcc
 #INTLFLAGS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H
 
+# Uncomment the following to enable SSL.
+#SSLFLAGS = -DUSE_SSL
+#SSLINC = -I/dev/env/DJDIR/include/openssl
+
 # Directory for installed binary:
 !BINDIR = /usr/local/bin