ModResult conversion: Change return type of all module functions

[user/henk/code/inspircd.git] / src / helperfuncs.cpp

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 3ff94e4f6e27b2e923bc9936807997fbb989535a..0ec8db966601540fe60e04324e8a958c8b65eef1 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -11,10 +11,9 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDhelper */
+/* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "exitcodes.h"
 
@@ -56,7 +55,7 @@ User* InspIRCd::FindNick(const char* nick)
                return FindUUID(nick);
 
        user_hash::iterator iter = this->Users->clientlist->find(nick);
-       
+
        if (iter == this->Users->clientlist->end())
                return NULL;
 
@@ -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
                {
@@ -151,11 +150,11 @@ long InspIRCd::ChannelCount()
 
 bool InspIRCd::IsValidMask(const std::string &mask)
 {
-       char* dest = (char*)mask.c_str();
+       const char* dest = mask.c_str();
        int exclamation = 0;
        int atsign = 0;
 
-       for (char* i = dest; *i; i++)
+       for (const char* i = dest; *i; i++)
        {
                /* out of range character, bad mask */
                if (*i < 32 || *i > 126)
@@ -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
@@ -307,21 +306,11 @@ bool InspIRCd::OpenLog(char**, int)
        {
                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->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
        {
@@ -351,22 +340,12 @@ void InspIRCd::CheckRoot()
        }
 }
 
-void InspIRCd::CheckDie()
-{
-       if (*Config->DieValue)
-       {
-               printf("WARNING: %s\n\n",Config->DieValue);
-               this->Logs->Log("CONFIG",DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
-               Exit(EXIT_STATUS_DIETAG);
-       }
-}
-
 void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::string &text)
 {
        std::string copy_text = text;
 
-       int MOD_RESULT = 0;
-       FOREACH_RESULT_I(this, I_OnWhoisLine, OnWhoisLine(user, dest, numeric, copy_text));
+       ModResult MOD_RESULT;
+       FIRST_MOD_RESULT(this, OnWhoisLine, MOD_RESULT, (user, dest, numeric, copy_text));
 
        if (!MOD_RESULT)
                user->WriteServ("%d %s", numeric, copy_text.c_str());
@@ -383,7 +362,7 @@ void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* fo
        this->SendWhoisLine(user, dest, numeric, std::string(textbuffer));
 }
 
-/** Refactored by Brain, Jun 2008. Much faster with some clever O(1) array
+/** Refactored by Brain, Jun 2009. Much faster with some clever O(1) array
  * lookups and pointer maths.
  */
 long InspIRCd::Duration(const std::string &str)
@@ -449,3 +428,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);
+}