From: Chet Ramey <chet.ramey@case.edu>
Date: Fri, 1 Aug 2014 19:31:14 +0000 (-0400)
Subject: Bash-4.3 patch 22
X-Git-Tag: upstream/4.3.25~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df2c55de9c87c2ee8904280d26e80f5c48dd6434;p=platform%2Fupstream%2Fbash.git

Bash-4.3 patch 22
---

diff --git a/execute_cmd.c b/execute_cmd.c
index f9a755d..9cebaef 100644
--- a/execute_cmd.c
+++ b/execute_cmd.c
@@ -2409,7 +2409,16 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
 #endif
       lstdin = wait_for (lastpid);
 #if defined (JOB_CONTROL)
-      exec_result = job_exit_status (lastpipe_jid);
+      /* If wait_for removes the job from the jobs table, use result of last
+	 command as pipeline's exit status as usual.  The jobs list can get
+	 frozen and unfrozen at inconvenient times if there are multiple pipelines
+	 running simultaneously. */
+      if (INVALID_JOB (lastpipe_jid) == 0)
+	exec_result = job_exit_status (lastpipe_jid);
+      else if (pipefail_opt)
+	exec_result = exec_result | lstdin;	/* XXX */
+      /* otherwise we use exec_result */
+        
 #endif
       unfreeze_jobs_list ();
     }
diff --git a/patchlevel.h b/patchlevel.h
index bc7f5f8..c8605ba 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 21
+#define PATCHLEVEL 22
 
 #endif /* _PATCHLEVEL_H_ */