X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=eb9151293d8e185747de8ba4a3caaa729a5b1588;hb=2e04480f21298262daa5c6d9b0d1b24c52f00756;hp=63a28b8cb797fe2e25bb9e4d8e94847c530752ec;hpb=b8e537eba7a77bc8cbcdd30e2ff1ba79fb7b0569;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 63a28b8cb..eb9151293 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2003, 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@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/>.
  */
 
+
 /* $Core */
 
 #include "inspircd.h"
@@ -19,54 +27,51 @@
 
 static bool match_internal(const unsigned char *str, const unsigned char *mask, unsigned const char *map)
 {
-        unsigned char *cp = NULL, *mp = NULL;
-        unsigned char* string = (unsigned char*)str;
-        unsigned char* wild = (unsigned char*)mask;
-
-	if (!map)
-		map = rfc_case_insensitive_map;
-
-        while ((*string) && (*wild != '*'))
-        {
-                if ((map[*wild] != map[*string]) && (*wild != '?'))
-                {
-                        return 0;
-                }
-                wild++;
-                string++;
-        }
-
-        while (*string)
-        {
-                if (*wild == '*')
-                {
-                        if (!*++wild)
-                        {
-                                return 1;
-                        }
-                        mp = wild;
-                        cp = string+1;
-                }
-                else
-                if ((map[*wild] == map[*string]) || (*wild == '?'))
-                {
-                        wild++;
-                        string++;
-                }
-                else
-                {
-                        wild = mp;
-                        string = cp++;
-                }
-
-        }
-
-        while (*wild == '*')
-        {
-                wild++;
-        }
-
-        return !*wild;
+	unsigned char *cp = NULL, *mp = NULL;
+	unsigned char* string = (unsigned char*)str;
+	unsigned char* wild = (unsigned char*)mask;
+
+	while ((*string) && (*wild != '*'))
+	{
+		if ((map[*wild] != map[*string]) && (*wild != '?'))
+		{
+			return 0;
+		}
+		wild++;
+		string++;
+	}
+
+	while (*string)
+	{
+		if (*wild == '*')
+		{
+			if (!*++wild)
+			{
+				return 1;
+			}
+			mp = wild;
+			cp = string+1;
+		}
+		else
+			if ((map[*wild] == map[*string]) || (*wild == '?'))
+			{
+				wild++;
+				string++;
+			}
+			else
+			{
+				wild = mp;
+				string = cp++;
+			}
+
+	}
+
+	while (*wild == '*')
+	{
+		wild++;
+	}
+
+	return !*wild;
 }
 
 /********************************************************************
@@ -75,11 +80,16 @@ static bool match_internal(const unsigned char *str, const unsigned char *mask,
 
 CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
 {
+	if (!map)
+		map = national_case_insensitive_map;
+
 	return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), map);
 }
 
 CoreExport bool InspIRCd::Match(const  char *str, const char *mask, unsigned const char *map)
 {
+	if (!map)
+		map = national_case_insensitive_map;
 	return match_internal((const unsigned char *)str, (const unsigned char *)mask, map);
 }
 
@@ -88,8 +98,11 @@ CoreExport bool InspIRCd::MatchCIDR(const std::string &str, const std::string &m
 	if (irc::sockets::MatchCIDR(str, mask, true))
 		return true;
 
+	if (!map)
+		map = national_case_insensitive_map;
+
 	// Fall back to regular match
-	return InspIRCd::Match(str, mask, NULL);
+	return InspIRCd::Match(str, mask, map);
 }
 
 CoreExport bool InspIRCd::MatchCIDR(const  char *str, const char *mask, unsigned const char *map)
@@ -97,7 +110,10 @@ CoreExport bool InspIRCd::MatchCIDR(const  char *str, const char *mask, unsigned
 	if (irc::sockets::MatchCIDR(str, mask, true))
 		return true;
 
+	if (!map)
+		map = national_case_insensitive_map;
+
 	// Fall back to regular match
-	return InspIRCd::Match(str, mask, NULL);
+	return InspIRCd::Match(str, mask, map);
 }