Merge branch 'busybox' into merge

14 files changed, 85 insertions, 29 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 817b5635f..9ef8f7742 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -7884,6 +7884,11 @@ subevalvar(char *start, char *str, int strloc,
                                 repl = NULL;
                                 break;
                         }
+                        /* Skip over quoted 'str'. Example: ${var/'/'} - second / is not a separator */
+                        if ((unsigned char)*repl == CTLQUOTEMARK) {
+                                while ((unsigned char)*++repl != CTLQUOTEMARK)
+                                        continue;
+                        }
                         if (*repl == '/') {
                                 *repl = '\0';
                                 break;
diff --git a/shell/ash_test/ash-parsing/nodone1.right b/shell/ash_test/ash-parsing/nodone1.right
new file mode 100644
index 000000000..0150ccad5
--- /dev/null
+++ b/shell/ash_test/ash-parsing/nodone1.right
@@ -0,0 +1 @@
+./nodone1.tests: line 2: syntax error: unexpected end of file (expecting "done")
diff --git a/shell/ash_test/ash-parsing/nodone1.tests b/shell/ash_test/ash-parsing/nodone1.tests
new file mode 100755
index 000000000..de286c5a2
--- /dev/null
+++ b/shell/ash_test/ash-parsing/nodone1.tests
@@ -0,0 +1 @@
+for i; do :
diff --git a/shell/ash_test/ash-parsing/nodone2.right b/shell/ash_test/ash-parsing/nodone2.right
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/shell/ash_test/ash-parsing/nodone2.right
@@ -0,0 +1 @@
+1
diff --git a/shell/ash_test/ash-parsing/nodone2.tests b/shell/ash_test/ash-parsing/nodone2.tests
new file mode 100755
index 000000000..69537b3b1
--- /dev/null
+++ b/shell/ash_test/ash-parsing/nodone2.tests
@@ -0,0 +1,3 @@
+for i in 1; do echo $i
+# the next line has no EOL. It still must count as "done" keyword:
+done
\ No newline at end of file
diff --git a/shell/ash_test/ash-quoting/dollar_repl_bash2.right b/shell/ash_test/ash-quoting/dollar_repl_bash2.right
new file mode 100644
index 000000000..e3fcd5807
--- /dev/null
+++ b/shell/ash_test/ash-quoting/dollar_repl_bash2.right
@@ -0,0 +1,4 @@
+axxb
+axxb
+axxb
+axxb
diff --git a/shell/ash_test/ash-quoting/dollar_repl_bash2.tests b/shell/ash_test/ash-quoting/dollar_repl_bash2.tests
new file mode 100755
index 000000000..45c7a10e2
--- /dev/null
+++ b/shell/ash_test/ash-quoting/dollar_repl_bash2.tests
@@ -0,0 +1,8 @@
+v="x/x"
+# The second / is quoted, should not be treated as separator
+echo a${v/'/'}b
+# The second / is escaped, should not be treated as separator
+echo a${v/\/}b
+
+echo "a${v/'/'}b"
+echo "a${v/\/}b"
diff --git a/shell/hush.c b/shell/hush.c
index ca01e2b5b..3e6a13b32 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -5497,6 +5497,15 @@ static struct pipe *parse_stream(char **pstring,
                         }
                         o_free_and_set_NULL(&ctx.word);
                         done_pipe(&ctx, PIPE_SEQ);
+
+                        /* Do we sit inside of any if's, loops or case's? */
+                        if (HAS_KEYWORDS
+                        IF_HAS_KEYWORDS(&& (ctx.ctx_res_w != RES_NONE || ctx.old_flag != 0))
+                        ) {
+                                syntax_error_unterm_str("compound statement");
+                                goto parse_error_exitcode1;
+                        }
+
                         pi = ctx.list_head;
                         /* If we got nothing... */
                         /* (this makes bare "&" cmd a no-op.
@@ -5519,7 +5528,7 @@ static struct pipe *parse_stream(char **pstring,
                         //      *heredoc_cnt_ptr = heredoc_cnt;
                         debug_leave();
                         debug_printf_heredoc("parse_stream return heredoc_cnt:%d\n", heredoc_cnt);
-                        debug_printf_parse("parse_stream return %p\n", pi);
+                        debug_printf_parse("parse_stream return %p: EOF\n", pi);
                         return pi;
                 }
 
@@ -9250,6 +9259,37 @@ static int checkjobs_and_fg_shell(struct pipe *fg_pipe)
  * backgrounded: cmd &     { list } &
  * subshell:     ( list ) [&]
  */
+static void set_G_ifs(void)
+{
+        /* Testcase: set -- q w e; (IFS='' echo "$*"; IFS=''; echo "$*"); echo "$*"
+         * Result should be 3 lines: q w e, qwe, q w e
+         */
+        if (G.ifs_whitespace != G.ifs)
+                free(G.ifs_whitespace);
+        G.ifs = get_local_var_value("IFS");
+        if (G.ifs) {
+                char *p;
+                G.ifs_whitespace = (char*)G.ifs;
+                p = skip_whitespace(G.ifs);
+                if (*p) {
+                        /* Not all $IFS is whitespace */
+                        char *d;
+                        int len = p - G.ifs;
+                        p = skip_non_whitespace(p);
+                        G.ifs_whitespace = xmalloc(len + strlen(p) + 1); /* can overestimate */
+                        d = mempcpy(G.ifs_whitespace, G.ifs, len);
+                        while (*p) {
+                                if (isspace(*p))
+                                        *d++ = *p;
+                                p++;
+                        }
+                        *d = '\0';
+                }
+        } else {
+                G.ifs = defifs;
+                G.ifs_whitespace = (char*)G.ifs;
+        }
+}
 #if !ENABLE_HUSH_MODE_X
 #define redirect_and_varexp_helper(command, sqp, argv_expanded) \
         redirect_and_varexp_helper(command, sqp)
@@ -9286,34 +9326,7 @@ static NOINLINE int run_pipe(struct pipe *pi)
         debug_printf_exec("run_pipe start: members:%d\n", pi->num_cmds);
         debug_enter();
 
-        /* Testcase: set -- q w e; (IFS='' echo "$*"; IFS=''; echo "$*"); echo "$*"
-         * Result should be 3 lines: q w e, qwe, q w e
-         */
-        if (G.ifs_whitespace != G.ifs)
-                free(G.ifs_whitespace);
-        G.ifs = get_local_var_value("IFS");
-        if (G.ifs) {
-                char *p;
-                G.ifs_whitespace = (char*)G.ifs;
-                p = skip_whitespace(G.ifs);
-                if (*p) {
-                        /* Not all $IFS is whitespace */
-                        char *d;
-                        int len = p - G.ifs;
-                        p = skip_non_whitespace(p);
-                        G.ifs_whitespace = xmalloc(len + strlen(p) + 1); /* can overestimate */
-                        d = mempcpy(G.ifs_whitespace, G.ifs, len);
-                        while (*p) {
-                                if (isspace(*p))
-                                        *d++ = *p;
-                                p++;
-                        }
-                        *d = '\0';
-                }
-        } else {
-                G.ifs = defifs;
-                G.ifs_whitespace = (char*)G.ifs;
-        }
+        set_G_ifs();
 
         IF_HUSH_JOB(pi->pgrp = -1;)
         pi->stopped_cmds = 0;
@@ -9758,6 +9771,8 @@ static int run_list(struct pipe *pi)
         debug_printf_exec("run_list lvl %d start\n", G.run_list_level);
         debug_enter();
 
+        set_G_ifs();
+
 #if ENABLE_HUSH_LOOPS
         /* Check syntax for "for" */
         {
diff --git a/shell/hush_test/hush-parsing/nodone1.right b/shell/hush_test/hush-parsing/nodone1.right
new file mode 100644
index 000000000..3dc1bcfbe
--- /dev/null
+++ b/shell/hush_test/hush-parsing/nodone1.right
@@ -0,0 +1 @@
+hush: syntax error: unterminated compound statement
diff --git a/shell/hush_test/hush-parsing/nodone1.tests b/shell/hush_test/hush-parsing/nodone1.tests
new file mode 100755
index 000000000..de286c5a2
--- /dev/null
+++ b/shell/hush_test/hush-parsing/nodone1.tests
@@ -0,0 +1 @@
+for i; do :
diff --git a/shell/hush_test/hush-parsing/nodone2.right b/shell/hush_test/hush-parsing/nodone2.right
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/shell/hush_test/hush-parsing/nodone2.right
@@ -0,0 +1 @@
+1
diff --git a/shell/hush_test/hush-parsing/nodone2.tests b/shell/hush_test/hush-parsing/nodone2.tests
new file mode 100755
index 000000000..69537b3b1
--- /dev/null
+++ b/shell/hush_test/hush-parsing/nodone2.tests
@@ -0,0 +1,3 @@
+for i in 1; do echo $i
+# the next line has no EOL. It still must count as "done" keyword:
+done
\ No newline at end of file
diff --git a/shell/hush_test/hush-quoting/dollar_repl_bash2.right b/shell/hush_test/hush-quoting/dollar_repl_bash2.right
new file mode 100644
index 000000000..e3fcd5807
--- /dev/null
+++ b/shell/hush_test/hush-quoting/dollar_repl_bash2.right
@@ -0,0 +1,4 @@
+axxb
+axxb
+axxb
+axxb
diff --git a/shell/hush_test/hush-quoting/dollar_repl_bash2.tests b/shell/hush_test/hush-quoting/dollar_repl_bash2.tests
new file mode 100755
index 000000000..45c7a10e2
--- /dev/null
+++ b/shell/hush_test/hush-quoting/dollar_repl_bash2.tests
@@ -0,0 +1,8 @@
+v="x/x"
+# The second / is quoted, should not be treated as separator
+echo a${v/'/'}b
+# The second / is escaped, should not be treated as separator
+echo a${v/\/}b
+
+echo "a${v/'/'}b"
+echo "a${v/\/}b"