diff options
| author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-07-28 15:14:45 +0000 |
|---|---|---|
| committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-07-28 15:14:45 +0000 |
| commit | 29003923057d43c4196f22762101217b086ca115 (patch) | |
| tree | 3fff440532d8d380ae7e4f2933bc7163360f8279 /applets | |
| parent | c82583d2b430ca889a76c939b7d32d572b2e6353 (diff) | |
| download | busybox-w32-29003923057d43c4196f22762101217b086ca115.tar.gz busybox-w32-29003923057d43c4196f22762101217b086ca115.tar.bz2 busybox-w32-29003923057d43c4196f22762101217b086ca115.zip | |
More sh updates (with related changes to everything else). Switched
to using getopt and cleaned up the resulting mess. if-then-else-fi
is now basically working (given a bunch of constraints).
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@913 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/busybox.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/applets/busybox.c b/applets/busybox.c index 291d31b19..1ed44ed9b 100644 --- a/applets/busybox.c +++ b/applets/busybox.c | |||
| @@ -337,7 +337,7 @@ const struct BB_applet applets[] = { | |||
| 337 | {0,NULL,0,NULL} | 337 | {0,NULL,0,NULL} |
| 338 | }; | 338 | }; |
| 339 | 339 | ||
| 340 | char *applet_name; | 340 | const char *applet_name; |
| 341 | 341 | ||
| 342 | #ifdef BB_FEATURE_INSTALLER | 342 | #ifdef BB_FEATURE_INSTALLER |
| 343 | /* | 343 | /* |
| @@ -416,7 +416,7 @@ static int install_links(const char *busybox, int use_symbolic_links) | |||
| 416 | 416 | ||
| 417 | int main(int argc, char **argv) | 417 | int main(int argc, char **argv) |
| 418 | { | 418 | { |
| 419 | char *s; | 419 | const char *s; |
| 420 | const struct BB_applet *a = applets; | 420 | const struct BB_applet *a = applets; |
| 421 | applet_name = "busybox"; | 421 | applet_name = "busybox"; |
| 422 | 422 | ||
| @@ -455,7 +455,7 @@ int main(int argc, char **argv) | |||
| 455 | applet_name = s; | 455 | applet_name = s; |
| 456 | } | 456 | } |
| 457 | 457 | ||
| 458 | *argv = applet_name; | 458 | *argv = (char*)applet_name; |
| 459 | 459 | ||
| 460 | #ifdef BB_SH | 460 | #ifdef BB_SH |
| 461 | /* Add in a special case hack -- whenever **argv == '-' | 461 | /* Add in a special case hack -- whenever **argv == '-' |