Remove unused NCWD and NPWD #defines.

[nmh] / uip / mhoutsbr.c

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 0c0a29759aae3061d79015500eba96bcc937782d..6d65ab6fd81abaf91feb576ee952a72b2b92db97 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -10,7 +10,7 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <h/signals.h>
+#include <h/utils.h>
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
@@ -97,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;
     }
@@ -125,9 +125,9 @@ 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;
+                return NOTOK;
            }
        }
        fprintf (out, "\n--%s--\n", boundary);
@@ -165,7 +165,7 @@ output_content (CT ct, FILE *out)
               body, don't emit the newline that would appear between
               the headers and body.  In that case, the call to
               write8Bit() shouldn't be needed, but is harmless. */
-           if (ct->c_ctinfo.ci_first_pm != NULL  ||
+           if (ct->c_ctinfo.ci_first_pm != NULL  ||  ct->c_begin == 0  ||
                ct->c_begin != ct->c_end) {
                putc ('\n', out);
            }
@@ -188,8 +188,14 @@ output_content (CT ct, FILE *out)
            break;
 
        case CE_BINARY:
-           advise (NULL, "can't handle binary transfer encoding in content");
-           result = NOTOK;
+           if (ct->c_type == CT_TEXT) {
+               /* So that mhfixmsg can decode to binary text. */
+               putc ('\n', out);
+               result = write8Bit (ct, out);
+           } else {
+               advise (NULL, "can't handle binary transfer encoding in content");
+               result = NOTOK;
+           }
            break;
 
        default:
@@ -200,7 +206,7 @@ output_content (CT ct, FILE *out)
        break;
     }
 
-    if (boundary && *boundary != '\0')
+    if (*boundary != '\0')
        free(boundary);
 
     return result;
@@ -360,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;
@@ -427,7 +433,10 @@ writeBase64ct (CT ct, FILE *out)
     if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
        return NOTOK;
 
-    result = writeBase64aux (ce->ce_fp, out, (ct->c_type == CT_TEXT));
+    result = writeBase64aux (ce->ce_fp, out,
+                             ct->c_type == CT_TEXT  &&  ct->c_ctparams
+                             ?  ((struct text *) ct->c_ctparams)->lf_line_endings == 0
+                             :  0);
     (*ct->c_ceclosefnx) (ct);
     return result;
 }