diff options
author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2006-08-10 18:28:37 +0000 |
---|---|---|
committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2006-08-10 18:28:37 +0000 |
commit | 6c9588419d3cfe01d04d3c870eaac712bb6745b8 (patch) | |
tree | 3fb86402535392367b1e2b42cb744de7255e610c /src/inspircd.cpp | |
parent | fd2eb26472bcc0b7b144f40523ff820cba82f574 (diff) |
Move FileExists, CleanFilename, DirValid, GetFullProgDir into class ServerConfig
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4848 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/inspircd.cpp')
-rw-r--r-- | src/inspircd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 14f88e0a3..6dad70a51 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -141,7 +141,7 @@ void Killed(int status) void Rehash(int status) { - ServerInstance->WriteOpers("Rehashing config file %s due to SIGHUP",CleanFilename(CONFIG_FILE)); + ServerInstance->WriteOpers("Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE)); fclose(ServerInstance->Config->log_file); OpenLog(NULL,0); ServerInstance->Config->Read(false,NULL); @@ -234,7 +234,7 @@ InspIRCd::InspIRCd(int argc, char** argv) this->startup_time = time(NULL); srand(time(NULL)); log(DEBUG,"*** InspIRCd starting up!"); - if (!FileExists(CONFIG_FILE)) + if (!ServerConfig::FileExists(CONFIG_FILE)) { printf("ERROR: Cannot open config file: %s\nExiting...\n",CONFIG_FILE); log(DEFAULT,"main: no config"); @@ -559,7 +559,7 @@ bool InspIRCd::LoadModule(const char* filename) std::string filename_str = filename; #ifndef STATIC_LINK #ifndef IS_CYGWIN - if (!DirValid(modfile)) + if (!ServerConfig::DirValid(modfile)) { log(DEFAULT,"Module %s is not within the modules directory.",modfile); snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile); @@ -569,7 +569,7 @@ bool InspIRCd::LoadModule(const char* filename) #endif log(DEBUG,"Loading module: %s",modfile); #ifndef STATIC_LINK - if (FileExists(modfile)) + if (ServerConfig::FileExists(modfile)) { #endif for (unsigned int j = 0; j < Config->module_names.size(); j++) |