diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-03-11 18:19:47 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-03-11 18:20:35 +0100 |
| commit | bb155ac18597f0b91c7cc7c612286b70bd943815 (patch) | |
| tree | bf4efedcaea9f4b107ab53e87b4e0bd52e80da01 /src | |
| parent | Add src/redshift to .gitignore (diff) | |
| download | redshift-ng-bb155ac18597f0b91c7cc7c612286b70bd943815.tar.gz redshift-ng-bb155ac18597f0b91c7cc7c612286b70bd943815.tar.bz2 redshift-ng-bb155ac18597f0b91c7cc7c612286b70bd943815.tar.xz | |
When looking for a redshift.conf file do not just check environment variable, also check that the file exists
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/config-ini.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/src/config-ini.c b/src/config-ini.c index 3183ba1..8449a8d 100644 --- a/src/config-ini.c +++ b/src/config-ini.c @@ -22,9 +22,11 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> #ifndef _WIN32 # include <pwd.h> -# include <unistd.h> #endif #include "config-ini.h" @@ -48,28 +50,38 @@ open_config_file(const char *filepath) if (filepath == NULL) { char cp[MAX_CONFIG_PATH]; char *env; + struct stat attr; - if ((env = getenv("XDG_CONFIG_HOME")) != NULL && + if (filepath == NULL && (env = getenv("XDG_CONFIG_HOME")) != NULL && env[0] != '\0') { snprintf(cp, sizeof(cp), "%s/redshift.conf", env); - filepath = cp; + if (!stat(cp, &attr)) + filepath = cp; + } #ifdef _WIN32 - } else if ((env = getenv("localappdata")) != NULL && env[0] != '\0') { + if (filepath == NULL && (env = getenv("localappdata")) != NULL && + env[0] != '\0') { snprintf(cp, sizeof(cp), "%s\\redshift.conf", env); - filepath = cp; + if (!stat(cp, &attr)) + filepath = cp; + } #endif - } else if ((env = getenv("HOME")) != NULL && env[0] != '\0') { + if (filepath == NULL && (env = getenv("HOME")) != NULL && + env[0] != '\0') { snprintf(cp, sizeof(cp), "%s/.config/redshift.conf", env); - filepath = cp; + if (!stat(cp, &attr)) + filepath = cp; + } #ifndef _WIN32 - } else { + if (filepath == NULL) { struct passwd *pwd = getpwuid(getuid()); char *home = pwd->pw_dir; snprintf(cp, sizeof(cp), "%s/.config/redshift.conf", home); - filepath = cp; + if (!stat(cp, &attr)) + filepath = cp; #endif } |