Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge

Conflicts:
	procps/ps.c

42 files changed, 61 insertions, 126 deletions

diff --git a/networking/arp.c b/networking/arp.c
index 3f68f5cf7..696c402e0 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -21,7 +21,6 @@
 //usage:     "\n[-v]    [-H HWTYPE] [-i IF] -Ds HOSTNAME IFACE [netmask MASK] pub"
 //usage:#define arp_full_usage "\n\n"
 //usage:       "Manipulate ARP cache\n"
-//usage:     "\nOptions:"
 //usage:       "\n      -a              Display (all) hosts"
 //usage:       "\n      -s              Set new ARP entry"
 //usage:       "\n      -d              Delete a specified entry"
diff --git a/networking/arping.c b/networking/arping.c
index 357dcaaf0..a4421edcb 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -10,7 +10,6 @@
 //usage:       "[-fqbDUA] [-c CNT] [-w TIMEOUT] [-I IFACE] [-s SRC_IP] DST_IP"
 //usage:#define arping_full_usage "\n\n"
 //usage:       "Send ARP requests/replies\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -f              Quit on first ARP reply"
 //usage:     "\n        -q              Quiet"
 //usage:     "\n        -b              Keep broadcasting, don't go unicast"
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 65eae9670..d80306d3d 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -21,7 +21,6 @@
 //usage:       "[-dvs] [-c CONFFILE] [-t TTL_SEC] [-p PORT] [-i ADDR]"
 //usage:#define dnsd_full_usage "\n\n"
 //usage:       "Small static DNS server daemon\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c FILE Config file"
 //usage:     "\n        -t SEC  TTL"
 //usage:     "\n        -p PORT Listen on PORT"
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index 7bb9aa5a7..6a88279f4 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -70,18 +70,15 @@
 //usage:       "Send a magic packet to wake up sleeping machines.\n"
 //usage:       "MAC must be a station address (00:11:22:33:44:55) or\n"
 //usage:       "a hostname with a known 'ethers' entry.\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -b              Send wake-up packet to the broadcast address"
 //usage:     "\n        -i iface        Interface to use (default eth0)"
 //usage:     "\n        -p pass         Append four or six byte password PW to the packet"
 
+#include "libbb.h"
 #include <netpacket/packet.h>
-#include <net/ethernet.h>
 #include <netinet/ether.h>
 #include <linux/if.h>
 
