Add GreenReaper and Skip to contributors

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 465f55d6f9e0ede43da0438b8d9a0e7d99f4f3b8..b0c96645736c543047004e9ef9dbc80fd4c0c43b 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,19 +281,44 @@ 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";
+                       if (!mkdir(path.c_str(), 0700) && errno != EEXIST)
+                       {
+                               /* 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->log_file = fopen(Config->logpath.c_str(),"a+");
@@ -330,7 +334,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);