X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8bf4e8784aa2a0438ba09b1a0eb9207d3baf6bd9..7711f3fc00259e55f630cfe6104eff3083dc9d77:/uip/whom.c

diff --git a/uip/whom.c b/uip/whom.c
index 862fc58c..2a36025a 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
-#include <signal.h>
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
@@ -57,20 +56,14 @@ DEFINE_SWITCH_ARRAY(WHOM, switches);
 int
 main (int argc, char **argv)
 {
-    pid_t child_id;
+    pid_t child_id = OK;
     int i, status, isdf = 0;
     int distsw = 0, vecp = 0;
     char *cp, *dfolder = NULL, *dmsg = NULL;
     char *msg = NULL, **ap, **argp, backup[BUFSIZ];
     char buf[BUFSIZ], **arguments, *vec[MAXARGS];
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -164,9 +157,6 @@ main (int argc, char **argv)
     }
 
     if (msg == NULL) {
-#ifdef	WHATNOW
-	if (dfolder || (cp = getenv ("mhdraft")) == NULL || *cp == '\0')
-#endif	/* WHATNOW */
 	    cp  = getcpy (m_draft (dfolder, dmsg, 1, &isdf));
 	msg = vec[vecp++] = cp;
     }
@@ -206,7 +196,7 @@ main (int argc, char **argv)
 
 	    status = pidwait(child_id, OK);
 
-	    unlink (msg);
+	    (void) m_unlink (msg);
 	    if (rename (backup, msg) == NOTOK)
 		adios (msg, "unable to rename %s to", backup);
 	    done (status);