Fix Karel's patch. Suggested by Eiji Tokuya

tatsuo-ishii · tatsuo-ishii · commit f25ed23c571d · 2001-09-06T05:01:38.000Z
diff --git a/src/interfaces/odbc/multibyte.c b/src/interfaces/odbc/multibyte.c
@@ -71,6 +71,7 @@ unsigned char *
 check_client_encoding(unsigned char *str)
 {
 	if (strstr(str, "%27SJIS%27") || 
+	    strstr(str, "%27Shift_JIS%27") || 
 	    strstr(str, "'SJIS'") || 
 	    strstr(str, "'sjis'") ||
 	    strstr(str, "'Shift_JIS'"))
@@ -79,8 +80,9 @@ check_client_encoding(unsigned char *str)
 		return ("SJIS");
 	}
 	if (strstr(str, "%27BIG5%27") || 
+	    strstr(str, "%27Big5%27") ||
 	    strstr(str, "'BIG5'") || 
-	    strstr(str, "'big5'")
+	    strstr(str, "'big5'") ||
 	    strstr(str, "'Big5'"))
 	{
 		multibyte_client_encoding = BIG5;

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ unsigned char *`
`71`	`71`	`check_client_encoding(unsigned char *str)`
`72`	`72`	`{`
`73`	`73`	`if (strstr(str, "%27SJIS%27") \|\|`
	`74`	`+ strstr(str, "%27Shift_JIS%27") \|\|`
`74`	`75`	`strstr(str, "'SJIS'") \|\|`
`75`	`76`	`strstr(str, "'sjis'") \|\|`
`76`	`77`	`strstr(str, "'Shift_JIS'"))`
`@@ -79,8 +80,9 @@ check_client_encoding(unsigned char *str)`
`79`	`80`	`return ("SJIS");`
`80`	`81`	`}`
`81`	`82`	`if (strstr(str, "%27BIG5%27") \|\|`
	`83`	`+ strstr(str, "%27Big5%27") \|\|`
`82`	`84`	`strstr(str, "'BIG5'") \|\|`
`83`		`- strstr(str, "'big5'")`
	`85`	`+ strstr(str, "'big5'") \|\|`
`84`	`86`	`strstr(str, "'Big5'"))`
`85`	`87`	`{`
`86`	`88`	`multibyte_client_encoding = BIG5;`