X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=de92872700347dcadb60d03d3d7a6f3d9806a664;hb=a98d2f5086f3ac27f5d311cb0ac5307dce85ed4f;hp=c94f0884222aaf7b7b9e764ef4dcedc50e614023;hpb=b395c59997debe3827a39ec23cba54465d2aaf6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index c94f08842..de9287270 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -155,7 +155,7 @@ void InspIRCd::SetSignals()
 
 void InspIRCd::QuickExit(int status)
 {
-	exit(0);
+	exit(status);
 }
 
 bool InspIRCd::DaemonSeed()
@@ -234,7 +234,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	 OperQuit("operquit", NULL),
 	 GenRandom(&HandleGenRandom),
 	 IsChannel(&HandleIsChannel),
-	 Rehash(&HandleRehash),
 	 IsNick(&HandleIsNick),
 	 IsIdent(&HandleIsIdent),
 	 OnCheckExemption(&HandleOnCheckExemption)
@@ -336,7 +335,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 +380,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;
 		}