Skip to content

Commit 8061f8f

Browse files
author
Chet Ramey
committed
Bash-4.3 patch 43
1 parent ae339e9 commit 8061f8f

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

execute_cmd.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2405,9 +2405,17 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
24052405
if (lastpipe_flag)
24062406
{
24072407
#if defined (JOB_CONTROL)
2408-
append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid);
2409-
#endif
2408+
if (INVALID_JOB (lastpipe_jid) == 0)
2409+
{
2410+
append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid);
2411+
lstdin = wait_for (lastpid);
2412+
}
2413+
else
2414+
lstdin = wait_for_single_pid (lastpid); /* checks bgpids list */
2415+
#else
24102416
lstdin = wait_for (lastpid);
2417+
#endif
2418+
24112419
#if defined (JOB_CONTROL)
24122420
/* If wait_for removes the job from the jobs table, use result of last
24132421
command as pipeline's exit status as usual. The jobs list can get

patchlevel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
2626
looks for to find the patch level (for the sccs version string). */
2727

28-
#define PATCHLEVEL 42
28+
#define PATCHLEVEL 43
2929

3030
#endif /* _PATCHLEVEL_H_ */

0 commit comments

Comments
 (0)