From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 27 Aug 2018 14:29:25 +0000 (-0400)
Subject: commit bash-20180824 snapshot
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b481dd38072504d0fbeef3709bac021336b0561;p=thirdparty%2Fbash.git

commit bash-20180824 snapshot
---

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index 59f93ba93..236ee9ba0 100644
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -4237,3 +4237,11 @@ execute_cmd.c
 	  causing jobs to be removed from the jobs table. Fixes savannah issue
 	  https://savannah.gnu.org/support/index.php?109541 reported by
 	  Björn Kautler <vampire0>
+
+				   8/24
+				   ----
+execute_cmd.c
+	- lastpipe_cleanup: call set_jobs_list_frozen instead of
+	  unfreeze_jobs_list
+	- execute_pipeline: set up lastpipe_cleanup with old value of
+	  jobs_list_frozen
diff --git a/execute_cmd.c b/execute_cmd.c
index 68b930063..c5972c8d0 100644
--- a/execute_cmd.c
+++ b/execute_cmd.c
@@ -2438,7 +2438,7 @@ static void
 lastpipe_cleanup (s)
      int s;
 {
-  unfreeze_jobs_list ();
+  set_jobs_list_frozen (s);
 }
 
 static int
@@ -2565,7 +2565,7 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
 	  lastpipe_flag = 1;
 	  old_frozen = freeze_jobs_list ();
 	  lastpipe_jid = stop_pipeline (0, (COMMAND *)NULL);	/* XXX */
-	  add_unwind_protect (lastpipe_cleanup, lastpipe_jid);
+	  add_unwind_protect (lastpipe_cleanup, old_frozen);
 	}
       if (cmd)
 	cmd->flags |= CMD_LASTPIPE;