Merge branch 'busybox' into merge

44 files changed, 508 insertions, 506 deletions

diff --git a/networking/Config.src b/networking/Config.src
index 0adb1e2f9..492c60da4 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -9,42 +9,42 @@ config FEATURE_IPV6
         bool "Enable IPv6 support"
         default y
         help
-          Enable IPv6 support in busybox.
-          This adds IPv6 support in the networking applets.
+        Enable IPv6 support in busybox.
+        This adds IPv6 support in the networking applets.
 
 config FEATURE_UNIX_LOCAL
         bool "Enable Unix domain socket support (usually not needed)"
         default n
         help
-          Enable Unix domain socket support in all busybox networking
-          applets.  Address of the form local:/path/to/unix/socket
-          will be recognized.
+        Enable Unix domain socket support in all busybox networking
+        applets.  Address of the form local:/path/to/unix/socket
+        will be recognized.
 
-          This extension is almost never used in real world usage.
-          You most likely want to say N.
+        This extension is almost never used in real world usage.
+        You most likely want to say N.
 
 config FEATURE_PREFER_IPV4_ADDRESS
         bool "Prefer IPv4 addresses from DNS queries"
         default y
         depends on FEATURE_IPV6
         help
-          Use IPv4 address of network host if it has one.
+        Use IPv4 address of network host if it has one.
 
-          If this option is off, the first returned address will be used.
-          This may cause problems when your DNS server is IPv6-capable and
-          is returning IPv6 host addresses too. If IPv6 address
-          precedes IPv4 one in DNS reply, busybox network applets
-          (e.g. wget) will use IPv6 address. On an IPv6-incapable host
-          or network applets will fail to connect to the host
-          using IPv6 address.
+        If this option is off, the first returned address will be used.
+        This may cause problems when your DNS server is IPv6-capable and
+        is returning IPv6 host addresses too. If IPv6 address
+        precedes IPv4 one in DNS reply, busybox network applets
+        (e.g. wget) will use IPv6 address. On an IPv6-incapable host
+        or network applets will fail to connect to the host
+        using IPv6 address.
 
 config VERBOSE_RESOLUTION_ERRORS
         bool "Verbose resolution errors"
         default n
         help
-          Enable if you are not satisfied with simplistic
-          "can't resolve 'hostname.com'" and want to know more.
-          This may increase size of your executable a bit.
+        Enable if you are not satisfied with simplistic
+        "can't resolve 'hostname.com'" and want to know more.
+        This may increase size of your executable a bit.
 
 INSERT
 
@@ -55,8 +55,8 @@ config IFUPDOWN_UDHCPC_CMD_OPTIONS
         default "-R -n"
         depends on IFUP || IFDOWN
         help
-          Command line options to pass to udhcpc from ifup.
-          Intended to alter options not available in /etc/network/interfaces.
-          (IE: --syslog --background etc...)
+        Command line options to pass to udhcpc from ifup.
+        Intended to alter options not available in /etc/network/interfaces.
+        (IE: --syslog --background etc...)
 
 endmenu
diff --git a/networking/arp.c b/networking/arp.c
index a62a3761c..177ab1571 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -13,11 +13,11 @@
  * modified for getopt32 by Arne Bernin <arne [at] alamut.de>
  */
 //config:config ARP
-//config:       bool "arp"
+//config:       bool "arp (11 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Manipulate the system ARP cache.
+//config:       Manipulate the system ARP cache.
 
 //applet:IF_ARP(APPLET(arp, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/arping.c b/networking/arping.c
index 5bfeb1b45..71672957e 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -6,11 +6,11 @@
  * Busybox port: Nick Fedchik <nick@fedchik.org.ua>
  */
 //config:config ARPING
-//config:       bool "arping"
+//config:       bool "arping (9.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Ping hosts by ARP packets.
+//config:       Ping hosts by ARP packets.
 //config:
 
 //applet:IF_ARPING(APPLET(arping, BB_DIR_USR_SBIN, BB_SUID_DROP))
diff --git a/networking/brctl.c b/networking/brctl.c
index 35876896e..690791e4c 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -13,31 +13,31 @@
  * At the time of this writing this was considered a feature.
  */
 //config:config BRCTL
-//config:       bool "brctl"
+//config:       bool "brctl (4.7 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Manage ethernet bridges.
-//config:         Supports addbr/delbr and addif/delif.
+//config:       Manage ethernet bridges.
+//config:       Supports addbr/delbr and addif/delif.
 //config:
 //config:config FEATURE_BRCTL_FANCY
 //config:       bool "Fancy options"
 //config:       default y
 //config:       depends on BRCTL
 //config:       help
-//config:         Add support for extended option like:
-//config:           setageing, setfd, sethello, setmaxage,
-//config:           setpathcost, setportprio, setbridgeprio,
-//config:           stp
-//config:         This adds about 600 bytes.
+//config:       Add support for extended option like:
+//config:               setageing, setfd, sethello, setmaxage,
+//config:               setpathcost, setportprio, setbridgeprio,
+//config:               stp
+//config:       This adds about 600 bytes.
 //config:
 //config:config FEATURE_BRCTL_SHOW
 //config:       bool "Support show"
 //config:       default y
 //config:       depends on BRCTL && FEATURE_BRCTL_FANCY
 //config:       help
-//config:         Add support for option which prints the current config:
-//config:           show
+//config:       Add support for option which prints the current config:
+//config:               show
 
 //applet:IF_BRCTL(APPLET(brctl, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 1b85618c6..37a80309d 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -17,10 +17,10 @@
  * the first porting of oao' scdns to busybox also.
  */
 //config:config DNSD
-//config:       bool "dnsd"
+//config:       bool "dnsd (9.8 kb)"
 //config:       default y
 //config:       help
-//config:         Small and static DNS server daemon.
+//config:       Small and static DNS server daemon.
 
 //applet:IF_DNSD(APPLET(dnsd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index d7d691772..52522e76d 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -64,11 +64,11 @@
  *   filter.  That configuration consumes more power.
  */
 //config:config ETHER_WAKE
-//config:       bool "ether-wake"
+//config:       bool "ether-wake (6.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Send a magic packet to wake up sleeping machines.
+//config:       Send a magic packet to wake up sleeping machines.
 
 //applet:IF_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, BB_DIR_USR_SBIN, BB_SUID_DROP, ether_wake))
 
diff --git a/networking/ftpd.c b/networking/ftpd.c
index 439608ce6..aee00e1c3 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -12,35 +12,35 @@
  * You have to run this daemon via inetd.
  */
 //config:config FTPD
-//config:       bool "ftpd"
+//config:       bool "ftpd (30 kb)"
 //config:       default y
 //config:       help
-//config:         Simple FTP daemon. You have to run it via inetd.
+//config:       Simple FTP daemon. You have to run it via inetd.
 //config:
 //config:config FEATURE_FTPD_WRITE
 //config:       bool "Enable upload commands"
 //config:       default y
 //config:       depends on FTPD
 //config:       help
-//config:         Enable all kinds of FTP upload commands (-w option)
+//config:       Enable all kinds of FTP upload commands (-w option)
 //config:
 //config:config FEATURE_FTPD_ACCEPT_BROKEN_LIST
 //config:       bool "Enable workaround for RFC-violating clients"
 //config:       default y
 //config:       depends on FTPD
 //config:       help
-//config:         Some ftp clients (among them KDE's Konqueror) issue illegal
-//config:         "LIST -l" requests. This option works around such problems.
-//config:         It might prevent you from listing files starting with "-" and
-//config:         it increases the code size by ~40 bytes.
-//config:         Most other ftp servers seem to behave similar to this.
+//config:       Some ftp clients (among them KDE's Konqueror) issue illegal
+//config:       "LIST -l" requests. This option works around such problems.
+//config:       It might prevent you from listing files starting with "-" and
+//config:       it increases the code size by ~40 bytes.
+//config:       Most other ftp servers seem to behave similar to this.
 //config:
 //config:config FEATURE_FTPD_AUTHENTICATION
 //config:       bool "Enable authentication"
 //config:       default y
 //config:       depends on FTPD
 //config:       help
-//config:         Enable basic system login as seen in telnet etc.
+//config:       Enable basic system login as seen in telnet etc.
 
 //applet:IF_FTPD(APPLET(ftpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 3eadd752d..cb0a96b59 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -13,16 +13,16 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config FTPGET
-//config:       bool "ftpget"
+//config:       bool "ftpget (8 kb)"
 //config:       default y
 //config:       help
-//config:         Retrieve a remote file via FTP.
+//config:       Retrieve a remote file via FTP.
 //config:
 //config:config FTPPUT
-//config:       bool "ftpput"
+//config:       bool "ftpput (7.7 kb)"
 //config:       default y
 //config:       help
-//config:         Store a remote file via FTP.
+//config:       Store a remote file via FTP.
 //config:
 //config:config FEATURE_FTPGETPUT_LONG_OPTIONS
 //config:       bool "Enable long options in ftpget/ftpput"
diff --git a/networking/hostname.c b/networking/hostname.c
index 9f2418422..4b305d2b6 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -11,16 +11,16 @@
  */
 
 //config:config HOSTNAME
-//config:       bool "hostname"
+//config:       bool "hostname (5.6 kb)"
 //config:       default y
 //config:       help
-//config:         Show or set the system's host name.
+//config:       Show or set the system's host name.
 //config:
 //config:config DNSDOMAINNAME
-//config:       bool "dnsdomainname"
+//config:       bool "dnsdomainname (3.6 kb)"
 //config:       default y
 //config:       help
-//config:         Alias to "hostname -d".
+//config:       Alias to "hostname -d".
 
 //                        APPLET_ODDNAME:name           main      location    suid_type     help
 //applet:IF_DNSDOMAINNAME(APPLET_ODDNAME(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname))
diff --git a/networking/httpd.c b/networking/httpd.c
index e072f23c7..cfc07075b 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -99,123 +99,123 @@
  */
  /* TODO: use TCP_CORK, parse_config() */
 //config:config HTTPD
-//config:       bool "httpd"
+//config:       bool "httpd (32 kb)"
 //config:       default y
 //config:       help
-//config:         HTTP server.
+//config:       HTTP server.
 //config:
 //config:config FEATURE_HTTPD_RANGES
 //config:       bool "Support 'Ranges:' header"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         Makes httpd emit "Accept-Ranges: bytes" header and understand
-//config:         "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted
-//config:         downloads, seeking in multimedia players etc.
+//config:       Makes httpd emit "Accept-Ranges: bytes" header and understand
+//config:       "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted
+//config:       downloads, seeking in multimedia players etc.
 //config:
 //config:config FEATURE_HTTPD_SETUID
 //config:       bool "Enable -u <user> option"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         This option allows the server to run as a specific user
