X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc2047.c;h=a2629a9e52f8c102f3d79b2f47c2870a6b1db253;hp=71bf5c7d708f2919955884d3ae70437db6c76da2;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=2293e9bc5a94ef33dc596b064c607d6bed5ad1fd diff --git a/lib-mime/rfc2047.c b/lib-mime/rfc2047.c index 71bf5c7..a2629a9 100644 --- a/lib-mime/rfc2047.c +++ b/lib-mime/rfc2047.c @@ -27,22 +27,13 @@ * please see the file GPL in the top level source directory. */ -#include -#include -#include +#include #include #include "charset.h" #include "thread.h" -#include -#include -#include -#include -#include -#include - /* If you are debugging this file, comment out the following line. */ /*#define NDEBUG*/ @@ -78,9 +69,9 @@ convert_string(const char *from, const char *f, ssize_t flen, obl = 4 * flen + 1; ob = buf = p_new(char, obl); - n = my_iconv(cd, &f, &flen, &ob, &obl); + n = mutt_iconv(cd, &f, &flen, &ob, &obl); - if (n < 0 || my_iconv(cd, 0, 0, &ob, &obl) < 0) { + if (n < 0 || mutt_iconv(cd, 0, 0, &ob, &obl) < 0) { int e = errno; iconv_close(cd); errno = e; @@ -109,7 +100,7 @@ char *mutt_choose_charset(const char *fromcode, const char *charsets, const char *p = charsets; while (*p) { - char cset[SHORT_STRING]; + char cset[STRING]; const char *q; char *s; ssize_t slen, n; @@ -275,14 +266,14 @@ static size_t try_block(const char *d, ssize_t dlen, ob = buf1; - if (my_iconv(cd, &ib, &ibl, &ob, &obl) < 0 - || my_iconv(cd, 0, 0, &ob, &obl) < 0) + if (mutt_iconv(cd, &ib, &ibl, &ob, &obl) < 0 + || mutt_iconv(cd, 0, 0, &ob, &obl) < 0) { assert (errno == E2BIG && ib > d); iconv_close(cd); return (ib - d == dlen) ? dlen : ib - d + 1; } - iconv_close (cd); + iconv_close(cd); } else { if (dlen > obl) return obl + 1; @@ -340,10 +331,10 @@ encode_block(char *s, char *d, ssize_t dlen, cd = mutt_iconv_open(tocode, fromcode, 0); assert (cd != MUTT_ICONV_ERROR); ib = d, ibl = dlen, ob = buf1, obl = sizeof(buf1) - m_strlen(tocode); - n1 = my_iconv(cd, &ib, &ibl, &ob, &obl); - n2 = my_iconv(cd, 0, 0, &ob, &obl); + n1 = mutt_iconv(cd, &ib, &ibl, &ob, &obl); + n2 = mutt_iconv(cd, 0, 0, &ob, &obl); assert (n1 >= 0 && n2 >= 0); - iconv_close (cd); + iconv_close(cd); return (*encoder)(s, buf1, ob - buf1, tocode); } else { return (*encoder)(s, d, dlen, tocode); @@ -564,19 +555,19 @@ static int rfc2047_encode(const char *d, ssize_t dlen, int col, } -void _rfc2047_encode_string(char **pd, int encode_specials, int col) +static void _rfc2047_encode_string(char **pd, int encode_specials, int col) { char *e; ssize_t elen; const char *charsets; - if (!Charset || !*pd) + if (!mod_cset.charset || !*pd) return; - charsets = m_strisempty(SendCharset) ? "UTF-8" : SendCharset; + charsets = m_strisempty(mod_cset.send_charset) ? "utf-8" : mod_cset.send_charset; rfc2047_encode(*pd, m_strlen(*pd), col, - Charset, charsets, &e, &elen, + mod_cset.charset, charsets, &e, &elen, encode_specials ? RFC822Specials : NULL); p_delete(pd); @@ -604,89 +595,80 @@ void rfc2047_encode_adrlist(address_t *addr, const char *tag) /* Decoding functions */ /****************************************************************************/ -/* decode one word into d[len] */ -static int rfc2047_decode_word(char *d, size_t len, const char *s) +/* decode one word into d[len] =?cst?[QB]?....?= */ +static int +rfc2047_decode_word(char *d, size_t len, const char *p, const char *end) { - const char *p, *eotoken; - char *charset = NULL; - int enc = 0, count = 0; - char *d0; + char charset[STRING] = ""; + const char *t; + char *q, *d0 = NULL; + int enc = 0; - /* =?[QB]?cset?.?= */ - for (p = s; (eotoken = strchr(p, '?')); p = eotoken + 1) { - switch (++count) { - const char *t; - char *q; + p += 2; /* =? */ - case 2: - /* ignore language specification a la RFC 2231 */ - t = memchr(p, '*', eotoken - p) ?: eotoken; - charset = p_dupstr(p, t - p); - break; + t = strchr(p, '?'); + if (!t) + return -1; + m_strncpy(charset, sizeof(charset), p, t - p); - case 3: - switch (*p) { - case 'q': case 'Q': - enc = ENCQUOTEDPRINTABLE; - break; + switch (t[1]) { + case 'q': case 'Q': + enc = ENCQUOTEDPRINTABLE; + break; - case 'b': case 'B': - enc = ENCBASE64; - break; + case 'b': case 'B': + enc = ENCBASE64; + break; + + default: + return -1; + } + + if (t[2] != '?') + return -1; + + p = t + 3; /* skip ?[QB]? */ + d0 = q = p_new(char, end - p + 1); /* it's enough space to decode */ - default: - p_delete(&charset); - return -1; + if (enc == ENCQUOTEDPRINTABLE) { + while (p < end - 2) { + if (*p == '=' && hexval(p[1]) >= 0 && hexval(p[2]) >= 0) { + *q++ = (hexval (p[1]) << 4) | hexval (p[2]); + p += 3; + } else + if (*p == '_') { + *q++ = ' '; + p++; + } else { + *q++ = *p++; } - break; + } + } else { /* enc == ENCBASE64 */ + int c, b = 0, k = 0; - case 4: - d0 = q = p_new(char, m_strlen(s) + 1); - - if (enc == ENCQUOTEDPRINTABLE) { - while (p < eotoken) { - if (*p == '=' && hexval(p[1]) >= 0 && hexval(p[2]) >= 0) { - *q++ = (hexval (p[1]) << 4) | hexval (p[2]); - p += 3; - } else - if (*p == '_') { - *q++ = ' '; - p++; - } else { - *q++ = *p++; - } - } - *q = 0; - } else { /* enc == ENCBASE64 */ - int c, b = 0, k = 0; - - while (p < eotoken) { - if (*p == '=') - break; - - c = base64val(*p++); - if (c < 0) - continue; - - if (k + 6 >= 8) { - k -= 2; - *q++ = b | (c >> k); - b = c << (8 - k); - } else { - b |= c << (k + 2); - k += 6; - } - } - *q = 0; + while (p < end - 2) { + if (*p == '=') + break; + + c = base64val(*p++); + if (c < 0) + continue; + + if (k + 6 >= 8) { + k -= 2; + *q++ = b | (c >> k); + b = c << (8 - k); + } else { + b |= c << (k + 2); + k += 6; } - break; } } + *q = '\0'; - if (charset) - mutt_convert_string(&d0, charset, Charset, M_ICONV_HOOK_FROM); + if (*charset) + mutt_convert_string(&d0, charset, mod_cset.charset, M_ICONV_HOOK_FROM); m_strcpy(d, len, d0); - p_delete(&charset); p_delete(&d0); return 0; } @@ -711,7 +693,7 @@ static const char *find_encoded_word(const char *s, const char **x) continue; s += 3; - while (0x20 <= *s && *s < 0x7f && *s != '?') { + while (0x20 <= *s && *s < 0x7f && (*s != '?' || s[1] != '=')) { s++; } @@ -777,8 +759,6 @@ static ssize_t lwsrlen(const char *s, ssize_t n) */ void rfc2047_decode(char **pd) { - const int strict_mime = option(OPTSTRICTMIME); - const char *s = *pd; char *d0, *d; ssize_t dlen; @@ -797,29 +777,28 @@ void rfc2047_decode(char **pd) if (!p) { /* no encoded words */ - if (!strict_mime) { - ssize_t m, n; - - n = m_strlen(s); - if (found_encoded && (m = lwslen(s, n)) != 0) { - if (m != n) - *d++ = ' ', dlen--; - n -= m, s += m; - } + ssize_t m, n; - if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII) { - char *t; - - t = p_dupstr(s, n); - if (mutt_convert_nonmime_string(&t) == 0) { - d += m_strcpy(d, dlen, t); - } else { - d += m_strcpy(d, dlen, s); - } - p_delete(&t); - break; + n = m_strlen(s); + if (found_encoded && (m = lwslen(s, n)) != 0) { + if (m != n) + *d++ = ' ', dlen--; + n -= m, s += m; + } + + if (mime_which_token(mod_cset.assumed_charset, -1) == MIME_US_ASCII) { + char *t; + + t = p_dupstr(s, n); + if (mutt_convert_nonmime_string(&t) == 0) { + d += m_strcpy(d, dlen, t); + } else { + d += m_strcpy(d, dlen, s); } + p_delete(&t); + break; } + d += m_strcpy(d, dlen, s); break; } @@ -830,29 +809,22 @@ void rfc2047_decode(char **pd) n = (p - s); /* ignore spaces between encoded words * and linear white spaces between encoded word and *text */ - if (!strict_mime) { - if (found_encoded && (m = lwslen(s, n)) != 0) { - if (m != n) - *d++ = ' ', dlen--; - n -= m, s += m; - } + if (found_encoded && (m = lwslen(s, n)) != 0) { + if (m != n) + *d++ = ' ', dlen--; + n -= m, s += m; + } - if ((m = n - lwsrlen(s, n)) != 0) { - m = m_strncpy(d, dlen, s, m); - d += m; - dlen -= m; - if (m != n) - *d++ = ' ', dlen--; - } - } else - if (!found_encoded || (ssize_t)strspn(s, " \t\r\n") != n) { - n = m_strncpy(d, dlen, s, n); - d += n; - dlen -= n; + if ((m = n - lwsrlen(s, n)) != 0) { + m = m_strncpy(d, dlen, s, m); + d += m; + dlen -= m; + if (m != n) + *d++ = ' ', dlen--; } } - rfc2047_decode_word(d, dlen, p); + rfc2047_decode_word(d, dlen, p, q); found_encoded = 1; s = q; while (*d && dlen)