Crash fixes from nenolod

[user/henk/code/inspircd.git] / src / wildcard.cpp

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index f888b68cfb7943883d54ab7d86bb73ba264c1161..0e6e8a874eaf4e3d6e309b1fe9ba0a51c3636137 100644 (file)
--- 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,21 +128,22 @@ 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);
 }
 
-bool match(bool case_sensitive, const char *str, const char *mask)
+CoreExport bool match(bool case_sensitive, const char *str, const char *mask)
 {
        return case_sensitive ? csmatch(str, mask) : match(str, mask);
 }