about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES16
-rw-r--r--INSTALLATION5
-rw-r--r--PROBLEMS2
-rw-r--r--WWW/Library/Implementation/HTAccess.c6
-rw-r--r--WWW/Library/Implementation/HTAnchor.c2
-rw-r--r--WWW/Library/Implementation/HTFile.c8
-rw-r--r--WWW/Library/Implementation/HTVMSUtils.c2
-rw-r--r--WWW/Library/Implementation/HTWAIS.c2
-rw-r--r--WWW/Library/Implementation/www_tcp.h4
-rw-r--r--src/GridText.c6
-rw-r--r--src/LYCookie.c4
-rw-r--r--src/LYCurses.h14
-rw-r--r--src/LYJump.c2
-rw-r--r--src/LYMain.c2
-rw-r--r--src/LYNews.c2
-rw-r--r--src/LYStrings.c4
-rw-r--r--src/LYUtils.c8
-rw-r--r--userdefs.h4
18 files changed, 52 insertions, 41 deletions
diff --git a/CHANGES b/CHANGES
index 61dae1c6..aaf23607 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,22 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2001-06-10 (2.8.4pre.2)
+* corrected order of parameters of is_prefix() function in the
+  scan_cookie_sublist() function, broken in dev.21 changes (report by Ken Scott
+  <admin@shellworld.net>) -TD
+* add a fallback definition for SA_LEN(), to build with glibc 2.2 (report by
+  Mark Sutton <mes@lazo.ca>, patch by Arkadiusz Miskiewicz at
+  http://cvs.pld.org.pl/SOURCES/lynx-SA_LEN.patch?rev=1.1)
+* modify ifdef in HTCheckForInterrupt() to build with DJGPP -DK
+* remove include for <pdcurses.h>, use <curses.h> which is the default for
+  PDCurses - DK
+* reviewed/reverted some changes from dev.20 which changed explicit "r", "w",
+  and "a+" fopen modes to TXT_R, TXT_W and TXT_A, where they relied on the
+  default mode set via SetDefaultMode().  With DJGPP, files containing special
+  graphics such as README's might not otherwise display, for example (report by
+  DK) -TD
+
 2001-06-03 (2.8.4pre.1)
 This version has been test-built on Linux (BSD curses, ncurses,
 slang), Tru64 5.1 (cc, curses/ncurses/slang), OpenVMS, OS/2 EMX, win32
diff --git a/INSTALLATION b/INSTALLATION
index a9bd1bcb..9a7435b0 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -736,11 +736,10 @@ Visual C++:
 	zlib.lib
 
     from the zlib build-tree, and
-	pdcurses.h
+	curses.h
 	pdcurses.lib
 
-    from the PDCurses build-tree.  Note that "pdcurses.h" is renamed from
-    PDCurses' "curses.h", to make it distinct from other versions of curses.
+    from the PDCurses build-tree.
 
     Then
 	make-msc
diff --git a/PROBLEMS b/PROBLEMS
index 17ea83eb..8e0cf214 100644
--- a/PROBLEMS
+++ b/PROBLEMS
@@ -32,7 +32,7 @@ they will be outlined in this file.
 ---------
 
     If you run into a problem compiling GridText.c, try omitting -O from the
-    compiler flags; these are very big files and may not compile successfully
+    compiler flags; it is a very big file and may not compile successfully
     if you include optimization.
 
 ---------
diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c
index e1bba633..1cc2b50e 100644
--- a/WWW/Library/Implementation/HTAccess.c
+++ b/WWW/Library/Implementation/HTAccess.c
@@ -1360,7 +1360,7 @@ PUBLIC HTParentAnchor * HTHomeAnchor NOARGS
 	/*
 	**  Someone telnets in, they get a special home.
 	*/
