projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move pop into lib-mx.
[apps/madmutt.git]
/
lib-mime
/
rfc2047.c
diff --git
a/lib-mime/rfc2047.c
b/lib-mime/rfc2047.c
index
a4d3b19
..
1d42403
100644
(file)
--- a/
lib-mime/rfc2047.c
+++ b/
lib-mime/rfc2047.c
@@
-100,7
+100,7
@@
char *mutt_choose_charset(const char *fromcode, const char *charsets,
const char *p = charsets;
while (*p) {
const char *p = charsets;
while (*p) {
- char cset[S
HORT_S
TRING];
+ char cset[STRING];
const char *q;
char *s;
ssize_t slen, n;
const char *q;
char *s;
ssize_t slen, n;
@@
-561,13
+561,13
@@
static void _rfc2047_encode_string(char **pd, int encode_specials, int col)
ssize_t elen;
const char *charsets;
ssize_t elen;
const char *charsets;
- if (!
C
harset || !*pd)
+ if (!
mod_cset.c
harset || !*pd)
return;
return;
- charsets = m_strisempty(
SendCharset) ? "UTF-8" : SendC
harset;
+ charsets = m_strisempty(
mod_cset.send_charset) ? "utf-8" : mod_cset.send_c
harset;
rfc2047_encode(*pd, m_strlen(*pd), col,
rfc2047_encode(*pd, m_strlen(*pd), col,
-
C
harset, charsets, &e, &elen,
+
mod_cset.c
harset, charsets, &e, &elen,
encode_specials ? RFC822Specials : NULL);
p_delete(pd);
encode_specials ? RFC822Specials : NULL);
p_delete(pd);
@@
-667,7
+667,7
@@
rfc2047_decode_word(char *d, size_t len, const char *p, const char *end)
*q = '\0';
if (*charset)
*q = '\0';
if (*charset)
- mutt_convert_string(&d0, charset,
C
harset, M_ICONV_HOOK_FROM);
+ mutt_convert_string(&d0, charset,
mod_cset.c
harset, M_ICONV_HOOK_FROM);
m_strcpy(d, len, d0);
p_delete(&d0);
return 0;
m_strcpy(d, len, d0);
p_delete(&d0);
return 0;
@@
-786,7
+786,7
@@
void rfc2047_decode(char **pd)
n -= m, s += m;
}
n -= m, s += m;
}
- if (mime_which_token(
AssumedC
harset, -1) == MIME_US_ASCII) {
+ if (mime_which_token(
mod_cset.assumed_c
harset, -1) == MIME_US_ASCII) {
char *t;
t = p_dupstr(s, n);
char *t;
t = p_dupstr(s, n);