[PATCH] D70198: On FreeBSD use AT_EXECPATH from ELF auxiliary vectors for getExecutablePath

[Ed Maste via Phabricator via llvm-commits]

emaste updated this revision to Diff 229186.
emaste added a comment.

Use `elf_aux_info()` if we can


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D70198/new/

https://reviews.llvm.org/D70198

Files:
  llvm/lib/Support/Unix/Path.inc


Index: llvm/lib/Support/Unix/Path.inc
===================================================================
--- llvm/lib/Support/Unix/Path.inc
+++ llvm/lib/Support/Unix/Path.inc
@@ -38,6 +38,14 @@
 #include <mach-o/dyld.h>
 #include <sys/attr.h>
 #include <copyfile.h>
+#elif defined(__FreeBSD__)
+#include <osreldate.h>
+#if __FreeBSD_version >= 1300057
+#include <sys/auxv.h>
+#else
+#include <machine/elf.h>
+extern char **environ;
+#endif
 #elif defined(__DragonFly__)
 #include <sys/mount.h>
 #endif
@@ -183,13 +191,41 @@
     if (realpath(exe_path, link_path))
       return link_path;
   }
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ||   \
-    defined(__minix) || defined(__DragonFly__) ||                              \
-    defined(__FreeBSD_kernel__) || defined(_AIX)
+#elif defined(__FreeBSD__)
+  // On FreeBSD if the exec path specified in ELF auxiliary vectors is
+  // preferred, if available.  /proc/curproc/file and the KERN_PROC_PATHNAME
+  // sysctl may not return the desired path if there are multiple hardlinks
+  // to the file.
+  char exe_path[PATH_MAX];
+#if __FreeBSD_version >= 1300057
+  char exe_path[PATH_MAX];
+  if (elf_aux_info(AT_EXECPATH, exe_path, sizeof(exe_path)) == 0)
+    return exe_path;
+#else
+  // elf_aux_info(AT_EXECPATH, ... is not available in all supported versions,
+  // fall back to finding the ELF auxiliary vectors after the process's
+  // environment.
+  char **p = ::environ;
+  while (*p++ != 0)
+    ;
+  // Iterate through auxiliary vectors for AT_EXECPATH.
+  for (;;) {
+    switch (*(uintptr_t *)p++) {
+    case AT_EXECPATH:
+      return *p;
+    case AT_NULL:
+      break;
+    }
+    p++;
+  }
+#endif
+  // Fall back to argv[0] if auxiliary vectors are not available.
+  if (getprogpath(exe_path, argv0) != NULL)
+    return exe_path;
+#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__minix) || \
+    defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(_AIX)
   const char *curproc = "/proc/curproc/file";
   char exe_path[PATH_MAX];
-  // /proc is not mounted by default under FreeBSD, but gives more accurate
-  // information than argv[0] when it is.
   if (sys::fs::exists(curproc)) {
     ssize_t len = readlink(curproc, exe_path, sizeof(exe_path));
     if (len > 0) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D70198.229186.patch
Type: text/x-patch
Size: 2305 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191113/0a23b6bf/attachment-0001.bin>