From 9ff0501e785e4e3fe2e8915eb9468d12cab98cf6 Mon Sep 17 00:00:00 2001 From: Masanori Kakura Date: Fri, 4 May 2018 22:58:54 +0900 Subject: config-ini: Properly respect XDG_CONFIG_HOME base directory specification If redshift.conf is not found, fall back to formerly used path. --- src/config-ini.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/config-ini.c b/src/config-ini.c index 749512a..05fca5d 100644 --- a/src/config-ini.c +++ b/src/config-ini.c @@ -63,8 +63,15 @@ open_config_file(const char *filepath) if (f == NULL && (env = getenv("XDG_CONFIG_HOME")) != NULL && env[0] != '\0') { - snprintf(cp, sizeof(cp), "%s/redshift.conf", env); + snprintf(cp, sizeof(cp), + "%s/redshift/redshift.conf", env); f = fopen(cp, "r"); + if (f == NULL) { + /* Fall back to formerly used path. */ + snprintf(cp, sizeof(cp), + "%s/redshift.conf", env); + f = fopen(cp, "r"); + } } #ifdef _WIN32 @@ -78,8 +85,14 @@ open_config_file(const char *filepath) if (f == NULL && (env = getenv("HOME")) != NULL && env[0] != '\0') { snprintf(cp, sizeof(cp), - "%s/.config/redshift.conf", env); + "%s/.config/redshift/redshift.conf", env); f = fopen(cp, "r"); + if (f == NULL) { + /* Fall back to formerly used path. */ + snprintf(cp, sizeof(cp), + "%s/.config/redshift.conf", env); + f = fopen(cp, "r"); + } } #ifndef _WIN32 @@ -87,8 +100,14 @@ open_config_file(const char *filepath) struct passwd *pwd = getpwuid(getuid()); char *home = pwd->pw_dir; snprintf(cp, sizeof(cp), - "%s/.config/redshift.conf", home); + "%s/.config/redshift/redshift.conf", home); f = fopen(cp, "r"); + if (f == NULL) { + /* Fall back to formerly used path. */ + snprintf(cp, sizeof(cp), + "%s/.config/redshift.conf", home); + f = fopen(cp, "r"); + } } if (f == NULL && (env = getenv("XDG_CONFIG_DIRS")) != NULL && @@ -101,9 +120,14 @@ open_config_file(const char *filepath) int len = end - begin; if (len > 0) { snprintf(cp, sizeof(cp), - "%.*s/redshift.conf", len, begin); - + "%.*s/redshift/redshift.conf", len, begin); f = fopen(cp, "r"); + if (f != NULL) { + /* Fall back to formerly used path. */ + snprintf(cp, sizeof(cp), + "%.*s/redshift.conf", len, begin); + f = fopen(cp, "r"); + } if (f != NULL) break; } -- cgit v1.2.3-70-g09d2