From 7719008a85c69db66e2f948d6779b6a45352018d Mon Sep 17 00:00:00 2001
From: Matt Kraai <kraai@debian.org>
Date: Tue, 11 Jul 2000 20:03:24 +0000
Subject: [PATCH] Added applet_name to contain the applet name.

---
 applets/busybox.c | 10 +++++-----
 busybox.c         | 10 +++++-----
 internal.h        |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/applets/busybox.c b/applets/busybox.c
index 5471db597..218343b4b 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -354,6 +354,7 @@ const struct BB_applet applets[] = {
 	{0}
 };
 
+const char *applet_name;
 
 #ifdef BB_FEATURE_INSTALLER
 /* 
@@ -436,7 +437,6 @@ int uninstall_links() ?
 int main(int argc, char **argv)
 {
 	char				*s;
-	char				*name;
 	const struct BB_applet	*a		= applets;
 
 #ifdef BB_FEATURE_INSTALLER	
@@ -469,12 +469,12 @@ int main(int argc, char **argv)
 	}
 #endif /* BB_FEATURE_INSTALLER */
 
-	for (s = name = argv[0]; *s != '\0';) {
+	for (s = applet_name = argv[0]; *s != '\0';) {
 		if (*s++ == '/')
-			name = s;
+			applet_name = s;
 	}
 
-	*argv = name;
+	*argv = applet_name;
 
 #ifdef BB_SH
 	/* Add in a special case hack -- whenever **argv == '-'
@@ -484,7 +484,7 @@ int main(int argc, char **argv)
 #endif
 
 	while (a->name != 0) {
-		if (strcmp(name, a->name) == 0) {
+		if (strcmp(applet_name, a->name) == 0) {
 			exit(((*(a->main)) (argc, argv)));
 		}
 		a++;
diff --git a/busybox.c b/busybox.c
index 5471db597..218343b4b 100644
--- a/busybox.c
+++ b/busybox.c
@@ -354,6 +354,7 @@ const struct BB_applet applets[] = {
 	{0}
 };
 
+const char *applet_name;
 
 #ifdef BB_FEATURE_INSTALLER
 /* 
@@ -436,7 +437,6 @@ int uninstall_links() ?
 int main(int argc, char **argv)
 {
 	char				*s;
-	char				*name;
 	const struct BB_applet	*a		= applets;
 
 #ifdef BB_FEATURE_INSTALLER	
@@ -469,12 +469,12 @@ int main(int argc, char **argv)
 	}
 #endif /* BB_FEATURE_INSTALLER */
 
-	for (s = name = argv[0]; *s != '\0';) {
+	for (s = applet_name = argv[0]; *s != '\0';) {
 		if (*s++ == '/')
-			name = s;
+			applet_name = s;
 	}
 
-	*argv = name;
+	*argv = applet_name;
 
 #ifdef BB_SH
 	/* Add in a special case hack -- whenever **argv == '-'
@@ -484,7 +484,7 @@ int main(int argc, char **argv)
 #endif
 
 	while (a->name != 0) {
-		if (strcmp(name, a->name) == 0) {
+		if (strcmp(applet_name, a->name) == 0) {
 			exit(((*(a->main)) (argc, argv)));
 		}
 		a++;
diff --git a/internal.h b/internal.h
index 081cd47fe..53c36c605 100644
--- a/internal.h
+++ b/internal.h
@@ -208,6 +208,7 @@ extern int which_main(int argc, char** argv);
 extern int whoami_main(int argc, char** argv);
 extern int yes_main(int argc, char** argv);
 
+extern const char *applet_name;
 
 extern void usage(const char *usage) __attribute__ ((noreturn));
 extern void errorMsg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));