From c811de8fb7ada54a3bfb19f9834ad026cacaf42c Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 17 Aug 2011 11:46:35 -0600 Subject: [PATCH] build: fix virpidfile on mingw Regression introduced in commit b7e5ca4. Mingw lacks kill(), but we were only using it for a sanity check; so we can go with one less check. Also, on OOM error, this function should outright fail rather than claim that the pid file was successfully read. * src/util/virpidfile.c (virPidFileReadPathIfAlive): Skip kill call where unsupported, and report error on OOM. --- src/util/virpidfile.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index e64b0b3139..8206e1a6d5 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -200,15 +200,18 @@ int virPidFileReadPathIfAlive(const char *path, if (rc < 0) return rc; - /* Check that it's still alive */ +#ifndef WIN32 + /* Check that it's still alive. Safe to skip this sanity check on + * mingw, which lacks kill(). */ if (kill(*pid, 0) < 0) { *pid = -1; return 0; } +#endif if (virAsprintf(&procpath, "/proc/%d/exe", *pid) < 0) { *pid = -1; - return 0; + return -1; } if (virFileIsLink(procpath) && -- GitLab