Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into merge

Conflicts:
	coreutils/ls.c
	shell/ash.c

12 files changed, 344 insertions, 133 deletions

diff --git a/networking/Config.src b/networking/Config.src
index 274fcae3a..8aeba0ef9 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -51,21 +51,21 @@ config VERBOSE_RESOLUTION_ERRORS
 config ARP
         bool "arp"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           Manipulate the system ARP cache.
 
 config ARPING
         bool "arping"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           Ping hosts by ARP packets.
 
 config BRCTL
         bool "brctl"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           Manage ethernet bridges.
           Supports addbr/delbr and addif/delif.
@@ -98,7 +98,7 @@ config DNSD
 config ETHER_WAKE
         bool "ether-wake"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           Send a magic packet to wake up sleeping machines.
 
@@ -281,7 +281,7 @@ config FEATURE_HTTPD_GZIP
 config IFCONFIG
         bool "ifconfig"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           Ifconfig is used to configure the kernel-resident network interfaces.
 
@@ -329,7 +329,7 @@ config FEATURE_IFCONFIG_BROADCAST_PLUS
 config IFENSLAVE
         bool "ifenslave"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           Userspace application to bind several interfaces
           to a logical interface (use with kernel bonding driver).
@@ -337,7 +337,7 @@ config IFENSLAVE
 config IFPLUGD
         bool "ifplugd"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           Network interface plug detection daemon.
 
@@ -379,7 +379,8 @@ config FEATURE_IFUPDOWN_IP
 config FEATURE_IFUPDOWN_IP_BUILTIN
         bool "Use busybox ip applet"
         default y
-        depends on FEATURE_IFUPDOWN_IP && PLATFORM_LINUX
+        depends on FEATURE_IFUPDOWN_IP
+        select PLATFORM_LINUX
         select IP
         select FEATURE_IP_ADDRESS
         select FEATURE_IP_LINK
@@ -498,7 +499,7 @@ config FEATURE_INETD_RPC
 config IP
         bool "ip"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           The "ip" applet is a TCP/IP interface configuration and routing
           utility. You generally don't need "ip" to use busybox with
@@ -611,39 +612,10 @@ config FEATURE_IPCALC_LONG_OPTIONS
         help
           Support long options for the ipcalc applet.
 
-config NAMEIF
-        bool "nameif"
-        default y
-        depends on PLATFORM_LINUX
-        select FEATURE_SYSLOG
-        help
-          nameif is used to rename network interface by its MAC address.
-          Renamed interfaces MUST be in the down state.
-          It is possible to use a file (default: /etc/mactab)
-          with list of new interface names and MACs.
-          Maximum interface name length: IFNAMSIZ = 16
-          File fields are separated by space or tab.
-          File format:
-          # Comment
-          new_interface_name    XX:XX:XX:XX:XX:XX
-
-config FEATURE_NAMEIF_EXTENDED
-        bool "Extended nameif"
-        default y
-        depends on NAMEIF
-        help
-          This extends the nameif syntax to support the bus_info and driver
-          checks. The syntax is compatible to the normal nameif.
-          File format:
-            new_interface_name  driver=asix bus=usb-0000:00:08.2-3
-            new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
-            new_interface_name  mac=00:80:C8:38:91:B5
-            new_interface_name  00:80:C8:38:91:B5
-
 config NETSTAT
         bool "netstat"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           netstat prints information about the Linux networking subsystem.
 
@@ -672,7 +644,7 @@ config NSLOOKUP
 config NTPD
         bool "ntpd"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           The NTP client/server daemon.
 
@@ -693,14 +665,14 @@ config PSCAN
 config ROUTE
         bool "route"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           Route displays or manipulates the kernel's IP routing tables.
 
 config SLATTACH
         bool "slattach"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           slattach is a small utility to attach network interfaces to serial
           lines.
@@ -887,7 +859,7 @@ config TFTP_DEBUG
 config TRACEROUTE
         bool "traceroute"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           Utility to trace the route of IP packets.
 
@@ -924,7 +896,7 @@ config FEATURE_TRACEROUTE_USE_ICMP
 config TUNCTL
         bool "tunctl"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           tunctl creates or deletes tun devices.
 
@@ -957,7 +929,7 @@ config UDPSVD
 config VCONFIG
         bool "vconfig"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           Creates, removes, and configures VLAN interfaces
 
