7 files changed, 25 insertions, 88 deletions
diff --git a/WWW/Library/Implementation/HTAAProt.c b/WWW/Library/Implementation/HTAAProt.c
index 7a607e66..d845ca02 100644
--- a/WWW/Library/Implementation/HTAAProt.c
+++ b/WWW/Library/Implementation/HTAAProt.c
@@ -601,7 +601,7 @@ PRIVATE void clear_uidgid_cache NOARGS
 
 PRIVATE void save_gid_info ARGS2(char *, name, int, user)
 {
-    USER_DATA *data = calloc(1, sizeof(USER_DATA));
+    USER_DATA *data = (USER_DATA *)calloc(1, sizeof(USER_DATA));
     if (!data)
 	return;
     if (!known_grp) {
@@ -620,7 +620,7 @@ PRIVATE void save_gid_info ARGS2(char *, name, int, user)
 
 PRIVATE void save_uid_info ARGS2(char *, name, int, user)
 {
-    USER_DATA *data = calloc(1, sizeof(USER_DATA));
+    USER_DATA *data = (USER_DATA *)calloc(1, sizeof(USER_DATA));
     if (!data)
 	return;
     if (!known_pwd) {
diff --git a/WWW/Library/Implementation/HTAAUtil.h b/WWW/Library/Implementation/HTAAUtil.h
index f4ec2eee..46cbe3f2 100644
--- a/WWW/Library/Implementation/HTAAUtil.h
+++ b/WWW/Library/Implementation/HTAAUtil.h
@@ -33,22 +33,6 @@
 #include <HTList.h>
 
 /*
-
-Default filenames
-
- */
-#ifndef PASSWD_FILE
-#define PASSWD_FILE     "/home2/luotonen/passwd"
-#endif
-
-#ifndef GROUP_FILE
-#define GROUP_FILE      "/home2/luotonen/group"
-#endif
-
-#define ACL_FILE_NAME   ".www_acl"
-
-
-/*
 ** Numeric constants
 */
 #define MAX_USERNAME_LEN        16      /* @@ Longest allowed username    */
diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c
index b8c3e10d..0fca482d 100644
--- a/WWW/Library/Implementation/HTAccess.c
+++ b/WWW/Library/Implementation/HTAccess.c
@@ -865,12 +865,6 @@ PRIVATE BOOL HTLoadDocument ARGS4(
 	    redirection_attempts = 0;
 	    return YES;
 	} else {
-#if NOT_USED_CODE
-	    /* disabled 1997-10-28 - kw
-	       callers already do this when requested
-	    */
-	    reloading = TRUE;
-#endif
 	    ForcingNoCache = YES;
 	    CTRACE(tfp, "HTAccess: Auto-reloading document.\n");
 	}
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index a688e03a..65bab4f9 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -2121,61 +2121,6 @@ end:
 #endif /* NOTDEFINED */
 
 /*
-**  Modified for Lynx-jp by Takuya ASADA (and K&Rized by FM).
-*/
-#if NOTDEFINED
-PUBLIC int main ARGS2(
-	int,		ac,
-	char **,	av)
-{
-    FILE *fp;
-    char buf[BUFLEN];
-    char header = 1, body = 0, r_jis = 0;
-    int  i, c;
-
-    for (i = 1; i < ac; i++) {
-	if (strcmp(av[i], "-B") == NULL)
-	    body = 1;
-	else if (strcmp(av[i], "-r") == NULL)
-	    r_jis = 1;
-	else
-	    break;
-    }
-
-    if (i >= ac) {
-	fp = stdin;
-    } else {
-	if ((fp = fopen(av[i], "r")) == NULL) {
-	    fprintf(stderr, "%s: cannot open %s\n", av[0], av[i]);
-	    exit(1);
-	}
-    }
-
-    while (fgets(buf, BUFLEN, fp)) {
-	if (buf[0] == '\n' && buf[1] == '\0')
-	    header = 0;
-	if (header) {
-	    c = fgetc(fp);
-	    if (c == ' ' || c == '\t') {
-		buf[strlen(buf)-1] = '\0';
-		ungetc(c, fp);
-	    } else {
-		ungetc(c, fp);
-	    }
-	}
-	if (header || body)
-	    HTmmdecode(buf, buf);
-	if (r_jis)
-	    HTrjis(buf, buf);
-	fprintf(stdout, "%s", buf);
-    }
-
-    close(fp);
-    exit(0);
-}
-#endif /* NOTDEFINED */
-
-/*
 **  Insert ESC where it seems lost.
 **  (The author of this function "rjis" is S. Ichikawa.)
 */
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 008e8476..dd5be2dd 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -305,10 +305,14 @@ extern BOOL LYOutOfMemory;	/* Declared in LYexit.c - FM */
 
 #define WHITE(c) (((unsigned char)(TOASCII(c))) <= 32)
 
+/*     Inline Function LYIsASCII: Is character c a traditional ASCII
+**     character (i.e. <128) after converting from host character set.  */
+
+#define LYIsASCII(c) (TOASCII((unsigned char)(c)) < 128)
 
 /*
 
-Sucess (>=0) and failure (<0) codes
+Success (>=0) and failure (<0) codes
 
 Some of the values are chosen to be HTTP-like, but status return values
 are generally not the response status from any specific protocol.
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 406dcf05..8b1d30c2 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -60,6 +60,8 @@ PRIVATE void fake_put_character ARGS2(
 #define START TRUE
 #define STOP FALSE
 
+#define PUTS_TR(x) psrc_convert_string = TRUE; PUTS(x)
+
 #else
 #  define PSRC(x)
 #  define NPSRC(x)
@@ -1973,6 +1975,13 @@ top1:
 	    **	via handle_entity(), or if the terminator is
 	    **	not the "standard" semi-colon for HTML. - FM
 	    */
+#ifdef USE_PSRC
+	    if (psrc_view && FoundEntity && c == ';') {
+		HTMLSRC_apply_markup(context,HTL_entity, START);
+		PUTC(c);
+		HTMLSRC_apply_markup(context,HTL_entity, STOP);
+	    }
+#endif
 	    if (!FoundEntity || c != ';')
 		goto top1;
 	}
@@ -3249,7 +3258,7 @@ top1:
 		    PSRCSTART(href);
 		    HTStartAnchor(context->target,NULL,string->data);
 		}
-		PUTS(string->data);
+		PUTS_TR(string->data);
 		if (cur_attr_is_href) {
 		    (*context->actions->end_element)(
 			context->target,
@@ -3320,7 +3329,7 @@ top1:
 		    PSRCSTART(href);
 		    HTStartAnchor(context->target,NULL,string->data);
 		}
-		PUTS(string->data);
+		PUTS_TR(string->data);
 		if (cur_attr_is_href) {
 		    (*context->actions->end_element)(
 			context->target,
@@ -3384,7 +3393,7 @@ top1:
 		    PSRCSTART(href);
 		    HTStartAnchor(context->target,NULL,string->data);
 		}
-		PUTS(string->data);
+		PUTS_TR(string->data);
 		if (cur_attr_is_href) {
 		    (*context->actions->end_element)(
 			context->target,
@@ -3996,6 +4005,7 @@ PUBLIC HTStream* SGML_new  ARGS3(
 	SGML_string(context, "<HTML><HEAD><TITLE>source</TITLE></HEAD>"
 			     "<BODY><PRE>") ;
 	psrc_view = TRUE;
+	psrc_convert_string = FALSE;
 	sgml_in_psrc_was_initialized = TRUE;
 	seen_letter_in_junk_tag = FALSE;
     }
diff --git a/WWW/Library/vms/descrip.mms b/WWW/Library/vms/descrip.mms
index e0d065a5..3b8c3f7f 100644
--- a/WWW/Library/vms/descrip.mms
+++ b/WWW/Library/vms/descrip.mms
@@ -107,7 +107,7 @@ CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), UCX, TCPWARE) $(INCLUDES)
 .ifdef MULTINET
 TCP = MULTINET
 .ifdef DEC_C
-CFLAGS = /decc/Prefix=ANSI $(DEBUGFLAGS) $(DCFLAGS) /Define=(_DECC_V4_SOURCE, __SOCKET_TYPEDEFS, $(EXTRADEFINES), MULTINET)
+CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=(_DECC_V4_SOURCE, __SOCKET_TYPEDEFS, $(EXTRADEFINES), MULTINET)
 .else
 CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), MULTINET) $(INCLUDES)
 .endif
@@ -116,7 +116,7 @@ CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), MULTINET) $(INCLUDES)
 .ifdef WIN_TCP
 TCP = WIN_TCP
 .ifdef DEC_C
