Add <gecos> field to <server> in XML stats output, also add to ProtoServer. Fixes...

[user/henk/code/inspircd.git] / src / wildcard.cpp

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 2243bc88217578b4607650a0c00e081aaaa407a4..2df7a5bec10e769b3e3445e8ebc18132fbfaee0c 100644 (file)
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,52 +11,57 @@
  * ---------------------------------------------------
  */
 
-#include <string>
+/* $Core: libIRCDwildcard */
+
 #include "inspircd.h"
 #include "hashcomp.h"
 #include "inspstring.h"
 
 using irc::sockets::MatchCIDR;
 
-// 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 csmatch(const char *str, const char *mask)
+/* Rewritten to operate on more effective C++ std::string types
+ * rather than char* to avoid data copies.
+ * - Brain
+ */
+
+CoreExport bool csmatch(const std::string &str, const std::string &mask)
 {
-       unsigned char *cp = NULL, *mp = NULL;
-       unsigned char* string = (unsigned char*)str;
-       unsigned char* wild = (unsigned char*)mask;
+       std::string::const_iterator cp, mp;
+
+       //unsigned char *cp = NULL, *mp = NULL;
+       //unsigned char* string = (unsigned char*)str;
+       //unsigned char* wild = (unsigned char*)mask;
 
-       while ((*string) && (*wild != '*'))
+       std::string::const_iterator wild = mask.begin();
+       std::string::const_iterator string = str.begin();
+
+       if (mask.empty())
+               return false;
+
+       while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
        {
                if ((*wild != *string) && (*wild != '?'))
-               {
                        return 0;
-               }
+
                wild++;
                string++;
        }
 
-       while (*string)
+       while (string != str.end())
        {
-               if (*wild == '*')
+               if (wild != mask.end() && *wild == '*')
                {
-                       if (!*++wild)
-                       {
+                       if (++wild == mask.end())
                                return 1;
-                       }
+
                        mp = wild;
-                       cp = string+1;
+                       cp = string;
+
+                       if (cp != str.end())
+                               cp++;
                }
                else
-               if ((*wild == *string) || (*wild == '?'))
+               if ((string != str.end() && wild != mask.end()) && ((*wild == *string) || (*wild == '?')))
                {
                        wild++;
                        string++;
@@ -64,48 +69,54 @@ bool csmatch(const char *str, const char *mask)
                else
                {
                        wild = mp;
-                       string = cp++;
+                       if (cp == str.end())
+                               cp = str.end();
+                       else
+                               string = cp++;
                }
 
        }
 
-       while (*wild == '*')
-       {
+       while ((wild != mask.end()) && (*wild == '*'))
                wild++;
-       }
 
-       return !*wild;
+       return wild == mask.end();
 }
 
-bool match(const char *str, const char *mask)
+CoreExport bool match(const std::string &str, const std::string &mask)
 {
-       unsigned char *cp = NULL, *mp = NULL;
-       unsigned char* string = (unsigned char*)str;
-       unsigned char* wild = (unsigned char*)mask;
+       std::string::const_iterator cp, mp;
+       std::string::const_iterator wild = mask.begin();
+       std::string::const_iterator string = str.begin();
+
+       if (mask.empty())
+               return false;
 
-       while ((*string) && (*wild != '*'))
+       while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
        {
-               if ((lowermap[*wild] != lowermap[*string]) && (*wild != '?'))
-               {
+               if ((lowermap[(unsigned char)*wild] != lowermap[(unsigned char)*string]) && (*wild != '?'))
                        return 0;
-               }
+
                wild++;
                string++;
        }
 
-       while (*string)
+       while (string != str.end())
        {
-               if (*wild == '*')
+               if (wild != mask.end() && *wild == '*')
                {
-                       if (!*++wild)
-                       {
+                       if (++wild == mask.end())
                                return 1;
-                       }
+
                        mp = wild;
-                       cp = string+1;
+                       cp = string;
+
+                       if (cp != str.end())
+                               cp++;
+
                }
                else
-               if ((lowermap[*wild] == lowermap[*string]) || (*wild == '?'))
+               if ((string != str.end() && wild != mask.end()) && ((lowermap[(unsigned char)*wild] == lowermap[(unsigned char)*string]) || (*wild == '?')))
                {
                        wild++;
                        string++;
@@ -113,30 +124,38 @@ bool match(const char *str, const char *mask)
                else
                {
                        wild = mp;
-                       string = cp++;
+                       if (cp == str.end())
+                               string = str.end();
+                       else
+                               string = cp++;
                }
 
        }
 
-       while (*wild == '*')
-       {
+       while ((wild != mask.end()) && (*wild == '*'))
                wild++;
-       }
 
-       return !*wild;
+       return wild == mask.end();
 }
 
 /* Overloaded function that has the option of using cidr */
-bool match(const char *str, const char *mask, bool use_cidr_match)
+CoreExport bool match(const std::string &str, const std::string &mask, bool use_cidr_match)
 {
        if (use_cidr_match && MatchCIDR(str, mask, true))
                return true;
        return match(str, mask);
 }
 
-bool match(bool case_sensitive, const char *str, const char *mask, bool use_cidr_match)
+CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask, bool use_cidr_match)
 {
        if (use_cidr_match && MatchCIDR(str, mask, true))
                return true;
-       return csmatch(str, mask);
+
+       return case_sensitive ? csmatch(str, mask) : match(str, mask);
+}
+
+CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask)
+{
+       return case_sensitive ? csmatch(str, mask) : match(str, mask);
 }
+