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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index b0c966457..d46f53ec7 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -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,9 +182,9 @@ bool InspIRCd::IsValidMask(const std::string &mask)
 }
 
 /* true for valid channel name, false else */
-bool IsChannelHandler::Call(const char *chname)
+bool IsChannelHandler::Call(const char *chname, size_t max)
 {
-	char *c;
+	const char *c = chname + 1;
 
 	/* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
 	if (!chname || *chname != '#')
@@ -192,7 +192,6 @@ bool IsChannelHandler::Call(const char *chname)
 		return false;
 	}
 
-	c = (char *)chname + 1;
 	while (*c)
 	{
 		switch (*c)
@@ -205,9 +204,10 @@ bool IsChannelHandler::Call(const char *chname)
 
 		c++;
 	}
-		
+
+	size_t len = c - chname;	
 	/* too long a name - note funky pointer arithmetic here. */
-	if ((c - chname) > CHANMAX)
+	if (len > max)
 	{
 			return false;
 	}
@@ -216,13 +216,13 @@ bool IsChannelHandler::Call(const char *chname)
 }
 
 /* true for valid nickname, false else */
-bool IsNickHandler::Call(const char* n)
+bool IsNickHandler::Call(const char* n, size_t max)
 {
 	if (!n || !*n)
 		return false;
  
-	int p = 0;
-	for (char* i = (char*)n; *i; i++, p++)
+	unsigned int p = 0;
+	for (const char* i = n; *i; i++, p++)
 	{
 		if ((*i >= 'A') && (*i <= '}'))
 		{
@@ -241,7 +241,7 @@ bool IsNickHandler::Call(const char* n)
 	}
 
 	/* too long? or not -- pointer arithmetic rocks */
-	return (p < NICKMAX - 1);
+	return (p < max);
 }
 
 /* return true for good ident, false else */
@@ -250,7 +250,7 @@ bool IsIdentHandler::Call(const char* n)
 	if (!n || !*n)
 		return false;
 
-	for (char* i = (char*)n; *i; i++)
+	for (const char* i = n; *i; i++)
 	{
 		if ((*i >= 'A') && (*i <= '}'))
 		{
@@ -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
 	{