X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmsgchk.c;h=1a59a3bd7d02c9f13a6c43d69441cf7ad456eb8b;hp=69999f6d62f4e7d7d30e63e811afb56061ed3064;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=99e5043db7ee6cf80f93708610a6e584a8068c6a

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 69999f6..1a59a3b 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -307,13 +307,12 @@ main (int argc, char **argv)
     if (vecp == 0) {
 	char *home;
 
-	home = (uid = geteuid()) ? home = getenv ("HOME") : NULL;
-	if (home == NULL) {
+        /* Not sure this check makes sense... */
+	if (!geteuid() || NULL == (home = getenv("HOME"))) {
 	    pw = getpwnam (user);
 	    if (pw == NULL)
 		adios (NULL, "unable to get information about user");
-	    if (home == NULL)
-		home = pw->pw_dir;
+	    home = pw->pw_dir;
 	}
 	status = checkmail (user, home, datesw, notifysw, 1);
     } else {
@@ -328,7 +327,8 @@ main (int argc, char **argv)
     }		/* host == NULL */
 #endif
 
-    return done (status);
+    done (status);
+    return 1;
 }