mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86 from Luminarys/master 

Fixed config loading
This commit is contained in:
Drew DeVault 2015-08-19 10:36:33 -04:00
parent 0f29f04816 0e4df85ba1
commit 2d3bd3c747
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sway/config.c
View File

@ -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