Add usage messages for applets without them.

diff --git a/applets/usage.c b/applets/usage.c
index d5a34ec287873a47d2253facfc7cbc9a1a5e9bb2..56ea80d0886c7a2035197b25326f5c386b8754b1 100644 (file)
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -83,6 +83,15 @@ const char chvt_usage[] =
        ;
 #endif
 
+#if defined BB_CLEAR
+const char clear_usage[] =
+       "clear\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nClear screen.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_CP_MV
 const char cp_usage[] =
        "cp [OPTION]... SOURCE DEST\n"
@@ -241,6 +250,15 @@ const char echo_usage[] =
        ;
 #endif
 
+#if defined BB_TRUE_FALSE
+const char false_usage[] =
+       "false\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nReturn an exit code of FALSE (1).\n"
+#endif
+       ;
+#endif
+
 #if defined BB_FDFLUSH
 const char fdflush_usage[] =
        "fdflush DEVICE\n"
@@ -340,6 +358,14 @@ const char gzip_usage[] =
        ;
 #endif
 
+#if defined BB_HALT
+const char halt_usage[] =
+       "halt\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nHalt the system.\n"
+#endif
+       ;
+
 #if defined BB_HEAD
 const char head_usage[] =
        "head [OPTION] [FILE]...\n"
@@ -353,6 +379,15 @@ const char head_usage[] =
        ;
 #endif
 
+#if defined BB_HOSTID
+const char hostid_usage[] =
+       "hostid\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nPrint out a unique 32-bit identifier for the machine.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_HOSTNAME
 const char hostname_usage[] =
        "hostname [OPTION] {hostname | -F file}\n"
@@ -549,6 +584,15 @@ const char ls_usage[] =
        ;
 #endif
 
+#if defined BB_LSMOD
+const char lsmod_usage[] =
+       "lsmod\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nList the currently loaded kernel modules.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_MAKEDEVS
 const char makedevs_usage[] =
        "makedevs NAME TYPE MAJOR MINOR FIRST LAST [s]\n"
@@ -767,6 +811,15 @@ const char ping_usage[] =
 #endif
 #endif
 
+#if defined BB_POWEROFF
+const char poweroff_usage[] =
+       "poweroff\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nHalt the system and request that the kernel shut off the power.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_PRINTF
 const char printf_usage[] =
        "printf FORMAT [ARGUMENT...]\n"
@@ -787,6 +840,24 @@ const char ps_usage[] =
        ;
 #endif
 
+#if defined BB_PWD
+const char pwd_usage[] =
+       "pwd\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nPrint the full filename of the current working directory.\n"
+#endif
+       ;
+#endif
+
+#if defined BB_REBOOT
+const char reboot_usage[] =
+       "reboot\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nReboot the system.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_RM
 const char rm_usage[] =
        "rm [OPTION]... FILE...\n"
@@ -1055,6 +1126,15 @@ const char tr_usage[] =
        ;
 #endif
 
+#if defined BB_TRUE_FALSE
+const char true_usage[] =
+       "true\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nReturn an exit code of TRUE (0).\n"
+#endif
+       ;
+#endif
+
 #if defined BB_TTY
 const char tty_usage[] =
        "tty\n"
@@ -1129,6 +1209,15 @@ const char update_usage[] =
        ;
 #endif
 
+#if defined BB_UPTIME
+const char uptime_usage[] =
+       "uptime\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nDisplay the time since the last boot.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_USLEEP
 const char usleep_usage[] =
        "usleep N\n" 

diff --git a/clear.c b/clear.c
index dba10569190b554d2752a0528c9f3a1423ab48a3..b1641bd1cb466e87a6dc52e81fa49fc6d03a8b97 100644 (file)
--- a/clear.c
+++ b/clear.c
@@ -28,6 +28,9 @@
 
 extern int clear_main(int argc, char **argv)
 {
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(clear_usage);
+
        printf("\033[H\033[J");
        return(TRUE);
 }

