Change m_override to send snomasks globally

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 6444ee211c17bf8361b409b9f1e4e6b4144c7363..51045ef5859a8dba15f215e3666849a43f7e9b64 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -739,10 +739,10 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail,
                }
                else
                {
-                       ServerInstance->SNO->WriteToSnoMask('A', "There were errors in the configuration file:");
+                       ServerInstance->SNO->WriteToSnoMask('a', "There were errors in the configuration file:");
                        while (start < errors.length())
                        {
-                               ServerInstance->SNO->WriteToSnoMask('A', errors.substr(start, 360));
+                               ServerInstance->SNO->WriteToSnoMask('a', errors.substr(start, 360));
                                start += 360;
                        }
                }
@@ -1230,7 +1230,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                                        if (bail)
                                                printf("Warning: Oper type '%s' has a missing class named '%s', this does nothing!\n", item, classname.c_str());
                                        else
-                                               ServerInstance->SNO->WriteToSnoMask('A', "Warning: Oper type '%s' has a missing class named '%s', this does nothing!", item, classname.c_str());
+                                               ServerInstance->SNO->WriteToSnoMask('a', "Warning: Oper type '%s' has a missing class named '%s', this does nothing!", item, classname.c_str());
                                }
                        }
                }
@@ -1276,7 +1276,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                        {
                                if (ServerInstance->Modules->Unload(removing->c_str()))
                                {
-                                       ServerInstance->SNO->WriteToSnoMask('A', "*** REHASH UNLOADED MODULE: %s",removing->c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('a', "*** REHASH UNLOADED MODULE: %s",removing->c_str());
 
                                        if (!useruid.empty())
                                        {
@@ -1285,7 +1285,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                                                        user->WriteNumeric(RPL_UNLOADEDMODULE, "%s %s :Module %s successfully unloaded.",user->nick.c_str(), removing->c_str(), removing->c_str());
                                        }
                                        else
-                                               ServerInstance->SNO->WriteToSnoMask('A', "Module %s successfully unloaded.", removing->c_str());
+                                               ServerInstance->SNO->WriteToSnoMask('a', "Module %s successfully unloaded.", removing->c_str());
 
                                        rem++;
                                }
@@ -1298,7 +1298,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                                                        user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s %s :Failed to unload module %s: %s",user->nick.c_str(), removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError().c_str());
                                        }
                                        else
-                                                ServerInstance->SNO->WriteToSnoMask('A', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str());
+                                                ServerInstance->SNO->WriteToSnoMask('a', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str());
                                }
                        }
                }
@@ -1309,7 +1309,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                        {
                                if (ServerInstance->Modules->Load(adding->c_str()))
                                {
-                                       ServerInstance->SNO->WriteToSnoMask('A', "*** REHASH LOADED MODULE: %s",adding->c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('a', "*** REHASH LOADED MODULE: %s",adding->c_str());
                                        if (!useruid.empty())
                                        {
                                                User* user = ServerInstance->FindNick(useruid);
@@ -1317,7 +1317,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                                                        user->WriteNumeric(RPL_LOADEDMODULE, "%s %s :Module %s successfully loaded.",user->nick.c_str(), adding->c_str(), adding->c_str());
                                        }
                                        else
-                                               ServerInstance->SNO->WriteToSnoMask('A', "Module %s successfully loaded.", adding->c_str());
+                                               ServerInstance->SNO->WriteToSnoMask('a', "Module %s successfully loaded.", adding->c_str());
 
                                        add++;
                                }
@@ -1330,7 +1330,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                                                        user->WriteNumeric(ERR_CANTLOADMODULE, "%s %s :Failed to load module %s: %s",user->nick.c_str(), adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError().c_str());
                                        }
                                        else
-                                               ServerInstance->SNO->WriteToSnoMask('A', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str());
+                                               ServerInstance->SNO->WriteToSnoMask('a', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str());
                                }
                        }
                }
@@ -1347,7 +1347,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                                user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str());
                }
                else
-                       ServerInstance->SNO->WriteToSnoMask('A', "*** Successfully rehashed server.");
+                       ServerInstance->SNO->WriteToSnoMask('a', "*** Successfully rehashed server.");
        }
 
 }
@@ -2046,64 +2046,6 @@ char* ServerConfig::CleanFilename(char* name)
 }
 
 
-bool ServerConfig::DirValid(const char* dirandfile)
-{
-#ifdef WINDOWS
-       return true;
-#else
-
-       char work[1024];
-       char buffer[1024];
-       char otherdir[1024];
-       int p;
-
-       strlcpy(work, dirandfile, 1024);
-       p = strlen(work);
-
-       // we just want the dir
-       while (*work)
-       {
-               if (work[p] == '/')
-               {
-                       work[p] = '\0';
-                       break;
-               }
-
-               work[p--] = '\0';
-       }
-
-       // Get the current working directory
-       if (getcwd(buffer, 1024 ) == NULL )
-               return false;
-
-       if (chdir(work) == -1)
-               return false;
-
-       if (getcwd(otherdir, 1024 ) == NULL )
-               return false;
-
-       if (chdir(buffer) == -1)
-               return false;
-
-       size_t t = strlen(work);
-
-       if (strlen(otherdir) >= t)
-       {
-               otherdir[t] = '\0';
-               if (!strcmp(otherdir,work))
-               {
-                       return true;
-               }
-
-               return false;
-       }
-       else
-       {
-               return false;
-       }
-#endif
-}
-
 std::string ServerConfig::GetFullProgDir()
 {
        char buffer[PATH_MAX];
@@ -2205,15 +2147,6 @@ bool ValueItem::GetBool()
  */
 bool InitTypes(ServerConfig* conf, const char*)
 {
-       if (conf->opertypes.size())
-       {
-               for (opertype_t::iterator n = conf->opertypes.begin(); n != conf->opertypes.end(); n++)
-               {
-                       if (n->second)
-                               delete[] n->second;
-               }
-       }
-
        conf->opertypes.clear();
        return true;
 }
@@ -2250,7 +2183,7 @@ bool DoType(ServerConfig* conf, const char*, char**, ValueList &values, int*)
        const char* TypeName = values[0].GetString();
        const char* Classes = values[1].GetString();
 
-       conf->opertypes[TypeName] = strnewdup(Classes);
+       conf->opertypes[TypeName] = std::string(Classes);
        return true;
 }
 
@@ -2372,4 +2305,5 @@ bool DoneELine(ServerConfig* conf, const char* tag)
 void ConfigReaderThread::Run()
 {
        ServerInstance->Config->Read(do_bail, TheUserUID);
+       done = true;
 }