diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2015-01-15 10:20:45 -0500 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2015-02-19 15:44:13 -0600 |
| commit | c6a8bcd4a5660e7d0bc4759f08a272c97bea369d (patch) | |
| tree | 0c126019d8b457dca966edb23f4451481ed9ced9 | |
| parent | 2b8818c04d17ef1268001609123647df95d5d219 (diff) | |
| download | android_external_bash-c6a8bcd4a5660e7d0bc4759f08a272c97bea369d.tar.gz android_external_bash-c6a8bcd4a5660e7d0bc4759f08a272c97bea369d.tar.bz2 android_external_bash-c6a8bcd4a5660e7d0bc4759f08a272c97bea369d.zip | |
Bash-4.3 patch 32
Change-Id: I0d7aeffa95fd5d5f109b561ed91b2625d801d1f0
| -rw-r--r-- | jobs.c | 4 | ||||
| -rw-r--r-- | patchlevel.h | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -3339,7 +3339,9 @@ itrace("waitchld: waitpid returns %d block = %d", pid, block); if (posixly_correct && this_shell_builtin && this_shell_builtin == wait_builtin) { interrupt_immediately = 0; - trap_handler (SIGCHLD); /* set pending_traps[SIGCHLD] */ + /* This was trap_handler (SIGCHLD) but that can lose traps if + children_exited > 1 */ + queue_sigchld_trap (children_exited); wait_signal_received = SIGCHLD; /* If we're in a signal handler, let CHECK_WAIT_INTR pick it up; run_pending_traps will call run_sigchld_trap later */ diff --git a/patchlevel.h b/patchlevel.h index 0ad46aa..b8bf387 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 31 +#define PATCHLEVEL 32 #endif /* _PATCHLEVEL_H_ */ |