diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-03-12 21:06:14 +0100 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2014-03-13 01:42:04 +0100 |
| commit | 9a33837a3f67d1896243d071455a0c3f0fd41729 (patch) | |
| tree | 65dbcf9e03caef5d6296bf60fa1293a293da9e29 /src/config-ini.c | |
| parent | Look for configuration file in XDG_CONFIG_DIRS and /etc (diff) | |
| download | redshift-ng-9a33837a3f67d1896243d071455a0c3f0fd41729.tar.gz redshift-ng-9a33837a3f67d1896243d071455a0c3f0fd41729.tar.bz2 redshift-ng-9a33837a3f67d1896243d071455a0c3f0fd41729.tar.xz | |
fopen directly instead of stat:ing
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src/config-ini.c')
| -rw-r--r-- | src/config-ini.c | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/src/config-ini.c b/src/config-ini.c index bc8e00a..01519b5 100644 --- a/src/config-ini.c +++ b/src/config-ini.c @@ -48,42 +48,38 @@ open_config_file(const char *filepath) FILE *f = NULL; if (filepath == NULL) { + FILE *f = NULL; char cp[MAX_CONFIG_PATH]; char *env; - struct stat attr; - if (filepath == NULL && (env = getenv("XDG_CONFIG_HOME")) != NULL && + if (f == NULL && (env = getenv("XDG_CONFIG_HOME")) != NULL && env[0] != '\0') { snprintf(cp, sizeof(cp), "%s/redshift.conf", env); - if (!stat(cp, &attr)) - filepath = cp; + f = fopen(cp, "r"); } #ifdef _WIN32 - if (filepath == NULL && (env = getenv("localappdata")) != NULL && + if (f == NULL && (env = getenv("localappdata")) != NULL && env[0] != '\0') { snprintf(cp, sizeof(cp), "%s\\redshift.conf", env); - if (!stat(cp, &attr)) - filepath = cp; + f = fopen(cp, "r"); } #endif - if (filepath == NULL && (env = getenv("HOME")) != NULL && + if (f == NULL && (env = getenv("HOME")) != NULL && env[0] != '\0') { snprintf(cp, sizeof(cp), "%s/.config/redshift.conf", env); - if (!stat(cp, &attr)) - filepath = cp; + f = fopen(cp, "r"); } #ifndef _WIN32 - if (filepath == NULL) { + if (f == NULL) { struct passwd *pwd = getpwuid(getuid()); char *home = pwd->pw_dir; snprintf(cp, sizeof(cp), "%s/.config/redshift.conf", home); - if (!stat(cp, &attr)) - filepath = cp; + f = fopen(cp, "r"); } - if (filepath == NULL && (env = getenv("XDG_CONFIG_DIRS")) != NULL && + if (f == NULL && (env = getenv("XDG_CONFIG_DIRS")) != NULL && env[0] != '\0') { int conf_dirs_len = strlen(env); int conf_dir_ptr = 0; @@ -97,28 +93,21 @@ open_config_file(const char *filepath) if (conf_dir[0] != '\0') { snprintf(cp, sizeof(cp), "%s/redshift.conf", conf_dir); - if (!stat(cp, &attr)) { - filepath = cp; + if ((f = fopen(cp, "r")) != NULL) break; - } } } else conf_dir[conf_dir_ptr++] = c; } } - if (filepath == NULL) { + if (f == NULL) { snprintf(cp, sizeof(cp), "%s/redshift.conf", "/etc"); - if (!stat(cp, &attr)) - filepath = cp; + f = fopen(cp, "r"); } #endif - if (filepath != NULL) { - f = fopen(filepath, "r"); - if (f != NULL) return f; - else if (f == NULL && errno != ENOENT) return NULL; - } + return f; } else { f = fopen(filepath, "r"); if (f == NULL) { |