-//config:         rather than defaulting to the user that starts the server.
-//config:         Use of this option requires special privileges to change to a
-//config:         different user.
+//config:       This option allows the server to run as a specific user
+//config:       rather than defaulting to the user that starts the server.
+//config:       Use of this option requires special privileges to change to a
+//config:       different user.
 //config:
 //config:config FEATURE_HTTPD_BASIC_AUTH
 //config:       bool "Enable Basic http Authentication"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         Utilizes password settings from /etc/httpd.conf for basic
-//config:         authentication on a per url basis.
-//config:         Example for httpd.conf file:
-//config:         /adm:toor:PaSsWd
+//config:       Utilizes password settings from /etc/httpd.conf for basic
+//config:       authentication on a per url basis.
+//config:       Example for httpd.conf file:
+//config:       /adm:toor:PaSsWd
 //config:
 //config:config FEATURE_HTTPD_AUTH_MD5
 //config:       bool "Support MD5 crypted passwords for http Authentication"
 //config:       default y
 //config:       depends on FEATURE_HTTPD_BASIC_AUTH
 //config:       help
-//config:         Enables encrypted passwords, and wildcard user/passwords
-//config:         in httpd.conf file.
-//config:         User '*' means 'any system user name is ok',
-//config:         password of '*' means 'use system password for this user'
-//config:         Examples:
-//config:         /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
-//config:         /adm:root:*
-//config:         /wiki:*:*
+//config:       Enables encrypted passwords, and wildcard user/passwords
+//config:       in httpd.conf file.
+//config:       User '*' means 'any system user name is ok',
+//config:       password of '*' means 'use system password for this user'
+//config:       Examples:
+//config:       /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
+//config:       /adm:root:*
+//config:       /wiki:*:*
 //config:
 //config:config FEATURE_HTTPD_CGI
 //config:       bool "Support Common Gateway Interface (CGI)"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         This option allows scripts and executables to be invoked
-//config:         when specific URLs are requested.
+//config:       This option allows scripts and executables to be invoked
+//config:       when specific URLs are requested.
 //config:
 //config:config FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
 //config:       bool "Support running scripts through an interpreter"
 //config:       default y
 //config:       depends on FEATURE_HTTPD_CGI
 //config:       help
-//config:         This option enables support for running scripts through an
-//config:         interpreter. Turn this on if you want PHP scripts to work
-//config:         properly. You need to supply an additional line in your
-//config:         httpd.conf file:
-//config:         *.php:/path/to/your/php
+//config:       This option enables support for running scripts through an
+//config:       interpreter. Turn this on if you want PHP scripts to work
+//config:       properly. You need to supply an additional line in your
+//config:       httpd.conf file:
+//config:       *.php:/path/to/your/php
 //config:
 //config:config FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
 //config:       bool "Set REMOTE_PORT environment variable for CGI"
 //config:       default y
 //config:       depends on FEATURE_HTTPD_CGI
 //config:       help
-//config:         Use of this option can assist scripts in generating
-//config:         references that contain a unique port number.
+//config:       Use of this option can assist scripts in generating
+//config:       references that contain a unique port number.
 //config:
 //config:config FEATURE_HTTPD_ENCODE_URL_STR
 //config:       bool "Enable -e option (useful for CGIs written as shell scripts)"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         This option allows html encoding of arbitrary strings for display
-//config:         by the browser. Output goes to stdout.
-//config:         For example, httpd -e "<Hello World>" produces
-//config:         "&#60Hello&#32World&#62".
+//config:       This option allows html encoding of arbitrary strings for display
+//config:       by the browser. Output goes to stdout.
+//config:       For example, httpd -e "<Hello World>" produces
+//config:       "&#60Hello&#32World&#62".
 //config:
 //config:config FEATURE_HTTPD_ERROR_PAGES
 //config:       bool "Support custom error pages"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         This option allows you to define custom error pages in
-//config:         the configuration file instead of the default HTTP status
-//config:         error pages. For instance, if you add the line:
-//config:               E404:/path/e404.html
-//config:         in the config file, the server will respond the specified
-//config:         '/path/e404.html' file instead of the terse '404 NOT FOUND'
-//config:         message.
+//config:       This option allows you to define custom error pages in
+//config:       the configuration file instead of the default HTTP status
+//config:       error pages. For instance, if you add the line:
+//config:               E404:/path/e404.html
+//config:       in the config file, the server will respond the specified
+//config:       '/path/e404.html' file instead of the terse '404 NOT FOUND'
+//config:       message.
 //config:
 //config:config FEATURE_HTTPD_PROXY
 //config:       bool "Support reverse proxy"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         This option allows you to define URLs that will be forwarded
-//config:         to another HTTP server. To setup add the following line to the
-//config:         configuration file
-//config:               P:/url/:http://hostname[:port]/new/path/
-//config:         Then a request to /url/myfile will be forwarded to
-//config:         http://hostname[:port]/new/path/myfile.
+//config:       This option allows you to define URLs that will be forwarded
+//config:       to another HTTP server. To setup add the following line to the
+//config:       configuration file
+//config:               P:/url/:http://hostname[:port]/new/path/
+//config:       Then a request to /url/myfile will be forwarded to
+//config:       http://hostname[:port]/new/path/myfile.
 //config:
 //config:config FEATURE_HTTPD_GZIP
 //config:       bool "Support GZIP content encoding"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
-//config:         Makes httpd send files using GZIP content encoding if the
-//config:         client supports it and a pre-compressed <file>.gz exists.
+//config:       Makes httpd send files using GZIP content encoding if the
+//config:       client supports it and a pre-compressed <file>.gz exists.
 
 //applet:IF_HTTPD(APPLET(httpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 9e16936d8..d1e9c58dc 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -26,52 +26,52 @@
  * IPV6 support added by Bart Visscher <magick@linux-fan.com>
  */
 //config:config IFCONFIG
-//config:       bool "ifconfig"
+//config:       bool "ifconfig (12 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Ifconfig is used to configure the kernel-resident network interfaces.
+//config:       Ifconfig is used to configure the kernel-resident network interfaces.
 //config:
 //config:config FEATURE_IFCONFIG_STATUS
 //config:       bool "Enable status reporting output (+7k)"
 //config:       default y
 //config:       depends on IFCONFIG
 //config:       help
-//config:         If ifconfig is called with no arguments it will display the status
-//config:         of the currently active interfaces.
+//config:       If ifconfig is called with no arguments it will display the status
+//config:       of the currently active interfaces.
 //config:
 //config:config FEATURE_IFCONFIG_SLIP
 //config:       bool "Enable slip-specific options \"keepalive\" and \"outfill\""
 //config:       default y
 //config:       depends on IFCONFIG
 //config:       help
-//config:         Allow "keepalive" and "outfill" support for SLIP. If you're not
-//config:         planning on using serial lines, leave this unchecked.
+//config:       Allow "keepalive" and "outfill" support for SLIP. If you're not
+//config:       planning on using serial lines, leave this unchecked.
 //config:
 //config:config FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
 //config:       bool "Enable options \"mem_start\", \"io_addr\", and \"irq\""
 //config:       default y
 //config:       depends on IFCONFIG
 //config:       help
-//config:         Allow the start address for shared memory, start address for I/O,
-//config:         and/or the interrupt line used by the specified device.
+//config:       Allow the start address for shared memory, start address for I/O,
+//config:       and/or the interrupt line used by the specified device.
 //config:
 //config:config FEATURE_IFCONFIG_HW
 //config:       bool "Enable option \"hw\" (ether only)"
 //config:       default y
 //config:       depends on IFCONFIG
 //config:       help
-//config:         Set the hardware address of this interface, if the device driver
-//config:         supports  this  operation. Currently, we only support the 'ether'
-//config:         class.
+//config:       Set the hardware address of this interface, if the device driver
+//config:       supports  this  operation. Currently, we only support the 'ether'
+//config:       class.
 //config:
 //config:config FEATURE_IFCONFIG_BROADCAST_PLUS
 //config:       bool "Set the broadcast automatically"
 //config:       default y
 //config:       depends on IFCONFIG
 //config:       help
-//config:         Setting this will make ifconfig attempt to find the broadcast
-//config:         automatically if the value '+' is used.
+//config:       Setting this will make ifconfig attempt to find the broadcast
+//config:       automatically if the value '+' is used.
 
 //applet:IF_IFCONFIG(APPLET(ifconfig, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index 070931209..26e5e8cf3 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -98,12 +98,12 @@
  *         set version to 1.1.0
  */
 //config:config IFENSLAVE
-//config:       bool "ifenslave"
+//config:       bool "ifenslave (13 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Userspace application to bind several interfaces
-//config:         to a logical interface (use with kernel bonding driver).
+//config:       Userspace application to bind several interfaces
+//config:       to a logical interface (use with kernel bonding driver).
 
 //applet:IF_IFENSLAVE(APPLET(ifenslave, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 4f8a274b0..9bc1a075f 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -7,11 +7,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IFPLUGD
-//config:       bool "ifplugd"
+//config:       bool "ifplugd (9.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Network interface plug detection daemon.
+//config:       Network interface plug detection daemon.
 
 //applet:IF_IFPLUGD(APPLET(ifplugd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
@@ -342,10 +342,8 @@ static int run_script(const char *action)
         /* r < 0 - can't exec, 0 <= r < 0x180 - exited, >=0x180 - killed by sig (r-0x180) */
         r = spawn_and_wait(argv);
 
-        unsetenv(IFPLUGD_ENV_PREVIOUS);
-        unsetenv(IFPLUGD_ENV_CURRENT);
-        free(env_PREVIOUS);
-        free(env_CURRENT);
+        bb_unsetenv_and_free(env_PREVIOUS);
+        bb_unsetenv_and_free(env_CURRENT);
 
         bb_error_msg("exit code: %d", r & 0xff);
         return (option_mask32 & FLAG_IGNORE_RETVAL) ? 0 : r;
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index a76fe1021..f8c29ab00 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -18,66 +18,66 @@
  */
 
 //config:config IFUP
-//config:       bool "ifup"
+//config:       bool "ifup (17 kb)"
 //config:       default y
 //config:       help
