Changeset 2859 in MondoRescue for branches/2.2.9/mindi-busybox/networking/wget.c

Timestamp:

Jul 26, 2011, 1:25:42 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Update to upstream busybox 1.18.5

File:

• branches/2.2.9/mindi-busybox/networking/wget.c (modified) (8 diffs)

branches/2.2.9/mindi-busybox/networking/wget.c

@@ -447 +447 @@
 static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
 {
-    char buf[512];
+    char buf[4*1024]; /* made bigger to speed up local xfers */
 #if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
 # if ENABLE_FEATURE_WGET_TIMEOUT
@@ -456 +456 @@
     polldata.fd = fileno(dfp);
     polldata.events = POLLIN | POLLPRI;
-    ndelay_on(polldata.fd);
 #endif
     progress_meter(PROGRESS_START);
@@ -465 +464 @@
     /* Loops only if chunked */
     while (1) {
+
+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+        ndelay_on(polldata.fd);
+#endif
         while (1) {
             int n;
@@ -494 +497 @@
             }
 #endif
+            /* fread internally uses read loop, which in our case
+             * is usually exited when we get EAGAIN.
+             * In this case, libc sets error marker on the stream.
+             * Need to clear it before next fread to avoid possible
+             * rare false positive ferror below. Rare because usually
+             * fread gets more than zero bytes, and we don't fall
+             * into if (n <= 0) ...
+             */
+            clearerr(dfp);
+            errno = 0;
             n = safe_fread(buf, rdsz, dfp);
+            /* man fread:
+             * If error occurs, or EOF is reached, the return value
+             * is a short item count (or zero).
+             * fread does not distinguish between EOF and error.
+             */
             if (n <= 0) {
-                if (ferror(dfp)) {
-                    /* perror will not work: ferror doesn't set errno */
-                    bb_error_msg_and_die(bb_msg_read_error);
-                }
-                break;
+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+                if (errno == EAGAIN) /* poll lied, there is no data? */
+                    continue; /* yes */
+#endif
+                if (ferror(dfp))
+                    bb_perror_msg_and_die(bb_msg_read_error);
+                break; /* EOF, not error */
             }
+
             xwrite(output_fd, buf, n);
 #if ENABLE_FEATURE_WGET_STATUSBAR
@@ -507 +528 @@
             progress_meter(PROGRESS_BUMP);
 #endif
-            if (G.got_clen)
+            if (G.got_clen) {
                 G.content_len -= n;
-        }
+                if (G.content_len == 0)
+                    break;
+            }
+        }
+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+        ndelay_off(polldata.fd);
+#endif
 
         if (!G.chunked)
@@ -707 +734 @@
             target.host, user_agent);
 
+        /* Ask server to close the connection as soon as we are done
+         * (IOW: we do not intend to send more requests)
+         */
+        fprintf(sfp, "Connection: close\r\n");
+
 #if ENABLE_FEATURE_WGET_AUTHENTICATION
         if (target.user) {
@@ -720 +752 @@
         if (G.beg_range)
             fprintf(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);
+
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
         if (extra_headers)
@@ -726 +759 @@
         if (opt & WGET_OPT_POST_DATA) {
             char *estr = URL_escape(post_data);
-            fprintf(sfp, "Content-Type: application/x-www-form-urlencoded\r\n");
-            fprintf(sfp, "Content-Length: %u\r\n" "\r\n" "%s",
-                    (int) strlen(estr), estr);
-            /*fprintf(sfp, "Connection: Keep-Alive\r\n\r\n");*/
-            /*fprintf(sfp, "%s\r\n", estr);*/
+            fprintf(sfp,
+                "Content-Type: application/x-www-form-urlencoded\r\n"
+                "Content-Length: %u\r\n"
+                "\r\n"
+                "%s",
+                (int) strlen(estr), estr
+            );
             free(estr);
         } else
 #endif
-        { /* If "Connection:" is needed, document why */
-            fprintf(sfp, /* "Connection: close\r\n" */ "\r\n");
+        {
+            fprintf(sfp, "\r\n");
         }