X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fusage.h;h=4e520655853fc9ac0d5a4fb72ab193becd31303c;hb=f8138d1f91c913166bffb0077a0fe06831a77ecf;hp=af518de0be6d86aa7798f9fc8c145f0d438cb4ea;hpb=5dd7ef0f37373e397a7160cb431a32ae57f9f7d9;p=oweals%2Fbusybox.git

diff --git a/include/usage.h b/include/usage.h
index af518de0b..4e5206558 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -55,6 +55,26 @@
        "	-x	Extract\n" \
        "	-v	Verbosely list files processed"
 
+#define arp_trivial_usage \
+       "\n" \
+       "[-vn]	[-H type] [-i if] -a [hostname]\n" \
+       "[-v]		  [-i if] -d hostname [pub]\n" \
+       "[-v]	[-H type] [-i if] -s hostname hw_addr [temp]\n" \
+       "[-v] 	[-H type] [-i if] -s hostname hw_addr [netmask nm] pub\n" \
+       "[-v]	[-H type] [-i if] -Ds hostname ifa [netmask nm] pub\n"
+#define arp_full_usage \
+       "Manipulate the system ARP cache" \
+       "\n\nOptions:" \
+       "\n	-a		Display (all) hosts" \
+       "\n	-s		Set a new ARP entry" \
+       "\n	-d		Delete a specified entry" \
+       "\n	-v		Verbose" \
+       "\n	-n		Don't resolve names" \
+       "\n	-i if		Specify network interface (e.g. eth0)" \
+       "\n	-D		Read <hwaddr> from given device" \
+       "\n	-A, -p		Specify protocol family" \
+       "\n	-H hwtype	Specify hardware address type"
+
 #define arping_trivial_usage \
        "[-fqbDUA] [-c count] [-w timeout] [-i device] [-s sender] target"
 #define arping_full_usage \
@@ -576,7 +596,7 @@
        "	-L	Use LABEL instead of the filename in the unified header\n" \
        "	-N	Treat absent files as empty\n" \
        "	-q	Output only whether files differ\n" \
-       "	-r	Recursively compare any subdirectories\n" \
+       "	-r	Recursively compare subdirectories\n" \
        "	-S	Start with FILE when comparing directories\n" \
        "	-T	Make tabs line up by prefixing a tab when necessary\n" \
        "	-s	Report when two files are the same\n" \
@@ -806,6 +826,7 @@
        "\\( and \\) or null; if \\( and \\) are not used, they return the number\n" \
        "of characters matched or 0."
 
+#if 0 /* bloaty */
 #define fakeidentd_trivial_usage \
        "[-b ip] [STRING]"
 #define fakeidentd_full_usage \
@@ -813,6 +834,14 @@
        "\n\nOptions:\n" \
        "	-b	Bind to ip address\n" \
        "	STRING	The ident answer string (default is nobody)"
+#else /* inetd-only */
+#define fakeidentd_trivial_usage \
+       "[username]"
+#define fakeidentd_full_usage \
+       "Return a (faked) ident response.\n" \
+       "This applet is meant to run from inetd.\n" \
+       "Optional argument is the username to return (default is 'nobody')."
+#endif
 
 #define false_trivial_usage \
        ""
@@ -1327,9 +1356,9 @@
 #define inetd_full_usage \
        "Listen for network connections and launch programs" \
        "\n\nOptions:\n" \
-       "	-f	Run as a foreground progress\n" \
-       "	-q	Sets the size of the socket listen queue to\n" \
-       "		the specified value. Default is 128"
+       "	-f	Run in foreground\n" \
+       "	-q N	Set the size of the socket listen queue to N\n" \
+       "		(default: 128)"
 
 #define init_trivial_usage \
        ""
@@ -1628,7 +1657,7 @@
        "Kernel logger" \
        "\n\nOptions:\n" \
        "	-c n	Sets the default log level of console messages to n\n" \
-       "	-n	Run as a foreground process"
+       "	-n	Run as foreground process"
 
 #define length_trivial_usage \
        "STRING"
@@ -2009,7 +2038,7 @@
 #define mkswap_trivial_usage \
        "[-c] [-v0|-v1] device [block-count]"
 #define mkswap_full_usage \
-       "Prepare a disk partition to be used as a swap partition" \
+       "Prepare a disk partition to be used as swap partition" \
        "\n\nOptions:\n" \
        "	-c		Check for read-ability\n" \
        "	-v0		Make version 0 swap [max 128 Megs]\n" \
@@ -3009,19 +3038,20 @@
        "System logging utility.\n" \
        "Note that this version of syslogd ignores /etc/syslog.conf." \
        "\n\nOptions:" \
-       "\n	-m MIN	Minutes between MARK lines (default=20, 0=off)" \
-       "\n	-n	Run as a foreground process" \
-       "\n	-O FILE	Use an alternate log file (default=/var/log/messages)" \
-       "\n	-l n	Sets the local log level of messages to n" \
-       "\n	-S	Make logging output smaller" \
+       "\n	-m MIN		Minutes between MARK lines (default=20, 0=off)" \
+       "\n	-n		Run as foreground process" \
+       "\n	-O FILE		Use an alternate log file (default=/var/log/messages)" \
+       "\n	-l n		Sets the local log level of messages to n" \
+       "\n	-S		Make logging output smaller" \
 	USE_FEATURE_ROTATE_LOGFILE( \
-       "\n	-s SIZE	Max size (KB) before rotate (default=200KB, 0=off)" \
-       "\n	-b NUM	Number of rotated logs to keep (default=1, max=99, 0=purge)") \
+       "\n	-s SIZE		Max size (KB) before rotate (default=200KB, 0=off)" \
+       "\n	-b NUM		Number of rotated logs to keep (default=1, max=99, 0=purge)") \
 	USE_FEATURE_REMOTE_LOG( \
        "\n	-R HOST[:PORT]	Log to IP or hostname on PORT (default PORT=514/UDP)" \
-       "\n	-L	Log locally and via network logging (default is network only)") \
+       "\n	-L		Log locally and via network logging (default is network only)") \
 	USE_FEATURE_IPC_SYSLOG( \
-       "\n	-C [size(KiB)]	Log to a circular buffer (read the buffer using logread)")
+       "\n	-C[size(KiB)]	Log to a shared mem buffer (read the buffer using logread)")
+	/* NB: -Csize shouldn't have space (because size is optional) */
 #define syslogd_example_usage \
        "$ syslogd -R masterlog:514\n" \
        "$ syslogd -R 192.168.1.1:601\n"