X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=10e1f331e485d1e192b3bb5baa5317af4355f46e;hb=bb81e1a5f38b1d6487e53aa5ac69ca7ced9f6562;hp=a216792ddd59e0464f967dac25e139e5947b87c3;hpb=a10024d9e354a2c5567976fd4ee8e5469e939302;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index a216792dd..10e1f331e 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *                <Craig@chatspike.net>
@@ -14,8 +14,11 @@
  * ---------------------------------------------------
  */
 
-#include <string>
+using namespace std;
+
+#include "inspircd_config.h"
 #include "inspircd.h"
+#include <string>
 #include "hashcomp.h"
 #include "helperfuncs.h"
 #ifdef GCC3
@@ -30,6 +33,9 @@
 #define nspace std
 #endif
 
+// from helperfuncs.cpp
+extern const char lowermap[255];
+
 /******************************************************
  *
  * The hash functions of InspIRCd are the centrepoint
@@ -70,31 +76,112 @@ size_t nspace::hash<in_addr>::operator()(const struct in_addr &a) const
 
 size_t nspace::hash<string>::operator()(const string &s) const
 {
-        char a[MAXBUF];
-        static struct hash<const char *> strhash;
-        strlcpy(a,s.c_str(),MAXBUF);
-        strlower(a);
-        return strhash(a);
+	char a[MAXBUF];
+	static struct hash<const char *> strhash;
+	strlcpy(a,s.c_str(),MAXBUF);
+	strlower(a);
+	return strhash(a);
 }
 
-bool StrHashComp::operator()(const string& s1, const string& s2) const
+bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const
 {
-        char a[MAXBUF],b[MAXBUF];
-        strlcpy(a,s1.c_str(),MAXBUF);
-        strlcpy(b,s2.c_str(),MAXBUF);
-        strlower(a);
-        strlower(b);
-        return (strcasecmp(a,b) == 0);
+	char* n1 = (char*)s1.c_str();
+	char* n2 = (char*)s2.c_str();
+	for (; *n1 && *n2; n1++, n2++)
+		if (lowertab[*n1] != lowertab[*n2])
+			return false;
+	return (lowertab[*n1] == lowertab[*n2]);
 }
 
-bool InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) const
+bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) const
 {
-        size_t q;
-        size_t p;
+        return (s1.s_addr == s1.s_addr);
+}
 
-        memcpy(&q,&s1,sizeof(size_t));
-        memcpy(&p,&s2,sizeof(size_t));
+/******************************************************
+ *
+ * This is the implementation of our special irc::string
+ * class which is a case-insensitive equivalent to
+ * std::string which is not only case-insensitive but
+ * can also do scandanavian comparisons, e.g. { = [, etc.
+ *
+ * This class depends on the global 'lowermap' which is
+ * initialized at startup by inspircd.cpp, and contains
+ * the 'scandanavian' casemappings for fast irc compare.
+ *
+ ******************************************************/
 
-        return (q == p);
+bool irc::irc_char_traits::eq(char c1st, char c2nd)
+{
+	return lowermap[(unsigned)c1st] == lowermap[(unsigned)c2nd];
+}
+
+bool irc::irc_char_traits::ne(char c1st, char c2nd)
+{
+	return lowermap[(unsigned)c1st] != lowermap[(unsigned)c2nd];
 }
 
+bool irc::irc_char_traits::lt(char c1st, char c2nd)
+{
+	return lowermap[(unsigned)c1st] < lowermap[(unsigned)c2nd];
+}
+
+int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n)
+{
+	for(unsigned int i = 0; i < n; i++)
+	{
+		if(lowermap[(unsigned)*str1] > lowermap[(unsigned)*str2])
+       	        	return 1;
+
+		if(lowermap[(unsigned)*str1] < lowermap[(unsigned)*str2])
+	               	return -1;
+
+	        if(*str1 == 0 || *str2 == 0)
+	              	return 0;
+
+	       	str1++;
+		str2++;
+	}
+	return 0;
+}
+
+std::string operator+ (std::string& leftval, irc::string& rightval)
+{
+	return leftval + std::string(rightval.c_str());
+}
+
+irc::string operator+ (irc::string& leftval, std::string& rightval)
+{
+	return leftval + irc::string(rightval.c_str());
+}
+
+bool operator== (std::string& leftval, irc::string& rightval)
+{
+	return (leftval == std::string(rightval.c_str()));
+}
+
+bool operator== (irc::string& leftval, std::string& rightval)
+{
+	return (rightval == std::string(leftval.c_str()));
+}
+
+const char* irc::irc_char_traits::find(const char* s1, int  n, char c)
+{
+	while(n-- > 0 && lowermap[(unsigned)*s1] != lowermap[(unsigned)c])
+		s1++;
+	return s1;
+}
+
+/* See hashcomp.h if you care about these... */
+std::ostream& operator<<(std::ostream &os, const irc::string &str)
+{
+	return os << str.c_str();
+}
+
+std::istream& operator>>(std::istream &is, irc::string &str)
+{
+	std::string tmp;
+	is >> tmp;
+	str = tmp.c_str();
+	return is;
+}