snapshot of project "lynx", label v2-8-7dev_5f

5 files changed, 21 insertions, 12 deletions

diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 50720368..003d61c0 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFTP.c,v 1.79 2007/07/02 23:05:12 tom Exp $
+ * $LynxId: HTFTP.c,v 1.80 2007/08/02 19:55:46 tom Exp $
  *
  *			File Transfer Protocol (FTP) Client
  *			for a WorldWideWeb browser
@@ -1144,7 +1144,7 @@ static int close_master_socket(void)
 	FD_CLR(master_socket, &open_sockets);
 
     status = NETCLOSE(master_socket);
-    CTRACE((tfp, "HTFTP: Closed master socket %d\n", master_socket));
+    CTRACE((tfp, "HTFTP: Closed master socket %u\n", master_socket));
 
     reset_master_socket();
 
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 7b190474..aaefab80 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.c,v 1.103 2007/07/22 22:31:01 tom Exp $
+ * $LynxId: HTFile.c,v 1.104 2007/08/02 19:46:01 tom Exp $
  *
  *			File Access				HTFile.c
  *			===========
@@ -2711,7 +2711,7 @@ int HTLoadFile(const char *addr,
 			    }
 			}
 		    }
-		    if (value != NO_VALUE_FOUND) {
+		    if (value < NO_VALUE_FOUND) {
 			CTRACE((tfp,
 				"HTLoadFile: value of presenting %s is %f\n",
 				HTAtom_name(rep), value));
diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c
index aa859d7a..f7b4f24b 100644
--- a/WWW/Library/Implementation/HTFormat.c
+++ b/WWW/Library/Implementation/HTFormat.c
@@ -1,4 +1,7 @@
-/*		Manage different file formats			HTFormat.c
+/*
+ * $LynxId: HTFormat.c,v 1.62 2007/08/02 20:12:22 tom Exp $
+ *
+ *		Manage different file formats			HTFormat.c
  *		=============================
  *
  * Bugs:
@@ -606,7 +609,7 @@ float HTStackValue(HTFormat rep_in,
 		(pres->rep_out == rep_out || pres->rep_out == wildcard)) {
 		float value = initial_value * pres->quality;
 
-		if (HTMaxSecs != 0.0)
+		if (HTMaxSecs > 0.0)
 		    value = value - (length * pres->secs_per_byte + pres->secs)
 			/ HTMaxSecs;
 		return value;
@@ -799,7 +802,6 @@ int HTCopy(HTParentAnchor *anchor,
 		    CTRACE((tfp,
 			    "HTCopy: Unexpected server disconnect. Treating as completed.\n"));
 		    status = 0;
-		    break;
 #else /* !UNIX */
 		    /*
 		     * Treat what we've gotten already as the complete
@@ -808,7 +810,6 @@ int HTCopy(HTParentAnchor *anchor,
 		    CTRACE((tfp,
 			    "HTCopy: Unexpected server disconnect.  Treating as completed.\n"));
 		    status = 0;
-		    break;
 #endif /* UNIX */
 		}
 #ifdef UNIX
diff --git a/WWW/Library/Implementation/HTRules.c b/WWW/Library/Implementation/HTRules.c
index b6510970..e88963c9 100644
--- a/WWW/Library/Implementation/HTRules.c
+++ b/WWW/Library/Implementation/HTRules.c
@@ -1,4 +1,7 @@
-/*	Configuration manager for Hypertext Daemon		HTRules.c
+/*
+ * $LynxId: HTRules.c,v 1.30 2007/08/02 20:12:40 tom Exp $
+ *
+ *	Configuration manager for Hypertext Daemon		HTRules.c
  *	==========================================
  *
  *
@@ -103,9 +106,9 @@ int HTAddRule(HTRuleOp op, const char *pattern,
     temp->op = op;
 
     if (equiv) {
-	CTRACE((tfp, "Rule: For `%s' op %d `%s'", pattern, op, equiv));
+	CTRACE((tfp, "Rule: For `%s' op %d `%s'", pattern, (int) op, equiv));
     } else {
-	CTRACE((tfp, "Rule: For `%s' op %d", pattern, op));
+	CTRACE((tfp, "Rule: For `%s' op %d", pattern, (int) op));
     }
     if (cond_op) {
 	CTRACE((tfp, "\t%s %s\n", cond_op, NONNULL(cond)));
diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h
index ca0ab6d8..c17fe4ae 100644
--- a/WWW/Library/Implementation/www_tcp.h
+++ b/WWW/Library/Implementation/www_tcp.h
@@ -1,5 +1,5 @@
 /*                System dependencies in the W3 library
- * $LynxId: www_tcp.h,v 1.36 2007/07/02 23:05:01 tom Exp $
+ * $LynxId: www_tcp.h,v 1.37 2007/08/02 20:06:10 tom Exp $
  *
                                    SYSTEM DEPENDENCIES
 
@@ -96,6 +96,11 @@ Default values
 # endif
 #endif /* HAVE_DIRENT_H */
 
+#ifdef HAVE_STRUCT_DIRENT64
+# undef STRUCT_DIRENT
+# define STRUCT_DIRENT struct dirent64
+#endif
+
 #if !(defined(DOSPATH) || defined(__EMX__) || defined(__CYGWIN__))
 #define STRUCT_DIRENT__D_INO 1
 #endif