From 02ea8ff2a4f8d592ef57493188c2648b7b8c5772 Mon Sep 17 00:00:00 2001 From: Paul Ackersviller Date: Sun, 11 Nov 2007 21:20:37 +0000 Subject: Merge of 22277, 22281 plus tweaks: standardize behaviour of using wait builtin with trapped signals. --- Src/exec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Src/exec.c') 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; -- cgit 1.4.1