-CFLAGS = /decc/Prefix=ANSI $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), WIN_TCP)
+CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), WIN_TCP)
 .else
 CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), WIN_TCP) $(INCLUDES)
 .endif
@@ -125,7 +125,7 @@ CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), WIN_TCP) $(INCLUDES)
 .ifdef CMU_TCP
 TCP = CMU_TCP
 .ifdef DEC_C
-CFLAGS = /decc/Prefix=ANSI $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), CMU_TCP)
+CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), CMU_TCP)
 .else
 CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), CMU_TCP) $(INCLUDES)
 .endif
@@ -134,7 +134,7 @@ CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), CMU_TCP) $(INCLUDES)
 .ifdef SOCKETSHR_TCP
 TCP = SOCKETSHR_TCP
 .ifdef DEC_C
-CFLAGS = /decc/Prefix=ANSI $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), SOCKETSHR_TCP)
+CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), SOCKETSHR_TCP)
 .else
 CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), SOCKETSHR_TCP) $(INCLUDES)
 .endif
@@ -153,7 +153,7 @@ CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), DECNET) $(INCLUDES)
 .else
 TCP = MULTINET			! (Default to MULTINET)
 .ifdef DEC_C
-CFLAGS = /decc/Prefix=ANSI $(DEBUGFLAGS) $(DCFLAGS) /Define=(_DECC_V4_SOURCE, __SOCKET_TYPEDEFS, $(EXTRADEFINES), MULTINET)
+CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=(_DECC_V4_SOURCE, __SOCKET_TYPEDEFS, $(EXTRADEFINES), MULTINET)
 .else
 CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), MULTINET) $(INCLUDES)
 .endif