1 files changed, 50 insertions, 23 deletions

diff --git a/sway/config.c b/sway/config.c
index 6e665434..fde386c7 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -26,7 +26,7 @@
 #include "sway/tree/arrange.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
-#include "cairo.h"
+#include "cairo_util.h"
 #include "pango.h"
 #include "stringop.h"
 #include "list.h"
@@ -338,35 +338,62 @@ static bool file_exists(const char *path) {
         return path && access(path, R_OK) != -1;
 }
 
+static char *config_path(const char *prefix, const char *config_folder) {
+        if (!prefix || !prefix[0] || !config_folder || !config_folder[0]) {
+                return NULL;
+        }
+
+        const char *filename = "config";
+
+        size_t size = 3 + strlen(prefix) + strlen(config_folder) + strlen(filename);
+        char *path = calloc(size, sizeof(char));
+        snprintf(path, size, "%s/%s/%s", prefix, config_folder, filename);
+        return path;
+}
+
 static char *get_config_path(void) {
-        static const char *config_paths[] = {
-                "$HOME/.sway/config",
-                "$XDG_CONFIG_HOME/sway/config",
-                "$HOME/.i3/config",
-                "$XDG_CONFIG_HOME/i3/config",
-                SYSCONFDIR "/sway/config",
-                SYSCONFDIR "/i3/config",
+        char *path = NULL;
+        const char *home = getenv("HOME");
+        char *config_home_fallback = NULL;
+
+        const char *config_home = getenv("XDG_CONFIG_HOME");
+        if ((config_home == NULL || config_home[0] == '\0') && home != NULL) {
+                size_t size_fallback = 1 + strlen(home) + strlen("/.config");
+                config_home_fallback = calloc(size_fallback, sizeof(char));
+                if (config_home_fallback != NULL)
+                        snprintf(config_home_fallback, size_fallback, "%s/.config", home);
+                config_home = config_home_fallback;
+        }
+
+        struct config_path {
+                const char *prefix;
+                const char *config_folder;
         };
 
-        char *config_home = getenv("XDG_CONFIG_HOME");
-        if (!config_home || !*config_home) {
-                config_paths[1] = "$HOME/.config/sway/config";
-                config_paths[3] = "$HOME/.config/i3/config";
-        }
+        struct config_path config_paths[] = {
+                { .prefix = home, .config_folder = ".sway"},
+                { .prefix = config_home, .config_folder = "sway"},
+                { .prefix = home, .config_folder = ".i3"},
+                { .prefix = config_home, .config_folder = "i3"},
+                { .prefix = SYSCONFDIR, .config_folder = "sway"},
+                { .prefix = SYSCONFDIR, .config_folder = "i3"}
+        };
 
-        for (size_t i = 0; i < sizeof(config_paths) / sizeof(char *); ++i) {
-                wordexp_t p;
-                if (wordexp(config_paths[i], &p, WRDE_UNDEF) == 0) {
-                        char *path = strdup(p.we_wordv[0]);
-                        wordfree(&p);
-                        if (file_exists(path)) {
-                                return path;
-                        }
-                        free(path);
+        size_t num_config_paths = sizeof(config_paths)/sizeof(config_paths[0]);
+        for (size_t i = 0; i < num_config_paths; i++) {
+                path = config_path(config_paths[i].prefix, config_paths[i].config_folder);
+                if (!path) {
+                        continue;
                 }
+                if (file_exists(path)) {
+                        break;
+                }
+                free(path);
+                path = NULL;
         }
 
-        return NULL;
+        free(config_home_fallback);
+        return path;
 }
 
 static bool load_config(const char *path, struct sway_config *config,