From 2ebd55fdcd7e177be150f9c5bdd1cbff9b110ad3 Mon Sep 17 00:00:00 2001
From: Bernd Wachter <bwachter-tmw@lart.info>
Date: Thu, 25 Feb 2010 14:50:23 +0100
Subject: Use recursive mkdir for config directories, fix log initialization

Logger now logs to stdout by default, and allows logging without
having a log file open. This allows using logger for error logging
in early startup functions.

Reviewed-by: Jared Adams
---
 src/CMakeLists.txt |  2 ++
 src/Makefile.am    |  2 ++
 src/client.cpp     | 14 +++++---------
 src/log.cpp        | 12 +++++-------
 4 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5cfbd1f0..ed579993 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -386,6 +386,8 @@ SET(SRCS
     utils/stringutils.cpp
     utils/stringutils.h
     utils/mutex.h
+    utils/mkdir.cpp
+    utils/mkdir.h
     utils/xml.cpp
     utils/xml.h
     animatedsprite.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index e7dc3685..a9ac7dff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -286,6 +286,8 @@ mana_SOURCES = gui/widgets/avatarlistbox.cpp \
 	      utils/dtor.h \
 	      utils/gettext.h \
 	      utils/mathutils.h \
+	      utils/mkdir.cpp \
+	      utils/mkdir.h \
 	      utils/sha256.cpp \
 	      utils/sha256.h \
 	      utils/stringutils.cpp \
diff --git a/src/client.cpp b/src/client.cpp
index 5651f968..9ef6bc96 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -73,6 +73,7 @@
 #include "resources/resourcemanager.h"
 
 #include "utils/gettext.h"
+#include "utils/mkdir.h"
 #include "utils/stringutils.h"
 
 #ifdef __APPLE__
@@ -204,6 +205,8 @@ Client::Client(const Options &options):
     assert(!mInstance);
     mInstance = this;
 
+    logger = new Logger;
+
     // Load branding information
     if (!options.brandingPath.empty())
     {
@@ -214,7 +217,6 @@ Client::Client(const Options &options):
     initScreenshotDir(options.screenshotDir);
 
     // Configure logger
-    logger = new Logger;
     logger->setLogFile(homeDir + std::string("/mana.log"));
 
     // Log the mana version
@@ -970,14 +972,8 @@ void Client::initHomeDir(const Options &options)
             "/." + branding.getValue("appShort", "mana");
 #endif
     }
-#if defined WIN32
-    if (!CreateDirectory(homeDir.c_str(), 0) &&
-            GetLastError() != ERROR_ALREADY_EXISTS)
-#else
-    // Create home directory if it doesn't exist already
-    if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
-            (errno != EEXIST))
-#endif
+
+    if (mkdir_r(homeDir.c_str()))
     {
         logger->error(strprintf(_("%s doesn't exist and can't be created! "
                                   "Exiting."), homeDir.c_str()));
diff --git a/src/log.cpp b/src/log.cpp
index 432d1b04..ba1610fd 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -35,7 +35,7 @@
 #include <sys/time.h>
 
 Logger::Logger():
-    mLogToStandardOut(false),
+    mLogToStandardOut(true),
     mChatWindow(NULL)
 {
 }
@@ -61,11 +61,6 @@ void Logger::setLogFile(const std::string &logFilename)
 
 void Logger::log(const char *log_text, ...)
 {
-    if (!mLogFile.is_open())
-    {
-        return;
-    }
-
     char* buf = new char[1024];
     va_list ap;
 
@@ -94,7 +89,10 @@ void Logger::log(const char *log_text, ...)
         << (int)((tv.tv_usec / 10000) % 100)
         << "] ";
 
-    mLogFile << timeStr.str() << buf << std::endl;
+    if (mLogFile.is_open())
+    {
+        mLogFile << timeStr.str() << buf << std::endl;
+    }
 
     if (mLogToStandardOut)
     {
-- 
cgit v1.2.3-70-g09d2