fix 147200 by merge nova code
git-svn-id: svn://10.0.0.236/trunk@10454 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -108,6 +108,7 @@ MODULE_PRIVATE csname2id_t csname2id_tbl[] = {
|
||||
{"x-viet-vps", "", CS_VIET_VPS},
|
||||
{"x-viet-tcvn", "", CS_VIET_TCVN},
|
||||
{"x-viet-vni", "", CS_VIET_VNI},
|
||||
{"T.61-8bit", "", CS_T61},
|
||||
|
||||
/* Additional OS/2 codepages. These are IANA primary names */
|
||||
{"ibm850", "Cp850", CS_CP_850}, /* PC Latin 1 */
|
||||
@@ -335,7 +336,12 @@ MODULE_PRIVATE csname2id_t csname2id_tbl[] = {
|
||||
/* aliases for TIS-620: */
|
||||
{"x-tis-620", "", CS_TIS620},
|
||||
|
||||
{"", "", CS_UNKNOWN}
|
||||
/* aliases for T.61-8bit: */
|
||||
{"T.61", "", CS_T61},
|
||||
{"iso-ir-103", "", CS_T61},
|
||||
{"csISO103T618bit", "", CS_T61},
|
||||
|
||||
{"", "", CS_UNKNOWN},
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -44,6 +44,7 @@ PRIVATE csinfo_t csinfo_tbl[] =
|
||||
/* 3 */ {{{2,2,{0xa1,0xfe}}, {4,2,{0x8e,0x8e}}, {0,0,{0x00,0x00}}}}, /* For CNS_8BIT */
|
||||
/* 4 */ {{{2,2,{0x21,0x7e}}, {0,0,{0x00,0x00}}, {0,0,{0x00,0x00}}}}, /* For 2 Byte GL */
|
||||
/* 5 */ {{{2,2,{0xC0,0xDF}}, {3,2,{0xE0,0xEF}}, {0,0,{0x00,0x00}}}}, /* For UTF8 */
|
||||
/* 6 */ {{{2,1,{0xC0,0xCF}}, {0,0,{0x00,0x00}}, {0,0,{0x00,0x00}}}}, /* For UTF8 */
|
||||
/* 0 */ {{{0,0,{0x00,0x00}}, {0,0,{0x00,0x00}}, {0,0,{0x00,0x00}}}}
|
||||
};
|
||||
/* Array to index from the lower 8 bits of csid into the index of csinfo_tbl */
|
||||
@@ -61,7 +62,7 @@ PRIVATE int csinfoindex[256] =
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x90 */
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xa0 */
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xb0 */
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xc0 */
|
||||
6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xc0 */
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xd0 */
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe0 */
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xf0 */
|
||||
|
||||
Reference in New Issue
Block a user