X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_regex_pcre.cpp;h=cba234c8cae74977c9930bbfde1a462ea63649f0;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=9e8aff159c81467959b935c67b6f5c73897b78be;hpb=a59d08fffd3dc8a9850ce34c9928fb6382b9b37f;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 9e8aff159..cba234c8c 100644
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | 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) 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/>.
  */
 
+
 #include "inspircd.h"
 #include <pcre.h>
 #include "m_regex.h"
@@ -20,15 +27,15 @@
 /* $CompileFlags: exec("pcre-config --cflags") */
 /* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */
 
-#ifdef WINDOWS
-#pragma comment(lib, "pcre.lib")
+#ifdef _WIN32
+# pragma comment(lib, "libpcre.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)
+		: ModuleException("Error in regex " + rx + " at offset " + ConvToStr(erroffset) + ": " + error)
 	{
 	}
 };
@@ -67,35 +74,27 @@ public:
 	}
 };
 
-class ModuleRegexPCRE : public Module
+class PCREFactory : public RegexFactory
 {
-public:
-	ModuleRegexPCRE() 	{
-		ServerInstance->Modules->PublishInterface("RegularExpression", this);
-	}
-
-	virtual Version GetVersion()
+ public:
+	PCREFactory(Module* m) : RegexFactory(m, "regex/pcre") {}
+	Regex* Create(const std::string& expr)
 	{
-		return Version("Regex Provider Module for PCRE", VF_COMMON | VF_VENDOR);
+		return new PCRERegex(expr);
 	}
+};
 
-	virtual ~ModuleRegexPCRE()
-	{
-		ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
+class ModuleRegexPCRE : public Module
+{
+public:
+	PCREFactory ref;
+	ModuleRegexPCRE() : ref(this) {
+		ServerInstance->Modules->AddService(ref);
 	}
 
-	void OnRequest(Request& request)
+	Version GetVersion()
 	{
-		if (strcmp("REGEX-NAME", request.id) == 0)
-		{
-			static_cast<RegexNameRequest&>(request).result = "pcre";
-		}
-		else if (strcmp("REGEX", request.id) == 0)
-		{
-			RegexFactoryRequest& rfr = (RegexFactoryRequest&)request;
-			std::string rx = rfr.GetRegex();
-			rfr.result = new PCRERegex(rx);
-		}
+		return Version("Regex Provider Module for PCRE", VF_VENDOR);
 	}
 };