Add $ModDep: special comment, similar to $CompileFlags and $LinkerFlags.

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 30e966b94520221ef6182a82840b7bea470ca225..1059770b456aa6bc7410e49a22126c4abfd273d2 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -28,7 +28,7 @@ ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
        *TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0';
        *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
        *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
-       *OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
+       *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
        log_file = NULL;
        NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = false;
        CycleHosts = writelog = AllowHalfop = true;
@@ -545,7 +545,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                {"dns",                 "timeout",                      &this->dns_timeout,             DT_INTEGER, ValidateDnsTimeout},
                {"options",             "moduledir",                    &this->ModPath,                 DT_CHARPTR, ValidateModPath},
                {"disabled",            "commands",                     &this->DisabledCommands,        DT_CHARPTR, NoValidation},
-               {"options",             "operonlystats",                &this->OperOnlyStats,           DT_CHARPTR, NoValidation},
+               {"options",             "userstats",            &this->UserStats,               DT_CHARPTR, NoValidation},
                {"options",             "customversion",                &this->CustomVersion,           DT_CHARPTR, NoValidation},
                {"options",             "hidesplits",                   &this->HideSplits,              DT_BOOLEAN, NoValidation},
                {"options",             "hidebans",                     &this->HideBans,                DT_BOOLEAN, NoValidation},
@@ -1271,23 +1271,18 @@ bool ServerConfig::ReadFile(file_cache &F, const char* fname)
        char linebuf[MAXBUF];
 
        F.clear();
-       file =  fopen(fname,"r");
+       file =  fopen(fname, "r");
 
        if (file)
        {
                while (!feof(file))
                {
-                       fgets(linebuf,sizeof(linebuf),file);
-                       linebuf[strlen(linebuf)-1]='\0';
-
-                       if (!*linebuf)
-                       {
-                               strcpy(linebuf," ");
-                       }
+                       fgets(linebuf, sizeof(linebuf), file);
+                       linebuf[strlen(linebuf)-1] = 0;
 
                        if (!feof(file))
                        {
-                               F.push_back(linebuf);
+                               F.push_back(*linebuf ? linebuf : " ");
                        }
                }