diff options
| author | Matt Kraai <kraai@debian.org> | 2000-10-25 19:05:38 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2000-10-25 19:05:38 +0000 |
| commit | 2dab174daa01952147322197f7c1821217c5e7c5 (patch) | |
| tree | 73b29863171b53b0049a2fe8e8a87193a1cdfcd3 | |
| parent | a0428eee9e0e5422fae9572d9dbafe7a9f81f485 (diff) | |
| download | busybox-2dab174daa01952147322197f7c1821217c5e7c5.tar.gz | |
Restore --help handling I mistakenly removed.
| -rw-r--r-- | applets/busybox.c | 5 | ||||
| -rw-r--r-- | busybox.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/applets/busybox.c b/applets/busybox.c index 985798ed6..d356e4cae 100644 --- a/applets/busybox.c +++ b/applets/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)); } @@ -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)); } |