Commitf52e734

committed

MB patches from Tatsuo Ishii

1 parent31fea97 commitf52e734Copy full SHA for f52e734

File tree

+46

-3

lines changed

+46

-3

lines changed

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.39 1998/09/01 04:32:53 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.40 1998/09/25 01:46:21 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -147,7 +147,14 @@ bpchar(char *s, int32 len)`
`147`	`147`	`if ((len==-1)\|\| (len==VARSIZE(s)))`
`148`	`148`	`returns;`
`149`	`149`
	`150`	`+#ifdefMULTIBYTE`
	`151`	`+/* truncate multi-byte string in a way not to break`
	`152`	`+ multi-byte boundary */`
	`153`	`+rlen=pg_mbcliplen(VARDATA(s),len-VARHDRSZ,len-VARHDRSZ);`
	`154`	`+len=rlen+VARHDRSZ;`
	`155`	`+#else`
`150`	`156`	`rlen=len-VARHDRSZ;`
	`157`	`+#endif`
`151`	`158`
`152`	`159`	`if (rlen>4096)`
`153`	`160`	`elog(ERROR,"bpchar: length of char() must be less than 4096");`
`@@ -367,7 +374,14 @@ varchar(char *s, int32 slen)`
`367`	`374`
`368`	`375`	`/* only reach here if we need to truncate string... */`
`369`	`376`
	`377`	`+#ifdefMULTIBYTE`
	`378`	`+/* truncate multi-byte string in a way not to break`
	`379`	`+ multi-byte boundary */`
	`380`	`+len=pg_mbcliplen(VARDATA(s),slen-VARHDRSZ,slen-VARHDRSZ);`
	`381`	`+slen=len+VARHDRSZ;`
	`382`	`+#else`
`370`	`383`	`len=slen-VARHDRSZ;`
	`384`	`+#endif`
`371`	`385`
`372`	`386`	`if (len>4096)`
`373`	`387`	`elog(ERROR,"varchar: length of varchar() must be less than 4096");`

Lines changed: 29 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* client encoding and server internal encoding.`
`4`	`4`	`* (currently mule internal code (mic) is used)`
`5`	`5`	`* Tatsuo Ishii`
`6`		`- * $Id: mbutils.c,v 1.3 1998/09/01 04:33:22 momjian Exp $ */`
	`6`	`+ * $Id: mbutils.c,v 1.4 1998/09/25 01:46:23 momjian Exp $ */`
`7`	`7`
`8`	`8`	`#include<stdio.h>`
`9`	`9`	`#include<string.h>`
`@@ -201,6 +201,34 @@ pg_mbstrlen_with_len(const unsigned char *mbstr, int limit)`
`201`	`201`	`return (len);`
`202`	`202`	`}`
`203`	`203`
	`204`	`+/*`
	`205`	`+ * returns the length of a multi-byte string`
	`206`	`+ * (not necessarily NULL terminated)`
	`207`	`+ * that is not longer than limit.`
	`208`	`+ * this function does not break multi-byte word boundary.`
	`209`	`+ */`
	`210`	`+int`
	`211`	`+pg_mbcliplen(constunsignedchar*mbstr,intlen,intlimit)`
	`212`	`+{`
	`213`	`+intclen=0;`
	`214`	`+intl;`
	`215`	`+`
	`216`	`+while (*mbstr&&len>0)`
	`217`	`+{`
	`218`	`+l=pg_mblen(mbstr);`
	`219`	`+if ((clen+l)>limit) {`
	`220`	`+break;`
	`221`	`+}`
	`222`	`+clen+=l;`
	`223`	`+if (clen==limit) {`
	`224`	`+break;`
	`225`	`+}`
	`226`	`+len-=l;`
	`227`	`+mbstr+=l;`
	`228`	`+}`
	`229`	`+return (clen);`
	`230`	`+}`
	`231`	`+`
`204`	`232`	`/*`
`205`	`233`	`* fuctions for utils/init`
`206`	`234`	`*/`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Id: pg_wchar.h,v 1.4 1998/09/01 04:36:34 momjian Exp $ */`
	`1`	`+/* $Id: pg_wchar.h,v 1.5 1998/09/25 01:46:25 momjian Exp $ */`
`2`	`2`
`3`	`3`	`#ifndefPG_WCHAR_H`
`4`	`4`	`#definePG_WCHAR_H`
`@@ -103,6 +103,7 @@ extern intpg_mule_mblen(const unsigned char *);`
`103`	`103`	`externintpg_mic_mblen(constunsignedchar*);`
`104`	`104`	`externintpg_mbstrlen(constunsignedchar*);`
`105`	`105`	`externintpg_mbstrlen_with_len(constunsignedchar*,int);`
	`106`	`+externintpg_mbcliplen(constunsignedchar*,int,int);`
`106`	`107`	`externpg_encoding_conv_tbl*pg_get_encent_by_encoding(int);`
`107`	`108`	`externboolshow_client_encoding(void);`
`108`	`109`	`externboolreset_client_encoding(void);`

Comments

(0)