dmbcs/i-bash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bash-4.2 patch 18

Browse source
This commit is contained in:
Chet Ramey 2011-11-22 20:03:16 -05:00
commit 335de49a72
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
execute_cmd.c
View file

@ -2196,6 +2196,7 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
if (ignore_return && cmd) if (ignore_return && cmd)
cmd->flags |= CMD_IGNORE_RETURN; cmd->flags |= CMD_IGNORE_RETURN;
#if defined (JOB_CONTROL)
lastpipe_flag = 0; lastpipe_flag = 0;
begin_unwind_frame ("lastpipe-exec"); begin_unwind_frame ("lastpipe-exec");
lstdin = -1; lstdin = -1;
@ -2215,15 +2216,19 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
lastpipe_jid = stop_pipeline (0, (COMMAND *)NULL); /* XXX */ lastpipe_jid = stop_pipeline (0, (COMMAND *)NULL); /* XXX */
add_unwind_protect (lastpipe_cleanup, lastpipe_jid); add_unwind_protect (lastpipe_cleanup, lastpipe_jid);
} }
if (cmd)
cmd->flags |= CMD_LASTPIPE; cmd->flags |= CMD_LASTPIPE;
} }
if (prev >= 0) if (prev >= 0)
add_unwind_protect (close, prev); add_unwind_protect (close, prev);
#endif
exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close); exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close);
#if defined (JOB_CONTROL)
if (lstdin > 0) if (lstdin > 0)
restore_stdin (lstdin); restore_stdin (lstdin);
#endif
if (prev >= 0) if (prev >= 0)
close (prev); close (prev);

2
patchlevel.h
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 17 #define PATCHLEVEL 18
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */