X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FUtils%2FFolders.cpp;h=2bf9bdad0ed429d6f869481f702934141b538e6d;hb=8b6e8f3ad7390309795eb35c0959264cb7924402;hp=b667daa933a5d22bc59b1779ea086550d70ad9d6;hpb=e8886f08acfcbec9dbe361df12cff7ef96005a0e;p=lugaru.git

diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp
index b667daa..2bf9bda 100644
--- a/Source/Utils/Folders.cpp
+++ b/Source/Utils/Folders.cpp
@@ -18,17 +18,22 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Folders.h"
+#include "Folders.hpp"
+
+#include <cerrno>
+#include <cstdlib>
 #include <cstring>
 #include <unistd.h>
+
 #if PLATFORM_UNIX
+#include <pwd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <pwd.h>
 #endif
+
 #if _WIN32
-#include <windows.h>
 #include <shlobj.h> // to get paths related functions
+#include <windows.h>
 #endif
 
 const std::string Folders::dataDir = DATA_DIR;
@@ -40,18 +45,13 @@ std::string Folders::getScreenshotDir()
     return screenshotDir;
 }
 
-std::string Folders::getResourcePath(std::string filepath)
-{
-    return dataDir + '/' + filepath;
-}
-
 std::string Folders::getUserDataPath()
 {
     std::string userDataPath;
 #ifdef _WIN32
     char path[MAX_PATH];
     // %APPDATA% (%USERPROFILE%\Application Data)
-    if(SUCCEEDED(SHGetFolderPathA(nullptr, CSIDL_APPDATA, nullptr, 0, path))) {
+    if (SUCCEEDED(SHGetFolderPathA(nullptr, CSIDL_APPDATA, nullptr, 0, path))) {
         userDataPath = std::string(path) + "/Lugaru/";
     } else {
         return dataDir;
@@ -84,7 +84,8 @@ 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)) {
@@ -104,40 +105,29 @@ std::string Folders::getGenericDirectory(const char* ENVVAR, const std::string f
 #if PLATFORM_UNIX
 const char* Folders::getHomeDirectory()
 {
-    const char *homedir = getenv("HOME");
+    const char* homedir = getenv("HOME");
     if (homedir != NULL)
         return homedir;
-    struct passwd *pw = getpwuid(getuid());
+    struct passwd* pw = getpwuid(getuid());
     if (pw != NULL)
         return pw->pw_dir;
     return NULL;
 }
 #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) {
@@ -145,3 +135,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;
+    }
+}