snapshot of project "lynx", label v2-9-0dev_6

6 files changed, 16 insertions, 16 deletions

diff --git a/CHANGES b/CHANGES
index 2f461aa3..21d9ecc2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,11 @@
--- $LynxId: CHANGES,v 1.1056 2020/09/03 22:17:31 tom Exp $
+-- $LynxId: CHANGES,v 1.1058 2020/09/05 14:11:12 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2020-09-03 (2.9.0dev.6)
+2020-09-05 (2.9.0dev.6)
+* remove commented ENABLE_LYNXRC for SHOW_COLOR:ON, and SHOW_DOTFILES since
+  those are normally saved to .lynxrc -TD
 * modify makeuctb to allow builds with asan2 when the configure option
   --enable-find-leaks is used-TD
 * add SOCKS5_PROXY environment variable, document the corresponding command
diff --git a/WWW/Library/Implementation/HTParse.c b/WWW/Library/Implementation/HTParse.c
index 36777249..a7f648fd 100644
--- a/WWW/Library/Implementation/HTParse.c
+++ b/WWW/Library/Implementation/HTParse.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTParse.c,v 1.89 2019/12/31 19:18:16 tom Exp $
+ * $LynxId: HTParse.c,v 1.90 2020/09/05 00:19:54 tom Exp $
  *
  *		Parse HyperText Document Address		HTParse.c
  *		================================
@@ -185,11 +185,11 @@ static void scan(char *name,
 }				/*scan */
 
 #if defined(HAVE_ALLOCA) && !defined(LY_FIND_LEAKS)
-#define LYalloca(x)        alloca(x)
+#define LYalloca(x)        alloca((size_t)(x))
 #define LYalloca_free(x)   {}
 #else
-#define LYalloca(x)        malloc(x)
-#define LYalloca_free(x)   free(x)
+#define LYalloca(x)        malloc((size_t)(x))
+#define LYalloca_free(x)   free((void *)(x))
 #endif
 
 static char *strchr_or_end(char *string, int ch)
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index 99022e02..945c9f91 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.156 2020/09/03 00:05:23 Thorsten.Glaser Exp $
+ * $LynxId: HTTCP.c,v 1.157 2020/09/03 22:57:14 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -2295,7 +2295,7 @@ int HTDoConnect(const char *url,
 	/* C99 */  {
 	    unsigned short x;	/* XXX 16-bit? */
 
-	    x = htons((unsigned) socks5_port);
+	    x = htons((PortNumber) socks5_port);
 	    memcpy(&pbuf[i], (unsigned char *) &x, sizeof x);
 	    i += (unsigned) sizeof(x);
 	}
diff --git a/lynx.cfg b/lynx.cfg
index 0ac59854..ac4a0cab 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,4 +1,4 @@
-# $LynxId: lynx.cfg,v 1.315 2020/03/01 13:47:14 tom Exp $
+# $LynxId: lynx.cfg,v 1.317 2020/09/05 14:11:12 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
@@ -7,7 +7,7 @@
 #PRCS LYNX_VERSION "2.9.0dev.6"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Sun, 01 Mar 2020 08:47:14 -0500"
+#PRCS LYNX_DATE "Sat, 05 Sep 2020 10:11:12 -0400"
 #
 # Definition pairs (configuration settings) are of the form
 #	VARIABLE:DEFINITION
@@ -3449,9 +3449,7 @@ COLOR:6:brightred:black
 #ENABLE_LYNXRC:SEND_USERAGENT:OFF
 #ENABLE_LYNXRC:SESSION_FILE:OFF
 #ENABLE_LYNXRC:SET_COOKIES:OFF
-#ENABLE_LYNXRC:SHOW_COLOR:ON
 #ENABLE_LYNXRC:SHOW_CURSOR:ON
-#ENABLE_LYNXRC:SHOW_DOTFILES:ON
 #ENABLE_LYNXRC:SHOW_KB_RATE:OFF
 #ENABLE_LYNXRC:SUB_BOOKMARKS:ON
 #ENABLE_LYNXRC:TAGSOUP:OFF
diff --git a/src/LYStrings.c b/src/LYStrings.c
index d12a6e36..f4719f87 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYStrings.c,v 1.276 2019/01/02 23:42:50 tom Exp $ */
+/* $LynxId: LYStrings.c,v 1.277 2020/09/04 00:34:02 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <UCAux.h>
@@ -592,7 +592,7 @@ char *LYstrncpy(char *target,
     if (n > 0) {
 	if (n > len)
 	    n = len;
-	(void) StrNCpy(target, source, n);
+	(void) memcpy(target, source, (size_t) n);
     } else {
 	n = 0;
     }
diff --git a/userdefs.h b/userdefs.h
index 70d094c0..cc6d995d 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.352 2020/03/01 13:47:14 tom Exp $
+ * $LynxId: userdefs.h,v 1.353 2020/09/05 14:11:12 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1449,7 +1449,7 @@
 #define LYNX_WWW_HOME "https://lynx.invisible-island.net/"
 #define LYNX_WWW_DIST "https://lynx.invisible-island.net/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Sun, 01 Mar 2020 08:47:14 -0500"
+#define LYNX_DATE "Sat, 05 Sep 2020 10:11:12 -0400"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */