X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/38c0aa73edd0e2951218a7f7f64658eb7a0eebaa..3c54bbb247ffc8fa094d754099c0b009e79d484d:/uip/mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 2306e378..1ef84211 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -5,16 +5,26 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/smatch.h"
+#include "sbr/m_backup.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/md5.h>
-#include <h/mts.h>
-#include <h/tws.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/mhcachesbr.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 "sbr/m_maildir.h"
 #include "sbr/m_mktemp.h"
 #include "mhfree.h"
@@ -89,11 +99,12 @@ static char outfile[BUFSIZ];
 int
 main (int argc, char **argv)
 {
-    int sizesw = 1, headsw = 1;
+    bool sizesw = true;
+    bool headsw = true;
     bool directives = true;
     bool autobuild = false;
     bool dist = false;
-    int verbosw = 0;
+    bool verbosw = false;
     bool dispo = false;
     size_t maxunencoded = MAXTEXTPERLN;
     int *icachesw;
@@ -117,7 +128,7 @@ main (int argc, char **argv)
 		die("cannot specify both standard input and a file");
             compfile = cp;
 	    listsw = false;	/* turn off -list if using standard in/out */
-	    verbosw = 0;	/* turn off -verbose listings */
+	    verbosw = false;	/* turn off -verbose listings */
 	    break;
 	}
 	if (*cp == '-') {
@@ -177,10 +188,10 @@ main (int argc, char **argv)
 		continue;
 
 	    case HEADSW:
-		headsw++;
+		headsw = true;
 		continue;
 	    case NHEADSW:
-		headsw = 0;
+		headsw = false;
 		continue;
 
 	    case DIRECTIVES:
@@ -205,10 +216,10 @@ main (int argc, char **argv)
 		continue;
 
 	    case SIZESW:
-		sizesw++;
+		sizesw = true;
 		continue;
 	    case NSIZESW:
-		sizesw = 0;
+		sizesw = false;
 		continue;
 
 	    case CONTENTIDSW:
@@ -258,10 +269,10 @@ main (int argc, char **argv)
 		continue;
 
 	    case VERBSW: 
-		verbosw++;
+		verbosw = true;
 		continue;
 	    case NVERBSW: 
-		verbosw = 0;
+		verbosw = false;
 		continue;
 	    case DISPOSW:
 		dispo = true;