X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ebf35185aa9256b0cd09234f39bd14db9e90e81c..965ab049343bc05dd4b6c881b84c517ddda7dfa6:/uip/mhfixmsg.c diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c index c839b246..8c5268ef 100644 --- a/uip/mhfixmsg.c +++ b/uip/mhfixmsg.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #ifdef HAVE_ICONV # include @@ -611,7 +610,7 @@ get_multipart_boundary (CT ct, char **part_boundary) { } } } else { - status = NOTOK; + status = NOTOK; } if (status == OK) { @@ -1453,6 +1452,8 @@ decode_text_parts (CT ct, int encoding, int *message_mods) { if (decode_part (ct) == OK && ct->c_cefile.ce_file) { if ((ct_encoding = content_encoding (ct)) == CE_BINARY && encoding != CE_BINARY) { + /* The decoding isn't acceptable so discard it. + Leave status as OK to allow other transformations. */ if (verbosw) { report (ct->c_partno, ct->c_file, "will not decode%s because it is binary", @@ -1463,9 +1464,10 @@ decode_text_parts (CT ct, int encoding, int *message_mods) { unlink (ct->c_cefile.ce_file); free (ct->c_cefile.ce_file); ct->c_cefile.ce_file = NULL; - status = NOTOK; - } else if (ct->c_encoding == CE_QUOTED && + } else if (ct->c_encoding == CE_QUOTED && ct_encoding == CE_8BIT && encoding == CE_7BIT) { + /* The decoding isn't acceptable so discard it. + Leave status as OK to allow other transformations. */ if (verbosw) { report (ct->c_partno, ct->c_file, "will not decode%s because it is 8bit", @@ -1476,7 +1478,6 @@ decode_text_parts (CT ct, int encoding, int *message_mods) { unlink (ct->c_cefile.ce_file); free (ct->c_cefile.ce_file); ct->c_cefile.ce_file = NULL; - status = NOTOK; } else { int enc; if (ct_encoding == CE_BINARY)