Added braces to all statements with clang-tidy and ran clang-format again

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

diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp
index 43b399e9a86334d3245fff8d8afd9ce944e973e3..751da930b65a46a75bb4cdafc87476a08ae2dcb9 100644 (file)
--- a/Source/Utils/Folders.cpp
+++ b/Source/Utils/Folders.cpp
@@ -20,9 +20,9 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Folders.hpp"
 
-#include <cstring>
-#include <cstdlib>
 #include <cerrno>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 
 #if PLATFORM_UNIX
@@ -45,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;
@@ -89,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)) {
@@ -109,40 +105,31 @@ std::string Folders::getGenericDirectory(const char* ENVVAR, const std::string f
 #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(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) {
@@ -150,3 +137,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;
+    }
+}