hush: fix hush-bugs/parse_err.tests

function                                             old     new   delta
parse_stream                                        2325    2339     +14
builtin_umask                                        121     123      +2
builtin_type                                         116     114      -2

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

1 files changed, 9 insertions, 4 deletions

diff --git a/shell/hush.c b/shell/hush.c
index 07cacbfc9..1bc0c611d 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -6232,10 +6232,15 @@ static struct pipe *parse_stream(char **pstring,
                 is_special = "{}<>;&|()#'" /* special outside of "str" */
                                 "\\$\"" IF_HUSH_TICK("`"); /* always special */
                 /* Are { and } special here? */
-                if (ctx.command->argv /* word [word]{... */
-                 || dest.length /* word{... */
-                 || dest.o_quoted /* ""{... */
-                 || (next != ';' && next != ')' && !strchr(G.ifs, next)) /* {word */
+                if (ctx.command->argv /* word [word]{... - non-special */
+                 || dest.length       /* word{... - non-special */
+                 || dest.o_quoted     /* ""{... - non-special */
+                 || (next != ';'            /* }; - special */
+                    && next != ')'          /* }) - special */
+                    && next != '&'          /* }& and }&& ... - special */
+                    && next != '|'          /* }|| ... - special */
+                    && !strchr(G.ifs, next) /* {word - non-special */
+                    )
                 ) {
                         /* They are not special, skip "{}" */
                         is_special += 2;