fdcompare.c: Move interface to own file.

[nmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index e8047be68abd2f1a11d9856ee16941fbd8457c7f..072787e780de5885df266f1e2c2eefcebf46682a 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -8,10 +8,15 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/mts.h>
+#include "h/mh.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 +43,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,12 +145,13 @@ 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];
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -157,7 +163,7 @@ main(int argc, char **argv)
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 
-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [profile-components] [switches]",
@@ -176,18 +182,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 +227,7 @@ main(int argc, char **argv)
        /* Also set localmbox here */
        if (! localmbox_primed) {
            localmbox = getlocalmbox();
-           localmbox_primed = 1;
+           localmbox_primed = true;
        }
 
        /*