From f3a5deec5ec5023c0e657821f323c196d97a16a2 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 10 May 2016 22:47:14 +0200
Subject: [PATCH] + on Windows use the unicode version to get cwd + on other
 platforms use getcwd in a platform independent way

---
 src/Base/FileInfo.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Base/FileInfo.cpp b/src/Base/FileInfo.cpp
index c2b7b68d6..3ba8d6958 100644
--- a/src/Base/FileInfo.cpp
+++ b/src/Base/FileInfo.cpp
@@ -92,9 +92,6 @@ std::wstring ConvertToWideString(const std::string& string)
     wideCharString = NULL;
     return wideString;
 }
-#define GetCurrentDir direct::_getcwd
-#elif defined (FC_OS_LINUX) || defined(FC_OS_CYGWIN) || defined(FC_OS_MACOSX) || defined(FC_OS_BSD)
-#define GetCurrentDir unistd::getcwd
 #endif
 
 
@@ -234,8 +231,17 @@ std::string FileInfo::dirPath () const
     if (last_pos != std::string::npos) {
         retval = FileName.substr(0, last_pos);
     }
-    else{
-        retval = std::string(GetCurrentDir(NULL, 0));
+    else {
+#ifdef FC_OS_WIN32
+        wchar_t buf[MAX_PATH];
+        GetCurrentDirectoryW(MAX_PATH, buf);
+        retval = std::string(ConvertFromWideString(std::wstring(buf)));
+#else
+        char buf[PATH_MAX+1];
+        const char* cwd = getcwd(buf, PATH_MAX);
+        if (cwd)
+            retval = std::string(cwd);
+#endif
     }
     return retval;
 }