X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/012d05c2b62332eb400d66b806e48216d39358c6..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/mhoutsbr.c?ds=inline

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 456a2e27..89b4b932 100644
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -96,7 +96,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,9 +124,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);
@@ -164,7 +164,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);
 	    }
@@ -187,8 +187,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:
@@ -199,7 +205,7 @@ output_content (CT ct, FILE *out)
 	break;
     }
 
-    if (boundary && *boundary != '\0')
+    if (*boundary != '\0')
 	free(boundary);
 
     return result;