-//config:         Activate the specified interfaces. This applet makes use
-//config:         of either "ifconfig" and "route" or the "ip" command to actually
-//config:         configure network interfaces. Therefore, you will probably also want
-//config:         to enable either IFCONFIG and ROUTE, or enable
-//config:         FEATURE_IFUPDOWN_IP and the various IP options. Of
-//config:         course you could use non-busybox versions of these programs, so
-//config:         against my better judgement (since this will surely result in plenty
-//config:         of support questions on the mailing list), I do not force you to
-//config:         enable these additional options. It is up to you to supply either
-//config:         "ifconfig", "route" and "run-parts" or the "ip" command, either
-//config:         via busybox or via standalone utilities.
+//config:       Activate the specified interfaces. This applet makes use
+//config:       of either "ifconfig" and "route" or the "ip" command to actually
+//config:       configure network interfaces. Therefore, you will probably also want
+//config:       to enable either IFCONFIG and ROUTE, or enable
+//config:       FEATURE_IFUPDOWN_IP and the various IP options. Of
+//config:       course you could use non-busybox versions of these programs, so
+//config:       against my better judgement (since this will surely result in plenty
+//config:       of support questions on the mailing list), I do not force you to
+//config:       enable these additional options. It is up to you to supply either
+//config:       "ifconfig", "route" and "run-parts" or the "ip" command, either
+//config:       via busybox or via standalone utilities.
 //config:
 //config:config IFDOWN
-//config:       bool "ifdown"
+//config:       bool "ifdown (15 kb)"
 //config:       default y
 //config:       help
-//config:         Deactivate the specified interfaces.
+//config:       Deactivate the specified interfaces.
 //config:
 //config:config IFUPDOWN_IFSTATE_PATH
 //config:       string "Absolute path to ifstate file"
 //config:       default "/var/run/ifstate"
 //config:       depends on IFUP || IFDOWN
 //config:       help
-//config:         ifupdown keeps state information in a file called ifstate.
-//config:         Typically it is located in /var/run/ifstate, however
-//config:         some distributions tend to put it in other places
-//config:         (debian, for example, uses /etc/network/run/ifstate).
-//config:         This config option defines location of ifstate.
+//config:       ifupdown keeps state information in a file called ifstate.
+//config:       Typically it is located in /var/run/ifstate, however
+//config:       some distributions tend to put it in other places
+//config:       (debian, for example, uses /etc/network/run/ifstate).
+//config:       This config option defines location of ifstate.
 //config:
 //config:config FEATURE_IFUPDOWN_IP
 //config:       bool "Use ip tool (else ifconfig/route is used)"
 //config:       default y
 //config:       depends on IFUP || IFDOWN
 //config:       help
-//config:         Use the iproute "ip" command to implement "ifup" and "ifdown", rather
-//config:         than the default of using the older "ifconfig" and "route" utilities.
+//config:       Use the iproute "ip" command to implement "ifup" and "ifdown", rather
+//config:       than the default of using the older "ifconfig" and "route" utilities.
 //config:
-//config:         If Y: you must install either the full-blown iproute2 package
-//config:         or enable "ip" applet in Busybox, or the "ifup" and "ifdown" applets
-//config:         will not work.
+//config:       If Y: you must install either the full-blown iproute2 package
+//config:       or enable "ip" applet in Busybox, or the "ifup" and "ifdown" applets
+//config:       will not work.
 //config:
-//config:         If N: you must install either the full-blown ifconfig and route
-//config:         utilities, or enable these applets in Busybox.
+//config:       If N: you must install either the full-blown ifconfig and route
+//config:       utilities, or enable these applets in Busybox.
 //config:
 //config:config FEATURE_IFUPDOWN_IPV4
 //config:       bool "Support IPv4"
 //config:       default y
 //config:       depends on IFUP || IFDOWN
 //config:       help
-//config:         If you want ifup/ifdown to talk IPv4, leave this on.
+//config:       If you want ifup/ifdown to talk IPv4, leave this on.
 //config:
 //config:config FEATURE_IFUPDOWN_IPV6
 //config:       bool "Support IPv6"
 //config:       default y
 //config:       depends on (IFUP || IFDOWN) && FEATURE_IPV6
 //config:       help
-//config:         If you need support for IPv6, turn this option on.
+//config:       If you need support for IPv6, turn this option on.
 //config:
 //UNUSED:
 ////////:config FEATURE_IFUPDOWN_IPX
@@ -93,18 +93,18 @@
 //config:       default y
 //config:       depends on IFUP || IFDOWN
 //config:       help
-//config:         This enables support for the "mapping" stanza, unless you have
-//config:         a weird network setup you don't need it.
+//config:       This enables support for the "mapping" stanza, unless you have
+//config:       a weird network setup you don't need it.
 //config:
 //config:config FEATURE_IFUPDOWN_EXTERNAL_DHCP
 //config:       bool "Support external DHCP clients"
 //config:       default n
 //config:       depends on IFUP || IFDOWN
 //config:       help
-//config:         This enables support for the external dhcp clients. Clients are
-//config:         tried in the following order: dhcpcd, dhclient, pump and udhcpc.
-//config:         Otherwise, if udhcpc applet is enabled, it is used.
-//config:         Otherwise, ifup/ifdown will have no support for DHCP.
+//config:       This enables support for the external dhcp clients. Clients are
+//config:       tried in the following order: dhcpcd, dhclient, pump and udhcpc.
+//config:       Otherwise, if udhcpc applet is enabled, it is used.
+//config:       Otherwise, ifup/ifdown will have no support for DHCP.
 
 //                 APPLET_ODDNAME:name    main      location     suid_type     help
 //applet:IF_IFUP(  APPLET_ODDNAME(ifup,   ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifup))
diff --git a/networking/inetd.c b/networking/inetd.c
index 3bf157b70..2991edc09 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -154,46 +154,46 @@
  *                      setuid()
  */
 //config:config INETD
-//config:       bool "inetd"
+//config:       bool "inetd (18 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         Internet superserver daemon
+//config:       Internet superserver daemon
 //config:
 //config:config FEATURE_INETD_SUPPORT_BUILTIN_ECHO
 //config:       bool "Support echo service"
 //config:       default y
 //config:       depends on INETD
 //config:       help
-//config:         Echo received data internal inetd service
+//config:       Echo received data internal inetd service
 //config:
 //config:config FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
 //config:       bool "Support discard service"
 //config:       default y
 //config:       depends on INETD
 //config:       help
-//config:         Internet /dev/null internal inetd service
+//config:       Internet /dev/null internal inetd service
 //config:
 //config:config FEATURE_INETD_SUPPORT_BUILTIN_TIME
 //config:       bool "Support time service"
 //config:       default y
 //config:       depends on INETD
 //config:       help
-//config:         Return 32 bit time since 1900 internal inetd service
+//config:       Return 32 bit time since 1900 internal inetd service
 //config:
 //config:config FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
 //config:       bool "Support daytime service"
 //config:       default y
 //config:       depends on INETD
 //config:       help
-//config:         Return human-readable time internal inetd service
+//config:       Return human-readable time internal inetd service
 //config:
 //config:config FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
 //config:       bool "Support chargen service"
 //config:       default y
 //config:       depends on INETD
 //config:       help
-//config:         Familiar character generator internal inetd service
+//config:       Familiar character generator internal inetd service
 //config:
 //config:config FEATURE_INETD_RPC
 //config:       bool "Support RPC services"
@@ -201,7 +201,7 @@
 //config:       depends on INETD
 //config:       select FEATURE_HAVE_RPC
 //config:       help
-//config:         Support Sun-RPC based services
+//config:       Support Sun-RPC based services
 
 //applet:IF_INETD(APPLET(inetd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ip.c b/networking/ip.c
index 3cf52cdd7..cca7cbe12 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -9,120 +9,120 @@
  * Bernhard Reutner-Fischer rewrote to use index_in_substr_array
  */
 //config:config IP
-//config:       bool "ip"
+//config:       bool "ip (34 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The "ip" applet is a TCP/IP interface configuration and routing
-//config:         utility. You generally don't need "ip" to use busybox with
-//config:         TCP/IP.
+//config:       The "ip" applet is a TCP/IP interface configuration and routing
+//config:       utility. You generally don't need "ip" to use busybox with
+//config:       TCP/IP.
 //config:
 //config:config IPADDR
-//config:       bool "ipaddr"
+//config:       bool "ipaddr (14 kb)"
 //config:       default y
 //config:       select FEATURE_IP_ADDRESS
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support short form of ip addr: ipaddr
+//config:       Support short form of ip addr: ipaddr
 //config:
 //config:config IPLINK
-//config:       bool "iplink"
+//config:       bool "iplink (16 kb)"
 //config:       default y
 //config:       select FEATURE_IP_LINK
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support short form of ip link: iplink
+//config:       Support short form of ip link: iplink
 //config:
 //config:config IPROUTE
-//config:       bool "iproute"
+//config:       bool "iproute (15 kb)"
 //config:       default y
 //config:       select FEATURE_IP_ROUTE
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support short form of ip route: iproute
+//config:       Support short form of ip route: iproute
 //config:
 //config:config IPTUNNEL
-//config:       bool "iptunnel"
+//config:       bool "iptunnel (9.6 kb)"
 //config:       default y
 //config:       select FEATURE_IP_TUNNEL
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support short form of ip tunnel: iptunnel
+//config:       Support short form of ip tunnel: iptunnel
 //config:
 //config:config IPRULE
-//config:       bool "iprule"
+//config:       bool "iprule (10 kb)"
 //config:       default y
 //config:       select FEATURE_IP_RULE
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support short form of ip rule: iprule
+//config:       Support short form of ip rule: iprule
 //config:
 //config:config IPNEIGH
-//config:       bool "ipneigh"
+//config:       bool "ipneigh (8.3 kb)"
 //config:       default y
 //config:       select FEATURE_IP_NEIGH
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Support short form of ip neigh: ipneigh
+//config:       Support short form of ip neigh: ipneigh
 //config:
 //config:config FEATURE_IP_ADDRESS
 //config:       bool "ip address"
 //config:       default y
 //config:       depends on IP || IPADDR
 //config:       help
-//config:         Address manipulation support for the "ip" applet.
+//config:       Address manipulation support for the "ip" applet.
 //config:
 //config:config FEATURE_IP_LINK
 //config:       bool "ip link"
 //config:       default y
 //config:       depends on IP || IPLINK
 //config:       help
-//config:         Configure network devices with "ip".
+//config:       Configure network devices with "ip".
 //config:
 //config:config FEATURE_IP_ROUTE
 //config:       bool "ip route"
 //config:       default y
 //config:       depends on IP || IPROUTE
 //config:       help
-//config:         Add support for routing table management to "ip".
+//config:       Add support for routing table management to "ip".
 //config:
 //config:config FEATURE_IP_ROUTE_DIR
 //config:       string "ip route configuration directory"
 //config:       default "/etc/iproute2"
 //config:       depends on FEATURE_IP_ROUTE
 //config:       help