-#include "libbb.h"
-
 /* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to
  * work as non-root, but we need SOCK_PACKET to specify the Ethernet
  * destination address.
diff --git a/networking/ftpd.c b/networking/ftpd.c
index fae634ec4..e38138c0a 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -22,7 +22,6 @@
 //usage:       "        21 stream tcp nowait root ftpd ftpd /files/to/serve\n"
 //usage:       "It also can be ran from tcpsvd:\n"
 //usage:       "        tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -w      Allow upload"
 //usage:     "\n        -v      Log errors to stderr. -vv: verbose log"
 //usage:     "\n        -S      Log errors to syslog. -SS: verbose log"
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index f63df55f4..abdf94c45 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -17,7 +17,6 @@
 //usage:       "[OPTIONS] HOST [LOCAL_FILE] REMOTE_FILE"
 //usage:#define ftpget_full_usage "\n\n"
 //usage:       "Retrieve a remote file via FTP\n"
-//usage:     "\nOptions:"
 //usage:        IF_FEATURE_FTPGETPUT_LONG_OPTIONS(
 //usage:     "\n        -c,--continue   Continue previous transfer"
 //usage:     "\n        -v,--verbose    Verbose"
@@ -37,7 +36,6 @@
 //usage:       "[OPTIONS] HOST [REMOTE_FILE] LOCAL_FILE"
 //usage:#define ftpput_full_usage "\n\n"
 //usage:       "Store a local file on a remote machine via FTP\n"
-//usage:     "\nOptions:"
 //usage:        IF_FEATURE_FTPGETPUT_LONG_OPTIONS(
 //usage:     "\n        -v,--verbose    Verbose"
 //usage:     "\n        -u,--username   Username"
diff --git a/networking/hostname.c b/networking/hostname.c
index 49a3e89bb..5f663908c 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -14,7 +14,6 @@
 //usage:       "[OPTIONS] [HOSTNAME | -F FILE]"
 //usage:#define hostname_full_usage "\n\n"
 //usage:       "Get or set hostname or DNS domain name\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -s      Short"
 //usage:     "\n        -i      Addresses for the hostname"
 //usage:     "\n        -d      DNS domain name"
diff --git a/networking/httpd.c b/networking/httpd.c
index d77342a2a..ba5eebad5 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -107,7 +107,6 @@
 //usage:       "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING"
 //usage:#define httpd_full_usage "\n\n"
 //usage:       "Listen for incoming HTTP requests\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -i              Inetd mode"
 //usage:     "\n        -f              Don't daemonize"
 //usage:     "\n        -v[v]           Verbose"
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 220b02126..b6604f5d1 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -30,7 +30,6 @@
 //usage:        IF_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
 //usage:#define ifconfig_full_usage "\n\n"
 //usage:       "Configure a network interface\n"
-//usage:     "\nOptions:"
 //usage:     "\n"
 //usage:        IF_FEATURE_IPV6(
 //usage:       "        [add ADDRESS[/PREFIXLEN]]\n")
@@ -47,18 +46,14 @@
 //usage:       "        [mem_start NN] [io_addr NN] [irq NN]\n")
 //usage:       "        [up|down] ..."
 
+#include "libbb.h"
+#include "inet_common.h"
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netinet/in.h>
-#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1
-#include <netpacket/packet.h>
-#include <net/ethernet.h>
-#else
-#include <sys/types.h>
-#include <netinet/if_ether.h>
+#ifdef HAVE_NET_ETHERNET_H
+# include <net/ethernet.h>
 #endif
-#include "libbb.h"
-#include "inet_common.h"
 
 #if ENABLE_FEATURE_IFCONFIG_SLIP
 # include <net/if_slip.h>
diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index 208623e7d..ae7719f52 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -102,7 +102,6 @@
 //usage:       "[-cdf] MASTER_IFACE SLAVE_IFACE..."
 //usage:#define ifenslave_full_usage "\n\n"
 //usage:       "Configure network interfaces for parallel routing\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c,--change-active      Change active slave"
 //usage:     "\n        -d,--detach             Remove slave interface from bonding device"
 //usage:     "\n        -f,--force              Force, even if interface is not Ethernet"
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 421611aae..d8358cdfd 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -11,7 +11,6 @@
 //usage:       "[OPTIONS]"
 //usage:#define ifplugd_full_usage "\n\n"
 //usage:       "Network interface plug detection daemon\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -n              Don't daemonize"
 //usage:     "\n        -s              Don't log to syslog"
 //usage:     "\n        -i IFACE        Interface"
@@ -38,7 +37,9 @@
 #include <linux/if.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
-#include <net/ethernet.h>
+#ifdef HAVE_NET_ETHERNET_H
+# include <net/ethernet.h>
+#endif
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/sockios.h>
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index b48abb7dc..382033038 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -20,8 +20,7 @@
 //usage:#define ifup_trivial_usage
 //usage:       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
 //usage:#define ifup_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n        -a      De/configure all interfaces automatically"
+//usage:       "        -a      De/configure all interfaces automatically"
 //usage:     "\n        -i FILE Use FILE for interface definitions"
 //usage:     "\n        -n      Print out what would happen, but don't do it"
 //usage:        IF_FEATURE_IFUPDOWN_MAPPING(
@@ -34,8 +33,7 @@
 //usage:#define ifdown_trivial_usage
 //usage:       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
 //usage:#define ifdown_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n        -a      De/configure all interfaces automatically"
+//usage:       "        -a      De/configure all interfaces automatically"
 //usage:     "\n        -i FILE Use FILE for interface definitions"
 //usage:     "\n        -n      Print out what would happen, but don't do it"
 //usage:        IF_FEATURE_IFUPDOWN_MAPPING(
diff --git a/networking/inetd.c b/networking/inetd.c
index 58ae089d1..873fd9528 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -158,10 +158,9 @@
 //usage:       "[-fe] [-q N] [-R N] [CONFFILE]"
 //usage:#define inetd_full_usage "\n\n"
 //usage:       "Listen for network connections and launch programs\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -f      Run in foreground"
 //usage:     "\n        -e      Log to stderr"
-//usage:     "\n        -q N    Socket listen queue (default: 128)"
+//usage:     "\n        -q N    Socket listen queue (default: 128)"
 //usage:     "\n        -R N    Pause services after N connects/min"
 //usage:     "\n                (default: 0 - disabled)"
 
@@ -171,8 +170,11 @@
 #include "libbb.h"
 
 #if ENABLE_FEATURE_INETD_RPC
-#include <rpc/rpc.h>
-#include <rpc/pmap_clnt.h>
+# if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
+#  error "You need to build uClibc with UCLIBC_HAS_RPC for NFS support"
+# endif
+# include <rpc/rpc.h>
+# include <rpc/pmap_clnt.h>
 #endif
 
 #if !BB_MMU
diff --git a/networking/interface.c b/networking/interface.c
index bea54c180..79c322ec0 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -30,15 +30,14 @@
  *          20001008 - Bernd Eckenfels, Patch from RH for setting mtu
  *                      (default AF was wrong)
  */
