From bb155ac18597f0b91c7cc7c612286b70bd943815 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Tue, 11 Mar 2014 18:19:47 +0100
Subject: When looking for a redshift.conf file do not just check environment
 variable, also check that the file exists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 src/config-ini.c | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'src/config-ini.c')

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
 		}
 
-- 
cgit v1.2.3-70-g09d2