Move init of a bunch of globals into main so we are at least

[oweals/busybox.git] / shell / lash.c

diff --git a/shell/lash.c b/shell/lash.c
index 89325b63d96d824d76c8061b675c9061a6985355..89a8fe6a50e21fdf43f65a1cce10e9ea4cb68a13 100644 (file)
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -64,7 +64,12 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <getopt.h>
+#include "busybox.h"
+#include "cmdedit.h"
+
+#ifdef BB_LOCALE_SUPPORT
 #include <locale.h>
+#endif
 
 //#define BB_FEATURE_SH_WORDEXP
 
@@ -76,11 +81,8 @@
 #include <glob.h>
 #define expand_t       glob_t
 #endif 
-#include "busybox.h"
-#include "cmdedit.h"
 
 
-static const int MAX_LINE = 256;       /* size of input buffer for cwd data */
 static const int MAX_READ = 128;       /* size of input buffer for `read' builtin */
 #define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n"
 
@@ -214,7 +216,7 @@ unsigned int shell_context;  /* Used in cmdedit.c to reset the
 
 
 /* Globals that are static to this file */
-static char *cwd;
+static const char *cwd;
 static char *local_pending_command = NULL;
 static struct jobset job_list = { NULL, NULL };
 static int argc;
@@ -230,7 +232,7 @@ static char syntax_err[]="syntax error near unexpected token";
 #endif
 
 static char *PS1;
-static char *PS2;
+static char *PS2 = "> ";
 
 
 #ifdef DEBUG_SHELL
@@ -294,8 +296,9 @@ static int builtin_cd(struct child_prog *child)
                printf("cd: %s: %m\n", newdir);
                return EXIT_FAILURE;
        }
-       getcwd(cwd, sizeof(char)*MAX_LINE);
-
+       cwd = xgetcwd((char *)cwd);
+       if (!cwd)
+               cwd = unknown;
        return EXIT_SUCCESS;
 }
 
@@ -410,7 +413,9 @@ static int builtin_jobs(struct child_prog *child)
 /* built-in 'pwd' handler */
 static int builtin_pwd(struct child_prog *dummy)
 {
-       getcwd(cwd, MAX_LINE);
+       cwd = xgetcwd((char *)cwd);
+       if (!cwd)
+               cwd = unknown;
        printf( "%s\n", cwd);
        return EXIT_SUCCESS;
 }
@@ -434,13 +439,14 @@ static int builtin_export(struct child_prog *child)
 #ifndef BB_FEATURE_SH_SIMPLE_PROMPT
        if (strncmp(v, "PS1=", 4)==0)
                PS1 = getenv("PS1");
-       else if (strncmp(v, "PS2=", 4)==0)
-               PS2 = getenv("PS2");
 #endif
+
+#ifdef BB_LOCALE_SUPPORT
        if(strncmp(v, "LC_ALL=", 7)==0)
                setlocale(LC_ALL, getenv("LC_ALL"));
        if(strncmp(v, "LC_CTYPE=", 9)==0)
                setlocale(LC_CTYPE, getenv("LC_CTYPE"));
+#endif
 
        return (res);
 }
@@ -623,10 +629,7 @@ static int builtin_unset(struct child_prog *child)
  */
 static int run_command_predicate(char *cmd)
 {
-       int n=strlen(cmd);
-       local_pending_command = xmalloc(n+1);
-       strncpy(local_pending_command, cmd, n); 
-       local_pending_command[n]='\0';
+       local_pending_command = xstrdup(cmd);
        return( busy_loop(NULL));
 }
 #endif
@@ -808,15 +811,10 @@ static inline void cmdedit_set_initial_prompt(void)
 {
 #ifdef BB_FEATURE_SH_SIMPLE_PROMPT
        PS1 = NULL;
-       PS2 = "> ";
 #else
        PS1 = getenv("PS1");
-       if(PS1==0) {
+       if(PS1==0)
                PS1 = "\\w \\$ ";
-       }
-       PS2 = getenv("PS2");
-       if(PS2==0) 
-               PS2 = "> ";
 #endif 
 }
 
@@ -954,7 +952,7 @@ static int expand_arguments(char *command)
        /* Fix up escape sequences to be the Real Thing(tm) */
        while( command && command[ix]) {
                if (command[ix] == '\\') {
-                       char *tmp = command+ix+1;
+                       const char *tmp = command+ix+1;
                        command[ix] = process_escape_sequence(  &tmp );
                        memmove(command+ix + 1, tmp, strlen(tmp)+1);
                }
@@ -1025,6 +1023,8 @@ static int expand_arguments(char *command)
                                (tmpcmd = strsep_space(cmd, &ix)) != NULL; cmd += ix, ix=0) {
                        if (*tmpcmd == '\0')
                                break;
+                       /* we need to trim() the result for glob! */
+                       trim(tmpcmd);
                        retval = glob(tmpcmd, flags, NULL, &expand_result);
                        free(tmpcmd); /* Free mem allocated by strsep_space */
                        if (retval == GLOB_NOSPACE) {
@@ -1047,10 +1047,8 @@ static int expand_arguments(char *command)
                                                error_msg(out_of_space);
                                                return FALSE;
                                        }
-                                       if (i>0) {
-                                               strcat(command+total_length, " ");
-                                               total_length+=1;
-                                       }
+                                       strcat(command+total_length, " ");
+                                       total_length+=1;
                                        strcat(command+total_length, expand_result.gl_pathv[i]);
                                        total_length+=length;
                                }
@@ -1165,7 +1163,7 @@ static int parse_command(char **command_ptr, struct job *job, int *inbg)
        int argc_l = 0;
        int done = 0;
        int argv_alloced;
-       int i;
+       int i, saw_quote = 0;
        char quote = '\0';
        int count;
        struct child_prog *prog;
@@ -1227,7 +1225,7 @@ static int parse_command(char **command_ptr, struct job *job, int *inbg)
                                           *src == ']') *buf++ = '\\';
                        *buf++ = *src;
                } else if (isspace(*src)) {
-                       if (*prog->argv[argc_l]) {
+                       if (*prog->argv[argc_l] || saw_quote) {
                                buf++, argc_l++;
                                /* +1 here leaves room for the NULL which ends argv */
                                if ((argc_l + 1) == argv_alloced) {
@@ -1237,12 +1235,14 @@ static int parse_command(char **command_ptr, struct job *job, int *inbg)
                                                                                  argv_alloced);
                                }
                                prog->argv[argc_l] = buf;
+                               saw_quote = 0;
                        }
                } else
                        switch (*src) {
                        case '"':
                        case '\'':
                                quote = *src;
+                               saw_quote = 1;
                                break;
 
                        case '#':                       /* comment */
@@ -1311,7 +1311,7 @@ static int parse_command(char **command_ptr, struct job *job, int *inbg)
 
                        case '|':                       /* pipe */
                                /* finish this command */
-                               if (*prog->argv[argc_l])
+                               if (*prog->argv[argc_l] || saw_quote)
                                        argc_l++;
                                if (!argc_l) {
                                        error_msg("empty command in pipe");
@@ -1480,7 +1480,7 @@ static int parse_command(char **command_ptr, struct job *job, int *inbg)
                src++;
        }
 
-       if (*prog->argv[argc_l]) {
+       if (*prog->argv[argc_l] || saw_quote) {
                argc_l++;
        }
        if (!argc_l) {
@@ -1807,7 +1807,7 @@ static int busy_loop(FILE * input)
                        if (!job_list.fg) {
                                /* move the shell to the foreground */
                                /* suppress messages when run from /linuxrc mag@sysgo.de */
-                               if (tcsetpgrp(0, getpid()) && errno != ENOTTY)
+                               if (tcsetpgrp(0, getpgrp()) && errno != ENOTTY)
                                        perror_msg("tcsetpgrp"); 
                        }
                }
@@ -1829,8 +1829,9 @@ static int busy_loop(FILE * input)
 #ifdef BB_FEATURE_CLEAN_UP
 void free_memory(void)
 {
-       if (cwd)
+       if (cwd) {
                free(cwd);
+       }
        if (local_pending_command)
                free(local_pending_command);
 
@@ -1850,7 +1851,6 @@ int shell_main(int argc_l, char **argv_l)
 
        /* These variables need re-initializing when recursing */
        shell_context = 0;
-       cwd=NULL;
        local_pending_command = NULL;
        close_me_head = NULL;
        job_list.head = NULL;
@@ -1912,7 +1912,7 @@ int shell_main(int argc_l, char **argv_l)
        if (interactive==TRUE) {
                //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
                /* Looks like they want an interactive shell */
-               printf( "\n\nBusyBox v%s (%s) Built-in shell (lash)\n", BB_VER, BB_BT);
+               printf( "\n\n" BB_BANNER " Built-in shell (lash)\n");
                printf( "Enter 'help' for a list of built-in commands.\n\n");
        } else if (local_pending_command==NULL) {
                //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
@@ -1921,8 +1921,9 @@ int shell_main(int argc_l, char **argv_l)
        }
 
        /* initialize the cwd -- this is never freed...*/
-       cwd=(char*)xmalloc(sizeof(char)*MAX_LINE+1);
-       getcwd(cwd, sizeof(char)*MAX_LINE);
+       cwd = xgetcwd(0);
+       if (!cwd)
+               cwd = unknown;
 
 #ifdef BB_FEATURE_CLEAN_UP
        atexit(free_memory);
@@ -1932,7 +1933,6 @@ int shell_main(int argc_l, char **argv_l)
        cmdedit_set_initial_prompt();
 #else
        PS1 = NULL;
-       PS2 = "> ";
 #endif
        
        return (busy_loop(input));