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

6 files changed, 28 insertions, 8 deletions

diff --git a/CHANGES b/CHANGES
index 9bfaacbc..77acd06e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,14 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2002-01-06 (2.8.5dev.7)
+* ifdef'd new directory-sorting code to compile when configure --disable-dired
+  is specified -TD
+* add (commented-out) definitions for building with OpenSSL in makefile.msc,
+  tested with OpenSSL 0.9.6c and Visual C++ 5.0 -TD
+* correct call to HTGetLinkInfo() in follow_link_number() from 2.8.5dev.6
+  changes to fix uninitialized pointer (report by PW) -TD
+
 2002-01-01 (2.8.5dev.6)
 * add configure options to link with dbmalloc and dmalloc debugging libraries
   which offer different features than --enable-find-leaks -TD
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 9ddfd398..562ac645 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1631,6 +1631,7 @@ PRIVATE void do_readme ARGS2(HTStructured *, target, CONST char *, localname)
 
 #define NM_cmp(a,b) ((a) < (b) ? -1 : ((a) > (b) ? 1 : 0))
 
+#if defined(LONG_LIST) && defined(DIRED_SUPPORT)
 PRIVATE char *file_type ARGS1(char *, path)
 {
     char *type;
@@ -1641,13 +1642,14 @@ PRIVATE char *file_type ARGS1(char *, path)
 	type = "";
     return type;
 }
+#endif /* LONG_LIST && DIRED_SUPPORT */
 
 PRIVATE int dired_cmp ARGS2(void *, a, void *, b)
 {
     DIRED *p = (DIRED *)a;
     DIRED *q = (DIRED *)b;
     int code = p->sort_tags - q->sort_tags;
-#ifdef LONG_LIST
+#if defined(LONG_LIST) && defined(DIRED_SUPPORT)
     if (code == 0) {
 	switch (dir_list_order) {
 	case ORDER_BY_SIZE:
@@ -1673,7 +1675,7 @@ PRIVATE int dired_cmp ARGS2(void *, a, void *, b)
 	    break;
 	}
     }
-#endif /* LONG_LIST */
+#endif /* LONG_LIST && DIRED_SUPPORT */
     if (code == 0)
 	code = AS_cmp(p->file_name, q->file_name);
 #if 0
diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h
index 05aa61e8..1a6844b5 100644
--- a/WWW/Library/Implementation/www_tcp.h
+++ b/WWW/Library/Implementation/www_tcp.h
@@ -192,6 +192,10 @@ extern int ws_netread(int fd, char *buf, int len);
 #include <errno.h>
 #include <direct.h>
 
+#ifndef pid_t
+typedef int pid_t;
+#endif /* !pid_t */
+
 #ifdef USE_WINSOCK2_H
 #include <winsock2.h>		/* normally included in windows.h */
 
diff --git a/makefile.msc b/makefile.msc
index 8e4c0094..628e9e67 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -19,13 +19,18 @@ ETC_LIB = lib
 # Uncomment SOCK_DEFS if you wish to build with winsock2.
 #SOCK_DEFS = /D "USE_WINSOCK2_H" /D "_WIN32_WINNT=0x0400"
 
+# Uncomment these to build with OpenSSL, adjusting SSL_DIR as needed.
+#SSL_DIR = C:\OpenSSL
+#SSL_DEFS = /D "USE_SSL" -I "$(SSL_DIR)\include" -I"$(SSL_DIR)\include\openssl"
+#SSL_LIBS = "$(SSL_DIR)\lib\ssleay32.lib" "$(SSL_DIR)\lib\libeay32.lib"
+
 INCLUDES = \
  /I "." \
  /I "$(SRC_DIR)" \
  /I "$(SRC_DIR)\chrtrans" \
  /I "$(WWW_DIR)" \
  /I "$(ETC_LIB)"
-DEFS = $(CS_DEFS) $(SOCK_DEFS) \
+DEFS = $(CS_DEFS) $(SOCK_DEFS) $(SSL_DEFS) \
  /D "__WIN32__" \
  /D "_CONSOLE" \
  /D "_MBCS" \
@@ -75,7 +80,7 @@ CFLAGS   = /nologo /MT /W3 /GX /O2 /c
 LDFLAGS  = /nologo /subsystem:console /incremental:no /machine:I386
 #LDFLAGS  = /debug /nologo /subsystem:console /incremental:no /machine:I386
 LIBS     = kernel32.lib user32.lib wsock32.lib /NODEFAULTLIB:libc\
- $(ETC_LIB)\pdcurses.lib $(ETC_LIB)\zlib.lib dirent.obj
+ $(ETC_LIB)\pdcurses.lib $(ETC_LIB)\zlib.lib dirent.obj $(SSL_LIBS)
 
 COMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(DEFS)
 LINK    = $(LD) $(LDFLAGS) /map:lynx.map /out:$@
diff --git a/src/LYGetFile.c b/src/LYGetFile.c
index ce0bb79b..cb52fcb5 100644
--- a/src/LYGetFile.c
+++ b/src/LYGetFile.c
@@ -1250,7 +1250,7 @@ PUBLIC int follow_link_number ARGS4(
     */
    if (*num > 0) {
 	int info;
-	char *text;
+	char *text = NULL;
 
 	/*
 	 *  Get the lname, and hightext, directly from www
@@ -1268,7 +1268,8 @@ PUBLIC int follow_link_number ARGS4(
 			     &new_link,
 			     &text,
 			     &links[cur].lname);
-	LYSetHilite(cur, text);
+	if (text != NULL)
+	    LYSetHilite(cur, text);
 	if (info == WWW_INTERN_LINK_TYPE) {
 	    links[cur].type = WWW_INTERN_LINK_TYPE;
 	    return(DO_LINK_STUFF);
diff --git a/userdefs.h b/userdefs.h
index 3e716793..d1598d26 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1347,11 +1347,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.5dev.6"
+#define LYNX_VERSION "2.8.5dev.7"
 #define LYNX_WWW_HOME "http://lynx.browser.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Tue, 01 Jan 2002 17:30:08 -0800"
+#define LYNX_DATE "Sun, 06 Jan 2002 11:56:19 -0800"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */