Remove _() and N_() from platform.h. #define them as NOP macros in the two
[oweals/busybox.git] / include / usage.h
index 22beeadf34f71e2646c62e0bb60236c579e4e2f0..3f894c5b71cd800659ffb5a10445f5911d014b83 100644 (file)
@@ -46,7 +46,7 @@
        "\t-v\t\tverbosely list files processed"
 
 #define arping_trivial_usage \
-       "[-fqbDUA] [-c count] [-w timeout] [-I device] [-s sender] target"
+       "[-fqbDUA] [-c count] [-w timeout] [-i device] [-s sender] target"
 #define arping_full_usage \
        "Ping hosts by ARP requests/replies.\n\n" \
        "Options:\n" \
@@ -58,7 +58,7 @@
        "\t-A\t\tARP answer mode, update your neighbours\n" \
        "\t-c count\tStop after sending count ARP request packets\n" \
        "\t-w timeout\tTime to wait for ARP reply, in seconds\n" \
-       "\t-I device\tOutgoing interface name, default is eth0\n" \
+       "\t-i device\tOutgoing interface name, default is eth0\n" \
        "\t-s sender\tSet specific sender IP address\n" \
        "\ttarget\t\tTarget IP address of ARP request"
 
 #define chvt_full_usage \
        "Changes the foreground virtual terminal to /dev/ttyN"
 
+#define cksum_trivial_usage \
+       "FILES..."
+#define cksum_full_usage \
+       "Calculates the CRC32 checksums of FILES."
+
 #define clear_trivial_usage \
        ""
 #define clear_full_usage \
 #define bbconfig_trivial_usage \
        ""
 #define bbconfig_full_usage \
-       "Print the config file which built busybox\n"
+       "Print the config file which built busybox"
 
 #define cp_trivial_usage \
        "[OPTION]... SOURCE DEST"
        "\t-l num\tlog level (8 - default)\n" \
        "\t-S\tlog to syslogd (default)\n" \
        "\t-L file\tlog to file\n" \
-       "\t-f\trun in fordeground\n" \
+       "\t-f\trun in foreground\n" \
        "\t-b\trun in background (default)\n" \
        "\t-c dir\tworking dir"
 
        "$ echo \"Hello world\" | cut -f 2 -d ' '\n" \
        "world\n"
 
-#ifdef CONFIG_FEATURE_DATE_ISOFMT
-#define USAGE_DATE_ISOFMT(a) a
-#else
-#define USAGE_DATE_ISOFMT(a)
-#endif
-
 #define date_trivial_usage \
        "[OPTION]... [MMDDhhmm[[CC]YY][.ss]] [+FORMAT]"
 #define date_full_usage \
        "\nOptions:\n" \
        "\t-R\t\tOutputs RFC-822 compliant date string\n" \
        "\t-d STRING\tDisplays time described by STRING, not `now'\n" \
-       USAGE_DATE_ISOFMT("\t-I[TIMESPEC]\tOutputs an ISO-8601 compliant date/time string\n" \
+USE_FEATURE_DATE_ISOFMT( \
+       "\t-I[TIMESPEC]\tOutputs an ISO-8601 compliant date/time string\n" \
        "\t\t\tTIMESPEC=`date' (or missing) for date only,\n" \
        "\t\t\t`hours', `minutes', or `seconds' for date and,\n" \
-       "\t\t\ttime to the indicated precision\n") \
+       "\t\t\ttime to the indicated precision\n" \
+       "\t-D hint\t\tUse 'hint' as date format, via strptime()\n" \
+) \
        "\t-s\t\tSets time described by STRING\n" \
        "\t-r FILE\t\tDisplays the last modification time of FILE\n" \
        "\t-u\t\tPrints or sets Coordinated Universal Time"
        "64\n"
 
 #define dd_trivial_usage \
-       "[if=FILE] [of=FILE] [bs=N] [count=N] [skip=N]\n" \
-       "\t  [seek=N] [conv=notrunc|noerror|sync]"
+       "[if=FILE] [of=FILE] " USE_FEATURE_DD_IBS_OBS("[ibs=N] [obs=N] ") "[bs=N] [count=N] [skip=N]\n" \
+       "\t  [seek=N]" USE_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync]")
 #define dd_full_usage \
        "Copy a file, converting and formatting according to options\n\n" \
        "\tif=FILE\t\tread from FILE instead of stdin\n" \
        "\tof=FILE\t\twrite to FILE instead of stdout\n" \
        "\tbs=N\t\tread and write N bytes at a time\n" \
+       USE_FEATURE_DD_IBS_OBS("\tibs=N\t\tread N bytes at a time\n") \
+       USE_FEATURE_DD_IBS_OBS("\tobs=N\t\twrite N bytes at a time\n") \
        "\tcount=N\t\tcopy only N input blocks\n" \
        "\tskip=N\t\tskip N input blocks\n" \
        "\tseek=N\t\tskip N output blocks\n" \
