X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fusage.h;h=aae06fda14a8671fa3b5b8373835758424d4ff25;hb=ca899efd6cfea224a10e7a596ca4780a2b85ef18;hp=3fb9961267e46a8b9449151de4928282a28be674;hpb=71c165780ac83b0562a7cbc3b57e87807f02055b;p=oweals%2Fbusybox.git diff --git a/include/usage.h b/include/usage.h index 3fb996126..aae06fda1 100644 --- a/include/usage.h +++ b/include/usage.h @@ -17,7 +17,6 @@ #define acpid_trivial_usage \ "[-d] [-c CONFDIR] [-l LOGFILE] [-e PROC_EVENT_FILE] [EVDEV_EVENT_FILE...]" - #define acpid_full_usage "\n\n" \ "Listen to ACPI events and spawn specific helpers on event arrival\n" \ "\nOptions:" \ @@ -120,16 +119,18 @@ #define ash_full_usage "" #define hush_trivial_usage NOUSAGE_STR #define hush_full_usage "" +#define lash_trivial_usage NOUSAGE_STR +#define lash_full_usage "" #define msh_trivial_usage NOUSAGE_STR #define msh_full_usage "" #define awk_trivial_usage \ - "[OPTION]... [program-text] [FILE...]" + "[OPTIONS] [AWK_PROGRAM] [FILE]..." #define awk_full_usage "\n\n" \ "Options:" \ - "\n -v var=val Set variable" \ - "\n -F sep Use sep as field separator" \ - "\n -f file Read program from file" \ + "\n -v VAR=VAL Set variable" \ + "\n -F SEP Use SEP as field separator" \ + "\n -f FILE Read program from file" \ #define basename_trivial_usage \ "FILE [SUFFIX]" @@ -144,10 +145,20 @@ "$ basename /foo/bar.txt .txt\n" \ "bar" +#define beep_trivial_usage \ + "-f freq -l length -d delay -r repetitions -n" +#define beep_full_usage "\n\n" \ + "Options:" \ + "\n -f Frequency in Hz" \ + "\n -l Length in ms" \ + "\n -d Delay in ms" \ + "\n -r Repetitions" \ + "\n -n Start new tone" \ + #define fbsplash_trivial_usage \ "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]" #define fbsplash_full_usage "\n\n" \ - "Options:\n" \ + "Options:" \ "\n -s Image" \ "\n -c Hide cursor" \ "\n -d Framebuffer device (default /dev/fb0)" \ @@ -181,7 +192,7 @@ ) \ #define bunzip2_trivial_usage \ - "[OPTION]... [FILE]" + "[OPTIONS] [FILE]" #define bunzip2_full_usage "\n\n" \ "Uncompress FILE (or standard input if FILE is '-' or omitted)\n" \ "\nOptions:" \ @@ -189,7 +200,7 @@ "\n -f Force" \ #define bzip2_trivial_usage \ - "[OPTION]... [FILE]..." + "[OPTIONS] [FILE]..." #define bzip2_full_usage "\n\n" \ "Compress FILE(s) with bzip2 algorithm.\n" \ "When FILE is '-' or unspecified, reads standard input. Implies -c.\n" \ @@ -202,13 +213,38 @@ #define busybox_notes_usage \ "Hello world!\n" +#define lzop_trivial_usage \ + "[-cfvd123456789CF] [FILE]..." +#define lzop_full_usage "\n\n" \ + " -c Write to standard output" \ + "\n -f Force" \ + "\n -v Verbose" \ + "\n -d Decompress" \ + "\n -F Don't store or verify checksum" \ + "\n -C Also write checksum of compressed block" \ + "\n -1..9 Compression level" \ + +#define lzopcat_trivial_usage \ + "[-vCF] [FILE]..." +#define lzopcat_full_usage "\n\n" \ + " -v Verbose" \ + "\n -F Don't store or verify checksum" \ + +#define unlzop_trivial_usage \ + "[-cfvCF] [FILE]..." +#define unlzop_full_usage "\n\n" \ + " -c Write to standard output" \ + "\n -f Force" \ + "\n -v Verbose" \ + "\n -F Don't store or verify checksum" \ + #define bzcat_trivial_usage \ "FILE" #define bzcat_full_usage "\n\n" \ "Uncompress to stdout" #define unlzma_trivial_usage \ - "[OPTION]... [FILE]" + "[OPTIONS] [FILE]" #define unlzma_full_usage "\n\n" \ "Uncompress FILE (or standard input if FILE is '-' or omitted)\n" \ "\nOptions:" \ @@ -443,9 +479,9 @@ "\n a SIGXCPU after N seconds" \ #define chroot_trivial_usage \ - "NEWROOT [COMMAND...]" + "NEWROOT [PROG [ARGS]]" #define chroot_full_usage "\n\n" \ - "Run COMMAND with root directory set to NEWROOT" + "Run PROG with root directory set to NEWROOT" #define chroot_example_usage \ "$ ls -l /bin/ls\n" \ "lrwxrwxrwx 1 root root 12 Apr 13 00:46 /bin/ls -> /BusyBox\n" \ @@ -492,14 +528,8 @@ #define bbconfig_full_usage "\n\n" \ "Print the config file which built busybox" -#define bbsh_trivial_usage \ - "[FILE]...\n" \ - "or: bbsh -c command [args]..." -#define bbsh_full_usage "\n\n" \ - "The bbsh shell (command interpreter)" - #define chrt_trivial_usage \ - "[OPTION]... [prio] [pid | command [arg]...]" + "[OPTIONS] [PRIO] [PID | PROG [ARGS]]" #define chrt_full_usage "\n\n" \ "Manipulate real-time attributes of a process\n" \ "\nOptions:" \ @@ -515,7 +545,7 @@ "You need CAP_SYS_NICE privileges to set scheduling attributes of a process" #define cp_trivial_usage \ - "[OPTION]... SOURCE DEST" + "[OPTIONS] SOURCE DEST" #define cp_full_usage "\n\n" \ "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY\n" \ "\nOptions:" \ @@ -585,13 +615,13 @@ #define cryptpw_full_usage "\n\n" \ "Crypt the PASSWORD using crypt(3)\n" \ "\nOptions:" \ - IF_GETOPT_LONG( \ + IF_LONG_OPTS( \ "\n -P,--password-fd=NUM Read password from fd NUM" \ /* "\n -s,--stdin Use stdin; like -P0" */ \ "\n -m,--method=TYPE Encryption method TYPE" \ "\n -S,--salt=SALT" \ ) \ - IF_NOT_GETOPT_LONG( \ + IF_NOT_LONG_OPTS( \ "\n -P NUM Read password from fd NUM" \ /* "\n -s Use stdin; like -P0" */ \ "\n -m TYPE Encryption method TYPE" \ @@ -606,13 +636,13 @@ #define mkpasswd_full_usage "\n\n" \ "Crypt the PASSWORD using crypt(3)\n" \ "\nOptions:" \ - IF_GETOPT_LONG( \ + IF_LONG_OPTS( \ "\n -P,--password-fd=NUM Read password from fd NUM" \ /* "\n -s,--stdin Use stdin; like -P0" */ \ "\n -m,--method=TYPE Encryption method TYPE" \ "\n -S,--salt=SALT" \ ) \ - IF_NOT_GETOPT_LONG( \ + IF_NOT_LONG_OPTS( \ "\n -P NUM Read password from fd NUM" \ /* "\n -s Use stdin; like -P0" */ \ "\n -m TYPE Encryption method TYPE" \ @@ -623,7 +653,7 @@ #define cttyhack_full_usage "" #define cut_trivial_usage \ - "[OPTION]... [FILE]..." + "[OPTIONS] [FILE]..." #define cut_full_usage "\n\n" \ "Print selected fields from each input FILE to standard output\n" \ "\nOptions:" \ @@ -641,10 +671,11 @@ "world\n" #define date_trivial_usage \ - "[OPTION]... [+FMT] [TIME]" + "[OPTIONS] [+FMT] [TIME]" #define date_full_usage "\n\n" \ "Display time (using +FMT), or set time\n" \ "\nOptions:" \ + "\n [-s] TIME Set time to TIME" \ "\n -u Work in UTC (don't convert to local time)" \ "\n -R Output RFC-822 compliant date string" \ IF_FEATURE_DATE_ISOFMT( \ @@ -653,18 +684,17 @@ "\n 'hours', 'minutes', or 'seconds' for date and" \ "\n time to the indicated precision" \ ) \ - "\n -d TIME Display TIME, not 'now'" \ "\n -r FILE Display last modification time of FILE" \ - "\n [-s] TIME Set time to TIME" \ + "\n -d TIME Display TIME, not 'now'" \ IF_FEATURE_DATE_ISOFMT( \ - "\n -D FMT Use FMT for str->date conversion" \ + "\n -D FMT Use FMT for -d TIME conversion" \ ) \ "\n" \ "\nRecognized formats for TIME:" \ "\n hh:mm[:ss]" \ "\n [YYYY.]MM.DD-hh:mm[:ss]" \ "\n YYYY-MM-DD hh:mm[:ss]" \ - "\n MMDDhhmm[[YY]YY][.ss]" \ + "\n [[[[[YY]YY]MM]DD]hh]mm[.ss]" \ #define date_example_usage \ "$ date\n" \ @@ -860,9 +890,18 @@ "\n -d Daemonize" \ #define dos2unix_trivial_usage \ - "[option] [FILE]" + "[OPTION] [FILE]" #define dos2unix_full_usage "\n\n" \ - "Convert FILE from dos to unix format.\n" \ + "Convert FILE in-place from DOS to Unix format.\n" \ + "When no file is given, use stdin/stdout.\n" \ + "\nOptions:" \ + "\n -u dos2unix" \ + "\n -d unix2dos" \ + +#define unix2dos_trivial_usage \ + "[OPTION] [FILE]" +#define unix2dos_full_usage "\n\n" \ + "Convert FILE in-place from Unix to DOS format.\n" \ "When no file is given, use stdin/stdout.\n" \ "\nOptions:" \ "\n -u dos2unix" \ @@ -944,12 +983,12 @@ #define dumpleases_full_usage "\n\n" \ "Display DHCP leases granted by udhcpd\n" \ "\nOptions:" \ - IF_GETOPT_LONG( \ + IF_LONG_OPTS( \ "\n -f,--file=FILE Leases file to load" \ "\n -r,--remaining Interpret lease times as time remaining" \ "\n -a,--absolute Interpret lease times as expire time" \ ) \ - IF_NOT_GETOPT_LONG( \ + IF_NOT_LONG_OPTS( \ "\n -f FILE Leases file to load" \ "\n -r Interpret lease times as time remaining" \ "\n -a Interpret lease times as expire time" \ @@ -1010,10 +1049,10 @@ #define ed_full_usage "" #define env_trivial_usage \ - "[-iu] [-] [name=value]... [command]" + "[-iu] [-] [name=value]... [PROG [ARGS]]" #define env_full_usage "\n\n" \ - "Print the current environment or run a program after setting\n" \ - "up the specified environment\n" \ + "Print the current environment or run PROG after setting up\n" \ + "the specified environment\n" \ "\nOptions:" \ "\n -, -i Start with an empty environment" \ "\n -u Remove variable from the environment" \ @@ -1100,7 +1139,7 @@ "1\n" #define fbset_trivial_usage \ - "[options] [mode]" + "[OPTIONS] [MODE]" #define fbset_full_usage "\n\n" \ "Show and modify frame buffer settings" @@ -1210,7 +1249,7 @@ IF_FEATURE_FIND_CONTEXT ( \ "\n -context File has specified security context") \ IF_FEATURE_FIND_EXEC( \ - "\n -exec CMD ARG ; Execute CMD with all instances of {} replaced by the" \ + "\n -exec CMD ARG ; Run CMD with all instances of {} replaced by the" \ "\n matching files") \ IF_FEATURE_FIND_PRUNE( \ "\n -prune Stop traversing current subtree") \ @@ -1223,6 +1262,17 @@ "$ find / -name passwd\n" \ "/etc/passwd\n" +#define flash_lock_trivial_usage \ + "MTD_DEVICE OFFSET SECTORS" +#define flash_lock_full_usage "\n\n" \ + "Lock part or all of an MTD device. If SECTORS is -1, then all sectors\n" \ + "will be locked, regardless of the value of OFFSET" + +#define flash_unlock_trivial_usage \ + "MTD_DEVICE" +#define flash_unlock_full_usage "\n\n" \ + "Unlock an MTD device" + #define flash_eraseall_trivial_usage \ "[-jq] MTD_DEVICE" #define flash_eraseall_full_usage "\n\n" \ @@ -1304,7 +1354,7 @@ "\n DIR Change root to this directory" \ #define ftpget_trivial_usage \ - "[options] remote-host local-file remote-file" + "[OPTIONS] HOST LOCAL_FILE REMOTE_FILE" #define ftpget_full_usage "\n\n" \ "Retrieve a remote file via FTP\n" \ "\nOptions:" \ @@ -1324,7 +1374,7 @@ ) #define ftpput_trivial_usage \ - "[options] remote-host remote-file local-file" + "[OPTIONS] HOST REMOTE_FILE LOCAL_FILE" #define ftpput_full_usage "\n\n" \ "Store a local file on a remote machine via FTP\n" \ "\nOptions:" \ @@ -1342,7 +1392,7 @@ ) #define fuser_trivial_usage \ - "[options] FILE or PORT/PROTO" + "[OPTIONS] FILE or PORT/PROTO" #define fuser_full_usage "\n\n" \ "Find processes which use FILEs or PORTs\n" \ "\nOptions:" \ @@ -1357,10 +1407,10 @@ #define getenforce_full_usage "" #define getopt_trivial_usage \ - "[OPTIONS]..." + "[OPTIONS]" #define getopt_full_usage "\n\n" \ - "Parse command options\n" \ - IF_GETOPT_LONG( \ + "Parse options\n" \ + IF_LONG_OPTS( \ "\n -a,--alternative Allow long options starting with single -" \ "\n -l,--longoptions=longopts Long options to be recognized" \ "\n -n,--name=progname The name under which errors are reported" \ @@ -1371,7 +1421,7 @@ "\n -T,--test Test for getopt(1) version" \ "\n -u,--unquoted Don't quote the output" \ ) \ - IF_NOT_GETOPT_LONG( \ + IF_NOT_LONG_OPTS( \ "\n -a Allow long options starting with single -" \ "\n -l longopts Long options to be recognized" \ "\n -n progname The name under which errors are reported" \ @@ -1432,7 +1482,7 @@ IF_FEATURE_GREP_EGREP_ALIAS("E") \ IF_FEATURE_GREP_CONTEXT("ABC") \ IF_EXTRA_COMPAT("z") \ - "] PATTERN [FILEs...]" + "] PATTERN [FILE]..." #define grep_full_usage "\n\n" \ "Search for PATTERN in each FILE or standard input\n" \ "\nOptions:" \ @@ -1476,7 +1526,7 @@ #define fgrep_full_usage "" #define gunzip_trivial_usage \ - "[OPTION]... [FILE]..." + "[OPTIONS] [FILE]..." #define gunzip_full_usage "\n\n" \ "Uncompress FILEs (or standard input)\n" \ "\nOptions:" \ @@ -1492,7 +1542,7 @@ "-rw-rw-r-- 1 andersen andersen 1761280 Apr 14 17:47 /tmp/BusyBox-0.43.tar\n" #define gzip_trivial_usage \ - "[OPTION]... [FILE]..." + "[OPTIONS] [FILE]..." #define gzip_full_usage "\n\n" \ "Compress FILEs (or standard input)\n" \ "\nOptions:" \ @@ -1520,7 +1570,7 @@ ) #define hdparm_trivial_usage \ - "[options] [device] .." + "[OPTIONS] [DEVICE]" #define hdparm_full_usage "\n\n" \ "Options:" \ "\n -a Get/set fs readahead" \ @@ -1571,7 +1621,7 @@ "\n -z Re-read partition table" \ #define head_trivial_usage \ - "[OPTION]... [FILE]..." + "[OPTIONS] [FILE]..." #define head_full_usage "\n\n" \ "Print first 10 lines of each FILE to standard output.\n" \ "With more than one FILE, precede each with a header giving the\n" \ @@ -1618,7 +1668,7 @@ "Print out a unique 32-bit identifier for the machine" #define hostname_trivial_usage \ - "[OPTION] [hostname | -F FILE]" + "[OPTIONS] [HOSTNAME | -F FILE]" #define hostname_full_usage "\n\n" \ "Get or set hostname or DNS domain name\n" \ "\nOptions:" \ @@ -1626,12 +1676,15 @@ "\n -i Addresses for the hostname" \ "\n -d DNS domain name" \ "\n -f Fully qualified domain name" \ - "\n -F FILE Use the contents of FILE to specify the hostname" \ + "\n -F FILE Use FILE's content as hostname" \ #define hostname_example_usage \ "$ hostname\n" \ "sage\n" +#define dnsdomainname_trivial_usage NOUSAGE_STR +#define dnsdomainname_full_usage "" + #define httpd_trivial_usage \ "[-ifv[v]]" \ " [-c CONFFILE]" \ @@ -1678,7 +1731,7 @@ "\n -f FILE Use specified device (e.g. /dev/rtc2)" \ #define id_trivial_usage \ - "[OPTIONS]... [USER]" + "[OPTIONS] [USER]" #define id_full_usage "\n\n" \ "Print information about USER or the current user\n" \ "\nOptions:" \ @@ -1744,10 +1797,10 @@ " # ifenslave -c bond0 eth0\n" \ #define ifplugd_trivial_usage \ - "[options]" + "[OPTIONS]" #define ifplugd_full_usage "\n\n" \ - "Network interface plug detection daemon.\n\n" \ - "Options:\n" \ + "Network interface plug detection daemon\n" \ + "\nOptions:" \ "\n -n Do not daemonize" \ "\n -s Do not log to syslog" \ "\n -i IFACE Interface" \ @@ -1969,7 +2022,7 @@ /* 2.6 style insmod has no options and required filename * (not module name - .ko can't be omitted) */ #define insmod_trivial_usage \ - IF_FEATURE_2_4_MODULES("[OPTION]... MODULE ") \ + IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ") \ IF_NOT_FEATURE_2_4_MODULES("FILE ") \ "[symbol=value]..." #define insmod_full_usage "\n\n" \ @@ -2047,7 +2100,7 @@ " SCOPE-ID := [host | link | global | NUMBER]" \ #define ipcalc_trivial_usage \ - "[OPTION]... ADDRESS[[/]NETMASK] [NETMASK]" + "[OPTIONS] ADDRESS[[/]NETMASK] [NETMASK]" #define ipcalc_full_usage "\n\n" \ "Calculate IP network settings from a IP address\n" \ "\nOptions:" \ @@ -2207,7 +2260,7 @@ "5\n" #define less_trivial_usage \ - "[-EMNmh~I?] [FILE...]" + "[-EMNmh~I?] [FILE]..." #define less_full_usage "\n\n" \ "View a file or list of files. The position within files can be\n" \ "changed, and files can be manipulated in various ways.\n" \ @@ -2235,7 +2288,7 @@ " linux64 Set 64bit uname emulation" \ #define ln_trivial_usage \ - "[OPTION] TARGET... LINK_NAME|DIRECTORY" + "[OPTIONS] TARGET... LINK_NAME|DIRECTORY" #define ln_full_usage "\n\n" \ "Create a link named LINK_NAME or DIRECTORY to the specified TARGET.\n" \ "Use '--' to indicate that all following arguments are non-options.\n" \ @@ -2273,7 +2326,7 @@ "$ loadkmap < /etc/i18n/lang-keymap\n" #define logger_trivial_usage \ - "[OPTION]... [MESSAGE]" + "[OPTIONS] [MESSAGE]" #define logger_full_usage "\n\n" \ "Write MESSAGE to the system log. If MESSAGE is omitted, log stdin.\n" \ "\nOptions:" \ @@ -2302,7 +2355,7 @@ "root\n" #define logread_trivial_usage \ - "[OPTION]..." + "[OPTIONS]" #define logread_full_usage "\n\n" \ "Show messages in syslogd's circular buffer\n" \ "\nOptions:" \ @@ -2327,7 +2380,7 @@ "losetup -f will show the first loop free loop device\n\n" #define lpd_trivial_usage \ - "SPOOLDIR [HELPER [ARGS...]]" + "SPOOLDIR [HELPER [ARGS]]" #define lpd_full_usage "\n\n" \ "SPOOLDIR must contain (symlinks to) device nodes or directories" \ "\nwith names matching print queue names. In the first case, jobs are" \ @@ -2347,7 +2400,7 @@ "\n -s Short display" \ #define lpr_trivial_usage \ - "-P queue[@host[:port]] -U USERNAME -J TITLE -Vmh [FILE...]" + "-P queue[@host[:port]] -U USERNAME -J TITLE -Vmh [FILE]..." /* -C CLASS exists too, not shown. * CLASS is supposed to be printed on banner page, if one is requested */ #define lpr_full_usage "\n\n" \ @@ -2365,7 +2418,7 @@ IF_FEATURE_AUTOWIDTH("T") IF_FEATURE_LS_TIMESTAMPS("tu") \ IF_FEATURE_LS_SORTFILES("v") IF_FEATURE_AUTOWIDTH("w") "x" \ IF_FEATURE_LS_SORTFILES("X") IF_FEATURE_HUMAN_READABLE("h") "k" \ - IF_SELINUX("K") "] [filenames...]" + IF_SELINUX("K") "] [FILE]..." #define ls_full_usage "\n\n" \ "List directory contents\n" \ "\nOptions:" \ @@ -2419,7 +2472,7 @@ "\n -Z List security context and permission") \ #define lsattr_trivial_usage \ - "[-Radlv] [files...]" + "[-Radlv] [FILE]..." #define lsattr_full_usage "\n\n" \ "List file attributes on an ext2 fs\n" \ "\nOptions:" \ @@ -2493,17 +2546,22 @@ #endif #define makemime_trivial_usage \ - "[OPTION]... [FILE]..." + "[OPTIONS] [FILE]..." #define makemime_full_usage "\n\n" \ - "Create MIME-encoded message\n" \ - "\nOptions:" \ - "\n -C Charset" \ - "\n -e Transfer encoding. Ignored. base64 is assumed" \ + "Create multipart MIME-encoded message from FILEs.\n" \ +/* "Transfer encoding is base64, disposition is inline (not attachment)\n" */ \ + "\nOptions:" \ + "\n -o FILE Output. Default: stdout" \ + "\n -a HDR Add header. Examples:" \ + "\n \"From: user@host.org\", \"Date: `date -R`\"" \ + "\n -c CT Content type. Default: text/plain" \ + "\n -C CS Charset. Default: " CONFIG_FEATURE_MIME_CHARSET \ +/* "\n -e ENC Transfer encoding. Ignored. base64 is assumed" */ \ "\n" \ - "\nOther options are silently ignored." \ + "\nOther options are silently ignored" \ #define man_trivial_usage \ - "[OPTION]... [MANPAGE]..." + "[OPTIONS] [MANPAGE]..." #define man_full_usage "\n\n" \ "Format and display manual page\n" \ "\nOptions:" \ @@ -2520,8 +2578,8 @@ "\n -V Verify file context on disk matches defaults" \ #define md5sum_trivial_usage \ - "[OPTION] [FILEs...]" \ - IF_FEATURE_MD5_SHA1_SUM_CHECK("\n or: md5sum [OPTION] -c [FILE]") + "[OPTIONS] [FILE]..." \ + IF_FEATURE_MD5_SHA1_SUM_CHECK("\n or: md5sum [OPTIONS] -c [FILE]") #define md5sum_full_usage "\n\n" \ "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums" \ IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \ @@ -2542,8 +2600,8 @@ "^D\n" #define sha1sum_trivial_usage \ - "[OPTION] [FILEs...]" \ - IF_FEATURE_MD5_SHA1_SUM_CHECK("\n or: sha1sum [OPTION] -c [FILE]") + "[OPTIONS] [FILE]..." \ + IF_FEATURE_MD5_SHA1_SUM_CHECK("\n or: sha1sum [OPTIONS] -c [FILE]") #define sha1sum_full_usage "\n\n" \ "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums." \ IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \ @@ -2554,8 +2612,8 @@ ) #define sha256sum_trivial_usage \ - "[OPTION] [FILEs...]" \ - IF_FEATURE_MD5_SHA1_SUM_CHECK("\n or: sha256sum [OPTION] -c [FILE]") + "[OPTIONS] [FILE]..." \ + IF_FEATURE_MD5_SHA1_SUM_CHECK("\n or: sha256sum [OPTIONS] -c [FILE]") #define sha256sum_full_usage "\n\n" \ "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums." \ IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \ @@ -2566,8 +2624,8 @@ ) #define sha512sum_trivial_usage \ - "[OPTION] [FILEs...]" \ - IF_FEATURE_MD5_SHA1_SUM_CHECK("\n or: sha512sum [OPTION] -c [FILE]") + "[OPTIONS] [FILE]..." \ + IF_FEATURE_MD5_SHA1_SUM_CHECK("\n or: sha512sum [OPTIONS] -c [FILE]") #define sha512sum_full_usage "\n\n" \ "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums." \ IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \ @@ -2588,7 +2646,7 @@ "It uses /etc/mdev.conf with lines\n" \ "[-]DEVNAME UID:GID PERM" \ IF_FEATURE_MDEV_RENAME(" [>|=PATH]") \ - IF_FEATURE_MDEV_EXEC(" [@|$|*COMMAND]") \ + IF_FEATURE_MDEV_EXEC(" [@|$|*PROG]") \ ) \ #define mdev_notes_usage "" \ @@ -2630,7 +2688,7 @@ "\n -X Disable special meaning of NUL and Ctrl-X from stdin" \ #define mkdir_trivial_usage \ - "[OPTION] DIRECTORY..." + "[OPTIONS] DIRECTORY..." #define mkdir_full_usage "\n\n" \ "Create DIRECTORY\n" \ "\nOptions:" \ @@ -2844,7 +2902,7 @@ " from the command line\n" #define more_trivial_usage \ - "[FILE...]" + "[FILE]..." #define more_full_usage "\n\n" \ "View FILE or standard input one screenful at a time" @@ -2864,6 +2922,9 @@ IF_NOT_FEATURE_MTAB_SUPPORT( \ "\n -f Dry run" \ ) \ + ) \ + IF_FEATURE_MOUNT_HELPERS( \ + "\n -i Don't run mount helper" \ ) \ IF_FEATURE_MTAB_SUPPORT( \ "\n -n Don't update /etc/mtab" \ @@ -2937,8 +2998,8 @@ "setpart tell unload unlock weof wset" \ #define mv_trivial_usage \ - "[OPTION]... SOURCE DEST\n" \ - "or: mv [OPTION]... SOURCE... DIRECTORY" + "[OPTIONS] SOURCE DEST\n" \ + "or: mv [OPTIONS] SOURCE... DIRECTORY" #define mv_full_usage "\n\n" \ "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY\n" \ "\nOptions:" \ @@ -2972,21 +3033,21 @@ #define nc_trivial_usage \ IF_NC_EXTRA("[-iN] [-wN] ")IF_NC_SERVER("[-l] [-p PORT] ") \ - "["IF_NC_EXTRA("-f FILENAME|")"IPADDR PORTNUM]"IF_NC_EXTRA(" [-e COMMAND]") + "["IF_NC_EXTRA("-f FILENAME|")"IPADDR PORT]"IF_NC_EXTRA(" [-e PROG]") #define nc_full_usage "\n\n" \ "Open a pipe to IP:port" IF_NC_EXTRA(" or file") \ NC_OPTIONS_STR \ IF_NC_EXTRA( \ - "\n -e Exec rest of command line after connect" \ - "\n -i SECS Delay interval for lines sent" \ - "\n -w SECS Timeout for connect" \ + "\n -e PROG Run PROG after connect" \ + "\n -i SEC Delay interval for lines sent" \ + "\n -w SEC Timeout for connect" \ "\n -f FILE Use file (ala /dev/ttyS0) instead of network" \ ) \ IF_NC_SERVER( \ "\n -l Listen mode, for inbound connects" \ IF_NC_EXTRA( \ "\n (use -l twice with -e for persistent server)") \ - "\n -p PORT Local port number" \ + "\n -p PORT Local port" \ ) #define nc_notes_usage "" \ @@ -3009,24 +3070,24 @@ #else /* DESKTOP nc - much more compatible with nc 1.10 */ #define nc_trivial_usage \ - "[-options] hostname port - connect" \ + "[OPTIONS] HOST PORT - connect" \ IF_NC_SERVER("\n" \ - "nc [-options] -l -p port [hostname] [port] - listen") + "nc [OPTIONS] -l -p PORT [HOST] [PORT] - listen") #define nc_full_usage "\n\n" \ "Options:" \ - "\n -e prog [args] Program to exec after connect (must be last)" \ + "\n -e PROG Run PROG after connect (must be last)" \ IF_NC_SERVER( \ "\n -l Listen mode, for inbound connects" \ ) \ "\n -n Don't do DNS resolution" \ - "\n -s addr Local address" \ - "\n -p port Local port" \ + "\n -s ADDR Local address" \ + "\n -p PORT Local port" \ "\n -u UDP mode" \ - "\n -v Verbose (cumulative: -vv)" \ - "\n -w secs Timeout for connects and final net reads" \ + "\n -v Verbose" \ + "\n -w SEC Timeout for connects and final net reads" \ IF_NC_EXTRA( \ - "\n -i sec Delay interval for lines sent" /* ", ports scanned" */ \ - "\n -o file Hex dump of traffic" \ + "\n -i SEC Delay interval for lines sent" /* ", ports scanned" */ \ + "\n -o FILE Hex dump traffic" \ "\n -z Zero-I/O mode (scanning)" \ ) \ /* "\n -r Randomize local and remote ports" */ @@ -3034,6 +3095,10 @@ /* "\n -G num Source-routing pointer: 4, 8, 12, ..." */ /* "\nport numbers can be individual or ranges: lo-hi [inclusive]" */ +/* -e PROG can take ARGS too: "nc ... -e ls -l", but we don't document it + * in help text: nc 1.10 does not allow that. We don't want to entice + * users to use this incompatibility */ + #endif #define netstat_trivial_usage \ @@ -3058,11 +3123,11 @@ ) #define nice_trivial_usage \ - "[-n ADJUST] [COMMAND [ARG]...]" + "[-n ADJUST] [PROG [ARGS]]" #define nice_full_usage "\n\n" \ - "Run a program with modified scheduling priority\n" \ + "Run PROG with modified scheduling priority\n" \ "\nOptions:" \ - "\n -n ADJUST Adjust the scheduling priority by ADJUST" \ + "\n -n ADJUST Adjust priority by ADJUST" \ #define nmeter_trivial_usage \ "format_string" @@ -3083,16 +3148,16 @@ "%[pn] Monitor # of processes\n" \ "%b Monitor block io\n" \ "%Nt Show time (with N decimal points)\n" \ - "%Nd Milliseconds between updates (default=1000)\n" \ + "%Nd Milliseconds between updates (default:1000)\n" \ "%r Print instead of at EOL" \ #define nmeter_example_usage \ "nmeter '%250d%t %20c int %i bio %b mem %m forks%p'" #define nohup_trivial_usage \ - "COMMAND [ARGS]" + "PROG [ARGS]" #define nohup_full_usage "\n\n" \ - "Run a command immune to hangups, with output to a non-tty" + "Run PROG immune to hangups, with output to a non-tty" #define nohup_example_usage \ "$ nohup make &" @@ -3116,14 +3181,14 @@ "to standard output. With no FILE or when FILE is -, read standard input." #define openvt_trivial_usage \ - "[-c NUM] [-sw] [COMMAND [ARGS]]" + "[-c N] [-sw] [PROG [ARGS]]" #define openvt_full_usage "\n\n" \ - "Start COMMAND on a new virtual terminal\n" \ + "Start PROG on a new virtual terminal\n" \ "\nOptions:" \ - "\n -c Use specified VT" \ + "\n -c N Use specified VT" \ "\n -s Switch to the VT" \ -/* "\n -l Run COMMAND as login shell (by prepending '-')" */ \ - "\n -w Wait for COMMAND to exit" \ +/* "\n -l Run PROG as login shell (by prepending '-')" */ \ + "\n -w Wait for PROG to exit" \ #define openvt_example_usage \ "openvt 2 /bin/ash\n" @@ -3134,9 +3199,9 @@ "[-n maxtokens] [-m mintokens] [-d delims] [-f flags] file ..." #define passwd_trivial_usage \ - "[OPTION] [name]" + "[OPTIONS] [USER]" #define passwd_full_usage "\n\n" \ - "Change user's password. If no name is specified,\n" \ + "Change USER's password. If no USER is specified,\n" \ "changes the password for the current user.\n" \ "\nOptions:" \ "\n -a Algorithm to use for password (choices: des, md5)" /* ", sha1)" */ \ @@ -3145,46 +3210,49 @@ "\n -u Unlock (re-enable) account" \ #define chpasswd_trivial_usage \ - IF_GETOPT_LONG("[--md5|--encrypted]") IF_NOT_GETOPT_LONG("[-m|-e]") + IF_LONG_OPTS("[--md5|--encrypted]") IF_NOT_LONG_OPTS("[-m|-e]") #define chpasswd_full_usage "\n\n" \ "Read user:password information from stdin " \ "and update /etc/passwd accordingly.\n" \ "\nOptions:" \ - IF_GETOPT_LONG( \ + IF_LONG_OPTS( \ "\n -e,--encrypted Supplied passwords are in encrypted form" \ "\n -m,--md5 Use MD5 encryption instead of DES" \ ) \ - IF_NOT_GETOPT_LONG( \ + IF_NOT_LONG_OPTS( \ "\n -e Supplied passwords are in encrypted form" \ "\n -m Use MD5 encryption instead of DES" \ ) #define patch_trivial_usage \ - "[-p NUM] [-i DIFF] [-R]" + "[-p NUM] [-i DIFF] [-R] [-N]" #define patch_full_usage "\n\n" \ " -p NUM Strip NUM leading components from file names" \ "\n -i DIFF Read DIFF instead of stdin" \ "\n -R Reverse patch" \ + "\n -N Ignore already applied patches" \ #define patch_example_usage \ "$ patch -p1 < example.diff\n" \ "$ patch -p0 -i example.diff" #define pgrep_trivial_usage \ - "[-flnovx] pattern" + "[-flnovx] [-s SID|-P PPID|PATTERN]" #define pgrep_full_usage "\n\n" \ - "Display process(es) selected by regex pattern\n" \ + "Display process(es) selected by regex PATTERN\n" \ "\nOptions:" \ "\n -l Show command name too" \ "\n -f Match against entire command line" \ "\n -n Show the newest process only" \ "\n -o Show the oldest process only" \ - "\n -v Negate the matching" \ + "\n -v Negate the match" \ "\n -x Match whole name (not substring)" \ + "\n -s Match session ID (0 for current)" \ + "\n -P Match parent process ID" \ #if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT) #define pidof_trivial_usage \ - "[OPTION] [NAME...]" + "[OPTIONS] [NAME...]" #define USAGE_PIDOF "\n\nOptions:" #else #define pidof_trivial_usage \ @@ -3219,29 +3287,29 @@ "Send ICMP ECHO_REQUEST packets to network hosts" #else #define ping_trivial_usage \ - "[OPTION]... host" + "[OPTIONS] HOST" #define ping_full_usage "\n\n" \ "Send ICMP ECHO_REQUEST packets to network hosts\n" \ "\nOptions:" \ "\n -4, -6 Force IPv4 or IPv6 hostname resolution" \ "\n -c CNT Send only CNT pings" \ - "\n -s SIZE Send SIZE data bytes in packets (default=56)" \ - "\n -I iface/IP Use interface or IP address as source" \ - "\n -W timeout Seconds to wait for the first response (default:10)" \ + "\n -s SIZE Send SIZE data bytes in packets (default:56)" \ + "\n -I IFACE/IP Use interface or IP address as source" \ + "\n -W SEC Seconds to wait for the first response (default:10)" \ "\n (after all -c CNT packets are sent)" \ - "\n -w deadline Seconds until ping exits (default:infinite)" \ + "\n -w SEC Seconds until ping exits (default:infinite)" \ "\n (can exit earlier with -c CNT)" \ "\n -q Quiet, only displays output at start" \ "\n and when finished" \ #define ping6_trivial_usage \ - "[OPTION]... host" + "[OPTIONS] HOST" #define ping6_full_usage "\n\n" \ "Send ICMP ECHO_REQUEST packets to network hosts\n" \ "\nOptions:" \ "\n -c CNT Send only CNT pings" \ - "\n -s SIZE Send SIZE data bytes in packets (default=56)" \ - "\n -I iface/IP Use interface or IP address as source" \ + "\n -s SIZE Send SIZE data bytes in packets (default:56)" \ + "\n -I IFACE/IP Use interface or IP address as source" \ "\n -q Quiet, only displays output at start" \ "\n and when finished" \ @@ -3273,16 +3341,18 @@ "the new root file system" #define pkill_trivial_usage \ - "[-l] | [-fnovx] [-signal] pattern" + "[-l|-SIGNAL] [-fnovx] [-s SID|-P PPID|PATTERN]" #define pkill_full_usage "\n\n" \ - "Send a signal to process(es) selected by regex pattern\n" \ + "Send a signal to process(es) selected by regex PATTERN\n" \ "\nOptions:" \ "\n -l List all signals" \ "\n -f Match against entire command line" \ "\n -n Signal the newest process only" \ "\n -o Signal the oldest process only" \ - "\n -v Negate the matching" \ + "\n -v Negate the match" \ "\n -x Match whole name (not substring)" \ + "\n -s Match session ID (0 for current)" \ + "\n -P Match parent process ID" \ #define popmaildir_trivial_usage \ "[OPTIONS] Maildir [connection-helper ...]" @@ -3430,15 +3500,18 @@ "files do not block on disk I/O" #define readlink_trivial_usage \ - IF_FEATURE_READLINK_FOLLOW("[-f] ") "FILE" + IF_FEATURE_READLINK_FOLLOW("[-fnv] ") "FILE" #define readlink_full_usage "\n\n" \ "Display the value of a symlink" \ IF_FEATURE_READLINK_FOLLOW( "\n" \ "\nOptions:" \ - "\n -f Canonicalize by following all symlinks") \ + "\n -f Canonicalize by following all symlinks" \ + "\n -n Don't add newline" \ + "\n -v Verbose" \ + ) \ #define readprofile_trivial_usage \ - "[OPTIONS]..." + "[OPTIONS]" #define readprofile_full_usage "\n\n" \ "Options:" \ "\n -m mapfile (Default: /boot/System.map)" \ @@ -3467,7 +3540,7 @@ "\n -f Force reboot (don't go through init)" \ #define reformime_trivial_usage \ - "[OPTION]... [FILE]..." + "[OPTIONS] [FILE]..." #define reformime_full_usage "\n\n" \ "Parse MIME-encoded message\n" \ "\nOptions:" \ @@ -3487,6 +3560,11 @@ "\n -g Process group id(s)" \ "\n -u Process user name(s) and/or id(s)" \ +#define scriptreplay_trivial_usage \ + "timingfile [typescript [divisor]]" +#define scriptreplay_full_usage "\n\n" \ + "Play back typescripts, using timing information" + #define reset_trivial_usage \ "" #define reset_full_usage "\n\n" \ @@ -3514,7 +3592,7 @@ "\n if it has changed" \ #define rm_trivial_usage \ - "[OPTION]... FILE..." + "[OPTIONS] FILE..." #define rm_full_usage "\n\n" \ "Remove (unlink) the FILE(s). Use '--' to\n" \ "indicate that all following arguments are non-options.\n" \ @@ -3527,7 +3605,7 @@ "$ rm -rf /tmp/foo\n" #define rmdir_trivial_usage \ - "[OPTION]... DIRECTORY..." + "[OPTIONS] DIRECTORY..." #define rmdir_full_usage "\n\n" \ "Remove the DIRECTORY, if it is empty.\n" \ "\nOptions:" \ @@ -3543,7 +3621,7 @@ "# rmdir /tmp/foo\n" #define rmmod_trivial_usage \ - "[OPTION]... [MODULE]..." + "[OPTIONS] [MODULE]..." #define rmmod_full_usage "\n\n" \ "Unload the specified kernel modules from the kernel\n" \ "\nOptions:" \ @@ -3585,7 +3663,7 @@ "[-a | -l | -u] [-d DEV] [-m MODE] [-s SEC | -t TIME]" #define rtcwake_full_usage "\n\n" \ "Enter a system sleep state until specified wakeup time\n" \ - IF_GETOPT_LONG( \ + IF_LONG_OPTS( \ "\n -a,--auto Read clock mode from adjtime" \ "\n -l,--local Clock is set to local time" \ "\n -u,--utc Clock is set to UTC time" \ @@ -3594,7 +3672,7 @@ "\n -s,--seconds=SEC Set the timeout in SEC seconds from now" \ "\n -t,--time=TIME Set the timeout to TIME seconds from epoch" \ ) \ - IF_NOT_GETOPT_LONG( \ + IF_NOT_LONG_OPTS( \ "\n -a Read clock mode from adjtime" \ "\n -l Clock is set to local time" \ "\n -u Clock is set to UTC time" \ @@ -3605,10 +3683,10 @@ ) #define runcon_trivial_usage \ - "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" \ - " runcon CONTEXT COMMAND [args]" + "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] PROG [ARGS]\n" \ + " runcon CONTEXT PROG [ARGS]" #define runcon_full_usage "\n\n" \ - "Run a program in a different security context\n" \ + "Run PROG in a different security context\n" \ "\n CONTEXT Complete security context\n" \ IF_FEATURE_RUNCON_LONG_OPTIONS( \ "\n -c,--compute Compute process transition context before modifying" \ @@ -3681,27 +3759,29 @@ "$ rx /tmp/foo\n" #define script_trivial_usage \ - "[-afq] [-c COMMAND] [OUTFILE]" + "[-afq" IF_SCRIPTREPLAY("t") "] [-c PROG] [OUTFILE]" #define script_full_usage "\n\n" \ "Options:" \ "\n -a Append output" \ - "\n -c Run COMMAND, not shell" \ + "\n -c Run PROG, not shell" \ "\n -f Flush output after each write" \ "\n -q Quiet" \ + IF_SCRIPTREPLAY( \ + "\n -t Send timing to stderr" \ + ) #define sed_trivial_usage \ - "[-efinr] pattern [files...]" + "[-efinr] SED_CMD [FILE]..." #define sed_full_usage "\n\n" \ "Options:" \ - "\n -e script Add the script to the commands to be executed" \ - "\n -f scriptfile Add scriptfile contents to the" \ - "\n commands to be executed" \ - "\n -i Edit files in-place" \ - "\n -n Suppress automatic printing of pattern space" \ - "\n -r Use extended regular expression syntax" \ + "\n -e CMD Add CMD to sed commands to be executed" \ + "\n -f FILE Add FILE contents to sed commands to be executed" \ + "\n -i Edit files in-place" \ + "\n -n Suppress automatic printing of pattern space" \ + "\n -r Use extended regex syntax" \ "\n" \ "\nIf no -e or -f is given, the first non-option argument is taken as the sed" \ - "\nscript to interpret. All remaining arguments are names of input files; if no" \ + "\ncommand to interpret. All remaining arguments are names of input files; if no" \ "\ninput files are specified, then the standard input is read. Source files" \ "\nwill not be modified unless -i option is given." \ @@ -3713,17 +3793,17 @@ #define selinuxenabled_full_usage "" #define sendmail_trivial_usage \ - "[OPTIONS] [rcpt]..." + "[OPTIONS] [RECIPIENT_EMAIL]..." #define sendmail_full_usage "\n\n" \ - "Send an email\n" \ + "Read email from stdin and send it\n" \ "\nStandard options:" \ - "\n -t Read recipients from message body, add them to those on cmdline" \ - "\n -f sender Sender. REQUIRED!" \ - "\n -o options various options. -oi IMPLIED! others are IGNORED!" \ + "\n -t Read additional recipients from message body" \ + "\n -f sender Sender (required)" \ + "\n -o options Various options. -oi implied, others are ignored" \ "\n" \ "\nBusybox specific options:" \ "\n -w seconds Network timeout" \ - "\n -H 'prog args' Run connection helper" \ + "\n -H 'PROG ARGS' Run connection helper" \ "\n Examples:" \ "\n -H 'exec openssl s_client -quiet -tls1 -starttls smtp" \ "\n -connect smtp.gmail.com:25' Username for AUTH LOGIN" \ "\n -ap Password for AUTH LOGIN" \ - "\n -am Authentication method. Ignored. login is implied." \ + "\n -am Authentication method. Ignored. LOGIN is implied" \ "\n" \ "\nOther options are silently ignored; -oi -t is implied" \ + IF_MAKEMIME( \ + "\nUse makemime applet to create message with attachments" \ + ) #define seq_trivial_usage \ "[-w] [-s SEP] [FIRST [INC]] LAST" @@ -3828,12 +3911,6 @@ "and will not be affected by keyboard signals (Ctrl-C etc).\n" \ "See setsid(2) for details." \ -#define lash_trivial_usage \ - "[FILE]...\n" \ - "or: sh -c command [args]..." -#define lash_full_usage "\n\n" \ - "lash is deprecated, please use hush" - #define last_trivial_usage \ ""IF_FEATURE_LAST_FANCY("[-HW] [-f file]") #define last_full_usage "\n\n" \ @@ -3855,15 +3932,15 @@ "\n -s Display raw scan-codes" \ #define slattach_trivial_usage \ - "[-cehmLF] [-s speed] [-p protocol] DEVICEs" + "[-cehmLF] [-s SPEED] [-p PROTOCOL] DEVICE" #define slattach_full_usage "\n\n" \ "Attach network interface(s) to serial line(s)\n" \ "\nOptions:" \ - "\n -p Set protocol (slip, cslip, slip6, clisp6 or adaptive)" \ - "\n -s Set line speed" \ + "\n -p PROT Set protocol (slip, cslip, slip6, clisp6 or adaptive)" \ + "\n -s SPD Set line speed" \ "\n -e Exit after initializing device" \ "\n -h Exit when the carrier is lost" \ - "\n -c Execute a command when the line is hung up" \ + "\n -c PROG Run PROG when the line is hung up" \ "\n -m Do NOT initialize the line in raw 8 bits mode" \ "\n -L Enable 3-wire operation" \ "\n -F Disable RTS/CTS flow control" \ @@ -3931,7 +4008,7 @@ "" #define split_trivial_usage \ - "[OPTION] [INPUT [PREFIX]]" + "[OPTIONS] [INPUT [PREFIX]]" #define split_full_usage "\n\n" \ "Options:" \ "\n -b n[k|m] Split by bytes" \ @@ -4006,7 +4083,7 @@ ) \ #define stat_trivial_usage \ - "[OPTION] FILE..." + "[OPTIONS] FILE..." #define stat_full_usage "\n\n" \ "Display file (default) or filesystem status\n" \ "\nOptions:" \ @@ -4066,13 +4143,13 @@ ) \ #define strings_trivial_usage \ - "[-afo] [-n length] [file...]" + "[-afo] [-n LEN] [FILE]..." #define strings_full_usage "\n\n" \ "Display printable strings in a binary file\n" \ "\nOptions:" \ "\n -a Scan whole file (default)" \ "\n -f Precede strings with filenames" \ - "\n -n N At least N characters form a string (default 4)" \ + "\n -n LEN At least LEN characters form a string (default 4)" \ "\n -o Precede strings with decimal offsets" \ #define stty_trivial_usage \ @@ -4087,23 +4164,23 @@ "\n [SETTING] See manpage" \ #define su_trivial_usage \ - "[OPTION]... [-] [username]" + "[OPTIONS] [-] [username]" #define su_full_usage "\n\n" \ "Change user id or become root\n" \ "\nOptions:" \ "\n -p, -m Preserve environment" \ - "\n -c Command to pass to 'sh -c'" \ - "\n -s Shell to use instead of default shell" \ + "\n -c CMD Command to pass to 'sh -c'" \ + "\n -s SH Shell to use instead of default shell" \ #define sulogin_trivial_usage \ - "[OPTION]... [tty-device]" + "[OPTIONS] [TTY]" #define sulogin_full_usage "\n\n" \ "Single user login\n" \ "\nOptions:" \ - "\n -t Timeout" \ + "\n -t N Timeout" \ #define sum_trivial_usage \ - "[rs] [files...]" + "[-rs] [FILE]..." #define sum_full_usage "\n\n" \ "Checksum and count the blocks in a file\n" \ "\nOptions:" \ @@ -4151,7 +4228,7 @@ ) \ #define switch_root_trivial_usage \ - "[-c /dev/console] NEW_ROOT NEW_INIT [ARG...]" + "[-c /dev/console] NEW_ROOT NEW_INIT [ARGS]" #define switch_root_full_usage "\n\n" \ "Free initramfs and switch to another root fs:\n" \ "chroot to NEW_ROOT, delete all in /, move NEW_ROOT to /,\n" \ @@ -4162,10 +4239,17 @@ #define sync_trivial_usage \ "" #define sync_full_usage "\n\n" \ - "Write all buffered filesystem blocks to disk" + "Write all buffered blocks to disk" + +#define fsync_trivial_usage \ + "[OPTIONS] FILE..." +#define fsync_full_usage \ + "Write files' buffered blocks to disk\n" \ + "\nOptions:" \ + "\n -d Avoid syncing metadata" #define sysctl_trivial_usage \ - "[OPTIONS]... [VALUE]..." + "[OPTIONS] [VALUE]..." #define sysctl_full_usage "\n\n" \ "Configure kernel parameters at runtime\n" \ "\nOptions:" \ @@ -4184,18 +4268,18 @@ "sysctl [-n] [-e] -A\n" #define syslogd_trivial_usage \ - "[OPTION]..." + "[OPTIONS]" #define syslogd_full_usage "\n\n" \ "System logging utility.\n" \ "Note that this version of syslogd ignores /etc/syslog.conf.\n" \ "\nOptions:" \ "\n -n Run in foreground" \ - "\n -O FILE Log to given file (default=/var/log/messages)" \ + "\n -O FILE Log to given file (default:/var/log/messages)" \ "\n -l n Set local log level" \ "\n -S Smaller logging output" \ IF_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)") \ IF_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 (default is network only if -R)") \ @@ -4204,7 +4288,7 @@ IF_FEATURE_IPC_SYSLOG( \ "\n -C[size(KiB)] Log to shared mem buffer (read it using logread)") \ /* NB: -Csize shouldn't have space (because size is optional) */ -/* "\n -m MIN Minutes between MARK lines (default=20, 0=off)" */ +/* "\n -m MIN Minutes between MARK lines (default:20, 0=off)" */ #define syslogd_example_usage \ "$ syslogd -R masterlog:514\n" \ @@ -4216,7 +4300,7 @@ "Concatenate FILE(s) and print them in reverse" #define tail_trivial_usage \ - "[OPTION]... [FILE]..." + "[OPTIONS] [FILE]..." #define tail_full_usage "\n\n" \ "Print last 10 lines of each FILE to standard output.\n" \ "With more than one FILE, precede each with a header giving the\n" \ @@ -4280,7 +4364,7 @@ "$ tar -cf /tmp/tarball.tar /usr/local\n" #define taskset_trivial_usage \ - "[-p] [mask] [pid | command [arg]...]" + "[-p] [MASK] [PID | PROG [ARGS]]" #define taskset_full_usage "\n\n" \ "Set or get CPU affinity\n" \ "\nOptions:" \ @@ -4298,7 +4382,7 @@ "pid 1's current affinity mask: 3\n" #define tee_trivial_usage \ - "[OPTION]... [FILE]..." + "[OPTIONS] [FILE]..." #define tee_full_usage "\n\n" \ "Copy standard input to each FILE, and also to standard output\n" \ "\nOptions:" \ @@ -4327,7 +4411,7 @@ #endif #define telnetd_trivial_usage \ - "[OPTION]" + "[OPTIONS]" #define telnetd_full_usage "\n\n" \ "Handle incoming telnet connections" \ IF_NOT_FEATURE_TELNETD_STANDALONE(" via inetd") "\n" \ @@ -4385,44 +4469,44 @@ "filter show [ dev STRING ] [ root | parent CLASSID ]" #define tcpsvd_trivial_usage \ - "[-hEv] [-c n] [-C n:msg] [-b n] [-u user] [-l name] ip port prog..." + "[-hEv] [-c N] [-C N[:MSG]] [-b N] [-u USER] [-l NAME] IP PORT PROG" /* with not-implemented options: */ -/* "[-hpEvv] [-c n] [-C n:msg] [-b n] [-u user] [-l name] [-i dir|-x cdb] [-t sec] ip port prog..." */ +/* "[-hpEvv] [-c N] [-C N[:MSG]] [-b N] [-u USER] [-l NAME] [-i DIR|-x CDB] [-t SEC] IP PORT PROG" */ #define tcpsvd_full_usage "\n\n" \ - "Create TCP socket, bind it to ip:port and listen\n" \ + "Create TCP socket, bind to IP:PORT and listen\n" \ "for incoming connection. Run PROG for each connection.\n" \ - "\nip IP to listen on. '0' = all" \ - "\nport Port to listen on" \ - "\nprog [arg] Program to run" \ - "\n-l name Local hostname (else looks up local hostname in DNS)" \ - "\n-u user[:group] Change to user/group after bind" \ - "\n-c n Handle up to n connections simultaneously" \ - "\n-b n Allow a backlog of approximately n TCP SYNs" \ - "\n-C n[:msg] Allow only up to n connections from the same IP" \ + "\nIP IP to listen on. '0' = all" \ + "\nPORT Port to listen on" \ + "\nPROG [ARGS] Program to run" \ + "\n-l NAME Local hostname (else looks up local hostname in DNS)" \ + "\n-u USER[:GROUP] Change to user/group after bind" \ + "\n-c N Handle up to N connections simultaneously" \ + "\n-b N Allow a backlog of approximately N TCP SYNs" \ + "\n-C N[:MSG] Allow only up to N connections from the same IP" \ "\n New connections from this IP address are closed" \ - "\n immediately. 'msg' is written to the peer before close" \ + "\n immediately. MSG is written to the peer before close" \ "\n-h Look up peer's hostname" \ "\n-E Do not set up environment variables" \ "\n-v Verbose" \ #define udpsvd_trivial_usage \ - "[-hEv] [-c n] [-u user] [-l name] ip port prog" + "[-hEv] [-c N] [-u USER] [-l NAME] IP PORT PROG" #define udpsvd_full_usage "\n\n" \ - "Create UDP socket, bind it to ip:port and wait\n" \ + "Create UDP socket, bind to IP:PORT and wait\n" \ "for incoming packets. Run PROG for each packet,\n" \ "redirecting all further packets with same peer ip:port to it\n" \ - "\nip IP to listen on. '0' = all" \ - "\nport Port to listen on" \ - "\nprog [arg] Program to run" \ - "\n-l name Local hostname (else looks up local hostname in DNS)" \ - "\n-u user[:group] Change to user/group after bind" \ - "\n-c n Handle up to n connections simultaneously" \ + "\nIP IP to listen on. '0' = all" \ + "\nPORT Port to listen on" \ + "\nPROG [ARGS] Program to run" \ + "\n-l NAME Local hostname (else looks up local hostname in DNS)" \ + "\n-u USER[:GROUP] Change to user/group after bind" \ + "\n-c N Handle up to N connections simultaneously" \ "\n-h Look up peer's hostname" \ "\n-E Do not set up environment variables" \ "\n-v Verbose" \ #define tftp_trivial_usage \ - "[OPTION]... HOST [PORT]" + "[OPTIONS] HOST [PORT]" #define tftp_full_usage "\n\n" \ "Transfer a file from/to tftp server\n" \ "\nOptions:" \ @@ -4454,10 +4538,9 @@ "\n -u Access files as USER" \ #define time_trivial_usage \ - "[OPTION]... COMMAND [ARGS...]" + "[OPTIONS] PROG [ARGS]" #define time_full_usage "\n\n" \ - "Run the program COMMAND with arguments ARGS. When COMMAND finishes,\n" \ - "COMMAND's resource usage information is displayed.\n" \ + "Run PROG. When it finishes, its resource usage is displayed.\n" \ "\nOptions:" \ "\n -v Verbose" \ @@ -4475,11 +4558,12 @@ "and show the status for however many processes will fit on the screen." \ #define touch_trivial_usage \ - "[-c] FILE [FILE...]" + "[-c] [-d DATE] FILE [FILE]..." #define touch_full_usage "\n\n" \ "Update the last-modified date on the given FILE[s]\n" \ "\nOptions:" \ - "\n -c Do not create any files" \ + "\n -c Do not create files" \ + "\n -d DT Date/time to use" \ #define touch_example_usage \ "$ ls -l /tmp/foo\n" \ @@ -4583,7 +4667,7 @@ IF_FEATURE_TUNCTL_UG( \ "[-Cfbnqtvo] [-c CID] [-V VCLS] [-H HOSTNAME] [-i INTERFACE]\n" \ " [-p pidfile] [-r IP] [-s script] [-O dhcp-option]..." IF_FEATURE_UDHCP_PORT(" [-P N]") #define udhcpc_full_usage "\n\n" \ - IF_GETOPT_LONG( \ + IF_LONG_OPTS( \ " -V,--vendorclass=CLASSID Vendor class identifier" \ "\n -i,--interface=INTERFACE Interface to use (default eth0)" \ "\n -H,-h,--hostname=HOSTNAME Client hostname" \ @@ -4612,7 +4696,7 @@ IF_FEATURE_TUNCTL_UG( \ "\n -a,--arping Use arping to validate offered address" \ ) \ ) \ - IF_NOT_GETOPT_LONG( \ + IF_NOT_LONG_OPTS( \ " -V CLASSID Vendor class identifier" \ "\n -i INTERFACE Interface to use (default: eth0)" \ "\n -H,-h HOSTNAME Client hostname" \ @@ -4733,15 +4817,6 @@ IF_FEATURE_TUNCTL_UG( \ "b\n" \ "c\n" -#define unix2dos_trivial_usage \ - "[option] [FILE]" -#define unix2dos_full_usage "\n\n" \ - "Convert FILE from unix to dos format.\n" \ - "When no file is given, use stdin/stdout.\n" \ - "\nOptions:" \ - "\n -u dos2unix" \ - "\n -d unix2dos" \ - #define unzip_trivial_usage \ "[-opts[modifiers]] file[.zip] [list] [-x xlist] [-d exdir]" #define unzip_full_usage "\n\n" \ @@ -4799,7 +4874,7 @@ IF_FEATURE_TUNCTL_UG( \ "$\n" #define vconfig_trivial_usage \ - "COMMAND [OPTIONS]..." + "COMMAND [OPTIONS]" #define vconfig_full_usage "\n\n" \ "Create and remove virtual ethernet devices\n" \ "\nOptions:" \ @@ -4811,7 +4886,7 @@ IF_FEATURE_TUNCTL_UG( \ "\n set_name_type [name-type]" \ #define vi_trivial_usage \ - "[OPTION] [FILE]..." + "[OPTIONS] [FILE]..." #define vi_full_usage "\n\n" \ "Edit FILE\n" \ "\nOptions:" \ @@ -4828,10 +4903,15 @@ IF_FEATURE_TUNCTL_UG( \ "\nOptions:" \ "\n -a Lock all VTs" \ +#define volname_trivial_usage \ + "[DEVICE]" +#define volname_full_usage "\n\n" \ + "Show CD volume name of the DEVICE (default /dev/cdrom)" + #define watch_trivial_usage \ - "[-n seconds] [-t] COMMAND..." + "[-n seconds] [-t] PROG [ARGS]" #define watch_full_usage "\n\n" \ - "Execute a program periodically\n" \ + "Run PROG periodically\n" \ "\nOptions:" \ "\n -n Loop period in seconds (default 2)" \ "\n -t Don't print header" \ @@ -4854,7 +4934,7 @@ IF_FEATURE_TUNCTL_UG( \ "\nUse 500ms to specify period in milliseconds" \ #define wc_trivial_usage \ - "[OPTION]... [FILE]..." + "[OPTIONS] [FILE]..." #define wc_full_usage "\n\n" \ "Print line, word, and byte counts for each FILE, and a total line if\n" \ "more than one FILE is specified. With no FILE, read standard input.\n" \ @@ -4889,7 +4969,7 @@ IF_FEATURE_TUNCTL_UG( \ "\n -Y Use proxy ('on' or 'off')" \ #define which_trivial_usage \ - "[COMMAND...]" + "[COMMAND]..." #define which_full_usage "\n\n" \ "Locate a COMMAND" #define which_example_usage \ @@ -4909,9 +4989,9 @@ IF_FEATURE_TUNCTL_UG( \ "Print the user name associated with the current effective user id" #define xargs_trivial_usage \ - "[OPTIONS] [COMMAND] [ARGS...]" + "[OPTIONS] [PROG [ARGS]]" #define xargs_full_usage "\n\n" \ - "Execute COMMAND on every item given by standard input\n" \ + "Run PROG on every item given by standard input\n" \ "\nOptions:" \ IF_FEATURE_XARGS_SUPPORT_CONFIRMATION( \ "\n -p Ask user whether to run each command") \ @@ -4920,7 +5000,7 @@ IF_FEATURE_TUNCTL_UG( \ "\n -0 Input is separated by NUL characters") \ "\n -t Print the command on stderr before execution" \ "\n -e[STR] STR stops input processing" \ - "\n -n N Pass no more than N args to COMMAND" \ + "\n -n N Pass no more than N args to PROG" \ "\n -s N Pass command line of no more than N bytes" \ IF_FEATURE_XARGS_SUPPORT_TERMOPT( \ "\n -x Exit if size is exceeded") \ @@ -4930,9 +5010,9 @@ IF_FEATURE_TUNCTL_UG( \ "$ find . -name '*.c' -print | xargs rm\n" #define yes_trivial_usage \ - "[OPTION]... [STRING]..." + "[OPTIONS] [STRING]" #define yes_full_usage "\n\n" \ - "Repeatedly output a line with all specified STRING(s), or 'y'" + "Repeatedly output a line with STRING, or 'y'" #define zcat_trivial_usage \ "FILE" @@ -4940,7 +5020,7 @@ IF_FEATURE_TUNCTL_UG( \ "Uncompress to stdout" #define zcip_trivial_usage \ - "[OPTIONS] ifname script" + "[OPTIONS] IFACE SCRIPT" #define zcip_full_usage "\n\n" \ "Manage a ZeroConf IPv4 link-local address\n" \ "\nOptions:" \