Merge branch 'busybox' into merge

5 files changed, 44 insertions, 2 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 28c7fe2db..8497538b1 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -149,6 +149,11 @@
 //config:       default y
 //config:       depends on SHELL_ASH
 //config:
+//config:config ASH_SLEEP
+//config:       bool "sleep builtin"
+//config:       default y
+//config:       depends on SHELL_ASH
+//config:
 //config:config ASH_HELP
 //config:       bool "help builtin"
 //config:       default y
@@ -7702,6 +7707,7 @@ varunset(const char *end, const char *var, const char *umsg, int varflags)
                         msg = umsg;
                 }
         }
+        ifsfree();
         ash_msg_and_raise_error("%.*s: %s%s", (int)(end - var - 1), var, msg, tail);
 }
 
@@ -7997,13 +8003,15 @@ subevalvar(char *start, char *str, int strloc,
                                 if (idx >= end)
                                         break;
                                 STPUTC(*idx, expdest);
+                                if (stackblock() != restart_detect)
+                                        goto restart;
                                 if (quotes && (unsigned char)*idx == CTLESC) {
                                         idx++;
                                         len++;
                                         STPUTC(*idx, expdest);
+                                        if (stackblock() != restart_detect)
+                                                goto restart;
                                 }
-                                if (stackblock() != restart_detect)
-                                        goto restart;
                                 idx++;
                                 len++;
                                 rmesc++;
@@ -8028,6 +8036,13 @@ subevalvar(char *start, char *str, int strloc,
                                 idx = loc;
                         }
 
+                        /* The STPUTC invocations above may resize and move the
+                         * stack via realloc(3). Since repl is a pointer into the
+                         * stack, we need to reconstruct it relative to stackblock().
+                         */
+                        if (slash_pos >= 0)
+                                repl = (char *)stackblock() + strloc + slash_pos + 1;
+
                         //bb_error_msg("repl:'%s'", repl);
                         for (loc = (char*)repl; *loc; loc++) {
                                 char *restart_detect = stackblock();
@@ -8127,6 +8142,7 @@ varvalue(char *name, int varflags, int flags, int quoted)
                 if (discard)
                         return -1;
 
+                ifsfree();
                 raise_error_syntax("bad substitution");
         }
 
@@ -11039,6 +11055,9 @@ static int FAST_FUNC printfcmd(int argc, char **argv) { return printf_main(argc,
 #if ENABLE_ASH_TEST || BASH_TEST2
 static int FAST_FUNC testcmd(int argc, char **argv)   { return test_main(argc, argv); }
 #endif
+#if ENABLE_ASH_SLEEP
+static int FAST_FUNC sleepcmd(int argc, char **argv)  { return sleep_main(argc, argv); }
+#endif
 
 /* Keep these in proper order since it is searched via bsearch() */
 static const struct builtincmd builtintab[] = {
@@ -11101,6 +11120,9 @@ static const struct builtincmd builtintab[] = {
         { BUILTIN_SPEC_REG      "return"  , returncmd  },
         { BUILTIN_SPEC_REG      "set"     , setcmd     },
         { BUILTIN_SPEC_REG      "shift"   , shiftcmd   },
+#if ENABLE_ASH_SLEEP
+        { BUILTIN_REGULAR       "sleep"   , sleepcmd   },
+#endif
 #if BASH_SOURCE
         { BUILTIN_SPEC_REG      "source"  , dotcmd     },
 #endif
diff --git a/shell/ash_test/ash-heredoc/heredoc_and_cmd.right b/shell/ash_test/ash-heredoc/heredoc_and_cmd.right
new file mode 100644
index 000000000..25ae70561
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_and_cmd.right
@@ -0,0 +1,2 @@
+./heredoc_and_cmd.tests: line 4: D: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+Y
diff --git a/shell/ash_test/ash-heredoc/heredoc_and_cmd.tests b/shell/ash_test/ash-heredoc/heredoc_and_cmd.tests
new file mode 100755
index 000000000..197542de7
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_and_cmd.tests
@@ -0,0 +1,8 @@
+# The bug was only happening with <<REDIR;CMD form below:
+M='AAAAAAAAAAAAAAAAA'
+fff(){
+date <<000; echo Y
+${D?$M$M$M$M$M$M}
+000
+}
+fff
diff --git a/shell/hush_test/hush-heredoc/heredoc_and_cmd.right b/shell/hush_test/hush-heredoc/heredoc_and_cmd.right
new file mode 100644
index 000000000..5c19a0621
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc_and_cmd.right
@@ -0,0 +1,2 @@
+hush: D: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+Y
diff --git a/shell/hush_test/hush-heredoc/heredoc_and_cmd.tests b/shell/hush_test/hush-heredoc/heredoc_and_cmd.tests
new file mode 100755
index 000000000..197542de7
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc_and_cmd.tests
@@ -0,0 +1,8 @@
+# The bug was only happening with <<REDIR;CMD form below:
+M='AAAAAAAAAAAAAAAAA'
+fff(){
+date <<000; echo Y
+${D?$M$M$M$M$M$M}
+000
+}
+fff