conf: allow wildcard patterns in include directive

Use glob() to match and read multiple configuration files with one
include directive.
This commit is contained in:
Miroslav Lichvar
2015-08-24 15:08:39 +02:00
parent 05183748a8
commit c0867b58f5
3 changed files with 21 additions and 5 deletions

14
conf.c
View File

@@ -1236,8 +1236,20 @@ parse_tempcomp(char *line)
static void
parse_include(char *line)
{
glob_t gl;
size_t i;
check_number_of_args(line, 1);
CNF_ReadFile(line);
if (glob(line, 0, NULL, &gl)) {
DEBUG_LOG(LOGF_Configure, "glob of %s failed", line);
return;
}
for (i = 0; i < gl.gl_pathc; i++)
CNF_ReadFile(gl.gl_pathv[i]);
globfree(&gl);
}
/* ================================================== */