diff options
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/free.c | 8 | ||||
| -rw-r--r-- | procps/kill.c | 18 | ||||
| -rw-r--r-- | procps/ps.c | 12 |
3 files changed, 30 insertions, 8 deletions
diff --git a/procps/free.c b/procps/free.c index 39594dbe5..e6f130ea9 100644 --- a/procps/free.c +++ b/procps/free.c @@ -37,6 +37,14 @@ extern int free_main(int argc, char **argv) info.sharedram/=DIVISOR; info.bufferram/=DIVISOR; + if (argc > 1 && **(argv + 1) == '-') { + usage("free\n" +#ifndef BB_FEATURE_TRIVIAL_HELP + "\nDisplays the amount of free and used system memory\n" +#endif + ); + } + printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free", "shared", "buffers"); diff --git a/procps/kill.c b/procps/kill.c index 93f02eab4..0487f6a66 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -32,16 +32,22 @@ #include <unistd.h> static const char *kill_usage = - "kill [-signal] process-id [process-id ...]\n\n" - "Send a signal (default is SIGTERM) to the specified process(es).\n\n" - "Options:\n" "\t-l\tList all signal names and numbers.\n\n"; + "kill [-signal] process-id [process-id ...]\n" +#ifndef BB_FEATURE_TRIVIAL_HELP + "\nSend a signal (default is SIGTERM) to the specified process(es).\n\n" + "Options:\n" "\t-l\tList all signal names and numbers.\n\n" +#endif + ; #ifdef BB_KILLALL static const char *killall_usage = - "killall [-signal] process-name [process-name ...]\n\n" - "Send a signal (default is SIGTERM) to the specified process(es).\n\n" - "Options:\n" "\t-l\tList all signal names and numbers.\n\n"; + "killall [-signal] process-name [process-name ...]\n" +#ifndef BB_FEATURE_TRIVIAL_HELP + "\nSend a signal (default is SIGTERM) to the specified process(es).\n\n" + "Options:\n" "\t-l\tList all signal names and numbers.\n\n" +#endif #endif + ; #define KILL 0 #define KILLALL 1 diff --git a/procps/ps.c b/procps/ps.c index f8cf33b25..0842a22c2 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -36,6 +36,9 @@ #include <fcntl.h> #include <ctype.h> #include <sys/ioctl.h> +#define BB_DECLARE_EXTERN +#define bb_need_help +#include "messages.c" #if ! defined BB_FEATURE_USE_DEVPS_PATCH @@ -128,8 +131,13 @@ extern int ps_main(int argc, char **argv) - if (argc > 1 && strcmp(argv[1], "--help") == 0) { - usage ("ps\n\nReport process status\n\nThis version of ps accepts no options.\n"); + if (argc > 1 && strcmp(argv[1], dash_dash_help) == 0) { + usage ("ps\n" +#ifndef BB_FEATURE_TRIVIAL_HELP + "\nReport process status\n" + "\nThis version of ps accepts no options.\n" +#endif + ); } dir = opendir("/proc"); |