From a6b4b295a6b5eaa17483e689d81d2c31142bdc96 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 9 Apr 2015 13:47:21 -0300
Subject: [PATCH] Minor fixes in app::crash to compile on clang and gcc

---
 src/app/crash/read_document.cpp  |  4 ++--
 src/app/crash/session.cpp        | 18 ++++++++++++------
 src/app/crash/write_document.cpp |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/app/crash/read_document.cpp b/src/app/crash/read_document.cpp
index 1016953df..5bf887d99 100644
--- a/src/app/crash/read_document.cpp
+++ b/src/app/crash/read_document.cpp
@@ -50,7 +50,7 @@ using namespace doc;
     std::ifstream name(base::from_utf8(base::join_path(dir, fn)), std::ifstream::binary);
 #else
   #define IFSTREAM(dir, name, fn) \
-    std::ifstream name(base::join_path(dir, fn), std::ifstream::binary);
+    std::ifstream name(base::join_path(dir, fn).c_str(), std::ifstream::binary);
 #endif
 
 namespace {
@@ -191,7 +191,7 @@ private:
     }
     else {
       Console().printf("Unable to load layer named '%s', type #%d\n",
-        name, (int)type);
+        name.c_str(), (int)type);
       return nullptr;
     }
   }
diff --git a/src/app/crash/session.cpp b/src/app/crash/session.cpp
index 8ca7ad38f..c4dc98100 100644
--- a/src/app/crash/session.cpp
+++ b/src/app/crash/session.cpp
@@ -49,8 +49,8 @@ Session::Backup::Backup(const std::string& dir)
 }
 
 Session::Session(const std::string& path)
-  : m_path(path)
-  , m_pid(0)
+  : m_pid(0)
+  , m_path(path)
 {
 }
 
@@ -107,8 +107,8 @@ void Session::create(base::pid pid)
   std::ofstream pidf(base::from_utf8(pidFilename()));
   std::ofstream verf(base::from_utf8(verFilename()));
 #else
-  std::ofstream pidf(pidFilename());
-  std::ofstream verf(verFilename());
+  std::ofstream pidf(pidFilename().c_str());
+  std::ofstream verf(verFilename().c_str());
 #endif
 
   pidf << m_pid;
@@ -200,7 +200,11 @@ void Session::loadPid()
 
   std::string pidfile = pidFilename();
   if (base::is_file(pidfile)) {
-    std::ifstream pf(pidfile);
+#ifdef _WIN32
+    std::ifstream pf(base::from_utf8(pidfile));
+#else
+    std::ifstream pf(pidfile.c_str());
+#endif
     if (pf)
       pf >> m_pid;
   }
@@ -224,8 +228,10 @@ void Session::deleteDirectory(const std::string& dir)
 
   for (auto& item : base::list_files(dir)) {
     std::string objfn = base::join_path(dir, item);
-    if (base::is_file(objfn))
+    if (base::is_file(objfn)) {
+      TRACE("DataRecovery: Deleting file '%s'\n", objfn.c_str());
       base::delete_file(objfn);
+    }
   }
   base::remove_directory(dir);
 }
diff --git a/src/app/crash/write_document.cpp b/src/app/crash/write_document.cpp
index 84031b679..9dd1ccb47 100644
--- a/src/app/crash/write_document.cpp
+++ b/src/app/crash/write_document.cpp
@@ -47,7 +47,7 @@ using namespace doc;
     std::ofstream name(base::from_utf8(base::join_path(dir, fn)), std::ofstream::binary);
 #else
   #define OFSTREAM(dir, name, fn) \
-    std::ofstream name(base::join_path(dir, fn), std::ofstream::binary);
+    std::ofstream name(base::join_path(dir, fn).c_str(), std::ofstream::binary);
 #endif
 
 namespace {