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.
diff --git a/procps/free.c b/procps/free.c
index 17dd386..d287c03 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -46,7 +46,7 @@
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 00a4d5c..bdd22b5 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -124,22 +124,19 @@
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 @@
}
break;
case '-':
- usage(appUsage);
+ show_usage();
default:
{
if (isdigit(**argv)) {
diff --git a/procps/ps.c b/procps/ps.c
index eabdef4..dd154af 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -207,7 +207,7 @@
#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 9d85ba0..9180ebf 100644
--- a/procps/renice.c
+++ b/procps/renice.c
@@ -32,7 +32,7 @@
{
int prio, status = EXIT_SUCCESS;
- if (argc < 3) usage(renice_usage);
+ if (argc < 3) show_usage();
prio = atoi(*++argv);
if (prio > 20) prio = 20;