X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1ca8f21e0edfe448b71ac86de1b0cd987547a002..d9c88cd101a63778a85dfd55a01a3af0db2465c9:/uip/scan.c

diff --git a/uip/scan.c b/uip/scan.c
index ba238d9c..b682ddd9 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -5,13 +5,34 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/fmt_scan.h>
-#include <h/scansbr.h>
-#include <h/tws.h>
-#include <h/mts.h>
+#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"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/seq_getnum.h"
+#include "sbr/error.h"
+#include "h/fmt_scan.h"
+#include "h/tws.h"
+#include "h/mts.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "sbr/m_maildir.h"
 #include "sbr/terminal.h"
 
@@ -41,8 +62,11 @@ DEFINE_SWITCH_ARRAY(SCAN, switches);
 int
 main (int argc, char **argv)
 {
-    int clearflag = 0, hdrflag = 0, ontty;
-    int width = -1, revflag = 0;
+    bool clearflag = false;
+    bool hdrflag = false;
+    int ontty;
+    int width = -1;
+    bool revflag = false;
     int i, state, msgnum;
     ivector_t seqnum = ivector_create (0);
     bool unseen;
@@ -82,10 +106,10 @@ main (int argc, char **argv)
 		    done (0);
 
 		case CLRSW: 
-		    clearflag++;
+		    clearflag = true;
 		    continue;
 		case NCLRSW: 
-		    clearflag = 0;
+		    clearflag = false;
 		    continue;
 
 		case FORMSW: 
@@ -100,10 +124,10 @@ main (int argc, char **argv)
 		    continue;
 
 		case HEADSW: 
-		    hdrflag++;
+		    hdrflag = true;
 		    continue;
 		case NHEADSW: 
-		    hdrflag = 0;
+		    hdrflag = false;
 		    continue;
 
 		case WIDTHSW: 
@@ -112,10 +136,10 @@ main (int argc, char **argv)
 		    width = atoi (cp);
 		    continue;
 		case REVSW:
-		    revflag++;
+		    revflag = true;
 		    continue;
 		case NREVSW:
-		    revflag = 0;
+		    revflag = false;
 		    continue;
 
 		case FILESW:
@@ -272,7 +296,7 @@ main (int argc, char **argv)
 	    }
 	    charstring_free (scanl);
 	    scan_finished ();
-	    hdrflag = 0;
+	    hdrflag = false;
 	    fclose (in);
 	    if (ontty)
 		fflush (stdout);