Merge branch 'busybox' into merge

15 files changed, 240 insertions, 90 deletions

diff --git a/networking/arp.c b/networking/arp.c
index 9381eb53a..69a5816eb 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -178,7 +178,7 @@ static int arp_del(char **args)
         if (flags == 0)
                 flags = 3;
 
-        strncpy(req.arp_dev, device, sizeof(req.arp_dev));
+        strncpy_IFNAMSIZ(req.arp_dev, device);
 
         err = -1;
 
@@ -219,7 +219,7 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa)
         struct ifreq ifr;
         const struct hwtype *xhw;
 
-        strcpy(ifr.ifr_name, ifname);
+        strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
         ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr,
                                         "can't get HW-Address for '%s'", ifname);
         if (hw_set && (ifr.ifr_hwaddr.sa_family != hw->type)) {
@@ -332,7 +332,7 @@ static int arp_set(char **args)
         /* Fill in the remainder of the request. */
         req.arp_flags = flags;
 
-        strncpy(req.arp_dev, device, sizeof(req.arp_dev));
+        strncpy_IFNAMSIZ(req.arp_dev, device);
 
         /* Call the kernel. */
         if (option_mask32 & ARP_OPT_v)
diff --git a/networking/arping.c b/networking/arping.c
index 6b0de4de2..46bd65e36 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -231,20 +231,23 @@ static void recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
         if (!(option_mask32 & QUIET)) {
                 int s_printed = 0;
 
-                printf("%scast re%s from %s [%s]",
+                printf("%scast re%s from %s [%02x:%02x:%02x:%02x:%02x:%02x]",
                         FROM->sll_pkttype == PACKET_HOST ? "Uni" : "Broad",
                         ah->ar_op == htons(ARPOP_REPLY) ? "ply" : "quest",
                         inet_ntoa(src_ip),
-                        ether_ntoa((struct ether_addr *) p));
+                        p[0], p[1], p[2], p[3], p[4], p[5]
+                );
                 if (dst_ip.s_addr != src.s_addr) {
                         printf("for %s ", inet_ntoa(dst_ip));
                         s_printed = 1;
                 }
                 if (memcmp(p + ah->ar_hln + 4, me.sll_addr, ah->ar_hln)) {
+                        unsigned char *pp = p + ah->ar_hln + 4;
                         if (!s_printed)
                                 printf("for ");
-                        printf("[%s]",
-                                ether_ntoa((struct ether_addr *) p + ah->ar_hln + 4));
+                        printf("[%02x:%02x:%02x:%02x:%02x:%02x]",
+                                pp[0], pp[1], pp[2], pp[3], pp[4], pp[5]
+                        );
                 }
 
                 if (last) {
@@ -292,8 +295,8 @@ int arping_main(int argc UNUSED_PARAM, char **argv)
                 /* Dad also sets quit_on_reply.
                  * Advert also sets unsolicited.
                  */
-                opt_complementary = "=1:Df:AU:c+";
-                opt = getopt32(argv, "DUAqfbc:w:I:s:",
+                opt_complementary = "=1:Df:AU";
+                opt = getopt32(argv, "DUAqfbc:+w:I:s:",
                                 &count, &str_timeout, &device, &source);
                 if (opt & 0x80) /* -w: timeout */
                         timeout_us = xatou_range(str_timeout, 0, INT_MAX/2000000) * 1000000 + 500000;
diff --git a/networking/ftpd.c b/networking/ftpd.c
index 360d1e6be..4cbb9b6fe 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -1130,11 +1130,11 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
         abs_timeout = 1 * 60 * 60;
         verbose_S = 0;
         G.timeout = 2 * 60;
-        opt_complementary = "t+:T+:vv:SS";
+        opt_complementary = "vv:SS";
 #if BB_MMU
-        opts = getopt32(argv,    "vS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
+        opts = getopt32(argv,    "vS" IF_FEATURE_FTP_WRITE("w") "t:+T:+", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
 #else
-        opts = getopt32(argv, "l1AvS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
+        opts = getopt32(argv, "l1AvS" IF_FEATURE_FTP_WRITE("w") "t:+T:+", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
         if (opts & (OPT_l|OPT_1)) {
                 /* Our secret backdoor to ls */
 /* TODO: pass --group-directories-first? would be nice, but ls doesn't do that yet */
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index f0defb5c8..28c49e218 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -107,9 +107,9 @@ enum {
 #endif
 };
 #if ENABLE_FEATURE_PIDFILE
-# define OPTION_STR "+ansfFi:r:It:u:d:m:pqlx:Mk"
+# define OPTION_STR "+ansfFi:r:It:+u:+d:+m:pqlx:Mk"
 #else
-# define OPTION_STR "+ansfFi:r:It:u:d:m:pqlx:M"
+# define OPTION_STR "+ansfFi:r:It:+u:+d:+m:pqlx:M"
 #endif
 
 enum { // interface status
@@ -560,7 +560,6 @@ int ifplugd_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        opt_complementary = "t+:u+:d+";
         opts = getopt32(argv, OPTION_STR,
                 &G.iface, &G.script_name, &G.poll_time, &G.delay_up,
                 &G.delay_down, &G.api_mode, &G.extra_arg);
diff --git a/networking/inetd.c b/networking/inetd.c
index 8d44b5198..f9295e38b 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1153,8 +1153,8 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
         if (real_uid != 0) /* run by non-root user */
                 config_filename = NULL;
 
-        opt_complementary = "R+:q+"; /* -q N, -R N */
-        opt = getopt32(argv, "R:feq:", &max_concurrency, &global_queuelen);
+        /* -q N, -R N */
+        opt = getopt32(argv, "R:+feq:+", &max_concurrency, &global_queuelen);
         argv += optind;
         //argc -= optind;
         if (argv[0])
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 471ae1a12..192e42fe5 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -794,8 +794,8 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
  e_found:
 
         // -g -G -t -r deleted, unimplemented -a deleted too
-        opt_complementary = "?2:vv:ll:w+"; /* max 2 params; -v and -l are counters; -w N */
-        getopt32(argv, "np:s:uvw:" IF_NC_SERVER("lk")
+        opt_complementary = "?2:vv:ll"; /* max 2 params; -v and -l are counters; -w N */
+        getopt32(argv, "np:s:uvw:+" IF_NC_SERVER("lk")
                         IF_NC_EXTRA("i:o:z"),
                         &str_p, &str_s, &o_wait
                         IF_NC_EXTRA(, &str_i, &str_o), &o_verbose IF_NC_SERVER(, &cnt_l));
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 410318979..130cef0af 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -267,7 +267,6 @@ typedef struct {
 
 typedef struct {
         len_and_sockaddr *p_lsa;
-        char             *p_hostname;
         char             *p_dotted;
         int              p_fd;
         int              datapoint_idx;
@@ -293,6 +292,7 @@ typedef struct {
         datapoint_t      filter_datapoint[NUM_DATAPOINTS];
         /* last sent packet: */
         msg_t            p_xmt_msg;
+        char             p_hostname[1];
 } peer_t;
 
 
@@ -765,14 +765,38 @@ reset_peer_stats(peer_t *p, double offset)
 }
 
 static void
+resolve_peer_hostname(peer_t *p, int loop_on_fail)
+{
+        len_and_sockaddr *lsa;
+
+ again:
+        lsa = host2sockaddr(p->p_hostname, 123);
+        if (!lsa) {
+                /* error message already emitted by host2sockaddr() */
+                if (!loop_on_fail)
+                        return;
+//FIXME: do this to avoid infinite looping on typo in a hostname?
+//well... in which case, what is a good value for loop_on_fail?
+                //if (--loop_on_fail == 0)
+                //      xfunc_die();
+                sleep(5);
+                goto again;
+        }
+        free(p->p_lsa);
+        free(p->p_dotted);
+        p->p_lsa = lsa;
+        p->p_dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
+}
+
+static void
 add_peers(const char *s)
 {
         llist_t *item;
         peer_t *p;
 
-        p = xzalloc(sizeof(*p));
-        p->p_lsa = xhost2sockaddr(s, 123);
-        p->p_dotted = xmalloc_sockaddr2dotted_noport(&p->p_lsa->u.sa);
+        p = xzalloc(sizeof(*p) + strlen(s));
+        strcpy(p->p_hostname, s);
+        resolve_peer_hostname(p, /*loop_on_fail=*/ 1);
 
         /* Names like N.<country2chars>.pool.ntp.org are randomly resolved
          * to a pool of machines. Sometimes different N's resolve to the same IP.
@@ -789,7 +813,6 @@ add_peers(const char *s)
                 }
         }
 
-        p->p_hostname = xstrdup(s);
         p->p_fd = -1;
         p->p_xmt_msg.m_status = MODE_CLIENT | (NTP_VERSION << 3);
         p->next_action_time = G.cur_time; /* = set_next(p, 0); */
@@ -2174,11 +2197,11 @@ static NOINLINE void ntp_init(char **argv)
 
         /* Parse options */
         peers = NULL;
-        opt_complementary = "dd:p::wn"         /* -d: counter; -p: list; -w implies -n */
+        opt_complementary = "dd:wn"  /* -d: counter; -p: list; -w implies -n */
                 IF_FEATURE_NTPD_SERVER(":Il"); /* -I implies -l */
         opts = getopt32(argv,
                         "nqNx" /* compat */
-                        "wp:S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */
+                        "wp:*S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */
                         IF_FEATURE_NTPD_SERVER("I:") /* compat */
                         "d" /* compat */
                         "46aAbgL", /* compat, ignored */
@@ -2190,6 +2213,31 @@ static NOINLINE void ntp_init(char **argv)
 
 //      if (opts & OPT_x) /* disable stepping, only slew is allowed */
 //              G.time_was_stepped = 1;
+
+#if ENABLE_FEATURE_NTPD_SERVER
+        G_listen_fd = -1;
+        if (opts & OPT_l) {
+                G_listen_fd = create_and_bind_dgram_or_die(NULL, 123);
+                if (G.if_name) {
+                        if (setsockopt_bindtodevice(G_listen_fd, G.if_name))
+                                xfunc_die();
+                }
+                socket_want_pktinfo(G_listen_fd);
+                setsockopt_int(G_listen_fd, IPPROTO_IP, IP_TOS, IPTOS_LOWDELAY);
+        }
+#endif
+        /* I hesitate to set -20 prio. -15 should be high enough for timekeeping */
+        if (opts & OPT_N)
+                setpriority(PRIO_PROCESS, 0, -15);
+
+        /* add_peers() calls can retry DNS resolution (possibly forever).
+         * Daemonize before them, or else boot can stall forever.
+         */
+        if (!(opts & OPT_n)) {
+                bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO, argv);
+                logmode = LOGMODE_NONE;
+        }
+
         if (peers) {
                 while (peers)
                         add_peers(llist_pop(&peers));
@@ -2218,26 +2266,6 @@ static NOINLINE void ntp_init(char **argv)
                 /* -l but no peers: "stratum 1 server" mode */
                 G.stratum = 1;
         }
-#if ENABLE_FEATURE_NTPD_SERVER
-        G_listen_fd = -1;
-        if (opts & OPT_l) {
-                G_listen_fd = create_and_bind_dgram_or_die(NULL, 123);
-                if (opts & OPT_I) {
-                        if (setsockopt_bindtodevice(G_listen_fd, G.if_name))
-                                xfunc_die();
-                }
-                socket_want_pktinfo(G_listen_fd);
-                setsockopt_int(G_listen_fd, IPPROTO_IP, IP_TOS, IPTOS_LOWDELAY);
-        }
-#endif
-        if (!(opts & OPT_n)) {
-                bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO, argv);
-                logmode = LOGMODE_NONE;
-        }
-        /* I hesitate to set -20 prio. -15 should be high enough for timekeeping */
-        if (opts & OPT_N)
-                setpriority(PRIO_PROCESS, 0, -15);
-
         /* If network is up, syncronization occurs in ~10 seconds.
          * We give "ntpd -q" 10 seconds to get first reply,
          * then another 50 seconds to finish syncing.
@@ -2338,18 +2366,8 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
                                                         p->p_dotted, p->reachable_bits, timeout);
 
                                         /* What if don't see it because it changed its IP? */
-                                        if (p->reachable_bits == 0) {
-                                                len_and_sockaddr *lsa = host2sockaddr(p->p_hostname, 123);
-                                                if (lsa) {
-                                                        char *dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
-                                                        //if (strcmp(dotted, p->p_dotted) != 0)
-                                                        //      bb_error_msg("peer IP changed");
-                                                        free(p->p_lsa);
-                                                        free(p->p_dotted);
-                                                        p->p_lsa = lsa;
-                                                        p->p_dotted = dotted;
-                                                }
-                                        }
+                                        if (p->reachable_bits == 0)
+                                                resolve_peer_hostname(p, /*loop_on_fail=*/ 0);
 
                                         set_next(p, timeout);
                                 }
diff --git a/networking/ping.c b/networking/ping.c
index cfe682646..82d5b7a85 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -186,6 +186,7 @@ create_icmp_socket(void)
 struct globals {
         char *hostname;
         char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
+        uint16_t myid;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
@@ -204,6 +205,7 @@ static void ping4(len_and_sockaddr *lsa)
         pkt = (struct icmp *) G.packet;
         /*memset(pkt, 0, sizeof(G.packet)); already is */
         pkt->icmp_type = ICMP_ECHO;
+        pkt->icmp_id = G.myid;
         pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, sizeof(G.packet));
 
         xsendto(pingsock, G.packet, DEFDATALEN + ICMP_MINLEN, &lsa->u.sa, lsa->len);
@@ -228,6 +230,8 @@ static void ping4(len_and_sockaddr *lsa)
                         struct iphdr *iphdr = (struct iphdr *) G.packet;
 
                         pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2));   /* skip ip hdr */
+                        if (pkt->icmp_id != G.myid)
+                                continue; /* not our ping */
                         if (pkt->icmp_type == ICMP_ECHOREPLY)
                                 break;
                 }
@@ -246,6 +250,7 @@ static void ping6(len_and_sockaddr *lsa)
         pkt = (struct icmp6_hdr *) G.packet;
         /*memset(pkt, 0, sizeof(G.packet)); already is */
         pkt->icmp6_type = ICMP6_ECHO_REQUEST;
+        pkt->icmp6_id = G.myid;
 
         sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
         setsockopt_int(pingsock, SOL_RAW, IPV6_CHECKSUM, sockopt);
@@ -269,6 +274,8 @@ static void ping6(len_and_sockaddr *lsa)
                         continue;
                 }
                 if (c >= ICMP_MINLEN) { /* icmp6_hdr */
+                        if (pkt->icmp6_id != G.myid)
+                                continue; /* not our ping */
                         if (pkt->icmp6_type == ICMP6_ECHO_REPLY)
                                 break;
                 }
@@ -317,6 +324,7 @@ static int common_ping_main(sa_family_t af, char **argv)
         alarm(5); /* give the host 5000ms to respond */
 
         create_icmp_socket(lsa);
+        G.myid = (uint16_t) getpid();
 #if ENABLE_PING6
         if (lsa->u.sa.sa_family == AF_INET6)
                 ping6(lsa);
@@ -333,7 +341,7 @@ static int common_ping_main(sa_family_t af, char **argv)
 
 /* Full(er) version */
 
-#define OPT_STRING ("qvc:s:t:w:W:I:np:4" IF_PING6("6"))
+#define OPT_STRING ("qvc:+s:t:+w:+W:+I:np:4" IF_PING6("6"))
 enum {
         OPT_QUIET = 1 << 0,
         OPT_VERBOSE = 1 << 1,
@@ -857,7 +865,7 @@ static int common_ping_main(int opt, char **argv)
         INIT_G();
 
         /* exactly one argument needed; -v and -q don't mix; -c NUM, -t NUM, -w NUM, -W NUM */
-        opt_complementary = "=1:q--v:v--q:c+:t+:w+:W+";
+        opt_complementary = "=1:q--v:v--q";
         opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_I, &str_p);
         if (opt & OPT_s)
                 datalen = xatou16(str_s); // -s
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 31bc70459..fbd1f1c45 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -232,9 +232,9 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
         tcp = (applet_name[0] == 't');
 
         /* 3+ args, -i at most once, -p implies -h, -v is counter, -b N, -c N */
-        opt_complementary = "-3:i--i:ph:vv:b+:c+";
+        opt_complementary = "-3:i--i:ph:vv";
 #ifdef SSLSVD
-        opts = getopt32(argv, "+c:C:i:x:u:l:Eb:hpt:vU:/:Z:K:",
+        opts = getopt32(argv, "+c:+C:i:x:u:l:Eb:+hpt:vU:/:Z:K:",
                 &cmax, &str_C, &instructs, &instructs, &user, &preset_local_hostname,
                 &backlog, &str_t, &ssluser, &root, &cert, &key, &verbose
         );
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 13c36aa46..2fbdc3bb3 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -496,12 +496,12 @@ int telnetd_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
 
         /* -w NUM, and implies -F. -w and -i don't mix */
-        IF_FEATURE_TELNETD_INETD_WAIT(opt_complementary = "wF:w+:i--w:w--i";)
+        IF_FEATURE_TELNETD_INETD_WAIT(opt_complementary = "wF:i--w:w--i";)
         /* Even if !STANDALONE, we accept (and ignore) -i, thus people
          * don't need to guess whether it's ok to pass -i to us */
         opt = getopt32(argv, "f:l:Ki"
                         IF_FEATURE_TELNETD_STANDALONE("p:b:F")
-                        IF_FEATURE_TELNETD_INETD_WAIT("Sw:"),
+                        IF_FEATURE_TELNETD_INETD_WAIT("Sw:+"),
                         &G.issuefile, &G.loginpath
                         IF_FEATURE_TELNETD_STANDALONE(, &opt_portnbr, &opt_bindaddr)
                         IF_FEATURE_TELNETD_INETD_WAIT(, &sec_linger)
diff --git a/networking/traceroute.c b/networking/traceroute.c
index eee4f8873..e43a36dc7 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -294,7 +294,7 @@
 
 #define OPT_STRING \
         "FIlnrdvxt:i:m:p:q:s:w:z:f:" \
-        IF_FEATURE_TRACEROUTE_SOURCE_ROUTE("g:") \
+        IF_FEATURE_TRACEROUTE_SOURCE_ROUTE("g:*") \
         "4" IF_TRACEROUTE6("6")
 enum {
         OPT_DONT_FRAGMNT = (1 << 0),    /* F */
@@ -819,7 +819,7 @@ common_traceroute_main(int op, char **argv)
         INIT_G();
 
         /* minimum 1 arg */
-        opt_complementary = "-1:x-x" IF_FEATURE_TRACEROUTE_SOURCE_ROUTE(":g::");
+        opt_complementary = "-1:x-x";
         op |= getopt32(argv, OPT_STRING
                 , &tos_str, &device, &max_ttl_str, &port_str, &nprobes_str
                 , &source, &waittime_str, &pausemsecs_str, &first_ttl_str
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index c77669a31..6ff040d9e 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -793,7 +793,11 @@ static void perform_renew(void)
 static void perform_d6_release(struct in6_addr *server_ipv6, struct in6_addr *our_cur_ipv6)
 {
         /* send release packet */
-        if (state == BOUND || state == RENEWING || state == REBINDING) {
+        if (state == BOUND
+         || state == RENEWING
+         || state == REBINDING
+         || state == RENEW_REQUESTED
+        ) {
                 bb_error_msg("unicasting a release");
                 send_d6_release(server_ipv6, our_cur_ipv6); /* unicast */
                 d6_run_script(NULL, "deconfig");
@@ -940,9 +944,9 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
 
         /* Parse command line */
         /* O,x: list; -T,-t,-A take numeric param */
-        opt_complementary = "O::x::T+:t+:A+" IF_UDHCP_VERBOSE(":vv") ;
+        IF_UDHCP_VERBOSE(opt_complementary = "vv";)
         IF_LONG_OPTS(applet_long_options = udhcpc6_longopts;)
-        opt = getopt32(argv, "i:np:qRr:s:T:t:SA:O:ox:f"
+        opt = getopt32(argv, "i:np:qRr:s:T:+t:+SA:+O:*ox:*f"
                 USE_FOR_MMU("b")
                 ///IF_FEATURE_UDHCPC_ARPING("a")
                 IF_FEATURE_UDHCP_PORT("P:")
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index fc7b6216d..8a16e987d 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1118,7 +1118,11 @@ static void perform_release(uint32_t server_addr, uint32_t requested_ip)
         struct in_addr temp_addr;
 
         /* send release packet */
-        if (state == BOUND || state == RENEWING || state == REBINDING) {
+        if (state == BOUND
+         || state == RENEWING
+         || state == REBINDING
+         || state == RENEW_REQUESTED
+        ) {
                 temp_addr.s_addr = server_addr;
                 strcpy(buffer, inet_ntoa(temp_addr));
                 temp_addr.s_addr = requested_ip;
@@ -1279,9 +1283,9 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 
         /* Parse command line */
         /* O,x: list; -T,-t,-A take numeric param */
-        opt_complementary = "O::x::T+:t+:A+" IF_UDHCP_VERBOSE(":vv") ;
+        IF_UDHCP_VERBOSE(opt_complementary = "vv";)
         IF_LONG_OPTS(applet_long_options = udhcpc_longopts;)
-        opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fB"
+        opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB"
                 USE_FOR_MMU("b")
                 IF_FEATURE_UDHCPC_ARPING("a::")
                 IF_FEATURE_UDHCP_PORT("P:")
diff --git a/networking/wget.c b/networking/wget.c
index c725edb5b..c886dd391 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1274,9 +1274,8 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
         applet_long_options = wget_longopts;
 #endif
         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:"
+        getopt32(argv, "csqO:P:Y:U:T:+"
                 /*ignored:*/ "t:"
                 /*ignored:*/ "n::"
                 /* wget has exactly four -n<letter> opts, all of which we can ignore:
diff --git a/networking/whois.c b/networking/whois.c
index bf330334a..c9dfcf5ee 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -21,43 +21,158 @@
 //kbuild:lib-$(CONFIG_WHOIS) += whois.o
 
 //usage:#define whois_trivial_usage
-//usage:       "[-h SERVER] [-p PORT] NAME..."
+//usage:       "[-i] [-h SERVER] [-p PORT] NAME..."
 //usage:#define whois_full_usage "\n\n"
 //usage:       "Query WHOIS info about NAME\n"
+//usage:     "\n        -i      Show redirect results too"
 //usage:     "\n        -h,-p   Server to query"
 
 #include "libbb.h"
 
-static void pipe_out(int fd)
+enum {
+        OPT_i = (1 << 0),
+};
+
+static char *query(const char *host, int port, const char *domain)
 {
+        int fd;
         FILE *fp;
-        char buf[1024];
+        bool success;
+        char *redir = NULL;
+        const char *pfx = "";
+        char linebuf[1024];
+        char *buf = NULL;
+        unsigned bufpos = 0;
 
+ again:
+        printf("[Querying %s:%d '%s%s']\n", host, port, pfx, domain);
+        fd = create_and_connect_stream_or_die(host, port);
+        success = 0;
+        fdprintf(fd, "%s%s\r\n", pfx, domain);
         fp = xfdopen_for_read(fd);
-        while (fgets(buf, sizeof(buf), fp)) {
-                char *p = strpbrk(buf, "\r\n");
-                if (p)
-                        *p = '\0';
-                puts(buf);
-        }
 
+        while (fgets(linebuf, sizeof(linebuf), fp)) {
+                unsigned len = strcspn(linebuf, "\r\n");
+                linebuf[len++] = '\n';
+
+                buf = xrealloc(buf, bufpos + len + 1);
+                memcpy(buf + bufpos, linebuf, len);
+                bufpos += len;
+                buf[bufpos] = '\0';
+
+                if (!redir || !success) {
+                        trim(linebuf);
+                        str_tolower(linebuf);
+                        if (!success) {
+                                success = is_prefixed_with(linebuf, "domain:")
+                                       || is_prefixed_with(linebuf, "domain name:");
+                        }
+                        else if (!redir) {
+                                char *p = is_prefixed_with(linebuf, "whois server:");
+                                if (!p)
+                                        p = is_prefixed_with(linebuf, "whois:");
+                                if (p)
+                                        redir = xstrdup(skip_whitespace(p));
+                        }
+                }
+        }
         fclose(fp); /* closes fd too */
+        if (!success && !pfx[0]) {
+                /*
+                 * Looking at /etc/jwhois.conf, some whois servers use
+                 * "domain = DOMAIN", "DOMAIN ID <DOMAIN>"
+                 * and "domain=DOMAIN_WITHOUT_LAST_COMPONENT"
+                 * formats, but those are rare.
+                 * (There are a few even more contrived ones.)
+                 * We are trying only "domain DOMAIN", the typical one.
+                 */
+                pfx = "domain ";
+                bufpos = 0;
+                goto again;
+        }
+
+        /* Success */
+        if (redir && strcmp(redir, host) == 0) {
+                /* Redirect to self does not count */
+                free(redir);
+                redir = NULL;
+        }
+        if (!redir || (option_mask32 & OPT_i)) {
+                /* Output saved text */
+                printf("[%s]\n%s", host, buf ? buf : "");
+        }
+        free(buf);
+        return redir;
+}
+
+static void recursive_query(const char *host, int port, const char *domain)
+{
+        char *free_me = NULL;
+        char *redir;
+ again:
+        redir = query(host, port, domain);
+        free(free_me);
+        if (redir) {
+                printf("[Redirected to %s]\n", redir);
+                host = free_me = redir;
+                port = 43;
+                goto again;
+        }
 }
 
+/* One of "big" whois implementations has these options:
+ *
+ * $ whois --help
+ * jwhois version 4.0, Copyright (C) 1999-2007  Free Software Foundation, Inc.
+ * -v, --verbose              verbose debug output
+ * -c FILE, --config=FILE     use FILE as configuration file
+ * -h HOST, --host=HOST       explicitly query HOST
+ * -n, --no-redirect          disable content redirection
+ * -s, --no-whoisservers      disable whois-servers.net service support
+ * -a, --raw                  disable reformatting of the query
+ * -i, --display-redirections display all redirects instead of hiding them
+ * -p PORT, --port=PORT       use port number PORT (in conjunction with HOST)
+ * -r, --rwhois               force an rwhois query to be made
+ * --rwhois-display=DISPLAY   sets the display option in rwhois queries
+ * --rwhois-limit=LIMIT       sets the maximum number of matches to return
+ *
+ * Example of its output:
+ * $ whois cnn.com
+ * [Querying whois.verisign-grs.com]
+ * [Redirected to whois.corporatedomains.com]
+ * [Querying whois.corporatedomains.com]
+ * [whois.corporatedomains.com]
+ * ...text of the reply...
+ *
+ * With -i, reply from each server is printed, after all redirects are done:
+ * [Querying whois.verisign-grs.com]
+ * [Redirected to whois.corporatedomains.com]
+ * [Querying whois.corporatedomains.com]
+ * [whois.verisign-grs.com]
+ * ...text of the reply...
+ * [whois.corporatedomains.com]
+ * ...text of the reply...
+ *
+ * With -a, no "DOMAIN" -> "domain DOMAIN" transformation is attempted.
+
+ * With -n, the first reply is shown, redirects are not followed:
+ * [Querying whois.verisign-grs.com]
+ * [whois.verisign-grs.com]
+ * ...text of the reply...
+ */
+
 int whois_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int whois_main(int argc UNUSED_PARAM, char **argv)
 {
         int port = 43;
-        const char *host = "whois-servers.net";
-
-        opt_complementary = "-1:p+";
-        getopt32(argv, "h:p:", &host, &port);
+        const char *host = "whois.iana.org";
 
+        opt_complementary = "-1";
+        getopt32(argv, "ih:p:+", &host, &port);
         argv += optind;
+
         do {
-                int fd = create_and_connect_stream_or_die(host, port);
-                fdprintf(fd, "%s\r\n", *argv);
-                pipe_out(fd);
+                recursive_query(host, port, *argv);
         }
         while (*++argv);