inc/test-eom-align: Create test mboxes in less steps.

[nmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 4af6e590bd1337d608e3d938af00be515ad8336c..ba96ac44811bc27d4cd8b5e5d0d68ad3a0b4eca5 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -21,6 +21,7 @@
 #include <h/fmt_scan.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include "h/done.h"
 #include <h/utils.h>
 #include "h/mhcachesbr.h"
 #include "mhmisc.h"
@@ -445,7 +446,7 @@ finish_field:
         CT *ctp;
         convert_list *next;
 
-        done = freects_done;
+        set_done(freects_done);
 
         /* In case there are multiple calls that land here, prevent leak. */
         for (ctp = cts; ctp && *ctp; ++ctp) { free_content (*ctp); }
@@ -1334,7 +1335,7 @@ raw:
                execvp ("/bin/sh", vec);
                fprintf (stderr, "unable to exec ");
                perror ("/bin/sh");
-               _exit (-1);
+               _exit(1);
                /* NOTREACHED */
 
            default:
@@ -1620,7 +1621,7 @@ scan_content (CT ct, size_t maxunencoded)
         }
     }
 
-    return (boundaryclash ? NOTOK : OK);
+    return boundaryclash ? NOTOK : OK;
 }
 
 
@@ -1744,7 +1745,7 @@ build_headers (CT ct, int header_encoding)
        np = output_params(len, ct->c_dispo_first, NULL, 0);
        vp = add(np, vp);
        vp = add("\n", vp);
-        mh_xfree(np);
+        free(np);
        add_header (ct, mh_xstrdup(DISPO_FIELD), vp);
     }
 
@@ -2017,7 +2018,7 @@ setup_attach_content(CT ct, char *filename)
 
     for (pm = ct->c_ctinfo.ci_first_pm; pm; pm = pm->pm_next) {
        if (strcasecmp(pm->pm_name, "name") == 0) {
-            mh_xfree(pm->pm_value);
+            free(pm->pm_value);
            pm->pm_value = mh_xstrdup(simplename);
            break;
        }