~mdw
/
sgt
/
charset
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I've just seen the MIME charset name 'x-sjis' in the wild. Add it to
[sgt/charset]
/
mimeenc.c
diff --git
a/mimeenc.c
b/mimeenc.c
index
fd7e975
..
b193374
100644
(file)
--- a/
mimeenc.c
+++ b/
mimeenc.c
@@
-40,6
+40,13
@@
static const struct {
{ "csASCII", CS_ASCII },
{ "646", CS_ASCII }, /* WILD */
{ "csASCII", CS_ASCII },
{ "646", CS_ASCII }, /* WILD */
+ { "BS_4730", CS_BS4730 },
+ { "iso-ir-4", CS_BS4730 },
+ { "ISO646-GB", CS_BS4730 },
+ { "gb", CS_BS4730 },
+ { "uk", CS_BS4730 },
+ { "csISO4UnitedKingdom", CS_BS4730 },
+
{ "ISO-8859-1", CS_ISO8859_1 },
{ "ISO8859-1", CS_ISO8859_1 }, /* WILD */
{ "iso-ir-100", CS_ISO8859_1 },
{ "ISO-8859-1", CS_ISO8859_1 },
{ "ISO8859-1", CS_ISO8859_1 }, /* WILD */
{ "iso-ir-100", CS_ISO8859_1 },
@@
-132,6
+139,8
@@
static const struct {
{ "csISOLatin6", CS_ISO8859_10 },
{ "latin6", CS_ISO8859_10 },
{ "csISOLatin6", CS_ISO8859_10 },
{ "latin6", CS_ISO8859_10 },
+ { "TIS-620", CS_ISO8859_11 },
+
{ "ISO-8859-13", CS_ISO8859_13 },
{ "ISO8859-13", CS_ISO8859_13 }, /* WILD */
{ "ISO-8859-13", CS_ISO8859_13 },
{ "ISO8859-13", CS_ISO8859_13 }, /* WILD */
@@
-167,6
+176,13
@@
static const struct {
{ "850", CS_CP850 },
{ "csPC850Multilingual", CS_CP850 },
{ "850", CS_CP850 },
{ "csPC850Multilingual", CS_CP850 },
+ { "IBM866", CS_CP866 },
+ { "cp866", CS_CP866 },
+ { "866", CS_CP866 },
+ { "csIBM866", CS_CP866 },
+
+ { "windows-874", CS_CP874 }, /* WILD */
+
{ "windows-1250", CS_CP1250 },
{ "win-1250", CS_CP1250 }, /* WILD */
{ "windows-1250", CS_CP1250 },
{ "win-1250", CS_CP1250 }, /* WILD */
@@
-201,6
+217,10
@@
static const struct {
{ "KOI8-RU", CS_KOI8_RU }, /* WILD */
{ "KOI8-RU", CS_KOI8_RU }, /* WILD */
+ { "JIS_X0201", CS_JISX0201 },
+ { "X0201", CS_JISX0201 },
+ { "csHalfWidthKatakana", CS_JISX0201 },
+
{ "macintosh", CS_MAC_ROMAN_OLD },
{ "mac", CS_MAC_ROMAN_OLD },
{ "csMacintosh", CS_MAC_ROMAN_OLD },
{ "macintosh", CS_MAC_ROMAN_OLD },
{ "mac", CS_MAC_ROMAN_OLD },
{ "csMacintosh", CS_MAC_ROMAN_OLD },
@@
-246,14
+266,13
@@
static const struct {
{ "Big5", CS_BIG5 },
{ "csBig5", CS_BIG5 },
{ "Big5", CS_BIG5 },
{ "csBig5", CS_BIG5 },
- /* The following two names are not listed on the above web page, but
- * I've seen them in the wild in real e-mail. */
- { "Big-5", CS_BIG5 },
- { "ChineseBig5", CS_BIG5 },
+ { "Big-5", CS_BIG5 }, /* WILD */
+ { "ChineseBig5", CS_BIG5 }, /* WILD */
{ "Shift_JIS", CS_SHIFT_JIS },
{ "MS_Kanji", CS_SHIFT_JIS },
{ "csShiftJIS", CS_SHIFT_JIS },
{ "Shift_JIS", CS_SHIFT_JIS },
{ "MS_Kanji", CS_SHIFT_JIS },
{ "csShiftJIS", CS_SHIFT_JIS },
+ { "x-sjis", CS_SHIFT_JIS }, /* WILD */
{ "HZ-GB-2312", CS_HZ },
{ "HZ-GB-2312", CS_HZ },
@@
-305,7
+324,7
@@
int charset_from_mimeenc(const char *name)
p = name;
q = mimeencs[i].name;
while (*p || *q) {
p = name;
q = mimeencs[i].name;
while (*p || *q) {
-
if (tolower(*p) != tolower(
*q))
+
if (tolower((unsigned char)*p) != tolower((unsigned char)
*q))
break;
p++; q++;
}
break;
p++; q++;
}