-	FILE * fp = fopen(REMOTE_POINTER, TXT_R);
+	FILE * fp = fopen(REMOTE_POINTER, "r");
 	char * status;
 	if (fp) {
 	    my_home_document = typecallocn(char, MAX_FILE_NAME);
@@ -1382,12 +1382,12 @@ PUBLIC HTParentAnchor * HTHomeAnchor NOARGS
 	CONST char * home =  (CONST char*)getenv("HOME");
 	if (home != null) {
 	    HTSprintf0(&my_home_document, "%s/%s", home, PERSONAL_DEFAULT);
-	    fp = fopen(my_home_document, TXT_R);
+	    fp = fopen(my_home_document, "r");
 	}
 
 	if (!fp) {
 	    StrAllocCopy(my_home_document, LOCAL_DEFAULT_FILE);
-	    fp = fopen(my_home_document, TXT_R);
+	    fp = fopen(my_home_document, "r");
 	}
 	if (fp) {
 	    fclose(fp);
diff --git a/WWW/Library/Implementation/HTAnchor.c b/WWW/Library/Implementation/HTAnchor.c
index 631c665f..d336cb7b 100644
--- a/WWW/Library/Implementation/HTAnchor.c
+++ b/WWW/Library/Implementation/HTAnchor.c
@@ -749,7 +749,7 @@ PUBLIC BOOL HTAnchor_delete ARGS1(
 #endif
     if (me->FileCache) {
 	FILE *fd;
-	if ((fd = fopen(me->FileCache, TXT_R)) != NULL) {
+	if ((fd = fopen(me->FileCache, "r")) != NULL) {
 	    fclose(fd);
 	    remove(me->FileCache);
 	}
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index b302120c..829214e8 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1604,7 +1604,7 @@ PRIVATE void do_readme ARGS2(HTStructured *, target, CONST char *, localname)
 
     HTSprintf0(&readme_file_name, "%s/%s", localname, HT_DIR_README_FILE);
 
-    fp = fopen(readme_file_name,  TXT_R);
+    fp = fopen(readme_file_name, "r");
 
     if (fp) {
 	HTStructuredClass targetClass;
@@ -2184,7 +2184,7 @@ PUBLIC int HTLoadFile ARGS4(
 	FILE * fp;
 	char * vmsname = strchr(filename + 1, '/') ?
 		    HTVMS_name(nodename, filename) : filename + 1;
-	fp = fopen(vmsname, TXT_R, "shr=put", "shr=upd");
+	fp = fopen(vmsname, "r", "shr=put", "shr=upd");
 
 	/*
 	**  If the file wasn't VMS syntax, then perhaps it is Ultrix.
@@ -2193,7 +2193,7 @@ PUBLIC int HTLoadFile ARGS4(
 	    char * ultrixname = 0;
 	    CTRACE((tfp, "HTLoadFile: Can't open as %s\n", vmsname));
 	    HTSprintf0(&ultrixname, "%s::\"%s\"", nodename, filename);
-	    fp = fopen(ultrixname, TXT_R, "shr=put", "shr=upd");
+	    fp = fopen(ultrixname, "r", "shr=put", "shr=upd");
 	    if (!fp) {
 		CTRACE((tfp, "HTLoadFile: Can't open as %s\n",
 			    ultrixname));
@@ -2563,7 +2563,7 @@ PUBLIC int HTLoadFile ARGS4(
 #endif /* HAVE_READDIR */
 	{
 	    int bin = HTCompressFileType(localname, ".", &dot) != cftNone;
-	    FILE * fp = fopen(localname, (bin ? BIN_R : TXT_R));
+	    FILE * fp = fopen(localname, (bin ? BIN_R : "r"));
 
 	    CTRACE((tfp, "HTLoadFile: Opening `%s' gives %p\n",
 				 localname, (void*)fp));
diff --git a/WWW/Library/Implementation/HTVMSUtils.c b/WWW/Library/Implementation/HTVMSUtils.c
index d4b37a76..5d372035 100644
--- a/WWW/Library/Implementation/HTVMSUtils.c
+++ b/WWW/Library/Implementation/HTVMSUtils.c
@@ -846,7 +846,7 @@ PUBLIC int HTVMSBrowseDir ARGS4(
 	if (header[strlen(header)-1] != '/')
 	    StrAllocCat(header, "/");
 	StrAllocCat(header, HT_DIR_README_FILE);
-	if ((fp = fopen(header,	 TXT_R)) != NULL) {
+	if ((fp = fopen(header,	 "r")) != NULL) {
 	    START(HTML_PRE);
 	    for(;;) {
 		char c = fgetc(fp);
diff --git a/WWW/Library/Implementation/HTWAIS.c b/WWW/Library/Implementation/HTWAIS.c
index 30b06ea5..86e8701d 100644
--- a/WWW/Library/Implementation/HTWAIS.c
+++ b/WWW/Library/Implementation/HTWAIS.c
@@ -786,7 +786,7 @@ PUBLIC int HTLoadWAIS ARGS4(
 		CACHE_FILE_PREFIX,
 		server_name, service, www_database);
 
-	fp = fopen(filename, TXT_R);	/* Have we found this already? */
+	fp = fopen(filename, "r");	/* Have we found this already? */
 	CTRACE((tfp, "HTWAIS: Description of server %s %s.\n",
 		    filename,
 		    fp ? "exists already" : "does NOT exist!"));
diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h
index 9de8ea51..f3f5ac65 100644
--- a/WWW/Library/Implementation/www_tcp.h
+++ b/WWW/Library/Implementation/www_tcp.h
@@ -830,6 +830,10 @@ typedef struct sockaddr_in SockA;  /* See netinet/in.h */
 #ifdef SIN6_LEN
 #define SOCKADDR_LEN(soc_address) ((struct sockaddr *)&soc_address)->sa_len
 #else
+#ifndef SA_LEN
+#define SA_LEN(x) (((x)->sa_family == AF_INET6)?sizeof(struct sockaddr_in6): \
+       (((x)->sa_family == AF_INET)?sizeof(struct sockaddr_in):sizeof(struct sockaddr)))
+#endif
 #define SOCKADDR_LEN(soc_address) SA_LEN((struct sockaddr *)&soc_address)
 #endif /* SIN6_LEN */
 #else
diff --git a/src/GridText.c b/src/GridText.c
index af7d2422..4562103c 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -8014,7 +8014,7 @@ PUBLIC BOOLEAN HTreparse_document NOARGS
 	}
 	CTRACE((tfp, "  Content type is \"%s\"\n", format->name));
 
-	fp = fopen(HTMainAnchor->source_cache_file, TXT_R);
+	fp = fopen(HTMainAnchor->source_cache_file, "r");
 	if (!fp) {
 	    CTRACE((tfp, "  Cannot read file %s\n", HTMainAnchor->source_cache_file));
 	    LYRemoveTemp(HTMainAnchor->source_cache_file);
@@ -12035,7 +12035,7 @@ PUBLIC int HText_ExtEditForm ARGS1(
 	    return 0;
 	}
 
-	fp = fopen (ed_temp, TXT_R);
+	fp = fopen (ed_temp, "r");
 	size = fread (ebuf, 1, size, fp);
 	LYCloseInput (fp);
 	ebuf[size] = '\0';	/* Terminate! - kw */
@@ -12425,7 +12425,7 @@ PUBLIC int HText_InsertFile ARGS1(
 	 */
 	LYGetFileInfo(fn, 0, 0, 0, 0, 0, &file_cs);
 
-	fp   = fopen (fn, TXT_R);
+	fp   = fopen (fn, "r");
 	if (!fp) {
 	    free(fbuf);
 	    free(fn);
diff --git a/src/LYCookie.c b/src/LYCookie.c
index 163b84c4..b9a77f3d 100644
--- a/src/LYCookie.c
+++ b/src/LYCookie.c
@@ -678,7 +678,7 @@ PRIVATE char * scan_cookie_sublist ARGS6(
 			host_matches(hostname, co->domain),
 			path, co->path,
 			(co->pathlen > 0)
-			    ? !is_prefix(path, co->path)
+			    ? !is_prefix(co->path, path)
 			    : 0,
 			(co->flags & COOKIE_FLAG_SECURE)
 			    ? " secure"
@@ -700,7 +700,7 @@ PRIVATE char * scan_cookie_sublist ARGS6(
 	 */
 	if (((co != NULL) &&
 	     host_matches(hostname, co->domain)) &&
-	    (co->pathlen == 0 || is_prefix(path, co->path))) {
+	    (co->pathlen == 0 || is_prefix(co->path, path))) {
 	    /*
 	     *	Skip if the secure flag is set and we don't have
 	     *	a secure connection.  HTTP.c presently treats only
diff --git a/src/LYCurses.h b/src/LYCurses.h
index ff38908f..5a25d102 100644
--- a/src/LYCurses.h
+++ b/src/LYCurses.h
@@ -183,14 +183,10 @@ typedef struct {
 #    ifdef HAVE_JCURSES_H
 #     include <jcurses.h>	/* sony_news */
 #    else
-#     ifdef PDCURSES
-#      include <pdcurses.h>	/* for PDCurses */
+#     ifdef HAVE_XCURSES
+#      include <xcurses.h>	/* PDCurses' UNIX port */
 #     else
-#      ifdef HAVE_XCURSES
-#       include <xcurses.h>	/* PDCurses' UNIX port */
-#      else
-#       include <curses.h>	/* default */
-#      endif
+#      include <curses.h>	/* default */
 #     endif
 #    endif
 #   endif
@@ -218,12 +214,8 @@ typedef struct {
 #else
 # if defined(VMS) && defined(__GNUC__)
 #  include <LYGCurses.h>
-# else
-#  ifdef PDCURSES	/* 1999/07/15 (Thu) 08:27:48 */
-#   include <pdcurses.h> /* for PDCurses */
 #  else
 #   include <curses.h>  /* everything else */
-#  endif /* not PDCURSES */
 # endif /* VMS && __GNUC__ */
 #endif /* HAVE_CONFIG_H */
 
diff --git a/src/LYJump.c b/src/LYJump.c
index d28468dc..478ddfc9 100644
--- a/src/LYJump.c
+++ b/src/LYJump.c
@@ -387,7 +387,7 @@ PRIVATE unsigned LYRead_Jumpfile ARGS1(struct JumpTable *,jtp)
     if (st.st_fab_rfm != (char)FAB$C_STMLF) {
 	/** It's a record-oriented file. **/
 	IsStream_LF = FALSE;
-	if ((fp = fopen(jtp->file, TXT_R, "mbc=32")) == NULL) {
+	if ((fp = fopen(jtp->file, "r", "mbc=32")) == NULL) {
 	    HTAlert(CANNOT_OPEN_JUMP_FILE);
 	    FREE(mp);
 	    return 0;
diff --git a/src/LYMain.c b/src/LYMain.c
index e93f1894..177384c6 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -2205,7 +2205,7 @@ PUBLIC void reload_read_cfg NOARGS
 	/*
 	 *  Process the temporary RC file.
 	 */
-	rcfp = fopen(tempfile, TXT_R);
+	rcfp = fopen(tempfile, "r");
 	read_rc(rcfp);
 	LYRemoveTemp(tempfile);
 	FREE(tempfile);		/* done with it - kw */
diff --git a/src/LYNews.c b/src/LYNews.c
index 0755d17f..23906a44 100644
--- a/src/LYNews.c
+++ b/src/LYNews.c
@@ -36,7 +36,7 @@ PRIVATE BOOLEAN message_has_content ARGS2(
 
     *nonspaces = FALSE;
 
-    if (!filename || (fp = fopen(filename, TXT_R)) == NULL) {
+    if (!filename || (fp = fopen(filename, "r")) == NULL) {
 	CTRACE((tfp, "Failed to open file %s for reading!\n",
 	       NONNULL(filename)));
 	return FALSE;
diff --git a/src/LYStrings.c b/src/LYStrings.c
index ac164295..fa9927a3 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1245,7 +1245,7 @@ PRIVATE int read_keymap_file NOARGS
 
     LYAddPathToHome(file, sizeof(file), FNAME_LYNX_KEYMAPS);
 
-    if ((fp = fopen (file, TXT_R)) == 0)
+    if ((fp = fopen (file, "r")) == 0)
 	return 0;
 
     linenum = 0;
@@ -1593,7 +1593,7 @@ re_read:
 	    if (new_fd >= 0) {
 		FILE *frp;
 		close(new_fd);
-		frp = freopen(term_name, TXT_R, stdin);
+		frp = freopen(term_name, "r", stdin);
 		CTRACE((tfp,
 		"nozap: freopen(%s,\"r\",stdin) returned %p, stdin is now %p with fd %d.\n",
 			term_name, frp, stdin, fileno(stdin)));
diff --git a/src/LYUtils.c b/src/LYUtils.c
index b6d01ab8..f3bcc1e0 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -2262,7 +2262,7 @@ PUBLIC int HTCheckForInterrupt NOARGS
     int c;
     int cmd;
 #ifndef VMS /* UNIX stuff: */
-#if !defined(USE_SLANG) && defined(UNIX)
+#if !defined(USE_SLANG) && (defined(UNIX) || defined(__DJGPP__))
     struct timeval socket_timeout;
     int ret = 0;
     fd_set readfds;
@@ -3197,7 +3197,7 @@ PUBLIC BOOLEAN LYCloseOutput ARGS1(
 PUBLIC BOOLEAN LYCanWriteFile ARGS1(
 	CONST char*,	filename)
 {
-    if (LYCloseOutput(fopen(filename, TXT_W))) {
+    if (LYCloseOutput(fopen(filename, "w"))) {
 	remove(filename);
 	return TRUE;
     } else {
@@ -3214,7 +3214,7 @@ PUBLIC BOOLEAN LYCanReadFile ARGS1(
 {
     FILE *fp;
 
-    if ((fp = fopen(filename, TXT_R)) != 0) {
+    if ((fp = fopen(filename, "r")) != 0) {
 	return LYCloseInput(fp);
     }
     return FALSE;
@@ -3259,7 +3259,7 @@ PUBLIC BOOLEAN inlocaldomain NOARGS
     if ((cp = ttyname(0)))
 	mytty = strrchr(cp, '/');
 
-    if (mytty && (fp = fopen(UTMP_FILE, TXT_R)) != NULL) {
+    if (mytty && (fp = fopen(UTMP_FILE, "r")) != NULL) {
 	mytty++;
 	do {
 	    n = fread((char *) &me, sizeof(struct utmp), 1, fp);
diff --git a/userdefs.h b/userdefs.h
index 49ed55b9..417e2241 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1351,11 +1351,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.4pre.1"
+#define LYNX_VERSION "2.8.4pre.2"
 #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 "Sun, 03 Jun 2001 13:19:24 -0700"
+#define LYNX_DATE "Sun, 10 Jun 2001 18:04:20 -0700"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-01-19 06:00:09 +0000