X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FUtils%2FFolders.cpp;h=3fa04025823b3502f4959ebc50e8a5fb83d6b57f;hb=eae73ddd7a006ee6de9ffb01f3ec5f8e5fdc6d85;hp=e2956e55db6c72c49d0d60c9f8dea9d2fd0a8833;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7;p=lugaru.git

diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp
index e2956e5..3fa0402 100644
--- a/Source/Utils/Folders.cpp
+++ b/Source/Utils/Folders.cpp
@@ -21,6 +21,8 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Folders.hpp"
 
 #include <cstring>
+#include <cstdlib>
+#include <cerrno>
 #include <unistd.h>
 
 #if PLATFORM_UNIX
@@ -43,11 +45,6 @@ std::string Folders::getScreenshotDir()
     return screenshotDir;
 }
 
-std::string Folders::getResourcePath(std::string filepath)
-{
-    return dataDir + '/' + filepath;
-}
-
 std::string Folders::getUserDataPath()
 {
     std::string userDataPath;
@@ -87,7 +84,7 @@ std::string Folders::getConfigFilePath()
 
 #if PLATFORM_LINUX
 /* Generic code for XDG ENVVAR test and fallback */
-std::string Folders::getGenericDirectory(const char* ENVVAR, const std::string fallback) {
+std::string Folders::getGenericDirectory(const char* ENVVAR, const std::string& fallback) {
     const char* path = getenv(ENVVAR);
     std::string ret;
     if ((path != NULL) && (strlen(path) != 0)) {
@@ -117,30 +114,18 @@ const char* Folders::getHomeDirectory()
 }
 #endif
 
-bool Folders::makeDirectory(std::string path) {
+bool Folders::makeDirectory(const 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;
-    }
+    return ((status != 0) || (GetLastError() == ERROR_ALREADY_EXISTS));
 #else
     errno = 0;
     int status = mkdir(path.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-    if (status == 0) {
-        return true;
-    } else if(errno == EEXIST) {
-        return true;
-    } else {
-        return false;
-    }
+    return ((status == 0) || (errno == EEXIST));
 #endif
 }
 
-FILE* Folders::openMandatoryFile(std::string filename, const char* mode)
+FILE* Folders::openMandatoryFile(const std::string& filename, const char* mode)
 {
     FILE* tfile = fopen(filename.c_str(), mode);
     if (tfile == NULL) {
@@ -148,3 +133,15 @@ FILE* Folders::openMandatoryFile(std::string filename, const char* mode)
     }
     return tfile;
 }
+
+bool Folders::file_exists(const std::string& filepath)
+{
+    FILE* file;
+    file = fopen(filepath.c_str(), "rb");
+    if (file == NULL) {
+        return false;
+    } else {
+        fclose(file);
+        return true;
+    }
+}