yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-23 21:12:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #603 from devnexen/code_simplification

Browse source 
Little simplification for NetBSD, /proc/<pid>/exe works just fine too.
This commit is contained in:
Yamagi 2020-10-06 16:55:01 +02:00 committed by GitHub
commit 2231268bc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/backends/generic/misc.c
View file

@ -33,7 +33,7 @@
#include <unistd.h> // readlink(), amongst others
#endif
#ifdef __FreeBSD__
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include <sys/sysctl.h> // for sysctl() to get path to executable
#endif
@ -73,18 +73,14 @@ static void SetExecutablePath(char* exePath)
exePath[0] = '\0';
}
#elif defined(__linux) || defined(__NetBSD__)
#elif defined(__linux)
// all the platforms that have /proc/$pid/exe or similar that symlink the
// real executable - basiscally Linux and the BSDs except for FreeBSD which
// doesn't enable proc by default and has a sysctl() for this. OpenBSD once
// had /proc but removed it for security reasons.
char buf[PATH_MAX] = {0};
#ifdef __linux
snprintf(buf, sizeof(buf), "/proc/%d/exe", getpid());
#else // the BSDs
snprintf(buf, sizeof(buf), "/proc/%d/file", getpid());
#endif
// readlink() doesn't null-terminate!
int len = readlink(buf, exePath, PATH_MAX-1);
if (len <= 0)
@ -97,11 +93,15 @@ static void SetExecutablePath(char* exePath)
exePath[len] = '\0';
}
#elif defined(__FreeBSD__)
#elif defined(__FreeBSD__) || defined(__NetBSD__)
// the sysctl should also work when /proc/ is not mounted (which seems to
// be common on FreeBSD), so use it..
#if defined(__FreeBSD__)
int name[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
#else
int name[4] = {CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PATHNAME};
#endif
size_t len = PATH_MAX-1;
int ret = sysctl(name, sizeof(name)/sizeof(name[0]), exePath, &len, NULL, 0);
if(ret != 0)