X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a59c5565745b21ab13ba016612b9bbbc95ffc8ed..4f28cd1669089292f6e34f14617d4a8c1354647b:/uip/scan.c

diff --git a/uip/scan.c b/uip/scan.c
index 77341eb9..b999378b 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,21 @@
  */
 
 #include "h/mh.h"
+#include "sbr/fmt_new.h"
+#include "sbr/dtime.h"
+#include "scansbr.h"
+#include "sbr/m_name.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/folder_free.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
@@ -14,7 +29,6 @@
 #include "sbr/seq_getnum.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"
-#include "h/scansbr.h"
 #include "h/tws.h"
 #include "h/mts.h"
 #include "h/done.h"
@@ -62,6 +76,7 @@ main (int argc, char **argv)
     char **argp, *nfs, **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
+    charstring_t scanl = NULL;
     FILE *in;
 
     if (nmh_init(argv[0], true, true)) { return 1; }
@@ -176,14 +191,14 @@ main (int argc, char **argv)
 
 	scan_detect_mbox_style (in);
 	for (msgnum = 1; ; ++msgnum) {
-	    charstring_t scanl = NULL;
-
 	    state = scan (in, msgnum, -1, nfs, width, 0, 0,
 			  hdrflag ? file : NULL, 0L, 1, &scanl);
-	    charstring_free (scanl);
+	    if (scanl)
+		charstring_clear(scanl);
 	    if (state != SCNMSG && state != SCNENC)
 		break;
 	}
+	charstring_free (scanl);
 	scan_finished ();
 	fclose (in);
 	done (0);
@@ -242,7 +257,6 @@ main (int argc, char **argv)
 	 (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel);
 	 msgnum += (revflag ? -1 : 1)) {
 	if (is_selected(mp, msgnum)) {
-	    charstring_t scanl = NULL;
 
 	    if ((in = fopen (cp = m_name (msgnum), "r")) == NULL) {
 		    admonish (cp, "unable to open message");
@@ -280,7 +294,8 @@ main (int argc, char **argv)
 		    inform("message %d: empty", msgnum);
 		    break;
 	    }
-	    charstring_free (scanl);
+	    if (scanl)
+		charstring_clear(scanl);
 	    scan_finished ();
 	    hdrflag = false;
 	    fclose (in);
@@ -288,6 +303,7 @@ main (int argc, char **argv)
 		fflush (stdout);
 	}
     }
+    charstring_free (scanl);
 
     ivector_free (seqnum);
     folder_free (mp);	/* free folder/message structure */