X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigparser.h;h=bdf7633417c4205b4b47e50f76af4fd0569bdbd4;hb=c05f81cac83e80c7727594e3929e0709eccca689;hp=4b83d26d7e01dfceb37a879649f17259710aaa6a;hpb=2ab2de1dda8f2043898b9df8004ba5b6c4df7349;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configparser.h b/include/configparser.h
index 4b83d26d7..bdf763341 100644
--- 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, 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
@@ -17,29 +20,12 @@
  */
 
 
-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_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;
@@ -47,34 +33,29 @@ struct ParseStack
 	ParseStack(ServerConfig* conf)
 		: 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";
+
+		// 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);
-	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);
 };
-
-/** 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; }
-	operator FILE*() { return f; }
-	~FileWrapper()
-	{
-		if (f)
-		{
-			if (close_with_pclose)
-				pclose(f);
-			else
-				fclose(f);
-		}
-	}
-};
-
-