Now wont even try to read an empty file

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index e3455818a27e57cac99628e78ceddd5604335867..f767eae72efe886d62f8f27d2c8f808de8f0845d 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -17,6 +17,7 @@
 #include "inspircd.h"
 #include "xline.h"
 #include "exitcodes.h"
+#include "commands/cmd_whowas.h"
 
 std::vector<std::string> old_module_names, new_module_names, added_modules, removed_modules;
 
@@ -77,7 +78,6 @@ bool ServerConfig::AddIOHook(Module* iomod, InspSocket* is)
 {
        if (!GetIOHook(is))
        {
-               ServerInstance->Log(DEBUG,"Hooked inspsocket %08x", is);
                SocketIOHookModule[is] = iomod;
                is->IsIOHooked = true;
                return true;
@@ -198,7 +198,6 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
 
 bool NoValidation(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
-       conf->GetInstance()->Log(DEBUG,"No validation for <%s:%s>",tag,value);
        return true;
 }
 
@@ -244,7 +243,6 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance)
                nspace::hash_map<std::string,command_t*>::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
                if (cm != ServerInstance->Parser->cmdlist.end())
                {
-                       ServerInstance->Log(DEBUG,"Disabling command '%s'",cm->second->command.c_str());
                        cm->second->Disable(true);
                }
        }
@@ -368,8 +366,14 @@ bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, Valu
                conf->WhoWasMaxKeep = 3600;
                conf->GetInstance()->Log(DEFAULT,"WARNING: <whowas:maxkeep> value less than 3600, setting to default 3600");
        }
-       conf->GetInstance()->Log(DEBUG,"whowas:groupsize:%d maxgroups:%d maxkeep:%d",conf->WhoWasGroupSize,conf->WhoWasMaxGroups,conf->WhoWasMaxKeep);
-       irc::whowas::PruneWhoWas(conf->GetInstance(), conf->GetInstance()->Time());
+
+       command_t* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS");
+       if (whowas_command)
+       {
+               std::deque<classbase*> params;
+               whowas_command->HandleInternal(WHOWAS_PRUNE, params);
+       }
+
        return true;
 }
 
@@ -417,7 +421,6 @@ bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &v
  */
 bool DoneConnect(ServerConfig* conf, const char* tag)
 {
-       conf->GetInstance()->Log(DEBUG,"DoneConnect called for tag: %s",tag);
        return true;
 }
 
@@ -434,7 +437,6 @@ bool InitULine(ServerConfig* conf, const char* tag)
 bool DoULine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
 {
        const char* server = values[0].GetString();
-       conf->GetInstance()->Log(DEBUG,"Read ULINE '%s'",server);
        conf->ulines.push_back(server);
        return true;
 }
@@ -586,7 +588,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                {"server",      "name",         "",                     new ValueContainerChar (this->ServerName),              DT_CHARPTR, ValidateServerName},
                {"server",      "description",  "Configure Me",         new ValueContainerChar (this->ServerDesc),              DT_CHARPTR, NoValidation},
                {"server",      "network",      "Network",              new ValueContainerChar (this->Network),                 DT_CHARPTR, NoValidation},
-               {"admin",       "name",         "Miss Configured",      new ValueContainerChar (this->AdminName),               DT_CHARPTR, NoValidation},
+               {"admin",       "name",         "",                     new ValueContainerChar (this->AdminName),               DT_CHARPTR, NoValidation},
                {"admin",       "email",        "Mis@configu.red",      new ValueContainerChar (this->AdminEmail),              DT_CHARPTR, NoValidation},
                {"admin",       "nick",         "Misconfigured",        new ValueContainerChar (this->AdminNick),               DT_CHARPTR, NoValidation},
                {"files",       "motd",         "",                     new ValueContainerChar (this->motd),                    DT_CHARPTR, ValidateMotd},
@@ -961,10 +963,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                {
                        case '\n':
                                if (in_quote)
-                               {
-                                       ServerInstance->Log(DEBUG, "Got \\n inside value");
                                        line += '\n';
-                               }
                                linenumber++;
                        case '\r':
                                if (!in_quote)
@@ -989,11 +988,9 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                if ((ch == '\\') && (in_quote) && (in_tag))
                {
                        line += ch;
-                       ServerInstance->Log(DEBUG,"Escape sequence in config line.");
                        char real_character;
                        if (conf.get(real_character))
                        {
-                               ServerInstance->Log(DEBUG,"Escaping %c", real_character);
                                if (real_character == 'n')
                                        real_character = '\n';
                                line += real_character;
@@ -1304,7 +1301,6 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con
                if (!default_value.empty())
                {
                        result = default_value;
-                       ServerInstance->Log(DEBUG, "No config option for '%s' in tag <%s> using default: %s", var.c_str(), tag.c_str(), default_value.c_str());
                        return true;
                }
        }
@@ -1313,14 +1309,8 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con
                if (!default_value.empty())
                {
                        result = default_value;
-                       ServerInstance->Log(DEBUG, "No <%s:%s> tags in config file using default: %s", tag.c_str(), var.c_str(), default_value.c_str());
                        return true;
                }
-               ServerInstance->Log(DEBUG, "No <%s> tags in config file.", tag.c_str());
-       }
-       else
-       {
-               ServerInstance->Log(DEBUG, "ConfValue got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
        }
        return false;
 }
@@ -1440,14 +1430,6 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in
                
                return iter->second.size();
        }
-       else if(pos == 0)
-       {
-               ServerInstance->Log(DEBUG, "No <%s> tags in config file.", tag.c_str());
-       }
-       else
-       {
-               ServerInstance->Log(DEBUG, "ConfVarEnum got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
-       }
        
        return 0;
 }
@@ -1456,6 +1438,9 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in
  */
 bool ServerConfig::ReadFile(file_cache &F, const char* fname)
 {
+       if (!fname || !*fname)
+               return false;
+
        FILE* file = NULL;
        char linebuf[MAXBUF];