Rework resolve_config_file()

HiFiPhile · Apr 14, 2024 · de0a7c5 · de0a7c5
1 parent 76a7a56
commit de0a7c5
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/src/configfile.c b/src/configfile.c
@@ -393,30 +393,36 @@ static int resolve_config_file(void)
     char *xdg = getenv("XDG_CONFIG_HOME");
     if (xdg)
     {
-        asprintf(&c.path, "%s/tio/config", xdg);
-        if (access(c.path, F_OK) == 0)
+        if (asprintf(&c.path, "%s/tio/config", xdg) != -1)
         {
-            return 0;
+            if (access(c.path, F_OK) == 0)
+            {
+                return 0;
+            }
+            free(c.path);
         }
-        free(c.path);
     }
 
     char *home = getenv("HOME");
     if (home)
     {
-        asprintf(&c.path, "%s/.config/tio/config", home);
-        if (access(c.path, F_OK) == 0)
+        if (asprintf(&c.path, "%s/.config/tio/config", home) != -1)
         {
-            return 0;
+            if (access(c.path, F_OK) == 0)
+            {
+                return 0;
+            }
+            free(c.path);
         }
-        free(c.path);
 
-        asprintf(&c.path, "%s/.tioconfig", home);
-        if (access(c.path, F_OK) == 0)
+        if (asprintf(&c.path, "%s/.tioconfig", home) != -1)
         {
-            return 0;
+            if (access(c.path, F_OK) == 0)
+            {
+                return 0;
+            }
+            free(c.path);
         }
-        free(c.path);
     }
 
     c.path = NULL;