From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 7 May 2012 20:32:44 +0000 (-0400)
Subject: Bash-4.2 direxpand with patch 26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfa29a60954130f5d9a2b343b97455eb25098278;p=thirdparty%2Fbash.git

Bash-4.2 direxpand with patch 26
---

diff --git a/execute_cmd.c b/execute_cmd.c
index 3f9c1507b..7432c85fe 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 c8093cc17..b5a234ff8 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_ */