+
+#include "libbb.h"
+#include "inet_common.h"
 #include <net/if.h>
 #include <net/if_arp.h>
-#ifndef __UCLIBC__
+#ifdef HAVE_NET_ETHERNET_H
 # include <net/ethernet.h>
-#else
-# include <linux/if_ether.h>
 #endif
-#include "libbb.h"
-#include "inet_common.h"
 
 #if ENABLE_FEATURE_HWIB
 /* #include <linux/if_infiniband.h> */
diff --git a/networking/ip.c b/networking/ip.c
index 98d583325..fb2f5e2da 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -55,7 +55,7 @@
 //usage:#define iproute_full_usage "\n\n"
 //usage:       "iproute { list | flush } SELECTOR\n"
 //usage:       "iproute get ADDRESS [from ADDRESS iif STRING]\n"
-//usage:       "                        [oif STRING]  [tos TOS]\n"
+//usage:       "                        [oif STRING] [tos TOS]\n"
 //usage:       "iproute { add | del | change | append | replace | monitor } ROUTE\n"
 //usage:       "                        SELECTOR := [root PREFIX] [match PREFIX] [proto RTPROTO]\n"
 //usage:       "                        ROUTE := [TYPE] PREFIX [tos TOS] [proto RTPROTO]\n"
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index f96c73912..3c8b8bfc9 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -16,7 +16,6 @@
 //usage:       "[OPTIONS] ADDRESS[[/]NETMASK] [NETMASK]"
 //usage:#define ipcalc_full_usage "\n\n"
 //usage:       "Calculate IP network settings from a IP address\n"
-//usage:     "\nOptions:"
 //usage:        IF_FEATURE_IPCALC_LONG_OPTIONS(
 //usage:     "\n        -b,--broadcast  Display calculated broadcast address"
 //usage:     "\n        -n,--network    Display calculated network address"
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index 199e11225..a41405c33 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -11,7 +11,6 @@
 //usage:       "[-fiw] [-b ADDR] [STRING]"
 //usage:#define fakeidentd_full_usage "\n\n"
 //usage:       "Provide fake ident (auth) service\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -f      Run in foreground"
 //usage:     "\n        -i      Inetd mode"
 //usage:     "\n        -w      Inetd 'wait' mode"
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 82ab979a5..bad2017fe 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -7,7 +7,7 @@
 #include <net/if.h>
 #include <net/if_packet.h>
 #include <netpacket/packet.h>
-#include <net/ethernet.h>
+#include <netinet/if_ether.h>
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c
index 04925ecf6..7aac8364d 100644
--- a/networking/libiproute/ll_proto.c
+++ b/networking/libiproute/ll_proto.c
@@ -12,11 +12,7 @@
 #include "rt_names.h"
 #include "utils.h"
 
-#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1
-#include <net/ethernet.h>
-#else
-#include <linux/if_ether.h>
-#endif
+#include <netinet/if_ether.h>
 
 #if !ENABLE_WERROR
 #warning de-bloat
diff --git a/networking/nameif.c b/networking/nameif.c
index 78719edac..5d7e8f9a4 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -61,7 +61,6 @@
 //usage:     "\n        [mac=]XX:XX:XX:XX:XX:XX"
 //usage:        )
 //usage:     "\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c FILE Configuration file (default: /etc/mactab)"
 //usage:     "\n        -s      Log to syslog"
 //usage:
