1849285a2
Denys Vlasenko
2021-06-13
Subject
*: more --help tweaks, mostly expanding ts --help
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/tar.c +1 -1coreutils/touch.c +1 -1coreutils/tty.c +1 -1coreutils/uname.c +2 -2coreutils/yes.c +1 -1miscutils/ts.c +4 -1procps/top.c +2 -2runit/svlogd.c +6 -6
archival/tar.c+1 -1
| @@ -775,7 +775,7 @@ static llist_t *append_file_list_to_list(llist_t *list) | |
| //usage: IF_FEATURE_TAR_NOPRESERVE_TIME("m") | |
| //usage: "vokO] " | |
| //usage: "[-f TARFILE] [-C DIR] " | |
| - | //usage: IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[OPTION]... ")) |
| + | //usage: IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[LONGOPT]... ")) |
| //usage: "[FILE]..." | |
| //usage:#define tar_full_usage "\n\n" | |
| //usage: IF_FEATURE_TAR_CREATE("Create, extract, ") | |
coreutils/touch.c+1 -1
| @@ -31,7 +31,7 @@ | |
| //kbuild:lib-$(CONFIG_TOUCH) += touch.o | |
| //usage:#define touch_trivial_usage | |
| - | //usage: "[-c" IF_FEATURE_TOUCH_SUSV3("am") "]" |
| + | //usage: "[-ch" IF_FEATURE_TOUCH_SUSV3("am") "]" |
| //usage: IF_FEATURE_TOUCH_SUSV3(" [-d DATE] [-t DATE] [-r FILE]") | |
| //usage: " FILE..." | |
| //usage:#define touch_full_usage "\n\n" | |
coreutils/tty.c+1 -1
| @@ -21,7 +21,7 @@ | |
| /* http://www.opengroup.org/onlinepubs/9699919799/utilities/tty.html */ | |
| //usage:#define tty_trivial_usage | |
| - | //usage: "" |
| + | //usage: "" IF_INCLUDE_SUSv2("[-s]") |
| //usage:#define tty_full_usage "\n\n" | |
| //usage: "Print file name of stdin's terminal" | |
| //usage: IF_INCLUDE_SUSv2( "\n" | |
coreutils/uname.c+2 -2
| @@ -79,13 +79,13 @@ | |
| //usage:#define uname_full_usage "\n\n" | |
| //usage: "Print system information\n" | |
| //usage: "\n -a Print all" | |
| - | //usage: "\n -m The machine (hardware) type" |
| + | //usage: "\n -m Machine (hardware) type" |
| //usage: "\n -n Hostname" | |
| //usage: "\n -r Kernel release" | |
| //usage: "\n -s Kernel name (default)" | |
| //usage: "\n -p Processor type" | |
| //usage: "\n -v Kernel version" | |
| - | //usage: "\n -i The hardware platform" |
| + | //usage: "\n -i Hardware platform" |
| //usage: "\n -o OS name" | |
| //usage: | |
| //usage:#define uname_example_usage | |
coreutils/yes.c+1 -1
| @@ -27,7 +27,7 @@ | |
| //usage:#define yes_trivial_usage | |
| //usage: "[STRING]" | |
| //usage:#define yes_full_usage "\n\n" | |
| - | //usage: "Repeatedly output a line with STRING, or 'y'" |
| + | //usage: "Repeatedly print a line with STRING, or 'y'" |
| #include "libbb.h" | |
miscutils/ts.c+4 -1
| @@ -13,7 +13,10 @@ | |
| //usage:#define ts_trivial_usage | |
| //usage: "[-is] [STRFTIME]" | |
| - | //usage:#define ts_full_usage "" |
| + | //usage:#define ts_full_usage "\n\n" |
| + | //usage: "Pipe stdin to stdout, add timestamp to each line\n" |
| + | //usage: "\n -s Time since start" |
| + | //usage: "\n -i Time since previous line" |
| #include "libbb.h" | |
| #include "common_bufsiz.h" | |
procps/top.c+2 -2
| @@ -1052,9 +1052,9 @@ static unsigned handle_input(unsigned scan_mask, duration_t interval) | |
| //usage: "[-b"IF_FEATURE_TOPMEM("m")IF_FEATURE_SHOW_THREADS("H")"]" | |
| //usage: " [-n COUNT] [-d SECONDS]" | |
| //usage:#define top_full_usage "\n\n" | |
| - | //usage: "Provide a view of process activity in real time." |
| + | //usage: "Show a view of process activity in real time." |
| //usage: "\n""Read the status of all processes from /proc each SECONDS" | |
| - | //usage: "\n""and display a screenful of them." |
| + | //usage: "\n""and show a screenful of them." |
| //usage: "\n" | |
| //usage: IF_FEATURE_TOP_INTERACTIVE( | |
| //usage: "Keys:" | |
runit/svlogd.c+6 -6
| @@ -140,12 +140,12 @@ log message, you can use a pattern like this instead | |
| //usage:#define svlogd_full_usage "\n\n" | |
| //usage: "Read log data from stdin and write to rotated log files in DIRs" | |
| //usage: "\n" | |
| - | //usage: "\n""-r C Replace non-printable characters with C" |
| - | //usage: "\n""-R CHARS Also replace CHARS with C (default _)" |
| - | //usage: "\n""-t Timestamp with @tai64n" |
| - | //usage: "\n""-tt Timestamp with yyyy-mm-dd_hh:mm:ss.sssss" |
| - | //usage: "\n""-ttt Timestamp with yyyy-mm-ddThh:mm:ss.sssss" |
| - | //usage: "\n""-v Verbose" |
| + | //usage: "\n"" -r C Replace non-printable characters with C" |
| + | //usage: "\n"" -R CHARS Also replace CHARS with C (default _)" |
| + | //usage: "\n"" -t Timestamp with @tai64n" |
| + | //usage: "\n"" -tt Timestamp with yyyy-mm-dd_hh:mm:ss.sssss" |
| + | //usage: "\n"" -ttt Timestamp with yyyy-mm-ddThh:mm:ss.sssss" |
| + | //usage: "\n"" -v Verbose" |
| //usage: "\n" | |
| //usage: "\n""DIR/config file modifies behavior:" | |
| //usage: "\n""sSIZE - when to rotate logs (default 1000000, 0 disables)" | |