Move all_opers into class InspIRCd

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 9b3b5b5b1c8b64dce75c99149dd46cc127a6ee09..ac51cafe883deb0134c2c18b50949230785679ba 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -58,6 +58,25 @@ extern const char lowermap[255];
  ******************************************************/
 
 using namespace std;
+using namespace irc::sockets;
+
+/* convert a string to lowercase. Note following special circumstances
+ * taken from RFC 1459. Many "official" server branches still hold to this
+ * rule so i will too;
+ *
+ *  Because of IRC's scandanavian origin, the characters {}| are
+ *  considered to be the lower case equivalents of the characters []\,
+ *  respectively. This is a critical issue when determining the
+ *  equivalence of two nicknames.
+ */
+void nspace::strlower(char *n)
+{
+        if (n)
+        {
+                for (char* t = n; *t; t++)
+                        *t = lowermap[(unsigned char)*t];
+        }
+}
 
 size_t nspace::hash<insp_inaddr>::operator()(const insp_inaddr &a) const
 {
@@ -68,10 +87,15 @@ size_t nspace::hash<insp_inaddr>::operator()(const insp_inaddr &a) const
 
 size_t nspace::hash<string>::operator()(const string &s) const
 {
-       char a[MAXBUF];
+       char a[s.length()];
+       size_t t = 0;
        static struct hash<const char *> strhash;
-       strlcpy(a,s.c_str(),MAXBUF);
-       strlower(a);
+
+       for (const char* x = s.c_str(); *x; x++)        /* Faster to do it this way than */
+               a[t++] = lowermap[(unsigned char)*x];   /* Seperate strlcpy and strlower */
+
+       a[t] = 0;
+
        return strhash(a);
 }
 
@@ -187,6 +211,11 @@ std::istream& operator>>(std::istream &is, irc::string &str)
 
 irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false)
 {
+       /* Remove trailing spaces, these muck up token parsing */
+       while (tokens.find_last_of(' ') == tokens.length() - 1)
+               tokens.erase(tokens.end() - 1);
+
+       /* Record starting position and current position */
        last_starting_position = tokens.begin();
        n = tokens.begin();
 }