X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/dbdbd49d59ae5c14e66b1c148a63b8abc9d076ab..4f28cd1669089292f6e34f14617d4a8c1354647b:/uip/mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index ad41ad3f..65082a0b 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -8,10 +8,17 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/mts.h>
+#include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/smatch.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/mts.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 
 #define MHPARAM_SWITCHES \
     X("components", 0, COMPSW) \
@@ -38,7 +45,7 @@ static char *sbackup = BACKUP_PREFIX;
 
 static char *datalocking = "fcntl";
 static char *localmbox = "";
-static int localmbox_primed = 0;
+static bool localmbox_primed;
 
 extern char *spoollocking;
 
@@ -140,7 +147,8 @@ main(int argc, char **argv)
 {
     int i, compp = 0;
     bool missed;
-    int all = 0, debug = 0;
+    bool all = false;
+    bool debug = false;
     int components = -1;
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
@@ -176,18 +184,18 @@ main(int argc, char **argv)
 		    break;
 
 		case ALLSW:
-		    all = 1;
+		    all = true;
 		    break;
 
 		case DEBUGSW:
-		    debug = 1;
+		    debug = true;
 		    break;
 	    }
 	} else {
 	    comps[compp++] = cp;
 	    if (strcmp("localmbox", cp) == 0 && ! localmbox_primed) {
 		localmbox = getlocalmbox();
-		localmbox_primed = 1;
+		localmbox_primed = true;
 	    }
 	}
     }
@@ -221,7 +229,7 @@ main(int argc, char **argv)
 	/* Also set localmbox here */
 	if (! localmbox_primed) {
 	    localmbox = getlocalmbox();
-	    localmbox_primed = 1;
+	    localmbox_primed = true;
 	}
 
 	/*