Fix uip/whom.c for C89 compatibility

[mmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index b0876eb..a478b42 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -254,6 +254,9 @@ get_content(FILE *in, char *file, int toplevel)
                        state = FLD2;
                        /* FALL */
                case FLD2:
+                       if (compnum == 1) {
+                               ct->crlf = f.value[f.valuelen-2] == '\r';
+                       }
                        compnum++;
 
                        /* add the header data to the list */
@@ -1025,7 +1028,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;
        }
 
@@ -1072,8 +1075,14 @@ InitMultiPart(CT ct)
        *++dp = '\0';
 
        /* record boundary separators */
-       m->mp_start = concat(bp, "\n", NULL);
-       m->mp_stop = concat(bp, "--\n", NULL);
+       if (!ct->crlf) {
+               m->mp_start = concat(bp, "\n", NULL);
+               m->mp_stop = concat(bp, "--\n", NULL);
+       } else {
+               m->mp_start = concat(bp, "\r\n", NULL);
+               m->mp_stop = concat(bp, "--\r\n", NULL);
+       }
+
 
        if (!ct->c_fp && (ct->c_fp = fopen(ct->c_file, "r")) == NULL) {
                advise(ct->c_file, "unable to open for reading");
@@ -1243,9 +1252,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 */