X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/dbdbd49d59ae5c14e66b1c148a63b8abc9d076ab..f28cfc5260eb87df0f6f106c837b3e2de640a9bf:/uip/sortm.c?ds=sidebyside

diff --git a/uip/sortm.c b/uip/sortm.c
index 9807a02b..347ea17c 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -5,10 +5,32 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/tws.h>
+#include "h/mh.h"
+#include "sbr/dtime.h"
+#include "sbr/m_name.h"
+#include "sbr/m_getfld.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/uprf.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/ext_hook.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/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/tws.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "sbr/m_maildir.h"
 
 #define SORTM_SWITCHES \
@@ -46,8 +68,8 @@ int nmsgs;
 
 char *subjsort;                 /* sort on subject if != 0 */
 time_t datelimit = 0;
-int submajor = 0;		/* if true, sort on subject-major */
-int verbose;
+bool submajor;  		/* if true, sort on subject-major */
+bool verbose;
 int allmsgs = 1;
 int check_failed = 0;
 
@@ -76,7 +98,7 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
     struct smsg **dlist;
-    int checksw = 0;
+    bool checksw = false;
 
     if (nmh_init(argv[0], true, true)) { return 1; }
 
@@ -131,7 +153,7 @@ main (int argc, char **argv)
 		while (*cp == '0')
 		    cp++;		/* skip any leading zeros */
 		if (!*cp) {		/* hit end of string */
-		    submajor++;		/* sort subject-major */
+		    submajor = true;	/* sort subject-major */
 		    continue;
 		}
 		if (!isdigit((unsigned char) *cp) || !(datelimit = atoi(cp)))
@@ -139,15 +161,15 @@ main (int argc, char **argv)
 		datelimit *= 60*60*24;
 		continue;
 	    case NLIMSW:
-		submajor = 0;	/* use date-major, but */
-		datelimit = 0;	/* use no limit */
+		submajor = false;	/* use date-major, but */
+		datelimit = 0;	        /* use no limit */
 		continue;
 
 	    case VERBSW:
-		verbose++;
+		verbose = true;
 		continue;
 	    case NVERBSW:
-		verbose = 0;
+		verbose = false;
 		continue;
 
 	    case ALLMSGS:
@@ -158,10 +180,10 @@ main (int argc, char **argv)
 		continue;
 
 	    case CHECKSW:
-		checksw = 1;
+		checksw = true;
 		continue;
 	    case NCHECKSW:
-		checksw = 0;
+		checksw = false;
 		continue;
 	    }
 	}