diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/exec.c | 27 |
2 files changed, 26 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index ddf0e1143..16b757a01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-10-29 Peter Stephenson <pws@csr.com> + + * 20528: Src/exec.c: Clint spotted that fix in 18492 to make + > >(...) synchronous failed in the case of an fd opened for the + shell's own use with an exec. + 2004-10-26 Peter Stephenson <pws@csr.com> * 20522: Src/glob.c, Test/D02glob.ztst: must-match optimisation diff --git a/Src/exec.c b/Src/exec.c index cdde2df25..c5fac2fc9 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -2205,7 +2205,7 @@ execcmd(Estate state, int input, int output, int how, int last1) /* Do process substitutions */ if (redir) - spawnpipes(redir); + spawnpipes(redir, nullexec); /* Do io redirections */ while (redir && nonempty(redir)) { @@ -3113,11 +3113,17 @@ getproc(char *cmd) #endif /* HAVE_FIFOS and PATH_DEV_FD not defined */ } -/* > >(...) or < <(...) (does not use named pipes) */ +/* + * > >(...) or < <(...) (does not use named pipes) + * + * If the second argument is 1, this is part of + * an "exec < <(...)" or "exec > >(...)" and we shouldn't + * wait for the job to finish before continuing. + */ /**/ static int -getpipe(char *cmd) +getpipe(char *cmd, int nullexec) { Eprog prog; int pipes[2], out = *cmd == Inang; @@ -3133,7 +3139,8 @@ getpipe(char *cmd) zclose(pipes[!out]); return -1; } - addproc(pid, NULL, 1, &bgtime); + if (!nullexec) + addproc(pid, NULL, 1, &bgtime); return pipes[!out]; } entersubsh(Z_ASYNC, 1, 0, 0); @@ -3157,11 +3164,17 @@ mpipe(int *pp) pp[1] = movefd(pp[1]); } -/* Do process substitution with redirection */ +/* + * Do process substitution with redirection + * + * If the second argument is 1, this is part of + * an "exec < <(...)" or "exec > >(...)" and we shouldn't + * wait for the job to finish before continuing. + */ /**/ static void -spawnpipes(LinkList l) +spawnpipes(LinkList l, int nullexec) { LinkNode n; Redir f; @@ -3172,7 +3185,7 @@ spawnpipes(LinkList l) f = (Redir) getdata(n); if (f->type == REDIR_OUTPIPE || f->type == REDIR_INPIPE) { str = f->name; - f->fd2 = getpipe(str); + f->fd2 = getpipe(str, nullexec); } } } |