X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=431ed13d92c3bd11d07d70f5a9982e34577a8109;hb=cb1464555eb711c0fd74e31aadaa9558d9b61b5d;hp=ec18728b509962b6b5f0166047efb8779d4a7d5e;hpb=49b693beb75b8292c5b378f46d2b357ebb2fdc8c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index ec18728b5..431ed13d9 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* w00t was here. ;p */
-
 /* $Install: src/inspircd $(BINPATH) */
 #include "inspircd.h"
 #include <signal.h>
@@ -29,13 +27,6 @@
 		#define RUSAGE_SELF 0
 	#endif
 
-	/* CRT memory debugging */
-	#ifdef DEBUG
-	#define _CRTDBG_MAP_ALLOC
-	#include <stdlib.h>
-	#include <crtdbg.h>
-	#endif
-
 	#include <pwd.h> // setuid
 	#include <grp.h> // setgid
 #endif
@@ -90,7 +81,7 @@ const char* ExitCodes[] =
 		"CreateEvent failed" /* 19 */
 };
 
-template<typename T> void DeleteZero(T* n)
+template<typename T> static void DeleteZero(T* n)
 {
 	if (n != NULL)
 	{
@@ -239,6 +230,8 @@ void InspIRCd::SetSignals()
 	signal(SIGHUP, InspIRCd::SetSignal);
 	signal(SIGPIPE, SIG_IGN);
 	signal(SIGCHLD, SIG_IGN);
+	/* We want E2BIG not a signal! */
+	signal(SIGXFSZ, SIG_IGN);
 #endif
 	signal(SIGTERM, InspIRCd::SetSignal);
 }
@@ -521,16 +514,29 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
 	if (!ServerConfig::FileExists(this->ConfigFileName))
 	{
-		printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName);
-		this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", this->ConfigFileName);
-		Exit(EXIT_STATUS_CONFIG);
+#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()))
+		{
+			strlcat(this->ConfigFileName, ".txt", MAXBUF);
+		}
+		else
+#endif
+		{
+			printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName);
+			this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", this->ConfigFileName);
+			Exit(EXIT_STATUS_CONFIG);
+		}
 	}
 
 	printf_c("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__);
 	printf_c("(C) InspIRCd Development Team.\033[0m\n\n");
 	printf_c("Developers:\n");
 	printf_c("\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special\n");
-	printf_c("\t\033[1;32mpippijn, peavey, aquanight, fez, psychon, dz\033[0m\n\n");
+	printf_c("\t\033[1;32mpeavey, aquanight, psychon, dz, danieldg\033[0m\n\n");
 	printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n");
 
 	Config->ClearStack();