aboutsummaryrefslogtreecommitdiff
path: root/swaynag
diff options
context:
space:
mode:
authorIan Fan <ianfan0@gmail.com>2019-01-14 09:42:55 +0000
committerIan Fan <ianfan0@gmail.com>2019-01-14 09:45:18 +0000
commit8729c6531193e08c21babdb37731059ed289ce95 (patch)
treea0bc771a9c331ca11d330bef84a781996d2fa65b /swaynag
parent89ad3f2bbbb6f5f367387992eea5d5c6f7fa7642 (diff)
swaynag: handle empty $XDG_CONFIG_HOME better
Set config path to fallback instead of setting $XDG_CONFIG_HOME
Diffstat (limited to 'swaynag')
-rw-r--r--swaynag/config.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/swaynag/config.c b/swaynag/config.c
index 85aa380a..60bda3e0 100644
--- a/swaynag/config.c
+++ b/swaynag/config.c
@@ -304,25 +304,15 @@ char *swaynag_get_config_path(void) {
SYSCONFDIR "/swaynag/config",
};
- if (!getenv("XDG_CONFIG_HOME")) {
- char *home = getenv("HOME");
- char *config_home = malloc(strlen(home) + strlen("/.config") + 1);
- if (!config_home) {
- wlr_log(WLR_ERROR, "Unable to allocate $HOME/.config");
- } else {
- strcpy(config_home, home);
- strcat(config_home, "/.config");
- setenv("XDG_CONFIG_HOME", config_home, 1);
- wlr_log(WLR_DEBUG, "Set XDG_CONFIG_HOME to %s", config_home);
- free(config_home);
- }
+ char *config_home = getenv("XDG_CONFIG_HOME");
+ if (!config_home || *config_home) {
+ config_paths[1] = "$HOME/.config/swaynag/config";
}
wordexp_t p;
- char *path;
for (size_t i = 0; i < sizeof(config_paths) / sizeof(char *); ++i) {
if (wordexp(config_paths[i], &p, 0) == 0) {
- path = strdup(p.we_wordv[0]);
+ char *path = strdup(p.we_wordv[0]);
wordfree(&p);
if (file_exists(path)) {
return path;