lwp: Rewrite signal wait code for portability and safety

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

diff --git a/src/lib/empthread/lwp.c b/src/lib/empthread/lwp.c
index 376fc62299efad6de290e036b82a0ba187b14361..d26eae7c889c03c2325e12a55841f2df46973730 100644 (file)
--- a/src/lib/empthread/lwp.c
+++ b/src/lib/empthread/lwp.c
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Sasha Mikheev
- *     Markus Armbruster, 2006-2009
+ *     Markus Armbruster, 2006-2020
  */
 
 #include <config.h>
@@ -42,23 +42,16 @@
 /* Flags that were passed to empth_init() */
 static int empth_flags;
 
-
 int
 empth_init(void **ctx, int flags)
 {
-    sigset_t set;
-
+    static int sig[] = { SIGHUP, SIGINT, SIGTERM, 0 };
     empth_flags = flags;
     empth_init_signals();
-    sigemptyset(&set);
-    sigaddset(&set, SIGHUP);
-    sigaddset(&set, SIGINT);
-    sigaddset(&set, SIGTERM);
-    lwpInitSystem(1, ctx, flags, &set);
+    lwpInitSystem(1, ctx, flags, sig);
     return 0;
 }
 
-
 empth_t *
 empth_create(void (*entry)(void *), int size, int flags,
             char *name, void *ud)
@@ -124,17 +117,12 @@ empth_sleep(time_t until)
 int
 empth_wait_for_signal(void)
 {
-    sigset_t set;
     int sig, err;
     time_t now;
 
     ef_make_stale();
-    sigemptyset(&set);
-    sigaddset(&set, SIGHUP);
-    sigaddset(&set, SIGINT);
-    sigaddset(&set, SIGTERM);
     for (;;) {
-       err = lwpSigWait(&set, &sig);
+       err = lwpSigWait(&sig);
        if (CANT_HAPPEN(err)) {
            time(&now);
            lwpSleepUntil(now + 60);