-//config:         Location of the "ip" applet routing configuration.
+//config:       Location of the "ip" applet routing configuration.
 //config:
 //config:config FEATURE_IP_TUNNEL
 //config:       bool "ip tunnel"
 //config:       default y
 //config:       depends on IP || IPTUNNEL
 //config:       help
-//config:         Add support for tunneling commands to "ip".
+//config:       Add support for tunneling commands to "ip".
 //config:
 //config:config FEATURE_IP_RULE
 //config:       bool "ip rule"
 //config:       default y
 //config:       depends on IP || IPRULE
 //config:       help
-//config:         Add support for rule commands to "ip".
+//config:       Add support for rule commands to "ip".
 //config:
 //config:config FEATURE_IP_NEIGH
 //config:       bool "ip neighbor"
 //config:       default y
 //config:       depends on IP || IPNEIGH
 //config:       help
-//config:         Add support for neighbor commands to "ip".
+//config:       Add support for neighbor commands to "ip".
 //config:
 //config:config FEATURE_IP_RARE_PROTOCOLS
 //config:       bool "Support displaying rarely used link types"
 //config:       default n
 //config:       depends on IP || IPADDR || IPLINK || IPROUTE || IPTUNNEL || IPRULE || IPNEIGH
 //config:       help
-//config:         If you are not going to use links of type "frad", "econet",
-//config:         "bif" etc, you probably don't need to enable this.
-//config:         Ethernet, wireless, infrared, ppp/slip, ip tunnelling
-//config:         link types are supported without this option selected.
+//config:       If you are not going to use links of type "frad", "econet",
+//config:       "bif" etc, you probably don't need to enable this.
+//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))
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 9359f9016..9888a6ff2 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -12,11 +12,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config IPCALC
-//config:       bool "ipcalc"
+//config:       bool "ipcalc (4.3 kb)"
 //config:       default y
 //config:       help
-//config:         ipcalc takes an IP address and netmask and calculates the
-//config:         resulting broadcast, network, and host range.
+//config:       ipcalc takes an IP address and netmask and calculates the
+//config:       resulting broadcast, network, and host range.
 //config:
 //config:config FEATURE_IPCALC_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -28,8 +28,8 @@
 //config:       default y
 //config:       depends on IPCALC
 //config:       help
-//config:         Adds the options hostname, prefix and silent to the output of
-//config:         "ipcalc".
+//config:       Adds the options hostname, prefix and silent to the output of
+//config:       "ipcalc".
 
 //applet:IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index 219c64b66..133d62a65 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -7,12 +7,12 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FAKEIDENTD
-//config:       bool "fakeidentd"
+//config:       bool "fakeidentd (8.9 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         fakeidentd listens on the ident port and returns a predefined
-//config:         fake value on any query.
+//config:       fakeidentd listens on the ident port and returns a predefined
+//config:       fake value on any query.
 
 //applet:IF_FAKEIDENTD(APPLET(fakeidentd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/nameif.c b/networking/nameif.c
index cffd5bfde..31ee98a39 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -11,34 +11,34 @@
  */
 
 //config:config NAMEIF
-//config:       bool "nameif"
+//config:       bool "nameif (6.6 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         nameif is used to rename network interface by its MAC address.
-//config:         Renamed interfaces MUST be in the down state.
-//config:         It is possible to use a file (default: /etc/mactab)
-//config:         with list of new interface names and MACs.
-//config:         Maximum interface name length: IFNAMSIZ = 16
-//config:         File fields are separated by space or tab.
-//config:         File format:
-//config:         # Comment
-//config:         new_interface_name    XX:XX:XX:XX:XX:XX
+//config:       nameif is used to rename network interface by its MAC address.
+//config:       Renamed interfaces MUST be in the down state.
+//config:       It is possible to use a file (default: /etc/mactab)
+//config:       with list of new interface names and MACs.
+//config:       Maximum interface name length: IFNAMSIZ = 16
+//config:       File fields are separated by space or tab.
+//config:       File format:
+//config:               # Comment
+//config:               new_interface_name  XX:XX:XX:XX:XX:XX
 //config:
 //config:config FEATURE_NAMEIF_EXTENDED
 //config:       bool "Extended nameif"
 //config:       default y
 //config:       depends on NAMEIF
 //config:       help
-//config:         This extends the nameif syntax to support the bus_info, driver,
-//config:         phyaddr selectors. The syntax is compatible to the normal nameif.
-//config:         File format:
-//config:           new_interface_name  driver=asix bus=usb-0000:00:08.2-3
-//config:           new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
-//config:           new_interface_name  phy_address=2 00:80:C8:38:91:B5
-//config:           new_interface_name  mac=00:80:C8:38:91:B5
-//config:           new_interface_name  00:80:C8:38:91:B5
+//config:       This extends the nameif syntax to support the bus_info, driver,
+//config:       phyaddr selectors. The syntax is compatible to the normal nameif.
+//config:       File format:
+//config:               new_interface_name  driver=asix bus=usb-0000:00:08.2-3
+//config:               new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
+//config:               new_interface_name  phy_address=2 00:80:C8:38:91:B5
+//config:               new_interface_name  mac=00:80:C8:38:91:B5
+//config:               new_interface_name  00:80:C8:38:91:B5
 
 //applet:IF_NAMEIF(APPLET(nameif, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/nbd-client.c b/networking/nbd-client.c
index 70869d651..a5e25e6aa 100644
--- a/networking/nbd-client.c
+++ b/networking/nbd-client.c
@@ -12,10 +12,10 @@
 //kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o
 
 //config:config NBDCLIENT
-//config:       bool "nbd-client"
+//config:       bool "nbd-client (4.6 kb)"
 //config:       default y
 //config:       help
-//config:         Network block device client
+//config:       Network block device client
 
 #define NBD_SET_SOCK          _IO(0xab, 0)
 #define NBD_SET_BLKSIZE       _IO(0xab, 1)
diff --git a/networking/nc.c b/networking/nc.c
index 1b70434ac..df073d7df 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -7,37 +7,37 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NC
-//config:       bool "nc"
+//config:       bool "nc (11 kb)"
 //config:       default y
 //config:       help
-//config:         A simple Unix utility which reads and writes data across network
-//config:         connections.
+//config:       A simple Unix utility which reads and writes data across network
+//config:       connections.
 //config:
 //config:config NC_SERVER
 //config:       bool "Netcat server options (-l)"
 //config:       default y
 //config:       depends on NC
 //config:       help
-//config:         Allow netcat to act as a server.
+//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:       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
-//config:         lines sent), -w (timeout for initial connection).
+//config:       Add -e (support for executing the rest of the command line after
+//config:       making or receiving a successful connection), -i (delay interval for
+//config:       lines sent), -w (timeout for initial connection).
 //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:       help
-//config:         This option makes nc closely follow original nc-1.10.
-//config:         The code is about 2.5k bigger. It enables
-//config:         -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
-//config:         busybox-specific extensions: -f FILE.
+//config:       This option makes nc closely follow original nc-1.10.
+//config:       The code is about 2.5k bigger. It enables
+//config:       -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
+//config:       busybox-specific extensions: -f FILE.
 
 //applet:IF_NC(APPLET(nc, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/networking/netstat.c b/networking/netstat.c
index 68e0c1a04..33281e333 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -14,27 +14,27 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NETSTAT
-//config:       bool "netstat"
+//config:       bool "netstat (10 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         netstat prints information about the Linux networking subsystem.
+//config:       netstat prints information about the Linux networking subsystem.
 //config:
 //config:config FEATURE_NETSTAT_WIDE
 //config:       bool "Enable wide output"
 //config:       default y
 //config:       depends on NETSTAT
 //config:       help
-//config:         Add support for wide columns. Useful when displaying IPv6 addresses
-//config:         (-W option).
+//config:       Add support for wide columns. Useful when displaying IPv6 addresses
+//config:       (-W option).
 //config:
 //config:config FEATURE_NETSTAT_PRG
 //config:       bool "Enable PID/Program name output"
 //config:       default y
 //config:       depends on NETSTAT
 //config:       help
-//config:         Add support for -p flag to print out PID and program name.
-//config:         +700 bytes of code.
+//config:       Add support for -p flag to print out PID and program name.
+//config:       +700 bytes of code.
 
 //applet:IF_NETSTAT(APPLET(netstat, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 8e3c8fed9..45c218e6c 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -11,10 +11,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config NSLOOKUP
-//config:       bool "nslookup"
+//config:       bool "nslookup (4.5 kb)"
 //config:       default y
 //config:       help
-//config:         nslookup is a tool to query Internet name servers.
+//config:       nslookup is a tool to query Internet name servers.
 
 //applet:IF_NSLOOKUP(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 73d27ac20..f21f9513d 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -41,27 +41,27 @@
  ***********************************************************************
  */
 //config:config NTPD
-//config:       bool "ntpd"
+//config:       bool "ntpd (17 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         The NTP client/server daemon.
+//config:       The NTP client/server daemon.
 //config:
 //config:config FEATURE_NTPD_SERVER
 //config:       bool "Make ntpd usable as a NTP server"
 //config:       default y
 //config:       depends on NTPD
 //config:       help
-//config:         Make ntpd usable as a NTP server. If you disable this option
-//config:         ntpd will be usable only as a NTP client.
+//config:       Make ntpd usable as a NTP server. If you disable this option
+//config:       ntpd will be usable only as a NTP client.
 //config:
 //config:config FEATURE_NTPD_CONF
 //config:       bool "Make ntpd understand /etc/ntp.conf"
 //config:       default y
 //config:       depends on NTPD
 //config:       help
-//config:         Make ntpd look in /etc/ntp.conf for peers. Only "server address"
-//config:         is supported.
+//config:       Make ntpd look in /etc/ntp.conf for peers. Only "server address"
+//config:       is supported.
 
 //applet:IF_NTPD(APPLET(ntpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ping.c b/networking/ping.c
index 94fb007f5..506e7b11b 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -47,27 +47,28 @@
 #endif
 
 //config:config PING
-//config:       bool "ping"
+//config:       bool "ping (9.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
-//config:         elicit an ICMP ECHO_RESPONSE from a host or gateway.
+//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:       bool "ping6 (10 kb)"
 //config:       default y
 //config:       depends on FEATURE_IPV6
 //config:       help
-//config:         This will give you a ping that can talk IPv6.
+//config:       Alias to "ping -6".
 //config:
 //config:config FEATURE_FANCY_PING
 //config:       bool "Enable fancy ping output"
 //config:       default y
 //config:       depends on PING || PING6
 //config:       help
