hush: fix an interactive abort on error

function                                             old     new   delta
parse_and_run_stream                                 140     155     +15

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/shell/hush.c b/shell/hush.c
index f8951d084..ac8e44778 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7589,6 +7589,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;