diff options
author | Elliott Hughes <enh@google.com> | 2018-12-04 14:22:12 -0800 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2018-12-04 17:08:19 -0600 |
commit | 141a075c0e192dc9910e777270114b1864270bfd (patch) | |
tree | 2d62f0cedc34773310b23b3d8f55f577cbbaf9db /toys | |
parent | bcf244f3e6ff3c76536063bc5f7d684c6fd4e3fd (diff) | |
download | toybox-141a075c0e192dc9910e777270114b1864270bfd.tar.gz |
Clean up some --help formatting.
Be consistent about upper versus lower case. (Upper seems to have the
majority, so I went with that, though I'm happy to provide the opposite
patch as long as we're consistent!)
Be consistent about using \t. (Though saving a few bytes seems like it
might be better done in the code that generates help.h rather than
directly in the source, since tabs make careful ASCII art layout hard
enough that we regularly have things misaligned.)
Remove trailing periods (most of which seem to have been added by me).
Always use the US "human readable" rather than my British
"human-readable", and be more consistent about declaring whether we're
showing multiples of 1000 or 1024.
Just say "verbose" rather than adding a useless "mode" or "output".
Diffstat (limited to 'toys')
62 files changed, 236 insertions, 236 deletions
diff --git a/toys/android/log.c b/toys/android/log.c index f9545ab8..3fbc95a0 100644 --- a/toys/android/log.c +++ b/toys/android/log.c @@ -13,9 +13,9 @@ config LOG Logs message to logcat. - -p use the given priority instead of INFO: + -p Use the given priority instead of INFO: d: DEBUG e: ERROR f: FATAL i: INFO v: VERBOSE w: WARN s: SILENT - -t use the given tag instead of "log" + -t Use the given tag instead of "log" */ #define FOR_log diff --git a/toys/android/restorecon.c b/toys/android/restorecon.c index 5ea6b3f9..39261fd9 100644 --- a/toys/android/restorecon.c +++ b/toys/android/restorecon.c @@ -13,11 +13,11 @@ config RESTORECON Restores the default security contexts for the given files. - -D apply to /data/data too - -F force reset - -R recurse into directories - -n don't make any changes; useful with -v to see what would change - -v verbose: show any changes + -D Apply to /data/data too + -F Force reset + -R Recurse into directories + -n Don't make any changes; useful with -v to see what would change + -v Verbose */ #define FOR_restorecon diff --git a/toys/example/demo_number.c b/toys/example/demo_number.c index 4c7b7327..fce18f11 100644 --- a/toys/example/demo_number.c +++ b/toys/example/demo_number.c @@ -12,7 +12,7 @@ config DEMO_NUMBER -b Use "B" for single byte units (HR_B) -d Decimal units - -h human readable + -h Human readable -s Space between number and units (HR_SPACE) */ diff --git a/toys/lsb/dmesg.c b/toys/lsb/dmesg.c index 42f642ce..a55dabf5 100644 --- a/toys/lsb/dmesg.c +++ b/toys/lsb/dmesg.c @@ -24,7 +24,7 @@ config DMESG -r Raw output (with <level markers>) -S Use syslog(2) rather than /dev/kmsg -s Show the last SIZE many bytes - -T Show human-readable timestamps + -T Human readable timestamps -t Don't print timestamps -w Keep waiting for more output (aka --follow) */ diff --git a/toys/lsb/hostname.c b/toys/lsb/hostname.c index 4b9347dd..c9fafa54 100644 --- a/toys/lsb/hostname.c +++ b/toys/lsb/hostname.c @@ -14,11 +14,11 @@ config HOSTNAME Get/set the current hostname. - -b set hostname to 'localhost' if otherwise unset - -d show DNS domain name (no host) - -f show fully-qualified name (host+domain, FQDN) - -F set hostname to contents of FILENAME - -s show short host name (no domain) + -b Set hostname to 'localhost' if otherwise unset + -d Show DNS domain name (no host) + -f Show fully-qualified name (host+domain, FQDN) + -F Set hostname to contents of FILENAME + -s Show short host name (no domain) */ #define FOR_hostname diff --git a/toys/lsb/killall.c b/toys/lsb/killall.c index d524107c..8870618b 100644 --- a/toys/lsb/killall.c +++ b/toys/lsb/killall.c @@ -14,11 +14,11 @@ config KILLALL Send a signal (default: TERM) to all processes with the given names. - -i ask for confirmation before killing - -l print list of all available signals - -q don't print any warnings or error messages - -s send SIGNAL instead of SIGTERM - -v report if the signal was successfully sent + -i Ask for confirmation before killing + -l Print list of all available signals + -q Don't print any warnings or error messages + -s Send SIGNAL instead of SIGTERM + -v Report if the signal was successfully sent */ #define FOR_killall diff --git a/toys/lsb/md5sum.c b/toys/lsb/md5sum.c index fbad784a..80f45a0e 100644 --- a/toys/lsb/md5sum.c +++ b/toys/lsb/md5sum.c @@ -29,7 +29,7 @@ config MD5SUM Calculate md5 hash for each input file, reading from stdin if none. Output one hash (32 hex digits) for each input file, followed by filename. - -b brief (hash only, no filename) + -b Brief (hash only, no filename) -c Check each line of FILE is the same hash+filename we'd output config SHA1SUM @@ -42,7 +42,7 @@ config SHA1SUM one hash (40 hex digits for sha1, 56 for sha224, 64 for sha256, 96 for sha384, and 128 for sha512) for each input file, followed by filename. - -b brief (hash only, no filename) + -b Brief (hash only, no filename) -c Check each line of FILE is the same hash+filename we'd output config SHA224SUM diff --git a/toys/lsb/mount.c b/toys/lsb/mount.c index 0fd9dc52..5d0aca33 100644 --- a/toys/lsb/mount.c +++ b/toys/lsb/mount.c @@ -19,13 +19,13 @@ config MOUNT Mount new filesystem(s) on directories. With no arguments, display existing mounts. - -a mount all entries in /etc/fstab (with -t, only entries of that TYPE) - -O only mount -a entries that have this option - -f fake it (don't actually mount) - -r read only (same as -o ro) - -w read/write (default, same as -o rw) - -t specify filesystem type - -v verbose + -a Mount all entries in /etc/fstab (with -t, only entries of that TYPE) + -O Only mount -a entries that have this option + -f Fake it (don't actually mount) + -r Read only (same as -o ro) + -w Read/write (default, same as -o rw) + -t Specify filesystem type + -v Verbose OPTIONS is a comma separated list of options, which can also be supplied as --longopts. diff --git a/toys/lsb/pidof.c b/toys/lsb/pidof.c index 40e732b5..4f266b84 100644 --- a/toys/lsb/pidof.c +++ b/toys/lsb/pidof.c @@ -15,8 +15,8 @@ config PIDOF Print the PIDs of all processes with the given names. - -s single shot, only return one pid - -o omit PID(s) + -s Single shot, only return one pid + -o Omit PID(s) */ #define FOR_pidof diff --git a/toys/lsb/su.c b/toys/lsb/su.c index 7ab24876..0bffe782 100644 --- a/toys/lsb/su.c +++ b/toys/lsb/su.c @@ -16,10 +16,10 @@ config SU Switch to user (or root) and run shell (with optional command line). - -s shell to use - -c command to pass to shell with -c - -l login shell - -(m|p) preserve environment + -s Shell to use + -c Command to pass to shell with -c + -l Login shell + -(m|p) Preserve environment */ #define FOR_su diff --git a/toys/lsb/umount.c b/toys/lsb/umount.c index d67d41fb..3c9e3ca1 100644 --- a/toys/lsb/umount.c +++ b/toys/lsb/umount.c @@ -19,11 +19,11 @@ config UMOUNT Unmount the listed filesystems. -a Unmount all mounts in /proc/mounts instead of command line list - -D Don't free loopback device(s) - -f Force unmount - -l Lazy unmount (detach from filesystem now, close when last user does) + -D Don't free loopback device(s) + -f Force unmount + -l Lazy unmount (detach from filesystem now, close when last user does) -n Don't use /proc/mounts - -r Remount read only if unmounting fails + -r Remount read only if unmounting fails -t Restrict "all" to mounts of TYPE (or use "noTYPE" to skip) -v Verbose */ diff --git a/toys/net/microcom.c b/toys/net/microcom.c index 7311e9d7..26ff2589 100644 --- a/toys/net/microcom.c +++ b/toys/net/microcom.c @@ -13,7 +13,7 @@ config MICROCOM Simple serial console. -s Set baud rate to SPEED - -X Ignore ^@ (send break) and ^] (exit). + -X Ignore ^@ (send break) and ^] (exit) */ #define FOR_microcom diff --git a/toys/net/netcat.c b/toys/net/netcat.c index 54700c36..aa251b88 100644 --- a/toys/net/netcat.c +++ b/toys/net/netcat.c @@ -15,10 +15,10 @@ config NETCAT help usage: netcat [-u] [-wpq #] [-s addr] {IPADDR PORTNUM|-f FILENAME} - -f use FILENAME (ala /dev/ttyS0) instead of network - -p local port number - -q quit SECONDS after EOF on stdin, even if stdout hasn't closed yet - -s local source address + -f Use FILENAME (ala /dev/ttyS0) instead of network + -p Local port number + -q Quit SECONDS after EOF on stdin, even if stdout hasn't closed yet + -s Local source address -w SECONDS timeout to establish connection -W SECONDS timeout for more data on an idle connection @@ -32,9 +32,9 @@ config NETCAT_LISTEN help usage: netcat [-t] [-lL COMMAND...] - -l listen for one incoming connection - -L listen for multiple incoming connections (server mode) - -t allocate tty (must come before -l or -L) + -l Listen for one incoming connection + -L Listen for multiple incoming connections (server mode) + -t Allocate tty (must come before -l or -L) The command line after -l or -L is executed (as a child process) to handle each incoming connection. If blank -l waits for a connection and forwards diff --git a/toys/net/netstat.c b/toys/net/netstat.c index 7bebb327..45d688e3 100644 --- a/toys/net/netstat.c +++ b/toys/net/netstat.c @@ -14,17 +14,17 @@ config NETSTAT Display networking information. Default is netsat -tuwx - -r routing table - -a all sockets (not just connected) - -l listening server sockets + -r Routing table + -a All sockets (not just connected) + -l Listening server sockets -t TCP sockets -u UDP sockets - -w raw sockets - -x unix sockets - -e extended info - -n don't resolve names - -W wide display - -p show PID/program name of sockets + -w Raw sockets + -x Unix sockets + -e Extended info + -n Don't resolve names + -W Wide display + -p Show PID/program name of sockets */ #define FOR_netstat diff --git a/toys/other/acpi.c b/toys/other/acpi.c index b73cff95..3e19141c 100644 --- a/toys/other/acpi.c +++ b/toys/other/acpi.c @@ -14,11 +14,11 @@ config ACPI Show status of power sources and thermal devices. - -a show power adapters - -b show batteries - -c show cooling device state - -t show temperatures - -V show everything + -a Show power adapters + -b Show batteries + -c Show cooling device state + -t Show temperatures + -V Show everything */ #define FOR_acpi diff --git a/toys/other/base64.c b/toys/other/base64.c index 87887cda..f1b617d6 100644 --- a/toys/other/base64.c +++ b/toys/other/base64.c @@ -14,9 +14,9 @@ config BASE64 Encode or decode in base64. - -d decode - -i ignore non-alphabetic characters - -w wrap output at COLUMNS (default 76 or 0 for no wrap) + -d Decode + -i Ignore non-alphabetic characters + -w Wrap output at COLUMNS (default 76 or 0 for no wrap) */ #define FOR_base64 diff --git a/toys/other/bzcat.c b/toys/other/bzcat.c index 0c79773a..f7453441 100644 --- a/toys/other/bzcat.c +++ b/toys/other/bzcat.c @@ -23,11 +23,11 @@ config BUNZIP2 Decompress listed files (file.bz becomes file) deleting archive file(s). Read from stdin if no files listed. - -c force output to stdout - -f force decompression (if FILE doesn't end in .bz, replace original) - -k keep input files (-c and -t imply this) - -t test integrity - -v verbose + -c Force output to stdout + -f Force decompression (if FILE doesn't end in .bz, replace original) + -k Keep input files (-c and -t imply this) + -t Test integrity + -v Verbose config BZCAT bool "bzcat" diff --git a/toys/other/chcon.c b/toys/other/chcon.c index a071eef5..cdbabf76 100644 --- a/toys/other/chcon.c +++ b/toys/other/chcon.c @@ -13,9 +13,9 @@ config CHCON Change the SELinux security context of listed file[s]. - -h change symlinks instead of what they point to - -R recurse into subdirectories - -v verbose output + -h Change symlinks instead of what they point to + -R Recurse into subdirectories + -v Verbose */ #define FOR_chcon diff --git a/toys/other/fmt.c b/toys/other/fmt.c index 764fe2b7..a4460ec2 100644 --- a/toys/other/fmt.c +++ b/toys/other/fmt.c @@ -20,7 +20,7 @@ config FMT Reformat input to wordwrap at a given line length, preserving existing indentation level, writing to stdout. - -w WIDTH maximum characters per line (default 75) + -w WIDTH Maximum characters per line (default 75) */ #define FOR_fmt diff --git a/toys/other/free.c b/toys/other/free.c index 0a4d69b9..ce0df020 100644 --- a/toys/other/free.c +++ b/toys/other/free.c @@ -14,7 +14,7 @@ config FREE Display the total, free and used amount of physical memory and swap space. -bkmgt Output units (default is bytes) - -h Human readable + -h Human readable (K=1024) */ #define FOR_free diff --git a/toys/other/fsfreeze.c b/toys/other/fsfreeze.c index dfe17fb9..b494ce96 100644 --- a/toys/other/fsfreeze.c +++ b/toys/other/fsfreeze.c @@ -13,8 +13,8 @@ config FSFREEZE Freeze or unfreeze a filesystem. - -f freeze - -u unfreeze + -f Freeze + -u Unfreeze */ #define FOR_fsfreeze diff --git a/toys/other/makedevs.c b/toys/other/makedevs.c index 5e6a9822..def1c4b6 100644 --- a/toys/other/makedevs.c +++ b/toys/other/makedevs.c @@ -15,7 +15,7 @@ config MAKEDEVS Create a range of special files as specified in a device table. - -d file containing device table (default reads from stdin) + -d File containing device table (default reads from stdin) Each line of of the device table has the fields: <name> <type> <mode> <uid> <gid> <major> <minor> <start> <increment> <count> diff --git a/toys/other/mkpasswd.c b/toys/other/mkpasswd.c index b4151363..6ff578ff 100644 --- a/toys/other/mkpasswd.c +++ b/toys/other/mkpasswd.c @@ -16,8 +16,8 @@ config MKPASSWD Crypt PASSWORD using crypt(3) - -P FD Read password from file descriptor FD - -m TYPE Encryption method (des, md5, sha256, or sha512; default is des) + -P FD Read password from file descriptor FD + -m TYPE Encryption method (des, md5, sha256, or sha512; default is des) -S SALT */ diff --git a/toys/other/nsenter.c b/toys/other/nsenter.c index 007e0556..dfcfbe83 100644 --- a/toys/other/nsenter.c +++ b/toys/other/nsenter.c @@ -25,7 +25,7 @@ config UNSHARE Create new container namespace(s) for this process and its children, so some attribute is not shared with the parent process. - -f Fork command in the background (--fork) + -f Fork command in the background (--fork) -i SysV IPC (message queues, semaphores, shared memory) (--ipc) -m Mount/unmount tree (--mount) -n Network address, sockets, routing, iptables (--net) @@ -46,8 +46,8 @@ config NSENTER Run COMMAND in an existing (set of) namespace(s). - -t PID to take namespaces from (--target) - -F don't fork, even if -p is used (--no-fork) + -t PID to take namespaces from (--target) + -F don't fork, even if -p is used (--no-fork) The namespaces to switch are: diff --git a/toys/other/readlink.c b/toys/other/readlink.c index 2e0cf11e..1a75dcac 100644 --- a/toys/other/readlink.c +++ b/toys/other/readlink.c @@ -14,11 +14,11 @@ config READLINK Options for producing cannonical paths (all symlinks/./.. resolved): - -e cannonical path to existing entry (fail if missing) - -f full path (fail if directory missing) - -m ignore missing entries, show where it would be - -n no trailing newline - -q quiet (no output, just error code) + -e Canonical path to existing entry (fail if missing) + -f Full path (fail if directory missing) + -m Ignore missing entries, show where it would be + -n No trailing newline + -q Quiet (no output, just error code) */ #define FOR_readlink diff --git a/toys/other/stat.c b/toys/other/stat.c index f571857a..7c2e337b 100644 --- a/toys/other/stat.c +++ b/toys/other/stat.c @@ -13,7 +13,7 @@ config STAT Display status of files or filesystems. -c Output specified FORMAT string instead of default - -f display filesystem status instead of file status + -f Display filesystem status instead of file status -L Follow symlinks -t terse (-c "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o") (with -f = -c "%n %i %l %t %s %S %b %f %a %c %d") diff --git a/toys/other/uptime.c b/toys/other/uptime.c index 61aed8fb..001af02c 100644 --- a/toys/other/uptime.c +++ b/toys/other/uptime.c @@ -16,7 +16,7 @@ config UPTIME Tell the current time, how long the system has been running, the number of users, and the system load averages for the past 1, 5 and 15 minutes. - -p Pretty (human-readable) uptime + -p Pretty (human readable) uptime -s Since when has the system been up? */ diff --git a/toys/other/watch.c b/toys/other/watch.c index ab51148c..0a21cccc 100644 --- a/toys/other/watch.c +++ b/toys/other/watch.c @@ -16,10 +16,10 @@ config WATCH Run PROG every -n seconds, showing output. Hit q to quit. - -n Loop period in seconds (default 2) - -t Don't print header - -e Exit on error - -b Beep on command error + -n Loop period in seconds (default 2) + -t Don't print header + -e Exit on error + -b Beep on command error -x Exec command directly (vs "sh -c") */ diff --git a/toys/pending/stty.c b/toys/pending/stty.c index 8c4754af..df12526b 100644 --- a/toys/pending/stty.c +++ b/toys/pending/stty.c @@ -15,8 +15,8 @@ config STTY Get/set terminal configuration. -F Open device instead of stdin - -a Show all current settings (default differences from "sane"). - -g Show all current settings usable as input to stty. + -a Show all current settings (default differences from "sane") + -g Show all current settings usable as input to stty Special characters (syntax ^c or undef): intr quit erase kill eof eol eol2 swtch start stop susp rprnt werase lnext discard diff --git a/toys/posix/basename.c b/toys/posix/basename.c index 11b96227..7e16afe6 100644 --- a/toys/posix/basename.c +++ b/toys/posix/basename.c @@ -15,8 +15,8 @@ config BASENAME Return non-directory portion of a pathname removing suffix. - -a All arguments are names. - -s SUFFIX Remove suffix (implies -a). + -a All arguments are names + -s SUFFIX Remove suffix (implies -a) */ #define FOR_basename diff --git a/toys/posix/chgrp.c b/toys/posix/chgrp.c index e6ea9a45..85a4102c 100644 --- a/toys/posix/chgrp.c +++ b/toys/posix/chgrp.c @@ -16,13 +16,13 @@ config CHGRP Change group of one or more files. - -f suppress most error messages. - -h change symlinks instead of what they point to - -R recurse into subdirectories (implies -h) - -H with -R change target of symlink, follow command line symlinks - -L with -R change target of symlink, follow all symlinks - -P with -R change symlink, do not follow symlinks (default) - -v verbose output + -f Suppress most error messages + -h Change symlinks instead of what they point to + -R Recurse into subdirectories (implies -h) + -H With -R change target of symlink, follow command line symlinks + -L With -R change target of symlink, follow all symlinks + -P With -R change symlink, do not follow symlinks (default) + -v Verbose config CHOWN bool "chown" diff --git a/toys/posix/cmp.c b/toys/posix/cmp.c index 1a8f6900..6cd410fc 100644 --- a/toys/posix/cmp.c +++ b/toys/posix/cmp.c @@ -14,8 +14,8 @@ config CMP Compare the contents of two files. - -l show all differing bytes - -s silent + -l Show all differing bytes + -s Silent */ #define FOR_cmp diff --git a/toys/posix/comm.c b/toys/posix/comm.c index 3e93de4f..33c056d3 100644 --- a/toys/posix/comm.c +++ b/toys/posix/comm.c @@ -17,9 +17,9 @@ config COMM columns as output: lines only in FILE1; lines only in FILE2; and lines in both files. Filename "-" is a synonym for stdin. - -1 suppress the output column of lines unique to FILE1 - -2 suppress the output column of lines unique to FILE2 - -3 suppress the output column of lines duplicated in FILE1 and FILE2 + -1 Suppress the output column of lines unique to FILE1 + -2 Suppress the output column of lines unique to FILE2 + -3 Suppress the output column of lines duplicated in FILE1 and FILE2 */ #define FOR_comm diff --git a/toys/posix/cp.c b/toys/posix/cp.c index 97cccb2f..0b1d0e49 100644 --- a/toys/posix/cp.c +++ b/toys/posix/cp.c @@ -28,22 +28,22 @@ config CP Copy files from SOURCE to DEST. If more than one SOURCE, DEST must be a directory. - -D create leading dirs under DEST (--parents) - -f delete destination files we can't write to - -F delete any existing destination file first (--remove-destination) - -i interactive, prompt before overwriting existing DEST - -p preserve timestamps, ownership, and mode - -R recurse into subdirectories (DEST must be a directory) + -D Create leading dirs under DEST (--parents) + -f Delete destination files we can't write to + -F Delete any existing destination file first (--remove-destination) + -i Interactive, prompt before overwriting existing DEST + -p Preserve timestamps, ownership, and mode + -R Recurse into subdirectories (DEST must be a directory) -H Follow symlinks listed on command line -L Follow all symlinks -P Do not follow symlinks [default] - -a same as -dpr - -d don't dereference symlinks - -l hard link instead of copy - -n no clobber (don't overwrite DEST) - -r synonym for -R - -s symlink instead of copy - -v verbose + -a Same as -dpr + -d Don't dereference symlinks + -l Hard link instead of copy + -n No clobber (don't overwrite DEST) + -r Synonym for -R + -s Symlink instead of copy + -v Verbose config CP_PRESERVE bool "cp --preserve support" @@ -68,10 +68,10 @@ config MV help usage: mv [-fivn] SOURCE... DEST" - -f force copy by deleting destination file - -i interactive, prompt before overwriting existing DEST - -v verbose - -n no clobber (don't overwrite DEST) + -f Force copy by deleting destination file + -i Interactive, prompt before overwriting existing DEST + -v Verbose + -n No clobber (don't overwrite DEST) config INSTALL bool "install" diff --git a/toys/posix/cpio.c b/toys/posix/cpio.c index f9da69e1..80567fd6 100644 --- a/toys/posix/cpio.c +++ b/toys/posix/cpio.c @@ -27,14 +27,14 @@ config CPIO copy files into and out of a "newc" format cpio archive - -F FILE use archive FILE instead of stdin/stdout - -p DEST copy-pass mode, copy stdin file list to directory DEST - -i extract from archive into file system (stdin=archive) - -o create archive (stdin=list of files, stdout=archive) - -t test files (list only, stdin=archive, stdout=list of files) - -v verbose (list files during create/extract) + -F FILE Use archive FILE instead of stdin/stdout + -p DEST Copy-pass mode, copy stdin file list to directory DEST + -i Extract from archive into file system (stdin=archive) + -o Create archive (stdin=list of files, stdout=archive) + -t Test files (list only, stdin=archive, stdout=list of files) + -v Verbose --no-preserve-owner (don't set ownership during extract) - --trailer Add legacy trailer (prevents concatenation). + --trailer Add legacy trailer (prevents concatenation) */ #define FOR_cpio diff --git a/toys/posix/cut.c b/toys/posix/cut.c index 0b12ab14..9f7f7458 100644 --- a/toys/posix/cut.c +++ b/toys/posix/cut.c @@ -25,15 +25,15 @@ config CUT from start). By default selection ranges are sorted and collated, use -D to prevent that. - -b select bytes - -c select UTF-8 characters - -C select unicode columns - -d use DELIM (default is TAB for -f, run of whitespace for -F) + -b Select bytes + -c Select UTF-8 characters + -C Select unicode columns + -d Use DELIM (default is TAB for -f, run of whitespace for -F) -D Don't sort/collate selections or match -fF lines without delimiter - -f select fields (words) separated by single DELIM character - -F select fields separated by DELIM regex - -O output delimiter (default one space for -F, input delim for -f) - -s skip lines without delimiters + -f Select fields (words) separated by single DELIM character + -F Select fields separated by DELIM regex + -O Output delimiter (default one space for -F, input delim for -f) + -s Skip lines without delimiters */ #define FOR_cut #include "toys.h" diff --git a/toys/posix/df.c b/toys/posix/df.c index fa136275..a6beda18 100644 --- a/toys/posix/df.c +++ b/toys/posix/df.c @@ -19,8 +19,8 @@ config DF -a Show all (including /proc and friends) -P The SUSv3 "Pedantic" option -k Sets units back to 1024 bytes (the default without -P) - -h Human readable output (K=1024) - -H Human readable output (k=1000) + -h Human readable (K=1024) + -H Human readable (k=1000) -i Show inodes instead of blocks -t type Display only filesystems of this type diff --git a/toys/posix/du.c b/toys/posix/du.c index d2f57277..ecae7568 100644 --- a/toys/posix/du.c +++ b/toys/posix/du.c @@ -19,18 +19,18 @@ config DU Size in: -k 1024 byte blocks (default) -K 512 byte blocks (posix) - -m megabytes - -h human readable format (e.g., 1K 243M 2G ) + -m Megabytes + -h Human readable (K=1024) What to show: - -a all files, not just directories - -H follow symlinks on cmdline - -L follow all symlinks - -s only total size of each argument - -x don't leave this filesystem - -c cumulative total - -d N only depth < N - -l disable hardlink filter + -a All files, not just directories + -H Follow symlinks on cmdline + -L Follow all symlinks + -s Only total size of each argument + -x Don't leave this filesystem + -c Cumulative total + -d N Only depth < N + -l Disable hardlink filter */ #define FOR_du diff --git a/toys/posix/echo.c b/toys/posix/echo.c index f16b7910..639f87ab 100644 --- a/toys/posix/echo.c +++ b/toys/posix/echo.c @@ -22,17 +22,17 @@ config ECHO -n No trailing newline -e Process the following escape sequences: - \\ backslash - \0NNN octal values (1 to 3 digits) - \a alert (beep/flash) - \b backspace - \c stop output here (avoids trailing newline) - \f form feed - \n newline - \r carriage return - \t horizontal tab - \v vertical tab - \xHH hexadecimal values (1 to 2 digits) + \\ Backslash + \0NNN Octal values (1 to 3 digits) + \a Alert (beep/flash) + \b Backspace + \c Stop output here (avoids trailing newline) + \f Form feed + \n Newline + \r Carriage return + \t Horizontal tab + \v Vertical tab + \xHH Hexadecimal values (1 to 2 digits) */ #define FOR_echo diff --git a/toys/posix/file.c b/toys/posix/file.c index 7d7bc3eb..ad98621c 100644 --- a/toys/posix/file.c +++ b/toys/posix/file.c @@ -14,8 +14,8 @@ config FILE Examine the given files and describe their content types. - -h don't follow symlinks (default) - -L follow symlinks + -h Don't follow symlinks (default) + -L Follow symlinks */ #define FOR_file diff --git a/toys/posix/grep.c b/toys/posix/grep.c index 14cebf95..b2394c7b 100644 --- a/toys/posix/grep.c +++ b/toys/posix/grep.c @@ -29,7 +29,7 @@ config GREP -r Recurse into subdirectories (defaults FILE to ".") -M Match filename pattern (--include) -S Skip filename pattern (--exclude) - -I Ignore binary files + -I Ignore binary files match type: -A Show NUM lines after -B Show NUM lines before match diff --git a/toys/posix/iconv.c b/toys/posix/iconv.c index e3cf7bae..ce375b4a 100644 --- a/toys/posix/iconv.c +++ b/toys/posix/iconv.c @@ -18,8 +18,8 @@ config ICONV Convert character encoding of files. -c Omit invalid chars - -f convert from (default utf8) - -t convert to (default utf8) + -f Convert from (default utf8) + -t Convert to (default utf8) */ #define FOR_iconv diff --git a/toys/posix/id.c b/toys/posix/id.c index daa4b9e2..cf30ae74 100644 --- a/toys/posix/id.c +++ b/toys/posix/id.c @@ -19,7 +19,7 @@ config ID Print user and group ID. - -n print names instead of numeric IDs (to be used with -Ggu) + -n Print names instead of numeric IDs (to be used with -Ggu) -G Show only the group IDs -g Show only the effective group ID -r Show real ID instead of effective ID diff --git a/toys/posix/kill.c b/toys/posix/kill.c index 72ce9179..f8e86b67 100644 --- a/toys/posix/kill.c +++ b/toys/posix/kill.c @@ -36,7 +36,7 @@ config KILLALL5 -l List signal name(s) and number(s) -o PID Omit PID - -s send SIGNAL (default SIGTERM) + -s Send SIGNAL (default SIGTERM) */ // This has to match the filename: diff --git a/toys/posix/mkdir.c b/toys/posix/mkdir.c index 956925da..abb33db4 100644 --- a/toys/posix/mkdir.c +++ b/toys/posix/mkdir.c @@ -14,9 +14,9 @@ config MKDIR Create one or more directories. - -m set permissions of directory to mode - -p make parent directories as needed - -v verbose + -m Set permissions of directory to mode + -p Make parent directories as needed + -v Verbose config MKDIR_Z bool @@ -25,7 +25,7 @@ config MKDIR_Z help usage: [-Z context] - -Z set security context + -Z Set security context */ #define FOR_mkdir diff --git a/toys/posix/nl.c b/toys/posix/nl.c index 32848332..3dbfcfd1 100644 --- a/toys/posix/nl.c +++ b/toys/posix/nl.c @@ -18,9 +18,9 @@ config NL Number lines of input. -E Use extended regex syntax (when doing -b pREGEX) - -b which lines to number: a (all) t (non-empty, default) pREGEX (pattern) + -b Which lines to number: a (all) t (non-empty, default) pREGEX (pattern) -l Only count last of this many consecutive blank lines - -n number STYLE: ln (left justified) rn (right justified) rz (zero pad) + -n Number STYLE: ln (left justified) rn (right justified) rz (zero pad) -s Separator to use between number and line (instead of TAB) -w Width of line numbers (default 6) */ diff --git a/toys/posix/paste.c b/toys/posix/paste.c index ea04f02e..872a744f 100644 --- a/toys/posix/paste.c +++ b/toys/posix/paste.c @@ -16,8 +16,8 @@ config PASTE Merge corresponding lines from each input file. - -d list of delimiter characters to separate fields with (default is \t) - -s sequential mode: turn each input file into one line of output + -d List of delimiter characters to separate fields with (default is \t) + -s Sequential mode: turn each input file into one line of output */ #define FOR_paste diff --git a/toys/posix/patch.c b/toys/posix/patch.c index 1a3c7bbb..2dc9a728 100644 --- a/toys/posix/patch.c +++ b/toys/posix/patch.c @@ -28,11 +28,11 @@ config PATCH Apply a unified diff to one or more files. - -d modify files in DIR + -d Modify files in DIR -i Input file (defaults=stdin) -l Loose match (ignore whitespace) -p Number of '/' to strip from start of file paths (default=all) - -R Reverse patch. + -R Reverse patch -u Ignored (only handles "unified" diffs) --dry-run Don't change files, just confirm patch applies diff --git a/toys/posix/ps.c b/toys/posix/ps.c index 731998d9..76873861 100644 --- a/toys/posix/ps.c +++ b/toys/posix/ps.c @@ -63,13 +63,13 @@ config PS Which processes to show (-gGuUpPt selections may be comma separated lists): - -A all -a has terminal not session leader - -d All but session leaders -e synonym for -A - -g in GROUPs -G in real GROUPs (before sgid) + -A All -a Has terminal not session leader + -d All but session leaders -e Synonym for -A + -g In GROUPs -G In real GROUPs (before sgid) -p PIDs (--pid) -P Parent PIDs (--ppid) -s In session IDs -t Attached to selected TTYs -T Show threads also -u Owned by selected USERs - -U real USERs (before suid) + -U Real USERs (before suid) Output modifiers: @@ -169,7 +169,7 @@ config PKILL usage: pkill [-fnovx] [-SIGNAL|-l SIGNAL] [PATTERN] [-G GID,] [-g PGRP,] [-P PPID,] [-s SID,] [-t TERM,] [-U UID,] [-u EUID,] -l Send SIGNAL (default SIGTERM) - -V verbose + -V Verbose -f Check full command line for PATTERN -G Match real Group ID(s) -g Match Process Group(s) (0 is current user) diff --git a/toys/posix/pwd.c b/toys/posix/pwd.c index 32035924..08f39bf6 100644 --- a/toys/posix/pwd.c +++ b/toys/posix/pwd.c @@ -14,8 +14,8 @@ config PWD Print working (current) directory. - -L Use shell's path from $PWD (when applicable) - -P Print cannonical absolute path + -L Use shell's path from $PWD (when applicable) + -P Print cannonical absolute path */ #define FOR_pwd diff --git a/toys/posix/rm.c b/toys/posix/rm.c index 2f99c326..608e1ca1 100644 --- a/toys/posix/rm.c +++ b/toys/posix/rm.c @@ -14,9 +14,9 @@ config RM Remove each argument from the filesystem. - -f force: remove without confirmation, no error if it doesn't exist - -i interactive: prompt for confirmation - -rR recursive: remove directory contents + -f Force: remove without confirmation, no error if it doesn't exist + -i Interactive: prompt for confirmation + -rR Recursive: remove directory contents */ #define FOR_rm diff --git a/toys/posix/sed.c b/toys/posix/sed.c index ea4d0055..eadac885 100644 --- a/toys/posix/sed.c +++ b/toys/posix/sed.c @@ -22,8 +22,8 @@ config SED Stream editor. Apply one or more editing SCRIPTs to each line of input (from FILE or stdin) producing output (by default to stdout). - -e add SCRIPT to list - -f add contents of SCRIPT_FILE to list + -e Add SCRIPT to list + -f Add contents of SCRIPT_FILE to list -i Edit each file in place -n No default output (use the p command to output matched lines) -r Use extended regular expression syntax diff --git a/toys/posix/sort.c b/toys/posix/sort.c index d4a0f4fd..c33b8ff0 100644 --- a/toys/posix/sort.c +++ b/toys/posix/sort.c @@ -17,21 +17,21 @@ config SORT Sort all lines of text from input files (or stdin) to stdout. - -r reverse - -u unique lines only - -n numeric order (instead of alphabetical) - -b ignore leading blanks (or trailing blanks in second part of key) - -c check whether input is sorted - -d dictionary order (use alphanumeric and whitespace chars only) - -f force uppercase (case insensitive sort) - -i ignore nonprinting characters - -M month sort (jan, feb, etc) + -r Reverse + -u Unique lines only + -n Numeric order (instead of alphabetical) + -b Ignore leading blanks (or trailing blanks in second part of key) + -c Check whether input is sorted + -d Dictionary order (use alphanumeric and whitespace chars only) + -f Force uppercase (case insensitive sort) + -i Ignore nonprinting characters + -M Month sort (jan, feb, etc) -x Hexadecimal numerical sort - -s skip fallback sort (only sort with keys) - -z zero (null) terminated lines - -k sort by "key" (see below) - -t use a key separator other than whitespace - -o output to FILE instead of stdout + -s Skip fallback sort (only sort with keys) + -z Zero (null) terminated lines + -k Sort by "key" (see below) + -t Use a key separator other than whitespace + -o Output to FILE instead of stdout Sorting by key looks at a subset of the words on each line. -k2 uses the second word to the end of the line, -k2,2 looks at only @@ -47,7 +47,7 @@ config SORT_FLOAT help usage: sort [-g] - -g general numeric sort (double precision with nan and inf) + -g General numeric sort (double precision with nan and inf) */ #define FOR_sort diff --git a/toys/posix/tail.c b/toys/posix/tail.c index bf997864..d01329c4 100644 --- a/toys/posix/tail.c +++ b/toys/posix/tail.c @@ -17,9 +17,9 @@ config TAIL Copy last lines from files to stdout. If no files listed, copy from stdin. Filename "-" is a synonym for stdin. - -n output the last NUMBER lines (default 10), +X counts from start - -c output the last NUMBER bytes, +NUMBER counts from start - -f follow FILE(s), waiting for more data to be appended + -n Output the last NUMBER lines (default 10), +X counts from start + -c Output the last NUMBER bytes, +NUMBER counts from start + -f Follow FILE(s), waiting for more data to be appended config TAIL_SEEK bool "tail seek support" diff --git a/toys/posix/tee.c b/toys/posix/tee.c index 5936b7b3..90098ce7 100644 --- a/toys/posix/tee.c +++ b/toys/posix/tee.c @@ -15,8 +15,8 @@ config TEE Copy stdin to each listed file, and also to stdout. Filename "-" is a synonym for stdout. - -a append to files - -i ignore SIGINT + -a Append to files + -i Ignore SIGINT */ #define FOR_tee diff --git a/toys/posix/time.c b/toys/posix/time.c index 18664c10..0cf63dee 100644 --- a/toys/posix/time.c +++ b/toys/posix/time.c @@ -17,8 +17,8 @@ config TIME (real = clock on the wall, user = cpu used by command's code, system = cpu used by OS on behalf of command.) - -p posix mode (default) - -v verbose mode + -p POSIX format output (default) + -v Verbose */ #define FOR_time diff --git a/toys/posix/touch.c b/toys/posix/touch.c index 6a07ff33..17a0a3ed 100644 --- a/toys/posix/touch.c +++ b/toys/posix/touch.c @@ -17,13 +17,13 @@ config TOUCH Update the access and modification times of each FILE to the current time. - -a change access time - -m change modification time - -c don't create file - -h change symlink - -d set time to DATE (in YYYY-MM-DDThh:mm:SS[.frac][tz] format) - -t set time to TIME (in [[CC]YY]MMDDhhmm[.ss][frac] format) - -r set time same as reference FILE + -a Change access time + -m Change modification time + -c Don't create file + -h Change symlink + -d Set time to DATE (in YYYY-MM-DDThh:mm:SS[.frac][tz] format) + -t Set time to TIME (in [[CC]YY]MMDDhhmm[.ss][frac] format) + -r Set time same as reference FILE */ #define FOR_touch diff --git a/toys/posix/tty.c b/toys/posix/tty.c index 1694d846..9a833d5e 100644 --- a/toys/posix/tty.c +++ b/toys/posix/tty.c @@ -17,7 +17,7 @@ config TTY Prints "not a tty" and exits with nonzero status if no terminal is connected to stdin. - -s silent, exit code only + -s Silent, exit code only */ #include "toys.h" diff --git a/toys/posix/uniq.c b/toys/posix/uniq.c index 78c82544..6c89c630 100644 --- a/toys/posix/uniq.c +++ b/toys/posix/uniq.c @@ -14,14 +14,14 @@ config UNIQ Report or filter out repeated lines in a file - -c show counts before each line - -d show only lines that are repeated - -u show only lines that are unique - -i ignore case when comparing lines - -z lines end with \0 not \n - -w compare maximum X chars per line - -f ignore first X fields - -s ignore first X chars + -c Show counts before each line + -d Show only lines that are repeated + -u Show only lines that are unique + -i Ignore case when comparing lines + -z Lines end with \0 not \n + -w Compare maximum X chars per line + -f Ignore first X fields + -s Ignore first X chars */ #define FOR_uniq diff --git a/toys/posix/uudecode.c b/toys/posix/uudecode.c index 4d2861af..220e43aa 100644 --- a/toys/posix/uudecode.c +++ b/toys/posix/uudecode.c @@ -14,7 +14,7 @@ config UUDECODE Decode file from stdin (or INFILE). - -o write to OUTFILE instead of filename in header + -o Write to OUTFILE instead of filename in header */ #define FOR_uudecode diff --git a/toys/posix/uuencode.c b/toys/posix/uuencode.c index 06709d5e..f0e5be12 100644 --- a/toys/posix/uuencode.c +++ b/toys/posix/uuencode.c @@ -14,7 +14,7 @@ config UUENCODE Uuencode stdin (or file) to stdout, with encode-filename in the output. - -m base64-encode + -m Base64 */ #define FOR_uuencode diff --git a/toys/posix/wc.c b/toys/posix/wc.c index b875c1fd..5d362e7d 100644 --- a/toys/posix/wc.c +++ b/toys/posix/wc.c @@ -14,10 +14,10 @@ config WC Count lines, words, and characters in input. - -l show lines - -w show words - -c show bytes - -m show characters + -l Show lines + -w Show words + -c Show bytes + -m Show characters By default outputs lines, words, bytes, and filename for each argument (or from stdin if none). Displays only either bytes |