X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=ce962fea6af32bce997f21fdaa4c12982b9577f3;hb=4d5b806140bbc41345f841d93e1e4d69fa58a5c3;hp=d2fbca6f6421fb2809a45f686ad51260804f7d68;hpb=1eae3c2ad42df386967afa42ed13cc95e7a0dd91;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index d2fbca6f6..ce962fea6 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -6,7 +6,7 @@
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -182,7 +182,7 @@ bool InspIRCd::IsValidMask(const std::string &mask)
 }
 
 /* true for valid channel name, false else */
-bool InspIRCd::IsChannel(const char *chname)
+bool IsChannelHandler::Call(const char *chname)
 {
 	char *c;
 
@@ -268,7 +268,7 @@ bool IsIdentHandler::Call(const char* n)
 	return true;
 }
 
-bool InspIRCd::IsSID(const std::string &str)
+bool IsSIDHandler::Call(const std::string &str)
 {
 	/* Returns true if the string given is exactly 3 characters long,
 	 * starts with a digit, and the other two characters are A-Z or digits
@@ -287,6 +287,57 @@ bool InspIRCd::OpenLog(char**, int)
 		this->Logs->SetupNoFork();
 	}
 	Config->MyDir = Config->GetFullProgDir();
+
+	/* Attempt to find home directory, portable to windows */
+	const char* home = getenv("HOME");
+	if (!home)
+	{
+		/* No $HOME, log to %USERPROFILE% */
+		home = getenv("USERPROFILE");
+		if (!home)
+		{
+			/* Nothing could be found at all, log to current dir */
+			Config->logpath = "./startup.log";
+		}
+	}
+
+	if (!Config->writelog) return true; // Skip opening default log if -nolog
+
+	if (!*this->LogFileName)
+	{
+		if (Config->logpath.empty())
+		{
+			std::string path = std::string(home) + "/.inspircd";
+			if (!mkdir(path.c_str(), 0700))
+			{
+				/* Log to ~/.inspircd/ircd.log */
+				Config->logpath = path + "/startup.log";
+			}
+			else
+			{
+				/* Couldn't make ~/.inspircd directory, log to current dir */
+				Config->logpath = "./startup.log";
+				printf("\nWARNING: Unable to create directory: %s (%s)\n", path.c_str(), strerror(errno));
+			}
+		}
+
+		Config->log_file = fopen(Config->logpath.c_str(),"a+");
+	}
+	else
+	{
+		Config->log_file = fopen(this->LogFileName,"a+");
+	}
+
+	if (!Config->log_file)
+	{
+		return false;
+	}
+
+	FileWriter* fw = new FileWriter(this, Config->log_file);
+	FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : DEFAULT), fw);
+
+	this->Logs->AddLogType("*", f, true);
+
 	return true;
 }