@@ -122,20 +121,20 @@ struct ethtool_drvinfo {
 };
 
 struct ethtool_cmd {
-        __u32   cmd;
-        __u32   supported;      /* Features this interface supports */
-        __u32   advertising;    /* Features this interface advertises */
-        __u16   speed;          /* The forced speed, 10Mb, 100Mb, gigabit */
-        __u8    duplex;         /* Duplex, half or full */
-        __u8    port;           /* Which connector port */
-        __u8    phy_address;
-        __u8    transceiver;    /* Which transceiver to use */
-        __u8    autoneg;        /* Enable or disable autonegotiation */
-        __u32   maxtxpkt;       /* Tx pkts before generating tx int */
-        __u32   maxrxpkt;       /* Rx pkts before generating rx int */
-        __u16   speed_hi;
-        __u16   reserved2;
-        __u32   reserved[3];
+        uint32_t   cmd;
+        uint32_t   supported;      /* Features this interface supports */
+        uint32_t   advertising;    /* Features this interface advertises */
+        uint16_t   speed;          /* The forced speed, 10Mb, 100Mb, gigabit */
+        uint8_t    duplex;         /* Duplex, half or full */
+        uint8_t    port;           /* Which connector port */
+        uint8_t    phy_address;
+        uint8_t    transceiver;    /* Which transceiver to use */
+        uint8_t    autoneg;        /* Enable or disable autonegotiation */
+        uint32_t   maxtxpkt;       /* Tx pkts before generating tx int */
+        uint32_t   maxrxpkt;       /* Rx pkts before generating rx int */
+        uint16_t   speed_hi;
+        uint16_t   reserved2;
+        uint32_t   reserved[3];
 };
 
 #define ETHTOOL_GSET      0x00000001 /* Get settings. */
diff --git a/networking/nc.c b/networking/nc.c
index 31d450dda..1b32e3aa3 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -49,7 +49,7 @@
 //usage:#if !ENABLE_NC_110_COMPAT
 //usage:
 //usage:#if ENABLE_NC_SERVER || ENABLE_NC_EXTRA
-//usage:#define NC_OPTIONS_STR "\n\nOptions:"
+//usage:#define NC_OPTIONS_STR "\n"
 //usage:#else
 //usage:#define NC_OPTIONS_STR
 //usage:#endif
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 29f99e76b..1daad1358 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -60,8 +60,7 @@
 //usage:       "nc [OPTIONS] -l -p PORT [HOST] [PORT]  - listen"
 //usage:        )
 //usage:#define nc_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n        -e PROG Run PROG after connect (must be last)"
+//usage:       "        -e PROG Run PROG after connect (must be last)"
 //usage:        IF_NC_SERVER(
 //usage:     "\n        -l      Listen mode, for inbound connects"
 //usage:        )
diff --git a/networking/netstat.c b/networking/netstat.c
index 356fb53cb..9c239579f 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -21,7 +21,6 @@
 //usage:       "[-"IF_ROUTE("r")"al] [-tuwx] [-en"IF_FEATURE_NETSTAT_WIDE("W")IF_FEATURE_NETSTAT_PRG("p")"]"
 //usage:#define netstat_full_usage "\n\n"
 //usage:       "Display networking information\n"
-//usage:     "\nOptions:"
 //usage:        IF_ROUTE(
 //usage:     "\n        -r      Routing table"
 //usage:        )
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 165673a1e..206af00c7 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -32,7 +32,6 @@
 //usage:        "[-dnqNw"IF_FEATURE_NTPD_SERVER("l")"] [-S PROG] [-p PEER]..."
 //usage:#define ntpd_full_usage "\n\n"
 //usage:       "NTP client/server\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -d      Verbose"
 //usage:     "\n        -n      Do not daemonize"
 //usage:     "\n        -q      Quit after clock is set"
diff --git a/networking/ping.c b/networking/ping.c
index 7a9c2d1f0..d75747984 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -73,7 +73,6 @@
 //usage:       "[OPTIONS] HOST"
 //usage:# define ping_full_usage "\n\n"
 //usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -4,-6           Force IP or IPv6 name resolution"
 //usage:     "\n        -c CNT          Send only CNT pings"
 //usage:     "\n        -s SIZE         Send SIZE data bytes in packets (default:56)"
