*: --help tweaks

function                                             old     new   delta
packed_usage                                       33589   33552     -37

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-06-14 20:47:20 +02:00
parent 643b308029
commit e2b9215868
21 changed files with 61 additions and 40 deletions

View File

@ -284,7 +284,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
//usage: "\n -c Write to stdout" //usage: "\n -c Write to stdout"
//usage: "\n -f Force" //usage: "\n -f Force"
//usage: "\n -k Keep input files" //usage: "\n -k Keep input files"
//usage: "\n -t Test file integrity" //usage: "\n -t Test integrity"
//usage: //usage:
//usage:#define gunzip_example_usage //usage:#define gunzip_example_usage
//usage: "$ ls -la /tmp/BusyBox*\n" //usage: "$ ls -la /tmp/BusyBox*\n"
@ -407,6 +407,8 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
//usage: "\n -c Write to stdout" //usage: "\n -c Write to stdout"
//usage: "\n -f Force" //usage: "\n -f Force"
//usage: "\n -k Keep input files" //usage: "\n -k Keep input files"
//usage: "\n -t Test integrity"
//usage:
//usage:#define bzcat_trivial_usage //usage:#define bzcat_trivial_usage
//usage: "[FILE]..." //usage: "[FILE]..."
//usage:#define bzcat_full_usage "\n\n" //usage:#define bzcat_full_usage "\n\n"
@ -465,6 +467,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
//usage: "\n -c Write to stdout" //usage: "\n -c Write to stdout"
//usage: "\n -f Force" //usage: "\n -f Force"
//usage: "\n -k Keep input files" //usage: "\n -k Keep input files"
//usage: "\n -t Test integrity"
//usage: //usage:
//usage:#define lzma_trivial_usage //usage:#define lzma_trivial_usage
//usage: "-d [-cfk] [FILE]..." //usage: "-d [-cfk] [FILE]..."
@ -474,6 +477,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
//usage: "\n -c Write to stdout" //usage: "\n -c Write to stdout"
//usage: "\n -f Force" //usage: "\n -f Force"
//usage: "\n -k Keep input files" //usage: "\n -k Keep input files"
//usage: "\n -t Test integrity"
//usage: //usage:
//usage:#define lzcat_trivial_usage //usage:#define lzcat_trivial_usage
//usage: "[FILE]..." //usage: "[FILE]..."
@ -536,7 +540,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
//usage: "\n -c Write to stdout" //usage: "\n -c Write to stdout"
//usage: "\n -f Force" //usage: "\n -f Force"
//usage: "\n -k Keep input files" //usage: "\n -k Keep input files"
//usage: "\n -t Test file integrity" //usage: "\n -t Test integrity"
//usage: //usage:
//usage:#define xz_trivial_usage //usage:#define xz_trivial_usage
//usage: "-d [-cfk] [FILE]..." //usage: "-d [-cfk] [FILE]..."
@ -546,7 +550,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
//usage: "\n -c Write to stdout" //usage: "\n -c Write to stdout"
//usage: "\n -f Force" //usage: "\n -f Force"
//usage: "\n -k Keep input files" //usage: "\n -k Keep input files"
//usage: "\n -t Test file integrity" //usage: "\n -t Test integrity"
//usage: //usage:
//usage:#define xzcat_trivial_usage //usage:#define xzcat_trivial_usage
//usage: "[FILE]..." //usage: "[FILE]..."

View File

@ -56,11 +56,13 @@
//usage: "\n -1..9 Compression level" //usage: "\n -1..9 Compression level"
//usage: IF_FEATURE_BZIP2_DECOMPRESS( //usage: IF_FEATURE_BZIP2_DECOMPRESS(
//usage: "\n -d Decompress" //usage: "\n -d Decompress"
//usage: "\n -t Test file integrity"
//usage: ) //usage: )
//usage: "\n -c Write to stdout" //usage: "\n -c Write to stdout"
//usage: "\n -f Force" //usage: "\n -f Force"
//usage: "\n -k Keep input files" //usage: "\n -k Keep input files"
//usage: IF_FEATURE_BZIP2_DECOMPRESS(
//usage: "\n -t Test integrity"
//usage: )
#include "libbb.h" #include "libbb.h"
#include "bb_archive.h" #include "bb_archive.h"

View File

