X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigparser.cpp;h=94192a71bb9166c2e8bda7124793f96c260fbe91;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=51d67b4f5be84357d9cb89bde65a1498a6a459b7;hpb=90875afded8d80cc6c61d9f7804c1ba7a74e70a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configparser.cpp b/src/configparser.cpp
index 51d67b4f5..94192a71b 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -30,9 +30,10 @@ struct Parser
 	fpos last_tag;
 	reference<ConfigTag> tag;
 	int ungot;
+	std::string mandatory_tag;
 
-	Parser(ParseStack& me, int myflags, FILE* conf, const std::string& name)
-		: stack(me), flags(myflags), file(conf), current(name), last_tag(name), ungot(-1)
+	Parser(ParseStack& me, int myflags, FILE* conf, const std::string& name, const std::string& mandatorytag)
+		: stack(me), flags(myflags), file(conf), current(name), last_tag(name), ungot(-1), mandatory_tag(mandatorytag)
 	{ }
 
 	int next(bool eof_ok = false)
@@ -184,6 +185,12 @@ struct Parser
 
 		while (kv(items, seen));
 
+		if (name == mandatory_tag)
+		{
+			// Found the mandatory tag
+			mandatory_tag.clear();
+		}
+
 		if (name == "include")
 		{
 			stack.DoInclude(tag, flags);
@@ -241,6 +248,8 @@ struct Parser
 				{
 					case EOF:
 						// this is the one place where an EOF is not an error
+						if (!mandatory_tag.empty())
+							throw CoreException("Mandatory tag \"" + mandatory_tag + "\" not found");
 						return true;
 					case '#':
 						comment();
@@ -277,6 +286,10 @@ void ParseStack::DoInclude(ConfigTag* tag, int flags)
 {
 	if (flags & FLAG_NO_INC)
 		throw CoreException("Invalid <include> tag in file included with noinclude=\"yes\"");
+
+	std::string mandatorytag;
+	tag->readString("mandatorytag", mandatorytag);
+
 	std::string name;
 	if (tag->readString("file", name))
 	{
@@ -284,7 +297,7 @@ void ParseStack::DoInclude(ConfigTag* tag, int flags)
 			flags |= FLAG_NO_INC;
 		if (tag->getBool("noexec", false))
 			flags |= FLAG_NO_EXEC;
-		if (!ParseFile(name, flags))
+		if (!ParseFile(name, flags, mandatorytag))
 			throw CoreException("Included");
 	}
 	else if (tag->readString("executable", name))
@@ -295,7 +308,7 @@ void ParseStack::DoInclude(ConfigTag* tag, int flags)
 			flags |= FLAG_NO_INC;
 		if (tag->getBool("noexec", true))
 			flags |= FLAG_NO_EXEC;
-		if (!ParseExec(name, flags))
+		if (!ParseExec(name, flags, mandatorytag))
 			throw CoreException("Included");
 	}
 }
@@ -307,7 +320,7 @@ void ParseStack::DoReadFile(const std::string& key, const std::string& name, int
 	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"));
+	FileWrapper file(exec ? popen(name.c_str(), "r") : fopen(name.c_str(), "r"), exec);
 	if (!file)
 		throw CoreException("Could not read \"" + name + "\" for \"" + key + "\" file");
 
@@ -317,13 +330,17 @@ void ParseStack::DoReadFile(const std::string& key, const std::string& name, int
 	char linebuf[MAXBUF*10];
 	while (fgets(linebuf, sizeof(linebuf), file))
 	{
-		int len = strlen(linebuf);
+		size_t len = strlen(linebuf);
 		if (len)
+		{
+			if (linebuf[len-1] == '\n')
+				len--;
 			cache.push_back(std::string(linebuf, len));
+		}
 	}
 }
 
-bool ParseStack::ParseFile(const std::string& name, int flags)
+bool ParseStack::ParseFile(const std::string& name, int flags, const std::string& mandatory_tag)
 {
 	ServerInstance->Logs->Log("CONFIG", DEBUG, "Reading file %s", name.c_str());
 	for (unsigned int t = 0; t < reading.size(); t++)
@@ -341,13 +358,13 @@ bool ParseStack::ParseFile(const std::string& name, int flags)
 		throw CoreException("Could not read \"" + name + "\" for include");
 
 	reading.push_back(name);
-	Parser p(*this, flags, file, name);
+	Parser p(*this, flags, file, name, mandatory_tag);
 	bool ok = p.outer_parse();
 	reading.pop_back();
 	return ok;
 }
 
-bool ParseStack::ParseExec(const std::string& name, int flags)
+bool ParseStack::ParseExec(const std::string& name, int flags, const std::string& mandatory_tag)
 {
 	ServerInstance->Logs->Log("CONFIG", DEBUG, "Reading executable %s", name.c_str());
 	for (unsigned int t = 0; t < reading.size(); t++)
@@ -360,12 +377,12 @@ bool ParseStack::ParseExec(const std::string& name, int flags)
 
 	/* It's not already included, add it to the list of files we've loaded */
 
-	FileWrapper file(popen(name.c_str(), "r"));
+	FileWrapper file(popen(name.c_str(), "r"), true);
 	if (!file)
 		throw CoreException("Could not open executable \"" + name + "\" for include");
 
 	reading.push_back(name);
-	Parser p(*this, flags, file, name);
+	Parser p(*this, flags, file, name, mandatory_tag);
 	bool ok = p.outer_parse();
 	reading.pop_back();
 	return ok;
@@ -373,8 +390,17 @@ bool ParseStack::ParseExec(const std::string& name, int flags)
 
 bool ConfigTag::readString(const std::string& key, std::string& value, bool allow_lf)
 {
+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wunknown-pragmas"
+# pragma clang diagnostic ignored "-Wundefined-bool-conversion"
+#endif
+	// TODO: this is undefined behaviour but changing the API is too risky for 2.0.
 	if (!this)
 		return false;
+#ifdef __clang__
+# pragma clang diagnostic pop
+#endif
 	for(std::vector<KeyVal>::iterator j = items.begin(); j != items.end(); ++j)
 	{
 		if(j->first != key)
@@ -455,10 +481,10 @@ 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, std::vector<KeyVal>*& Items)
 {
 	ConfigTag* rv = new ConfigTag(Tag, file, line);
-	items = &rv->items;
+	Items = &rv->items;
 	return rv;
 }