X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/397deef44d1f8d92b781e7d9af6f0f256eccbe73..b7b980a9e051e6999799eda5a81c5a6d8061e0eb:/uip/whom.c

diff --git a/uip/whom.c b/uip/whom.c
index eca3946d..b1e8b1ed 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -33,8 +33,8 @@
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("client host", -6, CLIESW) \
-    X("server host", -6, SERVSW) \
-    X("snoop", -5, SNOOPSW) \
+    X("server host", 0, SERVSW) \
+    X("snoop", 0, SNOOPSW) \
     X("sasl", SASLminc(4), SASLSW) \
     X("saslmech mechanism", SASLminc(-5), SASLMECHSW) \
     X("user username", SASLminc(-4), USERSW) \
@@ -63,13 +63,7 @@ main (int argc, char **argv)
     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;
@@ -202,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);