-//config:         Make the output from the ping applet include statistics, and at the
-//config:         same time provide full support for ICMP packets.
+//config:       With this option off, ping will say "HOST is alive!"
+//config:       or terminate with SIGALRM in 5 seconds otherwise.
+//config:       No command-line options will be recognized.
 
 /* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
 //applet:IF_PING(APPLET(ping, BB_DIR_BIN, BB_SUID_MAYBE))
@@ -103,7 +104,7 @@
 //usage:     "\n                        (can exit earlier with -c CNT)"
 //usage:     "\n        -q              Quiet, only display output at start"
 //usage:     "\n                        and when finished"
-//usage:     "\n        -p              Pattern to use for payload"
+//usage:     "\n        -p HEXBYTE      Pattern to use for payload"
 //usage:
 //usage:# define ping6_trivial_usage
 //usage:       "[OPTIONS] HOST"
@@ -114,7 +115,7 @@
 //usage:     "\n        -I IFACE/IP     Source interface or IP address"
 //usage:     "\n        -q              Quiet, only display output at start"
 //usage:     "\n                        and when finished"
-//usage:     "\n        -p              Pattern to use for payload"
+//usage:     "\n        -p HEXBYTE      Pattern to use for payload"
 //usage:
 //usage:#endif
 //usage:
@@ -236,8 +237,6 @@ static void ping4(len_and_sockaddr *lsa)
                                 break;
                 }
         }
-        if (ENABLE_FEATURE_CLEAN_UP)
-                close(pingsock);
 }
 
 #if ENABLE_PING6
@@ -280,8 +279,6 @@ static void ping6(len_and_sockaddr *lsa)
                                 break;
                 }
         }
-        if (ENABLE_FEATURE_CLEAN_UP)
-                close(pingsock);
 }
 #endif
 
@@ -331,6 +328,8 @@ static int common_ping_main(sa_family_t af, char **argv)
         else
 #endif
                 ping4(lsa);
+        if (ENABLE_FEATURE_CLEAN_UP)
+                close(pingsock);
         printf("%s is alive!\n", G.hostname);
         return EXIT_SUCCESS;
 }
diff --git a/networking/pscan.c b/networking/pscan.c
index 0893c3577..17985d2c8 100644
--- a/networking/pscan.c
+++ b/networking/pscan.c
@@ -6,10 +6,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PSCAN
-//config:       bool "pscan"
+//config:       bool "pscan (6.6 kb)"
 //config:       default y
 //config:       help
-//config:         Simple network port scanner.
+//config:       Simple network port scanner.
 
 //applet:IF_PSCAN(APPLET(pscan, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/networking/route.c b/networking/route.c
index 7dc2b5a3d..32789eecc 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -25,11 +25,11 @@
  * remove ridiculous amounts of bloat.
  */
 //config:config ROUTE
-//config:       bool "route"
+//config:       bool "route (8.9 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Route displays or manipulates the kernel's IP routing tables.
+//config:       Route displays or manipulates the kernel's IP routing tables.
 
 //applet:IF_ROUTE(APPLET(route, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/slattach.c b/networking/slattach.c
index 9267eb1d0..71b5bf427 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -13,12 +13,12 @@
  * - The -F options allows disabling of RTS/CTS flow control.
  */
 //config:config SLATTACH
-//config:       bool "slattach"
+//config:       bool "slattach (6.1 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         slattach is a small utility to attach network interfaces to serial
-//config:         lines.
+//config:       slattach is a small utility to attach network interfaces to serial
+//config:       lines.
 
 //applet:IF_SLATTACH(APPLET(slattach, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/ssl_client.c b/networking/ssl_client.c
index cfeae1587..d479846d7 100644
--- a/networking/ssl_client.c
+++ b/networking/ssl_client.c
@@ -4,11 +4,11 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SSL_CLIENT
-//config:       bool "ssl_client"
+//config:       bool "ssl_client (23 kb)"
 //config:       default y
 //config:       select TLS
 //config:       help
-//config:         This tool pipes data to/from a socket, TLS-encrypting it.
+//config:       This tool pipes data to/from a socket, TLS-encrypting it.
 
 //applet:IF_SSL_CLIENT(APPLET(ssl_client, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 3ebe7d5fc..270325164 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -29,18 +29,18 @@
  * - don't know how to retrieve ORIGDST for udp.
  */
 //config:config TCPSVD
-//config:       bool "tcpsvd"
+//config:       bool "tcpsvd (13 kb)"
 //config:       default y
 //config:       help
-//config:         tcpsvd listens on a TCP port and runs a program for each new
-//config:         connection.
+//config:       tcpsvd listens on a TCP port and runs a program for each new
+//config:       connection.
 //config:
 //config:config UDPSVD
-//config:       bool "udpsvd"
+//config:       bool "udpsvd (13 kb)"
 //config:       default y
 //config:       help
-//config:         udpsvd listens on an UDP port and runs a program for each new
-//config:         connection.
+//config:       udpsvd listens on an UDP port and runs a program for each new
+//config:       connection.
 
 //applet:IF_TCPSVD(APPLET_ODDNAME(tcpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, tcpsvd))
 //applet:IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, udpsvd))
diff --git a/networking/telnet.c b/networking/telnet.c
index a70f74762..9f191f7ad 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -21,30 +21,30 @@
  *
  */
 //config:config TELNET
-//config:       bool "telnet"
+//config:       bool "telnet (8.7 kb)"
 //config:       default y
 //config:       help
-//config:         Telnet is an interface to the TELNET protocol, but is also commonly
-//config:         used to test other simple protocols.
+//config:       Telnet is an interface to the TELNET protocol, but is also commonly
+//config:       used to test other simple protocols.
 //config:
 //config:config FEATURE_TELNET_TTYPE
 //config:       bool "Pass TERM type to remote host"
 //config:       default y
 //config:       depends on TELNET
 //config:       help
-//config:         Setting this option will forward the TERM environment variable to the
-//config:         remote host you are connecting to. This is useful to make sure that
-//config:         things like ANSI colors and other control sequences behave.
+//config:       Setting this option will forward the TERM environment variable to the
+//config:       remote host you are connecting to. This is useful to make sure that
+//config:       things like ANSI colors and other control sequences behave.
 //config:
 //config:config FEATURE_TELNET_AUTOLOGIN
 //config:       bool "Pass USER type to remote host"
 //config:       default y
 //config:       depends on TELNET
 //config:       help
-//config:         Setting this option will forward the USER environment variable to the
-//config:         remote host you are connecting to. This is useful when you need to
-//config:         log into a machine without telling the username (autologin). This
-//config:         option enables `-a' and `-l USER' arguments.
+//config:       Setting this option will forward the USER environment variable to the
+//config:       remote host you are connecting to. This is useful when you need to
+//config:       log into a machine without telling the username (autologin). This
+//config:       option enables `-a' and `-l USER' arguments.
 //config:
 //config:config FEATURE_TELNET_WIDTH
 //config:       bool "Enable window size autodetection"
diff --git a/networking/telnetd.c b/networking/telnetd.c
index f06e9583e..6e12de07a 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -21,73 +21,73 @@
  * Set process group corrections, initial busybox port
  */
 //config:config TELNETD
-//config:       bool "telnetd"
+//config:       bool "telnetd (12 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         A daemon for the TELNET protocol, allowing you to log onto the host
-//config:         running the daemon. Please keep in mind that the TELNET protocol
-//config:         sends passwords in plain text. If you can't afford the space for an
-//config:         SSH daemon and you trust your network, you may say 'y' here. As a
-//config:         more secure alternative, you should seriously consider installing the
-//config:         very small Dropbear SSH daemon instead:
+//config:       A daemon for the TELNET protocol, allowing you to log onto the host
+//config:       running the daemon. Please keep in mind that the TELNET protocol
+//config:       sends passwords in plain text. If you can't afford the space for an
+//config:       SSH daemon and you trust your network, you may say 'y' here. As a
+//config:       more secure alternative, you should seriously consider installing the
+//config:       very small Dropbear SSH daemon instead:
 //config:               http://matt.ucc.asn.au/dropbear/dropbear.html
 //config:
-//config:         Note that for busybox telnetd to work you need several things:
-//config:         First of all, your kernel needs:
+//config:       Note that for busybox telnetd to work you need several things:
+//config:       First of all, your kernel needs:
 //config:                 CONFIG_UNIX98_PTYS=y
 //config:
-//config:         Next, you need a /dev/pts directory on your root filesystem:
+//config:       Next, you need a /dev/pts directory on your root filesystem:
 //config:
 //config:                 $ ls -ld /dev/pts
 //config:                 drwxr-xr-x  2 root root 0 Sep 23 13:21 /dev/pts/
 //config:
-//config:         Next you need the pseudo terminal master multiplexer /dev/ptmx:
+//config:       Next you need the pseudo terminal master multiplexer /dev/ptmx:
 //config:
 //config:                 $ ls -la /dev/ptmx
 //config:                 crw-rw-rw-  1 root tty 5, 2 Sep 23 13:55 /dev/ptmx
 //config:
-//config:         Any /dev/ttyp[0-9]* files you may have can be removed.
-//config:         Next, you need to mount the devpts filesystem on /dev/pts using:
+//config:       Any /dev/ttyp[0-9]* files you may have can be removed.
+//config:       Next, you need to mount the devpts filesystem on /dev/pts using:
 //config:
 //config:                 mount -t devpts devpts /dev/pts
 //config:
-//config:         You need to be sure that busybox has LOGIN and
-//config:         FEATURE_SUID enabled. And finally, you should make
-//config:         certain that Busybox has been installed setuid root:
+//config:       You need to be sure that busybox has LOGIN and
+//config:       FEATURE_SUID enabled. And finally, you should make
+//config:       certain that Busybox has been installed setuid root:
 //config:
 //config:               chown root.root /bin/busybox
 //config:               chmod 4755 /bin/busybox
 //config:
-//config:         with all that done, telnetd _should_ work....
+//config:       with all that done, telnetd _should_ work....
 //config:
 //config:config FEATURE_TELNETD_STANDALONE
 //config:       bool "Support standalone telnetd (not inetd only)"
 //config:       default y
 //config:       depends on TELNETD
 //config:       help
-//config:         Selecting this will make telnetd able to run standalone.
+//config:       Selecting this will make telnetd able to run standalone.
 //config:
 //config:config FEATURE_TELNETD_INETD_WAIT
 //config:       bool "Support -w SEC option (inetd wait mode)"
 //config:       default y
 //config:       depends on FEATURE_TELNETD_STANDALONE
 //config:       help
