X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc2047.c;h=dd62416b5ea9d0ecc64073db88ecbe2c756a0f37;hp=ae4a52b9623811fdb2e21c6352a003ecca7c4949;hb=871a94fc21c9d349bb0fe8851e0f2e3a07527ed5;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a diff --git a/rfc2047.c b/rfc2047.c index ae4a52b..dd62416 100644 --- a/rfc2047.c +++ b/rfc2047.c @@ -13,16 +13,16 @@ #endif #include +#include +#include + +#include #include "mutt.h" -#include "ascii.h" -#include "mime.h" #include "charset.h" #include "rfc2047.h" #include "thread.h" -#include "lib/mem.h" -#include "lib/str.h" #include #include @@ -40,14 +40,12 @@ #endif #define ENCWORD_LEN_MAX 75 -#define ENCWORD_LEN_MIN 9 /* str_len ("=?.?.?.?=") */ +#define ENCWORD_LEN_MIN 9 /* m_strlen("=?.?.?.?=") */ #define HSPACE(x) ((x) == '\0' || (x) == ' ' || (x) == '\t') #define CONTINUATION_BYTE(c) (((c) & 0xc0) == 0x80) -extern char RFC822Specials[]; - typedef size_t (*encoder_t) (char *, const char *, size_t, const char *); @@ -77,7 +75,7 @@ static size_t convert_string (const char *f, size_t flen, *tlen = ob - buf; - mem_realloc (&buf, ob - buf + 1); + p_realloc(&buf, ob - buf + 1); *t = buf; iconv_close (cd); @@ -98,7 +96,7 @@ char *mutt_choose_charset (const char *fromcode, const char *charsets, q = strchr (p, ':'); - n = q ? q - p : str_len (p); + n = q ? q - p : m_strlen(p); if (!n || /* Assume that we never need more than 12 characters of @@ -149,30 +147,30 @@ static size_t b_encoder (char *s, const char *d, size_t dlen, char *s0 = s; memcpy (s, "=?", 2), s += 2; - memcpy (s, tocode, str_len (tocode)), s += str_len (tocode); + memcpy (s, tocode, m_strlen(tocode)), s += m_strlen(tocode); memcpy (s, "?B?", 3), s += 3; for (;;) { if (!dlen) break; else if (dlen == 1) { - *s++ = B64Chars[(*d >> 2) & 0x3f]; - *s++ = B64Chars[(*d & 0x03) << 4]; + *s++ = __m_b64chars[(*d >> 2) & 0x3f]; + *s++ = __m_b64chars[(*d & 0x03) << 4]; *s++ = '='; *s++ = '='; break; } else if (dlen == 2) { - *s++ = B64Chars[(*d >> 2) & 0x3f]; - *s++ = B64Chars[((*d & 0x03) << 4) | ((d[1] >> 4) & 0x0f)]; - *s++ = B64Chars[(d[1] & 0x0f) << 2]; + *s++ = __m_b64chars[(*d >> 2) & 0x3f]; + *s++ = __m_b64chars[((*d & 0x03) << 4) | ((d[1] >> 4) & 0x0f)]; + *s++ = __m_b64chars[(d[1] & 0x0f) << 2]; *s++ = '='; break; } else { - *s++ = B64Chars[(*d >> 2) & 0x3f]; - *s++ = B64Chars[((*d & 0x03) << 4) | ((d[1] >> 4) & 0x0f)]; - *s++ = B64Chars[((d[1] & 0x0f) << 2) | ((d[2] >> 6) & 0x03)]; - *s++ = B64Chars[d[2] & 0x3f]; + *s++ = __m_b64chars[(*d >> 2) & 0x3f]; + *s++ = __m_b64chars[((*d & 0x03) << 4) | ((d[1] >> 4) & 0x0f)]; + *s++ = __m_b64chars[((d[1] & 0x0f) << 2) | ((d[2] >> 6) & 0x03)]; + *s++ = __m_b64chars[d[2] & 0x3f]; d += 3, dlen -= 3; } } @@ -187,7 +185,7 @@ static size_t q_encoder (char *s, const char *d, size_t dlen, char *s0 = s; memcpy (s, "=?", 2), s += 2; - memcpy (s, tocode, str_len (tocode)), s += str_len (tocode); + memcpy (s, tocode, m_strlen(tocode)), s += m_strlen(tocode); memcpy (s, "?Q?", 3), s += 3; while (dlen--) { unsigned char c = *d++; @@ -229,7 +227,7 @@ static size_t try_block (const char *d, size_t dlen, if (fromcode) { cd = mutt_iconv_open (tocode, fromcode, 0); assert (cd != (iconv_t) (-1)); - ib = d, ibl = dlen, ob = buf1, obl = sizeof (buf1) - str_len (tocode); + ib = d, ibl = dlen, ob = buf1, obl = sizeof (buf1) - m_strlen(tocode); if (my_iconv(cd, &ib, &ibl, &ob, &obl) == (size_t) (-1) || my_iconv(cd, 0, 0, &ob, &obl) == (size_t) (-1)) { assert (errno == E2BIG); @@ -240,8 +238,8 @@ static size_t try_block (const char *d, size_t dlen, iconv_close (cd); } else { - if (dlen > sizeof (buf1) - str_len (tocode)) - return sizeof (buf1) - str_len (tocode) + 1; + if (dlen > sizeof (buf1) - m_strlen(tocode)) + return sizeof (buf1) - m_strlen(tocode) + 1; memcpy (buf1, d, dlen); ob = buf1 + dlen; } @@ -256,7 +254,7 @@ static size_t try_block (const char *d, size_t dlen, ++count; } - len = ENCWORD_LEN_MIN - 2 + str_len (tocode); + len = ENCWORD_LEN_MIN - 2 + m_strlen(tocode); len_b = len + (((ob - buf1) + 2) / 3) * 4; len_q = len + (ob - buf1) + 2 * count; @@ -295,7 +293,7 @@ static size_t encode_block (char *s, char *d, size_t dlen, if (fromcode) { cd = mutt_iconv_open (tocode, fromcode, 0); assert (cd != (iconv_t) (-1)); - ib = d, ibl = dlen, ob = buf1, obl = sizeof (buf1) - str_len (tocode); + 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); assert (n1 != (size_t) (-1) && n2 != (size_t) (-1)); @@ -480,15 +478,15 @@ static int rfc2047_encode (const char *d, size_t dlen, int col, /* Add to output buffer. */ #define LINEBREAK "\n\t" - if (bufpos + wlen + str_len (LINEBREAK) > buflen) { - buflen = bufpos + wlen + str_len (LINEBREAK); - mem_realloc (&buf, buflen); + if (bufpos + wlen + m_strlen(LINEBREAK) > buflen) { + buflen = bufpos + wlen + m_strlen(LINEBREAK); + p_realloc(&buf, buflen); } r = encode_block (buf + bufpos, t, n, icode, tocode, encoder); assert (r == wlen); bufpos += wlen; - memcpy (buf + bufpos, LINEBREAK, str_len (LINEBREAK)); - bufpos += str_len (LINEBREAK); + memcpy (buf + bufpos, LINEBREAK, m_strlen(LINEBREAK)); + bufpos += m_strlen(LINEBREAK); #undef LINEBREAK col = 1; @@ -498,7 +496,7 @@ static int rfc2047_encode (const char *d, size_t dlen, int col, /* Add last encoded word and us-ascii suffix to buffer. */ buflen = bufpos + wlen + (u + ulen - t1); - mem_realloc (&buf, buflen + 1); + p_realloc(&buf, buflen + 1); r = encode_block (buf + bufpos, t, t1 - t, icode, tocode, encoder); assert (r == wlen); bufpos += wlen; @@ -527,7 +525,7 @@ void _rfc2047_encode_string (char **pd, int encode_specials, int col) if (!charsets || !*charsets) charsets = "UTF-8"; - rfc2047_encode (*pd, str_len (*pd), col, + rfc2047_encode (*pd, m_strlen(*pd), col, Charset, charsets, &e, &elen, encode_specials ? RFC822Specials : NULL); @@ -535,10 +533,10 @@ void _rfc2047_encode_string (char **pd, int encode_specials, int col) *pd = e; } -void rfc2047_encode_adrlist (ADDRESS * addr, const char *tag) +void rfc2047_encode_adrlist (address_t * addr, const char *tag) { - ADDRESS *ptr = addr; - int col = tag ? str_len (tag) + 2 : 32; + address_t *ptr = addr; + int col = tag ? m_strlen(tag) + 2 : 32; while (ptr) { if (ptr->personal) @@ -555,7 +553,7 @@ static int rfc2047_decode_word (char *d, const char *s, size_t len) int enc = 0, count = 0; char *charset = NULL; - pd = d0 = p_new(char, str_len(s)); + pd = d0 = p_new(char, m_strlen(s)); for (pp = s; (pp1 = strchr (pp, '?')); pp = pp1 + 1) { count++; @@ -583,9 +581,7 @@ static int rfc2047_decode_word (char *d, const char *s, size_t len) for (; pp < pp1; pp++) { if (*pp == '_') *pd++ = ' '; - else if (*pp == '=' && - (!(pp[1] & ~127) && hexval (pp[1]) != -1) && - (!(pp[2] & ~127) && hexval (pp[2]) != -1)) { + else if (*pp == '=' && hexval(pp[1]) >= 0 && hexval(pp[2]) >= 0) { *pd++ = (hexval (pp[1]) << 4) | hexval (pp[2]); pp += 2; } @@ -600,7 +596,7 @@ static int rfc2047_decode_word (char *d, const char *s, size_t len) for (; pp < pp1; pp++) { if (*pp == '=') break; - if ((*pp & ~127) || (c = base64val (*pp)) == -1) + if ((c = base64val(*pp)) < 0) continue; if (k + 6 >= 8) { k -= 2; @@ -620,7 +616,7 @@ static int rfc2047_decode_word (char *d, const char *s, size_t len) if (charset) mutt_convert_string (&d0, charset, Charset, M_ICONV_HOOK_FROM); - strfcpy (d, d0, len); + m_strcpy(d, len, d0); p_delete(&charset); p_delete(&d0); return (0); @@ -709,14 +705,14 @@ void rfc2047_decode (char **pd) if (!s || !*s) return; - dlen = 4 * str_len (s); /* should be enough */ + dlen = 4 * m_strlen(s); /* should be enough */ d = d0 = p_new(char, dlen + 1); while (*s && dlen > 0) { if (!(p = find_encoded_word (s, &q))) { /* no encoded words */ if (!option (OPTSTRICTMIME)) { - n = str_len (s); + n = m_strlen(s); if (found_encoded && (m = lwslen (s, n)) != 0) { if (m != n) *d = ' ', d++, dlen--; @@ -728,7 +724,7 @@ void rfc2047_decode (char **pd) t = p_dupstr(s, n); if (mutt_convert_nonmime_string (&t) == 0) { - tlen = str_len (t); + tlen = m_strlen(t); strncpy (d, t, tlen); d += tlen; } @@ -778,7 +774,7 @@ void rfc2047_decode (char **pd) rfc2047_decode_word (d, p, dlen); found_encoded = 1; s = q; - n = str_len (d); + n = m_strlen(d); dlen -= n; d += n; } @@ -789,7 +785,7 @@ void rfc2047_decode (char **pd) str_adjust (pd); } -void rfc2047_decode_adrlist (ADDRESS * a) +void rfc2047_decode_adrlist (address_t * a) { while (a) { if (a->personal)