aboutsummaryrefslogtreecommitdiff
path: root/applets/busybox.c
diff options
context:
space:
mode:
Diffstat (limited to 'applets/busybox.c')
-rw-r--r--applets/busybox.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/applets/busybox.c b/applets/busybox.c
index 53eb363ac..625a492f2 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -6,7 +6,7 @@
6 */ 6 */
7#include "busybox.h" 7#include "busybox.h"
8 8
9const char *bb_applet_name ATTRIBUTE_EXTERNALLY_VISIBLE; 9const char *applet_name ATTRIBUTE_EXTERNALLY_VISIBLE;
10 10
11#ifdef CONFIG_FEATURE_INSTALLER 11#ifdef CONFIG_FEATURE_INSTALLER
12/* 12/*
@@ -59,16 +59,16 @@ int main(int argc, char **argv)
59{ 59{
60 const char *s; 60 const char *s;
61 61
62 bb_applet_name=argv[0]; 62 applet_name=argv[0];
63 if (*bb_applet_name == '-') bb_applet_name++; 63 if (*applet_name == '-') applet_name++;
64 for (s = bb_applet_name; *s ;) 64 for (s = applet_name; *s ;)
65 if (*(s++) == '/') bb_applet_name = s; 65 if (*(s++) == '/') applet_name = s;
66 66
67 /* Set locale for everybody except `init' */ 67 /* Set locale for everybody except `init' */
68 if(ENABLE_LOCALE_SUPPORT && getpid() != 1) 68 if(ENABLE_LOCALE_SUPPORT && getpid() != 1)
69 setlocale(LC_ALL, ""); 69 setlocale(LC_ALL, "");
70 70
71 run_applet_by_name(bb_applet_name, argc, argv); 71 run_applet_by_name(applet_name, argc, argv);
72 bb_error_msg_and_die("applet not found"); 72 bb_error_msg_and_die("applet not found");
73} 73}
74 74
@@ -106,7 +106,8 @@ int busybox_main(int argc, char **argv)
106 106
107 if (argc==1 || !strcmp(argv[1],"--help") ) { 107 if (argc==1 || !strcmp(argv[1],"--help") ) {
108 if (argc>2) { 108 if (argc>2) {
109 run_applet_by_name(bb_applet_name=argv[2], 2, argv); 109 applet_name = argv[2];
110 run_applet_by_name(applet_name, 2, argv);
110 } else { 111 } else {
111 const struct BB_applet *a; 112 const struct BB_applet *a;
112 int col, output_width; 113 int col, output_width;