X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_regex_posix.cpp;h=d63b83acf1d1fe31e2954228f2b6fd175a679932;hb=d848034590bc402277da975b7efdbc78ce1722fc;hp=62b44e0e4dae4497c53b1ee9fce605d88b976d65;hpb=7e843c22e16c81054bad18073d24fe1a07026431;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp
index 62b44e0e4..d63b83acf 100644
--- a/src/modules/extra/m_regex_posix.cpp
+++ b/src/modules/extra/m_regex_posix.cpp
@@ -1,39 +1,37 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
+
 #include "inspircd.h"
-#include "m_regex.h"
+#include "modules/regex.h"
 #include <sys/types.h>
 #include <regex.h>
 
-/* $ModDesc: Regex Provider Module for POSIX Regular Expressions */
-/* $ModDep: m_regex.h */
-
-class POSIXRegexException : public ModuleException
-{
-public:
-	POSIXRegexException(const std::string& rx, const std::string& error)
-		: ModuleException(std::string("Error in regex ") + rx + ": " + error)
-	{
-	}
-};
-
 class POSIXRegex : public Regex
 {
-private:
 	regex_t regbuf;
 
-public:
+ public:
 	POSIXRegex(const std::string& rx, bool extended) : Regex(rx)
 	{
 		int flags = (extended ? REG_EXTENDED : 0) | REG_NOSUB;
@@ -51,66 +49,49 @@ public:
 			error = errbuf;
 			delete[] errbuf;
 			regfree(&regbuf);
-			throw POSIXRegexException(rx, error);
+			throw RegexException(rx, error);
 		}
 	}
 
-	virtual ~POSIXRegex()
+	~POSIXRegex()
 	{
 		regfree(&regbuf);
 	}
 
-	virtual bool Matches(const std::string& text)
+	bool Matches(const std::string& text) CXX11_OVERRIDE
 	{
-		if (regexec(&regbuf, text.c_str(), 0, NULL, 0) == 0)
-		{
-			// Bang. :D
-			return true;
-		}
-		return false;
+		return (regexec(&regbuf, text.c_str(), 0, NULL, 0) == 0);
 	}
 };
 
-class ModuleRegexPOSIX : public Module
+class PosixFactory : public RegexFactory
 {
-private:
+ public:
 	bool extended;
-public:
-	ModuleRegexPOSIX() 	{
-		ServerInstance->Modules->PublishInterface("RegularExpression", this);
-		Implementation eventlist[] = { I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
-		OnRehash(NULL);
-	}
-
-	virtual Version GetVersion()
+	PosixFactory(Module* m) : RegexFactory(m, "regex/posix") {}
+	Regex* Create(const std::string& expr) CXX11_OVERRIDE
 	{
-		return Version("Regex Provider Module for POSIX Regular Expressions", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return new POSIXRegex(expr, extended);
 	}
+};
+
+class ModuleRegexPOSIX : public Module
+{
+	PosixFactory ref;
 
-	virtual ~ModuleRegexPOSIX()
+ public:
+	ModuleRegexPOSIX() : ref(this)
 	{
-		ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
 	}
 
-	virtual void OnRehash(User* u)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		ConfigReader Conf;
-		extended = Conf.ReadFlag("posix", "extended", 0);
+		return Version("Provides the posix regular expression engine which uses the POSIX.2 regular expression matching system.", VF_VENDOR);
 	}
 
-	void OnRequest(Request& request)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		if (strcmp("REGEX-NAME", request.id) == 0)
-		{
-			static_cast<RegexNameRequest&>(request).result = "posix";
-		}
-		else if (strcmp("REGEX", request.id) == 0)
-		{
-			RegexFactoryRequest& rfr = (RegexFactoryRequest&)request;
-			std::string rx = rfr.GetRegex();
-			rfr.result = new POSIXRegex(rx, extended);
-		}
+		ref.extended = ServerInstance->Config->ConfValue("posix")->getBool("extended");
 	}
 };