@@ -1004,7 +976,7 @@ config FEATURE_WGET_TIMEOUT
 config ZCIP
         bool "zcip"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         select FEATURE_SYSLOG
         help
           ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
diff --git a/networking/ftpd.c b/networking/ftpd.c
index 64068e467..b59135667 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -12,6 +12,23 @@
  * You have to run this daemon via inetd.
  */
 
+//usage:#define ftpd_trivial_usage
+//usage:       "[-wvS] [-t N] [-T N] [DIR]"
+//usage:#define ftpd_full_usage "\n\n"
+//usage:       "Anonymous FTP server\n"
+//usage:       "\n"
+//usage:       "ftpd should be used as an inetd service.\n"
+//usage:       "ftpd's line for inetd.conf:\n"
+//usage:       "        21 stream tcp nowait root ftpd ftpd /files/to/serve\n"
+//usage:       "It also can be ran from tcpsvd:\n"
+//usage:       "        tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -w      Allow upload"
+//usage:     "\n        -v      Log errors to stderr. -vv: verbose log"
+//usage:     "\n        -S      Log errors to syslog. -SS: verbose log"
+//usage:     "\n        -t,-T   Idle and absolute timeouts"
+//usage:     "\n        DIR     Change root to this directory"
+
 #include "libbb.h"
 #include <syslog.h>
 #include <netinet/tcp.h>
@@ -206,7 +223,7 @@ cmdio_write_error(unsigned status)
 {
         *(uint32_t *) G.msg_err = status;
         xwrite(STDOUT_FILENO, G.msg_err, sizeof("NNN " MSG_ERR) - 1);
-        if (G.verbose > 1)
+        if (G.verbose > 0)
                 verbose_log(G.msg_err);
 }
 #define WRITE_ERR(a) cmdio_write_error(STRNUM32sp(a))
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 59df4e80f..7706a84b7 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -106,6 +106,7 @@ enum {
 struct globals {
         char **my_environ;
         const char *startup_PATH;
+        char *shell;
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define INIT_G() do { } while (0)
@@ -986,11 +987,10 @@ static int doit(char *str)
 
                 fflush_all();
                 child = vfork();
-                switch (child) {
-                case -1: /* failure */
+                if (child < 0) /* failure */
                         return 0;
-                case 0: /* child */
-                        execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, (char *) NULL, G.my_environ);
+                if (child == 0) { /* child */
+                        execle(G.shell, G.shell, "-c", str, (char *) NULL, G.my_environ);
                         _exit(127);
                 }
                 safe_waitpid(child, &status, 0);
@@ -1165,6 +1165,7 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
 
         G.startup_PATH = getenv("PATH");
+        G.shell = xstrdup(get_shell_name());
 
         cmds = iface_down;
         if (applet_name[2] == 'u') {
@@ -1220,13 +1221,13 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
                                 /* ifup */
                                 if (iface_state) {
                                         bb_error_msg("interface %s already configured", iface);
-                                        continue;
+                                        goto next;
                                 }
                         } else {
                                 /* ifdown */
                                 if (!iface_state) {
                                         bb_error_msg("interface %s not configured", iface);
-                                        continue;
+                                        goto next;
                                 }
                         }
                         llist_free(state_list, free);
@@ -1316,6 +1317,9 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
                         fclose(state_fp);
                         llist_free(state_list, free);
                 }
+ next:
+                free(iface);
+                free(liface);
         }
 
         return any_failures;
