Minor charset issues
This commit is contained in:
parent
166c5cc25b
commit
f57d6bc53c
@ -245,8 +245,8 @@ int rfc2ftn(FILE *fp, faddr *recipient)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (charset == NULL) {
|
if (charset == NULL) {
|
||||||
charset = xstrcpy((char *)"iso-8859-1");
|
charset = xstrcpy((char *)"ISO-8859-1");
|
||||||
Syslog('m', "No charset, setting default to iso-8859-1");
|
Syslog('m', "No charset, setting default to ISO-8859-1");
|
||||||
}
|
}
|
||||||
chars_in = find_rfc_charset(charset);
|
chars_in = find_rfc_charset(charset);
|
||||||
|
|
||||||
@ -333,6 +333,7 @@ int rfc2ftn(FILE *fp, faddr *recipient)
|
|||||||
hdrsize += (fmsg->to->name)?strlen(fmsg->to->name):0;
|
hdrsize += (fmsg->to->name)?strlen(fmsg->to->name):0;
|
||||||
|
|
||||||
chars_out = msgs.Charset;
|
chars_out = msgs.Charset;
|
||||||
|
Syslog('m', "rfc2ftn: chars_in=%d chars_out=%d", chars_in, chars_out);
|
||||||
Syslog('m', "rfc2ftn: charset in: %s charset out: %s", get_ic_rfc(chars_in), get_ic_ftn(chars_out));
|
Syslog('m', "rfc2ftn: charset in: %s charset out: %s", get_ic_rfc(chars_in), get_ic_ftn(chars_out));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -273,10 +273,11 @@ int rfc2ftn(FILE *fp)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (charset == NULL) {
|
if (charset == NULL) {
|
||||||
charset = xstrcpy((char *)"iso-8859-1");
|
charset = xstrcpy((char *)"ISO-8859-1");
|
||||||
Syslog('m', "No charset, setting default to iso-8859-1");
|
Syslog('m', "No charset, setting default to iso-8859-1");
|
||||||
}
|
}
|
||||||
chartran_init(charset,getrfcchrs(msgs.Charset), 'm');
|
|
||||||
|
chartran_init(charset, get_ic_ftn(msgs.Charset), 'm');
|
||||||
|
|
||||||
if ((p = hdr((char *)"Message-ID",msg))) {
|
if ((p = hdr((char *)"Message-ID",msg))) {
|
||||||
if (!removemsgid)
|
if (!removemsgid)
|
||||||
|
Reference in New Issue
Block a user