From 4414eb581212f69ffac33678fd58be21dce49c27 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 5 Jan 2019 16:51:56 +0100 Subject: [PATCH] fixed NetBSD support - assume NetBSD >= 8.0 - for NetBSD < 8.0, define WAI_USE_PROC_SELF_EXE --- README.md | 2 ++ src/whereami.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 350bf76..98c7a3b 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ Supported platforms: - Android - QNX Neutrino - FreeBSD +- NetBSD +- DragonFly BSD - SunOS Just drop `whereami.h` and `whereami.c` into your build and get started. (see diff --git a/src/whereami.c b/src/whereami.c index 7441823..48d9af3 100644 --- a/src/whereami.c +++ b/src/whereami.c @@ -158,7 +158,7 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length) return length; } -#elif defined(__linux__) || defined(__CYGWIN__) || defined(__sun) +#elif defined(__linux__) || defined(__CYGWIN__) || defined(__sun) || defined(WAI_USE_PROC_SELF_EXE) #include #include @@ -581,7 +581,11 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length) for (;;) { +#if defined(__NetBSD__) + int mib[4] = { CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PATHNAME }; +#else int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; +#endif size_t size = sizeof(buffer1); if (sysctl(mib, (u_int)(sizeof(mib) / sizeof(mib[0])), path, &size, NULL, 0) != 0)