sync with lynx 2.8.5.rel2 which fixes a few minor bugs (null pointer checks,

progress bar with very slow connections)

10 files changed, 43 insertions, 18 deletions

diff --git a/gnu/usr.bin/lynx/CHANGES b/gnu/usr.bin/lynx/CHANGES
index dfa08dd1ff1..a9a3400d7eb 100644
--- a/gnu/usr.bin/lynx/CHANGES
+++ b/gnu/usr.bin/lynx/CHANGES
@@ -1,6 +1,17 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2004-04-22 (2.8.5rel.2 fixes from 2.8.6dev.1)
+* correct ifdef in LYgetattrs() to ensure that getattrs() is used only if the
+  configure script actually found it (report/patch by Paul Gilmartin).
+* correct LYcommandList() to allocate data passed to HTList_addObject(), since
+  LYRemoveFromCloset() may free it (report by FLWM) -TD
+* add a null-pointer check to parameter of HTQuoteParameter(), fixes bug
+  introduced in 2.8.5pre.4 (report by FLWM) -TD
+* correct units shown by HTReadProgress() for very low rates - bug from
+  2.8.5pre.3 changes (report by PG) -TD
+* update current-version in README -LP
+
 2004-02-04 (2.8.5rel.1)
 * build fixes for MINGW32 -DK
 * build fixes for OS/2 (reported by IZ) -TD
diff --git a/gnu/usr.bin/lynx/README b/gnu/usr.bin/lynx/README
index 3ed7711b6c8..b178f28413b 100644
--- a/gnu/usr.bin/lynx/README
+++ b/gnu/usr.bin/lynx/README
@@ -1,7 +1,7 @@
 
                              Lynx README file
 
