fix: use SYSCONFDIR in error message

[i3/i3status] / src / process_runs.c

diff --git a/src/process_runs.c b/src/process_runs.c
index bf4e919097c1f63a7f50c237d9f7c0028a6d7298..08963a0abe49920e51c76e455f29db36a324b1a4 100644 (file)
--- a/src/process_runs.c
+++ b/src/process_runs.c
@@ -1,56 +1,50 @@
-// vim:ts=8:expandtab
+// vim:ts=4:sw=4:expandtab
+#include <config.h>
 #include <stdbool.h>
 #include <glob.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
-
-#ifndef LINUX
-/* TODO: correctly check for *BSD */
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/resource.h>
-#endif
+#include <errno.h>
+#include <signal.h>
 
 #include "i3status.h"
 
 /*
- * Checks if the PID in path is still valid by checking:
- *  (Linux) if /proc/<pid> exists
- *  (NetBSD) if sysctl returns process infos for this pid
+ * Checks if the PID in path is still valid by sending signal 0 (does not do
+ * anything). kill() will return ESRCH if the process does not exist and 0 or
+ * EPERM (depending on the uid) if it exists.
+ *
+ * If multiple files match the glob pattern, all of them will be checked until
+ * the first running process is found.
  *
  */
 bool process_runs(const char *path) {
-        char pidbuf[16];
-        static glob_t globbuf;
-        int fd;
-        memset(pidbuf, 0, sizeof(pidbuf));
+    static char pidbuf[16];
+    static glob_t globbuf;
+    memset(pidbuf, 0, sizeof(pidbuf));
 
-        if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0)
-                die("glob() failed\n");
-        fd = open((globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path), O_RDONLY);
+    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) != 0)
+        die("glob() failed\n");
+    if (globbuf.gl_pathc == 0) {
+        /* No glob matches, the specified path does not contain a wildcard. */
         globfree(&globbuf);
-        if (fd < 0)
-                return false;
-        (void)read(fd, pidbuf, sizeof(pidbuf));
-        (void)close(fd);
+        if (!slurp(path, pidbuf, sizeof(pidbuf)))
+            return false;
+        return (kill(strtol(pidbuf, NULL, 10), 0) == 0 || errno == EPERM);
+    }
+    for (size_t i = 0; i < globbuf.gl_pathc; i++) {
+        if (!slurp(globbuf.gl_pathv[i], pidbuf, sizeof(pidbuf))) {
+            globfree(&globbuf);
+            return false;
+        }
+        if (kill(strtol(pidbuf, NULL, 10), 0) == 0 || errno == EPERM) {
+            globfree(&globbuf);
+            return true;
+        }
+    }
+    globfree(&globbuf);
 
-#ifdef LINUX
-        struct stat statbuf;
-        char procbuf[512];
-        (void)snprintf(procbuf, sizeof(procbuf), "/proc/%ld", strtol(pidbuf, NULL, 10));
-        return (stat(procbuf, &statbuf) >= 0);
-#else
-        /* TODO: correctly check for NetBSD. Evaluate if this runs on OpenBSD/FreeBSD */
-        struct kinfo_proc info;
-        size_t length = sizeof(struct kinfo_proc);
-        int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, strtol(pidbuf, NULL, 10) };
-        if (sysctl(mib, 4, &info, &length, NULL, 0) < 0)
-                return false;
-        return (length != 0);
-#endif
+    return false;
 }