Merge insp20

[user/henk/code/inspircd.git] / src / modules / m_nationalchars.cpp

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 0650cb3d000b004d704f15325f61b912cea5290a..8e836c407d59e3e0be3c810b787439c1e3e0322d 100644 (file)
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -223,11 +223,35 @@ class ModuleNationalChars : public Module
        caller1<bool, const std::string&> rememberer;
        bool forcequit;
        const unsigned char * lowermap_rememberer;
+       unsigned char prev_map[256];
+
+       template <typename T>
+       void RehashHashmap(T& hashmap)
+       {
+               T newhash(hashmap.bucket_count());
+               for (typename T::const_iterator i = hashmap.begin(); i != hashmap.end(); ++i)
+                       newhash.insert(std::make_pair(i->first, i->second));
+               hashmap.swap(newhash);
+       }
+
+       void CheckRehash()
+       {
+               // See if anything changed
+               if (!memcmp(prev_map, national_case_insensitive_map, sizeof(prev_map)))
+                       return;
+
+               memcpy(prev_map, national_case_insensitive_map, sizeof(prev_map));
+
+               RehashHashmap(ServerInstance->Users.clientlist);
+               RehashHashmap(ServerInstance->Users.uuidlist);
+               RehashHashmap(ServerInstance->chanlist);
+       }
 
  public:
        ModuleNationalChars()
                : rememberer(ServerInstance->IsNick), lowermap_rememberer(national_case_insensitive_map)
        {
+               memcpy(prev_map, national_case_insensitive_map, sizeof(prev_map));
        }
 
        void init() CXX11_OVERRIDE
@@ -247,13 +271,22 @@ class ModuleNationalChars : public Module
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("nationalchars");
                charset = tag->getString("file");
-               casemapping = tag->getString("casemapping", charset);
+               casemapping = tag->getString("casemapping", FileSystem::GetFileName(charset));
+               if (casemapping.find(' ') != std::string::npos)
+                       throw ModuleException("<nationalchars:casemapping> must not contain any spaces!");
+#if defined _WIN32
+               if (!FileSystem::StartsWithWindowsDriveLetter(charset))
+                       charset.insert(0, "./locales/");
+#else
                if(charset[0] != '/')
                        charset.insert(0, "../locales/");
+#endif
                unsigned char * tables[8] = { m_additional, m_additionalMB, m_additionalUp, m_lower, m_upper, m_additionalUtf8, m_additionalUtf8range, m_additionalUtf8interval };
-               loadtables(charset, tables, 8, 5);
+               if (!loadtables(charset, tables, 8, 5))
+                       throw ModuleException("The locale file failed to load. Check your log file for more information.");
                forcequit = tag->getBool("forcequit");
                CheckForceQuit("National character set changed");
+               CheckRehash();
        }
 
        void CheckForceQuit(const char * message)
@@ -262,10 +295,12 @@ class ModuleNationalChars : public Module
                        return;
 
                const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
-               for (UserManager::LocalList::const_iterator iter = list.begin(); iter != list.end(); ++iter)
+               for (UserManager::LocalList::const_iterator iter = list.begin(); iter != list.end(); )
                {
                        /* Fix by Brain: Dont quit UID users */
+                       // Quitting the user removes it from the list
                        User* n = *iter;
+                       ++iter;
                        if (!isdigit(n->nick[0]) && !ServerInstance->IsNick(n->nick))
                                ServerInstance->Users->QuitUser(n, message);
                }
@@ -276,6 +311,7 @@ class ModuleNationalChars : public Module
                ServerInstance->IsNick = rememberer;
                national_case_insensitive_map = lowermap_rememberer;
                CheckForceQuit("National characters module unloaded");
+               CheckRehash();
        }
 
        Version GetVersion() CXX11_OVERRIDE
@@ -292,13 +328,13 @@ class ModuleNationalChars : public Module
        }
 
        /*so Bynets Unreal distribution stuff*/
-       void loadtables(std::string filename, unsigned char ** tables, unsigned char cnt, char faillimit)
+       bool loadtables(std::string filename, unsigned char ** tables, unsigned char cnt, char faillimit)
        {
                std::ifstream ifs(ServerInstance->Config->Paths.PrependConfig(filename).c_str());
                if (ifs.fail())
                {
                        ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "loadtables() called for missing file: %s", filename.c_str());
-                       return;
+                       return false;
                }
 
                for (unsigned char n=0; n< cnt; n++)
@@ -313,11 +349,12 @@ class ModuleNationalChars : public Module
                        if (loadtable(ifs, tables[n], 255) && (n < faillimit))
                        {
                                ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "loadtables() called for illegal file: %s (line %d)", filename.c_str(), n+1);
-                               return;
+                               return false;
                        }
                }
 
                makereverse(m_additional, m_reverse_additional, sizeof(m_additional));
+               return true;
        }
 
        unsigned char symtoi(const char *t,unsigned char base)