utils: add a function for checking if a process given by pid is still alive

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

diff --git a/handler.c b/handler.c
index 531b509c3f43f508e03e6f84939d2db873db3f22..f4e27e12c3b1d342b8e879a34e07b5a434151247 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -16,7 +16,6 @@
 #include <glob.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #include "netifd.h"
 #include "system.h"

diff --git a/interface-event.c b/interface-event.c
index 707764ae6d566b44aa41b307265e9ca5fe168e2c..3b0d1faca391bf0b89c1909f5477e2c08db18b45 100644 (file)
--- a/interface-event.c
+++ b/interface-event.c
@@ -14,7 +14,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include <libubox/uloop.h>
 

diff --git a/interface-ip.c b/interface-ip.c
index 2280266552b3d527e2d80993c0fd33b600e99944..084688c61c8e1921401784d44f3a948d5893b124 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -15,7 +15,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #include <limits.h>
 #include <arpa/inet.h>

diff --git a/iprule.c b/iprule.c
index a31db9929ef79e9dd37e390a4b6b20f794a976a6..4e3dd155cc9b4a92a021d6cfcad3a6c11cb24fd9 100644 (file)
--- a/iprule.c
+++ b/iprule.c
@@ -15,7 +15,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #include <arpa/inet.h>
 

diff --git a/main.c b/main.c
index c1f55e9fe13cd18632605cab90e3fb15b2bb38dd..92c6f4969695d696fbb5952efac552bd7b20b516 100644 (file)
--- a/main.c
+++ b/main.c
@@ -15,7 +15,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
-#include <unistd.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <syslog.h>

diff --git a/proto-shell.c b/proto-shell.c
index aa638ad5938b711b5fa5bf4d10b3a4e343b08331..629f43bb95ed9a9fda171e3d8a2920721bd5e1a9 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -16,7 +16,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <signal.h>
 
 #include <arpa/inet.h>

diff --git a/system-linux.c b/system-linux.c
index e5364e06ddbce8e6f3951326426339abfcd6bceb..d01d7e31d754ebfb93028ed5ce8dee4035320bb3 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -41,7 +41,6 @@
 #define RTN_FAILED_POLICY 12
 #endif
 
-#include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <glob.h>

diff --git a/utils.c b/utils.c
index 6b53c229190686b69bf7d8401843bcd720dd5dbf..d202505397f330ea999d6583ef75285f6ffb1f45 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -18,6 +18,10 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
+#ifdef __APPLE__
+#include <libproc.h>
+#endif
+
 void
 __vlist_simple_init(struct vlist_simple_tree *tree, int offset)
 {
@@ -168,3 +172,26 @@ crc32_file(FILE *fp)
 
        return c ^ 0xFFFFFFFF;
 }
+
+bool check_pid_path(int pid, const char *exe)
+{
+       int proc_exe_len;
+       int exe_len = strlen(exe);
+
+#ifdef __APPLE__
+       char proc_exe_buf[PROC_PIDPATHINFO_SIZE];
+
+       proc_exe_len = proc_pidpath(pid, proc_exe_buf, sizeof(proc_exe_buf));
+#else
+       char proc_exe[32];
+       char *proc_exe_buf = alloca(exe_len);
+
+       sprintf(proc_exe, "/proc/%d/exe", pid);
+       proc_exe_len = readlink(proc_exe, proc_exe_buf, exe_len);
+#endif
+
+       if (proc_exe_len != exe_len)
+               return false;
+
+       return !memcmp(exe, proc_exe_buf, exe_len);
+}

diff --git a/utils.h b/utils.h
index 23795e592b5e96c591a26c2575240339d9b8169c..b0a7d02a7c1c71c5e6c26fb5f8be63af2a395448 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -14,6 +14,7 @@
 #ifndef __NETIFD_UTILS_H
 #define __NETIFD_UTILS_H
 
+#include <unistd.h>
 #include <stdio.h>
 #include <libubox/list.h>
 #include <libubox/avl.h>
@@ -107,6 +108,7 @@ static inline int fls(int x)
 unsigned int parse_netmask_string(const char *str, bool v6);
 bool split_netmask(char *str, unsigned int *netmask, bool v6);
 int parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask);
+bool check_pid_path(int pid, const char *exe);
 
 char * format_macaddr(uint8_t *mac);