mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-13 05:54:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix config search paths

Browse Source
This commit is contained in:
taiyu 2015-09-20 10:56:22 -07:00
parent 9fd2d635a1
commit 72aaffcf5b
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sway/config.c
View File

@ -110,47 +110,49 @@ static void config_defaults(struct sway_config *config) {
static char *get_config_path(void) { static char *get_config_path(void) {
char *config_path = NULL; char *config_path = NULL;
char *paths[3] = {getenv("HOME"), getenv("XDG_CONFIG_HOME"), ""}; char *paths[3] = { getenv("HOME"), getenv("XDG_CONFIG_HOME"), "" };
int pathlen[3] = {0, 0, 0}; int pathlen[3] = { 0, 0, 0 };
int i; int i;
#define home paths[0] #define home paths[0]
#define conf paths[1] #define conf paths[1]
// Get home and config directories // Get home and config directories
conf = conf ? strdup(conf) : NULL;
home = home ? strdup(home) : NULL; home = home ? strdup(home) : NULL;
if (conf) { // If config folder is unset, set it to $HOME/.config
conf = strdup(conf); if (!conf && home) {
} else if (home) {
const char *def = "/.config"; const char *def = "/.config";
conf = malloc(strlen(home) + strlen(def) + 1); conf = malloc(strlen(home) + strlen(def) + 1);
strcpy(conf, home); strcpy(conf, home);
strcat(conf, def); strcat(conf, def);
} else {
home = strdup("");
conf = strdup("");
} }
pathlen[0] = strlen(home); // Get path lengths
pathlen[1] = strlen(conf); pathlen[0] = home ? strlen(home) : 0;
pathlen[1] = conf ? strlen(conf) : 0;
#undef home #undef home
#undef conf #undef conf
// Search for config file from search paths // Search for config file from search paths
static const char *search_paths[] = { static const char *search_paths[] = {
"/.sway/config", // Prepend with $home "/.sway/config", // Prepend with $home
"/sway/config", // Prepend with $config "/sway/config", // Prepend with $config
"/etc/sway/config", "/etc/sway/config",
"/.i3/config", // $home "/.i3/config", // $home
"/.i3/config", // $config "/i3/config", // $config
"/etc/i3/config" "/etc/i3/config"
}; };
for (i = 0; i < (int)(sizeof(search_paths) / sizeof(char *)); ++i) { for (i = 0; i < (int)(sizeof(search_paths) / sizeof(char *)); ++i) {
char *test = malloc(pathlen[i%3] + strlen(search_paths[i]) + 1); // Only try path if it is set by enviroment variables
strcpy(test, paths[i%3]); if (paths[i%3]) {
strcat(test, search_paths[i]); char *test = malloc(pathlen[i%3] + strlen(search_paths[i]) + 1);
sway_log(L_DEBUG, "Checking for config at %s", test); strcpy(test, paths[i%3]);
if (file_exists(test)) { strcpy(test + pathlen[i%3], search_paths[i]);
config_path = test; sway_log(L_DEBUG, "Checking for config at %s", test);
goto cleanup; if (file_exists(test)) {
config_path = test;
goto cleanup;
}
free(test);
} }
free(test);
} }
sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_DIRS"); sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_DIRS");