Fix bugs in EUC_TW support. This fix includes patches contributed

tatsuo-ishii · tatsuo-ishii · commit 976a456b19f3 · 2000-11-17T04:53:54.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.15 2000/05/20 13:12:26 ishii Exp $
+ * $Id: conv.c,v 1.15.2.1 2000/11/17 04:53:54 ishii Exp $
  *
  *
  */
@@ -906,15 +906,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++;
 		}
@@ -941,7 +948,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.15 2000/05/20 13:12:26 ishii Exp $`
	`9`	`+ * $Id: conv.c,v 1.15.2.1 2000/11/17 04:53:54 ishii Exp $`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`*/`
`@@ -906,15 +906,22 @@ mic2euc_tw(unsigned char mic, unsigned char p, int len)`
`906`	`906`	`{`
`907`	`907`	`len -= pg_mic_mblen(mic++);`
`908`	`908`
`909`		`- if (c1 == LC_CNS11643_1 \|\| c1 == LC_CNS11643_2)`
	`909`	`+ if (c1 == LC_CNS11643_1)`
`910`	`910`	`{`
`911`	`911`	`p++ = mic++;`
`912`	`912`	`p++ = mic++;`
`913`	`913`	`}`
	`914`	`+ else if (c1 == LC_CNS11643_2)`
	`915`	`+ {`
	`916`	`+ *p++ = SS2;`
	`917`	`+ *p++ = 0xa2;`
	`918`	`+ p++ = mic++;`
	`919`	`+ p++ = mic++;`
	`920`	`+ }`
`914`	`921`	`else if (c1 == 0x9d)`
`915`	`922`	`{ /* LCPRV2? */`
`916`	`923`	`*p++ = SS2;`
`917`		`- *p++ = c1 - LC_CNS11643_3 + 0xa3;`
	`924`	`+ p++ = mic++ - LC_CNS11643_3 + 0xa3;`
`918`	`925`	`p++ = mic++;`
`919`	`926`	`p++ = mic++;`
`920`	`927`	`}`
`@@ -941,7 +948,7 @@ big52mic(unsigned char big5, unsigned char p, int len)`
`941`	`948`	`unsigned short big5buf,`
`942`	`949`	`cnsBuf;`
`943`	`950`	`unsigned char lc;`
`944`		`- char bogusBuf[2];`
	`951`	`+ char bogusBuf[3];`
`945`	`952`	`int i;`
`946`	`953`
`947`	`954`	`while (len > 0 && (c1 = *big5++))`