diff --git a/networking/nameif.c b/networking/nameif.c
index d02c2c11b..78719edac 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -10,6 +10,66 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//config:config NAMEIF
+//config:       bool "nameif"
+//config:       default y
+//config:       select PLATFORM_LINUX
+//config:       select FEATURE_SYSLOG
+//config:       help
+//config:         nameif is used to rename network interface by its MAC address.
+//config:         Renamed interfaces MUST be in the down state.
+//config:         It is possible to use a file (default: /etc/mactab)
+//config:         with list of new interface names and MACs.
+//config:         Maximum interface name length: IFNAMSIZ = 16
+//config:         File fields are separated by space or tab.
+//config:         File format:
+//config:         # Comment
+//config:         new_interface_name    XX:XX:XX:XX:XX:XX
+//config:
+//config:config FEATURE_NAMEIF_EXTENDED
+//config:       bool "Extended nameif"
+//config:       default y
+//config:       depends on NAMEIF
+//config:       help
+//config:         This extends the nameif syntax to support the bus_info, driver,
+//config:         phyaddr selectors. The syntax is compatible to the normal nameif.
+//config:         File format:
+//config:           new_interface_name  driver=asix bus=usb-0000:00:08.2-3
+//config:           new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
+//config:           new_interface_name  phy_address=2 00:80:C8:38:91:B5
+//config:           new_interface_name  mac=00:80:C8:38:91:B5
+//config:           new_interface_name  00:80:C8:38:91:B5
+
+//usage:#define nameif_trivial_usage
+//usage:        IF_NOT_FEATURE_NAMEIF_EXTENDED(
+//usage:                "[-s] [-c FILE] [IFNAME HWADDR]..."
+//usage:        )
+//usage:        IF_FEATURE_NAMEIF_EXTENDED(
+//usage:                "[-s] [-c FILE] [IFNAME SELECTOR]..."
+//usage:        )
+//usage:#define nameif_full_usage "\n\n"
+//usage:        "Rename network interface while it in the down state."
+//usage:        IF_NOT_FEATURE_NAMEIF_EXTENDED(
+//usage:     "\nThe device with address HWADDR is renamed to IFACE."
+//usage:        )
+//usage:        IF_FEATURE_NAMEIF_EXTENDED(
+//usage:     "\nThe device matched by SELECTOR is renamed to IFACE."
+//usage:     "\nSELECTOR can be a combination of:"
+//usage:     "\n        driver=STRING"
+//usage:     "\n        bus=STRING"
+//usage:     "\n        phy_address=NUM"
+//usage:     "\n        [mac=]XX:XX:XX:XX:XX:XX"
+//usage:        )
+//usage:     "\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -c FILE Configuration file (default: /etc/mactab)"
+//usage:     "\n        -s      Log to syslog"
+//usage:
+//usage:#define nameif_example_usage
+//usage:       "$ nameif -s dmz0 00:A0:C9:8C:F6:3F\n"
+//usage:       " or\n"
+//usage:       "$ nameif -c /etc/my_mactab_file\n"
+
 #include "libbb.h"
 #include <syslog.h>
 #include <net/if.h>
@@ -38,6 +98,7 @@ typedef struct ethtable_s {
 #if ENABLE_FEATURE_NAMEIF_EXTENDED
         char *bus_info;
         char *driver;
+        int32_t phy_address;
 #endif
 } ethtable_t;
 
@@ -59,6 +120,25 @@ struct ethtool_drvinfo {
         uint32_t eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
         uint32_t regdump_len;  /* Size of data from ETHTOOL_GREGS (bytes) */
 };
+
+struct ethtool_cmd {
+        __u32   cmd;
+        __u32   supported;      /* Features this interface supports */
+        __u32   advertising;    /* Features this interface advertises */
+        __u16   speed;          /* The forced speed, 10Mb, 100Mb, gigabit */
+        __u8    duplex;         /* Duplex, half or full */
+        __u8    port;           /* Which connector port */
+        __u8    phy_address;
+        __u8    transceiver;    /* Which transceiver to use */
+        __u8    autoneg;        /* Enable or disable autonegotiation */
+        __u32   maxtxpkt;       /* Tx pkts before generating tx int */
+        __u32   maxrxpkt;       /* Rx pkts before generating rx int */
+        __u16   speed_hi;
+        __u16   reserved2;
+        __u32   reserved[3];
+};
+
+#define ETHTOOL_GSET      0x00000001 /* Get settings. */
 #define ETHTOOL_GDRVINFO  0x00000003 /* Get driver info. */
 #endif
 
@@ -74,6 +154,7 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector)
 #endif
                 selector = skip_whitespace(selector);
 #if ENABLE_FEATURE_NAMEIF_EXTENDED
+                ch->phy_address = -1;
                 if (*selector == '\0')
                         break;
                 /* Search for the end .... */
@@ -87,6 +168,9 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector)
                 } else if (strncmp(selector, "driver=", 7) == 0) {
                         ch->driver = xstrdup(selector + 7);
                         found_selector++;
+                } else if (strncmp(selector, "phyaddr=", 8) == 0) {
+                        ch->phy_address = xatoi_positive(selector + 8);
+                        found_selector++;
                 } else {
 #endif
                         lmac = xmalloc(ETH_ALEN);
@@ -133,7 +217,7 @@ void delete_eth_table(ethtable_t *ch);
 #endif
 
 int nameif_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int nameif_main(int argc, char **argv)
+int nameif_main(int argc UNUSED_PARAM, char **argv)
 {
         ethtable_t *clist = NULL;
         const char *fname = "/etc/mactab";
@@ -148,17 +232,15 @@ int nameif_main(int argc, char **argv)
                  * can't hurt. 2>/dev/null if you don't like it: */
                 logmode |= LOGMODE_SYSLOG;
         }
-        argc -= optind;
         argv += optind;
 
-        if (argc & 1)
-                bb_show_usage();
-
-        if (argc) {
-                while (*argv) {
-                        char *ifname = xstrdup(*argv++);
-                        prepend_new_eth_table(&clist, ifname, *argv++);
-                }
+        if (argv[0]) {
+                do {
+                        if (!argv[1])
+                                bb_show_usage();
+                        prepend_new_eth_table(&clist, argv[0], argv[1]);
+                        argv += 2;
+                } while (*argv);
         } else {
                 parser = config_open(fname);
                 while (config_read(parser, token, 2, 2, "# \t", PARSE_NORMAL))
@@ -173,8 +255,9 @@ int nameif_main(int argc, char **argv)
                 struct ifreq ifr;
 #if  ENABLE_FEATURE_NAMEIF_EXTENDED
                 struct ethtool_drvinfo drvinfo;
+                struct ethtool_cmd eth_settings;
 #endif
-                if (parser->lineno < 2)
+                if (parser->lineno <= 2)
                         continue; /* Skip the first two lines */
 
                 /* Find the current interface name and copy it to ifr.ifr_name */
@@ -182,8 +265,14 @@ int nameif_main(int argc, char **argv)
                 strncpy_IFNAMSIZ(ifr.ifr_name, token[0]);
 
 #if ENABLE_FEATURE_NAMEIF_EXTENDED
+                /* Check for phy address */
+                memset(&eth_settings, 0, sizeof(eth_settings));
+                eth_settings.cmd = ETHTOOL_GSET;
+                ifr.ifr_data = (caddr_t) &eth_settings;
+                ioctl(ctl_sk, SIOCETHTOOL, &ifr);
+
                 /* Check for driver etc. */
-                memset(&drvinfo, 0, sizeof(struct ethtool_drvinfo));
+                memset(&drvinfo, 0, sizeof(drvinfo));
                 drvinfo.cmd = ETHTOOL_GDRVINFO;
                 ifr.ifr_data = (caddr_t) &drvinfo;
                 /* Get driver and businfo first, so we have it in drvinfo */
@@ -198,6 +287,8 @@ int nameif_main(int argc, char **argv)
                                 continue;
                         if (ch->driver && strcmp(ch->driver, drvinfo.driver) != 0)
                                 continue;
+                        if (ch->phy_address != -1 && ch->phy_address != eth_settings.phy_address)
+                                continue;
 #endif
                         if (ch->mac && memcmp(ch->mac, ifr.ifr_hwaddr.sa_data, ETH_ALEN) != 0)
                                 continue;
diff --git a/networking/nslookup.c b/networking/nslookup.c
index dcac7379e..67fc01547 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -66,7 +66,7 @@ static int print_host(const char *hostname, const char *header)
         // hint.ai_flags = AI_CANONNAME;
         rc = getaddrinfo(hostname, NULL /*service*/, &hint, &result);
 
-        if (!rc) {
+        if (rc == 0) {
                 struct addrinfo *cur = result;
                 unsigned cnt = 0;
 
@@ -94,7 +94,7 @@ static int print_host(const char *hostname, const char *header)
                 bb_error_msg("can't resolve '%s'", hostname);
 #endif
         }
-        if (ENABLE_FEATURE_CLEAN_UP)
+        if (ENABLE_FEATURE_CLEAN_UP && result)
                 freeaddrinfo(result);
         return (rc != 0);
 }
diff --git a/networking/ping.c b/networking/ping.c
index c2ff42e2c..7a9c2d1f0 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -32,7 +32,7 @@
 //config:config PING
 //config:       bool "ping"
 //config:       default y
-//config:       depends on PLATFORM_LINUX
+//config:       select PLATFORM_LINUX
 //config:       help
 //config:         ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
 //config:         elicit an ICMP ECHO_RESPONSE from a host or gateway.
diff --git a/networking/route.c b/networking/route.c
index b7d08dd63..98a03ded7 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -537,6 +537,7 @@ void FAST_FUNC bb_displayroutes(int noresolve, int netstatfmt)
                         printf("%-6d %-2d %7d %s\n", metric, ref, use, devname);
                 }
         }
+        fclose(fp);
 }
 
 #if ENABLE_FEATURE_IPV6
@@ -604,7 +605,7 @@ static void INET6_displayroutes(void)
                 set_flags(flags, (iflags & IPV6_MASK));
 
                 r = 0;
-                do {
+                while (1) {
                         inet_pton(AF_INET6, addr6x + r,
                                           (struct sockaddr *) &snaddr6.sin6_addr);
                         snaddr6.sin6_family = AF_INET6;
@@ -623,8 +624,9 @@ static void INET6_displayroutes(void)
                                 free(naddr6);
                                 break;
                         }
-                } while (1);
+                }
         }
+        fclose(fp);
 }
 
 #endif
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index 750a53a32..9cd8cbbae 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -8,7 +8,7 @@ INSERT
 config UDHCPD
         bool "udhcp server (udhcpd)"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           udhcpd is a DHCP server geared primarily toward embedded systems,
           while striving to be fully functional and RFC compliant.
@@ -66,7 +66,7 @@ config DHCPD_LEASES_FILE
 config UDHCPC
         bool "udhcp client (udhcpc)"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           udhcpc is a DHCP client geared primarily toward embedded systems,
           while striving to be fully functional and RFC compliant.
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index d97a404fa..ca82d37e6 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -38,6 +38,67 @@
 /* struct client_config_t client_config is in bb_common_bufsiz1 */
 
 
+#if ENABLE_LONG_OPTS
+static const char udhcpc_longopts[] ALIGN1 =
+        "clientid-none\0"  No_argument       "C"
+        "vendorclass\0"    Required_argument "V"
+        "hostname\0"       Required_argument "H"
+        "fqdn\0"           Required_argument "F"
+        "interface\0"      Required_argument "i"
+        "now\0"            No_argument       "n"
+        "pidfile\0"        Required_argument "p"
+        "quit\0"           No_argument       "q"
+        "release\0"        No_argument       "R"
+        "request\0"        Required_argument "r"
+        "script\0"         Required_argument "s"
+        "timeout\0"        Required_argument "T"
+        "version\0"        No_argument       "v"
+        "retries\0"        Required_argument "t"
+        "tryagain\0"       Required_argument "A"
+        "syslog\0"         No_argument       "S"
+        "request-option\0" Required_argument "O"
+        "no-default-options\0" No_argument   "o"
+        "foreground\0"     No_argument       "f"
+        "background\0"     No_argument       "b"
+        "broadcast\0"      No_argument       "B"
+        IF_FEATURE_UDHCPC_ARPING("arping\0"     No_argument       "a")
+        IF_FEATURE_UDHCP_PORT("client-port\0"   Required_argument "P")
+        ;
+#endif
+/* Must match getopt32 option string order */
+enum {
+        OPT_C = 1 << 0,
+        OPT_V = 1 << 1,
+        OPT_H = 1 << 2,
+        OPT_h = 1 << 3,
+        OPT_F = 1 << 4,
+        OPT_i = 1 << 5,
+        OPT_n = 1 << 6,
+        OPT_p = 1 << 7,
+        OPT_q = 1 << 8,
+        OPT_R = 1 << 9,
+        OPT_r = 1 << 10,
+        OPT_s = 1 << 11,
+        OPT_T = 1 << 12,
+        OPT_t = 1 << 13,
+        OPT_S = 1 << 14,
+        OPT_A = 1 << 15,
+        OPT_O = 1 << 16,
+        OPT_o = 1 << 17,
+        OPT_x = 1 << 18,
+        OPT_f = 1 << 19,
+        OPT_B = 1 << 20,
+/* The rest has variable bit positions, need to be clever */
+        OPTBIT_B = 20,
+        USE_FOR_MMU(             OPTBIT_b,)
+        IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,)
+        IF_FEATURE_UDHCP_PORT(   OPTBIT_P,)
+        USE_FOR_MMU(             OPT_b = 1 << OPTBIT_b,)
+        IF_FEATURE_UDHCPC_ARPING(OPT_a = 1 << OPTBIT_a,)
+        IF_FEATURE_UDHCP_PORT(   OPT_P = 1 << OPTBIT_P,)
+};
+
+
 /*** Script execution code ***/
 
 /* get a rough idea of how long an option will be (rounding up...) */
