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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 67faee8f5..9f3bca729 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -6,15 +6,14 @@
  * 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.
  *
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDhelper */
+/* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "exitcodes.h"
 
@@ -128,7 +127,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 +181,9 @@ 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, 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 +191,6 @@ bool InspIRCd::IsChannel(const char *chname)
 		return false;
 	}
 
-	c = (char *)chname + 1;
 	while (*c)
 	{
 		switch (*c)
@@ -205,9 +203,10 @@ bool InspIRCd::IsChannel(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 +215,13 @@ bool InspIRCd::IsChannel(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 +240,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 +249,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 <= '}'))
 		{
@@ -268,7 +267,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 +280,37 @@ 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";
+			Config->logpath = "./startup.log";
 		}
 
-		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 +323,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);
 
@@ -424,3 +438,17 @@ std::string InspIRCd::TimeString(time_t curtime)
 	return std::string(ctime(&curtime),24);
 }
 
+// You should only pass a single character to this.
+void InspIRCd::AddExtBanChar(char c)
+{
+	std::string &tok = Config->data005;
+	std::string::size_type ebpos;
+	
+	if ((ebpos = tok.find(" EXTBAN=,")) == std::string::npos)
+	{
+		tok.append(" EXTBAN=,");
+		tok.push_back(c);
+	}
+	else
+		tok.insert(ebpos + 9, 1, c);
+}