From 74f22a7d5cb6ed03f00c261fb4e28b411f1c4c0a Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 17 Oct 2018 16:21:37 -0700 Subject: Some more --help consistency. From eyeballing the output of for i in `./toybox | tr " " "\n"` ; do ./toybox $i --help ; done | \ grep '^-' | grep -v "\t" --- toys/net/microcom.c | 4 ++-- toys/net/netstat.c | 22 +++++++++++----------- toys/net/ping.c | 22 +++++++++++----------- toys/other/blockdev.c | 5 ++--- toys/other/hwclock.c | 14 +++++++------- toys/other/pmap.c | 4 ++-- toys/other/shred.c | 14 +++++++------- toys/pending/dd.c | 31 ++++++++++++++++--------------- toys/pending/userdel.c | 4 ++-- toys/posix/kill.c | 6 +++--- 10 files changed, 63 insertions(+), 63 deletions(-) diff --git a/toys/net/microcom.c b/toys/net/microcom.c index 62fe85e6..7311e9d7 100644 --- a/toys/net/microcom.c +++ b/toys/net/microcom.c @@ -12,8 +12,8 @@ config MICROCOM Simple serial console. - -s Set baud rate to SPEED - -X Ignore ^@ (send break) and ^] (exit). + -s Set baud rate to SPEED + -X Ignore ^@ (send break) and ^] (exit). */ #define FOR_microcom diff --git a/toys/net/netstat.c b/toys/net/netstat.c index 7d672488..7bebb327 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 - -t TCP sockets - -u UDP sockets - -w raw sockets - -x unix sockets - -e extended info - -n don't resolve names - -W wide display - -p PID/Program name of 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 */ #define FOR_netstat diff --git a/toys/net/ping.c b/toys/net/ping.c index b21abb7b..752879a2 100644 --- a/toys/net/ping.c +++ b/toys/net/ping.c @@ -27,17 +27,17 @@ config PING echo it receives back, with round trip time. Returns true if host alive. Options: - -4, -6 Force IPv4 or IPv6 - -c CNT Send CNT many packets (default 3, 0 = infinite) - -f Flood (print . and \b to show drops, default -c 15 -i 0.2) - -i TIME Interval between packets (default 1, need root for < .2) - -I IFACE/IP Source interface or address - -m MARK Tag outgoing packets using SO_MARK - -q Quiet (stops after one returns true if host is alive) - -s SIZE Data SIZE in bytes (default 56) - -t TTL Set Time To Live (number of hops) - -W SEC Seconds to wait for response after last -c packet (default 3) - -w SEC Exit after this many seconds + -4, -6 Force IPv4 or IPv6 + -c CNT Send CNT many packets (default 3, 0 = infinite) + -f Flood (print . and \b to show drops, default -c 15 -i 0.2) + -i TIME Interval between packets (default 1, need root for < .2) + -I IFACE/IP Source interface or address + -m MARK Tag outgoing packets using SO_MARK + -q Quiet (stops after one returns true if host is alive) + -s SIZE Data SIZE in bytes (default 56) + -t TTL Set Time To Live (number of hops) + -W SEC Seconds to wait for response after last -c packet (default 3) + -w SEC Exit after this many seconds */ #define FOR_ping diff --git a/toys/other/blockdev.c b/toys/other/blockdev.c index c2e10a22..75f71ad3 100644 --- a/toys/other/blockdev.c +++ b/toys/other/blockdev.c @@ -14,18 +14,17 @@ config BLOCKDEV Call ioctl(s) on each listed block device - OPTIONs: --setro Set read only --setrw Set read write --getro Get read only --getss Get sector size --getbsz Get block size - --setbsz BYTES Set block size + --setbsz BYTES Set block size --getsz Get device size in 512-byte sectors --getsize Get device size in sectors (deprecated) --getsize64 Get device size in bytes --getra Get readahead in 512-byte sectors - --setra Set readahead + --setra SECTORS Set readahead --flushbufs Flush buffers --rereadpt Reread partition table */ diff --git a/toys/other/hwclock.c b/toys/other/hwclock.c index 1d313e3b..81a29b77 100644 --- a/toys/other/hwclock.c +++ b/toys/other/hwclock.c @@ -12,13 +12,13 @@ config HWCLOCK help usage: hwclock [-rswtluf] - -f FILE Use specified device file instead of /dev/rtc (--rtc) - -l Hardware clock uses localtime (--localtime) - -r Show hardware clock time (--show) - -s Set system time from hardware clock (--hctosys) - -t Set the system time based on the current timezone (--systz) - -u Hardware clock uses UTC (--utc) - -w Set hardware clock from system time (--systohc) + -f FILE Use specified device file instead of /dev/rtc (--rtc) + -l Hardware clock uses localtime (--localtime) + -r Show hardware clock time (--show) + -s Set system time from hardware clock (--hctosys) + -t Set the system time based on the current timezone (--systz) + -u Hardware clock uses UTC (--utc) + -w Set hardware clock from system time (--systohc) */ #define FOR_hwclock diff --git a/toys/other/pmap.c b/toys/other/pmap.c index abb0a337..9b29bacd 100644 --- a/toys/other/pmap.c +++ b/toys/other/pmap.c @@ -15,8 +15,8 @@ config PMAP Reports the memory map of a process or processes. - -x Show the extended format - -q Do not display some header/footer lines + -x Show the extended format + -q Do not display some header/footer lines */ #define FOR_pmap diff --git a/toys/other/shred.c b/toys/other/shred.c index e10adc09..680320ec 100644 --- a/toys/other/shred.c +++ b/toys/other/shred.c @@ -14,13 +14,13 @@ config SHRED Securely delete a file by overwriting its contents with random data. - -f Force (chmod if necessary) - -n COUNT Random overwrite iterations (default 1) - -o OFFSET Start at OFFSET - -s SIZE Use SIZE instead of detecting file size - -u unlink (actually delete file when done) - -x Use exact size (default without -s rounds up to next 4k) - -z zero at end + -f Force (chmod if necessary) + -n COUNT Random overwrite iterations (default 1) + -o OFFSET Start at OFFSET + -s SIZE Use SIZE instead of detecting file size + -u Unlink (actually delete file when done) + -x Use exact size (default without -s rounds up to next 4k) + -z Zero at end Note: data journaling filesystems render this command useless, you must overwrite all free space (fill up disk) to erase old data on those. diff --git a/toys/pending/dd.c b/toys/pending/dd.c index aebc90e8..e37f8b28 100644 --- a/toys/pending/dd.c +++ b/toys/pending/dd.c @@ -16,21 +16,22 @@ config DD usage: dd [if=FILE] [of=FILE] [ibs=N] [obs=N] [bs=N] [count=N] [skip=N] [seek=N] [conv=notrunc|noerror|sync|fsync] [status=noxfer|none] - Options: - if=FILE Read from FILE instead of stdin - of=FILE Write to FILE instead of stdout - bs=N Read and write N bytes at a time - ibs=N Read N bytes at a time - obs=N Write N bytes at a time - count=N Copy only N input blocks - skip=N Skip N input blocks - seek=N Skip N output blocks - conv=notrunc Don't truncate output file - conv=noerror Continue after read errors - conv=sync Pad blocks with zeros - conv=fsync Physically write data out before finishing - status=noxfer Don't show transfer rate - status=none Don't show transfer rate or records in/out + Copy/convert files. + + if=FILE Read from FILE instead of stdin + of=FILE Write to FILE instead of stdout + bs=N Read and write N bytes at a time + ibs=N Read N bytes at a time + obs=N Write N bytes at a time + count=N Copy only N input blocks + skip=N Skip N input blocks + seek=N Skip N output blocks + conv=notrunc Don't truncate output file + conv=noerror Continue after read errors + conv=sync Pad blocks with zeros + conv=fsync Physically write data out before finishing + status=noxfer Don't show transfer rate + status=none Don't show transfer rate or records in/out Numbers may be suffixed by c (*1), w (*2), b (*512), kD (*1000), k (*1024), MD (*1000*1000), M (*1024*1024), GD (*1000*1000*1000) or G (*1024*1024*1024). diff --git a/toys/pending/userdel.c b/toys/pending/userdel.c index 9c93a219..8307c0f3 100644 --- a/toys/pending/userdel.c +++ b/toys/pending/userdel.c @@ -14,9 +14,9 @@ config USERDEL usage: userdel [-r] USER usage: deluser [-r] USER - Options: - -r remove home directory Delete USER from the SYSTEM + + -r remove home directory */ #define FOR_userdel diff --git a/toys/posix/kill.c b/toys/posix/kill.c index 3ea86e09..72ce9179 100644 --- a/toys/posix/kill.c +++ b/toys/posix/kill.c @@ -34,9 +34,9 @@ config KILLALL5 Send a signal to all processes outside current session. - -l List signal name(s) and number(s) - -o PID Omit PID - -s send SIGNAL (default SIGTERM) + -l List signal name(s) and number(s) + -o PID Omit PID + -s send SIGNAL (default SIGTERM) */ // This has to match the filename: -- cgit v1.2.3