snapshot of project "lynx", label v2-8-2pre_7

3 files changed, 23 insertions, 16 deletions

diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 3a8edbd4..5507254c 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1418,7 +1418,7 @@ PRIVATE void parse_vms_dir_entry ARGS2(
 
     /**  Get rid of blank lines, and information lines.  **/
     /**  Valid lines have the ';' version number token.  **/
-    if (!strlen(line) || (cp=strchr(line, ';')) == NULL) {
+    if (!strlen(line) || (cp = strchr(line, ';')) == NULL) {
 	entry_info->display = FALSE;
 	return;
     }
@@ -1935,12 +1935,12 @@ PRIVATE EntryInfo * parse_dir_entry ARGS2(
 		*first = FALSE;
 		if (!strncmp(entry, "total ", 6) ||
 		    strstr(entry, "not available") != NULL) {
-		    entry_info->display=FALSE;
+		    entry_info->display = FALSE;
 		    return(entry_info);
 		} else if (unsure_type) {
 		    /* this isn't really a unix server! */
 		    server_type = GENERIC_SERVER;
-		    entry_info->display=FALSE;
+		    entry_info->display = FALSE;
 		    return(entry_info);
 		}
 	    }
@@ -1982,7 +1982,7 @@ PRIVATE EntryInfo * parse_dir_entry ARGS2(
 
 	    if (!strcmp(entry_info->filename,"..") ||
 		!strcmp(entry_info->filename,"."))
-		entry_info->display=FALSE;
+		entry_info->display = FALSE;
 	    /*
 	    **	Goto the bottom and get real type.
 	    */
@@ -2576,7 +2576,6 @@ PUBLIC int HTFTPLoad ARGS4(
     int status;
     int retry;			/* How many times tried? */
     HTFormat format;
-    char command[LINE_LENGTH+1];
 
 
     /* set use_list to NOT since we don't know what kind of server
@@ -2626,6 +2625,7 @@ PUBLIC int HTFTPLoad ARGS4(
 /*	Tell the server to be passive
 */
 	{
+	    char command[LINE_LENGTH+1];
 	    char *p;
 	    int reply, h0, h1, h2, h3, p0, p1;	/* Parts of reply */
 	    int status;
@@ -3014,19 +3014,19 @@ PUBLIC int HTFTPLoad ARGS4(
 	    /** Otherwise, go to appropriate directory and doctor filename **/
 	    if (!strncmp(filename, "/~", 2))
 		filename += 2;
-	    CTRACE(tfp, "check '%s' to translate x/y/ to x[y]\n", filename);
+	    CTRACE(tfp, "check '%s' to translate x/y/ to [.x.y]\n", filename);
 	    if (!included_device &&
 		(cp = strchr(filename, '/')) != NULL &&
-		(cp1 = strrchr(cp, '/')) != NULL && cp != cp1) {
+		(cp1 = strrchr(cp, '/')) != NULL &&
+		(cp1 - cp) > 1) {
 		char *tmp = 0;
 
-		StrAllocCopy(tmp, cp+1);
-		tmp[(cp1-cp)] = 0;
+		HTSprintf0(&tmp, "[.%.*s]", cp1-cp-1, cp+1);
 
-		CTRACE(tfp, "change command '%s'\n", command);
-		while ((cp2 = strrchr(command, '/')) != NULL)
+		CTRACE(tfp, "change path '%s'\n", tmp);
+		while ((cp2 = strrchr(tmp, '/')) != NULL)
 		    *cp2 = '.';
-		CTRACE(tfp, "...to  command '%s'\n", command);
+		CTRACE(tfp, "...to  path '%s'\n", tmp);
 
 		status = send_cwd(tmp);
 		FREE(tmp);
diff --git a/WWW/Library/Implementation/HTPlain.c b/WWW/Library/Implementation/HTPlain.c
index c49d14c2..a1a8a136 100644
--- a/WWW/Library/Implementation/HTPlain.c
+++ b/WWW/Library/Implementation/HTPlain.c
@@ -214,7 +214,7 @@ PRIVATE void HTPlain_write ARGS3(HTStream *, me, CONST char*, s, int, l)
     CONST char * p;
     CONST char * e = s+l;
     char c;
-    unsigned char c_unsign;
+    unsigned c_unsign;
     BOOL chk;
     UCode_t code, uck = -1;
     char saved_char_in = '\0';
@@ -534,7 +534,7 @@ PRIVATE void HTPlain_write ARGS3(HTStream *, me, CONST char*, s, int, l)
 	   **  make it safe and output that now. - FM
 	   */
 	   } else if ((c_unsign > 0 &&
-		      c_unsign < LYlowest_eightbit[me->outUCLYhndl]) ||
+		      (int) c_unsign < LYlowest_eightbit[me->outUCLYhndl]) ||
 		      (me->T.trans_from_uni && !HTPassEightBitRaw)) {
 	    /*
 	    **	If we do not have the "7-bit approximations" as our
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 4ce8dabb..7d436284 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -3190,8 +3190,15 @@ top1:
 	    context->state = S_equals;
 	    break;
 	}
+#ifdef USE_PSRC
+	/* we are here because this char seemed the beginning of attrname */
+	if (psrc_view && context->current_attribute_number == INVALID) {
+	    PSRCSTOP(badattr);
+	    PUTC(' ');
+	}
+#endif
 	HTChunkPutc(string, c);
-	context->state = S_attr;		/* Get next attribute */
+	context->state = S_attr; /* Get next attribute */
 	break;
 
     case S_equals:		/* After attr = */
@@ -3202,7 +3209,7 @@ top1:
 #ifdef USE_PSRC
 	    if (psrc_view) {
 		if (context->current_tag != context->unknown_tag)
-    		    PSRCSTOP(tag);
+		    PSRCSTOP(tag);
 		else
 		    PSRCSTOP(badtag);
 		PSRCSTART(abracket);