X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/702ad1773b7b0064920e0fc723eec4a744f87e7c..bf58e45a34dcf8300098abff38c4e7393152f365:/uip/msh.c

diff --git a/uip/msh.c b/uip/msh.c
index e5f82bfa..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);
@@ -604,7 +597,7 @@ fsetup (char *folder)
 	padios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */
-    if (!(mp = folder_read (folder)))
+    if (!(mp = folder_read (folder, 0)))
 	padios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */
@@ -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) {
@@ -831,7 +823,7 @@ check_folder (int scansw)
 	low = mp->hghmsg + 1;
 	folder_free (mp);		/* free folder/message structure */
 
-	if (!(mp = folder_read (fmsh)))
+	if (!(mp = folder_read (fmsh, 0)))
 	    padios (NULL, "unable to re-read folder %s", fmsh);
 
 	hgh = mp->hghmsg;
@@ -983,7 +975,7 @@ readid (int msgnum)
 	switch (state = m_getfld (&gstate, name, buf, &bufsz, zp)) {
 	    case FLD: 
 	    case FLDPLUS: 
-		if (!mh_strcasecmp (name, BBoard_ID)) {
+		if (!strcasecmp (name, BBoard_ID)) {
 		    bp = getcpy (buf);
 		    while (state == FLDPLUS) {
 			bufsz = sizeof buf;
@@ -1097,7 +1089,7 @@ quit (void)
     if (vmh) 
 	ttyNaux (NULLCMD, "FAST");
     cp = NULL;
-    if ((dp = lkfopen (mp->foldpath, "r")) == NULL) {
+    if ((dp = lkfopendata (mp->foldpath, "r")) == NULL) {
 	advise (mp->foldpath, "unable to lock");
 	if (vmh) {
 	    ttyR (NULLCMD);
@@ -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,15 +1145,15 @@ 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);
 	}
     }
 
 release: ;
     if (cp)
 	free (cp);
-    lkfclose (dp, mp->foldpath);
+    lkfclosedata (dp, mp->foldpath);
     if (vmh) {
 	ttyR (NULLCMD);
 	pFIN ();
@@ -1274,8 +1266,7 @@ static int
 parse (char *buffer, struct Cmd *cmdp)
 {
     int argp = 0;
-    unsigned char c, *cp;
-    char *pp;
+    char c, *cp, *pp;
 
     cmdp->line[0] = 0;
     pp = cmdp->args[argp++] = cmdp->line;
@@ -1284,7 +1275,7 @@ parse (char *buffer, struct Cmd *cmdp)
     cmdp->stream = NULL;
 
     for (cp = buffer; (c = *cp); cp++) {
-	if (!isspace (c))
+	if (!isspace ((unsigned char) c))
 	    break;
     }
     if (c == '\0') {
@@ -1294,8 +1285,8 @@ parse (char *buffer, struct Cmd *cmdp)
     }
 
     while ((c = *cp++)) {
-	if (isspace (c)) {
-	    while (isspace (c))
+	if (isspace ((unsigned char) c)) {
+	    while (isspace ((unsigned char) c))
 		c = *cp++;
 	    if (c == 0)
 		break;
@@ -1350,7 +1341,7 @@ parse (char *buffer, struct Cmd *cmdp)
 		}
 		cmdp->redirect = pp + 1;/* sigh */
 		for (; (c = *cp); cp++)
-		    if (!isspace (c))
+		    if (!isspace ((unsigned char) c))
 			break;
 		if (c == 0) {
 		    padvise (NULL, cmdp->direction != PIPIO
@@ -1361,7 +1352,7 @@ parse (char *buffer, struct Cmd *cmdp)
 		strcpy (cmdp->redirect, cp);
 		if (cmdp->direction != PIPIO) {
 		    for (; *cp; cp++)
-			if (isspace (*cp)) {
+			if (isspace ((unsigned char) *cp)) {
 			    padvise (NULL, "bad name for redirect");
 			    return NOTOK;
 			}
@@ -1593,7 +1584,7 @@ static int
 pINI (void)
 {
     int i, vrsn;
-    unsigned char *bp;
+    char *bp;
     struct record rcs, *rc;
 
     rc = &rcs;
@@ -1602,7 +1593,7 @@ pINI (void)
     switch (peer2rc (rc)) {
 	case RC_INI: 
 	    bp = rc->rc_data;
-	    while (isspace (*bp))
+	    while (isspace ((unsigned char) *bp))
 		bp++;
 	    if (sscanf (bp, "%d", &vrsn) != 1) {
 	bad_init: ;
@@ -1614,9 +1605,9 @@ pINI (void)
 		done (1);
 	    }
 
-	    while (*bp && !isspace (*bp))
+	    while (*bp && !isspace ((unsigned char) *bp))
 		bp++;
-	    while (isspace (*bp))
+	    while (isspace ((unsigned char) *bp))
 		bp++;
 	    if (sscanf (bp, "%d", &numwins) != 1 || numwins <= 0)
 		goto bad_init;
@@ -1624,9 +1615,9 @@ pINI (void)
 		numwins = NWIN;
 
 	    for (i = 1; i <= numwins; i++) {
-		while (*bp && !isspace (*bp))
+		while (*bp && !isspace ((unsigned char) *bp))
 		    bp++;
-		while (isspace (*bp))
+		while (isspace ((unsigned char) *bp))
 		    bp++;
 		if (sscanf (bp, "%d", &windows[i]) != 1 || windows[i] <= 0)
 		    goto bad_init;