X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fconfigparser.h;h=bdf7633417c4205b4b47e50f76af4fd0569bdbd4;hb=8fcb8ee6d6542b533e132bc8958a895553ee8371;hp=3240ff5f9360874afffff7d2ae79f18d66693460;hpb=5d73e8928826340aaca9e78205ffb093a6b4f95c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configparser.h b/include/configparser.h
index 3240ff5f9..bdf763341 100644
--- a/include/configparser.h
+++ b/include/configparser.h
@@ -1,53 +1,61 @@
-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);
-	}
-};
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2016, 2021 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
+ * 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/>.
+ */
 
-enum ParseFlags
-{
-	FLAG_USE_XML = 1,
-	FLAG_NO_EXEC = 2,
-	FLAG_NO_INC = 4
-};
+
+#pragma once
 
 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;
 
 	ParseStack(ServerConfig* conf)
-		: output(conf->config_data), errstr(conf->errstr)
+		: output(conf->config_data), FilesOutput(conf->Files), errstr(conf->errstr)
 	{
-		vars["amp"] = "&";
+		// Special character escapes.
+		vars["newline"] = "\n";
+		vars["nl"]      = "\n";
+
+		// XML escapes.
+		vars["amp"]  = "&";
+		vars["apos"] = "'";
+		vars["gt"]   = ">";
+		vars["lt"]   = "<";
 		vars["quot"] = "\"";
-		vars["newline"] = vars["nl"] = "\n";
-	}
-	bool ParseFile(const std::string& name, int flags);
-	bool ParseExec(const std::string& name, int flags);
-	void DoInclude(ConfigTag* includeTag, int flags);
-};
 
-/** RAII wrapper on FILE* to close files on exceptions */
-struct FileWrapper
-{
-	FILE* const f;
-	FileWrapper(FILE* file) : f(file) {}
-	operator bool() { return f; }
-	operator FILE*() { return f; }
-	~FileWrapper()
-	{
-		if (f)
-			fclose(f);
+		// IRC formatting codes.
+		vars["irc.bold"]          = "\x02";
+		vars["irc.color"]         = "\x03";
+		vars["irc.colour"]        = "\x03";
+		vars["irc.italic"]        = "\x1D";
+		vars["irc.monospace"]     = "\x11";
+		vars["irc.reset"]         = "\x0F";
+		vars["irc.reverse"]       = "\x16";
+		vars["irc.strikethrough"] = "\x1E";
+		vars["irc.underline"]     = "\x1F";
 	}
+	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);
 };
-
-