JMR-dev/redshift-rebooted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config-ini: Properly respect XDG_CONFIG_HOME base directory specification

Browse Source 
If redshift.conf is not found, fall back to formerly used path.
This commit is contained in:
Masanori Kakura
2018-05-04 22:58:54 +09:00
parent 36e7877b0f
commit 9ff0501e78
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config-ini.c
+27 -3
View File
@@ -63,8 +63,15 @@ open_config_file(const char *filepath)
if (f == NULL && (env = getenv("XDG_CONFIG_HOME")) != NULL && if (f == NULL && (env = getenv("XDG_CONFIG_HOME")) != NULL &&
env[0] != '\0') { env[0] != '\0') {
snprintf(cp, sizeof(cp), "%s/redshift.conf", env); snprintf(cp, sizeof(cp),
"%s/redshift/redshift.conf", env);
f = fopen(cp, "r"); 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 #ifdef _WIN32
@@ -77,19 +84,31 @@ open_config_file(const char *filepath)
#endif #endif
if (f == NULL && (env = getenv("HOME")) != NULL && if (f == NULL && (env = getenv("HOME")) != NULL &&
env[0] != '\0') { env[0] != '\0') {
snprintf(cp, sizeof(cp),
"%s/.config/redshift/redshift.conf", env);
f = fopen(cp, "r");
if (f == NULL) {
/* Fall back to formerly used path. */
snprintf(cp, sizeof(cp), snprintf(cp, sizeof(cp),
"%s/.config/redshift.conf", env); "%s/.config/redshift.conf", env);
f = fopen(cp, "r"); f = fopen(cp, "r");
} }
}
#ifndef _WIN32 #ifndef _WIN32
if (f == NULL) { if (f == NULL) {
struct passwd *pwd = getpwuid(getuid()); struct passwd *pwd = getpwuid(getuid());
char *home = pwd->pw_dir; char *home = pwd->pw_dir;
snprintf(cp, sizeof(cp),
"%s/.config/redshift/redshift.conf", home);
f = fopen(cp, "r");
if (f == NULL) {
/* Fall back to formerly used path. */
snprintf(cp, sizeof(cp), snprintf(cp, sizeof(cp),
"%s/.config/redshift.conf", home); "%s/.config/redshift.conf", home);
f = fopen(cp, "r"); f = fopen(cp, "r");
} }
}
if (f == NULL && (env = getenv("XDG_CONFIG_DIRS")) != NULL && if (f == NULL && (env = getenv("XDG_CONFIG_DIRS")) != NULL &&
env[0] != '\0') { env[0] != '\0') {
@@ -101,9 +120,14 @@ open_config_file(const char *filepath)
int len = end - begin; int len = end - begin;
if (len > 0) { if (len > 0) {
snprintf(cp, sizeof(cp), snprintf(cp, sizeof(cp),
"%.*s/redshift.conf", len, begin); "%.*s/redshift/redshift.conf", len, begin);
f = fopen(cp, "r"); 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; if (f != NULL) break;
} }