X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FUtils%2FFolders.cpp;h=751da930b65a46a75bb4cdafc87476a08ae2dcb9;hb=b9a46d8e2b7e7e22c706e7dd3734f31015db4408;hp=21322c1596e192821765e8159811efa77f72a68a;hpb=cf610b0dfbf15ffafaefcae72a44957095fd7740;p=lugaru.git diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp index 21322c1..751da93 100644 --- a/Source/Utils/Folders.cpp +++ b/Source/Utils/Folders.cpp @@ -20,9 +20,9 @@ along with Lugaru. If not, see . #include "Folders.hpp" -#include -#include #include +#include +#include #include #if PLATFORM_UNIX @@ -51,7 +51,7 @@ std::string Folders::getUserDataPath() #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,24 +105,27 @@ std::string Folders::getGenericDirectory(const char* ENVVAR, const std::string& #if PLATFORM_UNIX const char* Folders::getHomeDirectory() { - const char *homedir = getenv("HOME"); - if (homedir != NULL) + const char* homedir = getenv("HOME"); + if (homedir != NULL) { return homedir; - struct passwd *pw = getpwuid(getuid()); - if (pw != NULL) + } + struct passwd* pw = getpwuid(getuid()); + if (pw != NULL) { return pw->pw_dir; + } return NULL; } #endif -bool Folders::makeDirectory(const std::string& path) { +bool Folders::makeDirectory(const std::string& path) +{ #ifdef _WIN32 int status = CreateDirectory(path.c_str(), NULL); - return status != 0 || GetLastError() == ERROR_ALREADY_EXISTS; + return ((status != 0) || (GetLastError() == ERROR_ALREADY_EXISTS)); #else errno = 0; int status = mkdir(path.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); - return status == 0 || errno == EEXIST; + return ((status == 0) || (errno == EEXIST)); #endif } @@ -133,3 +137,15 @@ FILE* Folders::openMandatoryFile(const 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; + } +}