@@ -90,7 +89,6 @@
 //usage:       "[OPTIONS] HOST"
 //usage:# define ping6_full_usage "\n\n"
 //usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c CNT          Send only CNT pings"
 //usage:     "\n        -s SIZE         Send SIZE data bytes in packets (default:56)"
 //usage:     "\n        -I IFACE/IP     Use interface or IP address as source"
diff --git a/networking/pscan.c b/networking/pscan.c
index 5595148fc..28005ad57 100644
--- a/networking/pscan.c
+++ b/networking/pscan.c
@@ -10,7 +10,6 @@
 //usage:       "[-cb] [-p MIN_PORT] [-P MAX_PORT] [-t TIMEOUT] [-T MIN_RTT] HOST"
 //usage:#define pscan_full_usage "\n\n"
 //usage:       "Scan a host, print all open ports\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c      Show closed ports too"
 //usage:     "\n        -b      Show blocked ports too"
 //usage:     "\n        -p      Scan from this port (default 1)"
diff --git a/networking/route.c b/networking/route.c
index 6699a1c32..b7b5a02e6 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -29,7 +29,6 @@
 //usage:       "[{add|del|delete}]"
 //usage:#define route_full_usage "\n\n"
 //usage:       "Edit kernel routing tables\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -n      Don't resolve names"
 //usage:     "\n        -e      Display other/more information"
 //usage:     "\n        -A inet" IF_FEATURE_IPV6("{6}") "       Select address family"
diff --git a/networking/slattach.c b/networking/slattach.c
index d1221b11a..a500da6d0 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -17,7 +17,6 @@
 //usage:       "[-cehmLF] [-s SPEED] [-p PROTOCOL] DEVICE"
 //usage:#define slattach_full_usage "\n\n"
 //usage:       "Attach network interface(s) to serial line(s)\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -p PROT Set protocol (slip, cslip, slip6, clisp6 or adaptive)"
 //usage:     "\n        -s SPD  Set line speed"
 //usage:     "\n        -e      Exit after initializing device"
