Flesh this out some more

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index d2fbca6f6421fb2809a45f686ad51260804f7d68..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.
  *
  * ---------------------------------------------------
  */
@@ -182,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;
 
@@ -268,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
@@ -287,6 +287,77 @@ bool InspIRCd::OpenLog(char**, int)
                this->Logs->SetupNoFork();
        }
        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())
+               {
+                       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));
+                       }
+               }
+
+               if (!Config->log_file)
+                       Config->log_file = fopen(Config->logpath.c_str(),"a+");
+       }
+       else
+       {
+               Config->log_file = fopen(this->LogFileName,"a+");
+       }
+
+       if (!Config->log_file)
+       {
+               return false;
+       }
+
+       FileWriter* fw = new FileWriter(this, Config->log_file);
+       FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : DEFAULT), fw);
+
+       this->Logs->AddLogType("*", f, true);
+
        return true;
 }