* please see the file GPL in the top level source directory.
*/
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
-#include "mutt.h"
#include "charset.h"
#include "thread.h"
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
/* If you are debugging this file, comment out the following line. */
/*#define NDEBUG*/
cd = mutt_iconv_open(to, from, 0);
- if (cd == (iconv_t)(-1))
+ if (cd == MUTT_ICONV_ERROR)
return -1;
obl = 4 * flen + 1;
p_delete(&res);
}
- mutt_canonical_charset(buf, sizeof(buf), tocode);
+ charset_canonicalize(buf, sizeof(buf), tocode);
m_strreplace(&tocode, buf);
}
ssize_t ibl = dlen;
iconv_t cd = mutt_iconv_open(tocode, fromcode, 0);
- assert (cd != (iconv_t)(-1));
+ assert (cd != MUTT_ICONV_ERROR);
ob = buf1;
len_q = len + (ob - buf1) + 2 * count;
/* Apparently RFC 1468 says to use B encoding for iso-2022-jp. */
- if (!ascii_strcasecmp(tocode, "ISO-2022-JP"))
+ if (mime_which_token(tocode, -1) == MIME_ISO_2022_JP)
len_q = ENCWORD_LEN_MAX + 1;
if (len_b < len_q && len_b <= ENCWORD_LEN_MAX) {
if (fromcode) {
cd = mutt_iconv_open(tocode, fromcode, 0);
- assert (cd != (iconv_t) (-1));
+ 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);
encoder_t **encoder, ssize_t *wlen)
{
size_t n, nn;
- int utf8 = fromcode && !ascii_strcasecmp(fromcode, "UTF-8");
+ int utf8 = mime_which_token(fromcode, -1) == MIME_UTF_8;
n = dlen;
for (;;) {
}
/* Hack to avoid labelling 8-bit data as us-ascii. */
- if (!icode && mutt_is_us_ascii(tocode))
+ if (!icode && charset_is_us_ascii(tocode))
tocode = "unknown-8bit";
/* Adjust t0 for maximum length of line. */
}
-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;
n -= m, s += m;
}
- if (ascii_strcasecmp(AssumedCharset, "us-ascii")) {
+ if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII) {
char *t;
t = p_dupstr(s, n);