urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-19 00:13:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6121 from urbit/ja/openbsd-7.2-fix

Browse Source 
vere: updates whereami dep to support OpenBSD
This commit is contained in:
Joe Bryan 2022-12-02 16:11:38 -05:00 committed by GitHub
commit 331c20bb9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 173 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
pkg/urbit/daemon/whereami.c
View File

@ -1,4 +1,6 @@
// (‑●‑●)> released under the WTFPL v2 license, by Gregory Pakosz (@gpakosz) // (‑●‑●)> dual licensed under the WTFPL v2 and MIT licenses
// without any warranty.
// by Gregory Pakosz (@gpakosz)
// https://github.com/gpakosz/whereami // https://github.com/gpakosz/whereami
// in case you want to #include "whereami.c" in a larger compilation unit // in case you want to #include "whereami.c" in a larger compilation unit
@ -10,6 +12,15 @@
extern "C" { extern "C" {
#endif #endif
#if defined(__linux__) || defined(__CYGWIN__)
#undef _DEFAULT_SOURCE
#define _DEFAULT_SOURCE
#elif defined(__APPLE__)
#undef _DARWIN_C_SOURCE
#define _DARWIN_C_SOURCE
#define _DARWIN_BETTER_REALPATH
#endif
#if !defined(WAI_MALLOC) || !defined(WAI_FREE) || !defined(WAI_REALLOC) #if !defined(WAI_MALLOC) || !defined(WAI_FREE) || !defined(WAI_REALLOC)
#include <stdlib.h> #include <stdlib.h>
#endif #endif
@ -46,7 +57,9 @@ extern "C" {
#if defined(_WIN32) #if defined(_WIN32)
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(push, 3) #pragma warning(push, 3)
#endif #endif
@ -55,6 +68,7 @@ extern "C" {
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(pop) #pragma warning(pop)
#endif #endif
#include <stdbool.h>
static int WAI_PREFIX(getModulePath_)(HMODULE module, char* out, int capacity, int* dirname_length) static int WAI_PREFIX(getModulePath_)(HMODULE module, char* out, int capacity, int* dirname_length)
{ {
@ -62,8 +76,9 @@ static int WAI_PREFIX(getModulePath_)(HMODULE module, char* out, int capacity, i
wchar_t buffer2[MAX_PATH]; wchar_t buffer2[MAX_PATH];
wchar_t* path = NULL; wchar_t* path = NULL;
int length = -1; int length = -1;
bool ok;
for (;;) for (ok = false; !ok; ok = true)
{ {
DWORD size; DWORD size;
int length_, length__; int length_, length__;
@ -119,14 +134,12 @@ static int WAI_PREFIX(getModulePath_)(HMODULE module, char* out, int capacity, i
} }
length = length__; length = length__;
break;
} }
if (path != buffer1) if (path != buffer1)
WAI_FREE(path); WAI_FREE(path);
return length; return ok ? length : -1;
} }
WAI_NOINLINE WAI_FUNCSPEC WAI_NOINLINE WAI_FUNCSPEC
@ -156,7 +169,7 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
return length; return length;
} }
#elif defined(__linux__) || defined(__CYGWIN__) || defined(__sun) #elif defined(__linux__) || defined(__CYGWIN__) || defined(__sun) || defined(WAI_USE_PROC_SELF_EXE)
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -170,6 +183,7 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#endif #endif
#include <inttypes.h> #include <inttypes.h>
#include <stdbool.h>
#if !defined(WAI_PROC_SELF_EXE) #if !defined(WAI_PROC_SELF_EXE)
#if defined(__sun) #if defined(__sun)
@ -185,8 +199,9 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
char buffer[PATH_MAX]; char buffer[PATH_MAX];
char* resolved = NULL; char* resolved = NULL;
int length = -1; int length = -1;
bool ok;
for (;;) for (ok = false; !ok; ok = true)
{ {
resolved = realpath(WAI_PROC_SELF_EXE, buffer); resolved = realpath(WAI_PROC_SELF_EXE, buffer);
if (!resolved) if (!resolved)
@ -211,11 +226,9 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
} }
} }
} }
break;
} }
return length; return ok ? length : -1;
} }
#if !defined(WAI_PROC_SELF_MAPS_RETRY) #if !defined(WAI_PROC_SELF_MAPS_RETRY)
@ -235,6 +248,7 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
#include <sys/mman.h> #include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <stdbool.h>
WAI_NOINLINE WAI_FUNCSPEC WAI_NOINLINE WAI_FUNCSPEC
int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length) int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
@ -281,15 +295,24 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
&&buffer[length - 4] == '.') &&buffer[length - 4] == '.')
{ {
int fd = open(path, O_RDONLY); int fd = open(path, O_RDONLY);
char* begin; if (fd == -1)
char* p; {
length = -1; // retry
break;
}
begin = (char*)mmap(0, offset, PROT_READ, MAP_SHARED, fd, 0); char* begin = (char*)mmap(0, offset, PROT_READ, MAP_SHARED, fd, 0);
p = begin + offset; if (begin == MAP_FAILED)
{
close(fd);
length = -1; // retry
break;
}
char* p = begin + offset - 30; // minimum size of local file header
while (p >= begin) // scan backwards while (p >= begin) // scan backwards
{ {
if (*((uint32_t*)p) == 0x04034b50UL) // local file header found if (*((uint32_t*)p) == 0x04034b50UL) // local file header signature found
{ {
uint16_t length_ = *((uint16_t*)(p + 26)); uint16_t length_ = *((uint16_t*)(p + 26));
@ -303,7 +326,7 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
break; break;
} }
p -= 4; --p;
} }
munmap(begin, offset); munmap(begin, offset);
@ -341,20 +364,17 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
break; break;
} }
if (maps)
fclose(maps);
return length; return length;
} }
#elif defined(__APPLE__) #elif defined(__APPLE__)
#define _DARWIN_BETTER_REALPATH
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#include <limits.h> #include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <stdbool.h>
WAI_FUNCSPEC WAI_FUNCSPEC
int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length) int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
@ -364,8 +384,9 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
char* path = buffer1; char* path = buffer1;
char* resolved = NULL; char* resolved = NULL;
int length = -1; int length = -1;
bool ok;
for (;;) for (ok = false; !ok; ok = true)
{ {
uint32_t size = (uint32_t)sizeof(buffer1); uint32_t size = (uint32_t)sizeof(buffer1);
if (_NSGetExecutablePath(path, &size) == -1) if (_NSGetExecutablePath(path, &size) == -1)
@ -398,14 +419,12 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
} }
} }
} }
break;
} }
if (path != buffer1) if (path != buffer1)
WAI_FREE(path); WAI_FREE(path);
return length; return ok ? length : -1;
} }
WAI_NOINLINE WAI_FUNCSPEC WAI_NOINLINE WAI_FUNCSPEC
@ -459,6 +478,7 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <stdbool.h>
#if !defined(WAI_PROC_SELF_EXE) #if !defined(WAI_PROC_SELF_EXE)
#define WAI_PROC_SELF_EXE "/proc/self/exefile" #define WAI_PROC_SELF_EXE "/proc/self/exefile"
@ -472,8 +492,9 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
char* resolved = NULL; char* resolved = NULL;
FILE* self_exe = NULL; FILE* self_exe = NULL;
int length = -1; int length = -1;
bool ok;
for (;;) for (ok = false; !ok; ok = true)
{ {
self_exe = fopen(WAI_PROC_SELF_EXE, "r"); self_exe = fopen(WAI_PROC_SELF_EXE, "r");
if (!self_exe) if (!self_exe)
@ -505,13 +526,11 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
} }
} }
} }
break;
} }
fclose(self_exe); fclose(self_exe);
return length; return ok ? length : -1;
} }
WAI_FUNCSPEC WAI_FUNCSPEC
@ -559,7 +578,7 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
} }
#elif defined(__DragonFly__) || defined(__FreeBSD__) || \ #elif defined(__DragonFly__) || defined(__FreeBSD__) || \
defined(__FreeBSD_kernel__) || defined(__NetBSD__) defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
#include <limits.h> #include <limits.h>
#include <stdlib.h> #include <stdlib.h>
@ -567,6 +586,116 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
#include <sys/types.h> #include <sys/types.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <stdbool.h>
#if defined(__OpenBSD__)
#include <unistd.h>
WAI_FUNCSPEC
int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
{
char buffer1[4096];
char buffer2[PATH_MAX];
char buffer3[PATH_MAX];
char** argv = (char**)buffer1;
char* resolved = NULL;
int length = -1;
bool ok;
for (ok = false; !ok; ok = true)
{
int mib[4] = { CTL_KERN, KERN_PROC_ARGS, getpid(), KERN_PROC_ARGV };
size_t size;
if (sysctl(mib, 4, NULL, &size, NULL, 0) != 0)
break;
if (size > sizeof(buffer1))
{
argv = (char**)WAI_MALLOC(size);
if (!argv)
break;
}
if (sysctl(mib, 4, argv, &size, NULL, 0) != 0)
break;
if (strchr(argv[0], '/'))
{
resolved = realpath(argv[0], buffer2);
if (!resolved)
break;
}
else
{
const char* PATH = getenv("PATH");
if (!PATH)
break;
size_t argv0_length = strlen(argv[0]);
const char* begin = PATH;
while (1)
{
const char* separator = strchr(begin, ':');
const char* end = separator ? separator : begin + strlen(begin);
if (end - begin > 0)
{
if (*(end -1) == '/')
--end;
if (((end - begin) + 1 + argv0_length + 1) <= sizeof(buffer2))
{
memcpy(buffer2, begin, end - begin);
buffer2[end - begin] = '/';
memcpy(buffer2 + (end - begin) + 1, argv[0], argv0_length + 1);
resolved = realpath(buffer2, buffer3);
if (resolved)
break;
}
}
if (!separator)
break;
begin = ++separator;
}
if (!resolved)
break;
}
length = (int)strlen(resolved);
if (length <= capacity)
{
memcpy(out, resolved, length);
if (dirname_length)
{
int i;
for (i = length - 1; i >= 0; --i)
{
if (out[i] == '/')
{
*dirname_length = i;
break;
}
}
}
}
}
if (argv != (char**)buffer1)
WAI_FREE(argv);
return ok ? length : -1;
}
#else
WAI_FUNCSPEC WAI_FUNCSPEC
int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length) int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
@ -576,13 +705,18 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
char* path = buffer1; char* path = buffer1;
char* resolved = NULL; char* resolved = NULL;
int length = -1; int length = -1;
bool ok;
for (;;) for (ok = false; !ok; ok = true)
{ {
#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 }; int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
#endif
size_t size = sizeof(buffer1); size_t size = sizeof(buffer1);
if (sysctl(mib, (u_int)(sizeof(mib) / sizeof(mib[0])), path, &size, NULL, 0) != 0) if (sysctl(mib, 4, path, &size, NULL, 0) != 0)
break; break;
resolved = realpath(path, buffer2); resolved = realpath(path, buffer2);
@ -608,16 +742,13 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
} }
} }
} }
break;
} }
if (path != buffer1) return ok ? length : -1;
WAI_FREE(path);
return length;
} }
#endif
WAI_NOINLINE WAI_FUNCSPEC WAI_NOINLINE WAI_FUNCSPEC
int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length) int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
{ {
@ -670,4 +801,4 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

6
pkg/urbit/daemon/whereami.h
View File

@ -1,4 +1,6 @@
// (‑●‑●)> released under the WTFPL v2 license, by Gregory Pakosz (@gpakosz) // (‑●‑●)> dual licensed under the WTFPL v2 and MIT licenses
// without any warranty.
// by Gregory Pakosz (@gpakosz)
// https://github.com/gpakosz/whereami // https://github.com/gpakosz/whereami
#ifndef WHEREAMI_H #ifndef WHEREAMI_H
@ -62,4 +64,4 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length);
} }
#endif #endif
#endif // #ifndef WHEREAMI_H #endif // #ifndef WHEREAMI_H