about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES6
-rw-r--r--WWW/Library/Implementation/HTAAProt.c12
-rw-r--r--WWW/Library/Implementation/HTFile.c7
-rw-r--r--WWW/Library/Implementation/SGML.c2
-rw-r--r--config.hin2
-rw-r--r--src/LYCurses.c13
-rw-r--r--src/LYMain.c4
-rw-r--r--src/LYStrings.c39
-rw-r--r--src/makefile.dsl23
-rw-r--r--src/makefile.wsl4
-rw-r--r--userdefs.h2
11 files changed, 73 insertions, 41 deletions
diff --git a/CHANGES b/CHANGES
index 776044ec..274785e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
 Changes since Lynx 2.8 release
 ================================================================================
 
+1998-05-14 (2.8.1dev.11)
+* fixes for function-keys with slang configuration on DOS (patch by DK).
+* correct missing '&' in command-line options entry for syslog (reported by
+  HN) - TD
+* correct initial value for NoColorvideo with PDCurses, from my error in
+  1998-05-10 integration (reported by DK) - TD
 1998-05-10 (2.8.1dev.10)
 * eliminate assignment to stderr for trace-file by making tfp a function. - TD
 * added John Davis' keymaps/keysym patch (it really should be integrated with
diff --git a/WWW/Library/Implementation/HTAAProt.c b/WWW/Library/Implementation/HTAAProt.c
index e1d6f61f..12c6361a 100644
--- a/WWW/Library/Implementation/HTAAProt.c
+++ b/WWW/Library/Implementation/HTAAProt.c
@@ -129,7 +129,7 @@ PUBLIC int HTAA_getUid NOARGS
 			    "HTAA_getUid: getpwuid",
 			    current_prot->uid_name,
 			    pw->pw_name, pw->pw_passwd,
-			    pw->pw_uid, pw->pw_gid);
+			    (int) pw->pw_uid, (int) pw->pw_gid);
 		return pw->pw_uid;	
 	    }
 	}
@@ -139,7 +139,7 @@ PUBLIC int HTAA_getUid NOARGS
 			    "HTAA_getUid: getpwnam",
 			    current_prot->uid_name, "returned",
 			    pw->pw_name, pw->pw_passwd,
-			    pw->pw_uid, pw->pw_gid);
+			    (int) pw->pw_uid, (int) pw->pw_gid);
 		return pw->pw_uid;
 	    }
 	}
@@ -149,7 +149,7 @@ PUBLIC int HTAA_getUid NOARGS
     */
     if (NULL != (pw = getpwnam("nobody"))) {
 	CTRACE(tfp, "HTAA_getUid: Uid for `nobody' is %d\n",
-		    pw->pw_uid);
+		    (int) pw->pw_uid);
 	return pw->pw_uid;
     }
     /*
@@ -179,7 +179,7 @@ PUBLIC int HTAA_getGid NOARGS
 		CTRACE(tfp, "%s(%s) returned (%s:%s:%d:...)\n",
 			    "HTAA_getGid: getgrgid",
 			    current_prot->gid_name,
-			    gr->gr_name, gr->gr_passwd, gr->gr_gid);
+			    gr->gr_name, (int) gr->gr_passwd, (int) gr->gr_gid);
 #endif
 		return gr->gr_gid;
 	    }
@@ -190,7 +190,7 @@ PUBLIC int HTAA_getGid NOARGS
 		CTRACE(tfp, "%s(\"%s\") returned (%s:%s:%d:...)\n",
 			    "HTAA_getGid: getgrnam",
 			    current_prot->gid_name,
-			    gr->gr_name, gr->gr_passwd, gr->gr_gid);
+			    gr->gr_name, (int) gr->gr_passwd, (int) gr->gr_gid);
 #endif
 		return gr->gr_gid;
 	    }
@@ -201,7 +201,7 @@ PUBLIC int HTAA_getGid NOARGS
     */
     if (NULL != (gr = getgrnam("nogroup"))) {
 	CTRACE(tfp, "HTAA_getGid: Gid for `nogroup' is %d\n",
-		    gr->gr_gid);
+		    (int) gr->gr_gid);
 	return gr->gr_gid;
     }
     /*
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index c809ff63..e4548616 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1107,8 +1107,9 @@ PUBLIC BOOL HTEditable ARGS1(
 	fprintf(tfp,
 	    "File mode is 0%o, uid=%d, gid=%d. My uid=%d, %d groups (",
 	    (unsigned int) fileStatus.st_mode, fileStatus.st_uid,
-	    fileStatus.st_gid,
-	    myUid, ngroups);
+	    (int) fileStatus.st_gid,
+	    (int) myUid,
+	    (int) ngroups);
 	for (i2 = 0; i2 < ngroups; i2++)
 	    fprintf(tfp, " %d", groups[i2]);
 	fprintf(tfp, ")\n");
@@ -1753,7 +1754,7 @@ PUBLIC int HTLoadFile ARGS4(
 	if ((strlen(localname) > strlen(MULTI_SUFFIX)) &&
 	    (0 == strcmp(localname + strlen(localname) - strlen(MULTI_SUFFIX),
 			 MULTI_SUFFIX))) {
-	    DIR *dp;
+	    DIR *dp = 0;
 	    BOOL forget_multi = NO;
 
 	    STRUCT_DIRENT * dirbuf;
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 66c515f3..32243519 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -1106,7 +1106,7 @@ PRIVATE void SGML_character ARGS2(
     CONST char * EntityName;
     char * p;
     BOOLEAN chk;	/* Helps (?) walk through all the else ifs... */
