Improve config settings

Author: drhelius

platforms/shared/desktop/config.cpp

@@ -35,7 +35,7 @@ static void write_float(const char* group, const char* key, float value);
 static bool read_bool(const char* group, const char* key, bool default_value);
 static void write_bool(const char* group, const char* key, bool boolean);
 static std::string read_string(const char* group, const char* key);
-static void write_string(const char* group, const char* key, std::string value);
+static void write_string(const char* group, const char* key, const std::string& value);
 static config_Hotkey read_hotkey(const char* group, const char* key, config_Hotkey default_value);
 static void write_hotkey(const char* group, const char* key, config_Hotkey hotkey);
 static config_Hotkey make_hotkey(SDL_Scancode key, SDL_Keymod mod);
@@ -158,10 +158,20 @@ static void set_defaults(void)
 
 void config_init(void)
 {
+    const char* root_path = NULL;
+
     if (check_portable())
-        config_root_path = SDL_GetBasePath();
+        root_path = SDL_GetBasePath();
     else
-        config_root_path = SDL_GetPrefPath("Geardome", GG_TITLE);
+        root_path = SDL_GetPrefPath("Geardome", GG_TITLE);
+
+    if (root_path == NULL)
+    {
+        Log("Unable to determine config path. Falling back to current directory.");
+        root_path = SDL_strdup("./");
+    }
+
+    config_root_path = root_path;
 
     strncpy_fit(config_temp_path, config_root_path, sizeof(config_temp_path));
     strncat_fit(config_temp_path, "tmp/", sizeof(config_temp_path));
@@ -180,7 +190,8 @@ void config_init(void)
 
 void config_destroy(void)
 {
-    SafeDelete(config_ini_file)
+    SafeDelete(config_ini_file);
+    SDL_free((void*)config_root_path);
 }
 
 void config_load_defaults(void)
@@ -759,6 +770,10 @@ void config_write(void)
     {
         Debug("Settings saved");
     }
+    else
+    {
+        Error("Unable to save settings to %s", config_emu_file_path);
+    }
 }
 
 static bool check_portable(void)
@@ -767,9 +782,11 @@ static bool check_portable(void)
     char portable_file_path[260];
 
     base_path = SDL_GetBasePath();
+    if (base_path == NULL)
+        return false;
 
-    strcpy(portable_file_path, base_path);
-    strcat(portable_file_path, "portable.ini");
+    snprintf(portable_file_path, sizeof(portable_file_path), "%sportable.ini", base_path);
+    SDL_free((void*)base_path);
 
     FILE* file = fopen_utf8(portable_file_path, "r");
 
@@ -784,14 +801,16 @@ static bool check_portable(void)
 
 static int read_int(const char* group, const char* key, int default_value)
 {
-    int ret = 0;
+    int ret = default_value;
 
     std::string value = config_ini_data[group][key];
 
-    if(value.empty())
-        ret = default_value;
-    else
-        ret = std::stoi(value);
+    if (!value.empty())
+    {
+        std::istringstream iss(value);
+        if (!(iss >> ret))
+            ret = default_value;
+    }
 
     Debug("Load integer setting: [%s][%s]=%d", group, key, ret);
     return ret;
@@ -806,17 +825,15 @@ static void write_int(const char* group, const char* key, int integer)
 
 static float read_float(const char* group, const char* key, float default_value)
 {
-    float ret = 0.0f;
+    float ret = default_value;
 
     std::string value = config_ini_data[group][key];
 
-    if(value.empty())
-        ret = default_value;
-    else
+    if (!value.empty())
     {
-        std::istringstream iss(value);
-        iss.imbue(std::locale::classic());
-        if (!(iss >> ret))
+        std::istringstream converter(value);
+        converter.imbue(std::locale::classic());
+        if (!(converter >> ret))
             ret = default_value;
     }
 
@@ -830,20 +847,22 @@ static void write_float(const char* group, const char* key, float value)
     oss.imbue(std::locale::classic());
     oss << std::fixed << std::setprecision(2) << value;
     std::string value_str = oss.str();
-    config_ini_data[group][key] = oss.str();
+    config_ini_data[group][key] = value_str;
     Debug("Save float setting: [%s][%s]=%s", group, key, value_str.c_str());
 }
 
 static bool read_bool(const char* group, const char* key, bool default_value)
 {
-    bool ret;
+    bool ret = default_value;
 
     std::string value = config_ini_data[group][key];
 
-    if(value.empty())
-        ret = default_value;
-    else
-        std::istringstream(value) >> std::boolalpha >> ret;
+    if (!value.empty())
+    {
+        std::istringstream converter(value);
+        if (!(converter >> std::boolalpha >> ret))
+            ret = default_value;
+    }
 
     Debug("Load bool setting: [%s][%s]=%s", group, key, ret ? "true" : "false");
     return ret;
@@ -866,7 +885,7 @@ static std::string read_string(const char* group, const char* key)
     return ret;
 }
 
-static void write_string(const char* group, const char* key, std::string value)
+static void write_string(const char* group, const char* key, const std::string& value)
 {
     config_ini_data[group][key] = value;
     Debug("Save string setting: [%s][%s]=%s", group, key, value.c_str());