X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_regex_pcre.cpp;h=6c5ecb83f0391f60df1479b331bd032e5565e32e;hb=71841b747d41a8efca1998aa950c89b034f8d46d;hp=5254f04a678d731ebdcae113b87069371d3e5ae7;hpb=7d93921aabd9c608821baec8a871aff844dfae49;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index 5254f04a6..6c5ecb83f 100644
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -1,106 +1,95 @@
-/*       +------------------------------------+
- *       | 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, 2016, 2019, 2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2011 Adam <Adam@anope.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@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/>.
  */
 
+/// $CompilerFlags: execute("pcre-config --cflags" "PCRE_CXXFLAGS")
+/// $LinkerFlags: execute("pcre-config --libs" "PCRE_LDFLAGS" "-lpcre")
+
+/// $PackageInfo: require_system("arch") pcre
+/// $PackageInfo: require_system("centos") pcre-devel
+/// $PackageInfo: require_system("darwin") pcre
+/// $PackageInfo: require_system("debian") libpcre3-dev
+/// $PackageInfo: require_system("ubuntu") libpcre3-dev
+
+
 #include "inspircd.h"
 #include <pcre.h>
-#include "m_regex.h"
-
-/* $ModDesc: Regex Provider Module for PCRE */
-/* $ModDep: m_regex.h */
-/* $CompileFlags: exec("pcre-config --cflags") */
-/* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */
+#include "modules/regex.h"
 
-#ifdef WINDOWS
-#pragma comment(lib, "pcre.lib")
+#ifdef _WIN32
+# pragma comment(lib, "pcre.lib")
 #endif
 
-class PCREException : public ModuleException
-{
-public:
-	PCREException(const std::string& rx, const std::string& error, int erroffset)
-		: ModuleException(std::string("Error in regex ") + rx + " at offset " + ConvToStr(erroffset) + ": " + error)
-	{
-	}
-};
-
 class PCRERegex : public Regex
 {
-private:
 	pcre* regex;
 
-public:
-	PCRERegex(const std::string& rx, InspIRCd* Me) : Regex(rx, Me)
+ public:
+	PCRERegex(const std::string& rx) : Regex(rx)
 	{
 		const char* error;
 		int erroffset;
 		regex = pcre_compile(rx.c_str(), 0, &error, &erroffset, NULL);
 		if (!regex)
 		{
-			Me->Logs->Log("REGEX", DEBUG, "pcre_compile failed: /%s/ [%d] %s", rx.c_str(), erroffset, error);
-			throw PCREException(rx, error, erroffset);
+			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "pcre_compile failed: /%s/ [%d] %s", rx.c_str(), erroffset, error);
+			throw RegexException(rx, error, erroffset);
 		}
 	}
 
-	virtual ~PCRERegex()
+	~PCRERegex()
 	{
 		pcre_free(regex);
 	}
 
-	virtual bool Matches(const std::string& text)
+	bool Matches(const std::string& text) CXX11_OVERRIDE
 	{
-		if (pcre_exec(regex, NULL, text.c_str(), text.length(), 0, 0, NULL, 0) > -1)
-		{
-			// Bang. :D
-			return true;
-		}
-		return false;
+		return (pcre_exec(regex, NULL, text.c_str(), text.length(), 0, 0, NULL, 0) >= 0);
 	}
 };
 
-class ModuleRegexPCRE : public Module
+class PCREFactory : public RegexFactory
 {
-public:
-	ModuleRegexPCRE(InspIRCd* Me) : Module(Me)
-	{
-		Me->Modules->PublishInterface("RegularExpression", this);
-		Implementation eventlist[] = { I_OnRequest };
-		Me->Modules->Attach(eventlist, this, 1);
-	}
-
-	virtual Version GetVersion()
+ public:
+	PCREFactory(Module* m) : RegexFactory(m, "regex/pcre") {}
+	Regex* Create(const std::string& expr) CXX11_OVERRIDE
 	{
-		return Version("Regex Provider Module for PCRE", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return new PCRERegex(expr);
 	}
+};
 
-	virtual ~ModuleRegexPCRE()
+class ModuleRegexPCRE : public Module
+{
+ public:
+	PCREFactory ref;
+	ModuleRegexPCRE() : ref(this)
 	{
-		ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
 	}
 
-	virtual const char* OnRequest(Request* request)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		if (strcmp("REGEX-NAME", request->GetId()) == 0)
-		{
-			return "pcre";
-		}
-		else if (strcmp("REGEX", request->GetId()) == 0)
-		{
-			RegexFactoryRequest* rfr = (RegexFactoryRequest*)request;
-			std::string rx = rfr->GetRegex();
-			rfr->result = new PCRERegex(rx, ServerInstance);
-			return "OK";
-		}
-		return NULL;
+		return Version("Provides the pcre regular expression engine which uses the PCRE library.", VF_VENDOR);
 	}
 };