diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2012-05-07 16:23:06 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2012-05-07 16:23:06 -0400 |
| commit | 723479771597fa6dbbe6353aedf18e90f80afab5 (patch) | |
| tree | e565d68400c3d8707dbe0d1af3d72136e63f4080 | |
| parent | 6d41b71587a48f90a555846477b2ff6a976d766d (diff) | |
| download | bash-723479771597fa6dbbe6353aedf18e90f80afab5.tar.gz | |
Bash-4.2 patch 26
| -rw-r--r-- | execute_cmd.c | 4 | ||||
| -rw-r--r-- | patchlevel.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/execute_cmd.c b/execute_cmd.c index 3f9c1507..7432c85f 100644 --- a/execute_cmd.c +++ b/execute_cmd.c @@ -2205,7 +2205,7 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close) current shell environment. */ 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) { do_piping (prev, pipe_out); @@ -2251,7 +2251,9 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close) unfreeze_jobs_list (); } +#if defined (JOB_CONTROL) discard_unwind_frame ("lastpipe-exec"); +#endif return (exec_result); } diff --git a/patchlevel.h b/patchlevel.h index c8093cc1..b5a234ff 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 25 +#define PATCHLEVEL 26 #endif /* _PATCHLEVEL_H_ */ |