summary refs log tree commit diff
path: root/src/trap.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2020-06-02 23:46:48 +1000
committerHerbert Xu <herbert@gondor.apana.org.au>2020-07-08 17:05:35 +1000
commit7249493949314557a5d22f52315713e5f9013e15 (patch)
tree38c20b531ce5cf47de35bff90baad79078540a82 /src/trap.c
parentRelease 0.5.11. (diff)
downloaddash-7249493949314557a5d22f52315713e5f9013e15.tar.gz
dash-7249493949314557a5d22f52315713e5f9013e15.zip
jobs: Fix waitcmd busy loop
We need to clear gotsigchld in waitproc because it is used as
a loop conditional for the waitcmd case.  Without it waitcmd
may busy loop after a SIGCHLD.

This patch also changes gotsigchld into a volatile sig_atomic_t
to prevent compilers from optimising its accesses away.

Fixes: 6c691b3e5099 ("jobs: Only clear gotsigchld when waiting...")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
-rw-r--r--src/trap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/trap.c b/src/trap.c
index 82e7ece..cd84814 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -76,7 +76,7 @@ static char gotsig[NSIG - 1];
 /* last pending signal */
 volatile sig_atomic_t pending_sig;
 /* received SIGCHLD */
-int gotsigchld;
+volatile sig_atomic_t gotsigchld;
 
 extern char *signal_names[];