X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/64e8827c5d5def0325ab7181fe939623c77e807c..92128dac:/uip/inc.c?ds=sidebyside

diff --git a/uip/inc.c b/uip/inc.c
index 3aa5e50f..c2213f13 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -197,11 +197,7 @@ main (int argc, char **argv)
     SAVEGROUPPRIVS();
     TRYDROPGROUPPRIVS();
 
-    setlocale(LC_ALL, "");
-    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);
@@ -591,6 +587,8 @@ go_to_it:
 	}
 
 	for (i = 1; i <= nmsgs; i++) {
+	    charstring_t scanl = NULL;
+
 	    msgnum++;
 	    if (packfile) {
 		fseek (pf, 0L, SEEK_CUR);
@@ -623,7 +621,7 @@ go_to_it:
 	    }
 	    switch (incerr = scan (pf, msgnum, 0, nfs, width,
 			      packfile ? 0 : msgnum == mp->hghmsg + 1 && chgflag,
-			      1, NULL, stop - start, noisy)) {
+			      1, NULL, stop - start, noisy, &scanl)) {
 	    case SCNEOF: 
 		printf ("%*d  empty\n", DMAXFOLDER, msgnum);
 		break;
@@ -642,11 +640,13 @@ go_to_it:
 	    case SCNENC:
 	    default: 
 		if (aud)
-		    fputs (scanl, aud);
+		    fputs (charstring_buffer (scanl), aud);
 		if (noisy)
 		    fflush (stdout);
 		break;
 	    }
+	    charstring_free (scanl);
+
 	    if (packfile) {
 		fseek (pf, stop, SEEK_SET);
 		fwrite (mmdlm2, 1, strlen (mmdlm2), pf);
@@ -660,7 +660,7 @@ go_to_it:
 	    } else {
 		if (ferror(pf) || fclose (pf)) {
 		    int e = errno;
-		    unlink (cp);
+		    (void) m_unlink (cp);
 		    pop_quit ();
 		    errno = e;
 		    adios (cp, "write error on");
@@ -670,6 +670,8 @@ go_to_it:
 
 	    if (trnflag && pop_dele (i) == NOTOK)
 		adios (NULL, "%s", response);
+
+	    scan_finished();
 	}
 
 	if (pop_quit () == NOTOK)
@@ -687,9 +689,12 @@ go_to_it:
 	scan_detect_mbox_style (in);		/* the MAGIC invocation... */
 	hghnum = msgnum = mp->hghmsg;
 	for (;;) {
+	    charstring_t scanl = NULL;
+
 	    /* create scanline for new message */
 	    switch (incerr = scan (in, msgnum + 1, msgnum + 1, nfs, width,
-			      msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) {
+			      msgnum == hghnum && chgflag, 1, NULL, 0L, noisy,
+			      &scanl)) {
 	    case SCNFAT:
 	    case SCNEOF: 
 		break;
@@ -718,13 +723,15 @@ go_to_it:
 		(void)ext_hook("add-hook", b, (char *)0);
 
 		if (aud)
-		    fputs (scanl, aud);
+		    fputs (charstring_buffer (scanl), aud);
 		if (noisy)
 		    fflush (stdout);
 
 		msgnum++;
 		continue;
 	    }
+	    charstring_free (scanl);
+
 	    /* If we get here there was some sort of error from scan(),
 	     * so stop processing anything more from the spool.
 	     */
@@ -737,6 +744,8 @@ go_to_it:
 
 	hghnum = msgnum = mp->hghmsg;
 	for (i = 0; i < num_maildir_entries; i++) {
+	    charstring_t scanl = NULL;
+
 	    msgnum++;
 
 	    sp = Maildir[i].filename;
@@ -755,7 +764,7 @@ go_to_it:
 			break;
 		if (ferror(sf) || fflush(pf) || ferror(pf)) {
 			int e = errno;
-			fclose(pf); fclose(sf); unlink(cp);
+			fclose(pf); fclose(sf); (void) m_unlink(cp);
 			errno = e;
 			adios(cp, "copy error %s -> %s", sp, cp);
 		}
@@ -769,7 +778,7 @@ go_to_it:
 	    fseek (pf, 0L, SEEK_SET);
 	    switch (incerr = scan (pf, msgnum, 0, nfs, width,
 			      msgnum == mp->hghmsg + 1 && chgflag,
-			      1, NULL, stop - start, noisy)) {
+			      1, NULL, stop - start, noisy, &scanl)) {
 	    case SCNEOF: 
 		printf ("%*d  empty\n", DMAXFOLDER, msgnum);
 		break;
@@ -795,23 +804,27 @@ go_to_it:
 		(void)ext_hook("add-hook", b, (char *)0);
 
 		if (aud)
-		    fputs (scanl, aud);
+		    fputs (charstring_buffer (scanl), aud);
 		if (noisy)
 		    fflush (stdout);
 		break;
 	    }
+	    charstring_free (scanl);
+
 	    if (ferror(pf) || fclose (pf)) {
 		int e = errno;
-		unlink (cp);
+		(void) m_unlink (cp);
 		errno = e;
 		adios (cp, "write error on");
 	    }
 	    pf = NULL;
 	    free (cp);
 
-	    if (trnflag && unlink (sp) == NOTOK)
+	    if (trnflag && m_unlink (sp) == NOTOK)
 		adios (sp, "couldn't unlink");
 	    free (sp); /* Free Maildir[i]->filename */
+
+	    scan_finished();
 	}
 	free (Maildir); /* From now on Maildir is just a flag - don't dref! */
     }
@@ -851,7 +864,7 @@ go_to_it:
 		    close (newfd);
 		else
 		    admonish (newmail, "error zero'ing");
-		unlink(map_name(newmail));
+		(void) m_unlink(map_name(newmail));
 	    }
 	} else {
 	    if (noisy)