-       "\tconv=notrunc\tdon't truncate output file\n" \
-       "\tconv=noerror\tcontinue after read errors\n" \
-       "\tconv=sync\tpad blocks with zeros\n" \
+       USE_FEATURE_DD_IBS_OBS( \
+               "\tconv=notrunc\tdon't truncate output file\n" \
+               "\tconv=noerror\tcontinue after read errors\n" \
+               "\tconv=sync\tpad blocks with zeros\n" \
+       ) \
        "\n" \
        "Numbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),\n" \
        "MD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)"
 #define deluser_full_usage \
         "Deletes user USER from the system"
 
-#ifdef CONFIG_DEVFSD_FG_NP
-#  define USAGE_DEVFSD_FG_NP(a) a
-#else
-#  define USAGE_DEVFSD_FG_NP(a)
-#endif
-
 #define devfsd_trivial_usage \
        "mntpnt [-v]" \
-       USAGE_DEVFSD_FG_NP("[-fg][-np]" )
+       USE_DEVFSD_FG_NP("[-fg][-np]" )
 #define devfsd_full_usage \
        "Optional daemon for managing devfs permissions and old device name symlinks.\n" \
        "\nOptions:\n" \
        "\tmntpnt\tThe mount point where devfs is mounted.\n\n" \
        "\t-v\tPrint the protocol version numbers for devfsd\n" \
        "\t\tand the kernel-side protocol version and exits." \
-       USAGE_DEVFSD_FG_NP( "\n\n\t-fg\tRun the daemon in the foreground.\n\n" \
+       USE_DEVFSD_FG_NP( "\n\n\t-fg\tRun the daemon in the foreground.\n\n" \
        "\t-np\tExit  after  parsing  the configuration file\n" \
        "\t\tand processing synthetic REGISTER events.\n" \
        "\t\tDo not poll for events.")
 
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-#  define USAGE_HUMAN_READABLE(a) a
-#  define USAGE_NOT_HUMAN_READABLE(a)
-#else
-#  define USAGE_HUMAN_READABLE(a)
-#  define USAGE_NOT_HUMAN_READABLE(a) a
-#endif
 #define df_trivial_usage \
-       "[-" USAGE_HUMAN_READABLE("hm") USAGE_NOT_HUMAN_READABLE("") "k] [FILESYSTEM ...]"
+       "[-" USE_FEATURE_HUMAN_READABLE("hm") "k] [FILESYSTEM ...]"
 #define df_full_usage \
        "Print the filesystem space used and space available.\n\n" \
        "Options:\n" \
-       USAGE_HUMAN_READABLE( \
-       "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
-       "\t-m\tprint sizes in megabytes\n" \
-       "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
-       "\n\t-k\tprint sizes in kilobytes(compatibility)")
+       USE_FEATURE_HUMAN_READABLE( \
+               "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
+               "\t-m\tprint sizes in megabytes\n" \
+               "\t-k\tprint sizes in kilobytes(default)" \
+       ) \
+       SKIP_FEATURE_HUMAN_READABLE("\n\t-k\tignored")
 #define df_example_usage \
        "$ df\n" \
        "Filesystem           1k-blocks      Used Available Use% Mounted on\n" \
        "Filesystem           1k-blocks      Used Available Use% Mounted on\n" \
        "/dev/sda3              8690864   8553540    137324  98% /\n"
 
+#define diff_trivial_usage \
+       "[-abdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
+#define diff_full_usage \
+       "Compare files line by line and output the differences between them.\n" \
+       "This diff implementation only supports unified diffs.\n\n" \
+       "Options:\n" \
+       "\t-a\tTreat all files as text\n" \
+       "\t-b\tIgnore changes in the amount of whitespace\n" \
+       "\t-d\tTry hard to find a smaller set of changes\n" \
+       "\t-i\tIgnore case differences\n" \
+       "\t-L\tUse LABEL instead of the filename in the unified header\n" \
+       "\t-N\tTreat absent files as empty\n" \
+       "\t-q\tOutput only whether files differ\n" \
+       "\t-r\tRecursively compare any subdirectories\n" \
+       "\t-S\tStart with FILE when comparing directories\n" \
+       "\t-T\tMake tabs line up by prefixing a tab when necessary\n" \
+       "\t-s\tReport when two files are the same\n" \
+       "\t-t\tExpand tabs to spaces in output\n" \
+       "\t-U\tOutput LINES lines of context\n" \
+       "\t-w\tIgnore all whitespace\n"
+
 #define dirname_trivial_usage \
        "FILENAME"
 #define dirname_full_usage \
        "\t-i\t\tInstall the package\n" \
        "\t-l\t\tList of installed packages\n" \
        "\t-C\t\tConfigure an unpackaged package\n" \
-       "\t-F depends\tIgnore depency problems\n" \
+       "\t-F depends\tIgnore dependency problems\n" \
        "\t-P\t\tPurge all files of a package\n" \
        "\t-r\t\tRemove all but the configuration files for a package\n" \
        "\t-u\t\tUnpack a package, but don't configure it"
 #define dpkg_deb_example_usage \
        "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
 
-#ifdef CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K
-#define USAGE_DU_DEFALT_BLOCKSIZE_1k(a) a
-#define USAGE_NOT_DU_DEFALT_BLOCKSIZE_1k(a)
-#else
-#define USAGE_DU_DEFALT_BLOCKSIZE_1k(a)
-#define USAGE_NOT_DU_DEFALT_BLOCKSIZE_1k(a) a
-#endif
-
 #define du_trivial_usage \
-       "[-aHLdclsx" USAGE_HUMAN_READABLE("hm") "k] [FILE]..."
+       "[-aHLdclsx" USE_FEATURE_HUMAN_READABLE("hm") "k] [FILE]..."
 #define du_full_usage \
        "Summarizes disk space used for each FILE and/or directory.\n" \
        "Disk space is printed in units of " \
-       USAGE_DU_DEFALT_BLOCKSIZE_1k("1024") USAGE_NOT_DU_DEFALT_BLOCKSIZE_1k("512") \
+       USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024") \
+       SKIP_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512") \
        " bytes.\n\n" \
        "Options:\n" \
        "\t-a\tshow sizes of files in addition to directories\n" \
        "\t-l\tcount sizes many times if hard linked\n" \
        "\t-s\tdisplay only a total for each argument\n" \
        "\t-x\tskip directories on different filesystems\n" \
