Fix bugs in EUC_TW support. This fix includes patches contributed

tatsuo-ishii · tatsuo-ishii · commit 8a35ac24f847 · 2000-11-17T04:42:10.000Z
by Chih-Chang Hsi. See "A Patch for MIC to EUC_TW code converting in
mb support" posting in pgsql-patches list dated 09 Nov 2000.
diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
@@ -6,7 +6,7 @@
  * WIN1250 client encoding support contributed by Pavel Behal
  * SJIS UDC (NEC selection IBM kanji) support contributed by Eiji Tokuya
  *
- * $Id: conv.c,v 1.20 2000/10/30 10:40:28 ishii Exp $
+ * $Id: conv.c,v 1.21 2000/11/17 04:42:10 ishii Exp $
  *
  *
  */
@@ -538,15 +538,22 @@ mic2euc_tw(unsigned char *mic, unsigned char *p, int len)
 	{
 		len -= pg_mic_mblen(mic++);
 
-		if (c1 == LC_CNS11643_1 || c1 == LC_CNS11643_2)
+		if (c1 == LC_CNS11643_1)
 		{
 			*p++ = *mic++;
 			*p++ = *mic++;
 		}
+		else if (c1 == LC_CNS11643_2)
+		{
+			*p++ = SS2;
+			*p++ = 0xa2;
+			*p++ = *mic++;
+			*p++ = *mic++;
+		}
 		else if (c1 == 0x9d)
 		{						/* LCPRV2? */
 			*p++ = SS2;
-			*p++ = c1 - LC_CNS11643_3 + 0xa3;
+			*p++ = *mic++ - LC_CNS11643_3 + 0xa3;
 			*p++ = *mic++;
 			*p++ = *mic++;
 		}
@@ -573,7 +580,7 @@ big52mic(unsigned char *big5, unsigned char *p, int len)
 	unsigned short big5buf,
 				cnsBuf;
 	unsigned char lc;
-	char		bogusBuf[2];
+	char		bogusBuf[3];
 	int			i;
 
 	while (len > 0 && (c1 = *big5++))

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* WIN1250 client encoding support contributed by Pavel Behal`
`7`	`7`	`* SJIS UDC (NEC selection IBM kanji) support contributed by Eiji Tokuya`
`8`	`8`	`*`
`9`		`- * $Id: conv.c,v 1.20 2000/10/30 10:40:28 ishii Exp $`
	`9`	`+ * $Id: conv.c,v 1.21 2000/11/17 04:42:10 ishii Exp $`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`*/`
`@@ -538,15 +538,22 @@ mic2euc_tw(unsigned char mic, unsigned char p, int len)`
`538`	`538`	`{`
`539`	`539`	`len -= pg_mic_mblen(mic++);`
`540`	`540`
`541`		`- if (c1 == LC_CNS11643_1 \|\| c1 == LC_CNS11643_2)`
	`541`	`+ if (c1 == LC_CNS11643_1)`
`542`	`542`	`{`
`543`	`543`	`p++ = mic++;`
`544`	`544`	`p++ = mic++;`
`545`	`545`	`}`
	`546`	`+ else if (c1 == LC_CNS11643_2)`
	`547`	`+ {`
	`548`	`+ *p++ = SS2;`
	`549`	`+ *p++ = 0xa2;`
	`550`	`+ p++ = mic++;`
	`551`	`+ p++ = mic++;`
	`552`	`+ }`
`546`	`553`	`else if (c1 == 0x9d)`
`547`	`554`	`{ /* LCPRV2? */`
`548`	`555`	`*p++ = SS2;`
`549`		`- *p++ = c1 - LC_CNS11643_3 + 0xa3;`
	`556`	`+ p++ = mic++ - LC_CNS11643_3 + 0xa3;`
`550`	`557`	`p++ = mic++;`
`551`	`558`	`p++ = mic++;`
`552`	`559`	`}`
`@@ -573,7 +580,7 @@ big52mic(unsigned char big5, unsigned char p, int len)`
`573`	`580`	`unsigned short big5buf,`
`574`	`581`	`cnsBuf;`
`575`	`582`	`unsigned char lc;`
`576`		`- char bogusBuf[2];`
	`583`	`+ char bogusBuf[3];`
`577`	`584`	`int i;`
`578`	`585`
`579`	`586`	`while (len > 0 && (c1 = *big5++))`