diff options
| author | Qiang Yu <Qiang.Yu@amd.com> | 2018-08-06 11:41:33 +0800 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2018-08-17 17:16:32 +0100 |
| commit | 04bdbbcab3c4862bf3f54ce60fcc1d2007776f80 (patch) | |
| tree | d078e5edb23a74a3aa5ac0e5ea371103b46ece7e /src | |
| parent | 0da417129e070193091452c8ffdec4df12070bc6 (diff) | |
xmlconfig: read more config files from drirc.d/
Driver and application can put their drirc files in
${datadir}/drirc.d/ with name xxx.conf. Config files
will be read and applied in file name alphabetic order.
So there are three places for drirc listed in order:
1. /usr/share/drirc.d/
2. /etc/drirc
3. ~/.drirc
v4:
fix meson build
v3:
1. seperate driParseConfigFiles refine into another patch
2. fix entries[i] mem leak
v2:
drop /etc/drirc.d
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/Makefile.am | 1 | ||||
| -rw-r--r-- | src/util/meson.build | 3 | ||||
| -rw-r--r-- | src/util/xmlconfig.c | 42 |
3 files changed, 46 insertions, 0 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index bafb57439ab..8d8c1566e1e 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -67,6 +67,7 @@ libxmlconfig_la_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DDATADIR=\"$(datadir)\" \ $(VISIBILITY_CFLAGS) \ $(EXPAT_CFLAGS) libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm diff --git a/src/util/meson.build b/src/util/meson.build index 51980e9214e..9740dafae30 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -123,6 +123,9 @@ libxmlconfig = static_library( '-DSYSCONFDIR="@0@"'.format( join_paths(get_option('prefix'), get_option('sysconfdir')) ), + '-DDATADIR="@0@"'.format( + join_paths(get_option('prefix'), get_option('datadir')) + ), ], build_by_default : false, ) diff --git a/src/util/xmlconfig.c b/src/util/xmlconfig.c index 035d0296efe..68ce5cee921 100644 --- a/src/util/xmlconfig.c +++ b/src/util/xmlconfig.c @@ -37,6 +37,8 @@ #include <math.h> #include <unistd.h> #include <errno.h> +#include <dirent.h> +#include <fnmatch.h> #include "xmlconfig.h" #include "u_process.h" @@ -929,10 +931,49 @@ parseOneConfigFile(struct OptConfData *data, const char *filename) XML_ParserFree (p); } +static int +scandir_filter(const struct dirent *ent) +{ + if (ent->d_type != DT_REG && ent->d_type != DT_LNK) + return 0; + + if (fnmatch("*.conf", ent->d_name, 0)) + return 0; + + return 1; +} + +/** \brief Parse configuration files in a directory */ +static void +parseConfigDir(struct OptConfData *data, const char *dirname) +{ + int i, count; + struct dirent **entries = NULL; + + count = scandir(dirname, &entries, scandir_filter, alphasort); + if (count < 0) + return; + + for (i = 0; i < count; i++) { + char filename[PATH_MAX]; + + snprintf(filename, PATH_MAX, "%s/%s", dirname, entries[i]->d_name); + free(entries[i]); + + parseOneConfigFile(data, filename); + } + + free(entries); +} + #ifndef SYSCONFDIR #define SYSCONFDIR "/etc" #endif +#ifndef DATADIR +#define DATADIR "/usr/share" +#endif + void driParseConfigFiles(driOptionCache *cache, const driOptionCache *info, int screenNum, const char *driverName) @@ -947,6 +988,7 @@ driParseConfigFiles(driOptionCache *cache, const driOptionCache *info, userData.driverName = driverName; userData.execName = util_get_process_name(); + parseConfigDir(&userData, DATADIR "/drirc.d"); parseOneConfigFile(&userData, SYSCONFDIR "/drirc"); if ((home = getenv ("HOME"))) { |