From: Chet Ramey <chet.ramey@case.edu>
Date: Wed, 17 Nov 2021 21:45:23 +0000 (-0500)
Subject: Bash-5.1 patch 10: fix for wait -n being interrupted by a trapped signal
X-Git-Tag: bash-5.2-alpha~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=910fcdc415abeb3d7d85fb46ee0d3e804a4c47a6;p=thirdparty%2Fbash.git

Bash-5.1 patch 10: fix for wait -n being interrupted by a trapped signal
---

diff --git a/builtins/wait.def b/builtins/wait.def
index 824c83fe1..e70a4d942 100644
--- a/builtins/wait.def
+++ b/builtins/wait.def
@@ -111,7 +111,8 @@ int
 wait_builtin (list)
      WORD_LIST *list;
 {
-  int status, code, opt, nflag, wflags;
+  int status, code, opt, nflag;
+  volatile int wflags;
   char *vname;
   SHELL_VAR *pidvar;
   struct procstat pstat;
@@ -180,6 +181,8 @@ wait_builtin (list)
       last_command_exit_signal = wait_signal_received;
       status = 128 + wait_signal_received;
       wait_sigint_cleanup ();
+      if (wflags & JWAIT_WAITING)
+	unset_waitlist ();
       WAIT_RETURN (status);
     }
 
diff --git a/patchlevel.h b/patchlevel.h
index 17586ff7f..75246e445 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 9
+#define PATCHLEVEL 10
 
 #endif /* _PATCHLEVEL_H_ */