@@ -346,11 +407,19 @@ static ALWAYS_INLINE uint32_t random_xid(void)
 /* Initialize the packet with the proper defaults */
 static void init_packet(struct dhcp_packet *packet, char type)
 {
+        uint16_t secs;
+
         /* Fill in: op, htype, hlen, cookie fields; message type option: */
         udhcp_init_header(packet, type);
 
         packet->xid = random_xid();
 
+        client_config.last_secs = monotonic_sec();
+        if (client_config.first_secs == 0)
+                client_config.first_secs = client_config.last_secs;
+        secs = client_config.last_secs - client_config.first_secs;
+        packet->secs = htons(secs);
+
         memcpy(packet->chaddr, client_config.client_mac, 6);
         if (client_config.clientid)
                 udhcp_add_binary_option(packet, client_config.clientid);
@@ -391,6 +460,10 @@ static void add_client_options(struct dhcp_packet *packet)
         if (client_config.fqdn)
                 udhcp_add_binary_option(packet, client_config.fqdn);
 
+        /* Request broadcast replies if we have no IP addr */
+        if ((option_mask32 & OPT_B) && packet->ciaddr == 0)
+                packet->flags |= htons(BROADCAST_FLAG);
+
         /* Add -x options if any */
         {
                 struct option_set *curr = client_config.options;
@@ -783,6 +856,7 @@ static void change_listen_mode(int new_mode)
         /* else LISTEN_NONE: sockfd stays closed */
 }
 
+/* Called only on SIGUSR1 */
 static void perform_renew(void)
 {
         bb_info_msg("Performing a DHCP renew");
@@ -853,13 +927,14 @@ static void client_background(void)
 //usage:# define IF_UDHCP_VERBOSE(...)
 //usage:#endif
 //usage:#define udhcpc_trivial_usage
-//usage:       "[-fbnq"IF_UDHCP_VERBOSE("v")"oCR] [-i IFACE] [-r IP] [-s PROG] [-p PIDFILE]\n"
+//usage:       "[-fbnq"IF_UDHCP_VERBOSE("v")"oCRB] [-i IFACE] [-r IP] [-s PROG] [-p PIDFILE]\n"
 //usage:       "        [-H HOSTNAME] [-V VENDOR] [-x OPT:VAL]... [-O OPT]..." IF_FEATURE_UDHCP_PORT(" [-P N]")
 //usage:#define udhcpc_full_usage "\n"
 //usage:        IF_LONG_OPTS(
 //usage:     "\n        -i,--interface IFACE    Interface to use (default eth0)"
 //usage:     "\n        -p,--pidfile FILE       Create pidfile"
 //usage:     "\n        -s,--script PROG        Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n        -B,--broadcast          Request broadcast replies"
 //usage:     "\n        -t,--retries N          Send up to N discover packets"
 //usage:     "\n        -T,--timeout N          Pause between packets (default 3 seconds)"
 //usage:     "\n        -A,--tryagain N         Wait N seconds after failure (default 20)"
@@ -897,6 +972,7 @@ static void client_background(void)
 //usage:     "\n        -i IFACE        Interface to use (default eth0)"
 //usage:     "\n        -p FILE         Create pidfile"
 //usage:     "\n        -s PROG         Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n        -B              Request broadcast replies"
 //usage:     "\n        -t N            Send up to N discover packets"
 //usage:     "\n        -T N            Pause between packets (default 3 seconds)"
 //usage:     "\n        -A N            Wait N seconds (default 20) after failure"
@@ -961,63 +1037,6 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
         struct dhcp_packet packet;
         fd_set rfds;
 
-#if ENABLE_LONG_OPTS
-        static const char udhcpc_longopts[] ALIGN1 =
-                "clientid-none\0"  No_argument       "C"
-                "vendorclass\0"    Required_argument "V"
-                "hostname\0"       Required_argument "H"
-                "fqdn\0"           Required_argument "F"
-                "interface\0"      Required_argument "i"
-                "now\0"            No_argument       "n"
-                "pidfile\0"        Required_argument "p"
-                "quit\0"           No_argument       "q"
-                "release\0"        No_argument       "R"
-                "request\0"        Required_argument "r"
-                "script\0"         Required_argument "s"
-                "timeout\0"        Required_argument "T"
-                "version\0"        No_argument       "v"
-                "retries\0"        Required_argument "t"
-                "tryagain\0"       Required_argument "A"
-                "syslog\0"         No_argument       "S"
-                "request-option\0" Required_argument "O"
-                "no-default-options\0" No_argument   "o"
-                "foreground\0"     No_argument       "f"
-                "background\0"     No_argument       "b"
-                IF_FEATURE_UDHCPC_ARPING("arping\0"     No_argument       "a")
-                IF_FEATURE_UDHCP_PORT("client-port\0"   Required_argument "P")
-                ;
-#endif
-        enum {
-                OPT_C = 1 << 0,
-                OPT_V = 1 << 1,
-                OPT_H = 1 << 2,
-                OPT_h = 1 << 3,
-                OPT_F = 1 << 4,
-                OPT_i = 1 << 5,
-                OPT_n = 1 << 6,
-                OPT_p = 1 << 7,
-                OPT_q = 1 << 8,
-                OPT_R = 1 << 9,
-                OPT_r = 1 << 10,
-                OPT_s = 1 << 11,
-                OPT_T = 1 << 12,
-                OPT_t = 1 << 13,
-                OPT_S = 1 << 14,
-                OPT_A = 1 << 15,
-                OPT_O = 1 << 16,
-                OPT_o = 1 << 17,
-                OPT_x = 1 << 18,
-                OPT_f = 1 << 19,
-/* The rest has variable bit positions, need to be clever */
-                OPTBIT_f = 19,
-                USE_FOR_MMU(             OPTBIT_b,)
-                IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,)
-                IF_FEATURE_UDHCP_PORT(   OPTBIT_P,)
-                USE_FOR_MMU(             OPT_b = 1 << OPTBIT_b,)
-                IF_FEATURE_UDHCPC_ARPING(OPT_a = 1 << OPTBIT_a,)
-                IF_FEATURE_UDHCP_PORT(   OPT_P = 1 << OPTBIT_P,)
-        };
-
         /* Default options */
         IF_FEATURE_UDHCP_PORT(SERVER_PORT = 67;)
         IF_FEATURE_UDHCP_PORT(CLIENT_PORT = 68;)
@@ -1033,7 +1052,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 #endif
                 ;
         IF_LONG_OPTS(applet_long_options = udhcpc_longopts;)
-        opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:f"
+        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:")
@@ -1250,6 +1269,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                         case BOUND:
                                 /* 1/2 lease passed, enter renewing state */
                                 state = RENEWING;
+                                client_config.first_secs = 0; /* make secs field count from 0 */
                                 change_listen_mode(LISTEN_KERNEL);
                                 log1("Entering renew state");
                                 /* fall right through */
@@ -1289,6 +1309,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                 bb_info_msg("Lease lost, entering init state");
                                 udhcp_run_script(NULL, "deconfig");
                                 state = INIT_SELECTING;
+                                client_config.first_secs = 0; /* make secs field count from 0 */
                                 /*timeout = 0; - already is */
                                 packet_num = 0;
                                 continue;
@@ -1305,6 +1326,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                 /* note: udhcp_sp_read checks FD_ISSET before reading */
                 switch (udhcp_sp_read(&rfds)) {
                 case SIGUSR1:
+                        client_config.first_secs = 0; /* make secs field count from 0 */
                         perform_renew();
                         if (state == RENEW_REQUESTED)
                                 goto case_RENEW_REQUESTED;
@@ -1436,6 +1458,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                                         udhcp_run_script(NULL, "deconfig");
                                                 change_listen_mode(LISTEN_RAW);
                                                 state = INIT_SELECTING;
+                                                client_config.first_secs = 0; /* make secs field count from 0 */
                                                 requested_ip = 0;
                                                 timeout = tryagain_timeout;
                                                 packet_num = 0;
@@ -1483,6 +1506,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                 change_listen_mode(LISTEN_RAW);
                                 sleep(3); /* avoid excessive network traffic */
                                 state = INIT_SELECTING;
+                                client_config.first_secs = 0; /* make secs field count from 0 */
                                 requested_ip = 0;
                                 timeout = 0;
                                 packet_num = 0;
diff --git a/networking/udhcp/dhcpc.h b/networking/udhcp/dhcpc.h
index 9ef053a1b..2b3599120 100644
--- a/networking/udhcp/dhcpc.h
+++ b/networking/udhcp/dhcpc.h
@@ -21,6 +21,9 @@ struct client_config_t {
         uint8_t *vendorclass;           /* Optional vendor class-id to use */
         uint8_t *hostname;              /* Optional hostname to use */
         uint8_t *fqdn;                  /* Optional fully qualified domain name to use */
+
+        uint16_t first_secs;
+        uint16_t last_secs;
 } FIX_ALIASING;
 
 /* server_config sits in 1st half of bb_common_bufsiz1 */
diff --git a/networking/wget.c b/networking/wget.c
index bbc161be8..41ec7f6dc 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -8,6 +8,32 @@
  * Copyright (C) 2010 Bradley M. Kuhn <bkuhn@ebb.org>
  * Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
  */
+
+//usage:#define wget_trivial_usage
+//usage:        IF_FEATURE_WGET_LONG_OPTIONS(
+//usage:       "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document FILE]\n"
+//usage:       "        [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n"
+//usage:       "        [--no-check-certificate] [-U|--user-agent AGENT]"
+//usage:                        IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
+//usage:        )
+//usage:        IF_NOT_FEATURE_WGET_LONG_OPTIONS(
+//usage:       "[-csq] [-O FILE] [-Y on/off] [-P DIR] [-U AGENT]"
+//usage:                        IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
+//usage:        )
+//usage:#define wget_full_usage "\n\n"
+//usage:       "Retrieve files via HTTP or FTP\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -s      Spider mode - only check file existence"
+//usage:     "\n        -c      Continue retrieval of aborted transfer"
+//usage:     "\n        -q      Quiet"
+//usage:     "\n        -P DIR  Save to DIR (default .)"
+//usage:        IF_FEATURE_WGET_TIMEOUT(
+//usage:     "\n        -T SEC  Network read timeout is SEC seconds"
+//usage:        )
+//usage:     "\n        -O FILE Save to FILE ('-' for stdout)"
+//usage:     "\n        -U STR  Use STR for User-Agent header"
+//usage:     "\n        -Y      Use proxy ('on' or 'off')"
+
 #include "libbb.h"
 
 //#define log_io(...) bb_error_msg(__VA_ARGS__)
@@ -604,8 +630,14 @@ static void download_one_url(const char *url)
                 if (G.fname_out[0] == '/' || !G.fname_out[0])
                         G.fname_out = (char*)"index.html";
                 /* -P DIR is considered only if there was no -O FILE */
-                if (G.dir_prefix)
-                        G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out);
+                else {
+                        if (G.dir_prefix)
+                                G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out);
+                        else {
+                                /* redirects may free target.path later, need to make a copy */
+                                G.fname_out = fname_out_alloc = xstrdup(G.fname_out);
+                        }
+                }
         }
 #if ENABLE_FEATURE_WGET_STATUSBAR
         G.curfile = bb_get_last_path_component_nostrip(G.fname_out);
