projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
many simplifications, copyright statements.
[apps/madmutt.git]
/
sendlib.c
diff --git
a/sendlib.c
b/sendlib.c
index
63399e4
..
3551aaf
100644
(file)
--- a/
sendlib.c
+++ b/
sendlib.c
@@
-625,7
+625,7
@@
static ssize_t convert_file_to (FILE * file, const char *fromcode,
ib = bufi;
ob = bufu, obl = sizeof (bufu);
n = my_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl);
ib = bufi;
ob = bufu, obl = sizeof (bufu);
n = my_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl);
- assert (n == -1 || !n
|| ICONV_NONTRANS
);
+ assert (n == -1 || !n);
if (n == -1 &&
((errno != EINVAL && errno != E2BIG) || ib == bufi)) {
assert (errno == EILSEQ ||
if (n == -1 &&
((errno != EINVAL && errno != E2BIG) || ib == bufi)) {
assert (errno == EILSEQ ||
@@
-826,7
+826,7
@@
CONTENT *mutt_get_content_info (const char *fname, BODY * b)
convert_file_from_to (fp, fchs, chs ? chs : SendCharset,
&fromcode, &tocode, info) != -1) {
if (!chs) {
convert_file_from_to (fp, fchs, chs ? chs : SendCharset,
&fromcode, &tocode, info) != -1) {
if (!chs) {
-
mutt_canonical_charset
(chsbuf, sizeof (chsbuf), tocode);
+
charset_canonicalize
(chsbuf, sizeof (chsbuf), tocode);
mutt_set_parameter ("charset", chsbuf, &b->parameter);
}
b->file_charset = fromcode;
mutt_set_parameter ("charset", chsbuf, &b->parameter);
}
b->file_charset = fromcode;
@@
-846,7
+846,7
@@
CONTENT *mutt_get_content_info (const char *fname, BODY * b)
if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset))
mutt_set_parameter ("charset", (!info->hibin ? "us-ascii" :
Charset
if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset))
mutt_set_parameter ("charset", (!info->hibin ? "us-ascii" :
Charset
- && !
mut
t_is_us_ascii (Charset) ? Charset :
+ && !
charse
t_is_us_ascii (Charset) ? Charset :
"unknown-8bit"), &b->parameter);
return info;
"unknown-8bit"), &b->parameter);
return info;
@@
-1136,7
+1136,7
@@
char *mutt_get_body_charset (char *d, ssize_t dlen, BODY * b)
p = mutt_get_parameter ("charset", b->parameter);
if (p)
p = mutt_get_parameter ("charset", b->parameter);
if (p)
-
mutt_canonical_charset
(d, dlen, NONULL (p));
+
charset_canonicalize
(d, dlen, NONULL (p));
else
m_strcpy(d, dlen, "us-ascii");
else
m_strcpy(d, dlen, "us-ascii");
@@
-1151,7
+1151,7
@@
void mutt_update_encoding (BODY * a)
char chsbuff[STRING];
/* override noconv when it's us-ascii */
char chsbuff[STRING];
/* override noconv when it's us-ascii */
- if (
mut
t_is_us_ascii (mutt_get_body_charset (chsbuff, sizeof (chsbuff), a)))
+ if (
charse
t_is_us_ascii (mutt_get_body_charset (chsbuff, sizeof (chsbuff), a)))
a->noconv = 0;
if (!a->force_charset && !a->noconv)
a->noconv = 0;
if (!a->force_charset && !a->noconv)