X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/dbdbd49d59ae5c14e66b1c148a63b8abc9d076ab..e99caef6d3e09d481849d3bdc51871f4c7bb574a:/uip/mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index e09be9de..9cbdc69a 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -5,17 +5,36 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.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/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/readconfig.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
 #include <fcntl.h>
-#include <h/signals.h>
-#include <h/md5.h>
-#include <h/mts.h>
-#include <h/tws.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/mhcachesbr.h>
+#include "h/signals.h"
+#include "h/md5.h"
+#include "h/mts.h"
+#include "h/tws.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/mhcachesbr.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "mhmisc.h"
 #include "sbr/m_maildir.h"
 #include "mhfree.h"
@@ -63,8 +82,10 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
+    int msgnum, *icachesw;
+    bool autosw = false;
     /* verbosw defaults to 1 for backward compatibility. */
-    int msgnum, *icachesw, autosw = 0, verbosw = 1;
+    bool verbosw = true;
     const char *clobbersw = "always";
     char *cp, *file = NULL, *outfile = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;
@@ -106,10 +127,10 @@ main (int argc, char **argv)
 		done (0);
 
 	    case AUTOSW:
-		autosw++;
+		autosw = true;
 		continue;
 	    case NAUTOSW:
-		autosw = 0;
+		autosw = false;
 		continue;
 
 	    case RCACHESW:
@@ -185,10 +206,10 @@ do_cache:
 		continue;
 
 	    case VERBSW:
-		verbosw = 1;
+		verbosw = true;
 		continue;
 	    case NVERBSW:
-		verbosw = 0;
+		verbosw = false;
 		continue;
             case CLOBBERSW:
 		if (!(cp = *argp++) || *cp == '-')
@@ -313,7 +334,7 @@ do_cache:
     if (!*cts)
 	done (1);
 
-    userrs = 1;
+    userrs = true;
     SIGNAL (SIGQUIT, quitser);
     SIGNAL (SIGPIPE, pipeser);