m_callerid Use std::find() where possible

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

diff --git a/include/configparser.h b/include/configparser.h
index 3240ff5f9360874afffff7d2ae79f18d66693460..478899ed92f203481515541e6df68d04552af6ee 100644 (file)
--- a/include/configparser.h
+++ b/include/configparser.h
@@ -1,3 +1,22 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 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
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 struct fpos
 {
        std::string filename;
@@ -22,10 +41,11 @@ struct ParseStack
        std::vector<std::string> reading;
        std::map<std::string, std::string> vars;
        ConfigDataHash& output;
+       ConfigFileCache& FilesOutput;
        std::stringstream& errstr;
 
        ParseStack(ServerConfig* conf)
-               : output(conf->config_data), errstr(conf->errstr)
+               : output(conf->config_data), FilesOutput(conf->Files), errstr(conf->errstr)
        {
                vars["amp"] = "&";
                vars["quot"] = "\"";
@@ -34,6 +54,7 @@ struct ParseStack
        bool ParseFile(const std::string& name, int flags);
        bool ParseExec(const std::string& name, int flags);
        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 */