diff options
| -rw-r--r-- | bin/sh/parser.c | 5 | ||||
| -rw-r--r-- | tools/regression/bin/sh/execution/redir5.0 | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bin/sh/parser.c b/bin/sh/parser.c index 4a2ffa4..f883dff 100644 --- a/bin/sh/parser.c +++ b/bin/sh/parser.c @@ -389,8 +389,10 @@ command(void) union node *cp, **cpp; union node *redir, **rpp; int t; + int is_subshell; checkkwd = CHKNL | CHKKWD | CHKALIAS; + is_subshell = 0; redir = NULL; n1 = NULL; rpp = &redir; @@ -558,6 +560,7 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : "")); if (readtoken() != TRP) synexpect(TRP); checkkwd = CHKKWD | CHKALIAS; + is_subshell = 1; break; case TBEGIN: n1 = list(0, 0); @@ -596,7 +599,7 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : "")); tokpushback++; *rpp = NULL; if (redir) { - if (n1->type != NSUBSHELL) { + if (!is_subshell) { n2 = (union node *)stalloc(sizeof (struct nredir)); n2->type = NREDIR; n2->nredir.n = n1; diff --git a/tools/regression/bin/sh/execution/redir5.0 b/tools/regression/bin/sh/execution/redir5.0 new file mode 100644 index 0000000..707ca68 --- /dev/null +++ b/tools/regression/bin/sh/execution/redir5.0 @@ -0,0 +1,3 @@ +# $FreeBSD$ + +{ (echo bad) >/dev/null; } </dev/null |
