commit bash-snap-20170612 snapshot

This commit is contained in:
Chet Ramey
2017-06-12 18:50:04 -04:00
parent e7cc795a7d
commit db0eba9aa8
3 changed files with 14 additions and 4 deletions
+7
View File
@@ -14047,3 +14047,10 @@ lib/readline/mbutil.c
- _rl_get_char_len: use MB_CUR_MAX in the call to mbrlen; there's no
need to look at the rest of the string when we're just interested in
the length of a single character
6/12
----
jobs.c
- wait_for: when waiting for the next child to exit (ANY_PID), make
sure to restore the old SIGINT handler before returning. Fixes
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=864649
+1 -1
View File
@@ -386,7 +386,7 @@ read_builtin (list)
sync_buffered_stream (default_buffered_input);
#endif
#if 0
#if 1
input_is_tty = isatty (fd);
#else
input_is_tty = 1;
+6 -3
View File
@@ -2826,9 +2826,12 @@ itrace("wait_for: blocking wait for %d returns %d child = %p", (int)pid, r, chil
CHECK_WAIT_INTR;
if (pid == ANY_PID)
/* XXX - could set child but we don't have a handle on what waitchld
reaps. Leave termination_state alone. */
goto wait_for_return;
{
/* XXX - could set child but we don't have a handle on what waitchld
reaps. Leave termination_state alone. */
restore_sigint_handler ();
goto wait_for_return;
}
}
while (PRUNNING (child) || (job != NO_JOB && RUNNING (job)));