aboutsummaryrefslogtreecommitdiffstats
path: root/execute_cmd.c
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2012-05-07 16:23:06 -0400
committerChet Ramey <chet.ramey@case.edu>2012-05-07 16:23:06 -0400
commit723479771597fa6dbbe6353aedf18e90f80afab5 (patch)
treee565d68400c3d8707dbe0d1af3d72136e63f4080 /execute_cmd.c
parent6d41b71587a48f90a555846477b2ff6a976d766d (diff)
downloadandroid_external_bash-723479771597fa6dbbe6353aedf18e90f80afab5.tar.gz
android_external_bash-723479771597fa6dbbe6353aedf18e90f80afab5.tar.bz2
android_external_bash-723479771597fa6dbbe6353aedf18e90f80afab5.zip
Bash-4.2 patch 26
Diffstat (limited to 'execute_cmd.c')
-rw-r--r--execute_cmd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/execute_cmd.c b/execute_cmd.c
index 3f9c150..7432c85 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);
}