Merge remote-tracking branch 'upstream/master'

39 files changed, 414 insertions, 357 deletions

diff --git a/networking/Config.src b/networking/Config.src
index 6dd7df754..274fcae3a 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -684,29 +684,6 @@ config FEATURE_NTPD_SERVER
           Make ntpd usable as a NTP server. If you disable this option
           ntpd will be usable only as a NTP client.
 
-config PING
-        bool "ping"
-        default y
-        depends on PLATFORM_LINUX
-        help
-          ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
-          elicit an ICMP ECHO_RESPONSE from a host or gateway.
-
-config PING6
-        bool "ping6"
-        default y
-        depends on FEATURE_IPV6 && PING
-        help
-          This will give you a ping that can talk IPv6.
-
-config FEATURE_FANCY_PING
-        bool "Enable fancy ping output"
-        default y
-        depends on PING
-        help
-          Make the output from the ping applet include statistics, and at the
-          same time provide full support for ICMP packets.
-
 config PSCAN
         bool "pscan"
         default y
diff --git a/networking/Kbuild.src b/networking/Kbuild.src
index f41a2df70..944f27be1 100644
--- a/networking/Kbuild.src
+++ b/networking/Kbuild.src
@@ -30,8 +30,6 @@ lib-$(CONFIG_NC)           += nc.o
 lib-$(CONFIG_NETSTAT)      += netstat.o
 lib-$(CONFIG_NSLOOKUP)     += nslookup.o
 lib-$(CONFIG_NTPD)         += ntpd.o
-lib-$(CONFIG_PING)         += ping.o
-lib-$(CONFIG_PING6)        += ping.o
 lib-$(CONFIG_PSCAN)        += pscan.o
 lib-$(CONFIG_ROUTE)        += route.o
 lib-$(CONFIG_SLATTACH)     += slattach.o
diff --git a/networking/arping.c b/networking/arping.c
index f2b12ed04..6f6b59cfb 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -1,10 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- * arping.c - Ping hosts by ARP requests/replies
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Author:      Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
+ * Author: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
  * Busybox port: Nick Fedchik <nick@fedchik.org.ua>
  */
 
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 92d4867aa..8ed31cea2 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -388,7 +388,7 @@ static int process_packet(struct dns_entry *conf_data,
         query_len = strlen(query_string) + 1;
         /* may be unaligned! */
         unaligned_type_class = (void *)(query_string + query_len);
-        query_len += sizeof(unaligned_type_class);
+        query_len += sizeof(*unaligned_type_class);
         /* where to append answer block */
         answb = (void *)(unaligned_type_class + 1);
 
diff --git a/networking/httpd.c b/networking/httpd.c
index c174958e2..fa42d9850 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -231,7 +231,7 @@ struct globals {
         int verbose;            /* must be int (used by getopt32) */
         smallint flg_deny_all;
 
-        unsigned rmt_ip;        /* used for IP-based allow/deny rules */
+        unsigned rmt_ip;        /* used for IP-based allow/deny rules */
         time_t last_mod;
         char *rmt_ip_str;       /* for $REMOTE_ADDR and $REMOTE_PORT */
         const char *bind_addr_or_port;
@@ -267,7 +267,7 @@ struct globals {
 #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
         Htaccess *script_i;     /* config script interpreters */
 #endif
-        char *iobuf;            /* [IOBUF_SIZE] */
+        char *iobuf;            /* [IOBUF_SIZE] */
 #define hdr_buf bb_common_bufsiz1
         char *hdr_ptr;
         int hdr_cnt;
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 3cb1ec858..59df4e80f 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -164,7 +164,7 @@ static char *get_var(const char *id, size_t idlen, struct interface_defn_t *ifd)
         return NULL;
 }
 
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
 static int count_netmask_bits(const char *dotted_quad)
 {
 //      int result;
@@ -195,7 +195,7 @@ static int count_netmask_bits(const char *dotted_quad)
         }
         return result;
 }
-#endif
+# endif
 
 static char *parse(const char *command, struct interface_defn_t *ifd)
 {
@@ -258,17 +258,17 @@ static char *parse(const char *command, struct interface_defn_t *ifd)
                                 varvalue = get_var(command, nextpercent - command, ifd);
 
                                 if (varvalue) {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
                                         /* "hwaddress <class> <address>":
                                          * unlike ifconfig, ip doesnt want <class>
                                          * (usually "ether" keyword). Skip it. */
                                         if (strncmp(command, "hwaddress", 9) == 0) {
                                                 varvalue = skip_whitespace(skip_non_whitespace(varvalue));
                                         }
-#endif
+# endif
                                         addstr(&result, varvalue, strlen(varvalue));
                                 } else {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
                                         /* Sigh...  Add a special case for 'ip' to convert from
                                          * dotted quad to bit count style netmasks.  */
                                         if (strncmp(command, "bnmask", 6) == 0) {
@@ -284,7 +284,7 @@ static char *parse(const char *command, struct interface_defn_t *ifd)
                                                         }
                                                 }
                                         }
-#endif
+# endif
                                         okay[opt_depth - 1] = 0;
                                 }
 
@@ -329,56 +329,64 @@ static int execute(const char *command, struct interface_defn_t *ifd, execfn *ex
         }
         return 1;
 }
-#endif
+
+#endif /* FEATURE_IFUPDOWN_IPV4 || FEATURE_IFUPDOWN_IPV6 */
+
 
 #if ENABLE_FEATURE_IFUPDOWN_IPV6
+
 static int FAST_FUNC loopback_up6(struct interface_defn_t *ifd, execfn *exec)
 {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         int result;
         result = execute("ip addr add ::1 dev %iface%", ifd, exec);
         result += execute("ip link set %iface% up", ifd, exec);
         return ((result == 2) ? 2 : 0);
-#else
+# else
         return execute("ifconfig %iface% add ::1", ifd, exec);
-#endif
+# endif
 }
 
 static int FAST_FUNC loopback_down6(struct interface_defn_t *ifd, execfn *exec)
 {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         return execute("ip link set %iface% down", ifd, exec);
-#else
+# else
         return execute("ifconfig %iface% del ::1", ifd, exec);
-#endif
+# endif
+}
+
+static int FAST_FUNC manual_up_down6(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM)
+{
+        return 1;
 }
 
 static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
 {
         int result;
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec);
         result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
         /* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */
         result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec);
-#else
+# else
         result = execute("ifconfig %iface%[[ media %media%]][[ hw %hwaddress%]][[ mtu %mtu%]] up", ifd, exec);
         result += execute("ifconfig %iface% add %address%/%netmask%", ifd, exec);
         result += execute("[[route -A inet6 add ::/0 gw %gateway%]]", ifd, exec);
-#endif
+# endif
         return ((result == 3) ? 3 : 0);
 }
 
 static int FAST_FUNC static_down6(struct interface_defn_t *ifd, execfn *exec)
 {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         return execute("ip link set %iface% down", ifd, exec);
-#else
+# else
         return execute("ifconfig %iface% down", ifd, exec);
-#endif
+# endif
 }
 
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
 static int FAST_FUNC v4tunnel_up(struct interface_defn_t *ifd, execfn *exec)
 {
         int result;
@@ -394,14 +402,15 @@ static int FAST_FUNC v4tunnel_down(struct interface_defn_t * ifd, execfn * exec)
 {
         return execute("ip tunnel del %iface%", ifd, exec);
 }
-#endif
+# endif
 
 static const struct method_t methods6[] = {
-#if ENABLE_FEATURE_IFUPDOWN_IP
-        { "v4tunnel", v4tunnel_up, v4tunnel_down, },
-#endif
-        { "static", static_up6, static_down6, },
-        { "loopback", loopback_up6, loopback_down6, },
+# if ENABLE_FEATURE_IFUPDOWN_IP
+        { "v4tunnel" , v4tunnel_up     , v4tunnel_down   , },
+# endif
+        { "static"   , static_up6      , static_down6    , },
+        { "manual"   , manual_up_down6 , manual_up_down6 , },
+        { "loopback" , loopback_up6    , loopback_down6  , },
 };
 
 static const struct address_family_t addr_inet6 = {
@@ -409,43 +418,46 @@ static const struct address_family_t addr_inet6 = {
         ARRAY_SIZE(methods6),
         methods6
 };
+
 #endif /* FEATURE_IFUPDOWN_IPV6 */
 
+
 #if ENABLE_FEATURE_IFUPDOWN_IPV4
+
 static int FAST_FUNC loopback_up(struct interface_defn_t *ifd, execfn *exec)
 {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         int result;
         result = execute("ip addr add 127.0.0.1/8 dev %iface%", ifd, exec);
         result += execute("ip link set %iface% up", ifd, exec);
         return ((result == 2) ? 2 : 0);
-#else
+# else
         return execute("ifconfig %iface% 127.0.0.1 up", ifd, exec);
-#endif
+# endif
 }
 
 static int FAST_FUNC loopback_down(struct interface_defn_t *ifd, execfn *exec)
 {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         int result;
         result = execute("ip addr flush dev %iface%", ifd, exec);
         result += execute("ip link set %iface% down", ifd, exec);
         return ((result == 2) ? 2 : 0);
-#else
+# else
         return execute("ifconfig %iface% 127.0.0.1 down", ifd, exec);
-#endif
+# endif
 }
 
 static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec)
 {
         int result;
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         result = execute("ip addr add %address%/%bnmask%[[ broadcast %broadcast%]] "
                         "dev %iface%[[ peer %pointopoint%]][[ label %label%]]", ifd, exec);
         result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
         result += execute("[[ip route add default via %gateway% dev %iface%]]", ifd, exec);
         return ((result == 3) ? 3 : 0);
-#else
+# else
         /* ifconfig said to set iface up before it processes hw %hwaddress%,
          * which then of course fails. Thus we run two separate ifconfig */
         result = execute("ifconfig %iface%[[ hw %hwaddress%]][[ media %media%]][[ mtu %mtu%]] up",
@@ -455,26 +467,26 @@ static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec)
                                 ifd, exec);
         result += execute("[[route add default gw %gateway% %iface%]]", ifd, exec);
         return ((result == 3) ? 3 : 0);
-#endif
+# endif
 }
 
 static int FAST_FUNC static_down(struct interface_defn_t *ifd, execfn *exec)
 {
         int result;
-#if ENABLE_FEATURE_IFUPDOWN_IP
+# if ENABLE_FEATURE_IFUPDOWN_IP
         result = execute("ip addr flush dev %iface%", ifd, exec);
         result += execute("ip link set %iface% down", ifd, exec);
-#else
+# else
         /* result = execute("[[route del default gw %gateway% %iface%]]", ifd, exec); */
         /* Bringing the interface down deletes the routes in itself.
            Otherwise this fails if we reference 'gateway' when using this from dhcp_down */
         result = 1;
         result += execute("ifconfig %iface% down", ifd, exec);
-#endif
+# endif
         return ((result == 2) ? 2 : 0);
 }
 
-#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+# if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
 struct dhcp_client_t {
         const char *name;
         const char *startcmd;
@@ -500,21 +512,21 @@ static const struct dhcp_client_t ext_dhcp_clients[] = {
                 "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
         },
 };
-#endif /* ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCPC */
+# endif /* FEATURE_IFUPDOWN_EXTERNAL_DHCPC */
 
-#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+# if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
 static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
 {
         unsigned i;
-#if ENABLE_FEATURE_IFUPDOWN_IP
+#  if ENABLE_FEATURE_IFUPDOWN_IP
         /* ip doesn't up iface when it configures it (unlike ifconfig) */
         if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec))
                 return 0;
-#else
+#  else
         /* needed if we have hwaddress on dhcp iface */
         if (!execute("ifconfig %iface%[[ hw %hwaddress%]] up", ifd, exec))
                 return 0;
-#endif
+#  endif
         for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
                 if (exists_execable(ext_dhcp_clients[i].name))
                         return execute(ext_dhcp_clients[i].startcmd, ifd, exec);
@@ -522,31 +534,31 @@ static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
         bb_error_msg("no dhcp clients found");
         return 0;
 }
-#elif ENABLE_UDHCPC
+# elif ENABLE_UDHCPC
 static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
 {
-#if ENABLE_FEATURE_IFUPDOWN_IP
+#  if ENABLE_FEATURE_IFUPDOWN_IP
         /* ip doesn't up iface when it configures it (unlike ifconfig) */
         if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec))
                 return 0;
-#else
+#  else
         /* needed if we have hwaddress on dhcp iface */
         if (!execute("ifconfig %iface%[[ hw %hwaddress%]] up", ifd, exec))
                 return 0;
-#endif
+#  endif
         return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid "
                         "-i %iface%[[ -H %hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]",
                         ifd, exec);
 }
-#else
+# else
 static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd UNUSED_PARAM,
                 execfn *exec UNUSED_PARAM)
 {
         return 0; /* no dhcp support */
 }
-#endif
+# endif
 
-#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+# if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
 static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
 {
         int result = 0;
@@ -569,7 +581,7 @@ static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
         result += static_down(ifd, exec);
         return ((result == 3) ? 3 : 0);
 }
-#elif ENABLE_UDHCPC
+# elif ENABLE_UDHCPC
 static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
 {
         int result;
@@ -586,13 +598,13 @@ static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd, execfn *exec)
         result += static_down(ifd, exec);
         return ((result == 3) ? 3 : 0);
 }
-#else
+# else
 static int FAST_FUNC dhcp_down(struct interface_defn_t *ifd UNUSED_PARAM,
                 execfn *exec UNUSED_PARAM)
 {
         return 0; /* no dhcp support */
 }
-#endif
+# endif
 
 static int FAST_FUNC manual_up_down(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM)
 {
@@ -644,7 +656,8 @@ static const struct address_family_t addr_inet = {
         methods
 };
 
-#endif  /* if ENABLE_FEATURE_IFUPDOWN_IPV4 */
+#endif  /* FEATURE_IFUPDOWN_IPV4 */
+
 
 /* Returns pointer to the next word, or NULL.
  * In 1st case, advances *buf to the word after this one.
diff --git a/networking/inetd.c b/networking/inetd.c
index 7030062b6..fb00c6cd7 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -295,7 +295,7 @@ struct globals {
         struct rlimit rlim_ofile;
         servtab_t *serv_list;
         int global_queuelen;
-        int maxsock;            /* max fd# in allsock, -1: unknown */
+        int maxsock;         /* max fd# in allsock, -1: unknown */
         /* whenever maxsock grows, prev_maxsock is set to new maxsock,
          * but if maxsock is set to -1, prev_maxsock is not changed */
         int prev_maxsock;
@@ -778,6 +778,12 @@ static servtab_t *parse_one_line(void)
         argc = 0;
         while ((arg = token[6+argc]) != NULL && argc < MAXARGV)
                 sep->se_argv[argc++] = xstrdup(arg);
+        /* Some inetd.conf files have no argv's, not even argv[0].
+         * Fix them up.
+         * (Technically, programs can be execed with argv[0] = NULL,
+         * but many programs do not like that at all) */
+        if (argc == 0)
+                sep->se_argv[0] = xstrdup(sep->se_program);
 
         /* catch mixups. "<service> stream udp ..." == wtf */
         if (sep->se_socktype == SOCK_STREAM) {
diff --git a/networking/ip.c b/networking/ip.c
index 7b1e2eb6a..350656cef 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * "ip" utility frontend.
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  * Bernhard Reutner-Fischer rewrote to use index_in_substr_array
  */
 
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index d4aa885c6..acbaa4ac5 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -15,9 +15,9 @@
 /* After libbb.h, because on some systems it needs other includes */
 #include <arpa/inet.h>
 
-#define CLASS_A_NETMASK ntohl(0xFF000000)
-#define CLASS_B_NETMASK ntohl(0xFFFF0000)
-#define CLASS_C_NETMASK ntohl(0xFFFFFF00)
+#define CLASS_A_NETMASK ntohl(0xFF000000)
+#define CLASS_B_NETMASK ntohl(0xFFFF0000)
+#define CLASS_C_NETMASK ntohl(0xFFFFFF00)
 
 static unsigned long get_netmask(unsigned long ipaddr)
 {
diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c
index bf01528c4..59c759b23 100644
--- a/networking/libiproute/ip_parse_common_args.c
+++ b/networking/libiproute/ip_parse_common_args.c
@@ -1,18 +1,15 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ip.c         "ip" utility frontend.
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  */
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 1be03a6c3..397a8ee34 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ipaddress.c          "ip address".
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
- *      Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated
+ * Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated
  */
 
 #include <fnmatch.h>
@@ -20,7 +18,7 @@
 
 #ifndef IFF_LOWER_UP
 /* from linux/if.h */
-#define IFF_LOWER_UP    0x10000         /* driver signals L1 up*/
+#define IFF_LOWER_UP  0x10000  /* driver signals L1 up */
 #endif
 
 struct filter_t {
@@ -365,7 +363,7 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
 
 struct nlmsg_list {
         struct nlmsg_list *next;
-        struct nlmsghdr   h;
+        struct nlmsghdr   h;
 };
 
 static int print_selected_addrinfo(int ifindex, struct nlmsg_list *ainfo)
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index c5ba294aa..82ab979a5 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -1,7 +1,5 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iplink.c "ip link".
- *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
@@ -296,9 +294,9 @@ static int do_change(char **argv, const unsigned rtm)
         };
         struct rtnl_handle rth;
         struct {
-                struct nlmsghdr         n;
-                struct ifinfomsg        i;
-                char                    buf[1024];
+                struct nlmsghdr  n;
+                struct ifinfomsg i;
+                char             buf[1024];
         } req;
         smalluint arg;
         char *name_str = NULL, *link_str = NULL, *type_str = NULL, *dev_str = NULL;
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 1696e6a34..f6071b463 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -1,19 +1,16 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iproute.c            "ip route".
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  * Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized
  */
 
-#include "ip_common.h"  /* #include "libbb.h" is inside */
+#include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
 #include "utils.h"
 
@@ -327,9 +324,9 @@ IF_FEATURE_IP_RULE(ARG_table,)
         };
         struct rtnl_handle rth;
         struct {
-                struct nlmsghdr         n;
-                struct rtmsg            r;
-                char                    buf[1024];
+                struct nlmsghdr n;
+                struct rtmsg    r;
+                char            buf[1024];
         } req;
         char mxbuf[256];
         struct rtattr * mxrta = (void*)mxbuf;
@@ -791,8 +788,8 @@ static int iproute_get(char **argv)
                                 }
                                 req.r.rtm_dst_len = addr.bitlen;
                         }
-                        argv++;
                 }
+                argv++;
         }
 
         if (req.r.rtm_dst_len == 0) {
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 3af6a83a8..dd3265c7c 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -1,18 +1,15 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iprule.c             "ip rule".
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  * initially integrated into busybox by Bernhard Reutner-Fischer
  */
 
@@ -191,9 +188,9 @@ static int iprule_modify(int cmd, char **argv)
         bool table_ok = 0;
         struct rtnl_handle rth;
         struct {
-                struct nlmsghdr n;
-                struct rtmsg    r;
-                char            buf[1024];
+                struct nlmsghdr n;
+                struct rtmsg    r;
+                char            buf[1024];
         } req;
         smalluint key;
 
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index bce373d05..5942feafc 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -1,16 +1,14 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iptunnel.c          "ip tunnel"
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
- * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit
- * Phil Karn <karn@ka9q.ampr.org>       990408: "pmtudisc" flag
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit
+ * Phil Karn <karn@ka9q.ampr.org>       990408: "pmtudisc" flag
  */
 
 #include <netinet/ip.h>
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index 8da80b2fc..7291ee2f1 100644
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -1,7 +1,5 @@
 /* vi: set sw=4 ts=4: */
 /*
- * RTnetlink service routines.
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version
@@ -74,8 +72,8 @@ int FAST_FUNC rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, in
         struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } };
         struct msghdr msg = {
                 (void*)&nladdr, sizeof(nladdr),
-                iov,    2,
-                NULL,   0,
+                iov,  2,
+                NULL, 0,
                 0
         };
 
@@ -108,8 +106,8 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
 
                 struct msghdr msg = {
                         (void*)&nladdr, sizeof(nladdr),
-                        &iov,   1,
-                        NULL,   0,
+                        &iov, 1,
+                        NULL, 0,
                         0
                 };
 
@@ -214,8 +212,8 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
         char   *buf = xmalloc(8*1024); /* avoid big stack buffer */
         struct msghdr msg = {
                 (void*)&nladdr, sizeof(nladdr),
-                &iov,   1,
-                NULL,   0,
+                &iov, 1,
+                NULL, 0,
                 0
         };
 
diff --git a/networking/libiproute/libnetlink.h b/networking/libiproute/libnetlink.h
index 4e4d5b7b9..51bee2d67 100644
--- a/networking/libiproute/libnetlink.h
+++ b/networking/libiproute/libnetlink.h
@@ -11,11 +11,11 @@
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
 struct rtnl_handle {
-        int                     fd;
-        struct sockaddr_nl      local;
-        struct sockaddr_nl      peer;
-        uint32_t                seq;
-        uint32_t                dump;
+        int                fd;
+        struct sockaddr_nl local;
+        struct sockaddr_nl peer;
+        uint32_t           seq;
+        uint32_t           dump;
 };
 
 extern void xrtnl_open(struct rtnl_handle *rth) FAST_FUNC;
diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c
index c2c01305d..33a54ea6c 100644
--- a/networking/libiproute/ll_addr.c
+++ b/networking/libiproute/ll_addr.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_addr.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
 #include <net/if_arp.h>
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index 246b9e33a..27cd90f34 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -1,17 +1,14 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_map.c
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
-#include <net/if.h>     /* struct ifreq and co. */
+#include <net/if.h>  /* struct ifreq and co. */
 
 #include "libbb.h"
 #include "libnetlink.h"
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c
index 1cd576f1d..04925ecf6 100644
--- a/networking/libiproute/ll_proto.c
+++ b/networking/libiproute/ll_proto.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_proto.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
 #include "libbb.h"
diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c
index 3861c2870..38b6c0516 100644
--- a/networking/libiproute/ll_types.c
+++ b/networking/libiproute/ll_types.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_types.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 #include <arpa/inet.h>
 #include <linux/if_arp.h>
diff --git a/networking/libiproute/rt_names.c b/networking/libiproute/rt_names.c
index 8dd16e3d3..c474ab903 100644
--- a/networking/libiproute/rt_names.c
+++ b/networking/libiproute/rt_names.c
@@ -1,13 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * rt_names.c           rtnetlink names DB.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 #include "libbb.h"
 #include "rt_names.h"
diff --git a/networking/libiproute/rtm_map.c b/networking/libiproute/rtm_map.c
index 5e358e105..3bab53baf 100644
--- a/networking/libiproute/rtm_map.c
+++ b/networking/libiproute/rtm_map.c
@@ -1,14 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * rtm_map.c
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
 #include "libbb.h"
diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c
index 2b646f0ea..d32db8de5 100644
--- a/networking/libiproute/utils.c
+++ b/networking/libiproute/utils.c
@@ -1,14 +1,12 @@
 /* vi: set sw=4 ts=4: */
 /*
- * utils.c
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  */
 
 #include "libbb.h"
diff --git a/networking/libiproute/utils.h b/networking/libiproute/utils.h
index ed03e785a..93c9d25d6 100644
--- a/networking/libiproute/utils.h
+++ b/networking/libiproute/utils.h
@@ -17,14 +17,14 @@ extern smallint oneline;
 extern char _SL_;
 
 #ifndef IPPROTO_ESP
-#define IPPROTO_ESP     50
+#define IPPROTO_ESP  50
 #endif
 #ifndef IPPROTO_AH
-#define IPPROTO_AH      51
+#define IPPROTO_AH  51
 #endif
 
 #define SPRINT_BSIZE 64
-#define SPRINT_BUF(x)   char x[SPRINT_BSIZE]
+#define SPRINT_BUF(x)  char x[SPRINT_BSIZE]
 
 extern void incomplete_command(void) NORETURN;
 
diff --git a/networking/nameif.c b/networking/nameif.c
index 45a3229f4..d02c2c11b 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -21,10 +21,10 @@
 #endif
 
 /* Taken from linux/sockios.h */
-#define SIOCSIFNAME     0x8923  /* set interface name */
+#define SIOCSIFNAME  0x8923  /* set interface name */
 
 /* Octets in one Ethernet addr, from <linux/if_ether.h> */
-#define ETH_ALEN        6
+#define ETH_ALEN     6
 
 #ifndef ifr_newname
 #define ifr_newname ifr_ifru.ifru_slave
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 8594a67a6..e98a5dd5b 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -268,8 +268,7 @@ static int doexec(char **proggie)
         dup2(0, 1);
         /* dup2(0, 2); - do we *really* want this? NO!
          * exec'ed prog can do it yourself, if needed */
-        execvp(proggie[0], proggie);
-        bb_perror_msg_and_die("can't execute '%s'", proggie[0]);
+        BB_EXECVP_or_die(proggie);
 }
 
 /* connect_w_timeout:
@@ -766,7 +765,7 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
         getopt32(argv, "hnp:s:uvw:" IF_NC_SERVER("l")
                         IF_NC_EXTRA("i:o:z"),
                         &str_p, &str_s, &o_wait
-                        IF_NC_EXTRA(, &str_i, &str_o, &o_verbose));
+                        IF_NC_EXTRA(, &str_i, &str_o), &o_verbose);
         argv += optind;
 #if ENABLE_NC_EXTRA
         if (option_mask32 & OPT_i) /* line-interval time */
diff --git a/networking/netstat.c b/networking/netstat.c
index 2a83af3ac..356fb53cb 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -699,7 +699,7 @@ int netstat_main(int argc UNUSED_PARAM, char **argv)
                 flags |= opt;
         }
         if (flags & (NETSTAT_TCP|NETSTAT_UDP|NETSTAT_RAW)) {
-                printf("Active Internet connections "); /* xxx */
+                printf("Active Internet connections "); /* xxx */
 
                 if ((flags & (NETSTAT_LISTENING|NETSTAT_CONNECTED)) == (NETSTAT_LISTENING|NETSTAT_CONNECTED))
                         printf("(servers and established)");
diff --git a/networking/ntpd.c b/networking/ntpd.c
index b7bd239b5..8fe529edb 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -89,7 +89,7 @@
 //UNUSED: #define PANIC_THRESHOLD 1000    /* panic threshold (sec) */
 
 #define FREQ_TOLERANCE  0.000015 /* frequency tolerance (15 PPM) */
-#define BURSTPOLL       0       /* initial poll */
+#define BURSTPOLL       0       /* initial poll */
 #define MINPOLL         5       /* minimum poll interval. std ntpd uses 6 (6: 64 sec) */
 #define BIGPOLL         10      /* drop to lower poll at any trouble (10: 17 min) */
 #define MAXPOLL         12      /* maximum poll interval (12: 1.1h, 17: 36.4h). std ntpd uses 17 */
@@ -865,7 +865,7 @@ fit(peer_t *p, double rd)
                 VERB3 bb_error_msg("peer %s unfit for selection: unreachable", p->p_dotted);
                 return 0;
         }
-#if 0   /* we filter out such packets earlier */
+#if 0 /* we filter out such packets earlier */
         if ((p->lastpkt_status & LI_ALARM) == LI_ALARM
          || p->lastpkt_stratum >= MAXSTRAT
         ) {
@@ -2110,7 +2110,7 @@ direct_freq(double fp_offset)
 }
 
 static void