@ -77,11 +77,13 @@ aa: 85.1% -- replaced with aa.gz
//usage: ) //usage: )
//usage: IF_FEATURE_GZIP_DECOMPRESS( //usage: IF_FEATURE_GZIP_DECOMPRESS(
//usage: "\n -d Decompress" //usage: "\n -d Decompress"
//usage: "\n -t Test file integrity"
//usage: ) //usage: )
//usage: "\n -c Write to stdout" //usage: "\n -c Write to stdout"
//usage: "\n -f Force" //usage: "\n -f Force"
//usage: "\n -k Keep input files" //usage: "\n -k Keep input files"
//usage: IF_FEATURE_GZIP_DECOMPRESS(
//usage: "\n -t Test integrity"
//usage: )
//usage: //usage:
//usage:#define gzip_example_usage //usage:#define gzip_example_usage
//usage: "$ ls -la /tmp/busybox*\n" //usage: "$ ls -la /tmp/busybox*\n"

View File

@ -86,6 +86,7 @@
//usage: "\n -f Force" //usage: "\n -f Force"
//usage: "\n -U Delete input files" //usage: "\n -U Delete input files"
///////: "\n -k Keep input files" (default, so why bother documenting?) ///////: "\n -k Keep input files" (default, so why bother documenting?)
//usage: "\n -t Test integrity"
//usage: "\n -v Verbose" //usage: "\n -v Verbose"
//usage: "\n -F Don't verify checksum" //usage: "\n -F Don't verify checksum"

View File

@ -23,13 +23,17 @@
//usage:#define chgrp_trivial_usage //usage:#define chgrp_trivial_usage
//usage: "[-Rh"IF_DESKTOP("LHPcvf")"]... GROUP FILE..." //usage: "[-Rh"IF_DESKTOP("LHPcvf")"]... GROUP FILE..."
//usage:#define chgrp_full_usage "\n\n" //usage:#define chgrp_full_usage "\n\n"
//usage: "Change the group membership of FILEs to GROUP\n" //usage: "Change the group membership of FILEs to GROUP"
//usage: "\n -R Recurse" //usage: "\n"
//usage: "\n -h Affect symlinks instead of symlink targets" //usage: "\n -h Affect symlinks instead of symlink targets"
//usage: IF_DESKTOP( //usage: IF_DESKTOP(
//usage: "\n -L Traverse all symlinks to directories" //usage: "\n -L Traverse all symlinks to directories"
//usage: "\n -H Traverse symlinks on command line only" //usage: "\n -H Traverse symlinks on command line only"
//usage: "\n -P Don't traverse symlinks (default)" //usage: "\n -P Don't traverse symlinks (default)"
//usage: )
//next 4 options are the same for chmod/chown/chgrp:
//usage: "\n -R Recurse"
//usage: IF_DESKTOP(
//usage: "\n -c List changed files" //usage: "\n -c List changed files"
//usage: "\n -v Verbose" //usage: "\n -v Verbose"
//usage: "\n -f Hide errors" //usage: "\n -f Hide errors"

View File

@ -26,12 +26,13 @@
//usage:#define chmod_trivial_usage //usage:#define chmod_trivial_usage
//usage: "[-R"IF_DESKTOP("cvf")"] MODE[,MODE]... FILE..." //usage: "[-R"IF_DESKTOP("cvf")"] MODE[,MODE]... FILE..."
//usage:#define chmod_full_usage "\n\n" //usage:#define chmod_full_usage "\n\n"
//usage: "Each MODE is one or more of the letters ugoa, one of the\n" //usage: "MODE is octal number (bit pattern sstrwxrwxrwx) or [ugoa]{+|-|=}[rwxXst]"
//usage: "symbols +-= and one or more of the letters rwxst\n" //usage: "\n"
//next 4 options are the same for chmod/chown/chgrp:
//usage: "\n -R Recurse" //usage: "\n -R Recurse"
//usage: IF_DESKTOP( //usage: IF_DESKTOP(
//usage: "\n -c List changed files" //usage: "\n -c List changed files"
//usage: "\n -v List all files" //usage: "\n -v Verbose"
//usage: "\n -f Hide errors" //usage: "\n -f Hide errors"
//usage: ) //usage: )
//usage: //usage:

View File

