Accept binary encoding for messages/*

[mmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index c250675..8e8b360 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -251,7 +251,6 @@ get_content(FILE *in, char *file, int toplevel)
        for (compnum = 1, state = FLD2;;) {
                switch (state = m_getfld2(state, &f, in)) {
                case LENERR2:
-                       advise(NULL, "To long field");
                        state = FLD2;
                        /* FALL */
                case FLD2:
@@ -551,13 +550,19 @@ incl_name_value(unsigned char *buf, char *name, char *value) {
 ** one, return the entire value.  Note that, for example, a name_suffix
 ** of name will match filename="foo", and return foo.
 */
-static char *
+char *
 extract_name_value(char *name_suffix, char *value) {
-       char *extracted_name_value = value;
-       char *name_suffix_plus_quote = concat(name_suffix, "=\"", NULL);
-       char *name_suffix_equals = strstr(value, name_suffix_plus_quote);
+       char *extracted_name_value;
+       char *name_suffix_plus_quote;
+       char *name_suffix_equals;
        char *cp;
 
+       if (!value) {
+               return value;
+       }
+       extracted_name_value = value;
+       name_suffix_plus_quote = concat(name_suffix, "=\"", NULL);
+       name_suffix_equals = strstr(value, name_suffix_plus_quote);
        mh_free0(&name_suffix_plus_quote);
        if (name_suffix_equals) {
                char *name_suffix_begin;
@@ -1020,7 +1025,7 @@ InitMultiPart(CT ct)
        */
        if (ct->c_encoding != CE_7BIT && ct->c_encoding != CE_8BIT
                && ct->c_encoding != CE_BINARY) {
-               admonish(NULL, "\"%s/%s\" type in message %s must be encoded in 7bit, 8bit, or binary", ci->ci_type, ci->ci_subtype, ct->c_file);
+               admonish(NULL, "\"%s/%s\" type in message %s should be encoded in 7bit, 8bit, or binary", ci->ci_type, ci->ci_subtype, ct->c_file);
                ct->c_encoding = CE_7BIT;
        }
 
@@ -1238,9 +1243,9 @@ InitMessage(CT ct)
        struct k2v *kv;
        CI ci = &ct->c_ctinfo;
 
-       if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT)) {
-               admonish(NULL, "\"%s/%s\" type in message %s should be encoded in 7bit or 8bit", ci->ci_type, ci->ci_subtype, ct->c_file);
-               return NOTOK;
+       if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT) && (ct->c_encoding != CE_BINARY)) {
+               admonish(NULL, "\"%s/%s\" type in message %s should be encoded in 7bit, 8bit, or binary", ci->ci_type, ci->ci_subtype, ct->c_file);
+               ct->c_encoding = CE_7BIT;
        }
 
        /* check for missing subtype */