*: remove "Options:" string from help texts

function                                             old     new   delta
packed_usage                                       28706   28623     -83

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

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"

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"

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"

networking/ether-wake.c

@@ -70,7 +70,6 @@
 //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"

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"

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"

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"

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"

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")

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"

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"

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(

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)"
 

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"

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"

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"

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:

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

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:	)

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:	)

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"

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"

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)"

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"

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"

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:

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"

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"

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"

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'"

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"

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]"

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"

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"

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"