X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=f38b3e6b569174fd40fb706b69d701a1feaae8cd;hb=b686288b3f6bbc49bd689df2d5b3d8ce9d62db4e;hp=53529f5395b8e35117bbf444da46631dc9972434;hpb=c16cda5d715241bb4bff8050bee942a8a34a72c0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 53529f539..f38b3e6b5 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -306,37 +306,7 @@ bool InspIRCd::OpenLog(char**, int) { 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)); - } + Config->logpath = "./startup.log"; } if (!Config->log_file) @@ -402,7 +372,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) @@ -482,3 +452,6 @@ void InspIRCd::AddExtBanChar(char c) else tok.insert(ebpos + 9, 1, c); } + + +