Apply patch from BuildSmart that fixes a few issues on Mac with the logfile path...

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index fd69a9a49bcbd8e4afb57a661c35e1bcaef24e55..da3fa5e1bc38f184e465e80cc893b907fa73000b 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include <stdarg.h>
 #include "configreader.h"
 #include "users.h"
@@ -18,7 +19,6 @@
 #include "wildcard.h"
 #include "mode.h"
 #include "xline.h"
-#include "inspircd.h"
 #include "exitcodes.h"
 
 static char TIMESTR[26];
@@ -81,7 +81,7 @@ std::string InspIRCd::GetServerDescription(const char* servername)
 
        FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description));
 
-       if (description != "")
+       if (!description.empty())
        {
                return description;
        }
@@ -325,7 +325,7 @@ int InspIRCd::InvisibleUserCount()
 
 int InspIRCd::OperCount()
 {
-       return this->all_opers.count();
+       return this->all_opers.size();
 }
 
 int InspIRCd::UnregisteredUserCount()
@@ -405,15 +405,43 @@ bool InspIRCd::IsNick(const char* n)
        return (p < NICKMAX - 1);
 }
 
+
+bool InspIRCd::IsIdent(const char* n)
+{
+       if (!n || !*n)
+               return false;
+
+       for (char* i = (char*)n; *i; i++)
+       {
+               if ((*i >= 'A') && (*i <= '}'))
+               {
+                       continue;
+               }
+
+               if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.'))
+               {
+                       continue;
+               }
+
+               return false;
+       }
+
+       return true;
+}
+
 void InspIRCd::OpenLog(char** argv, int argc)
 {
-       Config->MyDir = ServerConfig::GetFullProgDir(argv,argc);
+       Config->MyDir = Config->GetFullProgDir();
 
        if (!*this->LogFileName)
        {
-               if (Config->logpath == "")
+               if (Config->logpath.empty())
                {
+#ifndef DARWIN
                        Config->logpath = Config->MyDir + "/ircd.log";
+#else
+                       Config->logpath = "/var/log/ircd.log";
+#endif
                }
 
                Config->log_file = fopen(Config->logpath.c_str(),"a+");
@@ -434,10 +462,17 @@ void InspIRCd::OpenLog(char** argv, int argc)
 
 void InspIRCd::CheckRoot()
 {
+#ifndef DARWIN
        if (geteuid() == 0)
        {
                printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
                this->Log(DEFAULT,"Cant start as root");
+#else
+       if (geteuid() != 16)
+       {
+               printf("WARNING!!! You are not running inspircd as the ircdaemon user!!! YOU CAN NOT DO THIS!!!\n\n");
+               this->Log(DEFAULT,"Must start as user ircdaemon");
+#endif
                Exit(EXIT_STATUS_ROOT);
        }
 }
@@ -461,17 +496,17 @@ void InspIRCd::LoadAllModules()
 
        for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++)
        {
-               Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF);
-               printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
+               Config->ConfValue(Config->config_data, "module", "name", count, configToken, MAXBUF);
+               printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
                
                if (!this->LoadModule(configToken))             
                {
-                       this->Log(DEFAULT,"There was an error loading a module: %s", this->ModuleError());
-                       printf("\nThere was an error loading a module: %s\n\n",this->ModuleError());
+                       this->Log(DEFAULT,"There was an error loading the module '%s': %s", configToken, this->ModuleError());
+                       printf_c("\n[\033[1;31m*\033[0m] There was an error loading the module '%s': %s\n\n", configToken, this->ModuleError());
                        Exit(EXIT_STATUS_MODULE);
                }
        }
-       printf("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", this->ModCount+1, this->ModCount+1 == 1 ? " has" : "s have");
+       printf_c("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", this->ModCount+1, this->ModCount+1 == 1 ? " has" : "s have");
        this->Log(DEFAULT,"Total loaded modules: %d", this->ModCount+1);
 }