-Lynx Version 2.8.4 is the latest release (July 2001).
+Lynx Version 2.8.5 is the latest release (February 2004).
 See the CHANGES file for a complete record of all changes and bug fixes.
 New releases are announced on the lynx-dev mailing list (see below).
 
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTString.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTString.c
index 2177a108910..6b4a9c3b80f 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTString.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTString.c
@@ -877,11 +877,15 @@ PUBLIC char *HTQuoteParameter ARGS1(
     CONST char *,	parameter)
 {
     size_t i;
-    size_t last = strlen(parameter);
+    size_t last;
     size_t n = 0;
     size_t quoted = 0;
     char * result;
 
+    if (parameter == 0)
+	parameter = "";
+
+    last = strlen(parameter);
     for (i=0; i < last; ++i)
 	if (strchr("\\&#$^*?(){}<>\"';`|", parameter[i]) != 0
 	 || isspace(UCH(parameter[i])))
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTUtils.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTUtils.h
index bf2f3bc3d0b..bea5ef49085 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTUtils.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTUtils.h
@@ -571,6 +571,10 @@ extern int WWW_TraceMask;
 #define TRACE_CFG       (TRACE_bit(3))
 #define TRACE_BSTRING   (TRACE_bit(4))
 
+#if defined(USE_VERTRACE) && !defined(LY_TRACELINE)
+#define LY_TRACELINE __LINE__
+#endif
+
 #if defined(LY_TRACELINE)
 #define LY_SHOWWHERE fprintf( tfp, "%s: %d: ", __FILE__, LY_TRACELINE ),
 #else
diff --git a/gnu/usr.bin/lynx/configure b/gnu/usr.bin/lynx/configure
index a82757bbb0f..b50b9eb8f83 100644
--- a/gnu/usr.bin/lynx/configure
+++ b/gnu/usr.bin/lynx/configure
@@ -723,7 +723,7 @@ fi
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.5rel.1
+VERSION=2.8.5rel.2
 
 
 
diff --git a/gnu/usr.bin/lynx/configure.in b/gnu/usr.bin/lynx/configure.in
index e4f239d3662..3d6a06e116c 100644
--- a/gnu/usr.bin/lynx/configure.in
+++ b/gnu/usr.bin/lynx/configure.in
@@ -5,7 +5,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.5rel.1)
+AC_REVISION(2.8.5rel.2)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -33,7 +33,7 @@ CF_CHECK_CACHE
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.5rel.1
+VERSION=2.8.5rel.2
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(DESTDIR)
diff --git a/gnu/usr.bin/lynx/lynx.cfg b/gnu/usr.bin/lynx/lynx.cfg
index 91c17085f04..182aa1260bf 100644
--- a/gnu/usr.bin/lynx/lynx.cfg
+++ b/gnu/usr.bin/lynx/lynx.cfg
@@ -3,10 +3,10 @@
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.5rel.1"
+#PRCS LYNX_VERSION "2.8.5rel.2"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Wed, 04 Feb 2004 04:07:09 -0800"
+#PRCS LYNX_DATE "Thu, 22 Apr 2004 16:08:10 -0700"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
diff --git a/gnu/usr.bin/lynx/src/HTAlert.c b/gnu/usr.bin/lynx/src/HTAlert.c
index 0fed7542216..1f4c98e8607 100644
--- a/gnu/usr.bin/lynx/src/HTAlert.c
+++ b/gnu/usr.bin/lynx/src/HTAlert.c
@@ -165,13 +165,16 @@ PRIVATE CONST char *sprint_bytes ARGS3(
     static long kb_units = 1024;
     CONST char *u = HTProgressUnits(LYTransferRate);
 
-    if ( (LYTransferRate == rateKB || LYTransferRate == rateEtaKB_maybe)
-	 && (n >= 10 * kb_units) )
-	sprintf(s, "%ld", n/kb_units);
-    else if ((LYTransferRate == rateKB || LYTransferRate == rateEtaKB_maybe)
-	     && (n > 999))	/* Avoid switching between 1016b/s and 1K/s */
-	sprintf(s, "%.2g", ((double)n)/kb_units);
-    else {
+    if (LYTransferRate == rateKB || LYTransferRate == rateEtaKB_maybe) {
+	if (n >= 10 * kb_units) {
+	    sprintf(s, "%ld", n/kb_units);
+	} else if (n > 999) {	/* Avoid switching between 1016b/s and 1K/s */
+	    sprintf(s, "%.2g", ((double)n)/kb_units);
+	} else {
+	    sprintf(s, "%ld", n);
+	    u = HTProgressUnits(rateBYTES);
+	}
+    } else {
 	sprintf(s, "%ld", n);
     }
 
diff --git a/gnu/usr.bin/lynx/src/LYKeymap.c b/gnu/usr.bin/lynx/src/LYKeymap.c
index b0f6dce1835..4b841149719 100644
--- a/gnu/usr.bin/lynx/src/LYKeymap.c
+++ b/gnu/usr.bin/lynx/src/LYKeymap.c
@@ -1075,8 +1075,11 @@ PUBLIC HTList *LYcommandList NOARGS
 	unsigned j;
 	myList = HTList_new();
 	for (j = 0; revmap[j].name != 0; j++) {
-	    if (revmap[j].doc != 0)
-		HTList_addObject(myList, (char *)revmap[j].name);
+	    if (revmap[j].doc != 0) {
+		char *data = NULL;
+		StrAllocCopy(data, revmap[j].name);
+		HTList_addObject(myList, data);
+	    }
 	}
     }
     return myList;
diff --git a/gnu/usr.bin/lynx/userdefs.h b/gnu/usr.bin/lynx/userdefs.h
index 11362595140..8e37eeea83c 100644
--- a/gnu/usr.bin/lynx/userdefs.h
+++ b/gnu/usr.bin/lynx/userdefs.h
@@ -1360,11 +1360,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.5rel.1"
+#define LYNX_VERSION "2.8.5rel.2"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Wed, 04 Feb 2004 04:07:09 -0800"
+#define LYNX_DATE "Thu, 22 Apr 2004 16:08:10 -0700"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */