18 files changed, 107 insertions, 62 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 21fc05f01..08b6aa430 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2747,7 +2747,7 @@ updatepwd(const char *dir)
                         new = stack_putstr(p, new);
                         USTPUTC('/', new);
                 }
-                p = strtok(0, "/");
+                p = strtok(NULL, "/");
         }
         if (new > lim)
                 STUNPUTC(new);
@@ -5731,7 +5731,7 @@ popredir(int drop, int restore)
         struct redirtab *rp;
         int i;
 
-        if (--g_nullredirs >= 0)
+        if (--g_nullredirs >= 0 || redirlist == NULL)
                 return;
         INT_OFF;
         rp = redirlist;
@@ -8159,14 +8159,15 @@ findkwd(const char *s)
  * Locate and print what a word is...
  */
 static int
-describe_command(char *command, int describe_command_verbose)
+describe_command(char *command, const char *path, int describe_command_verbose)
 {
         struct cmdentry entry;
         struct tblentry *cmdp;
 #if ENABLE_ASH_ALIAS
         const struct alias *ap;
 #endif
-        const char *path = pathval();
+
+        path = path ? path : pathval();
 
         if (describe_command_verbose) {
                 out1str(command);
@@ -8266,7 +8267,7 @@ typecmd(int argc UNUSED_PARAM, char **argv)
                 verbose = 0;
         }
         while (argv[i]) {
-                err |= describe_command(argv[i++], verbose);
+                err |= describe_command(argv[i++], NULL, verbose);
         }
         return err;
 }
@@ -8280,6 +8281,7 @@ commandcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 VERIFY_BRIEF = 1,
                 VERIFY_VERBOSE = 2,
         } verify = 0;
+        const char *path = NULL;
 
         while ((c = nextopt("pvV")) != '\0')
                 if (c == 'V')
@@ -8290,9 +8292,11 @@ commandcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 else if (c != 'p')
                         abort();
 #endif
+                else
+                        path = bb_default_path;
         /* Mimic bash: just "command -v" doesn't complain, it's a nop */
         if (verify && (*argptr != NULL)) {
-                return describe_command(*argptr, verify - VERIFY_BRIEF);
+                return describe_command(*argptr, path, verify - VERIFY_BRIEF);
         }
 
         return 0;
@@ -9296,14 +9300,15 @@ parse_command_args(char **argv, const char **path)
         for (;;) {
                 cp = *++argv;
                 if (!cp)
-                        return 0;
+                        return NULL;
                 if (*cp++ != '-')
                         break;
                 c = *cp++;
                 if (!c)
                         break;
                 if (c == '-' && !*cp) {
-                        argv++;
+                        if (!*++argv)
+                                return NULL;
                         break;
                 }
                 do {
@@ -9313,7 +9318,7 @@ parse_command_args(char **argv, const char **path)
                                 break;
                         default:
                                 /* run 'typecmd' for other options */
-                                return 0;
+                                return NULL;
                         }
                         c = *cp++;
                 } while (c);
@@ -9400,6 +9405,9 @@ localcmd(int argc UNUSED_PARAM, char **argv)
 {
         char *name;
 
+        if (!funcnest)
+                ash_msg_and_raise_error("not in a function");
+
         argv = argptr;
         while ((name = *argv++) != NULL) {
                 mklocal(name);
@@ -9865,7 +9873,7 @@ evalcommand(union node *cmd, int flags)
                 if (evalbltin(cmdentry.u.cmd, argc, argv)) {
                         int exit_status;
                         int i = exception_type;
-                        if (i == EXEXIT)
+                        if (i == EXEXIT || i == EXEXEC)
                                 goto raise;
                         exit_status = 2;
                         if (i == EXINT)
@@ -10959,7 +10967,7 @@ static union node *andor(void);
 static union node *pipeline(void);
 static union node *parse_command(void);
 static void parseheredoc(void);
-static char nexttoken_ends_list(void);
+static int peektoken(void);
 static int readtoken(void);
 
 static union node *
@@ -10968,11 +10976,27 @@ list(int nlflag)
         union node *n1, *n2, *n3;
         int tok;
 
-        checkkwd = CHKNL | CHKKWD | CHKALIAS;
-        if (nlflag == 2 && nexttoken_ends_list())
-                return NULL;
         n1 = NULL;
         for (;;) {
+                switch (peektoken()) {
+                case TNL:
+                        if (!(nlflag & 1))
+                                break;
+                        parseheredoc();
+                        return n1;
+
+                case TEOF:
+                        if (!n1 && (nlflag & 1))
+                                n1 = NODE_EOF;
+                        parseheredoc();
+                        return n1;
+                }
+
+                checkkwd = CHKNL | CHKKWD | CHKALIAS;
+                if (nlflag == 2 && tokname_array[peektoken()][0])
+                        return n1;
+                nlflag |= 2;
+
                 n2 = andor();
                 tok = readtoken();
                 if (tok == TBACKGND) {
@@ -10998,37 +11022,15 @@ list(int nlflag)
                         n1 = n3;
                 }
                 switch (tok) {
+                case TNL:
+                case TEOF:
+                        tokpushback = 1;
+                        /* fall through */
                 case TBACKGND:
                 case TSEMI:
-                        tok = readtoken();
-                        /* fall through */
-                case TNL:
-                        if (tok == TNL) {
-                                parseheredoc();
-                                if (nlflag == 1)
-                                        return n1;
-                        } else {
-                                tokpushback = 1;
-                        }
-                        checkkwd = CHKNL | CHKKWD | CHKALIAS;
-                        if (nexttoken_ends_list()) {
-                                /* Testcase: "<<EOF; then <W".
-                                 * It used to segfault w/o this check:
-                                 */
-                                if (heredoclist) {
-                                        raise_error_unexpected_syntax(-1);
-                                }
-                                return n1;
-                        }
                         break;
-                case TEOF:
-                        if (heredoclist)
-                                parseheredoc();
-                        else
-                                pungetc();              /* push back EOF on input */
-                        return n1;
                 default:
-                        if (nlflag == 1)
+                        if ((nlflag & 1))
                                 raise_error_unexpected_syntax(-1);
                         tokpushback = 1;
                         return n1;
@@ -11356,7 +11358,7 @@ parse_command(void)
                 n1 = stzalloc(sizeof(struct nfor));
                 n1->type = NFOR;
                 n1->nfor.var = wordtext;
-                checkkwd = CHKKWD | CHKALIAS;
+                checkkwd = CHKNL | CHKKWD | CHKALIAS;
                 if (readtoken() == TIN) {
                         app = &ap;
                         while (readtoken() == TWORD) {
@@ -11383,7 +11385,7 @@ parse_command(void)
                          * Newline or semicolon here is optional (but note
                          * that the original Bourne shell only allowed NL).
                          */
-                        if (lasttoken != TNL && lasttoken != TSEMI)
+                        if (lasttoken != TSEMI)
                                 tokpushback = 1;
                 }
                 checkkwd = CHKNL | CHKKWD | CHKALIAS;
@@ -11402,10 +11404,8 @@ parse_command(void)
                 /*n2->narg.next = NULL; - stzalloc did it */
                 n2->narg.text = wordtext;
                 n2->narg.backquote = backquotelist;
-                do {
-                        checkkwd = CHKKWD | CHKALIAS;
-                } while (readtoken() == TNL);
-                if (lasttoken != TIN)
+                checkkwd = CHKNL | CHKKWD | CHKALIAS;
+                if (readtoken() != TIN)
                         raise_error_unexpected_syntax(TIN);
                 cpp = &n1->ncase.cases;
  next_case:
@@ -12336,6 +12336,7 @@ static int
 readtoken(void)
 {
         int t;
+        int kwd = checkkwd;
 #if DEBUG
         smallint alreadyseen = tokpushback;
 #endif
@@ -12349,7 +12350,7 @@ readtoken(void)
         /*
          * eat newlines
          */
-        if (checkkwd & CHKNL) {
+        if (kwd & CHKNL) {
                 while (t == TNL) {
                         parseheredoc();
                         t = xxreadtoken();
@@ -12363,7 +12364,7 @@ readtoken(void)
         /*
          * check for keywords
          */
-        if (checkkwd & CHKKWD) {
+        if (kwd & CHKKWD) {
                 const char *const *pp;
 
                 pp = findkwd(wordtext);
@@ -12397,14 +12398,14 @@ readtoken(void)
         return t;
 }
 
-static char
-nexttoken_ends_list(void)
+static int
+peektoken(void)
 {
         int t;
 
         t = readtoken();
         tokpushback = 1;
-        return tokname_array[t][0];
+        return t;
 }
 
 /*
@@ -12414,18 +12415,12 @@ nexttoken_ends_list(void)
 static union node *
 parsecmd(int interact)
 {
-        int t;
-
         tokpushback = 0;
+        checkkwd = 0;
+        heredoclist = 0;
         doprompt = interact;
         setprompt_if(doprompt, doprompt);
         needprompt = 0;
-        t = readtoken();
-        if (t == TEOF)
-                return NODE_EOF;
-        if (t == TNL)
-                return NULL;
-        tokpushback = 1;
         return list(1);
 }
 
diff --git a/shell/ash_test/ash-heredoc/heredoc2.right b/shell/ash_test/ash-heredoc/heredoc2.right
new file mode 100644
index 000000000..a486f1ac4
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc2.right
@@ -0,0 +1,2 @@
+bar
+bar
diff --git a/shell/ash_test/ash-heredoc/heredoc2.tests b/shell/ash_test/ash-heredoc/heredoc2.tests
new file mode 100755
index 000000000..6d9ccb6cc
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc2.tests
@@ -0,0 +1,7 @@
+foo () {
+cat <<EOF && { echo "$1" ; }
+$1
+EOF
+}
+
+foo "bar"
diff --git a/shell/ash_test/ash-heredoc/heredoc3.right b/shell/ash_test/ash-heredoc/heredoc3.right
new file mode 100644
index 000000000..ce0136250
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc3.right
@@ -0,0 +1 @@
+hello
diff --git a/shell/ash_test/ash-heredoc/heredoc3.tests b/shell/ash_test/ash-heredoc/heredoc3.tests
new file mode 100755
index 000000000..96c227cc1
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc3.tests
@@ -0,0 +1,9 @@
+echo hello >greeting
+cat <<EOF &&
+$(cat greeting)
+EOF
+{
+        echo $?
+        cat greeting
+} >/dev/null
+rm greeting
diff --git a/shell/ash_test/ash-misc/command.right b/shell/ash_test/ash-misc/command.right
new file mode 100644
index 000000000..7f746d9c4
--- /dev/null
+++ b/shell/ash_test/ash-misc/command.right
@@ -0,0 +1 @@
+recho: not found
diff --git a/shell/ash_test/ash-misc/command.tests b/shell/ash_test/ash-misc/command.tests
new file mode 100755
index 000000000..5d445af51
--- /dev/null
+++ b/shell/ash_test/ash-misc/command.tests
@@ -0,0 +1 @@
+command -p -V recho
diff --git a/shell/ash_test/ash-misc/command2.right b/shell/ash_test/ash-misc/command2.right
new file mode 100644
index 000000000..8d2165f69
--- /dev/null
+++ b/shell/ash_test/ash-misc/command2.right
@@ -0,0 +1,2 @@
+test1
+./command2.tests: ./test1.sh: line 1: ./test2.sh: Permission denied
diff --git a/shell/ash_test/ash-misc/command2.tests b/shell/ash_test/ash-misc/command2.tests
new file mode 100755
index 000000000..9d9de9a89
--- /dev/null
+++ b/shell/ash_test/ash-misc/command2.tests
@@ -0,0 +1,6 @@
+echo "echo test1; ./test2.sh" >test1.sh
+echo "echo test2" >test2.sh
+
+command . ./test1.sh
+
+rm -f test1.sh test2.sh
diff --git a/shell/ash_test/ash-misc/exec.right b/shell/ash_test/ash-misc/exec.right
new file mode 100644
index 000000000..1741a38dd
--- /dev/null
+++ b/shell/ash_test/ash-misc/exec.right
@@ -0,0 +1,2 @@
+./exec.tests: exec: line 2: ./test1.sh: not found
+127
diff --git a/shell/ash_test/ash-misc/exec.tests b/shell/ash_test/ash-misc/exec.tests
new file mode 100755
index 000000000..624915de1
--- /dev/null
+++ b/shell/ash_test/ash-misc/exec.tests
@@ -0,0 +1,3 @@
+rm -f test1.sh
+(exec ./test1.sh)
+echo $?
diff --git a/shell/ash_test/ash-misc/for.right b/shell/ash_test/ash-misc/for.right
new file mode 100644
index 000000000..d86bac9de
--- /dev/null
+++ b/shell/ash_test/ash-misc/for.right
@@ -0,0 +1 @@
+OK
diff --git a/shell/ash_test/ash-misc/for.tests b/shell/ash_test/ash-misc/for.tests
new file mode 100755
index 000000000..4889a9f2d
--- /dev/null
+++ b/shell/ash_test/ash-misc/for.tests
@@ -0,0 +1,5 @@
+for i
+in OK
+do
+        echo $i
+done
diff --git a/shell/ash_test/ash-misc/local2.right b/shell/ash_test/ash-misc/local2.right
new file mode 100644
index 000000000..630ef7979
--- /dev/null
+++ b/shell/ash_test/ash-misc/local2.right
@@ -0,0 +1 @@
+./local2.tests: local: line 1: not in a function
diff --git a/shell/ash_test/ash-misc/local2.tests b/shell/ash_test/ash-misc/local2.tests
new file mode 100755
index 000000000..8e14037c5
--- /dev/null
+++ b/shell/ash_test/ash-misc/local2.tests
@@ -0,0 +1 @@
+local x=1
diff --git a/shell/ash_test/run-all b/shell/ash_test/run-all
index ad93e251d..354cc1fcf 100755
--- a/shell/ash_test/run-all
+++ b/shell/ash_test/run-all
@@ -31,8 +31,9 @@ do_test()
             *.orig|*~) ;;
             #*) echo $x ; sh $x ;;
             *)
+            echo -n "$1/$x: "
             sh "$x" >"$TOPDIR/$noslash-$x.fail" 2>&1 && \
-            { echo "$1/$x: ok"; rm "$TOPDIR/$noslash-$x.fail"; } || echo "$1/$x: fail";
+            { echo "ok"; rm "$TOPDIR/$noslash-$x.fail"; } || echo "fail";
             ;;
         esac
     done
@@ -42,11 +43,12 @@ do_test()
         test -x "$x" || continue
         name="${x%%.tests}"
         test -f "$name.right" || continue
+        echo -n "$1/$x: "
         {
             "$THIS_SH" "./$x" >"$name.xx" 2>&1
             diff -u "$name.xx" "$name.right" >"$TOPDIR/$noslash-$x.fail" \
             && rm -f "$name.xx" "$TOPDIR/$noslash-$x.fail"
-        } && echo "$1/$x: ok" || echo "$1/$x: fail"
+        } && echo "ok" || echo "fail"
     done
     )
 }
diff --git a/shell/hush_test/hush-misc/for.right b/shell/hush_test/hush-misc/for.right
new file mode 100644
index 000000000..d86bac9de
--- /dev/null
+++ b/shell/hush_test/hush-misc/for.right
@@ -0,0 +1 @@
+OK
diff --git a/shell/hush_test/hush-misc/for.tests b/shell/hush_test/hush-misc/for.tests
new file mode 100755
index 000000000..4889a9f2d
--- /dev/null
+++ b/shell/hush_test/hush-misc/for.tests
@@ -0,0 +1,5 @@
+for i
+in OK
+do
+        echo $i
+done