-set_freq(double freq) /* frequency update */
+set_freq(double freq) /* frequency update */
 {
         char tbuf[80];
 
diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
index 5905e54e9..4ad44e4f3 100644
--- a/networking/ntpd_simple.c
+++ b/networking/ntpd_simple.c
@@ -870,7 +870,7 @@ static NOINLINE void ntp_init(char **argv)
                 int prec = 0;
                 int b;
 # if 0
-                struct timespec tp;
+                struct timespec tp;
                 /* We can use sys_clock_getres but assuming 10ms tick should be fine */
                 clock_getres(CLOCK_REALTIME, &tp);
                 tp.tv_sec = 0;
diff --git a/networking/ping.c b/networking/ping.c
index 3aba4906e..366a98668 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -29,6 +29,93 @@
 #include <netinet/ip_icmp.h>
 #include "libbb.h"
 
+//config:config PING
+//config:       bool "ping"
+//config:       default y
+//config:       depends on 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.
+//config:
+//config:config PING6
+//config:       bool "ping6"
+//config:       default y
+//config:       depends on FEATURE_IPV6 && PING
+//config:       help
+//config:         This will give you a ping that can talk IPv6.
+//config:
+//config:config FEATURE_FANCY_PING
+//config:       bool "Enable fancy ping output"
+//config:       default y
+//config:       depends on PING
+//config:       help
+//config:         Make the output from the ping applet include statistics, and at the
+//config:         same time provide full support for ICMP packets.
+
+/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore _BB_SUID_MAYBE: */
+//applet:IF_PING(APPLET(ping, _BB_DIR_BIN, _BB_SUID_MAYBE))
+//applet:IF_PING6(APPLET(ping6, _BB_DIR_BIN, _BB_SUID_MAYBE))
+
+//kbuild:lib-$(CONFIG_PING)  += ping.o
+//kbuild:lib-$(CONFIG_PING6) += ping.o
+
+//usage:#if !ENABLE_FEATURE_FANCY_PING
+//usage:# define ping_trivial_usage
+//usage:       "HOST"
+//usage:# define ping_full_usage "\n\n"
+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts"
+//usage:# define ping6_trivial_usage
+//usage:       "HOST"
+//usage:# define ping6_full_usage "\n\n"
+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts"
+//usage:#else
+//usage:# define ping_trivial_usage
+//usage:       "[OPTIONS] HOST"
+//usage:# define ping_full_usage "\n\n"
+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -4,-6           Force IP or IPv6 name resolution"
+//usage:     "\n        -c CNT          Send only CNT pings"
+//usage:     "\n        -s SIZE         Send SIZE data bytes in packets (default:56)"
+//usage:     "\n        -t TTL          Set TTL"
+//usage:     "\n        -I IFACE/IP     Use interface or IP address as source"
+//usage:     "\n        -W SEC          Seconds to wait for the first response (default:10)"
+//usage:     "\n                        (after all -c CNT packets are sent)"
+//usage:     "\n        -w SEC          Seconds until ping exits (default:infinite)"
+//usage:     "\n                        (can exit earlier with -c CNT)"
+//usage:     "\n        -q              Quiet, only displays output at start"
+//usage:     "\n                        and when finished"
+//usage:
+//usage:# define ping6_trivial_usage
+//usage:       "[OPTIONS] HOST"
+//usage:# define ping6_full_usage "\n\n"
+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -c CNT          Send only CNT pings"
+//usage:     "\n        -s SIZE         Send SIZE data bytes in packets (default:56)"
+//usage:     "\n        -I IFACE/IP     Use interface or IP address as source"
+//usage:     "\n        -q              Quiet, only displays output at start"
+//usage:     "\n                        and when finished"
+//usage:
+//usage:#endif
+//usage:
+//usage:#define ping_example_usage
+//usage:       "$ ping localhost\n"
+//usage:       "PING slag (127.0.0.1): 56 data bytes\n"
+//usage:       "64 bytes from 127.0.0.1: icmp_seq=0 ttl=255 time=20.1 ms\n"
+//usage:       "\n"
+//usage:       "--- debian ping statistics ---\n"
+//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"
+//usage:#define ping6_example_usage
+//usage:       "$ ping6 ip6-localhost\n"
+//usage:       "PING ip6-localhost (::1): 56 data bytes\n"
+//usage:       "64 bytes from ::1: icmp6_seq=0 ttl=64 time=20.1 ms\n"
+//usage:       "\n"
+//usage:       "--- ip6-localhost ping statistics ---\n"
+//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"
+
 #if ENABLE_PING6
 # include <netinet/icmp6.h>
 /* I see RENUMBERED constants in bits/in.h - !!?
@@ -223,17 +310,18 @@ static int common_ping_main(sa_family_t af, char **argv)
 
 /* Full(er) version */
 
-#define OPT_STRING ("qvc:s:w:W:I:4" IF_PING6("6"))
+#define OPT_STRING ("qvc:s:t:w:W:I:4" IF_PING6("6"))
 enum {
         OPT_QUIET = 1 << 0,
         OPT_VERBOSE = 1 << 1,
         OPT_c = 1 << 2,
         OPT_s = 1 << 3,
-        OPT_w = 1 << 4,
-        OPT_W = 1 << 5,
-        OPT_I = 1 << 6,
-        OPT_IPV4 = 1 << 7,
-        OPT_IPV6 = (1 << 8) * ENABLE_PING6,
+        OPT_t = 1 << 4,
+        OPT_w = 1 << 5,
+        OPT_W = 1 << 6,
+        OPT_I = 1 << 7,
+        OPT_IPV4 = 1 << 8,
+        OPT_IPV6 = (1 << 9) * ENABLE_PING6,
 };
 
 
@@ -244,6 +332,7 @@ struct globals {
         len_and_sockaddr *source_lsa;
         unsigned datalen;
         unsigned pingcount; /* must be int-sized */
+        unsigned opt_ttl;
         unsigned long ntransmitted, nreceived, nrepeats;
         uint16_t myid;
         unsigned tmin, tmax; /* in us */
@@ -275,6 +364,7 @@ struct globals {
 #define nreceived    (G.nreceived   )
 #define nrepeats     (G.nrepeats    )
 #define pingcount    (G.pingcount   )
+#define opt_ttl      (G.opt_ttl     )
 #define myid         (G.myid        )
 #define tmin         (G.tmin        )
 #define tmax         (G.tmax        )
@@ -586,6 +676,12 @@ static void ping4(len_and_sockaddr *lsa)
         sockopt = (datalen * 2) + 7 * 1024; /* giving it a bit of extra room */
         setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, &sockopt, sizeof(sockopt));
 
+        if (opt_ttl != 0) {
+                setsockopt(pingsock, IPPROTO_IP, IP_TTL, &opt_ttl, sizeof(opt_ttl));
+                /* above doesnt affect packets sent to bcast IP, so... */
+                setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, &opt_ttl, sizeof(opt_ttl));
+        }
+
         signal(SIGINT, print_stats_and_exit);
 
         /* start the ping's going ... */
@@ -735,9 +831,9 @@ static int common_ping_main(int opt, char **argv)
 
         INIT_G();
 
-        /* exactly one argument needed; -v and -q don't mix; -c NUM, -w NUM, -W NUM */
-        opt_complementary = "=1:q--v:v--q:c+:w+:W+";
-        opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &deadline, &timeout, &str_I);
+        /* 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 |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_I);
         if (opt & OPT_s)
                 datalen = xatou16(str_s); // -s
         if (opt & OPT_I) { // -I
diff --git a/networking/slattach.c b/networking/slattach.c
index 921ec552d..71edd2f27 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -134,9 +134,9 @@ int slattach_main(int argc UNUSED_PARAM, char **argv)
         int i, encap, opt;
         struct termios state;
         const char *proto = "cslip";
-        const char *extcmd;                             /* Command to execute after hangup */
+        const char *extcmd;   /* Command to execute after hangup */
         const char *baud_str;
-        int baud_code = -1;                             /* Line baud rate (system code) */
+        int baud_code = -1;   /* Line baud rate (system code) */
 
         enum {
                 OPT_p_proto  = 1 << 0,
diff --git a/networking/tc.c b/networking/tc.c
index 9242741e4..2e2473a70 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -1,7 +1,5 @@
 /* vi: set sw=4 ts=4: */
 /*
- * "tc" utility frontend.
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
diff --git a/networking/telnet.c b/networking/telnet.c
index 12d1970fa..f6fad684c 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -42,11 +42,13 @@ enum {
         UF_ECHO = 0x01,
         UF_SGA = 0x02,
 
-        TS_0 = 1,
+        TS_NORMAL = 0,
+        TS_COPY = 1,
         TS_IAC = 2,
         TS_OPT = 3,
         TS_SUB1 = 4,
         TS_SUB2 = 5,
+        TS_CR = 6,
 };
 
 typedef unsigned char byte;
@@ -83,13 +85,13 @@ struct globals {
         }; \
 } while (0)
 
-/* Function prototypes */
+
 static void rawmode(void);
 static void cookmode(void);
 static void do_linemode(void);
 static void will_charmode(void);
 static void telopt(byte c);
-static int subneg(byte c);
+static void subneg(byte c);
 
 static void iac_flush(void)
 {
@@ -170,24 +172,24 @@ static void handle_net_output(int len)
          * So I implemented it. It's really useful for me. I hope that
          * other people will find it interesting too.
          */
-
-        int i, j;
+        byte outbuf[2 * DATABUFSIZE];
         byte *p = (byte*)G.buf;
-        byte outbuf[4*DATABUFSIZE];
+        int j = 0;
 
-        for (i = len, j = 0; i > 0; i--, p++) {
-                if (*p == 0x1d) {
+        for (; len > 0; len--, p++) {
+                byte c = *p;
+                if (c == 0x1d) {
                         con_escape();
                         return;
                 }
-                outbuf[j++] = *p;
-                if (*p == 0xff)
-                        outbuf[j++] = 0xff;
-                else if (*p == 0x0d)
-                        outbuf[j++] = 0x00;
+                outbuf[j++] = c;
+                if (c == IAC)
+                        outbuf[j++] = c; /* IAC -> IAC IAC */
+                else if (c == '\r')
+                        outbuf[j++] = '\0'; /* CR -> CR NUL */
         }
         if (j > 0)
-                write(netfd, outbuf, j);
+                full_write(netfd, outbuf, j);
 }
 
 static void handle_net_input(int len)
@@ -198,25 +200,44 @@ static void handle_net_input(int len)
         for (i = 0; i < len; i++) {
                 byte c = G.buf[i];
 
-                if (G.telstate == 0) { /* most of the time state == 0 */
+                if (G.telstate == TS_NORMAL) { /* most typical state */
                         if (c == IAC) {
                                 cstart = i;
                                 G.telstate = TS_IAC;
                         }
+                        else if (c == '\r') {
+                                cstart = i + 1;
+                                G.telstate = TS_CR;
+                        }
+                        /* No IACs were seen so far, no need to copy
+                         * bytes within G.buf: */
                         continue;
                 }
+
                 switch (G.telstate) {
-                case TS_0:
+                case TS_CR:
+                        /* Prev char was CR. If cur one is NUL, ignore it.
+                         * See RFC 1123 section 3.3.1 for discussion of telnet EOL handling.
+                         */
+                        G.telstate = TS_COPY;
+                        if (c == '\0')
+                                break;
+                        /* else: fall through - need to handle CR IAC ... properly */
+
+                case TS_COPY: /* Prev char was ordinary */
+                        /* Similar to NORMAL, but in TS_COPY we need to copy bytes */
                         if (c == IAC)
                                 G.telstate = TS_IAC;
                         else
                                 G.buf[cstart++] = c;
+                        if (c == '\r')
+                                G.telstate = TS_CR;
                         break;
 
-                case TS_IAC:
-                        if (c == IAC) { /* IAC IAC -> 0xFF */
+                case TS_IAC: /* Prev char was IAC */
+                        if (c == IAC) { /* IAC IAC -> one IAC */
                                 G.buf[cstart++] = c;
-                                G.telstate = TS_0;
+                                G.telstate = TS_COPY;
                                 break;
                         }
                         /* else */
@@ -228,34 +249,38 @@ static void handle_net_input(int len)
                         case DONT:
                         case WILL:
                         case WONT:
-                                G.telwish =  c;
+                                G.telwish = c;
                                 G.telstate = TS_OPT;
                                 break;
+                        /* DATA MARK must be added later */
                         default:
-                                G.telstate = TS_0;      /* DATA MARK must be added later */
+                                G.telstate = TS_COPY;
                         }
                         break;
-                case TS_OPT: /* WILL, WONT, DO, DONT */
+
+                case TS_OPT: /* Prev chars were IAC WILL/WONT/DO/DONT */
                         telopt(c);
-                        G.telstate = TS_0;
+                        G.telstate = TS_COPY;
                         break;
+
                 case TS_SUB1: /* Subnegotiation */
                 case TS_SUB2: /* Subnegotiation */
-                        if (subneg(c))
-                                G.telstate = TS_0;
+                        subneg(c); /* can change G.telstate */
                         break;
                 }
         }
-        if (G.telstate) {
+
+        if (G.telstate != TS_NORMAL) {
+                /* We had some IACs, or CR */
                 if (G.iaclen)
                         iac_flush();
-                if (G.telstate == TS_0)
-                        G.telstate = 0;
+                if (G.telstate == TS_COPY) /* we aren't in the middle of IAC */
+                        G.telstate = TS_NORMAL;
                 len = cstart;
         }
 
         if (len)
-                write(STDOUT_FILENO, G.buf, len);
+                full_write(STDOUT_FILENO, G.buf, len);
 }
 
 static void put_iac(int c)
@@ -495,7 +520,7 @@ static void telopt(byte c)
 }
 
 /* subnegotiation -- ignore all (except TTYPE,NAWS) */
-static int subneg(byte c)
+static void subneg(byte c)
 {
         switch (G.telstate) {
         case TS_SUB1:
@@ -513,12 +538,13 @@ static int subneg(byte c)
 #endif
                 break;
         case TS_SUB2:
-                if (c == SE)
-                        return TRUE;
+                if (c == SE) {
+                        G.telstate = TS_COPY;
+                        return;
+                }
                 G.telstate = TS_SUB1;
-                /* break; */
+                break;
         }
-        return FALSE;
 }
 
 static void rawmode(void)
@@ -533,21 +559,13 @@ static void cookmode(void)
                 tcsetattr(0, TCSADRAIN, &G.termios_def);
 }
 
-/* poll gives smaller (-70 bytes) code */
-#define USE_POLL 1
-
 int telnet_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int telnet_main(int argc UNUSED_PARAM, char **argv)
 {
         char *host;
         int port;
         int len;
-#ifdef USE_POLL
         struct pollfd ufds[2];
-#else
-        fd_set readfds;
-        int maxfd;
-#endif
 
         INIT_G();
 
@@ -585,63 +603,39 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
 
         signal(SIGINT, record_signo);
 
-#ifdef USE_POLL
-        ufds[0].fd = 0; ufds[1].fd = netfd;
-        ufds[0].events = ufds[1].events = POLLIN;
-#else
-        FD_ZERO(&readfds);
-        FD_SET(STDIN_FILENO, &readfds);
-        FD_SET(netfd, &readfds);
-        maxfd = netfd + 1;
-#endif
+        ufds[0].fd = STDIN_FILENO;
+        ufds[0].events = POLLIN;
+        ufds[1].fd = netfd;
+        ufds[1].events = POLLIN;
 
         while (1) {
-#ifndef USE_POLL
-                fd_set rfds = readfds;
-
-                switch (select(maxfd, &rfds, NULL, NULL, NULL))
-#else
-                switch (poll(ufds, 2, -1))
-#endif
-                {
-                case 0:
-                        /* timeout */
-                case -1:
+                if (poll(ufds, 2, -1) < 0) {
                         /* error, ignore and/or log something, bay go to loop */
                         if (bb_got_signal)
                                 con_escape();
                         else
                                 sleep(1);
-                        break;
-                default:
+                        continue;
+                }
 
-#ifdef USE_POLL
-                        if (ufds[0].revents)
-#else
-                        if (FD_ISSET(STDIN_FILENO, &rfds))
-#endif
-                        {
-                                len = safe_read(STDIN_FILENO, G.buf, DATABUFSIZE);
-                                if (len <= 0)
-                                        doexit(EXIT_SUCCESS);
-                                TRACE(0, ("Read con: %d\n", len));
-                                handle_net_output(len);
-                        }
+// FIXME: reads can block. Need full bidirectional buffering.
 
-#ifdef USE_POLL
-                        if (ufds[1].revents)
-#else
-                        if (FD_ISSET(netfd, &rfds))
-#endif
-                        {
-                                len = safe_read(netfd, G.buf, DATABUFSIZE);
-                                if (len <= 0) {
-                                        full_write1_str("Connection closed by foreign host\r\n");
-                                        doexit(EXIT_FAILURE);
-                                }
-                                TRACE(0, ("Read netfd (%d): %d\n", netfd, len));
-                                handle_net_input(len);
+                if (ufds[0].revents) {
+                        len = safe_read(STDIN_FILENO, G.buf, DATABUFSIZE);
+                        if (len <= 0)
+                                doexit(EXIT_SUCCESS);
+                        TRACE(0, ("Read con: %d\n", len));
+                        handle_net_output(len);
+                }
+
+                if (ufds[1].revents) {
+                        len = safe_read(netfd, G.buf, DATABUFSIZE);
+                        if (len <= 0) {
+                                full_write1_str("Connection closed by foreign host\r\n");
+                                doexit(EXIT_FAILURE);
                         }
+                        TRACE(0, ("Read netfd (%d): %d\n", netfd, len));
+                        handle_net_input(len);
                 }
         } /* while (1) */
 }
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 5c011e15d..07c6a6a73 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -141,7 +141,7 @@ remove_iacs(struct tsession *ts, int *pnum_totty)
                 if (ptr[1] == SB && ptr[2] == TELOPT_NAWS) {
                         struct winsize ws;
                         if ((ptr+8) >= end)
-                                break;  /* incomplete, can't process */
+                                break;  /* incomplete, can't process */
                         ws.ws_col = (ptr[3] << 8) | ptr[4];
                         ws.ws_row = (ptr[5] << 8) | ptr[6];
                         ioctl(ts->ptyfd, TIOCSWINSZ, (char *)&ws);
@@ -273,8 +273,8 @@ make_new_session(
                 static const char iacs_to_send[] ALIGN1 = {
                         IAC, DO, TELOPT_ECHO,
                         IAC, DO, TELOPT_NAWS,
-                /* This requires telnetd.ctrlSQ.patch (incomplete) */
-                /*      IAC, DO, TELOPT_LFLOW, */
+                        /* This requires telnetd.ctrlSQ.patch (incomplete) */
+                        /*IAC, DO, TELOPT_LFLOW,*/
                         IAC, WILL, TELOPT_ECHO,
                         IAC, WILL, TELOPT_SGA
                 };
@@ -314,6 +314,8 @@ make_new_session(
         /* Restore default signal handling ASAP */
         bb_signals((1 << SIGCHLD) + (1 << SIGPIPE), SIG_DFL);
 
+        pid = getpid();
+
         if (ENABLE_FEATURE_UTMP) {
                 len_and_sockaddr *lsa = get_peer_lsa(sock);
                 char *hostname = NULL;
@@ -335,7 +337,6 @@ make_new_session(
         xopen(tty_name, O_RDWR); /* becomes our ctty */
         xdup2(0, 1);
         xdup2(0, 2);
-        pid = getpid();
         tcsetpgrp(0, pid); /* switch this tty's process group to us */
 
         /* The pseudo-terminal allocated to the client is configured to operate
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 78aabedf2..7e5ab61fd 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -926,6 +926,10 @@ static void client_background(void)
 //usage:     "\n        -v              Verbose"
 //usage:        )
 //usage:        )
+//usage:     "\nSignals:"
+//usage:     "\n        USR1    Renew current lease"
+//usage:     "\n        USR2    Release current lease"
+
 
 int udhcpc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int udhcpc_main(int argc UNUSED_PARAM, char **argv)
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index a015cf038..6fb48a19a 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -133,7 +133,10 @@ static uint32_t select_lease_time(struct dhcp_packet *packet)
 
 /* We got a DHCP DISCOVER. Send an OFFER. */
 /* NOINLINE: limit stack usage in caller */
-static NOINLINE void send_offer(struct dhcp_packet *oldpacket, uint32_t static_lease_nip, struct dyn_lease *lease)
+static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
+                uint32_t static_lease_nip,
+                struct dyn_lease *lease,
+                uint8_t *requested_ip_opt)
 {
         struct dhcp_packet packet;
         uint32_t lease_time_sec;
@@ -147,7 +150,6 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket, uint32_t static_l
         if (!static_lease_nip) {
                 /* We have no static lease for client's chaddr */
                 uint32_t req_nip;
-                uint8_t *req_ip_opt;
                 const char *p_host_name;
 
                 if (lease) {
@@ -158,9 +160,9 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket, uint32_t static_l
                         packet.yiaddr = lease->lease_nip;
                 }
                 /* Or: if client has requested an IP */
-                else if ((req_ip_opt = udhcp_get_option(oldpacket, DHCP_REQUESTED_IP)) != NULL
+                else if (requested_ip_opt != NULL
                  /* (read IP) */
-                 && (move_from_unaligned32(req_nip, req_ip_opt), 1)
+                 && (move_from_unaligned32(req_nip, requested_ip_opt), 1)
                  /* and the IP is in the lease range */
                  && ntohl(req_nip) >= server_config.start_ip
                  && ntohl(req_nip) <= server_config.end_ip
@@ -283,16 +285,12 @@ struct dyn_lease *g_leases;
 int udhcpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 {
-        fd_set rfds;
         int server_socket = -1, retval, max_sock;
-        struct dhcp_packet packet;
         uint8_t *state;
-        uint32_t static_lease_nip;
         unsigned timeout_end;
         unsigned num_ips;
         unsigned opt;
         struct option_set *option;
-        struct dyn_lease *lease, fake_lease;
         IF_FEATURE_UDHCP_PORT(char *str_P;)
 
 #if ENABLE_FEATURE_UDHCP_PORT
@@ -372,11 +370,15 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 
         timeout_end = monotonic_sec() + server_config.auto_time;
         while (1) { /* loop until universe collapses */
+                fd_set rfds;
+                struct dhcp_packet packet;
                 int bytes;
                 struct timeval tv;
                 uint8_t *server_id_opt;
-                uint8_t *requested_opt;
+                uint8_t *requested_ip_opt;
                 uint32_t requested_nip = requested_nip; /* for compiler */
+                uint32_t static_lease_nip;
+                struct dyn_lease *lease, fake_lease;
 
                 if (server_socket < 0) {
                         server_socket = udhcp_listen_socket(/*INADDR_ANY,*/ SERVER_PORT,
@@ -443,6 +445,18 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                         continue;
                 }
 
+                /* Get SERVER_ID if present */
+                server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID);
+                if (server_id_opt) {
+                        uint32_t server_id_network_order;
+                        move_from_unaligned32(server_id_network_order, server_id_opt);
+                        if (server_id_network_order != server_config.server_nip) {
+                                /* client talks to somebody else */
+                                log1("server ID doesn't match, ignoring");
+                                continue;
+                        }
+                }
+
                 /* Look for a static/dynamic lease */
                 static_lease_nip = get_static_nip_by_mac(server_config.static_leases, &packet.chaddr);
                 if (static_lease_nip) {
@@ -455,20 +469,10 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                         lease = find_lease_by_mac(packet.chaddr);
                 }
 
-                /* Get REQUESTED_IP and SERVER_ID if present */
-                server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID);
-                if (server_id_opt) {
-                        uint32_t server_id_net;
-                        move_from_unaligned32(server_id_net, server_id_opt);
-                        if (server_id_net != server_config.server_nip) {
-                                /* client talks to somebody else */
-                                log1("server ID doesn't match, ignoring");
-                                continue;
-                        }
-                }
-                requested_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP);
-                if (requested_opt) {
-                        move_from_unaligned32(requested_nip, requested_opt);
+                /* Get REQUESTED_IP if present */
+                requested_ip_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP);
+                if (requested_ip_opt) {
+                        move_from_unaligned32(requested_nip, requested_ip_opt);
                 }
 
                 switch (state[0]) {
@@ -476,7 +480,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 case DHCPDISCOVER:
                         log1("Received DISCOVER");
 
-                        send_offer(&packet, static_lease_nip, lease);
+                        send_offer(&packet, static_lease_nip, lease, requested_ip_opt);
                         break;
 
                 case DHCPREQUEST:
@@ -567,7 +571,7 @@ o DHCPREQUEST generated during REBINDING state:
    A DHCP server MAY extend a client's lease only if it has local
    administrative authority to do so.
 */
-                        if (!requested_opt) {
+                        if (!requested_ip_opt) {
                                 requested_nip = packet.ciaddr;
                                 if (requested_nip == 0) {
                                         log1("no requested IP and no ciaddr, ignoring");
@@ -580,11 +584,15 @@ o DHCPREQUEST generated during REBINDING state:
                                 send_ACK(&packet, lease->lease_nip);
                                 break;
                         }
-                        if (server_id_opt) {
-                                /* client was talking specifically to us.
-                                 * "No, we don't have this IP for you". */
+                        /* No lease for this MAC, or lease IP != requested IP */
+
+                        if (server_id_opt    /* client is in SELECTING state */
+                         || requested_ip_opt /* client is in INIT-REBOOT state */
+                        ) {
+                                /* "No, we don't have this IP for you" */
                                 send_NAK(&packet);
-                        }
+                        } /* else: client is in RENEWING or REBINDING, do not answer */
+
                         break;
 
                 case DHCPDECLINE:
@@ -603,7 +611,7 @@ o DHCPREQUEST generated during REBINDING state:
                          */
                         log1("Received DECLINE");
                         if (server_id_opt
-                         && requested_opt
+                         && requested_ip_opt
                          && lease  /* chaddr matches this lease */
                          && requested_nip == lease->lease_nip
                         ) {
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 1f574d2ad..13c65ad78 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -47,8 +47,8 @@ struct vlan_ioctl_args {
         short vlan_qos;
 };
 
-#define VLAN_GROUP_ARRAY_LEN 4096
-#define SIOCSIFVLAN     0x8983          /* Set 802.1Q VLAN options */
+#define VLAN_GROUP_ARRAY_LEN  4096
+#define SIOCSIFVLAN           0x8983  /* Set 802.1Q VLAN options */
 
 /* On entry, table points to the length of the current string
  * plus NUL terminator plus data length for the subsequent entry.
diff --git a/networking/wget.c b/networking/wget.c
index 5b0907e11..16594c9bf 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  *
  * Copyright (C) 2010 Bradley M. Kuhn <bkuhn@ebb.org>
- *   Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
+ * Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
  */
 #include "libbb.h"
 
@@ -48,7 +48,7 @@ struct BUG_G_too_big {
 /* Must match option string! */
 enum {
         WGET_OPT_CONTINUE   = (1 << 0),
-        WGET_OPT_SPIDER     = (1 << 1),
+        WGET_OPT_SPIDER     = (1 << 1),
         WGET_OPT_QUIET      = (1 << 2),
         WGET_OPT_OUTNAME    = (1 << 3),
         WGET_OPT_PREFIX     = (1 << 4),
@@ -786,7 +786,7 @@ However, in real world it was observed that some web servers
 */
                 case 204:
                         break;
-                case 300:       /* redirection */
+                case 300:  /* redirection */
                 case 301:
                 case 302:
                 case 303: