oysteikt/mpd
oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

config/File: support absolute paths in "include"

Browse Source
This commit is contained in:
Max Kellermann 2018-07-18 13:09:04 +02:00
parent b168a9d469
commit 035f986a91
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/config/File.cxx
View File

@ -176,12 +176,13 @@ ReadConfigFile(ConfigData &config_data, BufferedReader &reader, Path directory)
assert(name != nullptr); assert(name != nullptr);
if (StringIsEqual(name, "include")) { if (StringIsEqual(name, "include")) {
// TODO: allow absolute path specifications
// TODO: detect recursion // TODO: detect recursion
// TODO: Config{Block,Param} have only line number but no file name // TODO: Config{Block,Param} have only line number but no file name
// TODO: support wildcards (include "conf.d/*.conf") // TODO: support wildcards (include "conf.d/*.conf")
// TODO: add "include_optional" // TODO: add "include_optional"
ReadConfigFile(config_data, directory / AllocatedPath::FromUTF8Throw(ExpectValueAndEnd(tokenizer))); const auto path = AllocatedPath::Apply(directory,
AllocatedPath::FromUTF8Throw(ExpectValueAndEnd(tokenizer)));
ReadConfigFile(config_data, path);
continue; continue;
} }