Reworked output handling.

[nmh] / uip / mhoutsbr.c

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index c99744565730ba290226c1504c0dbcbfd5f9cfbf..6d65ab6fd81abaf91feb576ee952a72b2b92db97 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -10,6 +10,7 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
+#include <h/utils.h>
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
@@ -96,7 +97,7 @@ output_content (CT ct, FILE *out)
      * headers (since it has no body).
      */
     if (ct->c_ctexbody) {
-       if (boundary && *boundary != '\0')
+       if (*boundary != '\0')
            free(boundary);
        return OK;
     }
@@ -124,7 +125,7 @@ output_content (CT ct, FILE *out)
 
            fprintf (out, "\n--%s\n", boundary);
            if (output_content (p, out) == NOTOK) {
-               if (boundary && *boundary != '\0')
+               if (*boundary != '\0')
                    free(boundary);
                 return NOTOK;
            }
@@ -205,7 +206,7 @@ output_content (CT ct, FILE *out)
        break;
     }
 
-    if (boundary && *boundary != '\0')
+    if (*boundary != '\0')
        free(boundary);
 
     return result;
@@ -365,7 +366,7 @@ writeQuoted (CT ct, FILE *out)
         * doesn't falsely match an mbox delimiter.
         */
        cp = bufp;
-       if (gotlen >= 5 && strncmp (cp, "From ", 5) == 0) {
+       if (gotlen >= 5 && HasPrefix(cp, "From ")) {
            fprintf (out, "=%02X", 'F');
            cp++;
            n += 3;