int ch = next();
while (isspace(ch))
ch = next();
- while (isalnum(ch) || ch == '_')
+ while (isalnum(ch) || ch == '_'|| ch == '-')
{
rv.push_back(ch);
ch = next();
{
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))
}
}
+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());
if(!readString(key, result))
return def;
- return (result == "yes" || result == "true" || result == "1" || result == "on");
+ if (result == "yes" || result == "true" || result == "1" || result == "on")
+ return true;
+ if (result == "no" || result == "false" || result == "0" || result == "off")
+ return false;
+
+ ServerInstance->Logs->Log("CONFIG",DEFAULT, "Value of <" + tag + ":" + key + "> at " + getTagLocation() +
+ " is not valid, ignoring");
+ return def;
}
std::string ConfigTag::getTagLocation()