From 10e23dda641022f4fa4a8fe529cacb9913b08e52 Mon Sep 17 00:00:00 2001 From: Jon Lund Steffensen Date: Mon, 18 Oct 2010 00:55:16 +0200 Subject: config-ini.c: Fix loading explicitly requested config file. --- src/config-ini.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/config-ini.c') diff --git a/src/config-ini.c b/src/config-ini.c index 01ba99c..5231ba5 100644 --- a/src/config-ini.c +++ b/src/config-ini.c @@ -39,6 +39,8 @@ static FILE * open_config_file(const char *filepath) { + FILE *f = NULL; + if (filepath == NULL) { char cp[MAX_CONFIG_PATH]; char *env; @@ -54,21 +56,21 @@ open_config_file(const char *filepath) } if (filepath != NULL) { - FILE *f = fopen(filepath, "r"); + f = fopen(filepath, "r"); if (f != NULL) return f; else if (f == NULL && errno != ENOENT) return NULL; } /* TODO look in getenv("XDG_CONFIG_DIRS") */ } else { - FILE *f = fopen(filepath, "r"); + f = fopen(filepath, "r"); if (f == NULL) { perror("fopen"); return NULL; } } - return NULL; + return f; } int -- cgit v1.2.3-70-g09d2