From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Thu, 7 Apr 2011 10:27:14 +0000 (-0400)
Subject: Update Windows CodePage look-up table.
X-Git-Tag: v3.0.0a~513
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a74a724164723da025dc3e08fb7067f1794635d;p=thirdparty%2Flibarchive.git

Update Windows CodePage look-up table.

SVN-Revision: 3173
---

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 701f89c84..5681d0c72 100644
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -637,37 +637,70 @@ static struct charset {
 } charsets[] = {
 	/* MUST BE SORTED! */
 	{"ASCII", 1252},
+	{"ASMO-708", 708},
 	{"BIG5", 950},
 	{"CHINESE", 936},
 	{"CP367", 1252},
 	{"CP819", 1252},
+	{"CP1025", 21025},
+	{"DOS-720", 720},
+	{"DOS-862", 862},
 	{"EUC-CN", 51936},
 	{"EUC-JP", 51932},
 	{"EUC-KR", 949},
 	{"EUCCN", 51936},
 	{"EUCJP", 51932},
 	{"EUCKR", 949},
+	{"GB18030", 54936},
 	{"GB2312", 936},
 	{"HEBREW", 1255},
+	{"HZ-GB-2312", 52936},
+	{"IBM273", 20273},
+	{"IBM277", 20277},
+	{"IBM278", 20278},
+	{"IBM280", 20280},
+	{"IBM284", 20284},
+	{"IBM285", 20285},
+	{"IBM290", 20290},
+	{"IBM297", 20297},
 	{"IBM367", 1252},
+	{"IBM420", 20420},
+	{"IBM423", 20423},
+	{"IBM424", 20424},
 	{"IBM819", 1252},
-	{"ISO-8859-1", 1252},
-	{"ISO-8859-13", 1257},
-	{"ISO-8859-2", 28592}, /* Should be 1250? */
-	{"ISO-8859-5", 1251},
-	{"ISO-8859-7", 1253},
-	{"ISO-8859-8", 1255},
-	{"ISO-8859-9", 1254},
-	{"ISO8859-1", 1252},
-	{"ISO8859-13", 1257},
-	{"ISO8859-2", 28592}, /* Should be 1250? */
-	{"ISO8859-5", 1251},
-	{"ISO8859-7", 1253},
-	{"ISO8859-8", 1255},
-	{"ISO8859-9", 1254},
+	{"IBM871", 20871},
+	{"IBM880", 20880},
+	{"IBM905", 20905},
+	{"IBM924", 20924},
+	{"ISO-8859-1", 28591},
+	{"ISO-8859-13", 28603},
+	{"ISO-8859-15", 28605},
+	{"ISO-8859-2", 28592},
+	{"ISO-8859-3", 28593},
+	{"ISO-8859-4", 28594},
+	{"ISO-8859-5", 28595},
+	{"ISO-8859-6", 28596},
+	{"ISO-8859-7", 28597},
+	{"ISO-8859-8", 28598},
+	{"ISO-8859-9", 28599},
+	{"ISO8859-1", 28591},
+	{"ISO8859-13", 28603},
+	{"ISO8859-15", 28605},
+	{"ISO8859-2", 28592},
+	{"ISO8859-3", 28593},
+	{"ISO8859-4", 28594},
+	{"ISO8859-5", 28595},
+	{"ISO8859-6", 28596},
+	{"ISO8859-7", 28597},
+	{"ISO8859-8", 28598},
+	{"ISO8859-9", 28599},
+	{"JOHAB", 1361},
 	{"KOI8-R", 20866},
+	{"KOI8-U", 21866},
+	{"KS_C_5601-1987", 949},
 	{"LATIN1", 1252},
 	{"LATIN2", 28592},
+	{"MACINTOSH", 10000},
 	{"SHIFT-JIS", 932},
 	{"SHIFT_JIS", 932},
 	{"SJIS", 932},
@@ -677,6 +710,22 @@ static struct charset {
 	{"UTF-16BE", 1201},
 	{"UTF-16LE", 1200},
 	{"UTF-8", CP_UTF8},
+	{"X-EUROPA", 29001},
+	{"X-MAC-ARABIC", 10004},
+	{"X-MAC-CE", 10029},
+	{"X-MAC-CHINESEIMP", 10008},
+	{"X-MAC-CHINESETRAD", 10002},
+	{"X-MAC-CROATIAN", 10082},
+	{"X-MAC-CYRILLIC", 10007},
+	{"X-MAC-GREEK", 10006},
+	{"X-MAC-HEBREW", 10005},
+	{"X-MAC-ICELANDIC", 10079},
+	{"X-MAC-JAPANESE", 10001},
+	{"X-MAC-KOREAN", 10003},
+	{"X-MAC-ROMANIAN", 10010},
+	{"X-MAC-THAI", 10021},
+	{"X-MAC-TURKISH", 10081},
+	{"X-MAC-UKRAINIAN", 10017},
 };
 static unsigned
 make_codepage_from_charset(const char *charset)