X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FUtils%2FFolders.cpp;h=2bf9bdad0ed429d6f869481f702934141b538e6d;hp=3fa04025823b3502f4959ebc50e8a5fb83d6b57f;hb=8b6e8f3ad7390309795eb35c0959264cb7924402;hpb=531fd8d27258d6c15d6fd221272c74b48602a85a diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp index 3fa0402..2bf9bda 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,17 +105,18 @@ std::string Folders::getGenericDirectory(const char* ENVVAR, const std::string& #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(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));