diff --git a/networking/tc.c b/networking/tc.c
index e9848a86b..1574353a5 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -58,10 +58,10 @@
 
 struct globals {
         int filter_ifindex;
-        __u32 filter_qdisc;
-        __u32 filter_parent;
-        __u32 filter_prio;
-        __u32 filter_proto;
+        uint32_t filter_qdisc;
+        uint32_t filter_parent;
+        uint32_t filter_prio;
+        uint32_t filter_proto;
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 struct BUG_G_too_big {
@@ -94,8 +94,8 @@ static char* print_tc_classid(uint32_t cid)
 }
 
 /* Get a qdisc handle.  Return 0 on success, !0 otherwise.  */
-static int get_qdisc_handle(__u32 *h, const char *str) {
-        __u32 maj;
+static int get_qdisc_handle(uint32_t *h, const char *str) {
+        uint32_t maj;
         char *p;
 
         maj = TC_H_UNSPEC;
@@ -113,8 +113,8 @@ static int get_qdisc_handle(__u32 *h, const char *str) {
 }
 
 /* Get class ID.  Return 0 on success, !0 otherwise.  */
-static int get_tc_classid(__u32 *h, const char *str) {
-        __u32 maj, min;
+static int get_tc_classid(uint32_t *h, const char *str) {
+        uint32_t maj, min;
         char *p;
 
         maj = TC_H_ROOT;
@@ -513,7 +513,7 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
                         if (obj == OBJ_filter)
                                 filter_parent = TC_H_ROOT;
                 } else if (arg == ARG_parent) {
-                        __u32 handle;
+                        uint32_t handle;
                         if (msg.tcm_parent)
                                 duparg(*argv, "parent");
                         if (get_tc_classid(&handle, *argv))
@@ -530,7 +530,7 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
                                    *slash = '\0';
                          */
                         msg.tcm_handle = get_u32(*argv, "handle");
-                        /* if (slash) {if (get_u32(__u32 &mask, slash+1, NULL)) inv mask; addattr32(n, MAX_MSG, TCA_FW_MASK, mask); */
+                        /* if (slash) {if (get_u32(uint32_t &mask, slash+1, NULL)) inv mask; addattr32(n, MAX_MSG, TCA_FW_MASK, mask); */
                 } else if (arg == ARG_classid && obj == OBJ_class && cmd == CMD_change){
                 } else if (arg == ARG_pref || arg == ARG_prio) { /* filter::list */
                         if (filter_prio)
diff --git a/networking/telnet.c b/networking/telnet.c
index 1f0d85107..6dd0de53a 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -26,7 +26,6 @@
 //usage:       "[-a] [-l USER] HOST [PORT]"
 //usage:#define telnet_full_usage "\n\n"
 //usage:       "Connect to telnet server\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -a      Automatic login with $USER variable"
 //usage:     "\n        -l USER Automatic login as USER"
 //usage:
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 4404064fc..33020f1b4 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -26,7 +26,6 @@
 //usage:#define telnetd_full_usage "\n\n"
 //usage:       "Handle incoming telnet connections"
 //usage:        IF_NOT_FEATURE_TELNETD_STANDALONE(" via inetd") "\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -l LOGIN        Exec LOGIN on connect"
 //usage:     "\n        -f ISSUE_FILE   Display ISSUE_FILE instead of /etc/issue"
 //usage:     "\n        -K              Close connection as soon as login exits"
diff --git a/networking/tftp.c b/networking/tftp.c
index 648441016..17485a527 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -23,7 +23,6 @@
 //usage:       "[OPTIONS] HOST [PORT]"
 //usage:#define tftp_full_usage "\n\n"
 //usage:       "Transfer a file from/to tftp server\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -l FILE Local FILE"
 //usage:     "\n        -r FILE Remote FILE"
 //usage:        IF_FEATURE_TFTP_GET(
@@ -46,7 +45,6 @@
 //usage:       "        69 dgram udp nowait root tftpd tftpd -l /files/to/serve\n"
 //usage:       "It also can be ran from udpsvd:\n"
 //usage:       "        udpsvd -vE 0.0.0.0 69 tftpd /files/to/serve\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -r      Prohibit upload"
 //usage:     "\n        -c      Allow file creation via upload"
 //usage:     "\n        -u      Access files as USER"
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 85181ab8d..c32103519 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -216,7 +216,6 @@
 //usage:       "        [-z PAUSE_MSEC] HOST [BYTES]"
 //usage:#define traceroute_full_usage "\n\n"
 //usage:       "Trace the route to HOST\n"
-//usage:     "\nOptions:"
 //usage:        IF_TRACEROUTE6(
 //usage:     "\n        -4,-6   Force IP or IPv6 name resolution"
 //usage:        )
@@ -242,7 +241,6 @@
 //usage:       "        HOST [BYTES]"
 //usage:#define traceroute6_full_usage "\n\n"
 //usage:       "Trace the route to HOST\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -d      Set SO_DEBUG options to socket"
 //usage:     "\n        -n      Print numeric addresses"
 //usage:     "\n        -r      Bypass routing tables, send directly to HOST"
diff --git a/networking/tunctl.c b/networking/tunctl.c
index 8cb733b68..3a0870eb5 100644
--- a/networking/tunctl.c
+++ b/networking/tunctl.c
@@ -14,7 +14,6 @@
 //usage:       "[-f device] ([-t name] | -d name)" IF_FEATURE_TUNCTL_UG(" [-u owner] [-g group] [-b]")
 //usage:#define tunctl_full_usage "\n\n"
 //usage:       "Create or delete tun interfaces\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -f name         tun device (/dev/net/tun)"
 //usage:     "\n        -t name         Create iface 'name'"
 //usage:     "\n        -d name         Delete iface 'name'"
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 510c3a1d0..4d755e6b8 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -25,14 +25,8 @@
 #include "dhcpd.h"
 #include "dhcpc.h"
 
-#include <asm/types.h>
-#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
-# include <netpacket/packet.h>
-# include <net/ethernet.h>
-#else
-# include <linux/if_packet.h>
-# include <linux/if_ether.h>
-#endif
+#include <netinet/if_ether.h>
+#include <netpacket/packet.h>
 #include <linux/filter.h>
 
 /* struct client_config_t client_config is in bb_common_bufsiz1 */
@@ -1134,8 +1128,11 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                 client_config.no_default_options = 1;
         while (list_O) {
                 char *optstr = llist_pop(&list_O);
-                unsigned n = udhcp_option_idx(optstr);
-                n = dhcp_optflags[n].code;
+                unsigned n = bb_strtou(optstr, NULL, 0);
+                if (errno || n > 254) {
+                        n = udhcp_option_idx(optstr);
+                        n = dhcp_optflags[n].code;
+                }
                 client_config.opt_mask[n >> 3] |= 1 << (n & 7);
         }
         while (list_x) {
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index ec07192c1..64cd73ec7 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -7,7 +7,6 @@
 //usage:       "[-r|-a] [-f LEASEFILE]"
 //usage:#define dumpleases_full_usage "\n\n"
 //usage:       "Display DHCP leases granted by udhcpd\n"
-//usage:     "\nOptions:"
 //usage:        IF_LONG_OPTS(
 //usage:     "\n        -f,--file=FILE  Lease file"
 //usage:     "\n        -r,--remaining  Show remaining time"
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 2b7528cc7..66b42c5e1 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -6,18 +6,11 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-#include <netinet/in.h>
-#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
-# include <netpacket/packet.h>
-# include <net/ethernet.h>
-#else
-# include <asm/types.h>
-# include <linux/if_packet.h>
-# include <linux/if_ether.h>
-#endif
-
 #include "common.h"
 #include "dhcpd.h"
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
+#include <netpacket/packet.h>
 
 void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
 {
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index 39f1cec54..a5220ba74 100644
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -22,17 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <net/if.h>
-#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
-# include <netpacket/packet.h>
-# include <net/ethernet.h>
-#else
-# include <asm/types.h>
-# include <linux/if_packet.h>
-# include <linux/if_ether.h>
-#endif
-
 #include "common.h"
+#include <net/if.h>
 
 int FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac)
 {
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 4fa341ac3..48b45d9af 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -13,7 +13,6 @@
 //usage:       "COMMAND [OPTIONS]"
 //usage:#define vconfig_full_usage "\n\n"
 //usage:       "Create and remove virtual ethernet devices\n"
-//usage:     "\nOptions:"
 //usage:     "\n        add             [interface-name] [vlan_id]"
 //usage:     "\n        rem             [vlan-name]"
 //usage:     "\n        set_flag        [interface-name] [flag-num] [0 | 1]"
diff --git a/networking/wget.c b/networking/wget.c
index 5f6e8155f..eca673a86 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -22,7 +22,6 @@
 //usage:        )
 //usage:#define wget_full_usage "\n\n"
 //usage:       "Retrieve files via HTTP or FTP\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -s      Spider mode - only check file existence"
 //usage:     "\n        -c      Continue retrieval of aborted transfer"
 //usage:     "\n        -q      Quiet"
diff --git a/networking/whois.c b/networking/whois.c
index 4eab9e5fe..bf330334a 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -24,7 +24,6 @@
 //usage:       "[-h SERVER] [-p PORT] NAME..."
 //usage:#define whois_full_usage "\n\n"
 //usage:       "Query WHOIS info about NAME\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -h,-p   Server to query"
 
 #include "libbb.h"
diff --git a/networking/zcip.c b/networking/zcip.c
index 7250fb2fd..8a35eca5d 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -27,7 +27,6 @@
 //usage:       "[OPTIONS] IFACE SCRIPT"
 //usage:#define zcip_full_usage "\n\n"
 //usage:       "Manage a ZeroConf IPv4 link-local address\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -f              Run in foreground"
 //usage:     "\n        -q              Quit after obtaining address"
 //usage:     "\n        -r 169.254.x.x  Request this address first"
@@ -36,14 +35,12 @@
 //usage:     "\nWith no -q, runs continuously monitoring for ARP conflicts,"
 //usage:     "\nexits only on I/O errors (link down etc)"
 
+#include "libbb.h"
 #include <netinet/ether.h>
-#include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
-#include <linux/if_packet.h>
 #include <linux/sockios.h>
 
-#include "libbb.h"
 #include <syslog.h>
 
 /* We don't need more than 32 bits of the counter */