RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 08:34:57 +00:00
Code Issues Activity Actions

LibC: Reduce reliance on the dlfcn internals for regex functions

Browse source
This commit is contained in:
Tim Schumacher 2022-08-14 13:08:17 +02:00 • committed by Linus Groh
parent 39477e923f
commit be941c13e3
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/Libraries/LibC/regex.cpp
View file

@ -6,7 +6,6 @@
#include <AK/Assertions.h>
#include <dlfcn.h>
#include <dlfcn_integration.h>
#include <pthread.h>
#include <regex.h>
@ -22,12 +21,20 @@ static void ensure_libregex()
{
pthread_mutex_lock(&s_libregex_lock);
if (!s_libregex) {
s_libregex = __dlopen("libregex.so", RTLD_NOW).value();
s_libregex = dlopen("libregex.so", RTLD_NOW);
VERIFY(s_libregex);
s_regcomp = reinterpret_cast<int (*)(regex_t*, char const*, int)>(__dlsym(s_libregex, "regcomp").value());
s_regexec = reinterpret_cast<int (*)(regex_t const*, char const*, size_t, regmatch_t[], int)>(__dlsym(s_libregex, "regexec").value());
s_regerror = reinterpret_cast<size_t (*)(int, regex_t const*, char*, size_t)>(__dlsym(s_libregex, "regerror").value());
s_regfree = reinterpret_cast<void (*)(regex_t*)>(__dlsym(s_libregex, "regfree").value());
s_regcomp = reinterpret_cast<int (*)(regex_t*, char const*, int)>(dlsym(s_libregex, "regcomp"));
VERIFY(s_regcomp);
s_regexec = reinterpret_cast<int (*)(regex_t const*, char const*, size_t, regmatch_t[], int)>(dlsym(s_libregex, "regexec"));
VERIFY(s_regexec);
s_regerror = reinterpret_cast<size_t (*)(int, regex_t const*, char*, size_t)>(dlsym(s_libregex, "regerror"));
VERIFY(s_regerror);
s_regfree = reinterpret_cast<void (*)(regex_t*)>(dlsym(s_libregex, "regfree"));
VERIFY(s_regerror);
}
pthread_mutex_unlock(&s_libregex_lock);
}