5 files changed, 89 insertions, 52 deletions

diff --git a/networking/Config.src b/networking/Config.src
index 8604c53e9..9fc122bf3 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -1012,6 +1012,18 @@ config FEATURE_WGET_LONG_OPTIONS
         help
           Support long options for the wget applet.
 
+config FEATURE_WGET_TIMEOUT
+        bool "Enable read timeout option -T SEC"
+        default y
+        depends on WGET
+        help
+          Supports network read timeout for wget, so that wget will give
+          up and timeout when reading network data, through the -T command
+          line option.  Currently only network data read timeout is
+          supported (i.e., timeout is not applied to the DNS nor TCP
+          connection initialization).  When FEATURE_WGET_LONG_OPTIONS is
+          also enabled, the --timeout option will work in addition to -T.
+
 config ZCIP
         bool "zcip"
         default y
diff --git a/networking/brctl.c b/networking/brctl.c
index a36ab45c3..0f56412ce 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -271,7 +271,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
                                 }
                         }
                         arg1 = port;
-                        arg2 = xatoi_u(*argv);
+                        arg2 = xatoi_positive(*argv);
                         if (key == ARG_setbridgeprio) {
                                 arg1 = arg2;
                                 arg2 = 0;
diff --git a/networking/ftpd.c b/networking/ftpd.c
index e8cae0a36..0daf9f7a3 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -534,7 +534,7 @@ static void
 handle_rest(void)
 {
         /* When ftp_arg == NULL simply restart from beginning */
-        G.restart_pos = G.ftp_arg ? xatoi_u(G.ftp_arg) : 0;
+        G.restart_pos = G.ftp_arg ? xatoi_positive(G.ftp_arg) : 0;
         WRITE_OK(FTP_RESTOK);
 }
 
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index 331dffc2e..dcd493f13 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -85,7 +85,7 @@ config UDHCP_DEBUG
         depends on UDHCPD || UDHCPC || DHCPRELAY
         help
           Verbosity can be increased with multiple -v options.
-          This options controls how high it can be cranked up.
+          This option controls how high it can be cranked up.
 
           Bigger values result in bigger code. Levels above 1
           are very verbose and useful for debugging only.
diff --git a/networking/wget.c b/networking/wget.c
index 1f35f8b03..784e405da 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -3,8 +3,10 @@
  * wget - retrieve a file using HTTP or FTP
  *
  * Chip Rosenthal Covad Communications <chip@laserlink.net>
- *
  * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ *
+ * Copyright (C) 2010 Bradley M. Kuhn <bkuhn@ebb.org>
+ *   Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
  */
 #include "libbb.h"
 
@@ -19,7 +21,7 @@ struct host_info {
 };
 
 
-/* Globals (can be accessed from signal handlers) */
+/* Globals */
 struct globals {
         off_t content_len;        /* Content-length of the file */
         off_t beg_range;          /* Range at which continue begins */
@@ -28,6 +30,9 @@ struct globals {
         const char *curfile;      /* Name of current file being transferred */
         bb_progress_t pmt;
 #endif
+#if ENABLE_FEATURE_WGET_TIMEOUT
+        unsigned timeout_seconds;
+#endif
         smallint chunked;         /* chunked transfer encoding */
         smallint got_clen;        /* got content-length: from server  */
 } FIX_ALIASING;
@@ -35,42 +40,51 @@ struct globals {
 struct BUG_G_too_big {
         char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
 };
-#define INIT_G() do { } while (0)
+#define INIT_G() do { \
+        IF_FEATURE_WGET_TIMEOUT(G.timeout_seconds = 900;) \
+} while (0)
 
 
-#if ENABLE_FEATURE_WGET_STATUSBAR
+/* Must match option string! */
+enum {
+        WGET_OPT_CONTINUE   = (1 << 0),
+        WGET_OPT_SPIDER     = (1 << 1),
+        WGET_OPT_QUIET      = (1 << 2),
+        WGET_OPT_OUTNAME    = (1 << 3),
+        WGET_OPT_PREFIX     = (1 << 4),
+        WGET_OPT_PROXY      = (1 << 5),
+        WGET_OPT_USER_AGENT = (1 << 6),
+        WGET_OPT_NETWORK_READ_TIMEOUT = (1 << 7),
+        WGET_OPT_RETRIES    = (1 << 8),
+        WGET_OPT_PASSIVE    = (1 << 9),
+        WGET_OPT_HEADER     = (1 << 10) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
+        WGET_OPT_POST_DATA  = (1 << 11) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
+};
 
+enum {
+        PROGRESS_START = -1,
+        PROGRESS_END   = 0,
+        PROGRESS_BUMP  = 1,
+};
+#if ENABLE_FEATURE_WGET_STATUSBAR
 static void progress_meter(int flag)
 {
-        /* We can be called from signal handler */
-        int save_errno = errno;
+        if (option_mask32 & WGET_OPT_QUIET)
+                return;
 
-        if (flag == -1) { /* first call to progress_meter */
+        if (flag == PROGRESS_START)
                 bb_progress_init(&G.pmt);
-        }
 
         bb_progress_update(&G.pmt, G.curfile, G.beg_range, G.transferred,
                            G.chunked ? 0 : G.beg_range + G.transferred + G.content_len);
 
-        if (flag == 0) {
-                /* last call to progress_meter */
-                alarm(0);
+        if (flag == PROGRESS_END) {
                 bb_putchar_stderr('\n');
                 G.transferred = 0;
-        } else {
-                if (flag == -1) { /* first call to progress_meter */
-                        signal_SA_RESTART_empty_mask(SIGALRM, progress_meter);
-                }
-                alarm(1);
         }
-
-        errno = save_errno;
 }
-
-#else /* FEATURE_WGET_STATUSBAR */
-
+#else
 static ALWAYS_INLINE void progress_meter(int flag UNUSED_PARAM) { }
-
 #endif
 
 
@@ -199,7 +213,7 @@ static int ftpcmd(const char *s1, const char *s2, FILE *fp, char *buf)
         } while (!isdigit(buf[0]) || buf[3] != ' ');
 
         buf[3] = '\0';
-        result = xatoi_u(buf);
+        result = xatoi_positive(buf);
         buf[3] = ' ';
         return result;
 }
@@ -430,28 +444,20 @@ static FILE* prepare_ftp_session(FILE **dfpp, struct host_info *target, len_and_
         return sfp;
 }
 
-/* Must match option string! */
-enum {
-        WGET_OPT_CONTINUE   = (1 << 0),
-        WGET_OPT_SPIDER     = (1 << 1),
-        WGET_OPT_QUIET      = (1 << 2),
-        WGET_OPT_OUTNAME    = (1 << 3),
-        WGET_OPT_PREFIX     = (1 << 4),
-        WGET_OPT_PROXY      = (1 << 5),
-        WGET_OPT_USER_AGENT = (1 << 6),
-        WGET_OPT_RETRIES    = (1 << 7),
-        WGET_OPT_NETWORK_READ_TIMEOUT = (1 << 8),
-        WGET_OPT_PASSIVE    = (1 << 9),
-        WGET_OPT_HEADER     = (1 << 10) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
-        WGET_OPT_POST_DATA  = (1 << 11) * ENABLE_FEATURE_WGET_LONG_OPTIONS,
-};
-
 static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
 {
         char buf[512];
-
-        if (!(option_mask32 & WGET_OPT_QUIET))
-                progress_meter(-1);
+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+# if ENABLE_FEATURE_WGET_TIMEOUT
+        unsigned second_cnt;
+# endif
+        struct pollfd polldata;
+
+        polldata.fd = fileno(dfp);
+        polldata.events = POLLIN | POLLPRI;
+        ndelay_on(polldata.fd);
+#endif
+        progress_meter(PROGRESS_START);
 
         if (G.chunked)
                 goto get_clen;
@@ -470,6 +476,23 @@ static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
                                         rdsz = (unsigned)G.content_len;
                                 }
                         }
