Static-ify a variable. make du work with all the human-readable variants

[oweals/busybox.git] / sh.c

diff --git a/sh.c b/sh.c
index 9519538dcf708cefc68c49deecd33ba276fa86bd..150055bb142b00f62ac4e73c02453e350adb9571 100644 (file)
--- a/sh.c
+++ b/sh.c
@@ -49,7 +49,6 @@
 //#define DEBUG_SHELL
 
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -62,6 +61,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <getopt.h>
+#include "busybox.h"
 #include "cmdedit.h"
 
 static const int MAX_LINE = 256;       /* size of input buffer for cwd data */
@@ -153,6 +153,7 @@ static int run_command_predicate(char *cmd);
 /* function prototypes for shell stuff */
 static void mark_open(int fd);
 static void mark_closed(int fd);
+static void close_all(void);
 static void checkjobs(struct jobset *job_list);
 static int get_command(FILE * source, char *command);
 static int parse_command(char **command_ptr, struct job *job, int *inbg);
@@ -206,7 +207,7 @@ static char *local_pending_command = NULL;
 static struct jobset job_list = { NULL, NULL };
 static int argc;
 static char **argv;
-static struct close_me *close_me_head = NULL;
+static struct close_me *close_me_head;
 #ifdef BB_FEATURE_SH_ENVIRONMENT
 static int last_bg_pid=-1;
 static int last_return_code=-1;
@@ -300,6 +301,7 @@ static int builtin_exec(struct child_prog *child)
        if (child->argv[1] == NULL)
                return EXIT_SUCCESS;   /* Really? */
        child->argv++;
+       close_all();
        pseudo_exec(child);
        /* never returns */
 }
@@ -629,9 +631,11 @@ static void mark_closed(int fd)
 
 static void close_all()
 {
-       struct close_me *c;
-       for (c=close_me_head; c; c=c->next) {
+       struct close_me *c, *tmp;
+       for (c=close_me_head; c; c=tmp) {
                close(c->fd);
+               tmp=c->next;
+               free(c);
        }
        close_me_head = NULL;
 }
@@ -854,10 +858,9 @@ static int get_command(FILE * source, char *command)
                ** atexit() handlers and other unwanted stuff to our
                ** child processes (rob@sysgo.de)
                */
-               cmdedit_init();
                cmdedit_read_input(prompt_str, command);
-               free(prompt_str);
                cmdedit_terminate();
+               free(prompt_str);
                return 0;
 #else
                fputs(prompt_str, stdout);
@@ -917,44 +920,57 @@ static void expand_argument(struct child_prog *prog, int *argcPtr,
                flags = 0;
                i = 0;
        }
-       /* do shell variable substitution */
-       if(*prog->argv[argc_l - 1] == '$') {
-               if ((var = getenv(prog->argv[argc_l - 1] + 1))) {
-                       prog->argv[argc_l - 1] = var;
-               } 
 #ifdef BB_FEATURE_SH_ENVIRONMENT
-               else {
-                       switch(*(prog->argv[argc_l - 1] + 1)) {
+       /* do shell variable substitution */
+       src = prog->argv[argc_l - 1];
+       while((dst = strchr(src,'$')) != NULL){
+               if (!(var = getenv(dst + 1))) {
+                       switch(*(dst+1)) {
                                case '?':
-                                       prog->argv[argc_l - 1] = itoa(last_return_code);
+                                       var = itoa(last_return_code);
                                        break;
                                case '$':
-                                       prog->argv[argc_l - 1] = itoa(getpid());
+                                       var = itoa(getpid());
                                        break;
                                case '#':
-                                       prog->argv[argc_l - 1] = itoa(argc-1);
+                                       var = itoa(argc-1);
                                        break;
                                case '!':
                                        if (last_bg_pid==-1)
-                                               *(prog->argv[argc_l - 1])='\0';
+                                               *(var)='\0';
                                        else
-                                               prog->argv[argc_l - 1] = itoa(last_bg_pid);
+                                               var = itoa(last_bg_pid);
                                        break;
                                case '0':case '1':case '2':case '3':case '4':
                                case '5':case '6':case '7':case '8':case '9':
                                        {
-                                               int index=*(prog->argv[argc_l - 1] + 1)-48;
+                                               int index=*(dst + 1)-48;
                                                if (index >= argc) {
-                                                       *(prog->argv[argc_l - 1])='\0';
+                                                       var='\0';
                                                } else {
-                                                       prog->argv[argc_l - 1] = argv[index];
+                                                       var = argv[index];
                                                }
                                        }
                                        break;
                        }
                }
-#endif
+               if (var) {
+                       int offset = dst-src;
+#warning I have a memory leak which needs to be plugged somehow
+                       src = (char*)xmalloc(strlen(src)-strlen(dst)+strlen(var)+1);
+                       strncpy(src, prog->argv[argc_l -1], offset); 
+                       safe_strncpy(src+offset, var, strlen(var)+1); 
+                       /* If there are any remaining $ variables in the src string, put them back */
+                       if ((dst = strchr(prog->argv[argc_l -1]+offset+1,'$')) != NULL) {
+                               offset=strlen(src);
+                               safe_strncpy(src+strlen(src), dst, strlen(dst)+1);
+                       }
+                       prog->argv[argc_l -1] = src;
+               } else {
+                       memset(dst, 0, strlen(src)-strlen(dst)); 
+               }
        }
+#endif
 
        if (strpbrk(prog->argv[argc_l - 1],"*[]?")!= NULL){
                rc = glob(prog->argv[argc_l - 1], flags, NULL, &prog->glob_result);
@@ -1699,18 +1715,17 @@ int shell_main(int argc_l, char **argv_l)
        argc = argc_l;
        argv = argv_l;
 
+       /* These variables need re-initializing when recursing */
        shell_context = 0;
        cwd=NULL;
-#ifdef BB_FEATURE_SH_STANDALONE_SHELL
-       /* These variables need re-initializing when recursing */
        local_pending_command = NULL;
+       close_me_head = NULL;
        job_list.head = NULL;
        job_list.fg = NULL;
 #ifdef BB_FEATURE_SH_ENVIRONMENT
        last_bg_pid=-1;
        last_return_code=-1;
        show_x_trace=FALSE;
-#endif
 #endif
 
        if (argv[0] && argv[0][0] == '-') {