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

Bash-4.2 patch 26

Browse source
This commit is contained in:
Chet Ramey 2012-05-07 16:23:06 -04:00
commit 7234797715
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
execute_cmd.c
View file

@ -2205,7 +2205,7 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
current shell environment. */ current shell environment. */
if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
{ {
lstdin = move_to_high_fd (0, 0, 255); lstdin = move_to_high_fd (0, 1, -1);
if (lstdin > 0) if (lstdin > 0)
{ {
do_piping (prev, pipe_out); do_piping (prev, pipe_out);
@ -2251,7 +2251,9 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
unfreeze_jobs_list (); unfreeze_jobs_list ();
} }
#if defined (JOB_CONTROL)
discard_unwind_frame ("lastpipe-exec"); discard_unwind_frame ("lastpipe-exec");
#endif
return (exec_result); return (exec_result);
} }

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 25 #define PATCHLEVEL 26
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */