X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4a78cbcd4fa986d9c1e7bd0a5a4bdb619faeb7cb..2194825961eefdab538204e3bb682825a5427e14:/uip/post.c

diff --git a/uip/post.c b/uip/post.c
index 2683622e..8cfcf651 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -238,8 +238,6 @@ static int snoop      = 0;
 static char *clientsw = NULL;
 static char *serversw = NULL;
 
-extern struct smtp sm_reply;
-
 static char prefix[] = "----- =_aaaaaaaaaa";
 
 static char *partno = NULL;
@@ -283,14 +281,7 @@ main (int argc, char **argv)
     FILE *in, *out;
     m_getfld_state_t gstate = 0;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* foil search of user profile/context */
-    if (context_foil (NULL) == -1)
-	done (1);
+    if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; }
 
     mts_init (invo_name);
     arguments = getarguments (invo_name, argc, argv, 0);
@@ -637,13 +628,13 @@ main (int argc, char **argv)
 	    post (tmpfil, 0, verbose, envelope);
 	}
 	post (bccfil, 1, verbose, envelope);
-	unlink (bccfil);
+	(void) m_unlink (bccfil);
     } else {
 	post (tmpfil, 0, isatty (1), envelope);
     }
 
     p_refile (tmpfil);
-    unlink (tmpfil);
+    (void) m_unlink (tmpfil);
 
     if (verbose) {
     	if (partno)
@@ -1712,9 +1703,9 @@ sigser (int i)
 {
     NMH_UNUSED (i);
 
-    unlink (tmpfil);
+    (void) m_unlink (tmpfil);
     if (msgflags & MINV)
-	unlink (bccfil);
+	(void) m_unlink (bccfil);
 
     if (!whomsw || checksw)
 	sm_end (NOTOK);
@@ -1836,9 +1827,9 @@ die (char *what, char *fmt, ...)
 {
     va_list ap;
 
-    unlink (tmpfil);
+    (void) m_unlink (tmpfil);
     if (msgflags & MINV)
-	unlink (bccfil);
+	(void) m_unlink (bccfil);
 
     if (!whomsw || checksw)
 	sm_end (NOTOK);