Restore --help handling I mistakenly removed.
authorMatt Kraai <kraai@debian.org>
Wed, 25 Oct 2000 19:05:38 +0000 (19:05 -0000)
committerMatt Kraai <kraai@debian.org>
Wed, 25 Oct 2000 19:05:38 +0000 (19:05 -0000)
applets/busybox.c
busybox.c

index 985798e..d356e4c 100644 (file)
@@ -144,8 +144,11 @@ int main(int argc, char **argv)
        search_applet.name = applet_name;
        applet = bsearch(&search_applet, applets, NUM_APPLETS,
                        sizeof(struct BB_applet), applet_name_compare);
-       if (applet != NULL)
+       if (applet != NULL) {
+               if (applet->usage && argv[1] && strcmp(argv[1], "--help") == 0)
+                       usage(applet->usage); 
                exit((*(applet->main)) (argc, argv));
+       }
 
        return(busybox_main(argc, argv));
 }
index 985798e..d356e4c 100644 (file)
--- a/busybox.c
+++ b/busybox.c
@@ -144,8 +144,11 @@ int main(int argc, char **argv)
        search_applet.name = applet_name;
        applet = bsearch(&search_applet, applets, NUM_APPLETS,
                        sizeof(struct BB_applet), applet_name_compare);
-       if (applet != NULL)
+       if (applet != NULL) {
+               if (applet->usage && argv[1] && strcmp(argv[1], "--help") == 0)
+                       usage(applet->usage); 
                exit((*(applet->main)) (argc, argv));
+       }
 
        return(busybox_main(argc, argv));
 }