-//config:         This option allows you to run telnetd in "inet wait" mode.
-//config:         Example inetd.conf line (note "wait", not usual "nowait"):
+//config:       This option allows you to run telnetd in "inet wait" mode.
+//config:       Example inetd.conf line (note "wait", not usual "nowait"):
 //config:
-//config:         telnet stream tcp wait root /bin/telnetd telnetd -w10
+//config:       telnet stream tcp wait root /bin/telnetd telnetd -w10
 //config:
-//config:         In this example, inetd passes _listening_ socket_ as fd 0
-//config:         to telnetd when connection appears.
-//config:         telnetd will wait for connections until all existing
-//config:         connections are closed, and no new connections
-//config:         appear during 10 seconds. Then it exits, and inetd continues
-//config:         to listen for new connections.
+//config:       In this example, inetd passes _listening_ socket_ as fd 0
+//config:       to telnetd when connection appears.
+//config:       telnetd will wait for connections until all existing
+//config:       connections are closed, and no new connections
+//config:       appear during 10 seconds. Then it exits, and inetd continues
+//config:       to listen for new connections.
 //config:
-//config:         This option is rarely used. "tcp nowait" is much more usual
-//config:         way of running tcp services, including telnetd.
-//config:         You most probably want to say N here.
+//config:       This option is rarely used. "tcp nowait" is much more usual
+//config:       way of running tcp services, including telnetd.
+//config:       You most probably want to say N here.
 
 //applet:IF_TELNETD(APPLET(telnetd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/tftp.c b/networking/tftp.c
index 189364f0c..947e65169 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -19,22 +19,22 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config TFTP
-//config:       bool "tftp"
+//config:       bool "tftp (12 kb)"
 //config:       default y
 //config:       help
-//config:         This enables the Trivial File Transfer Protocol client program. TFTP
-//config:         is usually used for simple, small transfers such as a root image
-//config:         for a network-enabled bootloader.
+//config:       This enables the Trivial File Transfer Protocol client program. TFTP
+//config:       is usually used for simple, small transfers such as a root image
+//config:       for a network-enabled bootloader.
 //config:
 //config:config TFTPD
-//config:       bool "tftpd"
+//config:       bool "tftpd (10 kb)"
 //config:       default y
 //config:       help
-//config:         This enables the Trivial File Transfer Protocol server program.
-//config:         It expects that stdin is a datagram socket and a packet
-//config:         is already pending on it. It will exit after one transfer.
-//config:         In other words: it should be run from inetd in nowait mode,
-//config:         or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
+//config:       This enables the Trivial File Transfer Protocol server program.
+//config:       It expects that stdin is a datagram socket and a packet
+//config:       is already pending on it. It will exit after one transfer.
+//config:       In other words: it should be run from inetd in nowait mode,
+//config:       or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
 //config:
 //config:comment "Common options for tftp/tftpd"
 //config:       depends on TFTP || TFTPD
@@ -44,29 +44,29 @@
 //config:       default y
 //config:       depends on TFTP || TFTPD
 //config:       help
-//config:         Add support for the GET command within the TFTP client. This allows
-//config:         a client to retrieve a file from a TFTP server.
-//config:         Also enable upload support in tftpd, if tftpd is selected.
+//config:       Add support for the GET command within the TFTP client. This allows
+//config:       a client to retrieve a file from a TFTP server.
+//config:       Also enable upload support in tftpd, if tftpd is selected.
 //config:
-//config:         Note: this option does _not_ make tftpd capable of download
-//config:         (the usual operation people need from it)!
+//config:       Note: this option does _not_ make tftpd capable of download
+//config:       (the usual operation people need from it)!
 //config:
 //config:config FEATURE_TFTP_PUT
 //config:       bool "Enable 'tftp put' and/or tftpd download code"
 //config:       default y
 //config:       depends on TFTP || TFTPD
 //config:       help
-//config:         Add support for the PUT command within the TFTP client. This allows
-//config:         a client to transfer a file to a TFTP server.
-//config:         Also enable download support in tftpd, if tftpd is selected.
+//config:       Add support for the PUT command within the TFTP client. This allows
+//config:       a client to transfer a file to a TFTP server.
+//config:       Also enable download support in tftpd, if tftpd is selected.
 //config:
 //config:config FEATURE_TFTP_BLOCKSIZE
 //config:       bool "Enable 'blksize' and 'tsize' protocol options"
 //config:       default y
 //config:       depends on TFTP || TFTPD
 //config:       help
-//config:         Allow tftp to specify block size, and tftpd to understand
-//config:         "blksize" and "tsize" options.
+//config:       Allow tftp to specify block size, and tftpd to understand
+//config:       "blksize" and "tsize" options.
 //config:
 //config:config FEATURE_TFTP_PROGRESS_BAR
 //config:       bool "Enable progress bar"
@@ -78,8 +78,8 @@
 //config:       default n
 //config:       depends on TFTP || TFTPD
 //config:       help
-//config:         Make tftp[d] print debugging messages on stderr.
-//config:         This is useful if you are diagnosing a bug in tftp[d].
+//config:       Make tftp[d] print debugging messages on stderr.
+//config:       This is useful if you are diagnosing a bug in tftp[d].
 
 //applet:#if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
 //applet:IF_TFTP(APPLET(tftp, BB_DIR_USR_BIN, BB_SUID_DROP))
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 6817861ef..a958a2c6c 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -210,26 +210,26 @@
  *     Tue Dec 20 03:50:13 PST 1988
  */
 //config:config TRACEROUTE
-//config:       bool "traceroute"
+//config:       bool "traceroute (11 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Utility to trace the route of IP packets.
+//config:       Utility to trace the route of IP packets.
 //config:
 //config:config TRACEROUTE6
-//config:       bool "traceroute6"
+//config:       bool "traceroute6 (12 kb)"
 //config:       default y
 //config:       depends on FEATURE_IPV6
 //config:       help
-//config:         Utility to trace the route of IPv6 packets.
+//config:       Utility to trace the route of IPv6 packets.
 //config:
 //config:config FEATURE_TRACEROUTE_VERBOSE
 //config:       bool "Enable verbose output"
 //config:       default y
 //config:       depends on TRACEROUTE || TRACEROUTE6
 //config:       help
-//config:         Add some verbosity to traceroute. This includes among other things
-//config:         hostnames and ICMP response types.
+//config:       Add some verbosity to traceroute. This includes among other things
+//config:       hostnames and ICMP response types.
 //config:
 //config:config FEATURE_TRACEROUTE_USE_ICMP
 //config:       bool "Enable -I option (use ICMP instead of UDP)"
diff --git a/networking/tunctl.c b/networking/tunctl.c
index fa904c2a9..0a26ff7fb 100644
--- a/networking/tunctl.c
+++ b/networking/tunctl.c
@@ -10,19 +10,19 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config TUNCTL
-//config:       bool "tunctl"
+//config:       bool "tunctl (6.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         tunctl creates or deletes tun devices.
+//config:       tunctl creates or deletes tun devices.
 //config:
 //config:config FEATURE_TUNCTL_UG
 //config:       bool "Support owner:group assignment"
 //config:       default y
 //config:       depends on TUNCTL
 //config:       help
-//config:         Allow to specify owner and group of newly created interface.
-//config:         340 bytes of pure bloat. Say no here.
+//config:       Allow to specify owner and group of newly created interface.
+//config:       340 bytes of pure bloat. Say no here.
 
 //applet:IF_TUNCTL(APPLET(tunctl, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index 5c068441a..af2fe1835 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -10,105 +10,105 @@ config UDHCPD
         default y
         select PLATFORM_LINUX
         help
-          udhcpd is a DHCP server geared primarily toward embedded systems,
-          while striving to be fully functional and RFC compliant.
+        udhcpd is a DHCP server geared primarily toward embedded systems,
+        while striving to be fully functional and RFC compliant.
 
 config FEATURE_UDHCPD_WRITE_LEASES_EARLY
         bool "Rewrite the lease file at every new acknowledge"
         default y
         depends on UDHCPD
         help
-          If selected, udhcpd will write a new file with leases every
-          time a new lease has been accepted, thus eliminating the need
-          to send SIGUSR1 for the initial writing or updating. Any timed
-          rewriting remains undisturbed.
+        If selected, udhcpd will write a new file with leases every
+        time a new lease has been accepted, thus eliminating the need
+        to send SIGUSR1 for the initial writing or updating. Any timed
+        rewriting remains undisturbed.
 
 config FEATURE_UDHCPD_BASE_IP_ON_MAC
         bool "Select IP address based on client MAC"
         default n
         depends on UDHCPD
         help
-          If selected, udhcpd will base its selection of IP address to offer
-          on the client's hardware address. Otherwise udhcpd uses the next
-          consecutive free address.
+        If selected, udhcpd will base its selection of IP address to offer
+        on the client's hardware address. Otherwise udhcpd uses the next
+        consecutive free address.
 
-          This reduces the frequency of IP address changes for clients
-          which let their lease expire, and makes consecutive DHCPOFFERS
-          for the same client to (almost always) contain the same
-          IP address.
+        This reduces the frequency of IP address changes for clients
+        which let their lease expire, and makes consecutive DHCPOFFERS
+        for the same client to (almost always) contain the same
+        IP address.
 
 config DHCPD_LEASES_FILE
         string "Absolute path to lease file"
         default "/var/lib/misc/udhcpd.leases"
         depends on UDHCPD
         help
-          udhcpd stores addresses in a lease file. This is the absolute path
-          of the file. Normally it is safe to leave it untouched.
+        udhcpd stores addresses in a lease file. This is the absolute path
+        of the file. Normally it is safe to leave it untouched.
 
 config DUMPLEASES
-        bool "dumpleases"
+        bool "dumpleases (6.4 kb)"
         default y
         help
-          dumpleases displays the leases written out by the udhcpd.
-          Lease times are stored in the file by time remaining in lease, or
-          by the absolute time that it expires in seconds from epoch.
+        dumpleases displays the leases written out by the udhcpd.
+        Lease times are stored in the file by time remaining in lease, or
+        by the absolute time that it expires in seconds from epoch.
 
 config DHCPRELAY
-        bool "dhcprelay"
+        bool "dhcprelay (5.8 kb)"
         default y
         help
-          dhcprelay listens for dhcp requests on one or more interfaces
-          and forwards these requests to a different interface or dhcp
-          server.
+        dhcprelay listens for dhcp requests on one or more interfaces
+        and forwards these requests to a different interface or dhcp
+        server.
 
 config UDHCPC
         bool "udhcpc (DHCP client)"
         default y
         select PLATFORM_LINUX
         help
