X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=0e6e8a874eaf4e3d6e309b1fe9ba0a51c3636137;hb=8e8445d1c0744130f232d3c6f56d5fe1079773ad;hp=2243bc88217578b4607650a0c00e081aaaa407a4;hpb=0c828ad6d498a15f42b1d281ea979135a91b87e2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 2243bc882..0e6e8a874 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,7 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include <string>
+/* $Core: libIRCDwildcard */
+
 #include "inspircd.h"
 #include "hashcomp.h"
 #include "inspstring.h"
@@ -28,7 +29,7 @@ using irc::sockets::MatchCIDR;
 // (unattributed to any author) all over the 'net.
 // For now, we'll just consider this public domain.
 
-bool csmatch(const char *str, const char *mask)
+CoreExport bool csmatch(const char *str, const char *mask)
 {
 	unsigned char *cp = NULL, *mp = NULL;
 	unsigned char* string = (unsigned char*)str;
@@ -77,7 +78,7 @@ bool csmatch(const char *str, const char *mask)
 	return !*wild;
 }
 
-bool match(const char *str, const char *mask)
+CoreExport bool match(const char *str, const char *mask)
 {
 	unsigned char *cp = NULL, *mp = NULL;
 	unsigned char* string = (unsigned char*)str;
@@ -127,16 +128,23 @@ bool match(const char *str, const char *mask)
 }
 
 /* Overloaded function that has the option of using cidr */
-bool match(const char *str, const char *mask, bool use_cidr_match)
+CoreExport bool match(const char *str, const char *mask, bool use_cidr_match)
 {
 	if (use_cidr_match && MatchCIDR(str, mask, true))
 		return true;
 	return match(str, mask);
 }
 
-bool match(bool case_sensitive, const char *str, const char *mask, bool use_cidr_match)
+CoreExport bool match(bool case_sensitive, const char *str, const char *mask, bool use_cidr_match)
 {
 	if (use_cidr_match && MatchCIDR(str, mask, true))
 		return true;
-	return csmatch(str, mask);
+
+	return case_sensitive ? csmatch(str, mask) : match(str, mask);
+}
+
+CoreExport bool match(bool case_sensitive, const char *str, const char *mask)
+{
+	return case_sensitive ? csmatch(str, mask) : match(str, mask);
 }
+