diff options
| author | Masanori Kakura <kakurasan@gmail.com> | 2018-05-04 22:58:54 +0900 |
|---|---|---|
| committer | Masanori Kakura <kakurasan@gmail.com> | 2018-05-04 22:58:54 +0900 |
| commit | 9ff0501e785e4e3fe2e8915eb9468d12cab98cf6 (patch) | |
| tree | 4f18e0ab6618cfa75effff740c534d9c31326385 /src | |
| parent | Merge pull request #600 from kakurasan/travis_python3_mac (diff) | |
| download | redshift-ng-9ff0501e785e4e3fe2e8915eb9468d12cab98cf6.tar.gz redshift-ng-9ff0501e785e4e3fe2e8915eb9468d12cab98cf6.tar.bz2 redshift-ng-9ff0501e785e4e3fe2e8915eb9468d12cab98cf6.tar.xz | |
config-ini: Properly respect XDG_CONFIG_HOME base directory specification
If redshift.conf is not found, fall back to formerly used path.
Diffstat (limited to 'src')
| -rw-r--r-- | src/config-ini.c | 34 |
1 files changed, 29 insertions, 5 deletions
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; } |