X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=8ebdc3b58958bcf8c2a2fd5dc69c6f4bcea829d0;hb=5585654df265bc37d547fa7738e35cc7ae7dacbb;hp=a671c3d7b2872602a5b50b2e7f28ca843769765c;hpb=57330e973b3eb1f2a84803c84daf9d6b420859fd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index a671c3d7b..8ebdc3b58 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -186,6 +186,12 @@ bool InspIRCd::DaemonSeed()
 void InspIRCd::WritePID(const std::string& filename, bool exitonfail)
 {
 #ifndef _WIN32
+	if (!ServerInstance->Config->cmdline.writepid)
+	{
+		this->Logs->Log("STARTUP", LOG_DEFAULT, "--nopid specified on command line; PID file not written.");
+		return;
+	}
+
 	std::string fname(filename);
 	if (fname.empty())
 		fname = ServerInstance->Config->Paths.PrependData("inspircd.pid");
@@ -225,7 +231,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	FailedPortList pl;
 	// Flag variables passed to getopt_long() later
 	int do_version = 0, do_nofork = 0, do_debug = 0,
-	    do_nolog = 0, do_root = 0;
+	    do_nolog = 0, do_nopid = 0, do_root = 0;
 
 	// Initialize so that if we exit before proper initialization they're not deleted
 	this->Config = 0;
@@ -271,6 +277,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 		{ "config",	required_argument,	NULL,		'c'	},
 		{ "debug",	no_argument,		&do_debug,	1	},
 		{ "nolog",	no_argument,		&do_nolog,	1	},
+		{ "nopid",	no_argument,		&do_nopid,	1	},
 		{ "runasroot",	no_argument,		&do_root,	1	},
 		{ "version",	no_argument,		&do_version,	1	},
 #ifdef INSPIRCD_ENABLE_TESTSUITE
@@ -287,7 +294,16 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 		{
 			case 'c':
 				/* Config filename was set */
-				ConfigFileName = ServerInstance->Config->Paths.PrependConfig(optarg);
+				ConfigFileName = optarg;
+#ifdef _WIN32
+				TCHAR configPath[MAX_PATH + 1];
+				if (GetFullPathName(optarg, MAX_PATH, configPath, NULL) > 0)
+					ConfigFileName = configPath;
+#else
+				char configPath[PATH_MAX + 1];
+				if (realpath(optarg, configPath))
+					ConfigFileName = configPath;
+#endif
 			break;
 			case 0:
 				/* getopt_long_only() set an int variable, just keep going */
@@ -297,7 +313,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 			default:
 				/* Fall through to handle other weird values too */
 				std::cout << "Unknown parameter '" << argv[optind-1] << "'" << std::endl;
-				std::cout << "Usage: " << argv[0] << " [--nofork] [--nolog] [--debug] [--config <config>]" << std::endl <<
+				std::cout << "Usage: " << argv[0] << " [--nofork] [--nolog] [--nopid] [--debug] [--config <config>]" << std::endl <<
 					std::string(static_cast<size_t>(8+strlen(argv[0])), ' ') << "[--runasroot] [--version]" << std::endl;
 				Exit(EXIT_STATUS_ARGV);
 			break;
@@ -325,6 +341,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	Config->cmdline.nofork = (do_nofork != 0);
 	Config->cmdline.forcedebug = (do_debug != 0);
 	Config->cmdline.writelog = !do_nolog;
+	Config->cmdline.writepid = !do_nopid;
 
 	if (do_debug)
 	{