summaryrefslogtreecommitdiff
path: root/shell/hush.c
diff options
context:
space:
mode:
authorMatt Kraai2001-08-01 17:21:35 +0000
committerMatt Kraai2001-08-01 17:21:35 +0000
commit2d91deba45d5a284614e06cc55e2be03599ca26d (patch)
tree0ba0d2096b4305465ddea8532a5931cb4c02b343 /shell/hush.c
parent00344431402703089c6b93f6119f9966cc7ba566 (diff)
downloadbusybox-2d91deba45d5a284614e06cc55e2be03599ca26d.zip
busybox-2d91deba45d5a284614e06cc55e2be03599ca26d.tar.gz
Allow multiple shells to be enabled.
Diffstat (limited to 'shell/hush.c')
-rw-r--r--shell/hush.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 1344042..0e619f8 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -112,7 +112,7 @@
#else
#define applet_name "hush"
#include "standalone.h"
-#define shell_main main
+#define hush_main main
#undef BB_FEATURE_SH_FANCY_PROMPT
#endif
@@ -2562,7 +2562,7 @@ static void setup_job_control()
tcsetpgrp(shell_terminal, shell_pgrp);
}
-int shell_main(int argc, char **argv)
+int hush_main(int argc, char **argv)
{
int opt;
FILE *input;
@@ -2572,8 +2572,8 @@ int shell_main(int argc, char **argv)
global_argc = argc;
global_argv = argv;
- /* (re?) initialize globals. Sometimes shell_main() ends up calling
- * shell_main(), therefore we cannot rely on the BSS to zero out this
+ /* (re?) initialize globals. Sometimes hush_main() ends up calling
+ * hush_main(), therefore we cannot rely on the BSS to zero out this
* stuff. Reset these to 0 every time. */
ifs = NULL;
/* map[] is taken care of with call to update_ifs_map() */