From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 27 Oct 2015 13:02:45 +0000 (+0100)
Subject: process-util: make some minor corrections to PID live detection
X-Git-Tag: v228~140^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5fd9b2c5467b0a42ccdabc7eb8e516d512609a8e;p=thirdparty%2Fsystemd.git

process-util: make some minor corrections to PID live detection
---

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 0b7e3010e06..a737686ab0c 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -595,9 +595,12 @@ int getenv_for_pid(pid_t pid, const char *field, char **_value) {
 bool pid_is_unwaited(pid_t pid) {
         /* Checks whether a PID is still valid at all, including a zombie */
 
-        if (pid <= 0)
+        if (pid < 0)
                 return false;
 
+        if (pid <= 1) /* If we or PID 1 would be dead and have been waited for, this code would not be running */
+                return true;
+
         if (kill(pid, 0) >= 0)
                 return true;
 
@@ -609,9 +612,12 @@ bool pid_is_alive(pid_t pid) {
 
         /* Checks whether a PID is still valid and not a zombie */
 
-        if (pid <= 0)
+        if (pid < 0)
                 return false;
 
+        if (pid <= 1) /* If we or PID 1 would be a zombie, this code would not be running */
+                return true;
+
         r = get_process_state(pid);
         if (r == -ESRCH || r == 'Z')
                 return false;