-    UCode_t clong, uck; /* Enough bits for UCS4 ... */
+    UCode_t clong, uck = 0; /* Enough bits for UCS4 ... */
     char c;
     char saved_char_in = '\0';
 
diff --git a/config.hin b/config.hin
index bbadc639..3acd90c8 100644
--- a/config.hin
+++ b/config.hin
@@ -124,7 +124,7 @@
 /* FIXME:SNAKE */
 /* FIXME:SOCKS */
 /* FIXME:SVR4_BSDSELECT */
-/* FIXME:SYSLOG_REQUESTED_URLS */
+#define SYSLOG_REQUESTED_URLS
 
 #ifndef HAVE_LSTAT
 #define lstat stat
diff --git a/src/LYCurses.c b/src/LYCurses.c
index 3bc76490..42c2fc5b 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -466,17 +466,14 @@ PRIVATE void LYsetWAttr ARGS1(WINDOW *, win)
 	int code = 0;
 	int attr = A_NORMAL;
 	int offs = 1;
-
-#ifdef UNIX
 	static int NoColorVideo = -1;
 
+#ifdef UNIX
 	if (NoColorVideo < 0) {
 		NoColorVideo = tigetnum("ncv");
 	}
 	if (NoColorVideo < 0)
 		NoColorVideo = 0;
-#else /* PDCurses */
-	static int NoColorVideo = 0;
 #endif /* UNIX */
 
 	if (Current_Attr & A_BOLD)
