From b435f3a603819780d9009c01cfa8345caed3faef Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Sat, 10 Mar 2007 14:48:14 +0000 Subject: [PATCH] Removed duplicate table column --- ChangeLog | 2 ++ lib/charset.c | 49 +++++++++++++++++++++---------------------------- lib/mbselib.h | 1 - 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7dd16c48..649267bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ v0.91.7 07-Mar-2007 mbselib: If find_rfc_charset doesn't find a valid characterset we log a warning instead of an error. + Fixed some charset names using IANA information. + Removed duplicate table column. mbfido: In rfc2ftn if we cannot find the incoming charset from the diff --git a/lib/charset.c b/lib/charset.c index 8e7397bc..849fd53c 100644 --- a/lib/charset.c +++ b/lib/charset.c @@ -73,25 +73,25 @@ struct _charalias charalias[] = { /* * Array of charset identifiers. - * ftncidx, ftnkludge, rfcname, ic_ftn, ic_rfc, lang, desc + * ftncidx, ftnkludge, rfcname, ic_ftn, lang, desc */ struct _charmap charmap[] = { - {FTNC_NONE, (char *)"Undef", (char *)"Undef", (char *)"Undef", (char *)"Undef", (char *)"C", (char *)"Undefined"}, - {FTNC_CP437, (char *)"CP437 2", (char *)"ibm437", (char *)"CP437", (char *)"IBM437", (char *)"en_US", (char *)"IBM codepage 437 (Western European) (ANSI terminal)"}, - {FTNC_CP850, (char *)"CP850 2", (char *)"ibm850", (char *)"CP850", (char *)"IBM850", (char *)"en_US", (char *)"IBM codepage 850 (Latin-1) (ANSI terminal)"}, - {FTNC_CP865, (char *)"CP865 2", (char *)"ibm865", (char *)"CP865", (char *)"IBM865", (char *)"sv_SE", (char *)"IBM codepage 865 (Nordic)"}, - {FTNC_CP866, (char *)"CP866 2", (char *)"ibm866", (char *)"CP866", (char *)"IBM866", (char *)"ru_RU", (char *)"IBM codepage 866 (Russian)"}, - {FTNC_LATIN_1,(char *)"LATIN-1 2",(char *)"iso-8859-1", (char *)"LATIN1", (char *)"ISO-8859-1", (char *)"en_US", (char *)"ISO 8859-1 (Western European)"}, - {FTNC_LATIN_2,(char *)"LATIN-2 2",(char *)"iso-8859-2", (char *)"LATIN2", (char *)"ISO-8859-2", (char *)"cs_CZ", (char *)"ISO 8859-2 (Eastern European)"}, - {FTNC_LATIN_5,(char *)"LATIN-5 2",(char *)"iso-8859-5", (char *)"LATIN5", (char *)"ISO-8859-5", (char *)"turks", (char *)"ISO 8859-5 (Turkish)"}, - {FTNC_MAC, (char *)"MAC", (char *)"Macintosh", (char *)"MACINTOSH",(char *)"ISO-8859-1", (char *)"en_US", (char *)"MacIntosh character set"}, - {FTNC_CP852, (char *)"CP852 2", (char *)"ibm852", (char *)"CP852", (char *)"IBM852", (char *)"cs_CZ", (char *)"IBM codepage 852 (Czech, Latin-2)"}, - {FTNC_CP895, (char *)"CP895 2", (char *)"cp895", (char *)"CP850", (char *)"CP895", (char *)"cs_CZ", (char *)"IBM codepage 895 (Czech, Kamenicky)"}, - {FTNC_KOI8_R, (char *)"KOI8-R 2", (char *)"koi8-r", (char *)"KOI8-R", (char *)"KOI8-R", (char *)"ru_RUi.koi8r",(char *)"Unix codepage KOI8-R (Russian)"}, - {FTNC_CP936, (char *)"CP936 2", (char *)"gbk", (char *)"CP936", (char *)"GBK", (char *)"zh_CN.gbk", (char *)"IBM codepage 936 (Chinese, GBK)"}, - {FTNC_LATIN_9,(char *)"LATIN-9 2",(char *)"iso-8859-15",(char *)"LATIN-9", (char *)"ISO-8859-15",(char *)"en_US", (char *)"ISO 8859-15 (Western European EURO)"}, - {FTNC_UTF8, (char *)"UTF-8 4", (char *)"utf-8", (char *)"UTF-8", (char *)"UTF-8", (char *)"en_US.UTF-8", (char *)"Unicode UTF-8 (ISO/IEC 10646)"}, - {FTNC_ERROR, NULL, NULL, NULL, NULL, NULL, (char *)"ERROR"} + {FTNC_NONE, (char *)"Undef", (char *)"Undef", (char *)"Undef", (char *)"C", (char *)"Undefined"}, + {FTNC_CP437, (char *)"CP437 2", (char *)"ibm437", (char *)"CP437", (char *)"en_US", (char *)"IBM codepage 437 (Western European) (ANSI terminal)"}, + {FTNC_CP850, (char *)"CP850 2", (char *)"ibm850", (char *)"CP850", (char *)"en_US", (char *)"IBM codepage 850 (Latin-1) (ANSI terminal)"}, + {FTNC_CP865, (char *)"CP865 2", (char *)"ibm865", (char *)"CP865", (char *)"sv_SE", (char *)"IBM codepage 865 (Nordic)"}, + {FTNC_CP866, (char *)"CP866 2", (char *)"ibm866", (char *)"CP866", (char *)"ru_RU", (char *)"IBM codepage 866 (Russian)"}, + {FTNC_LATIN_1,(char *)"LATIN-1 2",(char *)"iso-8859-1", (char *)"LATIN1", (char *)"en_US", (char *)"ISO 8859-1 (Western European)"}, + {FTNC_LATIN_2,(char *)"LATIN-2 2",(char *)"iso-8859-2", (char *)"LATIN2", (char *)"cs_CZ", (char *)"ISO 8859-2 (Eastern European)"}, + {FTNC_LATIN_5,(char *)"LATIN-5 2",(char *)"iso-8859-5", (char *)"LATIN5", (char *)"turks", (char *)"ISO 8859-5 (Turkish)"}, + {FTNC_MAC, (char *)"MAC", (char *)"Macintosh", (char *)"MACINTOSH",(char *)"en_US", (char *)"MacIntosh character set"}, + {FTNC_CP852, (char *)"CP852 2", (char *)"ibm852", (char *)"CP852", (char *)"cs_CZ", (char *)"IBM codepage 852 (Czech, Latin-2)"}, + {FTNC_CP895, (char *)"CP895 2", (char *)"cp895", (char *)"CP850", (char *)"cs_CZ", (char *)"IBM codepage 895 (Czech, Kamenicky)"}, + {FTNC_KOI8_R, (char *)"KOI8-R 2", (char *)"koi8-r", (char *)"KOI8-R", (char *)"ru_RUi.koi8r",(char *)"Unix codepage KOI8-R (Russian)"}, + {FTNC_CP936, (char *)"CP936 2", (char *)"gbk", (char *)"CP936", (char *)"zh_CN.gbk", (char *)"IBM codepage 936 (Chinese, GBK)"}, + {FTNC_LATIN_9,(char *)"LATIN-9 2",(char *)"iso-8859-15",(char *)"LATIN-9", (char *)"en_US", (char *)"ISO 8859-15 (Western European EURO)"}, + {FTNC_UTF8, (char *)"UTF-8 4", (char *)"utf-8", (char *)"UTF-8", (char *)"en_US.UTF-8", (char *)"Unicode UTF-8 (ISO/IEC 10646)"}, + {FTNC_ERROR, NULL, NULL, NULL, NULL, (char *)"ERROR"} }; @@ -231,17 +231,10 @@ char *get_ic_ftn(int val) char *get_ic_rfc(int val) { static char ic_rfcname[20]; - - if ((val >= FTNC_NONE) && (val <= FTNC_MAXCHARS)) { - Syslog('-', "get_ic_rfc(%d) %s", val, charmap[val].ic_rfc); - snprintf(ic_rfcname, 20, "%s", charmap[val].ic_rfc); - return ic_rfcname; - } - - /* - * Not found, return a default - */ - return (char *)"iso-8859-1"; + + snprintf(ic_rfcname, 19, getrfcchrs(val)); + tu(ic_rfcname); + return ic_rfcname; } diff --git a/lib/mbselib.h b/lib/mbselib.h index 1fbca94f..2ee5a991 100644 --- a/lib/mbselib.h +++ b/lib/mbselib.h @@ -461,7 +461,6 @@ extern struct _charmap { char *ftnkludge; char *rfcname; char *ic_ftn; - char *ic_rfc; char *lang; char *desc; } charmap[];