int ch = next();
while (isspace(ch))
ch = next();
- while (isalnum(ch) || ch == '_')
+ while (isalnum(ch) || ch == '_'|| ch == '-')
{
rv.push_back(ch);
ch = next();
unget(ch);
}
- bool kv(std::vector<KeyVal>* items)
+ bool kv(std::vector<KeyVal>* items, std::set<std::string>& seen)
{
std::string key;
nextword(key);
else
value.push_back(ch);
}
+
+ if (!seen.insert(key).second)
+ throw CoreException("Duplicate key '" + key + "' found");
+
items->push_back(KeyVal(key, value));
return true;
}
throw CoreException("Empty tag name");
std::vector<KeyVal>* items;
+ std::set<std::string> seen;
tag = ConfigTag::create(name, current.filename, current.line, items);
- while (kv(items));
+ while (kv(items, seen));
if (name == "include")
{
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()