X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=0edb09084a07bc19119cfa7ab5152a6acef4f827;hb=b3bcd98242b8764f52bcde3259d7bc0ef72f61e3;hp=b0c96645736c543047004e9ef9dbc80fd4c0c43b;hpb=8528562075a54dbb8fc40d100e55e6a8af8067c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index b0c966457..0edb09084 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -308,10 +308,29 @@ bool InspIRCd::OpenLog(char**, int)
 		if (Config->logpath.empty())
 		{
 			std::string path = std::string(home) + "/.inspircd";
-			if (!mkdir(path.c_str(), 0700) && errno != EEXIST)
+			// 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
 			{
@@ -321,7 +340,8 @@ bool InspIRCd::OpenLog(char**, int)
 			}
 		}
 
-		Config->log_file = fopen(Config->logpath.c_str(),"a+");
+		if (!Config->log_file)
+			Config->log_file = fopen(Config->logpath.c_str(),"a+");
 	}
 	else
 	{