Minor fixes to being a standalone shell.

 -Erik

diff --git a/busybox.def.h b/busybox.def.h
index 296c7f94af2e7e9813e1fe8a3735bc29dcce157f..430671d524057e044264f94c5d60762a39a392db 100644 (file)
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -204,7 +204,7 @@
 //Allow the shell to invoke all the compiled in BusyBox commands as if they
 //were shell builtins.  Nice for staticly linking an emergency rescue shell
 //amoung other thing.
-#ifdef BB_FEATURE_STANDALONE_SHELL
+#define BB_FEATURE_STANDALONE_SHELL
 //
 // Enable tab completion in the shell (not yet 
 // working very well -- so don't turn this on)

diff --git a/lash.c b/lash.c
index 05dab925442a96660c6c60e24f3e155bfeb6f7be..9d4c27a9a39a6f9c42987a23a5709bb6d5e57526 100644 (file)
--- a/lash.c
+++ b/lash.c
@@ -771,7 +771,7 @@ static int runCommand(struct job newJob, struct jobSet *jobList, int inBg)
                                if (strcmp(newJob.progs[i].argv[0], a->name) == 0) {
                                        int argc;
                                        char** argv=newJob.progs[i].argv;
-                                       for(argc=0;*argv!=NULL, argv++, argc++);
+                                       for(argc=0;*argv!=NULL; argv++, argc++);
                                        exit((*(a->main)) (argc, newJob.progs[i].argv));
                                }
                                a++;

diff --git a/sh.c b/sh.c
index 05dab925442a96660c6c60e24f3e155bfeb6f7be..9d4c27a9a39a6f9c42987a23a5709bb6d5e57526 100644 (file)
--- a/sh.c
+++ b/sh.c
@@ -771,7 +771,7 @@ static int runCommand(struct job newJob, struct jobSet *jobList, int inBg)
                                if (strcmp(newJob.progs[i].argv[0], a->name) == 0) {
                                        int argc;
                                        char** argv=newJob.progs[i].argv;
-                                       for(argc=0;*argv!=NULL, argv++, argc++);
+                                       for(argc=0;*argv!=NULL; argv++, argc++);
                                        exit((*(a->main)) (argc, newJob.progs[i].argv));
                                }
                                a++;

diff --git a/shell/lash.c b/shell/lash.c
index 05dab925442a96660c6c60e24f3e155bfeb6f7be..9d4c27a9a39a6f9c42987a23a5709bb6d5e57526 100644 (file)
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -771,7 +771,7 @@ static int runCommand(struct job newJob, struct jobSet *jobList, int inBg)
                                if (strcmp(newJob.progs[i].argv[0], a->name) == 0) {
                                        int argc;
                                        char** argv=newJob.progs[i].argv;
-                                       for(argc=0;*argv!=NULL, argv++, argc++);
+                                       for(argc=0;*argv!=NULL; argv++, argc++);
                                        exit((*(a->main)) (argc, newJob.progs[i].argv));
                                }
                                a++;