X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigparser.h;h=478899ed92f203481515541e6df68d04552af6ee;hb=34b2dde776b332116d04cea356843b324ab099fb;hp=a1d7aff5bad5a6a0f994f3916bc341a92f601eb0;hpb=b332dda6a32f4033bfd7d9dd86150e1c23e3cf62;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configparser.h b/include/configparser.h
index a1d7aff5b..478899ed9 100644
--- 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;
@@ -12,8 +31,9 @@ struct fpos
 
 enum ParseFlags
 {
-	FLAG_NO_EXEC = 1,
-	FLAG_NO_INC = 2
+	FLAG_USE_XML = 1,
+	FLAG_NO_EXEC = 2,
+	FLAG_NO_INC = 4
 };
 
 struct ParseStack
@@ -21,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"] = "\"";
@@ -33,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 */