XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfree86/{loader,common}: Search all module directory prefixes in LoaderListDir

Browse Source 
Fixes: 01c0b7fd38

Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111
2025-11-21 16:29:01 +02:00
committed by Enrico Weigelt
parent 07d6ca4254
commit 3550e1e873
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86Configure.c
View File

@@ -593,7 +593,7 @@ GenerateDriverList(void)
{
const char **ret;
static const char *patlist[] = { "(.*)_drv\\.so", NULL };
ret = LoaderListDir(XORG_MODULE_ABI_TAG "/drivers", patlist);
ret = LoaderListDir("drivers", patlist);
/* fix up the probe order for video drivers */
if (ret != NULL)

45
hw/xfree86/loader/loadmod.c
View File

@@ -415,8 +415,8 @@ FindModule(const char *module, const char *dirname, PatternPtr patterns)
return name;
}
const char **
LoaderListDir(const char *subdir, const char **patternlist)
static const char **
_LoaderListDir(const char *subdir, const char **patternlist, int *saved_len)
{
char buf[PATH_MAX + 1];
char **pathlist;
@@ -490,9 +490,50 @@ LoaderListDir(const char *subdir, const char **patternlist)
bail:
FreePatterns(patterns);
*saved_len = ret ? n : 0;
return (const char **) ret;
}
const char **
LoaderListDir(const char *subdir, const char **patternlist)
{
int len = 0;
const char **ret = NULL;
int subdirlen = strlen(subdir);
for (int i = 0; i < sizeof(stdSubdirs) / sizeof(*stdSubdirs); i++) {
int prefixsize = sizeof(stdSubdirs[i]);
char* dir = malloc(prefixsize + subdirlen);
if (!dir) {
free(ret);
return NULL;
}
memcpy(dir, stdSubdirs[i], prefixsize - 1);
memcpy(dir + prefixsize - 1, subdir, subdirlen + 1);
int sublen = 0;
const char **subret = _LoaderListDir(dir, patternlist, &sublen);
free(dir);
if (!subret) {
continue;
}
int oldlen = len;
len += sublen;
void *tmp = reallocarray(ret, len + 1, sizeof(*ret));
if (!tmp) {
free(ret);
return NULL;
}
ret = tmp;
memcpy(ret + oldlen, subret, sublen);
}
if (ret) {
ret[len] = NULL;
}
return ret;
}
static Bool
CheckVersion(const char *module, XF86ModuleVersionInfo * data,
const XF86ModReqInfo * req)