@ -28,15 +28,19 @@
//usage:#define chown_trivial_usage //usage:#define chown_trivial_usage
//usage: "[-Rh"IF_DESKTOP("LHPcvf")"]... USER[:[GRP]] FILE..." //usage: "[-Rh"IF_DESKTOP("LHPcvf")"]... USER[:[GRP]] FILE..."
//usage:#define chown_full_usage "\n\n" //usage:#define chown_full_usage "\n\n"
//usage: "Change the owner and/or group of FILEs to USER and/or GRP\n" //usage: "Change the owner and/or group of FILEs to USER and/or GRP"
//usage: "\n -R Recurse" //usage: "\n"
//usage: "\n -h Affect symlinks instead of symlink targets" //usage: "\n -h Affect symlinks instead of symlink targets"
//usage: IF_DESKTOP( //usage: IF_DESKTOP(
//usage: "\n -L Traverse all symlinks to directories" //usage: "\n -L Traverse all symlinks to directories"
//usage: "\n -H Traverse symlinks on command line only" //usage: "\n -H Traverse symlinks on command line only"
//usage: "\n -P Don't traverse symlinks (default)" //usage: "\n -P Don't traverse symlinks (default)"
//usage: )
//next 4 options are the same for chmod/chown/chgrp:
//usage: "\n -R Recurse"
//usage: IF_DESKTOP(
//usage: "\n -c List changed files" //usage: "\n -c List changed files"
//usage: "\n -v List all files" //usage: "\n -v Verbose"
//usage: "\n -f Hide errors" //usage: "\n -f Hide errors"
//usage: ) //usage: )
//usage: //usage:

View File

@ -29,6 +29,7 @@
//usage: "\n -s Output only lines containing delimiter" //usage: "\n -s Output only lines containing delimiter"
//usage: "\n -f LIST Print only these fields" //usage: "\n -f LIST Print only these fields"
//usage: "\n -n Ignored" //usage: "\n -n Ignored"
//(manpage:-n with -b: don't split multibyte characters)
//usage: //usage:
//usage:#define cut_example_usage //usage:#define cut_example_usage
//usage: "$ echo \"Hello world\" | cut -f 1 -d ' '\n" //usage: "$ echo \"Hello world\" | cut -f 1 -d ' '\n"

View File

@ -43,10 +43,10 @@
//usage:#define echo_trivial_usage //usage:#define echo_trivial_usage
//usage: IF_FEATURE_FANCY_ECHO("[-neE] ") "[ARG]..." //usage: IF_FEATURE_FANCY_ECHO("[-neE] ") "[ARG]..."
//usage:#define echo_full_usage "\n\n" //usage:#define echo_full_usage "\n\n"
//usage: "Print the specified ARGs to stdout" //usage: "Print ARGs to stdout"
//usage: IF_FEATURE_FANCY_ECHO( "\n" //usage: IF_FEATURE_FANCY_ECHO( "\n"
//usage: "\n -n Suppress trailing newline" //usage: "\n -n No trailing newline"
//usage: "\n -e Interpret backslash escapes (i.e., \\t=tab)" //usage: "\n -e Interpret backslash escapes (\\t=tab etc)"
//usage: "\n -E Don't interpret backslash escapes (default)" //usage: "\n -E Don't interpret backslash escapes (default)"
//usage: ) //usage: )
//usage: //usage:

View File

@ -52,7 +52,7 @@
//usage:#define groups_trivial_usage //usage:#define groups_trivial_usage
//usage: "[USER]" //usage: "[USER]"
//usage:#define groups_full_usage "\n\n" //usage:#define groups_full_usage "\n\n"
//usage: "Print the group memberships of USER or for the current process" //usage: "Print the groups USER is in"
//usage: //usage:
//usage:#define groups_example_usage //usage:#define groups_example_usage
//usage: "$ groups\n" //usage: "$ groups\n"

View File

@ -24,22 +24,23 @@
//usage:#define chattr_full_usage "\n\n" //usage:#define chattr_full_usage "\n\n"
//usage: "Change ext2 file attributes\n" //usage: "Change ext2 file attributes\n"
//usage: "\n -R Recurse" //usage: "\n -R Recurse"
//usage: "\n -v VER Set version/generation number" //TODD? "\n -p NUM Set project number"
//usage: "\n -v NUM Set version/generation number"
//-V, -f accepted but ignored //-V, -f accepted but ignored
//usage: "\nModifiers:" //usage: "\nModifiers:"
//usage: "\n -,+,= Remove/add/set attributes" //usage: "\n -,+,= Remove/add/set attributes"
//usage: "\nAttributes:" //usage: "\nAttributes:"
//usage: "\n A Don't track atime" //usage: "\n A No atime"
//usage: "\n a Append mode only" //usage: "\n a Append only"
//usage: "\n c Enable compress" //usage: "\n c Compressed"
//usage: "\n D Write dir contents synchronously" //usage: "\n D Synchronous dir updates"
//usage: "\n d Don't backup with dump" //usage: "\n d Don't backup with dump"
//usage: "\n i Cannot be modified (immutable)" //usage: "\n i Immutable"
//usage: "\n j Write all data to journal first" //usage: "\n j Write data to journal first"
//usage: "\n s Zero disk storage when deleted" //usage: "\n s Zero storage when deleted"
//usage: "\n S Write synchronously" //usage: "\n S Synchronous file updates"
//usage: "\n t Disable tail-merging of partial blocks with other files" //usage: "\n t Don't tail-merge with other files"
//usage: "\n u Allow file to be undeleted" //usage: "\n u Allow undelete"
#include "libbb.h" #include "libbb.h"
#include "e2fs_lib.h" #include "e2fs_lib.h"

View File

@ -18,7 +18,7 @@
//kbuild:lib-$(CONFIG_CMP) += cmp.o //kbuild:lib-$(CONFIG_CMP) += cmp.o
//usage:#define cmp_trivial_usage //usage:#define cmp_trivial_usage
//usage: "[-l] [-s] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]" //usage: "[-ls] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
//usage:#define cmp_full_usage "\n\n" //usage:#define cmp_full_usage "\n\n"
//usage: "Compare FILE1 with FILE2 (or stdin)\n" //usage: "Compare FILE1 with FILE2 (or stdin)\n"
//usage: "\n -l Write the byte numbers (decimal) and values (octal)" //usage: "\n -l Write the byte numbers (decimal) and values (octal)"

View File

@ -63,8 +63,8 @@
//usage: "[-HhnlLoqvsrRiwFE" //usage: "[-HhnlLoqvsrRiwFE"
//usage: IF_EXTRA_COMPAT("z") //usage: IF_EXTRA_COMPAT("z")
//usage: "] [-m N] " //usage: "] [-m N] "
//usage: IF_FEATURE_GREP_CONTEXT("[-A/B/C N] ") //usage: IF_FEATURE_GREP_CONTEXT("[-A|B|C N] ")
//usage: "PATTERN/-e PATTERN.../-f FILE [FILE]..." //usage: "PATTERN | -e PATTERN... | -f FILE [FILE]..."
//usage:#define grep_full_usage "\n\n" //usage:#define grep_full_usage "\n\n"
//usage: "Search for PATTERN in FILEs (or stdin)\n" //usage: "Search for PATTERN in FILEs (or stdin)\n"
//usage: "\n -H Add 'filename:' prefix" //usage: "\n -H Add 'filename:' prefix"

View File

@ -19,9 +19,9 @@
//kbuild:lib-$(CONFIG_FLASHCP) += flashcp.o //kbuild:lib-$(CONFIG_FLASHCP) += flashcp.o
//usage:#define flashcp_trivial_usage //usage:#define flashcp_trivial_usage
//usage: "-v FILE MTD_DEVICE" //usage: "[-v] FILE MTD_DEVICE"
//usage:#define flashcp_full_usage "\n\n" //usage:#define flashcp_full_usage "\n\n"
//usage: "Copy an image to MTD device\n" //usage: "Copy FILE to MTD device\n"
//usage: "\n -v Verbose" //usage: "\n -v Verbose"
#include "libbb.h" #include "libbb.h"

View File

@ -19,7 +19,7 @@
//kbuild:lib-$(CONFIG_FREE) += free.o //kbuild:lib-$(CONFIG_FREE) += free.o
//usage:#define free_trivial_usage //usage:#define free_trivial_usage
//usage: "" IF_DESKTOP("[-b/k/m/g]") //usage: "" IF_DESKTOP("[-bkmg]")
//usage:#define free_full_usage "\n\n" //usage:#define free_full_usage "\n\n"
//usage: "Display the amount of free and used system memory" //usage: "Display the amount of free and used system memory"
//usage: //usage:

View File