-          udhcpc is a DHCP client geared primarily toward embedded systems,
-          while striving to be fully functional and RFC compliant.
+        udhcpc is a DHCP client geared primarily toward embedded systems,
+        while striving to be fully functional and RFC compliant.
 
-          The udhcp client negotiates a lease with the DHCP server and
-          runs a script when a lease is obtained or lost.
+        The udhcp client negotiates a lease with the DHCP server and
+        runs a script when a lease is obtained or lost.
 
 config FEATURE_UDHCPC_ARPING
         bool "Verify that the offered address is free, using ARP ping"
         default y
         depends on UDHCPC
         help
-          If selected, udhcpc will send ARP probes and make sure
-          the offered address is really not in use by anyone. The client
-          will DHCPDECLINE the offer if the address is in use,
-          and restart the discover process.
+        If selected, udhcpc will send ARP probes and make sure
+        the offered address is really not in use by anyone. The client
+        will DHCPDECLINE the offer if the address is in use,
+        and restart the discover process.
 
 config FEATURE_UDHCPC_SANITIZEOPT
         bool "Do not pass malformed host and domain names"
         default y
         depends on UDHCPC
         help
-          If selected, udhcpc will check some options (such as option 12 -
-          hostname) and if they don't look like valid hostnames
-          (for example, if they start with dash or contain spaces),
-          they will be replaced with string "bad" when exporting
-          to the environment.
+        If selected, udhcpc will check some options (such as option 12 -
+        hostname) and if they don't look like valid hostnames
+        (for example, if they start with dash or contain spaces),
+        they will be replaced with string "bad" when exporting
+        to the environment.
 
 config UDHCPC_DEFAULT_SCRIPT
         string "Absolute path to config script"
         default "/usr/share/udhcpc/default.script"
         depends on UDHCPC
         help
-          This script is called after udhcpc receives an answer. See
-          examples/udhcp for a working example. Normally it is safe
-          to leave this untouched.
+        This script is called after udhcpc receives an answer. See
+        examples/udhcp for a working example. Normally it is safe
+        to leave this untouched.
 
 config FEATURE_UDHCP_PORT
         bool "Enable '-P port' option for udhcpd and udhcpc"
         default n
         depends on UDHCPD || UDHCPC
         help
-          At the cost of ~300 bytes, enables -P port option.
-          This feature is typically not needed.
+        At the cost of ~300 bytes, enables -P port option.
+        This feature is typically not needed.
 
 config UDHCP_DEBUG
         int "Maximum verbosity level for udhcp applets (0..9)"
@@ -116,28 +116,28 @@ config UDHCP_DEBUG
         range 0 9
         depends on UDHCPD || UDHCPC || DHCPRELAY
         help
-          Verbosity can be increased with multiple -v options.
-          This option controls how high it can be cranked up.
+        Verbosity can be increased with multiple -v options.
+        This option controls how high it can be cranked up.
 
-          Bigger values result in bigger code. Levels above 1
-          are very verbose and useful for debugging only.
+        Bigger values result in bigger code. Levels above 1
+        are very verbose and useful for debugging only.
 
 config FEATURE_UDHCP_RFC3397
         bool "Support RFC3397 domain search (experimental)"
         default y
         depends on UDHCPD || UDHCPC
         help
-          If selected, both client and server will support passing of domain
-          search lists via option 119, specified in RFC 3397,
-          and SIP servers option 120, specified in RFC 3361.
+        If selected, both client and server will support passing of domain
+        search lists via option 119, specified in RFC 3397,
+        and SIP servers option 120, specified in RFC 3361.
 
 config FEATURE_UDHCP_8021Q
         bool "Support 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.
+        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_SLACK_FOR_BUGGY_SERVERS
         int "DHCP options slack buffer size"
@@ -145,19 +145,19 @@ config UDHCPC_SLACK_FOR_BUGGY_SERVERS
         range 0 924
         depends on UDHCPD || UDHCPC
         help
-          Some buggy DHCP servers send DHCP offer packets with option
-          field larger than we expect (which might also be considered a
-          buffer overflow attempt). These packets are normally discarded.
-          If circumstances beyond your control force you to support such
-          servers, this may help. The upper limit (924) makes dhcpc accept
-          even 1500 byte packets (maximum-sized ethernet packets).
-
-          This option does not make dhcp[cd] emit non-standard
-          sized packets.
-
-          Known buggy DHCP servers:
-          3Com OfficeConnect Remote 812 ADSL Router:
-            seems to confuse maximum allowed UDP packet size with
-            maximum size of entire IP packet, and sends packets which are
-            28 bytes too large.
-          Seednet (ISP) VDSL: sends packets 2 bytes too large.
+        Some buggy DHCP servers send DHCP offer packets with option
+        field larger than we expect (which might also be considered a
+        buffer overflow attempt). These packets are normally discarded.
+        If circumstances beyond your control force you to support such
+        servers, this may help. The upper limit (924) makes dhcpc accept
+        even 1500 byte packets (maximum-sized ethernet packets).
+
+        This option does not make dhcp[cd] emit non-standard
+        sized packets.
+
+        Known buggy DHCP servers:
+        3Com OfficeConnect Remote 812 ADSL Router:
+                seems to confuse maximum allowed UDP packet size with
+                maximum size of entire IP packet, and sends packets
+                which are 28 bytes too large.
+        Seednet (ISP) VDSL: sends packets 2 bytes too large.
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index f6d3fb98b..5ebd05d01 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -14,31 +14,31 @@
 //config:       default n  # not yet ready
 //config:       depends on FEATURE_IPV6
 //config:       help
-//config:         udhcpc6 is a DHCPv6 client
+//config:       udhcpc6 is a DHCPv6 client
 //config:
 //config:config FEATURE_UDHCPC6_RFC3646
 //config:       bool "Support RFC 3646 (DNS server and search list)"
 //config:       default y
 //config:       depends on UDHCPC6
 //config:       help
-//config:         List of DNS servers and domain search list can be requested with
-//config:         "-O dns" and "-O search". If server gives these values,
-//config:         they will be set in environment variables "dns" and "search".
+//config:       List of DNS servers and domain search list can be requested with
+//config:       "-O dns" and "-O search". If server gives these values,
+//config:       they will be set in environment variables "dns" and "search".
 //config:
 //config:config FEATURE_UDHCPC6_RFC4704
 //config:       bool "Support RFC 4704 (Client FQDN)"
 //config:       default y
 //config:       depends on UDHCPC6
 //config:       help
-//config:         You can request FQDN to be given by server using "-O fqdn".
+//config:       You can request FQDN to be given by server using "-O fqdn".
 //config:
 //config:config FEATURE_UDHCPC6_RFC4833
 //config:       bool "Support RFC 4833 (Timezones)"
 //config:       default y
 //config:       depends on UDHCPC6
 //config:       help
-//config:         You can request POSIX timezone with "-O tz" and timezone name
-//config:         with "-O timezone".
+//config:       You can request POSIX timezone with "-O tz" and timezone name
+//config:       with "-O timezone".
 
 //applet:IF_UDHCPC6(APPLET(udhcpc6, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -877,10 +877,10 @@ static int d6_raw_socket(int ifindex)
         };
 #endif
 
-        log1("opening raw socket on ifindex %d", ifindex); //log2?
+        log2("opening raw socket on ifindex %d", ifindex);
 
         fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IPV6));
-        log1("got raw socket fd %d", fd); //log2?
+        log2("got raw socket fd %d", fd);
 
         sock.sll_family = AF_PACKET;
         sock.sll_protocol = htons(ETH_P_IPV6);
@@ -1238,7 +1238,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                 retval = 0;
                 /* If we already timed out, fall through with retval = 0, else... */
                 if (tv > 0) {
-                        log1("waiting on select %u seconds", tv);
+                        log1("waiting %u seconds", tv);
                         timestamp_before_wait = (unsigned)monotonic_sec();
                         retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX);
                         if (retval < 0) {
@@ -1248,7 +1248,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                         continue;
                                 }
                                 /* Else: an error occured, panic! */
-                                bb_perror_msg_and_die("select");
+                                bb_perror_msg_and_die("poll");
                         }
                 }
 
diff --git a/networking/udhcp/d6_socket.c b/networking/udhcp/d6_socket.c
index 930e5e4f5..d00c217d6 100644
--- a/networking/udhcp/d6_socket.c
+++ b/networking/udhcp/d6_socket.c
@@ -28,8 +28,8 @@ int FAST_FUNC d6_read_interface(const char *interface, int *ifindex, struct in6_
                 if (ifa->ifa_addr->sa_family == AF_PACKET) {
                         struct sockaddr_ll *sll = (struct sockaddr_ll*)(ifa->ifa_addr);
                         memcpy(mac, sll->sll_addr, 6);
-                        log1("MAC %02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-                        log1("adapter index %d", sll->sll_ifindex);
+                        log2("MAC %02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+                        log2("ifindex %d", sll->sll_ifindex);
                         *ifindex = sll->sll_ifindex;
                         retval &= (0xf - (1<<0));
                 }
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 1a66c610e..ccf04993d 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1001,14 +1001,14 @@ static int udhcp_raw_socket(int ifindex)
         int fd;
         struct sockaddr_ll sock;
 
-        log1("opening raw socket on ifindex %d", ifindex); //log2?
+        log2("opening raw socket on ifindex %d", ifindex);
 
         fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
         /* ^^^^^
          * SOCK_DGRAM: remove link-layer headers on input (SOCK_RAW keeps them)
          * ETH_P_IP: want to receive only packets with IPv4 eth type
          */
-        log1("got raw socket fd"); //log2?
+        log2("got raw socket fd");
 
         sock.sll_family = AF_PACKET;
         sock.sll_protocol = htons(ETH_P_IP);
@@ -1455,7 +1455,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                 retval = 0;
                 /* If we already timed out, fall through with retval = 0, else... */
                 if (tv > 0) {
-                        log1("waiting on select %u seconds", tv);
+                        log1("waiting %u seconds", tv);
                         timestamp_before_wait = (unsigned)monotonic_sec();
                         retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX);
                         if (retval < 0) {
@@ -1465,7 +1465,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                         continue;
                                 }
                                 /* Else: an error occurred, panic! */
-                                bb_perror_msg_and_die("select");
+                                bb_perror_msg_and_die("poll");
                         }
                 }
 
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index 4fd79f423..ec6a1dc0f 100644
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -56,7 +56,7 @@ int FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t
                         close(fd);
                         return -1;
                 }
