Merge branch 'busybox' into merge

8 files changed, 91 insertions, 62 deletions

diff --git a/networking/Config.src b/networking/Config.src
index 8c7417f86..27c604a31 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -497,7 +497,7 @@ config FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
 
 config FEATURE_INETD_RPC
         bool "Support RPC services"
-        default y
+        default n  # very rarely used, and needs Sun RPC support in libc
         depends on INETD
         select FEATURE_HAVE_RPC
         help
diff --git a/networking/httpd.c b/networking/httpd.c
index 00169c36d..ed15fd883 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -967,19 +967,30 @@ static void send_headers(int responseNum)
         }
 #endif
         if (responseNum == HTTP_MOVED_TEMPORARILY) {
-                len += sprintf(iobuf + len, "Location: %s/%s%s\r\n",
+                /* Responding to "GET /dir" with
+                 * "HTTP/1.0 302 Found" "Location: /dir/"
+                 * - IOW, asking them to repeat with a slash.
+                 * Here, overflow IS possible, can't use sprintf:
+                 * mkdir test
+                 * python -c 'print("get /test?" + ("x" * 8192))' | busybox httpd -i -h .
+                 */
+                len += snprintf(iobuf + len, IOBUF_SIZE-3 - len,
+                                "Location: %s/%s%s\r\n",
                                 found_moved_temporarily,
                                 (g_query ? "?" : ""),
                                 (g_query ? g_query : ""));
+                if (len > IOBUF_SIZE-3)
+                        len = IOBUF_SIZE-3;
         }
 
 #if ENABLE_FEATURE_HTTPD_ERROR_PAGES
         if (error_page && access(error_page, R_OK) == 0) {
-                strcat(iobuf, "\r\n");
-                len += 2;
-
-                if (DEBUG)
+                iobuf[len++] = '\r';
+                iobuf[len++] = '\n';
+                if (DEBUG) {
+                        iobuf[len] = '\0';
                         fprintf(stderr, "headers: '%s'\n", iobuf);
+                }
                 full_write(STDOUT_FILENO, iobuf, len);
                 if (DEBUG)
                         fprintf(stderr, "writing error page: '%s'\n", error_page);
@@ -1021,8 +1032,10 @@ static void send_headers(int responseNum)
                                 responseNum, responseString,
                                 responseNum, responseString, infoString);
         }
-        if (DEBUG)
+        if (DEBUG) {
+                iobuf[len] = '\0';
                 fprintf(stderr, "headers: '%s'\n", iobuf);
+        }
         if (full_write(STDOUT_FILENO, iobuf, len) != len) {
                 if (verbose > 1)
                         bb_perror_msg("error");
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 7c45e8927..d477ff6d1 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -394,8 +394,8 @@ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
 # if ENABLE_FEATURE_IFUPDOWN_IP
         result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec);
         result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
-        /* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */
-        result += execute("[[ip route add ::/0 via %gateway%]][[ metric %metric%]]", ifd, exec);
+        /* Reportedly, IPv6 needs "dev %iface%", but IPv4 does not: */
+        result += execute("[[ip route add ::/0 via %gateway% dev %iface%]][[ metric %metric%]]", ifd, exec);
 # else
         result = execute("ifconfig %iface%[[ media %media%]][[ hw %hwaddress%]][[ mtu %mtu%]] up", ifd, exec);
         result += execute("ifconfig %iface% add %address%/%netmask%", ifd, exec);
@@ -421,7 +421,8 @@ static int FAST_FUNC v4tunnel_up(struct interface_defn_t *ifd, execfn *exec)
                         "%endpoint%[[ local %local%]][[ ttl %ttl%]]", ifd, exec);
         result += execute("ip link set %iface% up", ifd, exec);
         result += execute("ip addr add %address%/%netmask% dev %iface%", ifd, exec);
