X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..6db45651:/uip/burst.c?ds=sidebyside

diff --git a/uip/burst.c b/uip/burst.c
index 1b48c554..f188bf1f 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -8,6 +8,9 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/mhparse.h>
+#include "../sbr/m_maildir.h"
+#include "../sbr/m_mktemp.h"
+#include "mhfree.h"
 
 #define BURST_SWITCHES \
     X("inplace", 0, INPLSW) \
@@ -130,8 +133,7 @@ main (int argc, char **argv)
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
-	    else
-		folder = pluspath (cp);
+            folder = pluspath (cp);
 	} else {
 	    app_msgarg(&msgs, cp);
 	}
@@ -172,7 +174,7 @@ main (int argc, char **argv)
 	    if ((numburst = find_delim (msgnum, smsgs, &mimesw)) >= 1) {
 		if (verbosw)
 		    printf ("%d message%s exploded from digest %d\n",
-			    numburst, numburst > 1 ? "s" : "", msgnum);
+			    numburst, PLURALS(numburst), msgnum);
 		burst (&mp, msgnum, smsgs, numburst, inplace, verbosw,
 		       maildir, mimesw);
 	    } else {
@@ -246,9 +248,9 @@ find_delim (int msgnum, struct smsg *smsgs, int *mimesw)
 	    msgp = 1;
 	    find_mime_parts(content, smsgs, &msgp);
 	    free_content(content);
-	    if (msgp == 1 && *mimesw == 2) {
+	    if (msgp == 1 && *mimesw == 2)
 	    	adios (msgnam, "does not have any message/rfc822 parts");
-	    } else if (msgp > 1) {
+	    if (msgp > 1) {
 	    	*mimesw = 1;
 		return (msgp - 1);
 	    }
@@ -290,8 +292,7 @@ find_delim (int msgnum, struct smsg *smsgs, int *mimesw)
 	for (c = 0; fgets (buffer, sizeof(buffer), in); c = buffer[0]) {
 	    if ((wasdlm = CHECKDELIM(buffer)))
 		break;
-	    else
-		pos += (long) strlen (buffer);
+            pos += (long) strlen (buffer);
 	}
 
 	/*
@@ -351,8 +352,6 @@ find_mime_parts (CT content, struct smsg *smsgs, int *msgp)
 	for (part = m->mp_parts; part; part = part->mp_next)
 	    find_mime_parts(part->mp_part, smsgs, msgp);
     }
-
-    return;
 }