X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=75e9f3699d0966a84aff310ffdafeeae0229c7b9;hb=fead8af2b767cb5591536a3c98babf6b35194a66;hp=59c65b931d34d6617b66e997695eef139c9def08;hpb=9962840222b6886f7653fc64443f19ebd661cc63;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 59c65b931..75e9f3699 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -120,7 +120,10 @@ void InspIRCd::Cleanup()
 	/* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */
 	/* Must be deleted before modes as it decrements modelines */
 	if (FakeClient)
+	{
+		delete FakeClient->server;
 		FakeClient->cull();
+	}
 	DeleteZero(this->FakeClient);
 	DeleteZero(this->Users);
 	DeleteZero(this->Modes);
@@ -155,7 +158,7 @@ void InspIRCd::SetSignals()
 
 void InspIRCd::QuickExit(int status)
 {
-	exit(0);
+	exit(status);
 }
 
 bool InspIRCd::DaemonSeed()
@@ -207,7 +210,7 @@ void InspIRCd::WritePID(const std::string &filename)
 #ifndef _WIN32
 	std::string fname(filename);
 	if (fname.empty())
-		fname = DATA_PATH "/inspircd.pid";
+		fname = ServerInstance->Config->Paths.PrependData("inspircd.pid");
 	std::ofstream outfile(fname.c_str());
 	if (outfile.is_open())
 	{
@@ -231,10 +234,9 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	  * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods
 	  * themselves within the class.
 	  */
-	 OperQuit("OperQuit", NULL),
+	 OperQuit("operquit", NULL),
 	 GenRandom(&HandleGenRandom),
 	 IsChannel(&HandleIsChannel),
-	 Rehash(&HandleRehash),
 	 IsNick(&HandleIsNick),
 	 IsIdent(&HandleIsIdent),
 	 OnCheckExemption(&HandleOnCheckExemption)
@@ -336,7 +338,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 		{
 			case 'c':
 				/* Config filename was set */
-				ConfigFileName = optarg;
+				ConfigFileName = ServerInstance->Config->Paths.PrependConfig(optarg);
 			break;
 			case 0:
 				/* getopt_long_only() set an int variable, just keep going */
@@ -381,14 +383,14 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 		Logs->AddLogTypes("*", fls, true);
 	}
 
-	if (!ServerConfig::FileExists(ConfigFileName.c_str()))
+	if (!FileSystem::FileExists(ConfigFileName))
 	{
 #ifdef _WIN32
 		/* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */
 		std::string txtconf = this->ConfigFileName;
 		txtconf.append(".txt");
 
-		if (ServerConfig::FileExists(txtconf.c_str()))
+		if (FileSystem::FileExists(txtconf))
 		{
 			ConfigFileName = txtconf;
 		}
@@ -458,7 +460,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	this->UIDGen.init(Config->sid);
 
 	// Create the server user for this server
-	this->FakeClient = new FakeUser(Config->sid, Config->ServerName);
+	this->FakeClient = new FakeUser(Config->sid, Config->ServerName, Config->ServerDesc);
 
 	// This is needed as all new XLines are marked pending until ApplyLines() is called
 	this->XLines->ApplyLines();