[git commit] *: --help tweaks
Denys Vlasenko
vda.linux at googlemail.com
Sat Jun 12 23:08:48 UTC 2021
commit: https://git.busybox.net/busybox/commit/?id=6b6826f0b87b13c5e83786f045b90d703507464e
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
function old new delta
.rodata 103190 103189 -1
packed_usage 33590 33566 -24
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-25) Total: -25 bytes
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
archival/unzip.c | 2 +-
coreutils/env.c | 12 +++++++-----
coreutils/expr.c | 4 ++--
coreutils/uudecode.c | 4 ++--
docs/busybox_footer.pod | 1 +
editors/sed.c | 2 +-
editors/vi.c | 9 +++++++--
miscutils/microcom.c | 14 +++++++-------
networking/vconfig.c | 12 ++++++------
procps/watch.c | 2 +-
10 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/archival/unzip.c b/archival/unzip.c
index 66005a43e..fcdda6dfa 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -63,7 +63,7 @@
//usage: "\n -n Never overwrite files (default: ask)"
//usage: "\n -o Overwrite"
//usage: "\n -j Do not restore paths"
-//usage: "\n -p Print to stdout"
+//usage: "\n -p Write to stdout"
//usage: "\n -t Test"
//usage: "\n -q Quiet"
//usage: "\n -x FILE Exclude FILEs"
diff --git a/coreutils/env.c b/coreutils/env.c
index c37c0c2df..4715bf73a 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -39,12 +39,14 @@
/* http://www.opengroup.org/onlinepubs/007904975/utilities/env.html */
//usage:#define env_trivial_usage
-//usage: "[-iu] [-] [name=value]... [PROG ARGS]"
+//usage: "[-i] [-u NAME]... [-] [NAME=VALUE]... [PROG ARGS]"
+// The "-" can occur only once (unlike, say, -i): it terminates option processing,
+// so if it is followed by another "-" arg (or any option-looking arg),
+// that arg will be taken as PROG (or even as NAME=VALUE, example: "-z=QWE").
//usage:#define env_full_usage "\n\n"
-//usage: "Print the current environment or run PROG after setting up\n"
-//usage: "the specified environment\n"
-//usage: "\n -, -i Start with an empty environment"
-//usage: "\n -u Remove variable from the environment"
+//usage: "Print current environment or run PROG after setting up environment\n"
+//usage: "\n -, -i Start with empty environment"
+//usage: "\n -u NAME Remove variable from environment"
#include "libbb.h"
diff --git a/coreutils/expr.c b/coreutils/expr.c
index b247f08db..760b081f9 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -45,7 +45,7 @@
//usage:#define expr_trivial_usage
//usage: "EXPRESSION"
//usage:#define expr_full_usage "\n\n"
-//usage: "Print the value of EXPRESSION to stdout\n"
+//usage: "Print the value of EXPRESSION\n"
//usage: "\n"
//usage: "EXPRESSION may be:\n"
//usage: " ARG1 | ARG2 ARG1 if it is neither null nor 0, otherwise ARG2\n"
@@ -63,7 +63,7 @@
//usage: " ARG1 % ARG2\n"
//usage: " STRING : REGEXP Anchored pattern match of REGEXP in STRING\n"
//usage: " match STRING REGEXP Same as STRING : REGEXP\n"
-//usage: " substr STRING POS LENGTH Substring of STRING, POS counted from 1\n"
+//usage: " substr STRING POS LEN Substring of STRING, POS counts from 1\n"
//usage: " index STRING CHARS Index in STRING where any CHARS is found, or 0\n"
//usage: " length STRING Length of STRING\n"
//usage: " quote TOKEN Interpret TOKEN as a string, even if\n"
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 02b037276..bd7766ef7 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -183,7 +183,7 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
//usage:#define base32_trivial_usage
//usage: "[-d] [-w COL] [FILE]"
//usage:#define base32_full_usage "\n\n"
-//usage: "Base32 encode or decode FILE to standard output"
+//usage: "Base32 encode or decode FILE to standard output\n"
//usage: "\n -d Decode data"
//usage: "\n -w COL Wrap lines at COL (default 76, 0 disables)"
////usage: "\n -i When decoding, ignore non-alphabet characters"
@@ -191,7 +191,7 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
//usage:#define base64_trivial_usage
//usage: "[-d] [-w COL] [FILE]"
//usage:#define base64_full_usage "\n\n"
-//usage: "Base64 encode or decode FILE to standard output"
+//usage: "Base64 encode or decode FILE to standard output\n"
//usage: "\n -d Decode data"
//usage: "\n -w COL Wrap lines at COL (default 76, 0 disables)"
////usage: "\n -i When decoding, ignore non-alphabet characters"
diff --git a/docs/busybox_footer.pod b/docs/busybox_footer.pod
index 92748eb72..0f4810bd3 100644
--- a/docs/busybox_footer.pod
+++ b/docs/busybox_footer.pod
@@ -37,6 +37,7 @@ incorrect, please send in an update.
=for html <br>
Emanuele Aina <emanuele.aina at tiscali.it>
+
run-parts
=for html <br>
diff --git a/editors/sed.c b/editors/sed.c
index d3444003e..a6845a979 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -70,7 +70,7 @@
//usage:#define sed_full_usage "\n\n"
//usage: " -e CMD Add CMD to sed commands to be executed"
//usage: "\n -f FILE Add FILE contents to sed commands to be executed"
-//usage: "\n -i[SFX] Edit files in-place (otherwise sends to stdout)"
+//usage: "\n -i[SFX] Edit files in-place (otherwise write to stdout)"
//usage: "\n Optionally back files up, appending SFX"
//usage: "\n -n Suppress automatic printing of pattern space"
//usage: "\n -r,-E Use extended regex syntax"
diff --git a/editors/vi.c b/editors/vi.c
index d85cdd98d..beccef4b4 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -181,7 +181,7 @@
//kbuild:lib-$(CONFIG_VI) += vi.o
//usage:#define vi_trivial_usage
-//usage: IF_FEATURE_VI_COLON("[-c CMD] ")IF_FEATURE_VI_READONLY("[-R] ")"[FILE]..."
+//usage: IF_FEATURE_VI_COLON("[-c CMD] ")IF_FEATURE_VI_READONLY("[-R] ")"[-H] [FILE]..."
//usage:#define vi_full_usage "\n\n"
//usage: "Edit FILE\n"
//usage: IF_FEATURE_VI_COLON(
@@ -191,6 +191,7 @@
//usage: "\n -R Read-only"
//usage: )
//usage: "\n -H List available features"
+// note: non-standard, "vim -H" is Hebrew mode (bidi support)
#include "libbb.h"
// Should be after libbb.h: on some systems regex.h needs sys/types.h:
@@ -4748,7 +4749,11 @@ int vi_main(int argc, char **argv)
initial_cmds[0] = xstrndup(p, MAX_INPUT_LEN);
}
#endif
- while ((c = getopt(argc, argv, "hCRH" IF_FEATURE_VI_COLON("c:"))) != -1) {
+ while ((c = getopt(argc, argv,
+#if ENABLE_FEATURE_VI_CRASHME
+ "C"
+#endif
+ "RHh" IF_FEATURE_VI_COLON("c:"))) != -1) {
switch (c) {
#if ENABLE_FEATURE_VI_CRASHME
case 'C':
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index 399d4cf7f..97b46342f 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -18,14 +18,14 @@
//kbuild:lib-$(CONFIG_MICROCOM) += microcom.o
//usage:#define microcom_trivial_usage
-//usage: "[-d DELAY] [-t TIMEOUT] [-s SPEED] [-X] TTY"
+//usage: "[-d DELAY_MS] [-t TIMEOUT_MS ] [-s SPEED] [-X] TTY"
//usage:#define microcom_full_usage "\n\n"
-//usage: "Copy bytes for stdin to TTY and from TTY to stdout\n"
-//usage: "\n -d Wait up to DELAY ms for TTY output before sending every"
-//usage: "\n next byte to it"
-//usage: "\n -t Exit if both stdin and TTY are silent for TIMEOUT ms"
-//usage: "\n -s Set serial line to SPEED"
-//usage: "\n -X Disable special meaning of NUL and Ctrl-X from stdin"
+//usage: "Copy bytes from stdin to TTY and from TTY to stdout\n"
+//usage: "\n -d DELAY Wait up to DELAY ms for TTY output before sending"
+//usage: "\n every next byte to it"
+//usage: "\n -t TIMEOUT Exit if both stdin and TTY are silent for TIMEOUT ms"
+//usage: "\n -s SPEED Set serial line to SPEED"
+//usage: "\n -X Disable special meaning of NUL and Ctrl-X from stdin"
#include "libbb.h"
#include "common_bufsiz.h"
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 4f1fbe280..7e805be9c 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -20,12 +20,12 @@
//usage: "COMMAND [OPTIONS]"
//usage:#define vconfig_full_usage "\n\n"
//usage: "Create and remove virtual ethernet devices\n"
-//usage: "\n add IFACE VLAN_ID"
-//usage: "\n rem VLAN_NAME"
-//usage: "\n set_flag IFACE 0|1 VLAN_QOS"
-//usage: "\n set_egress_map VLAN_NAME SKB_PRIO VLAN_QOS"
-//usage: "\n set_ingress_map VLAN_NAME SKB_PRIO VLAN_QOS"
-//usage: "\n set_name_type NAME_TYPE"
+//usage: "\n add IFACE VLAN_ID"
+//usage: "\n rem VLAN_NAME"
+//usage: "\n set_flag IFACE 0|1 VLAN_QOS"
+//usage: "\n set_egress_map VLAN_NAME SKB_PRIO VLAN_QOS"
+//usage: "\n set_ingress_map VLAN_NAME SKB_PRIO VLAN_QOS"
+//usage: "\n set_name_type NAME_TYPE"
#include "libbb.h"
#include <net/if.h>
diff --git a/procps/watch.c b/procps/watch.c
index 059eb1dda..1190b29df 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -22,7 +22,7 @@
//usage: "[-n SEC] [-t] PROG ARGS"
//usage:#define watch_full_usage "\n\n"
//usage: "Run PROG periodically\n"
-//usage: "\n -n SEC Loop period (default 2)"
+//usage: "\n -n SEC Period (default 2)"
//usage: "\n -t Don't print header"
//usage:
//usage:#define watch_example_usage
More information about the busybox-cvs
mailing list