lwp: Fix handling of sigismember() failure

[empserver] / src / lib / lwp / sig.c

diff --git a/src/lib/lwp/sig.c b/src/lib/lwp/sig.c
index 031066ec795bbdaece3bc249fe4540ff7ec89960..04fb9f97741dba4d645c893673d3a8aa4e029afe 100644 (file)
--- a/src/lib/lwp/sig.c
+++ b/src/lib/lwp/sig.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1994-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1994-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
  *  sig.c: Wait for signals
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2006-2007
+ *     Markus Armbruster, 2006-2020
  */
 
 #include <config.h>
@@ -39,13 +39,13 @@
 #include "lwpint.h"
 
 /*
- * Signals catched so far.
+ * Signals caught so far.
  * Access only with signals blocked!
  */
-static sigset_t LwpSigCatched;
+static sigset_t LwpSigCaught;
 
 /*
- * LwpSigCatched changed since last
+ * LwpSigCaught changed since last
  */
 static sig_atomic_t LwpSigCheck;
 
@@ -63,14 +63,13 @@ lwpInitSigWait(sigset_t *set)
     struct sigaction act;
     int i;
 
-    sigemptyset(&LwpSigCatched);
+    sigemptyset(&LwpSigCaught);
 
     act.sa_flags = 0;
     act.sa_mask = *set;
-    sigemptyset(&act.sa_mask);
     act.sa_handler = lwpCatchAwaitedSig;
     for (i = 0; i < NSIG; i++) {
-       if (sigismember(set, i))
+       if (sigismember(set, i) > 0)
            sigaction(i, &act, NULL);
     }
 }
@@ -78,13 +77,13 @@ lwpInitSigWait(sigset_t *set)
 static void
 lwpCatchAwaitedSig(int sig)
 {
-    sigaddset(&LwpSigCatched, sig);
+    sigaddset(&LwpSigCaught, sig);
     LwpSigCheck = 1;
 }
 
 /*
- * Test whether a signal from @set has been catched.
- * If yes, delete that signal from the set of catched signals, and
+ * Test whether a signal from @set has been caught.
+ * If yes, delete that signal from the set of caught signals, and
  * return its number.
  * Else return 0.
  */
@@ -96,9 +95,9 @@ lwpGetSig(sigset_t *set)
 
     sigprocmask(SIG_BLOCK, set, &save);
     for (i = NSIG - 1; i > 0; i--) {
-       if (sigismember(set, i) && sigismember(&LwpSigCatched, i)) {
+       if (sigismember(set, i) > 0 && sigismember(&LwpSigCaught, i) > 0) {
            lwpStatus(LwpCurrent, "Got awaited signal %d", i);
-           sigdelset(&LwpSigCatched, i);
+           sigdelset(&LwpSigCaught, i);
            break;
        }
     }
@@ -117,7 +116,7 @@ lwpSigWait(sigset_t *set, int *sig)
 {
     int res;
 
-    if (CANT_HAPPEN(LwpSigWaiter))
+    if (LwpSigWaiter)
        return EBUSY;
     for (;;) {
        LwpSigCheck = 0;