-                log1("adapter index %d", ifr->ifr_ifindex);
+                log2("ifindex %d", ifr->ifr_ifindex);
                 *ifindex = ifr->ifr_ifindex;
         }
 
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 854eca0a1..e6e2872bf 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -10,11 +10,11 @@
 /* BB_AUDIT SUSv3 N/A */
 
 //config:config VCONFIG
-//config:       bool "vconfig"
+//config:       bool "vconfig (2.5 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:         Creates, removes, and configures VLAN interfaces
+//config:       Creates, removes, and configures VLAN interfaces
 
 //applet:IF_VCONFIG(APPLET(vconfig, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/networking/wget.c b/networking/wget.c
index b9d840328..ab9bc1836 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -10,11 +10,11 @@
  */
 
 //config:config WGET
-//config:       bool "wget"
+//config:       bool "wget (35 kb)"
 //config:       default y
 //config:       help
-//config:         wget is a utility for non-interactive download of files from HTTP
-//config:         and FTP servers.
+//config:       wget is a utility for non-interactive download of files from HTTP
+//config:       and FTP servers.
 //config:
 //config:config FEATURE_WGET_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -31,21 +31,21 @@
 //config:       default y
 //config:       depends on WGET
 //config:       help
-//config:         Support authenticated HTTP transfers.
+//config:       Support authenticated HTTP transfers.
 //config:
 //config:config FEATURE_WGET_TIMEOUT
 //config:       bool "Enable timeout option -T SEC"
 //config:       default y
 //config:       depends on WGET
 //config:       help
-//config:         Supports network read and connect timeouts for wget,
-//config:         so that wget will give up and timeout, through the -T
-//config:         command line option.
+//config:       Supports network read and connect timeouts for wget,
+//config:       so that wget will give up and timeout, through the -T
+//config:       command line option.
 //config:
-//config:         Currently only connect and network data read timeout are
-//config:         supported (i.e., timeout is not applied to the DNS query). When
-//config:         FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option
-//config:         will work in addition to -T.
+//config:       Currently only connect and network data read timeout are
+//config:       supported (i.e., timeout is not applied to the DNS query). When
+//config:       FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option
+//config:       will work in addition to -T.
 //config:
 //config:config FEATURE_WGET_HTTPS
 //config:       bool "Support HTTPS using internal TLS code"
@@ -53,68 +53,68 @@
 //config:       depends on WGET
 //config:       select TLS
 //config:       help
-//config:         wget will use internal TLS code to connect to https:// URLs.
-//config:         Note:
-//config:         On NOMMU machines, ssl_helper applet should be available
-//config:         in the $PATH for this to work. Make sure to select that applet.
+//config:       wget will use internal TLS code to connect to https:// URLs.
+//config:       Note:
+//config:       On NOMMU machines, ssl_helper applet should be available
+//config:       in the $PATH for this to work. Make sure to select that applet.
 //config:
-//config:         Note: currently, TLS code only makes TLS I/O work, it
-//config:         does *not* check that the peer is who it claims to be, etc.
-//config:         IOW: it uses peer-supplied public keys to establish encryption
-//config:         and signing keys, then encrypts and signs outgoing data and
-//config:         decrypts incoming data.
-//config:         It does not check signature hashes on the incoming data:
-//config:         this means that attackers manipulating TCP packets can
-//config:         send altered data and we unknowingly receive garbage.
-//config:         (This check might be relatively easy to add).
-//config:         It does not check public key's certificate:
-//config:         this means that the peer may be an attacker impersonating
-//config:         the server we think we are talking to.
+//config:       Note: currently, TLS code only makes TLS I/O work, it
+//config:       does *not* check that the peer is who it claims to be, etc.
+//config:       IOW: it uses peer-supplied public keys to establish encryption
+//config:       and signing keys, then encrypts and signs outgoing data and
+//config:       decrypts incoming data.
+//config:       It does not check signature hashes on the incoming data:
+//config:       this means that attackers manipulating TCP packets can
+//config:       send altered data and we unknowingly receive garbage.
+//config:       (This check might be relatively easy to add).
+//config:       It does not check public key's certificate:
+//config:       this means that the peer may be an attacker impersonating
+//config:       the server we think we are talking to.
 //config:
-//config:         If you think this is unacceptable, consider this. As more and more
-//config:         servers switch to HTTPS-only operation, without such "crippled"
-//config:         TLS code it is *impossible* to simply download a kernel source
-//config:         from kernel.org. Which can in real world translate into
-//config:         "my small automatic tooling to build cross-compilers from sources
-//config:         no longer works, I need to additionally keep a local copy
-//config:         of ~4 megabyte source tarball of a SSL library and ~2 megabyte
-//config:         source of wget, need to compile and built both before I can
-//config:         download anything. All this despite the fact that the build
-//config:         is done in a QEMU sandbox on a machine with absolutely nothing
-//config:         worth stealing, so I don't care if someone would go to a lot
-//config:         of trouble to intercept my HTTPS download to send me an altered
-//config:         kernel tarball".
+//config:       If you think this is unacceptable, consider this. As more and more
+//config:       servers switch to HTTPS-only operation, without such "crippled"
+//config:       TLS code it is *impossible* to simply download a kernel source
+//config:       from kernel.org. Which can in real world translate into
+//config:       "my small automatic tooling to build cross-compilers from sources
+//config:       no longer works, I need to additionally keep a local copy
+//config:       of ~4 megabyte source tarball of a SSL library and ~2 megabyte
+//config:       source of wget, need to compile and built both before I can
+//config:       download anything. All this despite the fact that the build
+//config:       is done in a QEMU sandbox on a machine with absolutely nothing
+//config:       worth stealing, so I don't care if someone would go to a lot
+//config:       of trouble to intercept my HTTPS download to send me an altered
+//config:       kernel tarball".
 //config:
-//config:         If you still think this is unacceptable, send patches.
+//config:       If you still think this is unacceptable, send patches.
 //config:
-//config:         If you still think this is unacceptable, do not want to send
-//config:         patches, but do want to waste bandwidth expaining how wrong
-//config:         it is, you will be ignored.
+//config:       If you still think this is unacceptable, do not want to send
+//config:       patches, but do want to waste bandwidth expaining how wrong
+//config:       it is, you will be ignored.
 //config:
 //config:config FEATURE_WGET_OPENSSL
 //config:       bool "Try to connect to HTTPS using openssl"
 //config:       default y
 //config:       depends on WGET
 //config:       help
-//config:         Try to use openssl to handle HTTPS.
+//config:       Try to use openssl to handle HTTPS.
 //config:
-//config:         OpenSSL has a simple SSL client for debug purposes.
-//config:         If you select this option, wget will effectively run:
-//config:         "openssl s_client -quiet -connect hostname:443
-//config:         -servername hostname 2>/dev/null" and pipe its data
-//config:         through it. -servername is not used if hostname is numeric.
-//config:         Note inconvenient API: host resolution is done twice,
-//config:         and there is no guarantee openssl's idea of IPv6 address
-//config:         format is the same as ours.
-//config:         Another problem is that s_client prints debug information
-//config:         to stderr, and it needs to be suppressed. This means
-//config:         all error messages get suppressed too.
-//config:         openssl is also a big binary, often dynamically linked
-//config:         against ~15 libraries.
+//config:       OpenSSL has a simple SSL client for debug purposes.
+//config:       If you select this option, wget will effectively run:
+//config:       "openssl s_client -quiet -connect hostname:443
+//config:       -servername hostname 2>/dev/null" and pipe its data
+//config:       through it. -servername is not used if hostname is numeric.
+//config:       Note inconvenient API: host resolution is done twice,
+//config:       and there is no guarantee openssl's idea of IPv6 address
+//config:       format is the same as ours.
+//config:       Another problem is that s_client prints debug information
+//config:       to stderr, and it needs to be suppressed. This means
+//config:       all error messages get suppressed too.
+//config:       openssl is also a big binary, often dynamically linked
+//config:       against ~15 libraries.
 //config:
-//config:         If openssl can't be executed, internal TLS code will be used
-//config:         (if you enabled it); if openssl can be executed but fails later,
-//config:         wget can't detect this, and download will fail.
+//config:       If openssl can't be executed, internal TLS code will be used
+//config:       (if you enabled it); if openssl can be executed but fails later,
+//config:       wget can't detect this, and download will fail.
 
 //applet:IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/networking/whois.c b/networking/whois.c
index c9dfcf5ee..0cb7e5411 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -11,10 +11,10 @@
  */
 
 //config:config WHOIS
-//config:       bool "whois"
+//config:       bool "whois (6.6 kb)"
 //config:       default y
 //config:       help
-//config:         whois is a client for the whois directory service
+//config:       whois is a client for the whois directory service
 
 //applet:IF_WHOIS(APPLET(whois, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/networking/zcip.c b/networking/zcip.c
index 9122bd681..94174a165 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -15,17 +15,17 @@
  * certainly be used.  Its naming is built over multicast DNS.
  */
 //config:config ZCIP
-//config:       bool "zcip"
+//config:       bool "zcip (7.8 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       select FEATURE_SYSLOG
 //config:       help
-//config:         ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
-//config:         It's a daemon that allocates and defends a dynamically assigned
-//config:         address on the 169.254/16 network, requiring no system administrator.
+//config:       ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
+//config:       It's a daemon that allocates and defends a dynamically assigned
+//config:       address on the 169.254/16 network, requiring no system administrator.
 //config:
-//config:         See http://www.zeroconf.org for further details, and "zcip.script"
-//config:         in the busybox examples.
+//config:       See http://www.zeroconf.org for further details, and "zcip.script"
+//config:       in the busybox examples.
 
 //applet:IF_ZCIP(APPLET(zcip, BB_DIR_SBIN, BB_SUID_DROP))
 
@@ -183,6 +183,7 @@ static int run(char *argv[3], const char *param, uint32_t nip)
         int status;
         const char *addr = addr; /* for gcc */
         const char *fmt = "%s %s %s" + 3;
+        char *env_ip = env_ip;
 
         argv[2] = (char*)param;
 
@@ -190,12 +191,16 @@ static int run(char *argv[3], const char *param, uint32_t nip)
 
         if (nip != 0) {
                 addr = nip_to_a(nip);
-                xsetenv("ip", addr);
+                /* Must not use setenv() repeatedly, it leaks memory. Use putenv() */
+                env_ip = xasprintf("ip=%s", addr);
+                putenv(env_ip);
                 fmt -= 3;
         }
         bb_error_msg(fmt, argv[2], argv[0], addr);
-
         status = spawn_and_wait(argv + 1);
+        if (nip != 0)
+                bb_unsetenv_and_free(env_ip);
+
         if (status < 0) {
                 bb_perror_msg("%s %s %s" + 3, argv[2], argv[0]);
                 return -errno;