aboutsummaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2001-02-14 21:23:06 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2001-02-14 21:23:06 +0000
commit67991cf824f8df27e74c92d754fb507681c69ce6 (patch)
treea0b652f3dc794d1050c1a8de3afb014a621238fa /procps
parent68be2ab914e1e20fe666bbd22a89a18714be2789 (diff)
downloadbusybox-67991cf824f8df27e74c92d754fb507681c69ce6.tar.gz
busybox-67991cf824f8df27e74c92d754fb507681c69ce6.tar.bz2
This patch, put together by Manuel Novoa III, is a merge of work
done by Evin Robertson (bug#1105) and work from Manuel to make usage messages occupy less space and simplify how usage messages are displayed.
Diffstat (limited to 'procps')
-rw-r--r--procps/free.c2
-rw-r--r--procps/kill.c7
-rw-r--r--procps/ps.c2
-rw-r--r--procps/renice.c2
4 files changed, 5 insertions, 8 deletions
diff --git a/procps/free.c b/procps/free.c
index 17dd38687..d287c03f5 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -46,7 +46,7 @@ extern int free_main(int argc, char **argv)
info.bufferram/=info.mem_unit;
if (argc > 1 && **(argv + 1) == '-')
- usage(free_usage);
+ show_usage();
printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free",
"shared", "buffers");
diff --git a/procps/kill.c b/procps/kill.c
index 00a4d5c40..bdd22b52d 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -124,22 +124,19 @@ const struct signal_name signames[] = {
extern int kill_main(int argc, char **argv)
{
int whichApp, sig = SIGTERM;
- const char *appUsage;
#ifdef BB_KILLALL
/* Figure out what we are trying to do here */
whichApp = (strcmp(applet_name, "killall") == 0)? KILLALL : KILL;
- appUsage = (whichApp == KILLALL)? killall_usage : kill_usage;
#else
whichApp = KILL;
- appUsage = kill_usage;
#endif
argc--;
argv++;
/* Parse any options */
if (argc < 1)
- usage(appUsage);
+ show_usage();
while (argc > 0 && **argv == '-') {
while (*++(*argv)) {
@@ -163,7 +160,7 @@ extern int kill_main(int argc, char **argv)
}
break;
case '-':
- usage(appUsage);
+ show_usage();
default:
{
if (isdigit(**argv)) {
diff --git a/procps/ps.c b/procps/ps.c
index eabdef407..dd154af9d 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -207,7 +207,7 @@ extern int ps_main(int argc, char **argv)
#endif
if (argc > 1 && **(argv + 1) == '-')
- usage(ps_usage);
+ show_usage();
/* open device */
fd = open(device, O_RDONLY);
diff --git a/procps/renice.c b/procps/renice.c
index 9d85ba0d0..9180ebf81 100644
--- a/procps/renice.c
+++ b/procps/renice.c
@@ -32,7 +32,7 @@ extern int renice_main(int argc, char **argv)
{
int prio, status = EXIT_SUCCESS;
- if (argc < 3) usage(renice_usage);
+ if (argc < 3) show_usage();
prio = atoi(*++argv);
if (prio > 20) prio = 20;