X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/da35ab7c7664b221aba2d761d0f051c57313e16e..be6c3984:/uip/msh.c?ds=inline

diff --git a/uip/msh.c b/uip/msh.c
index cdec7664..e91924c3 100644
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -26,7 +26,6 @@
 
 #include <pwd.h>
 #include <setjmp.h>
-#include <signal.h>
 #include <h/msh.h>
 #include <h/vmhsbr.h>
 
@@ -204,13 +203,7 @@ main (int argc, char **argv)
     char *cp, *file = NULL, *folder = NULL;
     char **argp, **arguments, buf[BUFSIZ];
 
-#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; }
 
     mts_init (invo_name);
     arguments = getarguments (invo_name, argc,argv, 1);
@@ -682,8 +675,7 @@ setup (char *file)
     }
     m_init ();
 
-    mp->msgattrs[0] = getcpy ("unseen");
-    mp->msgattrs[1] = NULL;
+    svector_push_back (mp->msgattrs, getcpy ("unseen"));
 
     scan_detect_mbox_style (fp);		/* the MAGIC invocation */
     if (fmsh) {
@@ -1122,7 +1114,7 @@ quit (void)
 		close (i);
 	    else
 		advise (mp->foldpath, "error zero'ing");
-	    unlink (map_name (mp->foldpath));/* XXX */
+	    (void) m_unlink (map_name (mp->foldpath));/* XXX */
 	}
 	goto release;
     }
@@ -1139,8 +1131,8 @@ quit (void)
     for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg; msgnum++)
 	if (does_exist(mp, msgnum) && pack (tmpfil, md, msgnum) == NOTOK) {
 	    mbx_close (tmpfil, md);
-	    unlink (tmpfil);
-	    unlink (map_name (tmpfil));
+	    (void) m_unlink (tmpfil);
+	    (void) m_unlink (map_name (tmpfil));
 	    goto release;
 	}
     mbx_close (tmpfil, md);
@@ -1153,8 +1145,8 @@ quit (void)
 
 	if (rename (map1, map2) == NOTOK) {
 	    admonish (map2, "unable to rename %s to", map1);
-	    unlink (map1);
-	    unlink (map2);
+	    (void) m_unlink (map1);
+	    (void) m_unlink (map2);
 	}
     }