Merge insp20

[user/henk/code/inspircd.git] / include / configparser.h

diff --git a/include/configparser.h b/include/configparser.h
index 478899ed92f203481515541e6df68d04552af6ee..02619e759fe76b65f4c18a4d61471b6044b223ce 100644 (file)
--- 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> 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);
 };
@@ -61,14 +62,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);
+               }
        }
 };
-
-