X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_nationalchars.cpp;h=bc90c9fad5a620ce6050cbd83430f59a8b5a3c5c;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=20e4eaa9e6a39fce172c4b1ee1ddb6f1d495dbd0;hpb=1377fabfee72994531df274248ed0ce6de483dd2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 20e4eaa9e..bc90c9fad 100644
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -239,6 +239,19 @@ class ModuleNationalChars : public Module
 		memcpy(prev_map, national_case_insensitive_map, sizeof(prev_map));
 
 		ServerInstance->RehashUsersAndChans();
+
+		// The OnGarbageCollect() method in m_watch rebuilds the hashmap used by it
+		Module* mod = ServerInstance->Modules->Find("m_watch.so");
+		if (mod)
+			mod->OnGarbageCollect();
+
+		// Send a Request to m_spanningtree asking it to rebuild its hashmaps
+		mod = ServerInstance->Modules->Find("m_spanningtree.so");
+		if (mod)
+		{
+			Request req(this, mod, "rehash");
+			req.Send();
+		}
 	}
 
  public:
@@ -271,11 +284,19 @@ class ModuleNationalChars : public Module
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("nationalchars");
 		charset = tag->getString("file");
-		casemapping = tag->getString("casemapping", charset);
+		casemapping = tag->getString("casemapping", ServerConfig::CleanFilename(charset.c_str()));
+		if (casemapping.find(' ') != std::string::npos)
+			throw ModuleException("<nationalchars:casemapping> must not contain any spaces!");
+#if defined _WIN32
+		if (!ServerInstance->Config->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();
@@ -317,13 +338,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(filename.c_str());
 		if (ifs.fail())
 		{
 			ServerInstance->Logs->Log("m_nationalchars",DEFAULT,"loadtables() called for missing file: %s", filename.c_str());
-			return;
+			return false;
 		}
 
 		for (unsigned char n=0; n< cnt; n++)
@@ -338,11 +359,12 @@ class ModuleNationalChars : public Module
 			if (loadtable(ifs, tables[n], 255) && (n < faillimit))
 			{
 				ServerInstance->Logs->Log("m_nationalchars",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)