X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=applets%2Fapplets.c;h=f3e56a9f39b6563cd1dd88386223109561c708fe;hb=ace02dc9cd3ca0c95db5b5ebe87b9d6cd6ca1733;hp=10b44a5fc7250a930869e685df13bf31e5daed4e;hpb=0f0c0b41ced8c30d382a0490719c79371260b9d1;p=oweals%2Fbusybox.git

diff --git a/applets/applets.c b/applets/applets.c
index 10b44a5fc..f3e56a9f3 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -35,10 +35,6 @@
 #undef PROTOTYPES
 #include "applets.h"
 
-#define bb_need_full_version
-#define BB_DECLARE_EXTERN
-#include "messages.c"
-
 struct BB_applet *applet_using;
 
 /* The -1 arises because of the {0,NULL,0,-1} entry above. */
@@ -49,13 +45,6 @@ extern void show_usage(void)
 	const char *format_string;
 	const char *usage_string = usage_messages;
 	int i;
-	/* From busybox.c */
-	extern int been_there_done_that;
-
-	if (strcmp(applet_using->name, "busybox")==0) {
-		been_there_done_that=1;
-		busybox_main(0, NULL);
-	}
 
 	for (i = applet_using - applets; i > 0; ) {
 		if (!*usage_string++) {
@@ -78,7 +67,7 @@ static int applet_name_compare(const void *x, const void *y)
 	return strcmp(name, applet->name);
 }
 
-extern size_t NUM_APPLETS;
+extern const size_t NUM_APPLETS;
 
 struct BB_applet *find_applet_by_name(const char *name)
 {
@@ -88,13 +77,32 @@ struct BB_applet *find_applet_by_name(const char *name)
 
 void run_applet_by_name(const char *name, int argc, char **argv)
 {
+	static int recurse_level = 0;
+	extern int been_there_done_that; /* From busybox.c */
+
+	recurse_level++;
 	/* Do a binary search to find the applet entry given the name. */
 	if ((applet_using = find_applet_by_name(name)) != NULL) {
 		applet_name = applet_using->name;
-		if (argv[1] && strcmp(argv[1], "--help") == 0)
-			show_usage();
+		if (argv[1] && strcmp(argv[1], "--help") == 0) {
+			if (strcmp(applet_using->name, "busybox")==0) {
+				if(argv[2])
+				  applet_using = find_applet_by_name(argv[2]);
+				 else
+				  applet_using = NULL;
+			}
+			if(applet_using)
+				show_usage();
+			been_there_done_that=1;
+			busybox_main(0, NULL);
+		}
 		exit((*(applet_using->main)) (argc, argv));
 	}
+	/* Just in case they have renamed busybox - Check argv[1] */
+	if (recurse_level == 1) {
+		run_applet_by_name("busybox", argc, argv);
+	}
+	recurse_level--;
 }