aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/applets.h2
-rw-r--r--include/usage.h16
2 files changed, 11 insertions, 7 deletions
diff --git a/include/applets.h b/include/applets.h
index 36b24856a..ff8799c63 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -79,6 +79,8 @@ IF_ARPING(APPLET(arping, _BB_DIR_USR_BIN, _BB_SUID_DROP))
79IF_ASH(APPLET(ash, _BB_DIR_BIN, _BB_SUID_DROP)) 79IF_ASH(APPLET(ash, _BB_DIR_BIN, _BB_SUID_DROP))
80IF_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_DROP, awk)) 80IF_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_DROP, awk))
81IF_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_DROP, basename)) 81IF_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_DROP, basename))
82IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, _BB_DIR_BIN, _BB_SUID_DROP, bash))
83IF_FEATURE_BASH_IS_HUSH(APPLET_ODDNAME(bash, hush, _BB_DIR_BIN, _BB_SUID_DROP, bash))
82IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP)) 84IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP))
83//IF_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_DROP)) 85//IF_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_DROP))
84IF_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_DROP)) 86IF_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_DROP))
diff --git a/include/usage.h b/include/usage.h
index 3fce939bb..d53b86731 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -123,6 +123,8 @@
123#define lash_full_usage "" 123#define lash_full_usage ""
124#define msh_trivial_usage NOUSAGE_STR 124#define msh_trivial_usage NOUSAGE_STR
125#define msh_full_usage "" 125#define msh_full_usage ""
126#define bash_trivial_usage NOUSAGE_STR
127#define bash_full_usage ""
126 128
127#define awk_trivial_usage \ 129#define awk_trivial_usage \
128 "[OPTIONS] [AWK_PROGRAM] [FILE]..." 130 "[OPTIONS] [AWK_PROGRAM] [FILE]..."
@@ -1472,9 +1474,9 @@
1472 "\n -m Find processes which use same fs as FILEs" \ 1474 "\n -m Find processes which use same fs as FILEs" \
1473 "\n -4 Search only IPv4 space" \ 1475 "\n -4 Search only IPv4 space" \
1474 "\n -6 Search only IPv6 space" \ 1476 "\n -6 Search only IPv6 space" \
1475 "\n -s Silent: just exit with 0 if any processes are found" \ 1477 "\n -s Don't display PIDs" \
1476 "\n -k Kill found processes (otherwise display PIDs)" \ 1478 "\n -k Kill found processes" \
1477 "\n -SIGNAL Signal to send (default: TERM)" \ 1479 "\n -SIGNAL Signal to send (default: KILL)" \
1478 1480
1479#define getenforce_trivial_usage NOUSAGE_STR 1481#define getenforce_trivial_usage NOUSAGE_STR
1480#define getenforce_full_usage "" 1482#define getenforce_full_usage ""
@@ -3572,11 +3574,11 @@
3572#if ENABLE_DESKTOP 3574#if ENABLE_DESKTOP
3573 3575
3574#define ps_trivial_usage \ 3576#define ps_trivial_usage \
3575 "" 3577 "[-o COL1,COL2=HEADER]" IF_FEATURE_SHOW_THREADS(" [-T]")
3576#define ps_full_usage "\n\n" \ 3578#define ps_full_usage "\n\n" \
3577 "Report process status\n" \ 3579 "Show list of processes\n" \
3578 "\nOptions:" \ 3580 "\nOptions:" \
3579 "\n -o col1,col2=header Select columns for display" \ 3581 "\n -o COL1,COL2=HEADER Select columns for display" \
3580 IF_FEATURE_SHOW_THREADS( \ 3582 IF_FEATURE_SHOW_THREADS( \
3581 "\n -T Show threads" \ 3583 "\n -T Show threads" \
3582 ) 3584 )
@@ -3592,7 +3594,7 @@
3592#define ps_trivial_usage \ 3594#define ps_trivial_usage \
3593 "" 3595 ""
3594#define ps_full_usage "\n\n" \ 3596#define ps_full_usage "\n\n" \
3595 "Report process status\n" \ 3597 "Show list of processes\n" \
3596 USAGE_PS \ 3598 USAGE_PS \
3597 IF_SELINUX( \ 3599 IF_SELINUX( \
3598 "\n -Z Show selinux context" \ 3600 "\n -Z Show selinux context" \