Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge

Conflicts:
	coreutils/ls.c
	include/platform.h
	libbb/bb_basename.c

10 files changed, 116 insertions, 44 deletions

diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 66316e21f..f63df55f4 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -60,7 +60,7 @@ struct globals {
         FILE *control_stream;
         int verbose_flag;
         int do_continue;
-        char buf[1]; /* actually [BUFSZ] */
+        char buf[4]; /* actually [BUFSZ] */
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 enum { BUFSZ = COMMON_BUFSIZE - offsetof(struct globals, buf) };
@@ -105,7 +105,7 @@ static int ftpcmd(const char *s1, const char *s2)
         }
 
         do {
-                strcpy(buf, "EOF");
+                strcpy(buf, "EOF"); /* for ftp_die */
                 if (fgets(buf, BUFSZ - 2, control_stream) == NULL) {
                         ftp_die(NULL);
                 }
@@ -316,7 +316,6 @@ static const char ftpgetput_longopts[] ALIGN1 =
 int ftpgetput_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ftpgetput_main(int argc UNUSED_PARAM, char **argv)
 {
-        unsigned opt;
         const char *port = "ftp";
         /* socket to ftp server */
 
@@ -345,7 +344,7 @@ int ftpgetput_main(int argc UNUSED_PARAM, char **argv)
         applet_long_options = ftpgetput_longopts;
 #endif
         opt_complementary = "-2:vv:cc"; /* must have 2 to 3 params; -v and -c count */
-        opt = getopt32(argv, "cvu:p:P:", &user, &password, &port,
+        getopt32(argv, "cvu:p:P:", &user, &password, &port,
                                         &verbose_flag, &do_continue);
         argv += optind;
 
diff --git a/networking/httpd.c b/networking/httpd.c
index d6157aca2..d77342a2a 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -2424,7 +2424,7 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
                 salt[0] = '$';
                 salt[1] = '1';
                 salt[2] = '$';
-                crypt_make_salt(salt + 3, 4, 0);
+                crypt_make_salt(salt + 3, 4);
                 puts(pw_encrypt(pass, salt, 1));
                 return 0;
         }
diff --git a/networking/inetd.c b/networking/inetd.c
index 226a6491c..58ae089d1 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1164,12 +1164,17 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
         sigaddset(&sa.sa_mask, SIGALRM);
         sigaddset(&sa.sa_mask, SIGCHLD);
         sigaddset(&sa.sa_mask, SIGHUP);
+//FIXME: explain why no SA_RESTART
+//FIXME: retry_network_setup is unsafe to run in signal handler (many reasons)!
         sa.sa_handler = retry_network_setup;
         sigaction_set(SIGALRM, &sa);
+//FIXME: reread_config_file is unsafe to run in signal handler(many reasons)!
         sa.sa_handler = reread_config_file;
         sigaction_set(SIGHUP, &sa);
+//FIXME: reap_child is unsafe to run in signal handler (uses stdio)!
         sa.sa_handler = reap_child;
         sigaction_set(SIGCHLD, &sa);
+//FIXME: clean_up_and_exit is unsafe to run in signal handler (uses stdio)!
         sa.sa_handler = clean_up_and_exit;
         sigaction_set(SIGTERM, &sa);
         sa.sa_handler = clean_up_and_exit;
diff --git a/networking/ntpd.c b/networking/ntpd.c
index e27dbaa6b..165673a1e 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1745,7 +1745,7 @@ static NOINLINE void
 recv_and_process_client_pkt(void /*int fd*/)
 {
         ssize_t          size;
-        uint8_t          version;
+        //uint8_t          version;
         len_and_sockaddr *to;
         struct sockaddr  *from;
         msg_t            msg;
@@ -1793,7 +1793,7 @@ recv_and_process_client_pkt(void /*int fd*/)
         msg.m_rootdelay = d_to_sfp(G.rootdelay);
 //simple code does not do this, fix simple code!
         msg.m_rootdisp = d_to_sfp(G.rootdisp);
-        version = (query_status & VERSION_MASK); /* ... >> VERSION_SHIFT - done below instead */
+        //version = (query_status & VERSION_MASK); /* ... >> VERSION_SHIFT - done below instead */
         msg.m_refid = G.refid; // (version > (3 << VERSION_SHIFT)) ? G.refid : G.refid3;
 
         /* We reply from the local address packet was sent to,
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 96f9d3472..85181ab8d 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -398,18 +398,23 @@ static len_and_sockaddr* dup_sockaddr(const len_and_sockaddr *lsa)
 
 
 static int
-wait_for_reply(len_and_sockaddr *from_lsa, struct sockaddr *to)
+wait_for_reply(len_and_sockaddr *from_lsa, struct sockaddr *to, unsigned *timestamp_us, int *left_ms)
 {
         struct pollfd pfd[1];
         int read_len = 0;
 
         pfd[0].fd = rcvsock;
         pfd[0].events = POLLIN;
-        if (safe_poll(pfd, 1, waittime * 1000) > 0) {
+        if (*left_ms >= 0 && safe_poll(pfd, 1, *left_ms) > 0) {
+                unsigned t;
+
                 read_len = recv_from_to(rcvsock,
                                 recv_pkt, sizeof(recv_pkt),
-                                /*flags:*/ 0,
+                                /*flags:*/ MSG_DONTWAIT,
                                 &from_lsa->u.sa, to, from_lsa->len);
+                t = monotonic_us();
+                *left_ms -= (t - *timestamp_us) / 1000;
+                *timestamp_us = t;
         }
 
         return read_len;
@@ -730,7 +735,7 @@ packet_ok(int read_len, len_and_sockaddr *from_lsa,
                         type, pr_type(type), icp->icmp6_code);
 
                 read_len -= sizeof(struct icmp6_hdr);
-                for (i = 0; i < read_len ; i++) {
+                for (i = 0; i < read_len; i++) {
                         if (i % 16 == 0)
                                 printf("%04x:", i);
                         if (i % 4 == 0)
@@ -819,7 +824,6 @@ print_delta_ms(unsigned t1p, unsigned t2p)
 static int
 common_traceroute_main(int op, char **argv)
 {
-        int i;
         int minpacket;
         int tos = 0;
         int max_ttl = 30;
@@ -973,6 +977,7 @@ common_traceroute_main(int op, char **argv)
 #if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE && defined IP_OPTIONS
                 if (lsrr > 0) {
                         unsigned char optlist[MAX_IPOPTLEN];
+                        unsigned size;
 
                         /* final hop */
                         gwlist[lsrr] = dest_lsa->u.sin.sin_addr.s_addr;
@@ -982,14 +987,14 @@ common_traceroute_main(int op, char **argv)
                         optlist[0] = IPOPT_NOP;
                         /* loose source route option */
                         optlist[1] = IPOPT_LSRR;
-                        i = lsrr * sizeof(gwlist[0]);
-                        optlist[2] = i + 3;
+                        size = lsrr * sizeof(gwlist[0]);
+                        optlist[2] = size + 3;
                         /* pointer to LSRR addresses */
                         optlist[3] = IPOPT_MINOFF;
-                        memcpy(optlist + 4, gwlist, i);
+                        memcpy(optlist + 4, gwlist, size);
 
                         if (setsockopt(sndsock, IPPROTO_IP, IP_OPTIONS,
-                                        (char *)optlist, i + sizeof(gwlist[0])) < 0) {
+                                        (char *)optlist, size + sizeof(gwlist[0])) < 0) {
                                 bb_perror_msg_and_die("IP_OPTIONS");
                         }
                 }
@@ -1103,28 +1108,34 @@ common_traceroute_main(int op, char **argv)
                 int unreachable = 0; /* counter */
                 int gotlastaddr = 0; /* flags */
                 int got_there = 0;
-                int first = 1;
 
                 printf("%2d", ttl);
                 for (probe = 0; probe < nprobes; ++probe) {
                         int read_len;
                         unsigned t1;
                         unsigned t2;
+                        int left_ms;
                         struct ip *ip;
 
-                        if (!first && pausemsecs > 0)
-                                usleep(pausemsecs * 1000);
                         fflush_all();
+                        if (probe != 0 && pausemsecs > 0)
+                                usleep(pausemsecs * 1000);
 
-                        t1 = monotonic_us();
                         send_probe(++seq, ttl);
+                        t2 = t1 = monotonic_us();
+
+                        left_ms = waittime * 1000;
+                        while ((read_len = wait_for_reply(from_lsa, to, &t2, &left_ms)) != 0) {
+                                int icmp_code;
+
+                                /* Recv'ed a packet, or read error */
+                                /* t2 = monotonic_us() - set by wait_for_reply */
 
-                        first = 0;
-                        while ((read_len = wait_for_reply(from_lsa, to)) != 0) {
-                                t2 = monotonic_us();
-                                i = packet_ok(read_len, from_lsa, to, seq);
+                                if (read_len < 0)
+                                        continue;
+                                icmp_code = packet_ok(read_len, from_lsa, to, seq);
                                 /* Skip short packet */
-                                if (i == 0)
+                                if (icmp_code == 0)
                                         continue;
 
                                 if (!gotlastaddr
@@ -1143,10 +1154,10 @@ common_traceroute_main(int op, char **argv)
                                                 printf(" (%d)", ip->ip_ttl);
 
                                 /* time exceeded in transit */
-                                if (i == -1)
+                                if (icmp_code == -1)
                                         break;
-                                i--;
-                                switch (i) {
+                                icmp_code--;
+                                switch (icmp_code) {
 #if ENABLE_TRACEROUTE6
                                 case ICMP6_DST_UNREACH_NOPORT << 8:
                                         got_there = 1;
@@ -1219,16 +1230,18 @@ common_traceroute_main(int op, char **argv)
                                         ++unreachable;
                                         break;
                                 default:
-                                        printf(" !<%d>", i);
+                                        printf(" !<%d>", icmp_code);
                                         ++unreachable;
                                         break;
                                 }
                                 break;
-                        }
+                        } /* while (wait and read a packet) */
+
                         /* there was no packet at all? */
                         if (read_len == 0)
                                 printf("  *");
-                }
+                } /* for (nprobes) */
+
                 bb_putchar('\n');
                 if (got_there
                  || (unreachable > 0 && unreachable >= nprobes - 1)
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index 9cd8cbbae..6bfa398ea 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -113,6 +113,14 @@ config FEATURE_UDHCP_RFC3397
           search lists via option 119, specified in RFC 3397,
           and SIP servers option 120, specified in RFC 3361.
 
+config FEATURE_UDHCP_8021Q
+        bool "Support for 802.1Q VLAN parameters"
+        default y
+        depends on UDHCPD || UDHCPC
+        help
+          If selected, both client and server will support passing of VLAN
+          ID and priority via options 132 and 133 as per 802.1Q.
+
 config UDHCPC_DEFAULT_SCRIPT
         string "Absolute path to config script"
         default "/usr/share/udhcpc/default.script"
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 0a60261ab..70e34614c 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -55,6 +55,10 @@ const struct dhcp_optflag dhcp_optflags[] = {
         { OPTION_SIP_SERVERS                      , 0x78 }, /* DHCP_SIP_SERVERS   */
 #endif
         { OPTION_STATIC_ROUTES                    , 0x79 }, /* DHCP_STATIC_ROUTES */
+#if ENABLE_FEATURE_UDHCP_8021Q
+        { OPTION_U16                              , 0x84 }, /* DHCP_VLAN_ID       */
+        { OPTION_U8                               , 0x85 }, /* DHCP_VLAN_PRIORITY */
+#endif
         { OPTION_STATIC_ROUTES                    , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
         { OPTION_STRING                           , 0xfc }, /* DHCP_WPAD          */
 
@@ -118,6 +122,10 @@ const char dhcp_option_strings[] ALIGN1 =
 // doesn't work in udhcpd.conf since OPTION_STATIC_ROUTES
 // is not handled yet by "string->option" conversion code:
         "staticroutes" "\0"/* DHCP_STATIC_ROUTES  */
+#if ENABLE_FEATURE_UDHCP_8021Q
+        "vlanid" "\0"      /* DHCP_VLAN_ID        */
+        "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY  */
+#endif
         "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
         "wpad" "\0"        /* DHCP_WPAD           */
         ;
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index f8f18ff01..ad6991c94 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -145,6 +145,8 @@ enum {
 //#define DHCP_DOMAIN_SEARCH    0x77 /* RFC 3397. set of ASCIZ string, DNS-style compressed */
 //#define DHCP_SIP_SERVERS      0x78 /* RFC 3361. flag byte, then: 0: domain names, 1: IP addrs */
 //#define DHCP_STATIC_ROUTES    0x79 /* RFC 3442. (mask,ip,router) tuples */
+#define DHCP_VLAN_ID            0x84 /* 802.1P VLAN ID */
+#define DHCP_VLAN_PRIORITY      0x85 /* 802.1Q VLAN priority */
 //#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */
 //#define DHCP_WPAD             0xfc /* MSIE's Web Proxy Autodiscovery Protocol */
 #define DHCP_END                0xff
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index ca82d37e6..510c3a1d0 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -300,6 +300,14 @@ static char **fill_envp(struct dhcp_packet *packet)
         uint8_t *temp;
         uint8_t overload = 0;
 
+#define BITMAP unsigned
+#define BBITS (sizeof(BITMAP) * 8)
+#define BMASK(i) (1 << (i & (sizeof(BITMAP) * 8 - 1)))
+#define FOUND_OPTS(i) (found_opts[(unsigned)i / BBITS])
+        BITMAP found_opts[256 / BBITS];
+
+        memset(found_opts, 0, sizeof(found_opts));
+
         /* We need 6 elements for:
          * "interface=IFACE"
          * "ip=N.N.N.N" from packet->yiaddr
@@ -311,18 +319,21 @@ static char **fill_envp(struct dhcp_packet *packet)
         envc = 6;
         /* +1 element for each option, +2 for subnet option: */
         if (packet) {
-                for (i = 0; dhcp_optflags[i].code; i++) {
-                        if (udhcp_get_option(packet, dhcp_optflags[i].code)) {
-                                if (dhcp_optflags[i].code == DHCP_SUBNET)
+                /* note: do not search for "pad" (0) and "end" (255) options */
+                for (i = 1; i < 255; i++) {
+                        temp = udhcp_get_option(packet, i);
+                        if (temp) {
+                                if (i == DHCP_OPTION_OVERLOAD)
+                                        overload = *temp;
+                                else if (i == DHCP_SUBNET)
                                         envc++; /* for mton */
                                 envc++;
+                                /*if (i != DHCP_MESSAGE_TYPE)*/
+                                FOUND_OPTS(i) |= BMASK(i);
                         }
                 }
-                temp = udhcp_get_option(packet, DHCP_OPTION_OVERLOAD);
-                if (temp)
-                        overload = *temp;
         }
-        curr = envp = xzalloc(sizeof(char *) * envc);
+        curr = envp = xzalloc(sizeof(envp[0]) * envc);
 
         *curr = xasprintf("interface=%s", client_config.interface);
         putenv(*curr++);
@@ -337,12 +348,16 @@ static char **fill_envp(struct dhcp_packet *packet)
         opt_name = dhcp_option_strings;
         i = 0;
         while (*opt_name) {
-                temp = udhcp_get_option(packet, dhcp_optflags[i].code);
-                if (!temp)
+                uint8_t code = dhcp_optflags[i].code;
+                BITMAP *found_ptr = &FOUND_OPTS(code);
+                BITMAP found_mask = BMASK(code);
+                if (!(*found_ptr & found_mask))
                         goto next;
+                *found_ptr &= ~found_mask; /* leave only unknown options */
+                temp = udhcp_get_option(packet, code);
                 *curr = xmalloc_optname_optval(temp, &dhcp_optflags[i], opt_name);
                 putenv(*curr++);
-                if (dhcp_optflags[i].code == DHCP_SUBNET) {
+                if (code == DHCP_SUBNET) {
                         /* Subnet option: make things like "$ip/$mask" possible */
                         uint32_t subnet;
                         move_from_unaligned32(subnet, temp);
@@ -368,6 +383,28 @@ static char **fill_envp(struct dhcp_packet *packet)
                 *curr = xasprintf("sname=%."DHCP_PKT_SNAME_LEN_STR"s", packet->sname);
                 putenv(*curr++);
         }
+        /* Handle unknown options */
+        for (i = 0; i < 256;) {
+                BITMAP bitmap = FOUND_OPTS(i);
+                if (!bitmap) {
+                        i += BBITS;
+                        continue;
+                }
+                if (bitmap & BMASK(i)) {
+                        unsigned len, ofs;
+
+                        temp = udhcp_get_option(packet, i);
+                        /* udhcp_get_option returns ptr to data portion,
+                         * need to go back to get len
+                         */
+                        len = temp[-OPT_DATA + OPT_LEN];
+                        *curr = xmalloc(sizeof("optNNN=") + 1 + len*2);
+                        ofs = sprintf(*curr, "opt%u=", i);
+                        bin2hex(*curr + ofs, (void*) temp, len)[0] = '\0';
+                        putenv(*curr++);
+                }
+                i++;
+        }
         return envp;
 }
 
diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c
index 49bcafb9c..6840f3c25 100644
--- a/networking/udhcp/files.c
+++ b/networking/udhcp/files.c
@@ -80,9 +80,9 @@ static const struct config_keyword keywords[] = {
         /* keywords with no defaults must be last! */
         {"option"       , udhcp_str2optset, &server_config.options      , ""},
         {"opt"          , udhcp_str2optset, &server_config.options      , ""},
-        {"notify_file"  , read_str        , &server_config.notify_file  , ""},
-        {"sname"        , read_str        , &server_config.sname        , ""},
-        {"boot_file"    , read_str        , &server_config.boot_file    , ""},
+        {"notify_file"  , read_str        , &server_config.notify_file  , NULL},
+        {"sname"        , read_str        , &server_config.sname        , NULL},
+        {"boot_file"    , read_str        , &server_config.boot_file    , NULL},
         {"static_lease" , read_staticlease, &server_config.static_leases, ""},
 };
 enum { KWS_WITH_DEFAULTS = ARRAY_SIZE(keywords) - 6 };