diff options
| author | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-11 21:20:37 +0000 |
|---|---|---|
| committer | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-11 21:20:37 +0000 |
| commit | 02ea8ff2a4f8d592ef57493188c2648b7b8c5772 (patch) | |
| tree | 18bba974268bad3edefd097c444a62180af483b2 /Src/exec.c | |
| parent | a2579351a1a33f97fa14e3993b5091e04598f992 (diff) | |
| download | zsh-02ea8ff2a4f8d592ef57493188c2648b7b8c5772.tar.gz zsh-02ea8ff2a4f8d592ef57493188c2648b7b8c5772.tar.xz zsh-02ea8ff2a4f8d592ef57493188c2648b7b8c5772.zip | |
Merge of 22277, 22281 plus tweaks: standardize behaviour of using wait builtin with trapped signals.
Diffstat (limited to 'Src/exec.c')
| -rw-r--r-- | Src/exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Src/exec.c b/Src/exec.c index c69730f88..61d21be90 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -2896,7 +2896,7 @@ getoutput(char *cmd, int qt) zclose(pipes[1]); retval = readoutput(pipes[0], qt); fdtable[pipes[0]] = FDT_UNUSED; - waitforpid(pid); /* unblocks */ + waitforpid(pid, 0); /* unblocks */ lastval = cmdoutval; return retval; } @@ -3025,7 +3025,7 @@ getoutputfile(char *cmd) close(fd); os = jobtab[thisjob].stat; - waitforpid(pid); + waitforpid(pid, 0); cmdoutval = 0; jobtab[thisjob].stat = os; return nam; |