From 56207523113ee8e4479947cc2f90b9b88840a41f Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 21 Apr 2014 04:36:35 +0200 Subject: Support (but warn) that the user does not have an passwd entry or a home set in the passwd entry. Also, getpwent can fail: handle that. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/config-ini.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/config-ini.c b/src/config-ini.c index 65751dd..51eeeca 100644 --- a/src/config-ini.c +++ b/src/config-ini.c @@ -85,10 +85,22 @@ open_config_file(const char *filepath) if (f == NULL) { struct passwd *pwd = getpwuid(getuid()); - char *home = pwd->pw_dir; - snprintf(cp, sizeof(cp), - "%s/.config/redshift.conf", home); - f = fopen(cp, "r"); + if (pwd != NULL) { + char *home = pwd->pw_dir; + if ((home != NULL) && (*home != '\0')) { + snprintf(cp, sizeof(cp), + "%s/.config/redshift.conf", home); + f = fopen(cp, "r"); + } else { + fprintf(stderr, _("It appear as if you are homeless.")); + } + } else if (errno) { + perror("getpwuid"); + } else { + fprintf(stderr, _("It appear as if you do not exist.")); + /* errno can either be set to any number of error codes, + or be zero if the user does not have a passwd entry. */ + } } if (f == NULL && (env = getenv("XDG_CONFIG_DIRS")) != NULL && -- cgit v1.2.3-70-g09d2