39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
|
From 910fcdc415abeb3d7d85fb46ee0d3e804a4c47a6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Chet Ramey <chet.ramey@case.edu>
|
||
|
|
Date: Wed, 17 Nov 2021 16:45:23 -0500
|
||
|
|
Subject: [PATCH] Bash-5.1 patch 10: fix for wait -n being interrupted by a
|
||
|
|
trapped signal
|
||
|
|
|
||
|
|
Conflict:NA
|
||
|
|
Reference:https://git.savannah.gnu.org/cgit/bash.git/commit/?id=910fcdc415abeb3d7d85fb46ee0d3e804a4c47a6
|
||
|
|
---
|
||
|
|
builtins/wait.def | 5 ++++-
|
||
|
|
1 files changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/builtins/wait.def b/builtins/wait.def
|
||
|
|
index 824c83fe..e70a4d94 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);
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|