Added tests of MMDF mailbox format to test-eom-align.

[nmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index efb9c5269608a1c1f734f3eb4112e99475e1fffa..bb45519828a013a8aa3307e5ce5e97c803f2779a 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -13,8 +13,10 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
+#include "h/done.h"
 #include <h/utils.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 #include "mhfree.h"
 #include "mhoutsbr.h"
 
@@ -107,7 +109,7 @@ main (int argc, char **argv)
 
     if (nmh_init(argv[0], 2)) { return 1; }
 
-    done=unlink_done;
+    set_done(unlink_done);
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -116,8 +118,7 @@ main (int argc, char **argv)
        if (cp[0] == '-' && cp[1] == '\0') {
            if (compfile)
                adios (NULL, "cannot specify both standard input and a file");
-           else
-               compfile = cp;
+            compfile = cp;
            listsw = 0;         /* turn off -list if using standard in/out */
            verbosw = 0;        /* turn off -verbose listings */
            break;
@@ -281,8 +282,7 @@ main (int argc, char **argv)
        }
        if (compfile)
            adios (NULL, "only one composition file allowed");
-       else
-           compfile = cp;
+        compfile = cp;
     }
 
     /*
@@ -290,7 +290,7 @@ main (int argc, char **argv)
      */
     if ((cp = getenv ("MHBUILD"))) {
        if ((fp = fopen (cp, "r"))) {
-           readconfig ((struct node **) 0, fp, cp, 0);
+           readconfig(NULL, fp, cp, 0);
            fclose (fp);
        } else {
            admonish ("", "unable to read $MHBUILD profile (%s)", cp);
@@ -301,7 +301,7 @@ main (int argc, char **argv)
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
-       readconfig ((struct node **) 0, fp, cp, 0);
+       readconfig(NULL, fp, cp, 0);
        fclose (fp);
     }