X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=8b93be24500e9cb681aaf8d8a7155f2459f088ee;hb=b3ea96554e5334c27030c14b72ea1c69c253bde0;hp=67faee8f54371fd77dc814cf56c5c8e79ac413ab;hpb=eb2e28b0cfcf25b792c23951024594e1bbb69ef6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 67faee8f5..8b93be245 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.
  *
  * ---------------------------------------------------
  */
@@ -128,7 +128,7 @@ void InspIRCd::SendError(const std::string &s)
 	{
 		if ((*i)->registered == REG_ALL)
 		{
-		   	(*i)->WriteServ("NOTICE %s :%s",(*i)->nick,s.c_str());
+		   	(*i)->WriteServ("NOTICE %s :%s",(*i)->nick.c_str(),s.c_str());
 	   	}
 		else
 		{
@@ -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
@@ -281,22 +281,67 @@ bool InspIRCd::IsSID(const std::string &str)
 /* open the proper logfile */
 bool InspIRCd::OpenLog(char**, int)
 {
-	/* This function only happens at startup now (log reopening is done at OnReadConfig stage now instead of rehash) */
+	/* This function only happens at startup now */
 	if (Config->nofork)
 	{
 		this->Logs->SetupNoFork();
 	}
-	if (!Config->writelog) return true; // Skip opening default log if -nolog
 	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())
 		{
-			Config->logpath = Config->MyDir + "/ircd.log";
+			std::string path = std::string(home) + "/.inspircd";
+			// This tries to create the ~/.inspircd. If it succeeds, then we go ahead and use it.
+			// If it fails due to an existing target, then we use it anyway.
+			// Either way, we make sure we can get write access to the log at this point.
+			if (!mkdir(path.c_str(), 0700) || errno == EEXIST)
+			{
+				/* Log to ~/.inspircd/ircd.log */
+				Config->logpath = path + "/startup.log";
+				FILE* fd = fopen(Config->logpath.c_str(), "a+");
+				if (!fd)
+				{
+					// Could not get write access... Why?
+					if (errno == ENOTDIR)
+						// ~/.inspircd is not actually a directory!
+						printf("\nWARNING: Unable to create directory: %s (Exists and is not a directory)\n", path.c_str());
+					else
+						// Not writable for some other reason (no +w access, readonly fs, file too big, whatever).
+						printf("\nWARNING: No write access to %s (%s)\n", Config->logpath.c_str(), strerror(errno));
+					Config->logpath = "./startup.log";
+				}
+				else
+				{
+					Config->log_file = fd;
+				}
+			}
+			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+");
+		if (!Config->log_file)
+			Config->log_file = fopen(Config->logpath.c_str(),"a+");
 	}
 	else
 	{
@@ -309,7 +354,7 @@ bool InspIRCd::OpenLog(char**, int)
 	}
 
 	FileWriter* fw = new FileWriter(this, Config->log_file);
-	FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : Config->LogLevel), fw);
+	FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : DEFAULT), fw);
 
 	this->Logs->AddLogType("*", f, true);