From f57d6bc53cdba9b35ba076df82f48cc795a7d24c Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Wed, 28 Feb 2007 19:29:07 +0000 Subject: [PATCH] Minor charset issues --- mbfido/rfc2ftn.c | 5 +++-- mbnntp/rfc2ftn.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mbfido/rfc2ftn.c b/mbfido/rfc2ftn.c index 0330f4d0..d63c0288 100644 --- a/mbfido/rfc2ftn.c +++ b/mbfido/rfc2ftn.c @@ -245,8 +245,8 @@ int rfc2ftn(FILE *fp, faddr *recipient) } if (charset == NULL) { - charset = xstrcpy((char *)"iso-8859-1"); - Syslog('m', "No charset, setting default to iso-8859-1"); + charset = xstrcpy((char *)"ISO-8859-1"); + Syslog('m', "No charset, setting default to ISO-8859-1"); } 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; 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)); /* diff --git a/mbnntp/rfc2ftn.c b/mbnntp/rfc2ftn.c index ff5c2925..3a7805be 100644 --- a/mbnntp/rfc2ftn.c +++ b/mbnntp/rfc2ftn.c @@ -273,10 +273,11 @@ int rfc2ftn(FILE *fp) } 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"); } - chartran_init(charset,getrfcchrs(msgs.Charset), 'm'); + + chartran_init(charset, get_ic_ftn(msgs.Charset), 'm'); if ((p = hdr((char *)"Message-ID",msg))) { if (!removemsgid)