From 264aa50f7297709a097eecb53df8c59c2db1043d Mon Sep 17 00:00:00 2001 From: Michal Gorny Date: Sun, 3 Mar 2019 10:06:40 +0000 Subject: [PATCH] [llvm] [Support] Reimplement getMainExecutable() using sysctl on NetBSD Use sysctl() to implement getMainExecutable() on NetBSD, rather than trying to guess the correct path from argv[0]. This is one of the fixes to recent clang-check-mac-libcxx-fixed-compilation-db.cpp test failure on NetBSD. This has been historically done on both FreeBSD and NetBSD in r303015, and reverted in r303285 due to buggy implementation on FreeBSD. However, FWIK the NetBSD implementation does not suffer from the same bugs and is more reliable than playing with argv[0]. Differential Revision: https://reviews.llvm.org/D56975 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@355283 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/Unix/Path.inc | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc index 5eba86d2077..d1f82bc9e72 100644 --- a/lib/Support/Unix/Path.inc +++ b/lib/Support/Unix/Path.inc @@ -90,6 +90,11 @@ #define STATVFS_F_FLAG(vfs) (vfs).f_flags #endif +#if defined(__NetBSD__) +#include +#include +#endif + using namespace llvm; namespace llvm { @@ -98,7 +103,7 @@ namespace fs { const file_t kInvalidFile = -1; -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ +#if defined(__FreeBSD__) || defined(__OpenBSD__) || \ defined(__minix) || defined(__FreeBSD_kernel__) || defined(__linux__) || \ defined(__CYGWIN__) || defined(__DragonFly__) || defined(_AIX) || defined(__GNU__) static int @@ -169,7 +174,18 @@ std::string getMainExecutable(const char *argv0, void *MainAddr) { if (realpath(exe_path, link_path)) return link_path; } -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ +#elif defined(__NetBSD__) + // NB: sysctl() solution can't be used on FreeBSD since it may return + // a wrong path when a file is hardlinked in multiple locations. + // See r303285 for an earlier revert. + + char exe_path[PATH_MAX]; + int mib[4] = {CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PATHNAME}; + size_t len = sizeof(exe_path); + + if (sysctl(mib, 4, exe_path, &len, nullptr, 0) == 0) + return exe_path; +#elif defined(__FreeBSD__) || defined(__OpenBSD__) || \ defined(__minix) || defined(__DragonFly__) || \ defined(__FreeBSD_kernel__) || defined(_AIX) char exe_path[PATH_MAX]; -- 2.50.1