X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigparser.cpp;h=2af796b21c771c3532781d881c7470ec652809f2;hb=57e4bf97250a20f0b54957f2d5aabf02f158c171;hp=8bf9aaec297fd5cec25bd5de717395748638c3b8;hpb=80f10dc783b75aa6fa2a3fe490a6e94b2a78e467;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configparser.cpp b/src/configparser.cpp
index 8bf9aaec2..2af796b21 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -91,7 +91,7 @@ struct Parser
 		unget(ch);
 	}
 
-	bool kv(std::vector<KeyVal>* items, std::set<std::string>& seen)
+	bool kv(ConfigItems* items)
 	{
 		std::string key;
 		nextword(key);
@@ -177,10 +177,10 @@ struct Parser
 				value.push_back(ch);
 		}
 
-		if (!seen.insert(key).second)
+		if (items->find(key) != items->end())
 			throw CoreException("Duplicate key '" + key + "' found");
 
-		items->push_back(KeyVal(key, value));
+		(*items)[key] = value;
 		return true;
 	}
 
@@ -199,11 +199,10 @@ struct Parser
 		if (name.empty())
 			throw CoreException("Empty tag name");
 
-		std::vector<KeyVal>* items;
-		std::set<std::string> seen;
+		ConfigItems* items;
 		tag = ConfigTag::create(name, current.filename, current.line, items);
 
-		while (kv(items, seen))
+		while (kv(items))
 		{
 			// Do nothing here (silences a GCC warning).
 		}
@@ -220,14 +219,14 @@ struct Parser
 		}
 		else if (name == "files")
 		{
-			for(std::vector<KeyVal>::iterator i = items->begin(); i != items->end(); i++)
+			for(ConfigItems::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++)
+			for(ConfigItems::iterator i = items->begin(); i != items->end(); i++)
 			{
 				stack.DoReadFile(i->first, i->second, flags, true);
 			}
@@ -385,7 +384,7 @@ bool ParseStack::ParseFile(const std::string& path, int flags, const std::string
 
 bool ConfigTag::readString(const std::string& key, std::string& value, bool allow_lf)
 {
-	for(std::vector<KeyVal>::iterator j = items.begin(); j != items.end(); ++j)
+	for(ConfigItems::iterator j = items.begin(); j != items.end(); ++j)
 	{
 		if(j->first != key)
 			continue;
@@ -403,10 +402,18 @@ bool ConfigTag::readString(const std::string& key, std::string& value, bool allo
 	return false;
 }
 
-std::string ConfigTag::getString(const std::string& key, const std::string& def)
+std::string ConfigTag::getString(const std::string& key, const std::string& def, size_t minlen, size_t maxlen)
 {
-	std::string res = def;
-	readString(key, res);
+	std::string res;
+	if (!readString(key, res))
+		return def;
+
+	if (res.length() < minlen || res.length() > maxlen)
+	{
+		ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "WARNING: The length of <%s:%s> is not between %ld and %ld; value set to %s.",
+			tag.c_str(), key.c_str(), minlen, maxlen, def.c_str());
+		return def;
+	}
 	return res;
 }
 
@@ -488,7 +495,7 @@ std::string ConfigTag::getTagLocation()
 	return src_name + ":" + ConvToStr(src_line);
 }
 
-ConfigTag* ConfigTag::create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*& Items)
+ConfigTag* ConfigTag::create(const std::string& Tag, const std::string& file, int line, ConfigItems*& Items)
 {
 	ConfigTag* rv = new ConfigTag(Tag, file, line);
 	Items = &rv->items;
@@ -500,6 +507,11 @@ ConfigTag::ConfigTag(const std::string& Tag, const std::string& file, int line)
 {
 }
 
+OperInfo::OperInfo(const std::string& Name)
+	: name(Name)
+{
+}
+
 std::string OperInfo::getConfig(const std::string& key)
 {
 	std::string rv;