diff options
Diffstat (limited to 'src/configparser.cpp')
| -rw-r--r-- | src/configparser.cpp | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/src/configparser.cpp b/src/configparser.cpp index 0e77cbb36..558c49117 100644 --- a/src/configparser.cpp +++ b/src/configparser.cpp @@ -177,6 +177,20 @@ struct Parser { stack.DoInclude(tag, flags); } + else if (name == "files") + { + for(std::vector<KeyVal>::iterator i = items->begin(); i != items->end(); i++) + { + stack.DoReadFile(i->first, i->second, flags, false); + } + } + else if (name == "execfiles") + { + for(std::vector<KeyVal>::iterator i = items->begin(); i != items->end(); i++) + { + stack.DoReadFile(i->first, i->second, flags, true); + } + } else if (name == "define") { if (!(flags & FLAG_USE_XML)) @@ -275,6 +289,29 @@ void ParseStack::DoInclude(ConfigTag* tag, int flags) } } +void ParseStack::DoReadFile(const std::string& key, const std::string& name, int flags, bool exec) +{ + if (flags & FLAG_NO_INC) + throw CoreException("Invalid <files> tag in file included with noinclude=\"yes\""); + if (exec && (flags & FLAG_NO_EXEC)) + throw CoreException("Invalid <execfiles> tag in file included with noexec=\"yes\""); + + FileWrapper file(exec ? popen(name.c_str(), "r") : fopen(name.c_str(), "r")); + if (!file) + throw CoreException("Could not read \"" + name + "\" for \"" + key + "\" file"); + + file_cache& cache = FilesOutput[key]; + cache.clear(); + + char linebuf[MAXBUF*10]; + while (fgets(linebuf, sizeof(linebuf), file)) + { + int len = strlen(linebuf); + if (len) + cache.push_back(std::string(linebuf, len - 1)); + } +} + bool ParseStack::ParseFile(const std::string& name, int flags) { ServerInstance->Logs->Log("CONFIG", DEBUG, "Reading file %s", name.c_str()); |