Patchwork Use sysctl instead of /proc to find executable path on FreeBSD

login
register
mail settings
Submitter Juergen Lock
Date March 25, 2010, 9:07 p.m.
Message ID <20100325210712.GA52370@triton8.kn-bremen.de>
Download mbox | patch
Permalink /patch/48598/
State New
Headers show

Comments

Juergen Lock - March 25, 2010, 9:07 p.m.
..since /proc usually isn't mounted on FreeBSD.

Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>

Patch

--- a/vl.c
+++ b/vl.c
@@ -52,6 +52,7 @@ 
 #include <sys/stat.h>
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 #include <libutil.h>
+#include <sys/sysctl.h>
 #else
 #include <util.h>
 #endif
@@ -3368,10 +3369,13 @@  static char *find_datadir(const char *ar
     }
 #elif defined(__FreeBSD__)
     {
-        int len;
-        len = readlink("/proc/curproc/file", buf, sizeof(buf) - 1);
-        if (len > 0) {
-            buf[len] = 0;
+        static int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
+        size_t len = sizeof(buf) - 1;
+
+        *buf = '\0';
+        if (!sysctl(mib, sizeof(mib)/sizeof(*mib), buf, &len, NULL, 0) &&
+            *buf) {
+            buf[sizeof(buf) - 1] = '\0';
             p = buf;
         }
     }