diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-10-04 21:33:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 21:33:52 +0200 |
| commit | 03d4358277f7056cb679113e8cea9d590f0ad5df (patch) | |
| tree | db90aa45aacd281b2bc3cd08c1a746b0cb012d3a /src/basic/process-util.c | |
| parent | e65270ad1227e07659803acfba502a10d73d0ca9 (diff) | |
| parent | 6f876815c6e8a06f07e27b7658e04d6d595d9584 (diff) | |
| download | systemd-03d4358277f7056cb679113e8cea9d590f0ad5df.tar.gz | |
Merge pull request #6975 from sourcejedi/logind_pid_0_v2
Selectively revert "tree-wide: use pid_is_valid() at more places"
Diffstat (limited to 'src/basic/process-util.c')
| -rw-r--r-- | src/basic/process-util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/basic/process-util.c b/src/basic/process-util.c index b1cdc4257d..99b0946a03 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -475,7 +475,7 @@ static int get_process_id(pid_t pid, const char *field, uid_t *uid) { assert(field); assert(uid); - if (!pid_is_valid(pid)) + if (pid < 0) return -EINVAL; p = procfs_file_alloca(pid, "status"); @@ -787,7 +787,7 @@ 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_is_valid(pid)) + 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 */ @@ -807,7 +807,7 @@ bool pid_is_alive(pid_t pid) { /* Checks whether a PID is still valid and not a zombie */ - if (!pid_is_valid(pid)) + if (pid < 0) return false; if (pid <= 1) /* If we or PID 1 would be a zombie, this code would not be running */ @@ -826,7 +826,7 @@ bool pid_is_alive(pid_t pid) { int pid_from_same_root_fs(pid_t pid) { const char *root; - if (!pid_is_valid(pid)) + if (pid < 0) return false; if (pid == 0 || pid == getpid_cached()) |