Merge branch 'busybox' into merge

15 files changed, 60 insertions, 98 deletions

diff --git a/networking/hostname.c b/networking/hostname.c
index d87f6562f..8e3238d99 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -9,7 +9,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config HOSTNAME
 //config:       bool "hostname (5.6 kb)"
 //config:       default y
diff --git a/networking/httpd.c b/networking/httpd.c
index 9369de824..74196a4f1 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1371,12 +1371,13 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post
                                 out_cnt += count;
                                 count = 0;
                                 /* "Status" header format is: "Status: 302 Redirected\r\n" */
-                                if (out_cnt >= 7 && memcmp(rbuf, "Status:", 7) == 0) {
+                                if (out_cnt >= 8 && memcmp(rbuf, "Status: ", 8) == 0) {
                                         /* send "HTTP/1.0 " */
                                         if (full_write(STDOUT_FILENO, HTTP_200, 9) != 9)
                                                 break;
-                                        rbuf += 7; /* skip "Status:" */
-                                        count = out_cnt - 7;
+                                        /* skip "Status: " (including space, sending "HTTP/1.0  NNN" is wrong) */
+                                        rbuf += 8;
+                                        count = out_cnt - 8;
                                         out_cnt = -1; /* buffering off */
                                 } else if (out_cnt >= 4) {
                                         /* Did CGI add "HTTP"? */
@@ -2337,7 +2338,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
                         if (STRNCASECMP(iobuf, "Range:") == 0) {
                                 /* We know only bytes=NNN-[MMM] */
                                 char *s = skip_whitespace(iobuf + sizeof("Range:")-1);
-                                if (is_prefixed_with(s, "bytes=") == 0) {
+                                if (is_prefixed_with(s, "bytes=")) {
                                         s += sizeof("bytes=")-1;
                                         range_start = BB_STRTOOFF(s, &s, 10);
                                         if (s[0] != '-' || range_start < 0) {
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index c2cfe82ec..5521e8a5a 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -16,7 +16,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config IFUP
 //config:       bool "ifup (17 kb)"
 //config:       default y
diff --git a/networking/interface.c b/networking/interface.c
index c5c8f2cdd..119185881 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -223,7 +223,7 @@ static char* FAST_FUNC UNSPEC_print(unsigned char *ptr)
         pos = buff;
         for (i = 0; i < sizeof(struct sockaddr); i++) {
                 /* careful -- not every libc's sprintf returns # bytes written */
-                sprintf(pos, "%02X-", (*ptr++ & 0377));
+                sprintf(pos, "%02X-", *ptr++);
                 pos += 3;
         }
         /* Erase trailing "-".  Works as long as sizeof(struct sockaddr) != 0 */
@@ -704,9 +704,8 @@ static char* FAST_FUNC ether_print(unsigned char *ptr)
 {
         char *buff;
         buff = xasprintf("%02X:%02X:%02X:%02X:%02X:%02X",
-                         (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
-                         (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
-                );
+                ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]
+        );
         return auto_string(buff);
 }
 
diff --git a/networking/ip.c b/networking/ip.c
index 8aaeef0db..0bc0edc57 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -126,13 +126,13 @@
 //config:       Ethernet, wireless, infrared, ppp/slip, ip tunnelling
 //config:       link types are supported without this option selected.
 
-//applet:IF_IP(APPLET(ip, BB_DIR_SBIN, BB_SUID_DROP))
-//applet:IF_IPADDR(APPLET(ipaddr, BB_DIR_SBIN, BB_SUID_DROP))
-//applet:IF_IPLINK(APPLET(iplink, BB_DIR_SBIN, BB_SUID_DROP))
-//applet:IF_IPROUTE(APPLET(iproute, BB_DIR_SBIN, BB_SUID_DROP))
-//applet:IF_IPRULE(APPLET(iprule, BB_DIR_SBIN, BB_SUID_DROP))
-//applet:IF_IPTUNNEL(APPLET(iptunnel, BB_DIR_SBIN, BB_SUID_DROP))
-//applet:IF_IPNEIGH(APPLET(ipneigh, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_IP(      APPLET_NOEXEC(ip      , ip      , BB_DIR_SBIN, BB_SUID_DROP, ip      ))
+//applet:IF_IPADDR(  APPLET_NOEXEC(ipaddr  , ipaddr  , BB_DIR_SBIN, BB_SUID_DROP, ipaddr  ))
+//applet:IF_IPLINK(  APPLET_NOEXEC(iplink  , iplink  , BB_DIR_SBIN, BB_SUID_DROP, iplink  ))
+//applet:IF_IPROUTE( APPLET_NOEXEC(iproute , iproute , BB_DIR_SBIN, BB_SUID_DROP, iproute ))
+//applet:IF_IPRULE(  APPLET_NOEXEC(iprule  , iprule  , BB_DIR_SBIN, BB_SUID_DROP, iprule  ))
+//applet:IF_IPTUNNEL(APPLET_NOEXEC(iptunnel, iptunnel, BB_DIR_SBIN, BB_SUID_DROP, iptunnel))
+//applet:IF_IPNEIGH( APPLET_NOEXEC(ipneigh , ipneigh , BB_DIR_SBIN, BB_SUID_DROP, ipneigh ))
 
 //kbuild:lib-$(CONFIG_IP) += ip.o
 //kbuild:lib-$(CONFIG_IPADDR) += ip.o
diff --git a/networking/nameif.c b/networking/nameif.c
index 1f2695495..91d50536a 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -9,7 +9,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config NAMEIF
 //config:       bool "nameif (6.6 kb)"
 //config:       default y
diff --git a/networking/nbd-client.c b/networking/nbd-client.c
index cf1857231..bedb01a1c 100644
--- a/networking/nbd-client.c
+++ b/networking/nbd-client.c
@@ -3,20 +3,20 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-#include "libbb.h"
-#include <netinet/tcp.h>
-#include <linux/fs.h>
-
-//applet:IF_NBDCLIENT(APPLET_NOEXEC(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient))
-
-//kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o
-
 //config:config NBDCLIENT
 //config:       bool "nbd-client (4.6 kb)"
 //config:       default y
 //config:       help
 //config:       Network block device client
 
+//applet:IF_NBDCLIENT(APPLET_NOEXEC(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient))
+
+//kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o
+
+#include "libbb.h"
+#include <netinet/tcp.h>
+#include <linux/fs.h>
+
 #define NBD_SET_SOCK          _IO(0xab, 0)
 #define NBD_SET_BLKSIZE       _IO(0xab, 1)
 #define NBD_SET_SIZE          _IO(0xab, 2)
diff --git a/networking/nc.c b/networking/nc.c
index 3437c565e..4b8f9c13a 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -13,17 +13,23 @@
 //config:       A simple Unix utility which reads and writes data across network
 //config:       connections.
 //config:
+//config:config NETCAT
+//config:       bool "netcat (11 kb)"
+//config:       default n
+//config:       help
+//config:       Alias to nc.
+//config:
 //config:config NC_SERVER
 //config:       bool "Netcat server options (-l)"
 //config:       default y
-//config:       depends on NC
+//config:       depends on NC || NETCAT
 //config:       help
 //config:       Allow netcat to act as a server.
 //config:
 //config:config NC_EXTRA
 //config:       bool "Netcat extensions (-eiw and -f FILE)"
 //config:       default y
-//config:       depends on NC
+//config:       depends on NC || NETCAT
 //config:       help
 //config:       Add -e (support for executing the rest of the command line after
 //config:       making or receiving a successful connection), -i (delay interval for
@@ -31,8 +37,8 @@
 //config:
 //config:config NC_110_COMPAT
 //config:       bool "Netcat 1.10 compatibility (+2.5k)"
-//config:       default n  # off specially for Rob
-//config:       depends on NC
+//config:       default y
+//config:       depends on NC || NETCAT
 //config:       help
 //config:       This option makes nc closely follow original nc-1.10.
 //config:       The code is about 2.5k bigger. It enables
@@ -40,8 +46,11 @@
 //config:       busybox-specific extensions: -f FILE.
 
 //applet:IF_NC(APPLET(nc, BB_DIR_USR_BIN, BB_SUID_DROP))
+//                 APPLET_ODDNAME:name    main location        suid_type     help
+//applet:IF_NETCAT(APPLET_ODDNAME(netcat, nc,  BB_DIR_USR_BIN, BB_SUID_DROP, nc))
 
 //kbuild:lib-$(CONFIG_NC) += nc.o
+//kbuild:lib-$(CONFIG_NETCAT) += nc.o
 
 #include "libbb.h"
 #include "common_bufsiz.h"
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 25fa44389..4f881eaf9 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -2235,7 +2235,7 @@ static NOINLINE void ntp_init(char **argv)
                         "wp:*S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */
                         IF_FEATURE_NTPD_SERVER("I:") /* compat */
                         "d" /* compat */
-                        "46aAbgL", /* compat, ignored */
+                        "46aAbgL" /* compat, ignored */
                                 "\0"
                                 "dd:wn"  /* -d: counter; -p: list; -w implies -n */
                                 IF_FEATURE_NTPD_SERVER(":Il") /* -I implies -l */
diff --git a/networking/ping.c b/networking/ping.c
index 7460e4414..774f8f3e0 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -24,28 +24,6 @@
  * This version is an adaptation of ping.c from busybox.
  * The code was modified by Bart Visscher <magick@linux-fan.com>
  */
-
-#include <net/if.h>
-#include <netinet/ip_icmp.h>
-#include "libbb.h"
-#include "common_bufsiz.h"
-
-#ifdef __BIONIC__
-/* should be in netinet/ip_icmp.h */
-# define ICMP_DEST_UNREACH    3  /* Destination Unreachable  */
-# define ICMP_SOURCE_QUENCH   4  /* Source Quench    */
-# define ICMP_REDIRECT        5  /* Redirect (change route)  */
-# define ICMP_ECHO            8  /* Echo Request      */
-# define ICMP_TIME_EXCEEDED  11  /* Time Exceeded    */
-# define ICMP_PARAMETERPROB  12  /* Parameter Problem    */
-# define ICMP_TIMESTAMP      13  /* Timestamp Request    */
-# define ICMP_TIMESTAMPREPLY 14  /* Timestamp Reply    */
-# define ICMP_INFO_REQUEST   15  /* Information Request    */
-# define ICMP_INFO_REPLY     16  /* Information Reply    */
-# define ICMP_ADDRESS        17  /* Address Mask Request    */
-# define ICMP_ADDRESSREPLY   18  /* Address Mask Reply    */
-#endif
-
 //config:config PING
 //config:       bool "ping (9.5 kb)"
 //config:       default y
@@ -136,6 +114,27 @@
 //usage:       "1 packets transmitted, 1 packets received, 0% packet loss\n"
 //usage:       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
 
+#include <net/if.h>
+#include <netinet/ip_icmp.h>
+#include "libbb.h"
+#include "common_bufsiz.h"
+
+#ifdef __BIONIC__
+/* should be in netinet/ip_icmp.h */
+# define ICMP_DEST_UNREACH    3  /* Destination Unreachable  */
+# define ICMP_SOURCE_QUENCH   4  /* Source Quench    */
+# define ICMP_REDIRECT        5  /* Redirect (change route)  */
+# define ICMP_ECHO            8  /* Echo Request      */
+# define ICMP_TIME_EXCEEDED  11  /* Time Exceeded    */
+# define ICMP_PARAMETERPROB  12  /* Parameter Problem    */
+# define ICMP_TIMESTAMP      13  /* Timestamp Request    */
+# define ICMP_TIMESTAMPREPLY 14  /* Timestamp Reply    */
+# define ICMP_INFO_REQUEST   15  /* Information Request    */
+# define ICMP_INFO_REPLY     16  /* Information Reply    */
+# define ICMP_ADDRESS        17  /* Address Mask Request    */
+# define ICMP_ADDRESSREPLY   18  /* Address Mask Reply    */
+#endif
+
 #if ENABLE_PING6
 # include <netinet/icmp6.h>
 /* I see RENUMBERED constants in bits/in.h - !!?
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 849ca1388..714555fa8 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -8,7 +8,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 //config:config UDHCPC6
 //config:       bool "udhcpc6"
 //config:       default n  # not yet ready
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 55e0400b9..99d91bf70 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1183,44 +1183,6 @@ static void client_background(void)
 //usage:       "        [-i IFACE]"IF_FEATURE_UDHCP_PORT(" [-P PORT]")" [-s PROG] [-p PIDFILE]\n"
 //usage:       "        [-oC] [-r IP] [-V VENDOR] [-F NAME] [-x OPT:VAL]... [-O OPT]..."
 //usage:#define udhcpc_full_usage "\n"
-//usage:        IF_LONG_OPTS(
-//usage:     "\n        -i,--interface IFACE    Interface to use (default eth0)"
-//usage:        IF_FEATURE_UDHCP_PORT(
-//usage:     "\n        -P,--client-port PORT   Use PORT (default 68)"
-//usage:        )
-//usage:     "\n        -s,--script PROG        Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
-//usage:     "\n        -p,--pidfile FILE       Create pidfile"
-//usage:     "\n        -B,--broadcast          Request broadcast replies"
-//usage:     "\n        -t,--retries N          Send up to N discover packets (default 3)"
-//usage:     "\n        -T,--timeout SEC        Pause between packets (default 3)"
-//usage:     "\n        -A,--tryagain SEC       Wait if lease is not obtained (default 20)"
-//usage:     "\n        -n,--now                Exit if lease is not obtained"
-//usage:     "\n        -q,--quit               Exit after obtaining lease"
-//usage:     "\n        -R,--release            Release IP on exit"
-//usage:     "\n        -f,--foreground         Run in foreground"
-//usage:        USE_FOR_MMU(
-//usage:     "\n        -b,--background         Background if lease is not obtained"
-//usage:        )
-//usage:     "\n        -S,--syslog             Log to syslog too"
-//usage:        IF_FEATURE_UDHCPC_ARPING(
-//usage:     "\n        -a[MSEC],--arping[=MSEC] Validate offered address with ARP ping"
-//usage:        )
-//usage:     "\n        -r,--request IP         Request this IP address"
-//usage:     "\n        -o,--no-default-options Don't request any options (unless -O is given)"
-//usage:     "\n        -O,--request-option OPT Request option OPT from server (cumulative)"
-//usage:     "\n        -x OPT:VAL              Include option OPT in sent packets (cumulative)"
-//usage:     "\n                                Examples of string, numeric, and hex byte opts:"
-//usage:     "\n                                -x hostname:bbox - option 12"
-//usage:     "\n                                -x lease:3600 - option 51 (lease time)"
-//usage:     "\n                                -x 0x3d:0100BEEFC0FFEE - option 61 (client id)"
-//usage:     "\n        -F,--fqdn NAME          Ask server to update DNS mapping for NAME"
-//usage:     "\n        -V,--vendorclass VENDOR Vendor identifier (default 'udhcp VERSION')"
-//usage:     "\n        -C,--clientid-none      Don't send MAC as client identifier"
-//usage:        IF_UDHCP_VERBOSE(
-//usage:     "\n        -v                      Verbose"
-//usage:        )
-//usage:        )
-//usage:        IF_NOT_LONG_OPTS(
 //usage:     "\n        -i IFACE        Interface to use (default eth0)"
 //usage:        IF_FEATURE_UDHCP_PORT(
 //usage:     "\n        -P PORT         Use PORT (default 68)"
@@ -1256,7 +1218,6 @@ static void client_background(void)
 //usage:        IF_UDHCP_VERBOSE(
 //usage:     "\n        -v              Verbose"
 //usage:        )
-//usage:        )
 //usage:     "\nSignals:"
 //usage:     "\n        USR1    Renew lease"
 //usage:     "\n        USR2    Release lease"
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 62a483865..8548c8c3b 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -6,9 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-/* BB_AUDIT SUSv3 N/A */
-
 //config:config VCONFIG
 //config:       bool "vconfig (2.5 kb)"
 //config:       default y
@@ -34,6 +31,8 @@
 #include "libbb.h"
 #include <net/if.h>
 
+/* BB_AUDIT SUSv3 N/A */
+
 /* Stuff from linux/if_vlan.h, kernel version 2.4.23 */
 enum vlan_ioctl_cmds {
         ADD_VLAN_CMD,
diff --git a/networking/wget.c b/networking/wget.c
index 0001ddcba..1f5ab8bc2 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -8,7 +8,6 @@
  * Copyright (C) 2010 Bradley M. Kuhn <bkuhn@ebb.org>
  * Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
  */
-
 //config:config WGET
 //config:       bool "wget (35 kb)"
 //config:       default y
diff --git a/networking/whois.c b/networking/whois.c
index fd1cdf43e..f0ec86301 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -9,7 +9,6 @@
  * Add ipv6 support
  * Add proxy support
  */
-
 //config:config WHOIS
 //config:       bool "whois (6.6 kb)"
 //config:       default y