X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigparser.h;h=8292fdda5c6207182cd4129bdf6b27bcc41d4f2a;hb=61d586b1a3ad689669f6dcdc285b0d021ca814bd;hp=478899ed92f203481515541e6df68d04552af6ee;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configparser.h b/include/configparser.h
index 478899ed9..8292fdda5 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
 };
@@ -51,8 +53,8 @@ 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 = "");
+	bool ParseExec(const std::string& name, int flags, const std::string& mandatory_tag = "");
 	void DoInclude(ConfigTag* includeTag, int flags);
 	void DoReadFile(const std::string& key, const std::string& file, int flags, bool exec);
 };
@@ -61,14 +63,18 @@ struct ParseStack
 struct FileWrapper
 {
 	FILE* const f;
-	FileWrapper(FILE* file) : f(file) {}
-	operator bool() { return f; }
+	bool close_with_pclose;
+	FileWrapper(FILE* file, bool use_pclose = false) : f(file), close_with_pclose(use_pclose) {}
+	operator bool() { return (f != NULL); }
 	operator FILE*() { return f; }
 	~FileWrapper()
 	{
 		if (f)
-			fclose(f);
+		{
+			if (close_with_pclose)
+				pclose(f);
+			else
+				fclose(f);
+		}
 	}
 };
-
-