fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

driconf: add executable_regexp application attribute

Browse source 
For matching executable with variable names like Mari which
append version string to its executable like: Mari4.5v2, Mari4.7v4.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13304>
This commit is contained in:
Qiang Yu 2021-10-12 15:23:27 +08:00 • committed by Marge Bot
parent 308bd1f00c
commit 9a24de9aa7
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/util/00-mesa-defaults.conf
View file

@ -36,6 +36,7 @@ TODO: document the other workarounds.
<!ELEMENT application (option+)>
<!ATTLIST application name CDATA #REQUIRED
executable CDATA #IMPLIED
executable_regexp CDATA #IMPLIED
sha1 CDATA #IMPLIED
application_name_match CDATA #IMPLIED
application_versions CDATA #IMPLIED>

11
src/util/xmlconfig.c
View file

@ -681,6 +681,7 @@ parseAppAttr(struct OptConfData *data, const char **attr)
uint32_t i;
const char *exec = NULL;
const char *sha1 = NULL;
const char *exec_regexp = NULL;
const char *application_name_match = NULL;
const char *application_versions = NULL;
driOptionInfo version_range = {
@ -690,6 +691,7 @@ parseAppAttr(struct OptConfData *data, const char **attr)
for (i = 0; attr[i]; i += 2) {
if (!strcmp(attr[i], "name")) /* not needed here */;
else if (!strcmp(attr[i], "executable")) exec = attr[i+1];
else if (!strcmp(attr[i], "executable_regexp")) exec_regexp = attr[i+1];
else if (!strcmp(attr[i], "sha1")) sha1 = attr[i+1];
else if (!strcmp(attr[i], "application_name_match"))
application_name_match = attr[i+1];
@ -699,6 +701,15 @@ parseAppAttr(struct OptConfData *data, const char **attr)
}
if (exec && strcmp(exec, data->execName)) {
data->ignoringApp = data->inApp;
} else if (exec_regexp) {
regex_t re;
if (regcomp(&re, exec_regexp, REG_EXTENDED|REG_NOSUB) == 0) {
if (regexec(&re, data->execName, 0, NULL, 0) == REG_NOMATCH)
data->ignoringApp = data->inApp;
regfree(&re);
} else
XML_WARNING("Invalid executable_regexp=\"%s\".", exec_regexp);
} else if (sha1) {
/* SHA1_DIGEST_STRING_LENGTH includes terminating null byte */
if (strlen(sha1) != (SHA1_DIGEST_STRING_LENGTH - 1)) {