-       USAGE_HUMAN_READABLE( \
-       "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
-       "\t-m\tprint sizes in megabytes\n" ) \
-       "\t-k\tprint sizes in kilobytes" USAGE_DU_DEFALT_BLOCKSIZE_1k("(default)")
+       USE_FEATURE_HUMAN_READABLE( \
+               "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
+               "\t-m\tprint sizes in megabytes\n" \
+       ) \
+       "\t-k\tprint sizes in kilobytes" \
+       USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("(default)")
 #define du_example_usage \
        "$ du\n" \
        "16      ./CVS\n" \
        "Displays the DHCP leases granted by udhcpd.\n\n" \
        "Options:\n" \
        "\t-f,\t--file=FILENAME\tLeases file to load\n" \
-       "\t-r,\t--remaining\tInterpret lease times as time remaing\n" \
+       "\t-r,\t--remaining\tInterpret lease times as time remaining\n" \
        "\t-a,\t--absolute\tInterpret lease times as expire time"
 
 #define e2fsck_trivial_usage \
        "[-panyrcdfvstDFSV] [-b superblock] [-B blocksize] " \
        "[-I inode_buffer_blocks] [-P process_inode_size] " \
-       "[-l|-L bad_blocks_file] [-C fd] [-j ext-journal] " \
+       "[-l|-L bad_blocks_file] [-C fd] [-j external_journal] " \
        "[-E extended-options] device"
 #define e2fsck_full_usage \
        "Check a Linux ext2/ext3 file system.\n\n" \
        "\t-l file\tAdd to badblocks list\n" \
        "\t-L file\tSet badblocks list"
 
-#ifdef CONFIG_FEATURE_FANCY_ECHO
-#  define USAGE_FANCY_ECHO(a) a
-#else
-#  define USAGE_FANCY_ECHO(a)
-#endif
-
 #define echo_trivial_usage \
-       USAGE_FANCY_ECHO("[-neE] ") "[ARG ...]"
+       USE_FEATURE_FANCY_ECHO("[-neE] ") "[ARG ...]"
 #define echo_full_usage \
        "Prints the specified ARGs to stdout\n\n" \
-       USAGE_FANCY_ECHO("Options:\n" \
-       "\t-n\tsuppress trailing newline\n" \
-       "\t-e\tinterpret backslash-escaped characters (i.e., \\t=tab)\n" \
-       "\t-E\tdisable interpretation of backslash-escaped characters")
+       USE_FEATURE_FANCY_ECHO( \
+               "Options:\n" \
+               "\t-n\tsuppress trailing newline\n" \
+               "\t-e\tinterpret backslash-escaped characters (i.e., \\t=tab)\n" \
+               "\t-E\tdisable interpretation of backslash-escaped characters" \
+       )
 #define echo_example_usage \
        "$ echo \"Erik is cool\"\n" \
        "Erik is cool\n" \
