* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
/* open the proper logfile */
bool InspIRCd::OpenLog(char**, int)
{
- /* This function only happens at startup now */
- if (Config->nofork)
- {
- this->Logs->SetupNoFork();
- }
+ if (!Config->cmdline.writelog) return true; // Skip opening default log if -nolog
- if (!Config->writelog) return true; // Skip opening default log if -nolog
+ if (Config->cmdline.startup_log.empty())
+ Config->cmdline.startup_log = "logs/startup.log";
+ FILE* startup = fopen(Config->cmdline.startup_log.c_str(), "a+");
- if (!*this->LogFileName)
- {
- if (Config->logpath.empty())
- {
- Config->logpath = "logs/startup.log";
- }
-
- if (!Config->log_file)
- Config->log_file = fopen(Config->logpath.c_str(),"a+");
- }
- else
- {
- Config->log_file = fopen(this->LogFileName,"a+");
- }
-
- if (!Config->log_file)
+ if (!startup)
{
return false;
}
- FileWriter* fw = new FileWriter(Config->log_file);
- FileLogStream *f = new FileLogStream((Config->forcedebug ? DEBUG : DEFAULT), fw);
+ FileWriter* fw = new FileWriter(startup);
+ FileLogStream *f = new FileLogStream((Config->cmdline.forcedebug ? DEBUG : DEFAULT), fw);
this->Logs->AddLogType("*", f, true);
void InspIRCd::AddExtBanChar(char c)
{
std::string &tok = Config->data005;
- std::string::size_type ebpos;
+ std::string::size_type ebpos = tok.find(" EXTBAN=,");
- if ((ebpos = tok.find(" EXTBAN=,")) == std::string::npos)
+ if (ebpos == std::string::npos)
{
tok.append(" EXTBAN=,");
tok.push_back(c);
}
else
- tok.insert(ebpos + 9, 1, c);
+ {
+ ebpos += 9;
+ while (isalpha(tok[ebpos]) && tok[ebpos] < c)
+ ebpos++;
+ tok.insert(ebpos, 1, c);
+ }
}