@ -59,7 +59,7 @@
//usage: "$ kill 252\n" //usage: "$ kill 252\n"
//usage: //usage:
//usage:#define killall_trivial_usage //usage:#define killall_trivial_usage
//usage: "[-l] [-q] [-SIG] PROCESS_NAME..." //usage: "[-lq] [-SIG] PROCESS_NAME..."
//usage:#define killall_full_usage "\n\n" //usage:#define killall_full_usage "\n\n"
//usage: "Send a signal (default: TERM) to given processes\n" //usage: "Send a signal (default: TERM) to given processes\n"
//usage: "\n -l List all signal names and numbers" //usage: "\n -l List all signal names and numbers"

View File

@ -14398,7 +14398,7 @@ init(void)
//usage:#define ash_trivial_usage //usage:#define ash_trivial_usage
//usage: "[-il] [-/+Cabefmnuvx] [-/+o OPT]... [-c 'SCRIPT' [ARG0 [ARGS]] / FILE [ARGS] / -s [ARGS]]" //usage: "[-il] [-|+Cabefmnuvx] [-|+o OPT]... [-c 'SCRIPT' [ARG0 [ARGS]] | FILE [ARGS] | -s [ARGS]]"
//////// comes from ^^^^^^^^^^optletters //////// comes from ^^^^^^^^^^optletters
//usage:#define ash_full_usage "\n\n" //usage:#define ash_full_usage "\n\n"
//usage: "Unix shell interpreter" //usage: "Unix shell interpreter"

View File

@ -339,7 +339,7 @@
* therefore we don't show them either. * therefore we don't show them either.
*/ */
//usage:#define hush_trivial_usage //usage:#define hush_trivial_usage
//usage: "[-enxl] [-c 'SCRIPT' [ARG0 [ARGS]] / FILE [ARGS] / -s [ARGS]]" //usage: "[-enxl] [-c 'SCRIPT' [ARG0 [ARGS]] | FILE [ARGS] | -s [ARGS]]"
//usage:#define hush_full_usage "\n\n" //usage:#define hush_full_usage "\n\n"
//usage: "Unix shell interpreter" //usage: "Unix shell interpreter"

View File

@ -26,7 +26,7 @@
//usage: "Write MESSAGE (or stdin) to syslog\n" //usage: "Write MESSAGE (or stdin) to syslog\n"
//usage: "\n -s Log to stderr as well as the system log" //usage: "\n -s Log to stderr as well as the system log"
//usage: "\n -t TAG Log using the specified tag (defaults to user name)" //usage: "\n -t TAG Log using the specified tag (defaults to user name)"
//usage: "\n -p PRIO Priority (numeric or facility.level pair)" //usage: "\n -p PRIO Priority (number or FACILITY.LEVEL pair)"
//usage: //usage:
//usage:#define logger_example_usage //usage:#define logger_example_usage
//usage: "$ logger \"hello\"\n" //usage: "$ logger \"hello\"\n"

View File

@ -46,7 +46,7 @@
//kbuild:lib-$(CONFIG_DMESG) += dmesg.o //kbuild:lib-$(CONFIG_DMESG) += dmesg.o
//usage:#define dmesg_trivial_usage //usage:#define dmesg_trivial_usage
//usage: "[-c] [-n LEVEL] [-s SIZE]" //usage: "[-cr] [-n LEVEL] [-s SIZE]"
//usage:#define dmesg_full_usage "\n\n" //usage:#define dmesg_full_usage "\n\n"
//usage: "Print or control the kernel ring buffer\n" //usage: "Print or control the kernel ring buffer\n"
//usage: "\n -c Clear ring buffer after printing" //usage: "\n -c Clear ring buffer after printing"

View File

@ -18,7 +18,8 @@
//kbuild:lib-$(CONFIG_IONICE) += ionice.o //kbuild:lib-$(CONFIG_IONICE) += ionice.o
//usage:#define ionice_trivial_usage //usage:#define ionice_trivial_usage
//usage: "[-c 1-3] [-n 0-7] [-p PID] [PROG ARGS]" //usage: "[-c 1-3] [-n 0-7] { -p PID | PROG ARGS }"
//TODO: | -P PGID | -u UID; also -pPu can take _list of_ IDs
//usage:#define ionice_full_usage "\n\n" //usage:#define ionice_full_usage "\n\n"
//usage: "Change I/O priority and class\n" //usage: "Change I/O priority and class\n"
//usage: "\n -c N Class. 1:realtime 2:best-effort 3:idle" //usage: "\n -c N Class. 1:realtime 2:best-effort 3:idle"