-       USAGE_FANCY_ECHO("$  echo -e \"Erik\\nis\\ncool\"\n" \
+       USE_FEATURE_FANCY_ECHO("$  echo -e \"Erik\\nis\\ncool\"\n" \
        "Erik\n" \
        "is\n" \
        "cool\n" \
        "Options:\n" \
        "\t-t\tclose tray"
 
+#define ed_trivial_usage ""
+#define ed_full_usage ""
+
 #define env_trivial_usage \
        "[-iu] [-] [name=value]... [command]"
 #define env_full_usage \
        "Options:\n" \
        "\t-b\t\tSend wake-up packet to the broadcast address\n" \
        "\t-i iface\tUse interface ifname instead of the default \"eth0\"\n" \
-       "\t-p pass\tAppend the four or six byte password PW to the packet\n"
+       "\t-p pass\tAppend the four or six byte password PW to the packet"
 
 #define expr_trivial_usage \
        "EXPRESSION"
        "\t-S SECTORS  Set the number of sectors\n" \
        "\t-v  Give fdisk version"
 
-#ifdef CONFIG_FEATURE_FIND_TYPE
-#  define USAGE_FIND_TYPE(a) a
-#else
-#  define USAGE_FIND_TYPE(a)
-#endif
-#ifdef CONFIG_FEATURE_FIND_PERM
-#  define USAGE_FIND_PERM(a) a
-#else
-#  define USAGE_FIND_PERM(a)
-#endif
-#ifdef CONFIG_FEATURE_FIND_MTIME
-#  define USAGE_FIND_MTIME(a) a
-#else
-#  define USAGE_FIND_MTIME(a)
-#endif
-#ifdef CONFIG_FEATURE_FIND_MMIN
-  #define USAGE_FIND_MMIN(a) a
-#else
-  #define USAGE_FIND_MMIN(a)
-#endif
-#ifdef CONFIG_FEATURE_FIND_NEWER
-#  define USAGE_FIND_NEWER(a) a
-#else
-#  define USAGE_FIND_NEWER(a)
-#endif
-#ifdef CONFIG_FEATURE_FIND_INUM
-#  define USAGE_FIND_INUM(a) a
-#else
-#  define USAGE_FIND_INUM(a)
-#endif
-#ifdef CONFIG_FEATURE_FIND_EXEC
-#  define USAGE_FIND_EXEC(a) a
-#else
-#  define USAGE_FIND_EXEC(a)
-#endif
-
 #define find_trivial_usage \
        "[PATH...] [EXPRESSION]"
 #define find_full_usage \
        "\t-follow\t\tDereference symbolic links\n" \
        "\t-name PATTERN\tFile name (leading directories removed) matches PATTERN\n" \
        "\t-print\t\tPrint (default and assumed)\n" \
-       USAGE_FIND_TYPE( \
+       USE_FEATURE_FIND_PRINT0( \
+       "\t-print0\t\tDelimit output with null characters rather than\n\t\t\tnewlines" \
+) USE_FEATURE_FIND_TYPE( \
        "\n\t-type X\t\tFiletype matches X (where X is one of: f,d,l,b,c,...)" \
-) USAGE_FIND_PERM( \
+) USE_FEATURE_FIND_PERM( \
        "\n\t-perm PERMS\tPermissions match any of (+NNN); all of (-NNN);\n\t\t\tor exactly (NNN)" \
-) USAGE_FIND_MTIME( \
+) USE_FEATURE_FIND_MTIME( \
        "\n\t-mtime DAYS\tModified time is greater than (+N); less than (-N);\n\t\t\tor exactly (N) days" \
-) USAGE_FIND_MMIN( \
+) USE_FEATURE_FIND_MMIN( \
        "\n\t-mmin MINS\tModified time is greater than (+N); less than (-N);\n\t\t\tor exactly (N) minutes" \
-) USAGE_FIND_NEWER( \
+) USE_FEATURE_FIND_NEWER( \
        "\n\t-newer FILE\tModified time is more recent than FILE's" \
-) USAGE_FIND_INUM( \
+) USE_FEATURE_FIND_INUM( \
        "\n\t-inum N\t\tFile has inode number N" \
-) USAGE_FIND_EXEC( \
+) USE_FEATURE_FIND_EXEC( \
        "\n\t-exec CMD\tExecute CMD with all instances of {} replaced by the" \
        "\n\t\t\tfiles matching EXPRESSION")
 
        "\t-s         Don't print or kill anything.\n" \
        "\t-4         When using port/proto only search IPv4 space\n" \
        "\t-6         When using port/proto only search IPv6 space\n" \
-       "\t-SIGNAL    When used with -k, this signal will be used to kill\n"
+       "\t-SIGNAL    When used with -k, this signal will be used to kill"
+
 #define getopt_trivial_usage \
        "[OPTIONS]..."
 #define getopt_full_usage \
        "\t-I initstring\tSets the init string to send before anything else\n" \
        "\t-H login_host\tLog login_host into the utmp file as the hostname"
 
-#if ENABLE_FEATURE_GREP_EGREP_ALIAS
-#define USAGE_GREP_E(a) a
-#else
-#define USAGE_GREP_E(a)
-#endif
-#if ENABLE_FEATURE_GREP_CONTEXT
-#define USAGE_GREP_CTX(a) a
-#else
-#define USAGE_GREP_CTX(a)
-#endif
 #define grep_trivial_usage \
        "[-ihHnqvs" \
-       USAGE_GREP_E("E") \
-       USAGE_GREP_CTX("ABC") \
+       USE_FEATURE_GREP_EGREP_ALIAS("E") \
+       USE_FEATURE_GREP_CONTEXT("ABC") \
        "] PATTERN [FILEs...]"
 #define grep_full_usage \
        "Search for PATTERN in each FILE or standard input.\n\n" \
        "\t-f\tread PATTERN from file\n" \
        "\t-e\tPATTERN is a regular expression\n" \
        "\t-F\tPATTERN is a set of newline-separated strings" \
-       USAGE_GREP_E("\n\t-E\tPATTERN is an extended regular expression") \
-       USAGE_GREP_CTX("\n\t-A\tprint NUM lines of trailing context") \
-       USAGE_GREP_CTX("\n\t-B\tprint NUM lines of leading context") \
-       USAGE_GREP_CTX("\n\t-C\tprint NUM lines of output context")
+       USE_FEATURE_GREP_EGREP_ALIAS("\n\t-E\tPATTERN is an extended regular expression") \
+       USE_FEATURE_GREP_CONTEXT("\n\t-A\tprint NUM lines of trailing context") \
+       USE_FEATURE_GREP_CONTEXT("\n\t-B\tprint NUM lines of leading context") \
+       USE_FEATURE_GREP_CONTEXT("\n\t-C\tprint NUM lines of output context")
 
 #define grep_example_usage \
        "$ grep root /etc/passwd\n" \
        "Options:\n" \
        "\t-d\t\tdelay interval for halting\n" \
        "\t-n\t\tno call to sync()\n" \
-       "\t-f\t\tforce halt (don't go through init)\n"
-
-#ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
-#define USAGE_HDPARM_IDENT(a) a
-#else
-#define USAGE_HDPARM_IDENT(a)
-#endif
-
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF
-#define USAGE_SCAN_HWIF(a) a
-#else
-#define USAGE_SCAN_HWIF(a)
-#endif
-
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
-#define USAGE_UNREGISTER_HWIF(a) a
-#else
-#define USAGE_UNREGISTER_HWIF(a)
-#endif
-
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET
-#define USAGE_DRIVE_RESET(a) a
-#else
-#define USAGE_DRIVE_RESET(a)
-#endif
-
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
-#define USAGE_TRISTATE_HWIF(a) a
-#else
-#define USAGE_TRISTATE_HWIF(a)
-#endif
-
-#ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA
-#define USAGE_GETSET_DMA(a) a
-#else
-#define USAGE_GETSET_DMA(a)
-#endif
+       "\t-f\t\tforce halt (don't go through init)"
 
 #define hdparm_trivial_usage \
        "[options] [device] .."
        "\t-B   set Advanced Power Management setting (1-255)\n" \
        "\t-c   get/set IDE 32-bit IO setting\n" \
        "\t-C   check IDE power mode status\n" \
-       USAGE_GETSET_DMA("\t-d   get/set using_dma flag\n") \
+       USE_FEATURE_HDPARM_HDIO_GETSET_DMA("\t-d   get/set using_dma flag\n") \
        "\t-D   enable/disable drive defect-mgmt\n" \
        "\t-f   flush buffer cache for device on exit\n" \
        "\t-g   display drive geometry\n" \
        "\t-h   display terse usage information\n" \
        "\t-i   display drive identification\n" \
-       USAGE_HDPARM_IDENT("\t-I   detailed/current information directly from drive\n") \
-       USAGE_HDPARM_IDENT("\t-Istdin  similar to -I, but wants /proc/ide/" "*" "/hd?/identify as input\n") \
+       USE_FEATURE_HDPARM_GET_IDENTITY("\t-I   detailed/current information directly from drive\n") \
+       USE_FEATURE_HDPARM_GET_IDENTITY("\t-Istdin  similar to -I, but wants /proc/ide/" "*" "/hd?/identify as input\n") \
        "\t-k   get/set keep_settings_over_reset flag (0/1)\n" \
        "\t-K   set drive keep_features_over_reset flag (0/1)\n" \
        "\t-L   set drive doorlock (0/1) (removable harddisks only)\n" \
        "\t-q   change next setting quietly\n" \
        "\t-Q   get/set DMA tagged-queuing depth (if supported)\n" \
        "\t-r   get/set readonly flag (DANGEROUS to set)\n" \
-       USAGE_SCAN_HWIF("\t-R   register an IDE interface (DANGEROUS)\n") \
+       USE_FEATURE_HDPARM_HDIO_SCAN_HWIF("\t-R   register an IDE interface (DANGEROUS)\n") \
        "\t-S   set standby (spindown) timeout\n" \
        "\t-t   perform device read timings\n" \
        "\t-T   perform cache read timings\n" \
        "\t-u   get/set unmaskirq flag (0/1)\n" \
-       USAGE_UNREGISTER_HWIF("\t-U   un-register an IDE interface (DANGEROUS)\n") \
+       USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF("\t-U   un-register an IDE interface (DANGEROUS)\n") \
        "\t-v   defaults; same as -mcudkrag for IDE drives\n" \
        "\t-V   display program version and exit immediately\n" \
-       USAGE_DRIVE_RESET("\t-w   perform device reset (DANGEROUS)\n") \
+       USE_FEATURE_HDPARM_HDIO_DRIVE_RESET("\t-w   perform device reset (DANGEROUS)\n") \
        "\t-W   set drive write-caching flag (0/1) (DANGEROUS)\n" \
-       USAGE_TRISTATE_HWIF("\t-x   tristate device for hotswap (0/1) (DANGEROUS)\n") \
+       USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF("\t-x   tristate device for hotswap (0/1) (DANGEROUS)\n") \
        "\t-X   set IDE xfer mode (DANGEROUS)\n" \
        "\t-y   put IDE drive in standby mode\n" \
        "\t-Y   put IDE drive to sleep\n" \
        "\t-Z   disable Seagate auto-powersaving mode\n" \
        "\t-z   re-read partition table"
 
-#ifdef CONFIG_FEATURE_FANCY_HEAD
-#define USAGE_FANCY_HEAD(a) a
-#else
-#define USAGE_FANCY_HEAD(a)
-#endif
-
 #define head_trivial_usage \
        "[OPTION]... [FILE]..."
 #define head_full_usage \
        "file name. With no FILE, or when FILE is -, read standard input.\n\n" \
        "Options:\n" \
        "\t-n NUM\t\tPrint first NUM lines instead of first 10" \
-       USAGE_FANCY_HEAD( \
+       USE_FEATURE_FANCY_HEAD( \
        "\n\t-c NUM\t\toutput the first NUM bytes\n" \
        "\t-q\t\tnever output headers giving file names\n" \
        "\t-v\t\talways output headers giving file names" )
        "$ hostname\n" \
        "sage\n"
 
-#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH
-#  define USAGE_HTTPD_BASIC_AUTH(a) a
-#  ifdef CONFIG_FEATURE_HTTPD_AUTH_MD5
-#    define USAGE_HTTPD_AUTH_MD5(a) a
-#  else
-#    define USAGE_HTTPD_AUTH_MD5(a)
-#  endif
-#else
-#  define USAGE_HTTPD_BASIC_AUTH(a)
-#  define USAGE_HTTPD_AUTH_MD5(a)
-#endif
-#ifdef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
-#  define USAGE_HTTPD_STANDALONE(a)
-#  define USAGE_HTTPD_SETUID(a)
-#else
-#  define USAGE_HTTPD_STANDALONE(a) a
-#  ifdef CONFIG_FEATURE_HTTPD_SETUID
-#    define USAGE_HTTPD_SETUID(a) a
-#  else
-#    define USAGE_HTTPD_SETUID(a)
-#  endif
-#endif
 #define httpd_trivial_usage \
        "[-c <conf file>]" \
-       USAGE_HTTPD_STANDALONE(" [-p <port>]") \
-       USAGE_HTTPD_SETUID(" [-u user]") \
-       USAGE_HTTPD_BASIC_AUTH(" [-r <realm>]") \
-       USAGE_HTTPD_AUTH_MD5(" [-m pass]") \
+       USE_FEATURE_HTTPD_WITHOUT_INETD(" [-p <port>]") \
+       USE_FEATURE_HTTPD_SETUID(" [-u user]") \
+       USE_FEATURE_HTTPD_BASIC_AUTH(" [-r <realm>]") \
+       USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \
        " [-h home]" \
        " [-d/-e <string>]"
 #define httpd_full_usage \
        "Listens for incoming http server requests.\n\n" \
        "Options:\n" \
        "\t-c FILE\t\tSpecifies configuration file. (default httpd.conf)\n" \
-       USAGE_HTTPD_STANDALONE("\t-p PORT\tServer port (default 80)\n") \
-       USAGE_HTTPD_SETUID("\t-u USER\tSet uid to USER after listening privileges port\n") \
-       USAGE_HTTPD_BASIC_AUTH("\t-r REALM\tAuthentication Realm for Basic Authentication\n") \
-       USAGE_HTTPD_AUTH_MD5("\t-m PASS\t\tCrypt PASS with md5 algorithm\n") \
+       USE_FEATURE_HTTPD_WITHOUT_INETD("\t-p PORT\tServer port (default 80)\n") \
+       USE_FEATURE_HTTPD_SETUID("\t-u USER\tSet uid to USER after listening privileges port\n") \
+       USE_FEATURE_HTTPD_BASIC_AUTH("\t-r REALM\tAuthentication Realm for Basic Authentication\n") \
+       USE_FEATURE_HTTPD_AUTH_MD5("\t-m PASS\t\tCrypt PASS with md5 algorithm\n") \
        "\t-h HOME  \tSpecifies http HOME directory (default ./)\n" \
        "\t-e STRING\tHtml encode STRING\n" \
        "\t-d STRING\tURL decode STRING"
 #define ifconfig_full_usage \
        "configure a network interface\n\n" \
        "Options:\n" \
-       USAGE_IPV6("[add <address>[/<prefixlen>]]\n") \
-       USAGE_IPV6("[del <address>[/<prefixlen>]]\n") \
+       USAGE_IPV6("\t[add <address>[/<prefixlen>]]\n") \
+       USAGE_IPV6("\t[del <address>[/<prefixlen>]]\n") \
        "\t[[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n" \
        "\t[netmask <address>]  [dstaddr <address>]\n" \
        USAGE_SIOCSKEEPALIVE("\t[outfill <NN>] [keepalive <NN>]\n") \
        "{ {add|del} IFADDR dev STRING | {show|flush}\n" \
        "\t\t[ dev STRING ] [ to PREFIX ] }"
 #define ipaddr_full_usage \
-       "ipaddr {add|del} IFADDR dev STRING\n" \
+       "ipaddr {add|delete} IFADDR dev STRING\n" \
        "ipaddr {show|flush} [ dev STRING ] [ scope SCOPE-ID ]\n" \
        "\t\t\t[ to PREFIX ] [ label PATTERN ]\n" \
        "\t\t\tIFADDR := PREFIX | ADDR peer PREFIX\n" \
        "The upper-case options MQS are used to remove a shared memory\n" \
        "segment by an shmkey value. The lower-case options mqs are used\n" \
        "to remove a segment by shmid value.\n" \
-       "\t-m | -M\tRemove the memory segment after the last detatch\n" \
+       "\t-m | -M\tRemove the memory segment after the last detach\n" \
        "\t-q | -Q\tRemove the message queue\n" \
-       "\t-s | -S\tRemove the semaphore\n"
+       "\t-s | -S\tRemove the semaphore"
 
 #define ipcs_trivial_usage \
        "[[-smq] -i shmid] | [[-asmq] [-tclup]]"
        "Resource specification:\n" \
        "\t-m\tshared memory segments\n" \
        "\t-q\tmessage queues\n" \
-       "\t-s\tsempahore arrays\n" \
+       "\t-s\tsemaphore arrays\n" \
        "\t-a\tall (default)\n" \
        "Output format:\n" \
        "\t-t\ttime\n" \
        "\t-p\tpid\n" \
        "\t-s\tcreator\n" \
        "\t-a\tlimits\n" \
-       "\t-i\tsummary\n"
+       "\t-i\tsummary"
 
 #define iplink_trivial_usage \
        "{ set DEVICE { up | down | arp { on | off } | show [ DEVICE ] }"
        "\t\tfile\n" \
        "\t-~\tSuppress ~s displayed when input past the end of the file is\n" \
        "\t\treached.\n" \
-       "\t-h, -?\tDisplay this help message\n"
+       "\t-h, -?\tDisplay this help message"
+
+#define setarch_trivial_usage \
+       "<personality> <program> [args ...]"
+#define setarch_full_usage \
+       "Personality may be:\n" \
+       "\tlinux32\tSet 32bit uname emulation\n" \
+       "\tlinux64\tSet 64bit uname emulation"
 
 #define ln_trivial_usage \
        "[OPTION] TARGET... LINK_NAME|DIRECTORY"
 #endif
 
 #define ls_trivial_usage \
-       "[-1Aa" USAGE_LS_TIMESTAMPS("c") "Cd" USAGE_LS_TIMESTAMPS("e") USAGE_LS_FILETYPES("F") "iln" USAGE_LS_FILETYPES("p") USAGE_LS_FOLLOWLINKS("L") USAGE_LS_RECURSIVE("R") USAGE_LS_SORTFILES("rS") "s" USAGE_AUTOWIDTH("T") USAGE_LS_TIMESTAMPS("tu") USAGE_LS_SORTFILES("v") USAGE_AUTOWIDTH("w") "x" USAGE_LS_SORTFILES("X") USAGE_HUMAN_READABLE("h") USAGE_NOT_HUMAN_READABLE("") "k" USAGE_SELINUX("K") "] [filenames...]"
+       "[-1Aa" USAGE_LS_TIMESTAMPS("c") "Cd" USAGE_LS_TIMESTAMPS("e") USAGE_LS_FILETYPES("F") "iln" USAGE_LS_FILETYPES("p") USAGE_LS_FOLLOWLINKS("L") USAGE_LS_RECURSIVE("R") USAGE_LS_SORTFILES("rS") "s" USAGE_AUTOWIDTH("T") USAGE_LS_TIMESTAMPS("tu") USAGE_LS_SORTFILES("v") USAGE_AUTOWIDTH("w") "x" USAGE_LS_SORTFILES("X") USE_FEATURE_HUMAN_READABLE("h") "k" USAGE_SELINUX("K") "] [filenames...]"
 #define ls_full_usage \
        "List directory contents\n\n" \
        "Options:\n" \
        USAGE_AUTOWIDTH("\t-w NUM\tassume the terminal is NUM columns wide\n") \
        "\t-x\tlist entries by lines instead of by columns\n" \
        USAGE_LS_SORTFILES("\t-X\tsort the listing by extension\n") \
-       USAGE_HUMAN_READABLE( \
+       USE_FEATURE_HUMAN_READABLE( \
        "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n") \
        USAGE_SELINUX("\t-k\tprint security context\n") \
        USAGE_SELINUX("\t-K\tprint security context in long format\n")
        "\t-q\tQuiet output\n" \
        "\t-r\tRemove module (stacks) or do autoclean\n" \
        "\t-s\tReport via syslog instead of stderr\n" \
-       "\t-v\tVerbose output\n\n"
+       "\t-v\tVerbose output"
 #define modprobe_notes_usage \
 "modprobe can (un)load a stack of modules, passing each module options (when\n" \
 "loading). modprobe uses a configuration file to determine what option(s) to\n" \
 "\n" \
 "  alias <alias_name> <mod_name>\n" \
 "    Makes it possible to modprobe alias_name, when there is no such module.\n" \
-"    It makes sense if your mod_name is long, or you want a more reprenstative\n" \
+"    It makes sense if your mod_name is long, or you want a more representative\n" \
 "    name for that module (eg. 'scsi' in place of 'aha7xxx').\n" \
 "    This makes it also possible to use a different set of options (below) for\n" \
 "    the module and the alias.\n" \
        "   which are the default for alias 'tulip2'\n\n" \
        "$ modprobe tulip2 irq=8\n" \
        "   will load the module 'tulip' with default options 'irq=4 io=0x308 irq=8',\n" \
-       "   which are the default for alias 'tulip2' overriden by the option 'irq=8'\n\n" \
+       "   which are the default for alias 'tulip2' overridden by the option 'irq=8'\n\n" \
        "   from the command line\n\n" \
        "$ modprobe tulip2 irq=2 io=0x210\n" \
        "   will load the module 'tulip' with default options 'irq=4 io=0x308 irq=4 io=0x210',\n" \
-       "   which are the default for alias 'tulip2' overriden by the options 'irq=2 io=0x210'\n\n" \
+       "   which are the default for alias 'tulip2' overridden by the options 'irq=2 io=0x210'\n\n" \
        "   from the command line\n"
 
 #define more_trivial_usage \
        "Options:\n" \
        "\t-d\t\tdelay interval for halting\n" \
        "\t-n\t\tno call to sync()\n" \
-       "\t-f\t\tforce power off (don't go through init)\n"
+       "\t-f\t\tforce power off (don't go through init)"
 
 #define printenv_trivial_usage \
        "[VARIABLES...]"
        "Options:\n" \
        "\t-d\t\tdelay interval for rebooting\n" \
        "\t-n\t\tno call to sync()\n" \
-       "\t-f\t\tforce reboot (don't go through init)\n"
+       "\t-f\t\tforce reboot (don't go through init)"
 
 #define renice_trivial_usage \
        "{{-n INCREMENT} | PRIORITY} [[ -p | -g | -u ] ID ...]"
        "\t-a ARG\tPass ARG as an argument for every program invoked\n" \
        "\t-u MASK\tSet the umask to MASK before executing every program"
 
-#if BB_APPLET_RUNLEVEL
 #define runlevel_trivial_usage \
        "[utmp]"
 #define runlevel_full_usage \
 #define runlevel_example_usage \
        "$ runlevel /var/run/utmp\n" \
        "N 2"
-#endif
 
 #define rx_trivial_usage \
        "FILE"
 #define setkeycodes_example_usage \
        "$ setkeycodes e030 127\n"
 
+#define setlogcons_trivial_usage \
+       "N"
+#define setlogcons_full_usage \
+       "Redirects the kernel output to console N (0 for current)."
+
 #define setsid_trivial_usage \
        "program [arg ...]"
 #define setsid_full_usage \
        USAGE_SORT_BIG("\t-s\tstable (don't sort ties alphabetically)\n") \
        "\t-u\tsuppress duplicate lines" \
        USAGE_SORT_BIG("\n\t-z\tinput terminated by nulls, not newlines\n") \
-       USAGE_SORT_BIG("\t-mST\tignored for GNU compatability") \
+       USAGE_SORT_BIG("\t-mST\tignored for GNU compatibility") \
        ""
 #define sort_example_usage \
        "$ echo -e \"e\\nf\\nb\\nd\\nc\\na\" | sort\n" \
        "[-L volume-label] [-M last-mounted-dir] [-O [^]feature[,...]] " \
        "[-T last-check-time] [-U UUID] device"
 #define tune2fs_full_usage \
-       "Adjust filesystem options on ext[23] filesystems.\n\n"
+       "Adjust filesystem options on ext[23] filesystems."
 
 #define udhcpc_trivial_usage \
        "[-Cfbnqtv] [-c CID] [-V VCLS] [-H HOSTNAME] [-i INTERFACE]\n[-p pidfile] [-r IP] [-s script]"
        "Executes COMMAND on every item given by standard input.\n\n" \
        "Options:\n" \
        USAGE_XARGS_CONFIRMATION("\t-p\tPrompt the user about whether to run each command\n") \
-       "\t-r\tDo not run command for empty readed lines\n" \
+       "\t-r\tDo not run command for empty read lines\n" \
        USAGE_XARGS_TERMOPT("\t-x\tExit if the size is exceeded\n") \
        USAGE_XARGS_ZERO_TERM("\t-0\tInput filenames are terminated by a null character\n") \
        "\t-t\tPrint the command line on stderr before executing it"
        "\t-f              foreground mode\n" \
        "\t-q              quit after address (no daemon)\n" \
        "\t-r 169.254.x.x  request this address first\n" \
-       "\t-v              verbose; show version\n"
+       "\t-v              verbose; show version"
 
 #endif /* __BB_USAGE_H__ */