diff --git a/networking/whois.c b/networking/whois.c
new file mode 100644
index 000000000..4eab9e5fe
--- /dev/null
+++ b/networking/whois.c
@@ -0,0 +1,66 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * whois - tiny client for the whois directory service
+ *
+ * Copyright (c) 2011 Pere Orga <gotrunks@gmail.com>
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+/* TODO
+ * Add ipv6 support
+ * Add proxy support
+ */
+
+//config:config WHOIS
+//config:       bool "whois"
+//config:       default y
+//config:       help
+//config:         whois is a client for the whois directory service
+
+//applet:IF_WHOIS(APPLET(whois, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_WHOIS) += whois.o
+
+//usage:#define whois_trivial_usage
+//usage:       "[-h SERVER] [-p PORT] NAME..."
+//usage:#define whois_full_usage "\n\n"
+//usage:       "Query WHOIS info about NAME\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -h,-p   Server to query"
+
+#include "libbb.h"
+
+static void pipe_out(int fd)
+{
+        FILE *fp;
+        char buf[1024];
+
+        fp = xfdopen_for_read(fd);
+        while (fgets(buf, sizeof(buf), fp)) {
+                char *p = strpbrk(buf, "\r\n");
+                if (p)
+                        *p = '\0';
+                puts(buf);
+        }
+
+        fclose(fp); /* closes fd too */
+}
+
+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);
+
+        argv += optind;
+        do {
+                int fd = create_and_connect_stream_or_die(host, port);
+                fdprintf(fd, "%s\r\n", *argv);
+                pipe_out(fd);
+        }
+        while (*++argv);
+
+        return EXIT_SUCCESS;
+}