inc/test-eom-align: Fix MMDF-mbox `B' size calculation.

[nmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index b39cc80989c6044ad10094cf8122098e7eafbce5..b6f26eb9a2e9f08e5f0adb306bd2a2c5bd56ca5c 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -13,9 +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_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 #include "mhfree.h"
 #include "mhoutsbr.h"
 
@@ -82,12 +83,7 @@ int contentidsw = 1;
  * Temporary files
  */
 static char infile[BUFSIZ];
-static int unlink_infile  = 0;
-
 static char outfile[BUFSIZ];
-static int unlink_outfile = 0;
-
-static void unlink_done (int) NORETURN;
 
 
 int
@@ -108,8 +104,6 @@ main (int argc, char **argv)
 
     if (nmh_init(argv[0], 2)) { return 1; }
 
-    done=unlink_done;
-
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
@@ -117,8 +111,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;
@@ -282,8 +275,7 @@ main (int argc, char **argv)
        }
        if (compfile)
            adios (NULL, "only one composition file allowed");
-       else
-           compfile = cp;
+        compfile = cp;
     }
 
     /*
@@ -291,7 +283,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);
@@ -302,7 +294,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);
     }
 
@@ -330,10 +322,7 @@ main (int argc, char **argv)
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }
-
-       /* save a copy of the name for later removal */
        strncpy (infile, cp, sizeof(infile));
-       unlink_infile = 1;
 
        /* copy standard input to temporary file */
        while ((n = fread(buffer, 1, sizeof(buffer), stdin)) > 0) {
@@ -391,10 +380,9 @@ main (int argc, char **argv)
 
     /* output MIME message to this temporary file */
     if ((cp = m_mktemp2(compfile, invo_name, NULL, &fp_out)) == NULL) {
-       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+       adios(NULL, "unable to create temporary file");
     }
     strncpy(outfile, cp, sizeof(outfile));
-    unlink_outfile = 1;
 
     /* output the message */
     output_message_fp (ct, fp_out, outfile);
@@ -418,25 +406,12 @@ main (int argc, char **argv)
        rename (buffer, compfile);
        done (1);
     }
-    unlink_outfile = 0;
+    /* Remove from atexit(3) list of files to unlink. */
+    if (!(m_unlink(outfile) == -1 && errno == ENOENT)) {
+        adios(outfile, "file exists after rename:");
+    }
 
     free_content (ct);
     done (0);
     return 1;
 }
-
-
-static void NORETURN
-unlink_done (int status)
-{
-    /*
-     * Check if we need to remove stray
-     * temporary files.
-     */
-    if (unlink_infile)
-       (void) m_unlink (infile);
-    if (unlink_outfile)
-       (void) m_unlink (outfile);
-
-    exit (status);
-}