d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Fix two things about {(...)} <redir:

Browse Source 
* In {(...) <redir1;} <redir2, do not drop redir1.
* Maintain the difference between (...) <redir and {(...)} <redir:
  In (...) <redir, the redirection is performed in the child, while in
  {(...)} <redir it should be performed in the parent (like {(...); :;}
  <redir)
This commit is contained in:
Jilles Tjoelker 2011-02-05 15:02:19 +00:00
parent c059d82290
commit b15e9aa322
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/sh/parser.c
View File

@ -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;

3
tools/regression/bin/sh/execution/redir5.0 Normal file
View File

@ -0,0 +1,3 @@
# $FreeBSD$
{ (echo bad) >/dev/null; } </dev/null