diff --git a/console-tools/clear.c b/console-tools/clear.c
index dba10569190b554d2752a0528c9f3a1423ab48a3..b1641bd1cb466e87a6dc52e81fa49fc6d03a8b97 100644 (file)
--- a/console-tools/clear.c
+++ b/console-tools/clear.c
@@ -28,6 +28,9 @@
 
 extern int clear_main(int argc, char **argv)
 {
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(clear_usage);
+
        printf("\033[H\033[J");
        return(TRUE);
 }

diff --git a/coreutils/hostid.c b/coreutils/hostid.c
index f1010a65d524fa11301801018d22a7138478b3e6..3bf79de473fef8df7895754fc4d51147000fc9e5 100644 (file)
--- a/coreutils/hostid.c
+++ b/coreutils/hostid.c
@@ -25,6 +25,9 @@
 
 extern int hostid_main(int argc, char **argv)
 {
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(hostid_usage);
+
        printf("%lx\n", gethostid());
        return(TRUE);
 }

diff --git a/coreutils/pwd.c b/coreutils/pwd.c
index f0c923b7b3cc35b1f777928feb30bdeba20a8fdc..1a023d383377f98b15c84d5d4be24b5f860a0ae7 100644 (file)
--- a/coreutils/pwd.c
+++ b/coreutils/pwd.c
@@ -30,6 +30,9 @@ extern int pwd_main(int argc, char **argv)
 {
        char buf[BUFSIZ + 1];
 
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(pwd_usage);
+
        if (getcwd(buf, sizeof(buf)) == NULL)
                fatalError("%s\n", strerror(errno));
 

diff --git a/halt.c b/halt.c
index 2ca36d038eb1d653fe0e60a8548adece67e7ea1a..7baccf5d4ef885e8c4cac211de8030f5ff385e15 100644 (file)
--- a/halt.c
+++ b/halt.c
@@ -26,6 +26,9 @@
 
 extern int halt_main(int argc, char **argv)
 {
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(halt_usage);
+
 #ifdef BB_FEATURE_LINUXRC
        /* don't assume init's pid == 1 */
        return(kill(*(findPidByName("init")), SIGUSR1));

diff --git a/hostid.c b/hostid.c
index f1010a65d524fa11301801018d22a7138478b3e6..3bf79de473fef8df7895754fc4d51147000fc9e5 100644 (file)
--- a/hostid.c
+++ b/hostid.c
@@ -25,6 +25,9 @@
 
 extern int hostid_main(int argc, char **argv)
 {
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(hostid_usage);
+
        printf("%lx\n", gethostid());
        return(TRUE);
 }

diff --git a/init/halt.c b/init/halt.c
index 2ca36d038eb1d653fe0e60a8548adece67e7ea1a..7baccf5d4ef885e8c4cac211de8030f5ff385e15 100644 (file)
--- a/init/halt.c
+++ b/init/halt.c
@@ -26,6 +26,9 @@
 
 extern int halt_main(int argc, char **argv)
 {
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(halt_usage);
+
 #ifdef BB_FEATURE_LINUXRC
        /* don't assume init's pid == 1 */
        return(kill(*(findPidByName("init")), SIGUSR1));

diff --git a/init/poweroff.c b/init/poweroff.c
index 126a0fb9496e81fc08c8079127a7bc7a2714f0fb..b499d141fc179015af95a9cf91c2889d328ed4fc 100644 (file)
--- a/init/poweroff.c
+++ b/init/poweroff.c
@@ -26,6 +26,9 @@
 
 extern int poweroff_main(int argc, char **argv)
 {
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(poweroff_usage);
+
 #ifdef BB_FEATURE_LINUXRC
        /* don't assume init's pid == 1 */
        return(kill(*(findPidByName("init")), SIGUSR2));

diff --git a/init/reboot.c b/init/reboot.c
index bde8dbd7750d7dc1511f80c9f1ed141e94a81fce..bef9b26f04dc2b83f92bbbb6915c5f4e3843fbcc 100644 (file)
--- a/init/reboot.c
+++ b/init/reboot.c
@@ -26,6 +26,9 @@
 
 extern int reboot_main(int argc, char **argv)
 {
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(reboot_usage);
+
 #ifdef BB_FEATURE_LINUXRC
        /* don't assume init's pid == 1 */
        return(kill(*(findPidByName("init")), SIGINT));

diff --git a/lsmod.c b/lsmod.c
index 6eb9c56b8d09f1b58304c54c12559b59981d92e1..95006f020b47ec4b44600da2c6ca79e58cb4a2c5 100644 (file)
--- a/lsmod.c
+++ b/lsmod.c
@@ -36,5 +36,8 @@ extern int lsmod_main(int argc, char **argv)
        char *filename = "/proc/modules";
 #endif
 
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(lsmod_usage);
+
        return(print_file_by_name(filename));
 }

diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index 6eb9c56b8d09f1b58304c54c12559b59981d92e1..95006f020b47ec4b44600da2c6ca79e58cb4a2c5 100644 (file)
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -36,5 +36,8 @@ extern int lsmod_main(int argc, char **argv)
        char *filename = "/proc/modules";
 #endif
 
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(lsmod_usage);
+
        return(print_file_by_name(filename));
 }

diff --git a/poweroff.c b/poweroff.c
index 126a0fb9496e81fc08c8079127a7bc7a2714f0fb..b499d141fc179015af95a9cf91c2889d328ed4fc 100644 (file)
--- a/poweroff.c
+++ b/poweroff.c
@@ -26,6 +26,9 @@
 
 extern int poweroff_main(int argc, char **argv)
 {
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(poweroff_usage);
+
 #ifdef BB_FEATURE_LINUXRC
        /* don't assume init's pid == 1 */
        return(kill(*(findPidByName("init")), SIGUSR2));

diff --git a/procps/uptime.c b/procps/uptime.c
index efdbccf00e87f494f02c4d6a2d50b799af3e01d6..6a8bfa638264be56c9c4ed9127242fded8b24829 100644 (file)
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -46,6 +46,9 @@ extern int uptime_main(int argc, char **argv)
        struct tm *current_time;
        time_t current_secs;
 
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(uptime_usage);
+
        time(&current_secs);
        current_time = localtime(&current_secs);
 

diff --git a/pwd.c b/pwd.c
index f0c923b7b3cc35b1f777928feb30bdeba20a8fdc..1a023d383377f98b15c84d5d4be24b5f860a0ae7 100644 (file)
--- a/pwd.c
+++ b/pwd.c
@@ -30,6 +30,9 @@ extern int pwd_main(int argc, char **argv)
 {
        char buf[BUFSIZ + 1];
 
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(pwd_usage);
+
        if (getcwd(buf, sizeof(buf)) == NULL)
                fatalError("%s\n", strerror(errno));
 

diff --git a/reboot.c b/reboot.c
index bde8dbd7750d7dc1511f80c9f1ed141e94a81fce..bef9b26f04dc2b83f92bbbb6915c5f4e3843fbcc 100644 (file)
--- a/reboot.c
+++ b/reboot.c
@@ -26,6 +26,9 @@
 
 extern int reboot_main(int argc, char **argv)
 {
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(reboot_usage);
+
 #ifdef BB_FEATURE_LINUXRC
        /* don't assume init's pid == 1 */
        return(kill(*(findPidByName("init")), SIGINT));

diff --git a/true_false.c b/true_false.c
index c56f5e7afe95cfcf4e7d04b034e8471e0de65205..33703fff678053b26a83922ae2dfd638883c378f 100644 (file)
--- a/true_false.c
+++ b/true_false.c
@@ -27,10 +27,16 @@
 
 extern int true_main(int argc, char **argv)
 {
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(true_usage);
+
        return(TRUE);
 }
 
 extern int false_main(int argc, char **argv)
 {
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(false_usage);
+
        return(FALSE);
 }

diff --git a/uptime.c b/uptime.c
index efdbccf00e87f494f02c4d6a2d50b799af3e01d6..6a8bfa638264be56c9c4ed9127242fded8b24829 100644 (file)
--- a/uptime.c
+++ b/uptime.c
@@ -46,6 +46,9 @@ extern int uptime_main(int argc, char **argv)
        struct tm *current_time;
        time_t current_secs;
 
+       if (argc > 1 && strcmp(argv[1], "--help") == 0)
+               usage(uptime_usage);
+
        time(&current_secs);
        current_time = localtime(&current_secs);
 

diff --git a/usage.c b/usage.c
index d5a34ec287873a47d2253facfc7cbc9a1a5e9bb2..56ea80d0886c7a2035197b25326f5c386b8754b1 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -83,6 +83,15 @@ const char chvt_usage[] =
        ;
 #endif
 
+#if defined BB_CLEAR
+const char clear_usage[] =
+       "clear\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nClear screen.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_CP_MV
 const char cp_usage[] =
        "cp [OPTION]... SOURCE DEST\n"
@@ -241,6 +250,15 @@ const char echo_usage[] =
        ;
 #endif
 
+#if defined BB_TRUE_FALSE
+const char false_usage[] =
+       "false\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nReturn an exit code of FALSE (1).\n"
+#endif
+       ;
+#endif
+
 #if defined BB_FDFLUSH
 const char fdflush_usage[] =
        "fdflush DEVICE\n"
@@ -340,6 +358,14 @@ const char gzip_usage[] =
        ;
 #endif
 
+#if defined BB_HALT
+const char halt_usage[] =
+       "halt\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nHalt the system.\n"
+#endif
+       ;
+
 #if defined BB_HEAD
 const char head_usage[] =
        "head [OPTION] [FILE]...\n"
@@ -353,6 +379,15 @@ const char head_usage[] =
        ;
 #endif
 
+#if defined BB_HOSTID
+const char hostid_usage[] =
+       "hostid\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nPrint out a unique 32-bit identifier for the machine.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_HOSTNAME
 const char hostname_usage[] =
        "hostname [OPTION] {hostname | -F file}\n"
@@ -549,6 +584,15 @@ const char ls_usage[] =
        ;
 #endif
 
+#if defined BB_LSMOD
+const char lsmod_usage[] =
+       "lsmod\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nList the currently loaded kernel modules.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_MAKEDEVS
 const char makedevs_usage[] =
        "makedevs NAME TYPE MAJOR MINOR FIRST LAST [s]\n"
@@ -767,6 +811,15 @@ const char ping_usage[] =
 #endif
 #endif
 
+#if defined BB_POWEROFF
+const char poweroff_usage[] =
+       "poweroff\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nHalt the system and request that the kernel shut off the power.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_PRINTF
 const char printf_usage[] =
        "printf FORMAT [ARGUMENT...]\n"
@@ -787,6 +840,24 @@ const char ps_usage[] =
        ;
 #endif
 
+#if defined BB_PWD
+const char pwd_usage[] =
+       "pwd\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nPrint the full filename of the current working directory.\n"
+#endif
+       ;
+#endif
+
+#if defined BB_REBOOT
+const char reboot_usage[] =
+       "reboot\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nReboot the system.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_RM
 const char rm_usage[] =
        "rm [OPTION]... FILE...\n"
@@ -1055,6 +1126,15 @@ const char tr_usage[] =
        ;
 #endif
 
+#if defined BB_TRUE_FALSE
+const char true_usage[] =
+       "true\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nReturn an exit code of TRUE (0).\n"
+#endif
+       ;
+#endif
+
 #if defined BB_TTY
 const char tty_usage[] =
        "tty\n"
@@ -1129,6 +1209,15 @@ const char update_usage[] =
        ;
 #endif
 
+#if defined BB_UPTIME
+const char uptime_usage[] =
+       "uptime\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nDisplay the time since the last boot.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_USLEEP
 const char usleep_usage[] =
        "usleep N\n"