X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/dbdbd49d59ae5c14e66b1c148a63b8abc9d076ab..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index c94002df..fe21b15b 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -5,16 +5,23 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.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"
@@ -75,9 +82,9 @@ DEFINE_SWITCH_ARRAY(MIMEENCODING, encodingswitches);
 
 int debugsw = 0;
 
-int listsw   = 0;
-int rfc934sw = 0;
-int contentidsw = 1;
+bool listsw;
+bool rfc934sw;
+bool contentidsw = true;
 
 /*
  * Temporary files
@@ -89,8 +96,13 @@ static char outfile[BUFSIZ];
 int
 main (int argc, char **argv)
 {
-    int sizesw = 1, headsw = 1, directives = 1, autobuild = 0, dist = 0;
-    int verbosw = 0, dispo = 0;
+    bool sizesw = true;
+    bool headsw = true;
+    bool directives = true;
+    bool autobuild = false;
+    bool dist = false;
+    bool verbosw = false;
+    bool dispo = false;
     size_t maxunencoded = MAXTEXTPERLN;
     int *icachesw;
     char *cp, buf[BUFSIZ];
@@ -112,8 +124,8 @@ main (int argc, char **argv)
 	    if (compfile)
 		die("cannot specify both standard input and a file");
             compfile = cp;
-	    listsw = 0;		/* turn off -list if using standard in/out */
-	    verbosw = 0;	/* turn off -verbose listings */
+	    listsw = false;	/* turn off -list if using standard in/out */
+	    verbosw = false;	/* turn off -verbose listings */
 	    break;
 	}
 	if (*cp == '-') {
@@ -134,16 +146,16 @@ main (int argc, char **argv)
 
 	    case AUTOSW:
 	    	/* -auto implies -nodirectives */
-		autobuild = 1;
-		directives = 0;
+		autobuild = true;
+		directives = false;
 		continue;
 	    case NAUTOSW:
 	    	/*
 		 * We're turning directives back on since this is likely here
 		 * to override a profile entry
 		 */
-		autobuild = 0;
-		directives = 1;
+		autobuild = false;
+		directives = true;
 		continue;
 
 	    case RCACHESW:
@@ -173,45 +185,45 @@ main (int argc, char **argv)
 		continue;
 
 	    case HEADSW:
-		headsw++;
+		headsw = true;
 		continue;
 	    case NHEADSW:
-		headsw = 0;
+		headsw = false;
 		continue;
 
 	    case DIRECTIVES:
-		directives = 1;
+		directives = true;
 		continue;
 	    case NDIRECTIVES:
-		directives = 0;
+		directives = false;
 		continue;
 
 	    case LISTSW:
-		listsw++;
+		listsw = true;
 		continue;
 	    case NLISTSW:
-		listsw = 0;
+		listsw = false;
 		continue;
 
 	    case RFC934SW:
-		rfc934sw++;
+		rfc934sw = true;
 		continue;
 	    case NRFC934SW:
-		rfc934sw = 0;
+		rfc934sw = false;
 		continue;
 
 	    case SIZESW:
-		sizesw++;
+		sizesw = true;
 		continue;
 	    case NSIZESW:
-		sizesw = 0;
+		sizesw = false;
 		continue;
 
 	    case CONTENTIDSW:
-		contentidsw = 1;
+		contentidsw = true;
 		continue;
 	    case NCONTENTIDSW:
-		contentidsw = 0;
+		contentidsw = false;
 		continue;
 
 	    case HEADERENCSW: {
@@ -254,22 +266,22 @@ main (int argc, char **argv)
 		continue;
 
 	    case VERBSW: 
-		verbosw++;
+		verbosw = true;
 		continue;
 	    case NVERBSW: 
-		verbosw = 0;
+		verbosw = false;
 		continue;
 	    case DISPOSW:
-		dispo = 1;
+		dispo = true;
 		continue;
 	    case NDISPOSW:
-		dispo = 0;
+		dispo = false;
 		continue;
 	    case DEBUGSW:
 		debugsw = 1;
 		continue;
 	    case DISTSW:
-		dist = 1;
+		dist = true;
 		continue;
 	    }
 	}