X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=63a28b8cb797fe2e25bb9e4d8e94847c530752ec;hb=6cdc212ce7559bfc6cb26bf1e09fb3601a48c5ce;hp=074a91eedc348bde8d1cc27649e129a6f93f34d7;hpb=9582002171b47c49f5de3cb6ae6f7ece788b233b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 074a91eed..63a28b8cb 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -17,67 +17,56 @@
 #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) :)
- *
- */
-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;
+        unsigned char *cp = NULL, *mp = NULL;
+        unsigned char* string = (unsigned char*)str;
+        unsigned char* wild = (unsigned char*)mask;
 
 	if (!map)
-		map = lowermap;
-
-	while (*string)
-	{
-		if (*wild == '*')
-		{
-			while (*wild && *wild == '*')
-				wild++;
-
-			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 != '?') )
-		{
-			return false;
-		}
-		else
-			wild++;
-
-		string++;
-	}
-
-	while (*wild && *wild == '*')
-		wild++;
-
-	return !*wild;
+		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;
 }
 
 /********************************************************************
@@ -94,7 +83,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))