X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=06fc78b433b268997ce783d894b81c166136b061;hb=cb7982a32ed1d8c8fa42beb3056c35f44ad6eb21;hp=123abc500bf85fa81991f9db42458ef67508833b;hpb=5c328da92fbf7a7e8b26ded2df085d3cf49f67f5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 123abc500..06fc78b43 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -14,103 +14,83 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <string>
 #include "inspircd_config.h"
 #include "inspircd.h"
+#include "helperfuncs.h"
 #include "inspstring.h"
 
-void Delete(char* str,int pos)
-{
-	char moo[MAXBUF];
-	strlcpy(moo,str,MAXBUF);
-	moo[pos] = '\0';
-	strlcpy(str,moo,MAXBUF);
-	strlcat(str,moo+pos+1,MAXBUF);
-}
-
-void Insert(char* substr,char* str,int pos)
-{
-	std::string a = str;
-	a.insert(pos,substr);
-	strlcpy(str,a.c_str(),MAXBUF);
-}
-
-
-int MWC = 0;
+// Wed 27 Apr 2005 - Brain
+// I've taken our our old wildcard routine -
+// although comprehensive, it was topheavy and very
+// slow, and ate masses of cpu when doing lots of
+// comparisons. This is the 'de-facto' routine used
+// by many, nobody really knows who wrote it first
+// or what license its under, i've seen examples of it
+// (unattributed to any author) all over the 'net.
+// For now, we'll just consider this public domain.
 
-bool match2(char* literal,char* mask)
+int wildcmp(char *wild, char *string)
 {
+	char *cp, *mp;
+	while ((*string) && (*wild != '*'))
+	{
+		if ((*wild != *string) && (*wild != '?'))
+		{
+			return 0;
+		}
+		wild++;
+		string++;
+	}
 
-char OldM[MAXBUF];
-int I,I2;
-
-if (MWC)
-	return true;
+	while (*string)
+	{
+		if (*wild == '*')
+		{
+			if (!*++wild)
+			{
+				return 1;
+			}
+			mp = wild;
+			cp = string+1;
+		}
+		else
+		if ((*wild == *string) || (*wild == '?'))
+		{
+			wild++;
+			string++;
+		}
+		else
+		{
+			wild = mp;
+			string = cp++;
+		}
 
-if ((strstr(mask,"*")==0) && (strlen(literal) != strlen(mask)))
-	return 0;
- I=0;
- I2=0;
- while (I < strlen(mask))
- {
-   if (I2 >= strlen(literal))
-	   return 0;
- 
-   if ((mask[I]=='*') && (MWC==0))
-   {
-     strlcpy(OldM,mask,MAXBUF);
-     
-     Delete(mask,I);
-     
-     while (strlen(mask)<255)
-     {
-       match2(literal,mask);
-       if (MWC==2)
-	       return 1;
+	}
 
-       Insert("?",mask,I);
-     }
-     strlcpy(mask,OldM,MAXBUF);
-     Delete(mask,I);
-     Insert("?",mask,I);
-   }
-   if (mask[I]=='?')
-   {
-     I++;
-     I2++;
-     continue;
-   }
-   if (mask[I] != literal[I2])
-	   return 0;
-   if (MWC)
-	   return 1;
-   I++;
-   I2++;
- }
- if (strlen(literal)==strlen(mask))
-		 MWC=2;
+	while (*wild == '*')
+	{
+		wild++;
+	}
 
+	return !*wild;
 }
 
+// This wrapper function is required to convert both
+// strings to 'scandanavian lowercase' and make copies
+// of them to a safe location. It also ensures we don't
+// bite off more than we can chew with the length of
+// the string.
+
 bool match(const char* literal, const char* mask)
 {
-	char L[10240];
-	char M[10240];
-	MWC = 0;
+	static char L[10240];
+	static char M[10240];
 	strlcpy(L,literal,10240);
 	strlcpy(M,mask,10240);
 	strlower(L);
 	strlower(M);
-	// short circuit literals
-	log(DEBUG,"Match '%s' to '%s'",L,M);
-	if ((!strchr(M,'*')) && (!strchr(M,'?')))
-	{
-		if (!strcasecmp(L,M))
-		{
-			return true;
-		}
-	}
-	match2(L,M);
-	return (MWC == 2);
+	return wildcmp(M,L);
 }
-