Fix STATUSMSG tag messages not including the status in the target.

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

diff --git a/include/configparser.h b/include/configparser.h
index 8292fdda5c6207182cd4129bdf6b27bcc41d4f2a..6326792187246e2b30f83b2c198a6f403a763605 100644 (file)
--- a/include/configparser.h
+++ b/include/configparser.h
@@ -1,7 +1,10 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2016 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -19,29 +22,10 @@
 
 #pragma once
 
-struct fpos
-{
-       std::string filename;
-       int line;
-       int col;
-       fpos(const std::string& name, int l = 1, int c = 1) : filename(name), line(l), col(c) {}
-       std::string str()
-       {
-               return filename + ":" + ConvToStr(line) + ":" + ConvToStr(col);
-       }
-};
-
-enum ParseFlags
-{
-       FLAG_USE_COMPAT = 1,
-       FLAG_NO_EXEC = 2,
-       FLAG_NO_INC = 4
-};
-
 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;
@@ -53,28 +37,7 @@ struct ParseStack
                vars["quot"] = "\"";
                vars["newline"] = vars["nl"] = "\n";
        }
-       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 = "");
+       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);
 };
-
-/** RAII wrapper on FILE* to close files on exceptions */
-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 != NULL); }
-       operator FILE*() { return f; }
-       ~FileWrapper()
-       {
-               if (f)
-               {
-                       if (close_with_pclose)
-                               pclose(f);
-                       else
-                               fclose(f);
-               }
-       }
-};