Another update from Larry:

[oweals/busybox.git] / lash.c

diff --git a/lash.c b/lash.c
index ee45b1a0dbe895437e97663c1e9536d03da64f4f..1d128355cafd1cfd63e250d106ffec683ad22057 100644 (file)
--- a/lash.c
+++ b/lash.c
@@ -64,6 +64,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <getopt.h>
+#include "busybox.h"
+#include "cmdedit.h"
 
 #ifdef BB_LOCALE_SUPPORT
 #include <locale.h>
@@ -79,8 +81,6 @@
 #include <glob.h>
 #define expand_t       glob_t
 #endif 
-#include "busybox.h"
-#include "cmdedit.h"
 
 
 static const int MAX_READ = 128;       /* size of input buffer for `read' builtin */
@@ -1019,6 +1019,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) {
@@ -1041,10 +1043,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;
                                }
@@ -1159,7 +1159,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;
@@ -1221,7 +1221,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) {
@@ -1231,12 +1231,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 */
@@ -1305,7 +1307,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");
@@ -1474,7 +1476,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) {
@@ -1801,7 +1803,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"); 
                        }
                }
@@ -1907,7 +1909,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]);