diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2011-08-14 18:34:27 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2011-08-14 18:34:27 +0000 |
| commit | 516ea294b8645fa910200096098575c39a55547a (patch) | |
| tree | 64c934a814f14f23dfafc75dbd2e7497095da1f5 /Src/signals.c | |
| parent | 8af2cbd1f213dc7864c84dae869a705d03cf83d5 (diff) | |
| download | zsh-516ea294b8645fa910200096098575c39a55547a.tar.gz zsh-516ea294b8645fa910200096098575c39a55547a.tar.xz zsh-516ea294b8645fa910200096098575c39a55547a.zip | |
29677: Do not allow external processes in a pipeline to become suspended
when the end of the pipe is controlled by a builtin in the current shell which cannot itself become suspended.
Diffstat (limited to 'Src/signals.c')
| -rw-r--r-- | Src/signals.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Src/signals.c b/Src/signals.c index 81949843f..dd39158d0 100644 --- a/Src/signals.c +++ b/Src/signals.c @@ -490,14 +490,21 @@ wait_for_processes(void) * update it. */ if (findproc(pid, &jn, &pn, 0)) { + if (((jn->stat & STAT_BUILTIN) || + (list_pipe && (jobtab[thisjob].stat & STAT_BUILTIN))) && + WIFSTOPPED(status) && WSTOPSIG(status) == SIGTSTP) { + killjb(jn, SIGCONT); + zwarn("job can't be suspended"); + } else { #if defined(HAVE_WAIT3) && defined(HAVE_GETRUSAGE) - struct timezone dummy_tz; - gettimeofday(&pn->endtime, &dummy_tz); - pn->status = status; - pn->ti = ru; + struct timezone dummy_tz; + gettimeofday(&pn->endtime, &dummy_tz); + pn->status = status; + pn->ti = ru; #else - update_process(pn, status); + update_process(pn, status); #endif + } update_job(jn); } else if (findproc(pid, &jn, &pn, 1)) { pn->status = status; |