snapshot of project "lynx", label v2-7-1ac_0-102

5 files changed, 15 insertions, 17 deletions

diff --git a/WWW/Library/Implementation/HTDOS.c b/WWW/Library/Implementation/HTDOS.c
index 1e67a1a0..05e56194 100644
--- a/WWW/Library/Implementation/HTDOS.c
+++ b/WWW/Library/Implementation/HTDOS.c
@@ -68,10 +68,10 @@ char * HTDOS_name(char *dosname)	{
 		}
 	}
 
-//	if(strlen(cp_url) < 4) cp_url[] = ':';
+/*	if(strlen(cp_url) < 4) cp_url[] = ':';
 	if(strlen(cp_url) == 3) cp_url[3] = '\\';
 
-	if(strlen(cp_url) == 4) cp_url[4] = '.';
+	if(strlen(cp_url) == 4) cp_url[4] = '.'; */
 
 	if((strlen(cp_url) > 2) && (cp_url[1] == '|'))
 		cp_url[1] = ':';
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index ac0d2874..a4eae4a7 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -873,7 +873,7 @@ PUBLIC HTFormat HTCharsetFormat ARGS3(
 	*cp4 = '\0';
 	cp4 = cp3;
 	chndl = UCGetLYhndl_byMIME(cp3);
-	if (UCCanTranslateFromTo(chndl, current_char_set)) {
+	if (UCCanTranslateFromTo(chndl, current_char_set) != TQ_NO) {
 	    chartrans_ok = YES;
 	    *cp1 = '\0';
 	    format = HTAtom_for(cp);
@@ -886,7 +886,7 @@ PUBLIC HTFormat HTCharsetFormat ARGS3(
 	    **  Got something but we don't recognize it.
 	    */
 	    chndl = UCLYhndl_for_unrec;
-	    if (UCCanTranslateFromTo(chndl, current_char_set)) {
+	    if (UCCanTranslateFromTo(chndl, current_char_set) != TQ_NO) {
 		chartrans_ok = YES;
 		HTAnchor_setUCInfoStage(anchor, chndl,
 					UCT_STAGE_MIME,
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index b694bb05..814ed9c7 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -378,7 +378,7 @@ PRIVATE void HTMIME_put_character ARGS2(
 			    cp4 = cp3;
 			    chndl = UCGetLYhndl_byMIME(cp3);
 			    if (UCCanTranslateFromTo(chndl,
-						     current_char_set)) {
+						     current_char_set) != TQ_NO) {
 				chartrans_ok = YES;
 				*cp1 = '\0';
 				me->format = HTAtom_for(cp);
@@ -390,7 +390,7 @@ PRIVATE void HTMIME_put_character ARGS2(
 						 recognize it */
 				chndl = UCLYhndl_for_unrec;
 				if (UCCanTranslateFromTo(chndl,
-							 current_char_set)) {
+							 current_char_set) != TQ_NO) {
 				    chartrans_ok = YES;
 				    *cp1 = '\0';
 				    me->format = HTAtom_for(cp);
@@ -2388,8 +2388,8 @@ PUBLIC void HTmmdecode ARGS2(
 			for (p = s+2; *p; p++)
 			    *p = TOLOWER(*p);
 			invalid = ((LYhndl = UCGetLYhndl_byMIME(s+2)) < 0 ||
-				   !UCCanTranslateFromTo(LYhndl,
-							 current_char_set));
+				   UCCanTranslateFromTo(LYhndl,
+						 current_char_set) != TQ_NO);
 			*qm2 = '?';
 		    }
 		    if (!invalid) {
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index cbc43984..6fe7739a 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -206,15 +206,10 @@ PUBLIC int HTInetStatus ARGS1(
 #define ER_NO_TRANS_DONE
 #endif /* VMS */
 
-#if defined(NeXT) || defined(THINK_C)
+#ifdef HAVE_STRERROR
 	   strerror(SOCKET_ERRNO));
 #define ER_NO_TRANS_DONE
-#endif /* NeXT || THINK_C */
-
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(BSDI)
-	   strerror(SOCKET_ERRNO));
-#define ER_NO_TRANS_DONE
-#endif /* __NetBSD__ || __FreeBSD__ || BSDI */
+#endif /* HAVE_STRERROR */
 
 #ifndef ER_NO_TRANS_DONE
 	   (SOCKET_ERRNO < sys_nerr ?
diff --git a/WWW/Library/unix/makefile.in b/WWW/Library/unix/makefile.in
index f9fbb160..89c1cf2f 100644
--- a/WWW/Library/unix/makefile.in
+++ b/WWW/Library/unix/makefile.in
@@ -18,8 +18,11 @@ VPATH		= $(srcdir)
 LYFLAGS		= # FIXME: set in parent makefile
 
 CC		= @CC@
-CPPOPTS		= @DEFS@ @CPPFLAGS@ $(LYFLAGS) -I../../.. -I../../../src
-CFLAGS		= $(CPPOPTS) @CFLAGS@
+DEFS		= @DEFS@
+CPPFLAGS	= @CPPFLAGS@
+CPPOPTS		= $(DEFS) $(CPPFLAGS) $(LYFLAGS) -I../../.. -I../../../src
+LY_CFLAGS	= @CFLAGS@
+CFLAGS		= $(CPPOPTS) $(LY_CFLAGS)
 
 # Directory for installed binary:
 BINDIR		= @bindir@