X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=lib-mime%2Frfc2047.c;h=4900d7caf4b97c3de80a888f27c6a5f7c6980472;hb=d6e1782b1e788bd1c4767443712bf1713cc013ef;hp=26c68ced7146f80cacf8226e1410cf64682c4071;hpb=a8aba140a61d5b86093cea46afcb613092d4978d;p=apps%2Fmadmutt.git

diff --git a/lib-mime/rfc2047.c b/lib-mime/rfc2047.c
index 26c68ce..4900d7c 100644
--- a/lib-mime/rfc2047.c
+++ b/lib-mime/rfc2047.c
@@ -33,7 +33,6 @@
 
 #include <lib-mime/mime.h>
 
-#include "mutt.h"
 #include "charset.h"
 #include "thread.h"
 
@@ -305,7 +304,7 @@ static size_t try_block(const char *d, ssize_t dlen,
         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) {
@@ -362,7 +361,7 @@ static size_t choose_block(char *d, size_t dlen, int col,
                            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 (;;) {
@@ -453,7 +452,7 @@ static int rfc2047_encode(const char *d, ssize_t dlen, int col,
     }
 
     /* 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. */
@@ -808,7 +807,7 @@ void rfc2047_decode(char **pd)
                     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);