+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+# if ENABLE_FEATURE_WGET_TIMEOUT
+                        second_cnt = G.timeout_seconds;
+# endif
+                        while (1) {
+                                if (safe_poll(&polldata, 1, 1000) != 0)
+                                        break; /* error, EOF, or data is available */
+# if ENABLE_FEATURE_WGET_TIMEOUT
+                                if (second_cnt != 0 && --second_cnt == 0) {
+                                        progress_meter(PROGRESS_END);
+                                        bb_perror_msg_and_die("download timed out");
+                                }
+# endif
+                                /* Needed for "stalled" indicator */
+                                progress_meter(PROGRESS_BUMP);
+                        }
+#endif
                         n = safe_fread(buf, rdsz, dfp);
                         if (n <= 0) {
                                 if (ferror(dfp)) {
@@ -481,6 +504,7 @@ static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
                         xwrite(output_fd, buf, n);
 #if ENABLE_FEATURE_WGET_STATUSBAR
                         G.transferred += n;
+                        progress_meter(PROGRESS_BUMP);
 #endif
                         if (G.got_clen)
                                 G.content_len -= n;
@@ -499,8 +523,7 @@ static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
                 G.got_clen = 1;
         }
 
-        if (!(option_mask32 & WGET_OPT_QUIET))
-                progress_meter(0);
+        progress_meter(PROGRESS_END);
 }
 
 int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -541,9 +564,11 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
                 "directory-prefix\0" Required_argument "P"
                 "proxy\0"            Required_argument "Y"
                 "user-agent\0"       Required_argument "U"
+#if ENABLE_FEATURE_WGET_TIMEOUT
+                "timeout\0"          Required_argument "T"
+#endif
                 /* Ignored: */
                 // "tries\0"            Required_argument "t"
-                // "timeout\0"          Required_argument "T"
                 /* Ignored (we always use PASV): */
                 "passive-ftp\0"      No_argument       "\xff"
                 "header\0"           Required_argument "\xfe"
@@ -559,12 +584,12 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
         applet_long_options = wget_longopts;
 #endif
         /* server.allocated = target.allocated = NULL; */
-        opt_complementary = "-1" IF_FEATURE_WGET_LONG_OPTIONS(":\xfe::");
-        opt = getopt32(argv, "csqO:P:Y:U:" /*ignored:*/ "t:T:",
+        opt_complementary = "-1" IF_FEATURE_WGET_TIMEOUT(":T+") IF_FEATURE_WGET_LONG_OPTIONS(":\xfe::");
+        opt = getopt32(argv, "csqO:P:Y:U:T:" /*ignored:*/ "t:",
                                 &fname_out, &dir_prefix,
                                 &proxy_flag, &user_agent,
-                                NULL, /* -t RETRIES */
-                                NULL /* -T NETWORK_READ_TIMEOUT */
+                                IF_FEATURE_WGET_TIMEOUT(&G.timeout_seconds) IF_NOT_FEATURE_WGET_TIMEOUT(NULL),
+                                NULL /* -t RETRIES */
                                 IF_FEATURE_WGET_LONG_OPTIONS(, &headers_llist)
                                 IF_FEATURE_WGET_LONG_OPTIONS(, &post_data)
                                 );