-        result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec);
+        /* Reportedly, IPv6 needs "dev %iface%", but IPv4 does not: */
+        result += execute("[[ip route add ::/0 via %gateway% dev %iface%]]", ifd, exec);
         return ((result == 4) ? 4 : 0);
 }
 
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index e2b85fc7b..af9eb46f7 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -136,7 +136,6 @@ unsigned FAST_FUNC ll_index_to_flags(int idx)
 int FAST_FUNC xll_name_to_index(const char *name)
 {
         int ret = 0;
-        int sock_fd;
 
 /* caching is not warranted - no users which repeatedly call it */
 #ifdef UNUSED
@@ -164,30 +163,8 @@ int FAST_FUNC xll_name_to_index(const char *name)
                         }
                 }
         }
-        /* We have not found the interface in our cache, but the kernel
-         * may still know about it. One reason is that we may be using
-         * module on-demand loading, which means that the kernel will
-         * load the module and make the interface exist only when
-         * we explicitely request it (check for dev_load() in net/core/dev.c).
-         * I can think of other similar scenario, but they are less common...
-         * Jean II */
 #endif
-
-        sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
-        if (sock_fd >= 0) {
-                struct ifreq ifr;
-                int tmp;
-
-                strncpy_IFNAMSIZ(ifr.ifr_name, name);
-                ifr.ifr_ifindex = -1;
-                tmp = ioctl(sock_fd, SIOCGIFINDEX, &ifr);
-                close(sock_fd);
-                if (tmp >= 0)
-                        /* In theory, we should redump the interface list
-                         * to update our cache, this is left as an exercise
-                         * to the reader... Jean II */
-                        ret = ifr.ifr_ifindex;
-        }
+        ret = if_nametoindex(name);
 /* out:*/
         if (ret <= 0)
                 bb_error_msg_and_die("can't find device '%s'", name);
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 64cd73ec7..987cc9aff 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -4,18 +4,20 @@
  */
 
 //usage:#define dumpleases_trivial_usage
-//usage:       "[-r|-a] [-f LEASEFILE]"
+//usage:       "[-r|-a] [-d] [-f LEASEFILE]"
 //usage:#define dumpleases_full_usage "\n\n"
 //usage:       "Display DHCP leases granted by udhcpd\n"
 //usage:        IF_LONG_OPTS(
 //usage:     "\n        -f,--file=FILE  Lease file"
 //usage:     "\n        -r,--remaining  Show remaining time"
 //usage:     "\n        -a,--absolute   Show expiration time"
+//usage:     "\n        -d,--decimal    Show time in seconds"
 //usage:        )
 //usage:        IF_NOT_LONG_OPTS(
 //usage:     "\n        -f FILE Lease file"
 //usage:     "\n        -r      Show remaining time"
 //usage:     "\n        -a      Show expiration time"
+//usage:     "\n        -d      Show time in seconds"
 //usage:        )
 
 #include "common.h"
@@ -28,21 +30,22 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
         int fd;
         int i;
         unsigned opt;
-        int64_t written_at, curr, expires_abs;
+        int64_t written_at, curr;
         const char *file = LEASES_FILE;
         struct dyn_lease lease;
-        struct in_addr addr;
 
         enum {
                 OPT_a = 0x1, // -a
                 OPT_r = 0x2, // -r
                 OPT_f = 0x4, // -f
+                OPT_d = 0x8, // -d
         };
 #if ENABLE_LONG_OPTS
         static const char dumpleases_longopts[] ALIGN1 =
                 "absolute\0"  No_argument       "a"
                 "remaining\0" No_argument       "r"
                 "file\0"      Required_argument "f"
+                "decimal\0"   No_argument       "d"
                 ;
 
         applet_long_options = dumpleases_longopts;
@@ -50,13 +53,16 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
         init_unicode();
 
         opt_complementary = "=0:a--r:r--a";
