diff options
Diffstat (limited to 'applets/busybox.c')
-rw-r--r-- | applets/busybox.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/applets/busybox.c b/applets/busybox.c index 4f1ef2661..457a85a68 100644 --- a/applets/busybox.c +++ b/applets/busybox.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #endif | 10 | #endif |
11 | 11 | ||
12 | int been_there_done_that = 0; /* Also used in applets.c */ | 12 | int been_there_done_that = 0; /* Also used in applets.c */ |
13 | const char *applet_name; | 13 | const char *bb_applet_name; |
14 | 14 | ||
15 | #ifdef CONFIG_FEATURE_INSTALLER | 15 | #ifdef CONFIG_FEATURE_INSTALLER |
16 | /* | 16 | /* |
@@ -60,7 +60,7 @@ static void install_links(const char *busybox, int use_symbolic_links) | |||
60 | install_dir[applets[i].location], applets[i].name); | 60 | install_dir[applets[i].location], applets[i].name); |
61 | rc = Link(busybox, fpc); | 61 | rc = Link(busybox, fpc); |
62 | if (rc!=0 && errno!=EEXIST) { | 62 | if (rc!=0 && errno!=EEXIST) { |
63 | perror_msg("%s", fpc); | 63 | bb_perror_msg("%s", fpc); |
64 | } | 64 | } |
65 | free(fpc); | 65 | free(fpc); |
66 | } | 66 | } |
@@ -72,14 +72,14 @@ int main(int argc, char **argv) | |||
72 | { | 72 | { |
73 | const char *s; | 73 | const char *s; |
74 | 74 | ||
75 | applet_name = argv[0]; | 75 | bb_applet_name = argv[0]; |
76 | 76 | ||
77 | if (applet_name[0] == '-') | 77 | if (bb_applet_name[0] == '-') |
78 | applet_name++; | 78 | bb_applet_name++; |
79 | 79 | ||
80 | for (s = applet_name; *s != '\0';) { | 80 | for (s = bb_applet_name; *s != '\0';) { |
81 | if (*s++ == '/') | 81 | if (*s++ == '/') |
82 | applet_name = s; | 82 | bb_applet_name = s; |
83 | } | 83 | } |
84 | 84 | ||
85 | #ifdef CONFIG_LOCALE_SUPPORT | 85 | #ifdef CONFIG_LOCALE_SUPPORT |
@@ -91,8 +91,8 @@ int main(int argc, char **argv) | |||
91 | } | 91 | } |
92 | #endif | 92 | #endif |
93 | 93 | ||
94 | run_applet_by_name(applet_name, argc, argv); | 94 | run_applet_by_name(bb_applet_name, argc, argv); |
95 | error_msg_and_die("applet not found"); | 95 | bb_error_msg_and_die("applet not found"); |
96 | } | 96 | } |
97 | 97 | ||
98 | 98 | ||
@@ -143,7 +143,7 @@ int busybox_main(int argc, char **argv) | |||
143 | "\tutilities into a single executable. Most people will create a\n" | 143 | "\tutilities into a single executable. Most people will create a\n" |
144 | "\tlink to busybox for each function they wish to use, and BusyBox\n" | 144 | "\tlink to busybox for each function they wish to use, and BusyBox\n" |
145 | "\twill act like whatever it was invoked as.\n" | 145 | "\twill act like whatever it was invoked as.\n" |
146 | "\nCurrently defined functions:\n", full_version); | 146 | "\nCurrently defined functions:\n", bb_msg_full_version); |
147 | 147 | ||
148 | while (a->name != 0) { | 148 | while (a->name != 0) { |
149 | col += | 149 | col += |