-int rfc2231_encode_string (char **pd)
-{
- int ext = 0, encode = 0;
- char *charset, *s, *t, *e, *d = 0;
- size_t slen, dlen = 0;
-
- /*
- * A shortcut to detect pure 7bit data.
- *
- * This should prevent the worst when character set handling
- * is flawed.
- */
-
- for (s = *pd; *s; s++)
- if (*s & 0x80)
- break;
-
- if (!*s)
- return 0;
-
- if (!Charset || !SendCharset ||
- !(charset = mutt_choose_charset (Charset, SendCharset,
- *pd, m_strlen(*pd), &d, &dlen))) {
- charset = m_strdup(Charset ? Charset : "unknown-8bit");
- d = *pd;
- dlen = m_strlen(d);
- }
-
- if (!mutt_is_us_ascii (charset))
- encode = 1;
-
- for (s = d, slen = dlen; slen; s++, slen--)
- if (*s < 0x20 || *s >= 0x7f)
- encode = 1, ++ext;
- else if (strchr (MimeSpecials, *s) || strchr ("*'%", *s))
- ++ext;
-
- if (encode) {
- e = p_new(char, dlen + 2 * ext + m_strlen(charset) + 3);
- sprintf (e, "%s''", charset); /* __SPRINTF_CHECKED__ */
- t = e + m_strlen(e);
- for (s = d, slen = dlen; slen; s++, slen--)
- if (*s < 0x20 || *s >= 0x7f ||
- strchr (MimeSpecials, *s) || strchr ("*'%", *s)) {
- sprintf (t, "%%%02X", (unsigned char) *s);
- t += 3;
- }
- else
- *t++ = *s;
- *t = '\0';
+ if (mod_cset.charset && mod_cset.send_charset) {
+ charset = mutt_choose_charset(mod_cset.charset, mod_cset.send_charset,
+ *s, m_strlen(*s), &d, &dlen);
+ }
+
+ if (!charset) {
+ charset = m_strdup(mod_cset.charset ?: "unknown-8bit");
+ d = *s;
+ dlen = m_strlen(d);
+ }