X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/dbdbd49d59ae5c14e66b1c148a63b8abc9d076ab..04ee0c3f6ad7e4177cc43a0c57f046013a4fbac9:/uip/scan.c

diff --git a/uip/scan.c b/uip/scan.c
index 7fd636a7..30b8f9e8 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -5,13 +5,18 @@
  * 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/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/scansbr.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,11 +46,15 @@ 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);
-    int unseen, num_unseen_seq = 0;
+    bool unseen;
+    int num_unseen_seq = 0;
     char *cp, *maildir, *file = NULL, *folder = NULL;
     char *form = NULL, *format = NULL, buf[BUFSIZ];
     char **argp, *nfs, **arguments;
@@ -81,10 +90,10 @@ main (int argc, char **argv)
 		    done (0);
 
 		case CLRSW: 
-		    clearflag++;
+		    clearflag = true;
 		    continue;
 		case NCLRSW: 
-		    clearflag = 0;
+		    clearflag = false;
 		    continue;
 
 		case FORMSW: 
@@ -99,10 +108,10 @@ main (int argc, char **argv)
 		    continue;
 
 		case HEADSW: 
-		    hdrflag++;
+		    hdrflag = true;
 		    continue;
 		case NHEADSW: 
-		    hdrflag = 0;
+		    hdrflag = false;
 		    continue;
 
 		case WIDTHSW: 
@@ -111,10 +120,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:
@@ -246,10 +255,10 @@ main (int argc, char **argv)
 	     * Check if message is in any sequence given
 	     * by Unseen-Sequence profile entry.
 	     */
-	    unseen = 0;
+	    unseen = false;
 	    for (i = 0; i < num_unseen_seq; i++) {
 		if (in_sequence(mp, ivector_at (seqnum, i), msgnum)) {
-		    unseen = 1;
+		    unseen = true;
 		    break;
 		}
 	    }
@@ -271,7 +280,7 @@ main (int argc, char **argv)
 	    }
 	    charstring_free (scanl);
 	    scan_finished ();
-	    hdrflag = 0;
+	    hdrflag = false;
 	    fclose (in);
 	    if (ontty)
 		fflush (stdout);