X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=632319ea366a56cbbd3ca371cac870d04f588927;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=d040940c49730084f9964e959dae4e756e4c1c12;hpb=185829f827156bf1068128416ef29993f46fdd3e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index d040940c4..632319ea3 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -14,18 +14,19 @@
 #include "inspircd.h"
 #include "configreader.h"
 #include <signal.h>
-#ifndef WIN32
 
+#ifndef WIN32
 #include <dirent.h>
 #include <unistd.h>
 #include <sys/resource.h>
-
+#include <dlfcn.h>
+#include <getopt.h>
 /* This is just to be completely certain that the change which fixed getrusage on RH7 doesn't break anything else -- Om */  
 #ifndef RUSAGE_SELF
 #define RUSAGE_SELF 0
 #endif
-
 #endif
+
 #include <exception>
 #include <fstream>
 #include "modules.h"
@@ -38,10 +39,9 @@
 #include "command_parse.h"
 #include "exitcodes.h"
 
-#ifndef WIN32
-#include <dlfcn.h>
-#include <getopt.h>
-#else
+#ifdef WIN32
+
+/* This MUST remain static and delcared outside the class, so that WriteProcessMemory can reference it properly */
 static DWORD owner_processid = 0;
 
 DWORD WindowsForkStart(InspIRCd * Instance)
@@ -78,15 +78,20 @@ DWORD WindowsForkStart(InspIRCd * Instance)
 
 	// Launch our "forked" process.
 	BOOL bSuccess = CreateProcess ( module,	// Module (exe) filename
-		GetCommandLine(),					// Command line (exe plus parameters from the OS)
-		0,									// PROCESS_SECURITY_ATTRIBUTES
-		0,									// THREAD_SECURITY_ATTRIBUTES
-		TRUE,								// We went to inherit handles.
-		startupflags,						// Allow us full access to the process and suspend it.
-		0,									// ENVIRONMENT
-		0,									// CURRENT_DIRECTORY
-		&startupinfo,						// startup info
-		&procinfo);							// process info
+		strdup(GetCommandLine()),	// Command line (exe plus parameters from the OS)
+						// NOTE: We cannot return the direct value of the
+						// GetCommandLine function here, as the pointer is
+						// passed straight to the child process, and will be
+						// invalid once we exit as it goes out of context.
+						// strdup() seems ok, though.
+		0,				// PROCESS_SECURITY_ATTRIBUTES
+		0,				// THREAD_SECURITY_ATTRIBUTES
+		TRUE,				// We went to inherit handles.
+		startupflags,			// Allow us full access to the process and suspend it.
+		0,				// ENVIRONMENT
+		0,				// CURRENT_DIRECTORY
+		&startupinfo,			// startup info
+		&procinfo);			// process info
 
 	if(!bSuccess)
 	{
@@ -482,12 +487,12 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
 	struct option longopts[] =
 	{
-		{ "nofork",		no_argument,		&do_nofork,		1	},
-		{ "logfile",	required_argument,	NULL,			'f'	},
-		{ "config",		required_argument,	NULL,			'c'	},
-		{ "debug",		no_argument,		&do_debug,		1	},
-		{ "nolog",		no_argument,		&do_nolog,		1	},
-		{ "runasroot",	no_argument,		&do_root,		1	},
+		{ "nofork",	no_argument,		&do_nofork,	1	},
+		{ "logfile",	required_argument,	NULL,		'f'	},
+		{ "config",	required_argument,	NULL,		'c'	},
+		{ "debug",	no_argument,		&do_debug,	1	},
+		{ "nolog",	no_argument,		&do_nolog,	1	},
+		{ "runasroot",	no_argument,		&do_root,	1	},
 		{ "version",	no_argument,		&do_version,	1	},
 		{ 0, 0, 0, 0 }
 	};
@@ -499,12 +504,10 @@ InspIRCd::InspIRCd(int argc, char** argv)
 			case 'f':
 				/* Log filename was set */
 				strlcpy(LogFileName, optarg, MAXBUF);
-				printf("LOG: Setting logfile to %s\n", LogFileName);
 			break;
 			case 'c':
 				/* Config filename was set */
 				strlcpy(ConfigFileName, optarg, MAXBUF);
-				printf("CONFIG: Setting config file to %s\n", ConfigFileName);
 			break;
 			case 0:
 				/* getopt_long_only() set an int variable, just keep going */