X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/41c25df5a669fa999155c6d29435856ffa5bcd36..b46d49ba:/uip/whom.c?ds=sidebyside

diff --git a/uip/whom.c b/uip/whom.c
index f0eee7ef..76f434e4 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "h/done.h"
 #include <h/utils.h>
 #include <h/signals.h>
 #include "sbr/m_maildir.h"
@@ -59,7 +60,8 @@ main (int argc, char **argv)
 {
     pid_t child_id = OK;
     int status, isdf = 0;
-    int distsw = 0, vecp = 0;
+    int vecp = 0;
+    bool distsw;
     char *cp, *dfolder = NULL, *dmsg = NULL;
     char *msg = NULL, **ap, **argp, backup[BUFSIZ];
     char buf[BUFSIZ], **arguments, *vec[MAXARGS];
@@ -166,11 +168,10 @@ main (int argc, char **argv)
 	    cp  = getcpy (m_draft (dfolder, dmsg, 1, &isdf));
 	msg = vec[vecp++] = cp;
     }
-    if ((cp = getenv ("mhdist"))
-	    && *cp
-	    && (distsw = atoi (cp))
-	    && (cp = getenv ("mhaltmsg"))
-	    && *cp) {
+
+    distsw = (cp = getenv("mhdist")) && *cp && atoi(cp) &&
+        (cp = getenv("mhaltmsg")) && *cp;
+    if (distsw) {
 	if (distout (msg, cp, backup) == NOTOK)
 	    done (1);
 	vec[vecp++] = "-dist";
@@ -202,5 +203,5 @@ main (int argc, char **argv)
     execvp (postproc, vec);
     fprintf (stderr, "unable to exec ");
     perror (postproc);
-    _exit (-1);
+    _exit(1);
 }