Microsoft, in their "infinite wisdom" decide to have no sensible naming convention...

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 487af4511fde55efa2e9261b0044d4cd89921b09..0edb09084a07bc19119cfa7ab5152a6acef4f827 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -6,7 +6,7 @@
  * 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.
  *
  * ---------------------------------------------------
  */
@@ -18,27 +18,6 @@
 #include "xline.h"
 #include "exitcodes.h"
 
-/** Log()
- *  Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
- *  is greater than the configured loglevel.
- */
-void InspIRCd::Log(int level, const char* text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[65536];
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, 65536, text, argsPtr);
-       va_end(argsPtr);
-
-       this->Log(level, std::string(textbuffer));
-}
-
-void InspIRCd::Log(int level, const std::string &text)
-{
-       this->Logs->Log("DEPRECATED", level, "Deprecated use of InspIRCd::Log(), message = %s", text.c_str());
-}
-
 std::string InspIRCd::GetServerDescription(const char* servername)
 {
        std::string description;
@@ -203,7 +182,7 @@ 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)
 {
        char *c;
 
@@ -289,7 +268,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
@@ -302,22 +281,67 @@ 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";
+                       std::string path = std::string(home) + "/.inspircd";
+                       // 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
+                       {
+                               /* 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->log_file = fopen(Config->logpath.c_str(),"a+");
+               if (!Config->log_file)
+                       Config->log_file = fopen(Config->logpath.c_str(),"a+");
        }
        else
        {
@@ -330,7 +354,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);
 
@@ -342,7 +366,7 @@ void InspIRCd::CheckRoot()
        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");
+               this->Logs->Log("STARTUP",DEFAULT,"Cant start as root");
                Exit(EXIT_STATUS_ROOT);
        }
 }
@@ -352,7 +376,7 @@ void InspIRCd::CheckDie()
        if (*Config->DieValue)
        {
                printf("WARNING: %s\n\n",Config->DieValue);
-               this->Log(DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
+               this->Logs->Log("CONFIG",DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
                Exit(EXIT_STATUS_DIETAG);
        }
 }