snapshot of project "lynx", label v2-8-9dev_16y

10 files changed, 83 insertions, 45 deletions

diff --git a/CHANGES b/CHANGES
index 073337f1..357a08cd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,18 @@
--- $LynxId: CHANGES,v 1.958 2018/03/20 23:40:45 tom Exp $
+-- $LynxId: CHANGES,v 1.963 2018/03/21 14:38:06 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2018-03-20 (2.8.9dev.17)
+2018-03-21 (2.8.9dev.17)
+* modify samples/oldlynx.bat to check if Lynx recognizes the -lss option -TD
+* modify samples/*lynx.bat to check for environment variables that Lynx would
+  test for temp-directory, and only if those are absent will the scripts
+  attempt to create a temp-directory -TD
+* modify samples/*lynx.bat to set PATH for executing utility programs -TD
+* remove unused critSec_DNS -TD
+* use EnterCriticalSection in ws_netread rather than InitializeCriticalSection
+  since critSec_READ was initialized in LYMain.c (report by GV) -TD
+* use freeaddrinfo() in one case where free() was used (report by GV) -TD
 * implement "+" item type for gopher protocol (report by James Tomasino) -TD
 * add checks in options-menu in case no color-styles have been defined -TD
 * add Visual Studio project files for 2010, 2012 -TD
@@ -29,7 +38,8 @@ Changes since Lynx 2.8 release
   take into account server headers which extend past the first block read
   (report/test-case by Dick Wesseling) -TD
 * permanently enable EXP_HTTP_HEADERS feature -TD
-* modify color-style hashing to check for collisions -TD
+* modify color-style hashing to check for collisions (reported by TG, Russell
+  Bell) -TD
 * add PREFERRED_CONTENT_TYPE defaulting to text/plain and options-menu to
   replace an assumption in HTMIMEConvert that everything is text/html.
   Since most servers provide a valid Content-Type for HTML, and are more likely
diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss
index 6e0a3db1..32fbda87 100644
--- a/PACKAGE/lynx.iss
+++ b/PACKAGE/lynx.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx.iss,v 1.28 2018/03/18 17:48:41 tom Exp $

+; $LynxId: lynx.iss,v 1.29 2018/03/21 14:56:20 tom Exp $

 ; vile:ts=4 sw=4 notabinsert fk=8bit

 ;

 ; This is the BASE script for different flavors of the installer for Lynx.

@@ -128,7 +128,6 @@ Name: "{app}\doc\test"
 Name: "{app}\help"

 Name: "{app}\help\keystrokes"

 Name: "{app}\icon"

-Name: "{app}\tmp"

 

 [Files]

 #emit 'Source: "' + BinsSrcDir + '\' + SourceExeName + '"; DestDir: "{app}"; DestName: ' + MyAppExeName + '; AfterInstall: myPostExecutable; Flags: ignoreversion'

diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index 3cc43bd6..abe06777 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.139 2018/03/11 22:30:30 tom Exp $
+ * $LynxId: HTTCP.c,v 1.140 2018/03/21 00:29:50 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -1589,7 +1589,7 @@ static void really_getaddrinfo(const char *host,
 	    statuses->h_length = (int) (((LYNX_ADDRINFO *) (*result))->ai_addrlen);
 	}
     }
-    free(res);
+    freeaddrinfo(res);
 }
 #endif /* NSL_FORK */
 
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 1d8dd2ec..a4037f2a 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.168 2018/03/18 18:47:59 tom Exp $
+ * $LynxId: HTTP.c,v 1.169 2018/03/21 00:45:27 tom Exp $
  *
  * HyperText Tranfer Protocol	- Client implementation		HTTP.c
  * ==========================
@@ -431,7 +431,7 @@ int ws_netread(int fd, char *buf, int len)
 #define TICK	5
 #define STACK_SIZE	0x2000uL
 
-    InitializeCriticalSection(&critSec_READ);
+    EnterCriticalSection(&critSec_READ);
 
     para.fd = fd;
     para.buf = buf;
diff --git a/samples/lynx.bat b/samples/lynx.bat
index 03f4a5db..417cd748 100644
--- a/samples/lynx.bat
+++ b/samples/lynx.bat
@@ -1,18 +1,31 @@
 @echo off

-@rem $LynxId: lynx.bat,v 1.6 2018/03/18 17:20:13 tom Exp $

-@rem Claudio Santambrogio

