X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5781cc9dca08c6d780b128a03448ca0fe64831c6..39ecf70bb:/uip/burst.c?ds=sidebyside

diff --git a/uip/burst.c b/uip/burst.c
index b86c722e..de762e99 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -1,6 +1,4 @@
-
-/*
- * burst.c -- explode digests into individual messages
+/* burst.c -- explode digests into individual messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -10,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) \
@@ -174,13 +175,13 @@ 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 {
 		if (numburst == 0) {
 		    if (!quietsw)
-			admonish (NULL, "message %d not in digest format",
+			inform("message %d not in digest format, continuing...",
 				  msgnum);
 		}  /* this pair of braces was missing before 1999-07-15 */
 		else
@@ -189,7 +190,7 @@ main (int argc, char **argv)
 	}
     }
 
-    free ((char *) smsgs);
+    free(smsgs);
     context_replace (pfolder, folder);	/* update current folder */
 
     /*
@@ -353,8 +354,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;
 }
 
 
@@ -521,6 +520,7 @@ cpybrst (FILE *in, FILE *out, char *ifile, char *ofile, int len, int mime)
 
 		    default: 
 			state = S2;
+			/* FALLTHRU */
 		    case '\n': 
 			fputc (c, out);
 			break;
@@ -531,6 +531,7 @@ cpybrst (FILE *in, FILE *out, char *ifile, char *ofile, int len, int mime)
 		switch (c) {
 		    case '\n': 
 			state = S1;
+			/* FALLTHRU */
 		    default: 
 			fputc (c, out);
 			break;