From 8e12a6aed3d99ac8c140cd56b560f5efeb1c4e1a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 15 Sep 2010 14:48:59 +0200
Subject: [PATCH] util: use waitid() instead of waitpid() everywhere to avoid
 confusion due to SIGSTOP

---
 src/kmod-setup.c | 18 ++++++++++--------
 src/main.c       |  9 +++++----
 src/util.c       |  6 ++++--
 src/util.h       |  2 +-
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/kmod-setup.c b/src/kmod-setup.c
index 0bcad3ce..44d843db 100644
--- a/src/kmod-setup.c
+++ b/src/kmod-setup.c
@@ -41,7 +41,8 @@ int kmod_setup(void) {
         ExecCommand command;
         ExecContext context;
         pid_t pid;
-        int status, r;
+        int r;
+        siginfo_t status;
 
         for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) {
 
@@ -76,21 +77,22 @@ int kmod_setup(void) {
         if (r < 0)
                 return r;
 
-        if ((r = waitpid_loop(pid, &status)) < 0)
+        if ((r = wait_for_terminate(pid, &status)) < 0)
                 return -errno;
 
-        if (WIFEXITED(status)) {
-                if (WEXITSTATUS(status) != 0) {
-                        log_warning("/sbin/modprobe failed with error code %i.", WEXITSTATUS(status));
+        if (status.si_code == CLD_EXITED) {
+                if (status.si_status != 0) {
+                        log_warning("/sbin/modprobe failed with error code %i.", status.si_status);
                         return -EPROTO;
                 }
 
                 log_debug("/sbin/modprobe succeeded.");
                 return 0;
-        }
 
-        if (WIFSIGNALED(status)) {
-                log_warning("/sbin/modprobe terminated by signal %s.", signal_to_string(WTERMSIG(status)));
+        } else if (status.si_code == CLD_KILLED ||
+                   status.si_code == CLD_DUMPED) {
+
+                log_warning("/sbin/modprobe terminated by signal %s.", signal_to_string(status.si_status));
                 return -EPROTO;
         }
 
diff --git a/src/main.c b/src/main.c
index dc561a9b..e4f229e3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -119,12 +119,13 @@ _noreturn_ static void crash(int sig) {
                         _exit(1);
 
                 } else {
-                        int status;
+                        siginfo_t status;
+                        int r;
 
                         /* Order things nicely. */
-                        if (waitpid(pid, &status, 0) < 0)
-                                log_error("Caught <%s>, waitpid() failed: %s", signal_to_string(sig), strerror(errno));
-                        else if (!WCOREDUMP(status))
+                        if ((r = wait_for_terminate(pid, &status)) < 0)
+                                log_error("Caught <%s>, waitpid() failed: %s", signal_to_string(sig), strerror(-r));
+                        else if (status.si_code != CLD_DUMPED)
                                 log_error("Caught <%s>, core dump failed.", signal_to_string(sig));
                         else
                                 log_error("Caught <%s>, dumped core as pid %lu.", signal_to_string(sig), (unsigned long) pid);
diff --git a/src/util.c b/src/util.c
index 805d47af..a3d6b497 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3101,12 +3101,14 @@ char *unquote(const char *s, const char quote) {
         return strdup(s);
 }
 
-int waitpid_loop(pid_t pid, int *status) {
+int wait_for_terminate(pid_t pid, siginfo_t *status) {
         assert(pid >= 1);
         assert(status);
 
         for (;;) {
-                if (waitpid(pid, status, 0) < 0) {
+                zero(*status);
+
+                if (waitid(P_PID, pid, status, WEXITED) < 0) {
 
                         if (errno == EINTR)
                                 continue;
diff --git a/src/util.h b/src/util.h
index 4bea1ecc..bdd4f15c 100644
--- a/src/util.h
+++ b/src/util.h
@@ -345,7 +345,7 @@ int touch(const char *path);
 
 char *unquote(const char *s, const char quote);
 
-int waitpid_loop(pid_t pid, int *status);
+int wait_for_terminate(pid_t pid, siginfo_t *status);
 
 #define NULSTR_FOREACH(i, l) \
         for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)
-- 
2.39.5