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

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index b49ba943a..eb9151293 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -1,84 +1,75 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   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>
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * 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 free but copyrighted software; see
- *            the file COPYING for details.
+ * 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"
 #include "hashcomp.h"
 #include "inspstring.h"
 
-/*
- * Wildcard matching!
- *
- *  Iteration 1)
- *   Slow, horrible, etc.
- *	Iteration 2)
- *   The vastly available 'public domain' one
- *	Iteration 3)
- *   ZNC's, thought to be faster than ours, but it turned out that we could do better ;-)
- *	Iteration 4)
- *   Largely from work by peavey and myself (w00t) :)
- *	Iteration 5)
- *   peavey: Fix glob scan similar to 1.1, but scan ahead on glob in inner loop to retain speedup
- *   this fixes another case which we forgot to test. Add early return for obvious fail condition.
- */
-static bool match_internal(const unsigned char *string, const unsigned char *wild, unsigned const char *map)
+static bool match_internal(const unsigned char *str, const unsigned char *mask, unsigned const char *map)
 {
-	const unsigned char *s, *m; m = wild;
+	unsigned char *cp = NULL, *mp = NULL;
+	unsigned char* string = (unsigned char*)str;
+	unsigned char* wild = (unsigned char*)mask;
 
-	if (*string && !*wild)
-		return false;
-
-	if (!map)
-		map = rfc_case_insensitive_map;
+	while ((*string) && (*wild != '*'))
+	{
+		if ((map[*wild] != map[*string]) && (*wild != '?'))
+		{
+			return 0;
+		}
+		wild++;
+		string++;
+	}
 
 	while (*string)
 	{
 		if (*wild == '*')
 		{
-			while (*wild && *wild == '*')
-				wild++;
-
-			m = wild;
-
-			if (!*wild)
-				return true;
-			else if (*wild != '?')
+			if (!*++wild)
 			{
-				s = string;
-				while (*s)
-				{
-					if ((map[*wild] == map[*s]))
-					{
-						string = s;
-						if (*(wild+1) || !*(s+1))
-							wild++;
-						break;
-					}
-					s++;
-				}
+				return 1;
 			}
+			mp = wild;
+			cp = string+1;
 		}
-		else if ( (map[*wild] == map[*string]) || (*wild == '?') )
-			wild++;
 		else
-			wild = m;
+			if ((map[*wild] == map[*string]) || (*wild == '?'))
+			{
+				wild++;
+				string++;
+			}
+			else
+			{
+				wild = mp;
+				string = cp++;
+			}
 
-		string++;
 	}
 
-	while (*wild && *wild == '*')
+	while (*wild == '*')
+	{
 		wild++;
+	}
 
 	return !*wild;
 }
@@ -89,11 +80,16 @@ static bool match_internal(const unsigned char *string, const unsigned char *wil
 
 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);
 }
 
@@ -102,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)
@@ -111,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);
 }