-        opt = getopt32(argv, "arf:", &file);
+        opt = getopt32(argv, "arf:d", &file);
 
         fd = xopen(file, O_RDONLY);
 
-        printf("Mac Address       IP Address      Host Name           Expires %s\n", (opt & OPT_a) ? "at" : "in");
-        /*     "00:00:00:00:00:00 255.255.255.255 ABCDEFGHIJKLMNOPQRS Wed Jun 30 21:49:08 1993" */
         /*     "123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 */
+        /*     "00:00:00:00:00:00 255.255.255.255 ABCDEFGHIJKLMNOPQRS Wed Jun 30 21:49:08 1993" */
+        printf("Mac %-14s"       "IP %-13s"      "Host %-15s"        "Expires %s\n",
+                "Address", "Address", "Name",
+                (opt & OPT_a) ? "at" : "in"
+        );
 
         xread(fd, &written_at, sizeof(written_at));
         written_at = SWAP_BE64(written_at);
@@ -65,6 +71,9 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
                 written_at = curr; /* lease file from future! :) */
 
         while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) {
+                struct in_addr addr;
+                int64_t expires_abs;
+
                 const char *fmt = ":%02x" + 1;
                 for (i = 0; i < 6; i++) {
                         printf(fmt, lease.lease_mac[i]);
@@ -87,6 +96,13 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
                         puts("expired");
                         continue;
                 }
+                if (opt & OPT_d) {
+                        /* -d: decimal time */
+                        if (!(opt & OPT_a))
+                                expires_abs -= curr;
+                        printf("%llu\n", (unsigned long long) expires_abs);
+                        continue;
+                }
                 if (!(opt & OPT_a)) { /* no -a */
                         unsigned d, h, m;
                         unsigned expires = expires_abs - curr;
diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c
index 745340ad3..844bb60b1 100644
--- a/networking/udhcp/leases.c
+++ b/networking/udhcp/leases.c
@@ -65,10 +65,15 @@ struct dyn_lease* FAST_FUNC add_lease(
                         if (hostname_len > sizeof(oldest->hostname))
                                 hostname_len = sizeof(oldest->hostname);
                         p = safe_strncpy(oldest->hostname, hostname, hostname_len);
-                        /* sanitization (s/non-ASCII/^/g) */
+                        /*
+                         * Sanitization (s/bad_char/./g).
+                         * The intent is not to allow only "DNS-valid" hostnames,
+                         * but merely make dumpleases output safe for shells to use.
+                         * We accept "0-9A-Za-z._-", all other chars turn to dots.
+                         */
                         while (*p) {
-                                if (*p < ' ' || *p > 126)
-                                        *p = '^';
+                                if (!isalnum(*p) && *p != '-' && *p != '_')
+                                        *p = '.';
                                 p++;
                         }
                 }
diff --git a/networking/wget.c b/networking/wget.c
index 0082ced39..edf8fd8af 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -102,7 +102,8 @@
 //usage:       "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document FILE]\n"
 //usage:       "        [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n"
 /* Since we ignore these opts, we don't show them in --help */
-/* //usage:    "        [--no-check-certificate] [--no-cache]" */
+/* //usage:    "        [--no-check-certificate] [--no-cache] [--passive-ftp] [-t TRIES]" */
+/* //usage:    "        [-nv] [-nc] [-nH] [-np]" */
 //usage:       "        [-U|--user-agent AGENT]" IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
 //usage:        )
 //usage:        IF_NOT_FEATURE_WGET_LONG_OPTIONS(
@@ -1225,19 +1226,22 @@ 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
+IF_FEATURE_WGET_TIMEOUT(
+                "timeout\0"          Required_argument "T")
                 /* Ignored: */
-                // "tries\0"            Required_argument "t"
+IF_DESKTOP(     "tries\0"            Required_argument "t")
+                "header\0"           Required_argument "\xff"
+                "post-data\0"        Required_argument "\xfe"
                 /* Ignored (we always use PASV): */
-                "passive-ftp\0"      No_argument       "\xff"
-                "header\0"           Required_argument "\xfe"
-                "post-data\0"        Required_argument "\xfd"
+IF_DESKTOP(     "passive-ftp\0"      No_argument       "\xf0")
                 /* Ignored (we don't do ssl) */
-                "no-check-certificate\0" No_argument   "\xfc"
+IF_DESKTOP(     "no-check-certificate\0" No_argument   "\xf0")
                 /* Ignored (we don't support caching) */
-                "no-cache\0"         No_argument       "\xfb"
+IF_DESKTOP(     "no-cache\0"         No_argument       "\xf0")
+IF_DESKTOP(     "no-verbose\0"       No_argument       "\xf0")
+IF_DESKTOP(     "no-clobber\0"       No_argument       "\xf0")
+IF_DESKTOP(     "no-host-directories\0" No_argument    "\xf0")
+IF_DESKTOP(     "no-parent\0"        No_argument       "\xf0")
                 ;
 #endif
 
@@ -1257,14 +1261,25 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
         applet_long_options = wget_longopts;
 #endif
-        opt_complementary = "-1"
-                        IF_FEATURE_WGET_TIMEOUT(":T+")
-                        IF_FEATURE_WGET_LONG_OPTIONS(":\xfe::");
-        getopt32(argv, "csqO:P:Y:U:T:" /*ignored:*/ "t:",
-                &G.fname_out, &G.dir_prefix,
+        opt_complementary = "-1" /* at least one URL */
+                IF_FEATURE_WGET_TIMEOUT(":T+") /* -T NUM */
+                IF_FEATURE_WGET_LONG_OPTIONS(":\xff::"); /* --header is a list */
+        getopt32(argv, "csqO:P:Y:U:T:"
+                /*ignored:*/ "t:"
+                /*ignored:*/ "n::"
+                /* wget has exactly four -n<letter> opts, all of which we can ignore:
+                 * -nv --no-verbose: be moderately quiet (-q is full quiet)
+                 * -nc --no-clobber: abort if exists, neither download to FILE.n nor overwrite FILE
+                 * -nH --no-host-directories: wget -r http://host/ won't create host/
+                 * -np --no-parent
+                 * "n::" above says that we accept -n[ARG].
+                 * Specifying "n:" would be a bug: "-n ARG" would eat ARG!
+                 */
+                , &G.fname_out, &G.dir_prefix,
                 &G.proxy_flag, &G.user_agent,
                 IF_FEATURE_WGET_TIMEOUT(&G.timeout_seconds) IF_NOT_FEATURE_WGET_TIMEOUT(NULL),
-                NULL /* -t RETRIES */
+                NULL, /* -t RETRIES */
+                NULL  /* -n[ARG] */
                 IF_FEATURE_WGET_LONG_OPTIONS(, &headers_llist)
                 IF_FEATURE_WGET_LONG_OPTIONS(, &G.post_data)
         );
diff --git a/networking/zcip.c b/networking/zcip.c
index d15c67d55..1d6910555 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -345,7 +345,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
         state = PROBE;
         while (1) {
                 struct pollfd fds[1];
-                unsigned deadline_us;
+                unsigned deadline_us = deadline_us;
                 struct arp_packet p;
                 int ip_conflict;
                 int n;
@@ -361,8 +361,10 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
                         // make the kernel filter out all packets except
                         // ones we'd care about.
                 }
-                // Set deadline_us to the point in time when we timeout
-                deadline_us = MONOTONIC_US() + timeout_ms * 1000;
+                if (timeout_ms >= 0) {
+                        // Set deadline_us to the point in time when we timeout
+                        deadline_us = MONOTONIC_US() + timeout_ms * 1000;
+                }
 
                 VDBG("...wait %d %s nsent=%u\n",
                                 timeout_ms, argv_intf, nsent);