-@rem improved by loto1992@inbox.ru

+@rem $LynxId: lynx.bat,v 1.9 2018/03/21 16:10:36 tom Exp $

+@rem demonstrate lynx with color-style

 setlocal

 

-set TERM=vt100

-set HOME=%~dp0

+	set TERM=vt100

+rem Set HOME to make URLs in config work, though this prevents -trace

+	set HOME=%~dp0

+	set PATH=%HOME%;%PATH%

 

-rem  normally set, but just in case..

-if "x%TEMP%"=="x" set TEMP=%HOME%tmp

-mkdir "%TEMP%"

+rem We need a temporary directory

+	if not "x%LYNX_TEMP_SPACE%"=="x" goto :do_cfg

+	if "x%TEMP%"=="x"                set LYNX_TEMP_SPACE=%TEMP%

+	if not "x%TEMP%"=="x"            goto :do_cfg

+	if "x%TMP%"=="x"                 set LYNX_TEMP_SPACE=%TMP%

+	if not "x%TMP%"=="x"             goto :do_cfg

 

-set LYNX_CFG=%HOME%lynx-demo.cfg

-set LYNX_LSS=%HOME%lynx.lss

+	set LYNX_TEMP_SPACE=%HOMEDRIVE%%HOMEPATH%tmp

+	mkdir "%LYNX_TEMP_SPACE%"

+	if not errorlevel 0              goto :do_cfg

 

-"%HOME%lynx.exe" %1 %2 %3 %4 %5

+	echo Cannot make temp-directory

+	goto :eof

+

+:do_cfg

+	set LYNX_CFG_PATH=%HOME%

+	set LYNX_CFG=%HOME%lynx-demo.cfg

+	set LYNX_LSS=%HOME%lynx.lss

+

+	lynx.exe %1 %2 %3 %4 %5 %6 %7 %8 %9

 endlocal

diff --git a/samples/oldlynx.bat b/samples/oldlynx.bat
index 20362f63..976b3a85 100644
--- a/samples/oldlynx.bat
+++ b/samples/oldlynx.bat
@@ -1,25 +1,44 @@
-@ECHO OFF

-@rem $LynxId: oldlynx.bat,v 1.5 2018/03/18 17:20:13 tom Exp $

-@rem demonstrate lynx without color-style -TD

+@ECHO off

+@rem $LynxId: oldlynx.bat,v 1.8 2018/03/21 16:08:49 tom Exp $

+@rem demonstrate lynx without color-style

 setlocal

 

-set TERM=vt100

-set HOME=%~dp0

+	set TERM=vt100

+rem Set HOME to make URLs in config work, though this prevents -trace

+	set HOME=%~dp0

+	set PATH=%HOME%;%PATH%

 

-rem  normally set, but just in case..

-if "x%TEMP%"=="x" set TEMP=%HOME%tmp

-mkdir "%TEMP%"

+rem We need a temporary directory

+	if not "x%LYNX_TEMP_SPACE%"=="x" goto :do_cfg

+	if "x%TEMP%"=="x"                set LYNX_TEMP_SPACE=%TEMP%

+	if not "x%TEMP%"=="x"            goto :do_cfg

+	if "x%TMP%"=="x"                 set LYNX_TEMP_SPACE=%TMP%

+	if not "x%TMP%"=="x"             goto :do_cfg

 

-set LYNX_CFG=%HOME%oldlynx.cfg

-set LYNX_LSS=

+	set LYNX_TEMP_SPACE=%HOMEDRIVE%%HOMEPATH%tmp

+	mkdir "%LYNX_TEMP_SPACE%"

+	if not errorlevel 0              goto :do_cfg

 

-if exist "%LYNX_CFG%" goto done

+	echo Cannot make temp-directory

+	goto :eof

 

-echo "DEFAULT_COLORS:off"    >>"%LYNX_CFG%"

-echo "include:lynx-demo.cfg" >>"%LYNX_CFG%"

-echo "COLOR_STYLE:"          >>"%LYNX_CFG%"

-echo "NESTED_TABLES:off"     >>"%LYNX_CFG%"

+:do_cfg

+	lynx.exe -help 2>&1 | find "-lss" >NUL

+	if not errorlevel 1 goto :do_cfg2

+	echo This copy of Lynx was not compiled with color-style.

+	goto :eof

 

-:done

