Merge branch 'busybox' into merge

2 files changed, 11 insertions, 0 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 87df555dd..09e8725bf 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -8096,6 +8096,8 @@ subevalvar(char *start, char *str, int strloc,
                                 char *restart_detect = stackblock();
                                 if (quotes && *loc == '\\') {
                                         STPUTC(CTLESC, expdest);
+                                        if (stackblock() != restart_detect)
+                                                goto restart;
                                         len++;
                                 }
                                 STPUTC(*loc, expdest);
diff --git a/shell/hush.c b/shell/hush.c
index f8951d084..810dafd35 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1429,6 +1429,7 @@ static void syntax_error_unterm_str(unsigned lineno UNUSED_PARAM, const char *s)
 {
         bb_error_msg("syntax error: unterminated %s", s);
 //? source4.tests fails: in bash, echo ${^} in script does not terminate the script
+// (but bash --posix, or if bash is run as "sh", does terminate in script, so maybe uncomment this?)
 //      die_if_script();
 }
 
@@ -7589,6 +7590,14 @@ static void parse_and_run_stream(struct in_str *inp, int end_trigger)
                                 }
                                 /* Force prompt */
                                 inp->p = NULL;
+                                /* Clear "peeked" EOF. Without this,
+                                 *  $ { cmd }<Enter>
+                                 *  > ^D
+                                 *  hush: syntax error: unterminated {
+                                 * exits interactive shell:
+                                 */
+                                if (inp->peek_buf[0] == EOF)
+                                        inp->peek_buf[0] = 0;
                                 /* This stream isn't empty */
                                 empty = 0;
                                 continue;