X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigparser.h;h=c9790c59f7d22ccb22527b620b7933463f3e6698;hb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;hp=4b83d26d7e01dfceb37a879649f17259710aaa6a;hpb=074a96c9ffc85763da833bccadefc9978152482c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configparser.h b/include/configparser.h
index 4b83d26d7..c9790c59f 100644
--- a/include/configparser.h
+++ b/include/configparser.h
@@ -17,6 +17,8 @@
  */
 
 
+#pragma once
+
 struct fpos
 {
 	std::string filename;
@@ -31,7 +33,7 @@ struct fpos
 
 enum ParseFlags
 {
-	FLAG_USE_XML = 1,
+	FLAG_USE_COMPAT = 1,
 	FLAG_NO_EXEC = 2,
 	FLAG_NO_INC = 4
 };
@@ -39,7 +41,7 @@ enum ParseFlags
 struct ParseStack
 {
 	std::vector<std::string> reading;
-	std::map<std::string, std::string> vars;
+	insp::flat_map<std::string, std::string, irc::insensitive_swo> vars;
 	ConfigDataHash& output;
 	ConfigFileCache& FilesOutput;
 	std::stringstream& errstr;
@@ -51,8 +53,7 @@ struct ParseStack
 		vars["quot"] = "\"";
 		vars["newline"] = vars["nl"] = "\n";
 	}
-	bool ParseFile(const std::string& name, int flags);
-	bool ParseExec(const std::string& name, int flags);
+	bool ParseFile(const std::string& name, int flags, const std::string& mandatory_tag = std::string(), bool isexec = false);
 	void DoInclude(ConfigTag* includeTag, int flags);
 	void DoReadFile(const std::string& key, const std::string& file, int flags, bool exec);
 };
@@ -63,7 +64,7 @@ struct FileWrapper
 	FILE* const f;
 	bool close_with_pclose;
 	FileWrapper(FILE* file, bool use_pclose = false) : f(file), close_with_pclose(use_pclose) {}
-	operator bool() { return f; }
+	operator bool() { return (f != NULL); }
 	operator FILE*() { return f; }
 	~FileWrapper()
 	{
@@ -76,5 +77,3 @@ struct FileWrapper
 		}
 	}
 };
-
-