@@ -650,9 +647,9 @@ PUBLIC void start_curses NOARGS
 
     if (slinit == 0) {
 	SLtt_get_terminfo();
-#ifdef __DJGPP__
+#if defined(__DJGPP__) && !defined(DJGPP_KEYHANDLER) 
 	SLkp_init ();
-#endif /* __DJGPP__ */
+#endif /* __DJGPP__ && !DJGPP_KEYHANDLER */ 
 
 #ifdef UNIX
 #if SLANG_VERSION >= 9935
@@ -724,9 +721,7 @@ PUBLIC void start_curses NOARGS
     scrollok(0,0);
     SLsmg_Backspace_Moves = 1;
 #ifndef VMS
-#if defined(_WINDOWS) || defined(__DJGPP__)
-    /* SLgetkey_map_to_ansi (1); -- FIXME: is this needed? */
-#else
+#if !defined(_WINDOWS) && !defined(__DJGPP__) 
     SLtty_set_suspend_state(1);
 #endif /* !_WINDOWS */
 #ifdef SIGTSTP
diff --git a/src/LYMain.c b/src/LYMain.c
index 449b8931..9a588f6a 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -35,9 +35,7 @@
 #endif
 
 #ifdef __DJGPP__
-#ifdef USE_SLANG
 #include <dos.h>
-#endif /* USE_SLANG */
 #endif /* __DJGPP__ */
 
 #ifndef VMS
@@ -2889,7 +2887,7 @@ treated '>' as a co-terminator for double-quotes and tags"
 #ifndef VMS
 #ifdef SYSLOG_REQUESTED_URLS
    PARSE_STR(
-      "syslog", 	NEED_LYSTRING_ARG, 	syslog_txt,
+      "syslog", 	NEED_LYSTRING_ARG, 	&syslog_txt,
       "=text\ninformation for syslog call"
    ),
 #endif
diff --git a/src/LYStrings.c b/src/LYStrings.c
index b39603fa..1f4253ec 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -15,6 +15,11 @@
 #include <LYCharSets.h>
 #include <HTString.h>
 
+#ifdef DJGPP_KEYHANDLER
+#include <pc.h>
+#include <keys.h>
+#endif /* DJGPP_KEYHANDLER */
+
 #include <ctype.h>
 
 #include <LYLeaks.h>
@@ -233,7 +238,11 @@ PUBLIC int LYmbcsstrlen ARGS2(
 #define GetChar() ttgetc()
 #else
 #ifdef __DJGPP__
+#ifdef DJGPP_KEYHANDLER
+#define GetChar getxkey
+#else
 #define GetChar SLkp_getkey
+#endif /* DJGPP_KEYHANDLER */
 #else
 #define GetChar (int)SLang_getkey
 #endif /* __DJGPP__ */
@@ -783,7 +792,31 @@ re_read:
 	    d = GetChar();
     }
 #if defined(__DJGPP__) && defined(USE_SLANG)
-    else { /* SLang keypad interface */
+#ifdef DJGPP_KEYHANDLER
+    else { /* DJGPP keypad interface (see file "keys.h" for definitions) */
+	switch (c) {
+	    case K_Up:		c = UPARROW;	break; /* up arrow */
+	    case K_EUp: 	c = UPARROW;	break; /* up arrow */
+	    case K_Down:	c = DNARROW;	break; /* down arrow */
+	    case K_EDown:	c = DNARROW;	break; /* down arrow */
+	    case K_Right:	c = RTARROW;	break; /* right arrow */
+	    case K_ERight:	c = RTARROW;	break; /* right arrow */
+	    case K_Left:	c = LTARROW;	break; /* left arrow */
+	    case K_ELeft:	c = LTARROW;	break; /* left arrow */
+	    case K_PageDown:	c = PGDOWN;	break; /* page down */
+	    case K_EPageDown:	c = PGDOWN;	break; /* page down */
+	    case K_PageUp:	c = PGUP;	break; /* page up */
+	    case K_EPageUp:	c = PGUP;	break; /* page up */
+	    case K_Home:	c = HOME;	break; /* HOME */
+	    case K_EHome:	c = HOME;	break; /* HOME */
+	    case K_End: 	c = END_KEY;	break; /* END */
+	    case K_EEnd:	c = END_KEY;	break; /* END */
+	    case K_F1:		c = F1; 	break; /* F1 */
+	    case K_Alt_X:	c = 4;		break; /* alt x */
+	}
+    }
+#else
+    else { /* SLang keypad interface (see file "slang.h" for definitions) */
 	switch (c) {
 	case SL_KEY_UP:
 	    c = UPARROW;
@@ -824,7 +857,8 @@ re_read:
 	    break;
 	}
     }
-#endif
+#endif /* DJGPP_KEYHANDLER */
+#endif /* __DJGPP__ && USE_SLANG */
 #if HAVE_KEYPAD
     else {
 	/*
@@ -1974,6 +2008,7 @@ PUBLIC char * SNACat ARGS3(
     return *dest;
 }
 
+
 /*
 **   UPPER8 ?
 **   it was "TOUPPER(a) - TOUPPER(b)" in its previous life...
diff --git a/src/makefile.dsl b/src/makefile.dsl
index 5623bc65..956b0b01 100644
--- a/src/makefile.dsl
+++ b/src/makefile.dsl
@@ -9,14 +9,16 @@ LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o \
 LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYExtern.o \

 LYStyle.o LYHash.o

 

-SLANGINC = -I/slang/src

-SLANGLIB = /slang/src/djgobjs/libslang.a

 CFLAGS= $(MCFLAGS) -I. -I.. $(SLANGINC)

 

 CC = gcc

-MCFLAGS = -O3 -DRAWDOSKEYHACK -DUSE_ZLIB -DUSE_EXTERNALS -DUSE_SLANG -DACCESS_AUTH -DNO_CUSERID -DNOUSERS -DDOSPATH -DNO_TTYTYPE -DNO_UTMP -Ichrtrans -I../WWW/library/implementation   -I../djgpp/tcplib/include -I../djgpp/tcplib/include/tcp

-WWWLIB = ../WWW/library/djgpp/libwww.a  ../djgpp/tcplib/obj/libtcp.a

-LIBS=-lz -lwmemu

+MCFLAGS = -O3 -DUSE_ZLIB -DUSE_EXTERNALS \

+-DUSE_SLANG -DDJGPP_KEYHANDLER -DACCESS_AUTH -DNO_CUSERID \

+-DNOUSERS -DDOSPATH -DNO_TTYTYPE -DNO_UTMP -I../WWW/library/implement -I../djgpp/tcplib/include \

+-I./chrtrans -I../djgpp/tcplib/include/tcp

+WWWLIB = ../WWW/library/djgpp/libwww.a ../djgpp/tcplib/obj/libtcp.a

+LIBS= -lslang -lz

+CHRTR= ./chrtrans/

 

 all: lynx.exe

 

@@ -28,9 +30,9 @@ lynx.exe:   message $(OBJS) $(WWWLIB)
 message:

 	@echo "Compiling Lynx sources"

 

-dbg:	$(OBJS) $(WWWLIB)

+dbg:    $(OBJS) $(WWWLIB)

 	@echo "Making Lynx code"

-	$(CC) -g $(OBJS) $(CFLAGS) $(WWWLIB) $(SLANGLIB) $(LIBS)

+	$(CC) $(OBJS) $(CFLAGS) $(WWWLIB) $(SLANGLIB) $(LIBS)

 

 lint:

 	lint *.c  > ../lint.out

@@ -56,10 +58,5 @@ DefaultStyle.o: DefaultStyle.c ../userdefs.h
 LYEditmap.o: LYEditmap.c ../userdefs.h

 LYCharUtils.o: LYCharUtils.c ../userdefs.h

 LYExtern.o: LYExtern.c ../userdefs.h

+LyUtils.o: LYUtils.c ../userdefs.h

 LYCookie.o: ../userdefs.h

-

-#UCdomap.o: UCdomap.c ../userdefs.h lycharsets.h

-#UCdomap.o: UCdomap.c chrtrans/UCkd.h chrtrans/makeuctb chrtrans/makeuctb.c \

-#                UCdomap.h UCMap.h ../userdefs.h

-#UCAux.o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h

-

diff --git a/src/makefile.wsl b/src/makefile.wsl
index cabfe3c5..ff7d3813 100644
--- a/src/makefile.wsl
+++ b/src/makefile.wsl
@@ -9,7 +9,6 @@ LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o \
 LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYExtern.o \

 LYStyle.o LYHash.o

 

-SLANGINC=-If:/slang/src

 CFLAGS= $(MCFLAGS) -I. -I.. $(SLANGINC)

 

 CC = gcc

@@ -18,7 +17,7 @@ MCFLAGS = -O3 -DUSE_ZLIB -DUSE_EXTERNALS \
 -DNOUSERS -DDOSPATH -DNO_TTYTYPE -DNO_UTMP -I../WWW/library/implement -I../djgpp/tcplib/include \

 -I./chrtrans -I../djgpp/tcplib/include/tcp

 WWWLIB = ../WWW/library/djgpp/libwww.a ../djgpp/tcplib/obj/libtcp.a

-LIBS=-Lf:/slang/src/djgobjs -lslang -lz

+LIBS= -lslang -lz

 CHRTR= ./chrtrans/

 

 all: lynx.exe

@@ -59,4 +58,5 @@ DefaultStyle.o: DefaultStyle.c ../userdefs.h
 LYEditmap.o: LYEditmap.c ../userdefs.h

 LYCharUtils.o: LYCharUtils.c ../userdefs.h

 LYExtern.o: LYExtern.c ../userdefs.h

+LyUtils.o: LYUtils.c ../userdefs.h

 LYCookie.o: ../userdefs.h

diff --git a/userdefs.h b/userdefs.h
index 97ce8741..f983e85c 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1202,7 +1202,7 @@
  * the version definition with the Project Version on checkout. Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.1dev.10"
+#define LYNX_VERSION "2.8.1dev.11"
 
 #ifndef MAXINT
 #define MAXINT 2147483647	/* max integer */
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-04 19:46:32 +0000