util: don't send SIGCONT following a SIGCONT or SIGKILL in kill_and_sigcont()

[elogind.git] / src / basic / process-util.c

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 2912529795678e6fa7b38f34649e35dd9703ca31..c976f1f6891fda039fae84296acd91acba26aa2f 100644 (file)
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -631,8 +631,10 @@ int kill_and_sigcont(pid_t pid, int sig) {
 
         r = kill(pid, sig) < 0 ? -errno : 0;
 
-        if (r >= 0)
-                kill(pid, SIGCONT);
+        /* If this worked, also send SIGCONT, unless we already just sent a SIGCONT, or SIGKILL was sent which isn't
+         * affected by a process being suspended anyway. */
+        if (r >= 0 && !IN_SET(SIGCONT, SIGKILL))
+                (void) kill(pid, SIGCONT);
 
         return r;
 }