Damjan Jovanovic : loader: Use sysctl instead of /proc/curproc/file on FreeBSD.

Alexandre Julliard julliard at winehq.org
Mon Oct 25 16:30:06 CDT 2021


Module: wine
Branch: master
Commit: f5e51cfc5551a80f096a80d1f1512386e4df09a4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f5e51cfc5551a80f096a80d1f1512386e4df09a4

Author: Damjan Jovanovic <damjan.jov at gmail.com>
Date:   Sat Oct 23 10:15:14 2021 +0200

loader: Use sysctl instead of /proc/curproc/file on FreeBSD.

Signed-off-by: Damjan Jovanovic <damjan.jov at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 loader/main.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/loader/main.c b/loader/main.c
index fdc77c56162..242ff15accd 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -29,6 +29,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dlfcn.h>
+#include <limits.h>
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
 
 #include "main.h"
 
@@ -83,8 +87,14 @@ static const char *get_self_exe( char *argv0 )
 #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
     return "/proc/self/exe";
 #elif defined (__FreeBSD__) || defined(__DragonFly__)
-    return "/proc/curproc/file";
-#else
+    static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+    size_t path_size = PATH_MAX;
+    char *path = malloc( path_size );
+    if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 ))
+        return path;
+    free( path );
+#endif
+
     if (!strchr( argv0, '/' )) /* search in PATH */
     {
         char *p, *path = getenv( "PATH" );
@@ -104,7 +114,6 @@ static const char *get_self_exe( char *argv0 )
         return NULL;
     }
     return argv0;
-#endif
 }
 
 static void *try_dlopen( const char *dir, const char *name )




More information about the wine-cvs mailing list