sway

commit 2d3bd3c74772e72ed6119549428150c7318fe456
parent 0f29f048167739c6f92d241d2aacbfcf6972c39c
Author: Drew DeVault <sir@cmpwn.com>
Date:   Wed, 19 Aug 2015 10:36:33 -0400

Merge pull request #86 from Luminarys/master

Fixed config loading
Diffstat:
M
sway/config.c
 | 
16
++++++++++++----

1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/sway/config.c b/sway/config.c
@@ -71,13 +71,21 @@ static const char *search_paths[] = {
 };
 
 static char *get_config_path() {
-	char *home = strdup(getenv("HOME"));
-	char *config = strdup(getenv("XDG_CONFIG_HOME"));
-	if (!config) {
-		const char *def = "/.config/sway";
+	char *home = getenv("HOME");
+	if (home) {
+		home = strdup(getenv("HOME"));
+	}
+	char *config = getenv("XDG_CONFIG_HOME");
+	if (config) {
+		config = strdup(getenv("XDG_CONFIG_HOME"));
+	} else if (home) {
+		const char *def = "/.config";
 		config = malloc(strlen(home) + strlen(def) + 1);
 		strcpy(config, home);
 		strcat(config, def);
+	} else {
+		home = strdup("");
+		config = strdup("");
 	}
 
 	// Set up a temporary config for holding set variables