-"%HOME%lynx.exe" -lss="" %1 %2 %3 %4 %5 %6 %7 %8 %9

+:do_cfg2

+	set LYNX_CFG_PATH=%HOME%

+	set LYNX_CFG=%LYNX_TEMP_SPACE%\oldlynx.cfg

+	set LYNX_LSS=

+

+	echo DEFAULT_COLORS:off    >>"%LYNX_CFG%"

+	echo include:lynx-demo.cfg >>"%LYNX_CFG%"

+	echo COLOR_STYLE:          >>"%LYNX_CFG%"

+	echo NESTED_TABLES:off     >>"%LYNX_CFG%"

+

+:do_exe

+	lynx.exe -lss="" %1 %2 %3 %4 %5 %6 %7 %8 %9

+	erase %LYNX_CFG%

 endlocal

diff --git a/scripts/install-cfg.sh b/scripts/install-cfg.sh
index bd8129f6..a4228cd7 100755
--- a/scripts/install-cfg.sh
+++ b/scripts/install-cfg.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $LynxId: install-cfg.sh,v 1.3 2008/09/10 13:15:35 tom Exp $
+# $LynxId: install-cfg.sh,v 1.4 2018/03/21 16:20:42 tom Exp $
 # install lynx.cfg, ensuring the old config-file is saved to a unique file,
 # and prepending customizations to the newly-installed file.
 #
@@ -25,6 +25,7 @@ if test -f "$DST" ; then
 	rm -f $OLD $NEW $TST $TMP
 
 	# avoid propagating obsolete URLs into new installs
+	echo lynx.isc.org >$TMP
 	echo lynx.browser.org >$TMP
 	echo www.trill-home.com >>$TMP
 	echo www.cc.ukans.edu >>$TMP
diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h
index 02e73bff..f237b2bd 100644
--- a/src/LYGlobalDefs.h
+++ b/src/LYGlobalDefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYGlobalDefs.h,v 1.144 2018/03/11 22:49:43 tom Exp $
+ * $LynxId: LYGlobalDefs.h,v 1.145 2018/03/21 00:50:51 tom Exp $
  *
  * global variable definitions
  */
@@ -667,7 +667,6 @@ extern "C" {
     extern BOOLEAN system_is_NT;
     extern char windows_drive[4];
     extern int lynx_timeout;
-    extern CRITICAL_SECTION critSec_DNS;
     extern CRITICAL_SECTION critSec_READ;
 #endif				/* _WINDOWS */
 
diff --git a/src/LYMain.c b/src/LYMain.c
index 18c8898f..f3a00035 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMain.c,v 1.274 2018/03/18 19:17:00 tom Exp $
+ * $LynxId: LYMain.c,v 1.275 2018/03/21 00:50:51 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -341,7 +341,6 @@ char windows_drive[4];		/* 1998/01/13 (Tue) 21:13:24 */
 #ifdef _WINDOWS
 #define	TIMEOUT	180		/* 1998/03/30 (Mon) 14:50:44 */
 int lynx_timeout = TIMEOUT;
-CRITICAL_SECTION critSec_DNS;	/* 1998/09/03 (Thu) 22:01:56 */
 CRITICAL_SECTION critSec_READ;	/* 1998/09/03 (Thu) 22:01:56 */
 #endif /* _WINDOWS */
 
@@ -1083,7 +1082,6 @@ int main(int argc,
     }
 
     /* 1998/09/03 (Thu) 22:02:32 */
-    InitializeCriticalSection(&critSec_DNS);
     InitializeCriticalSection(&critSec_READ);
 
 #endif /* _WINDOWS */
diff --git a/src/LYexit.c b/src/LYexit.c
index 425c85c0..b266117f 100644
--- a/src/LYexit.c
+++ b/src/LYexit.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYexit.c,v 1.36 2013/10/24 09:16:37 tom Exp $
+ * $LynxId: LYexit.c,v 1.37 2018/03/21 00:50:51 tom Exp $
  *
  *	Copyright (c) 1994, University of Kansas, All Rights Reserved
  *	(most of this file was rewritten in 1996 and 2004).
@@ -86,7 +86,6 @@ void LYexit(int status)
 {
 #ifndef VMS			/*  On VMS, the VMSexit() handler does these. - FM */
 #ifdef _WINDOWS
-    DeleteCriticalSection(&critSec_DNS);
     DeleteCriticalSection(&critSec_READ);
 
     WSACleanup();