Skip to content

Commit

Permalink
Merge pull request #84469 from time-killer-games/patch-1
Browse files Browse the repository at this point in the history
Fix NetBSD executable path
  • Loading branch information
akien-mga committed Jan 4, 2024
2 parents 5fd5176 + 52da1e9 commit c921b65
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion drivers/unix/os_unix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -753,11 +753,26 @@ String OS_Unix::get_executable_path() const {
return OS::get_executable_path();
}
return b;
#elif defined(__OpenBSD__) || defined(__NetBSD__)
#elif defined(__OpenBSD__)
char resolved_path[MAXPATHLEN];

realpath(OS::get_executable_path().utf8().get_data(), resolved_path);

return String(resolved_path);
#elif defined(__NetBSD__)
int mib[4] = { CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PATHNAME };
char buf[MAXPATHLEN];
size_t len = sizeof(buf);
if (sysctl(mib, 4, buf, &len, nullptr, 0) != 0) {
WARN_PRINT("Couldn't get executable path from sysctl");
return OS::get_executable_path();
}

// NetBSD does not always return a normalized path. For example if argv[0] is "./a.out" then executable path is "/home/netbsd/./a.out". Normalize with realpath:
char resolved_path[MAXPATHLEN];

realpath(buf, resolved_path);

return String(resolved_path);
#elif defined(__FreeBSD__)
int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
Expand Down

0 comments on commit c921b65

Please sign in to comment.