Trying to handle a bit better missing files and avoid segfaults

[lugaru.git] / Source / Utils / Folders.cpp

diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp
index 0a36e5c86e1906392d2359db9e97fda07f74cc53..c4e86abf17ab2344d92fdda55edd3e9b130c3428 100644 (file)
--- a/Source/Utils/Folders.cpp
+++ b/Source/Utils/Folders.cpp
@@ -20,9 +20,17 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Folders.h"
 #include <cstring>
+#include <unistd.h>
+#if PLATFORM_UNIX
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <pwd.h>
+#endif
+#if _WIN32
+#include <windows.h>
+#endif
 
-const std::string Folders::dataDir = DATADIR;
+const std::string Folders::dataDir = DATA_DIR;
 
 std::string Folders::getScreenshotDir()
 {
@@ -38,36 +46,84 @@ std::string Folders::getResourcePath(std::string filepath)
 
 std::string Folders::getUserDataPath()
 {
-    std::string userDataPath = getGenericDirectory("XDG_DATA_HOME", ".local/share");
+#ifdef _WIN32
+    return dataDir;
+#else
+    std::string userDataPath;
+#if (defined(__APPLE__) && defined(__MACH__))
+    const char* homePath = getHomeDirectory();
+    if (homePath == NULL) {
+        userDataPath = ".";
+    } else {
+        userDataPath = std::string(homePath) + "/Library/Application Support/Lugaru";
+    }
+#else
+    userDataPath = getGenericDirectory("XDG_DATA_HOME", ".local/share");
+#endif
     makeDirectory(userDataPath);
     return userDataPath;
+#endif
 }
 
 std::string Folders::getConfigFilePath()
 {
-    std::string configFolder = getGenericDirectory("XDG_CONFIG_HOME", ".config");
+#ifdef _WIN32
+    return dataDir + "/config.txt";
+#else
+    std::string configFolder;
+#if (defined(__APPLE__) && defined(__MACH__))
+    configFolder = getUserDataPath();
+#else
+    configFolder = getGenericDirectory("XDG_CONFIG_HOME", ".config");
+#endif
     makeDirectory(configFolder);
     return configFolder + "/config.txt";
+#endif
 }
 
+#if PLATFORM_LINUX
 /* Generic code for XDG ENVVAR test and fallback */
 std::string Folders::getGenericDirectory(const char* ENVVAR, const std::string fallback) {
-    char* path = getenv(ENVVAR);
+    const char* path = getenv(ENVVAR);
     std::string ret;
-    if((path != NULL) && (strlen(path) != 0)) {
+    if ((path != NULL) && (strlen(path) != 0)) {
         ret = std::string(path) + "/lugaru";
     } else {
-        path = getenv("HOME");
-        if((path != NULL) && (strlen(path) != 0)) {
-            ret = std::string(path) + '/' + fallback + "/lugaru";
+        const char* homedir = getHomeDirectory();
+        if ((homedir != NULL) && (strlen(homedir) != 0)) {
+            ret = std::string(homedir) + '/' + fallback + "/lugaru";
         } else {
             ret = ".";
         }
     }
     return ret;
 }
+#endif
+
+#if PLATFORM_UNIX
+const char* Folders::getHomeDirectory()
+{
+    const char *homedir = getenv("HOME");
+    if (homedir != NULL)
+        return homedir;
+    struct passwd *pw = getpwuid(getuid());
+    if (pw != NULL)
+        return pw->pw_dir;
+    return NULL;
+}
+#endif
 
 bool Folders::makeDirectory(std::string path) {
+#ifdef _WIN32
+    int status = CreateDirectory(path.c_str(), NULL);
+    if (status != 0) {
+        return true;
+    } else if(GetLastError() == ERROR_ALREADY_EXISTS) {
+        return true;
+    } else {
+        return false;
+    }
+#else
     errno = 0;
     int status = mkdir(path.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
     if (status == 0) {
@@ -77,4 +133,14 @@ bool Folders::makeDirectory(std::string path) {
     } else {
         return false;
     }
+#endif
+}
+
+FILE* Folders::openMandatoryFile(std::string filename, const char* mode)
+{
+    FILE* tfile = fopen(filename.c_str(), mode);
+    if (tfile == NULL) {
+        throw FileNotFoundException(filename);
+    }
+    return tfile;
 }