Bash-4.3 patch 43

This commit is contained in:
Chet Ramey
2016-06-20 15:14:03 -04:00
parent ae339e9c3c
commit 8061f8f11e
2 changed files with 11 additions and 3 deletions

View File

@@ -2405,9 +2405,17 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
if (lastpipe_flag) if (lastpipe_flag)
{ {
#if defined (JOB_CONTROL) #if defined (JOB_CONTROL)
append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid); if (INVALID_JOB (lastpipe_jid) == 0)
#endif {
append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid);
lstdin = wait_for (lastpid);
}
else
lstdin = wait_for_single_pid (lastpid); /* checks bgpids list */
#else
lstdin = wait_for (lastpid); lstdin = wait_for (lastpid);
#endif
#if defined (JOB_CONTROL) #if defined (JOB_CONTROL)
/* If wait_for removes the job from the jobs table, use result of last /* If wait_for removes the job from the jobs table, use result of last
command as pipeline's exit status as usual. The jobs list can get command as pipeline's exit status as usual. The jobs list can get

View File

@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 42 #define PATCHLEVEL 43
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */