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

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index e717b0ad4..b49ba943a 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -18,64 +18,75 @@
 #include "inspstring.h"
 
 /*
- * Wildcard matching, the third (and probably final) iteration!
+ * 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 *str, const unsigned char *mask, unsigned const char *map)
+static bool match_internal(const unsigned char *string, const unsigned char *wild, unsigned const char *map)
 {
-	const unsigned char *wild = str;
-	const unsigned char *string = mask;
-	const unsigned char *cp = NULL;
-	const unsigned char *mp = NULL;
+	const unsigned char *s, *m; m = wild;
 
-	if (!map)
-		map = lowermap; // default to case insensitive search
-
-	while ((*string) && (*wild != '*'))
-	{
-		if (map[*wild] != map[*string] && (*wild != '?'))
-		{
-			return false;
-		}
+	if (*string && !*wild)
+		return false;
 
-		++wild;
-		++string;
-	}
+	if (!map)
+		map = rfc_case_insensitive_map;
 
 	while (*string)
 	{
 		if (*wild == '*')
 		{
-			if (!*++wild)
-			{
-				return true;
-			}
+			while (*wild && *wild == '*')
+				wild++;
 
-			mp = wild;
-			cp = string+1;
-		}
+			m = wild;
 
-		// if mapped char == mapped wild AND wild is NOT ?
-		else if (map[*wild] == map[*string] && (*wild == '?'))
-		{
-			++wild;
-			++string;
+			if (!*wild)
+				return true;
+			else if (*wild != '?')
+			{
+				s = string;
+				while (*s)
+				{
+					if ((map[*wild] == map[*s]))
+					{
+						string = s;
+						if (*(wild+1) || !*(s+1))
+							wild++;
+						break;
+					}
+					s++;
+				}
+			}
 		}
+		else if ( (map[*wild] == map[*string]) || (*wild == '?') )
+			wild++;
 		else
-		{
-			wild = mp;
-			string = cp++;
-		}
+			wild = m;
+
+		string++;
 	}
 
-	while (*wild == '*')
-	{
+	while (*wild && *wild == '*')
 		wild++;
-	}
 
-	return (*wild == 0);
+	return !*wild;
 }
 
+/********************************************************************
+ * Below here is all wrappers around match_internal
+ ********************************************************************/
+
 CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
 {
 	return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), map);
@@ -86,7 +97,6 @@ CoreExport bool InspIRCd::Match(const  char *str, const char *mask, unsigned con
 	return match_internal((const unsigned char *)str, (const unsigned char *)mask, map);
 }
 
-
 CoreExport bool InspIRCd::MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map)
 {
 	if (irc::sockets::MatchCIDR(str, mask, true))