X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6fc2909634fb431c65ecfa8b6db4f6519f99b389..9a87f2bf9289ef232ec8c267fd7be76120c87ca2:/uip/whom.c

diff --git a/uip/whom.c b/uip/whom.c
index 688950c9..c1ef6592 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -1,6 +1,4 @@
-
-/*
- * whom.c -- report to whom a message would be sent
+/* whom.c -- report to whom a message would be sent
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -8,7 +6,10 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <h/signals.h>
+#include "../sbr/m_maildir.h"
+#include "../sbr/m_mktemp.h"
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
@@ -142,15 +143,14 @@ main (int argc, char **argv)
 	}
 	if (msg)
 	    adios (NULL, "only one draft at a time!");
-	else
-	    vec[vecp++] = msg = cp;
+        vec[vecp++] = msg = cp;
     }
 
     /* allow Aliasfile: profile entry */
     if ((cp = context_find ("Aliasfile"))) {
 	char *dp = NULL;
 
-	for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; ap++) {
+	for (ap = brkstring(dp = mh_xstrdup(cp), " ", "\n"); ap && *ap; ap++) {
 	    vec[vecp++] = "-alias";
 	    vec[vecp++] = *ap;
 	}
@@ -181,7 +181,8 @@ main (int argc, char **argv)
 
     switch (distsw ? child_id : OK) {
 	case NOTOK:
-    	    advise (NULL, "unable to fork, so checking directly...");
+	    inform("unable to fork, so checking directly...");
+	    /* FALLTHRU */
 	case OK:
 	    execvp (postproc, vec);
 	    fprintf (stderr, "unable to exec ");