NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb49c879

committed

Fix psql's copy of utf2ucs() to match the backend's copy exactly;

in particular, propagate a fix in the test to see whether a UTF8 character haslength 4 bytes. This is likely of little real-world consequence because5-or-more-byte UTF8 sequences are not supported by Postgres nor seen anywherein the wild, but still we may as well get it right. Problem found by JosephAdams.Bug is aboriginal, so back-patch all the way.

1 parentf0f46ed commitb49c879Copy full SHA for b49c879

File tree

1 file changed

-10

lines changed

src/bin/psql
- mbprint.c

1 file changed

-10

lines changed

`‎src/bin/psql/mbprint.c`

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2010, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.38 2010/01/02 16:57:59 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.39 2010/08/16 00:06:18 tgl Exp $`
`7`	`7`	`*`
`8`	`8`	`* XXX this file does not really belong in psql/. Perhaps move to libpq?`
`9`	`9`	`* It also seems that the mbvalidate function is redundant with existing`
`@@ -53,28 +53,20 @@ utf2ucs(const unsigned char *c)`
`53`	`53`	`if ((*c&0x80)==0)`
`54`	`54`	`return (pg_wchar)c[0];`
`55`	`55`	`elseif ((*c&0xe0)==0xc0)`
`56`		`-{`
`57`	`56`	`return (pg_wchar) (((c[0]&0x1f) <<6) \|`
`58`	`57`	`(c[1]&0x3f));`
`59`		`-}`
`60`	`58`	`elseif ((*c&0xf0)==0xe0)`
`61`		`-{`
`62`	`59`	`return (pg_wchar) (((c[0]&0x0f) <<12) \|`
`63`	`60`	`((c[1]&0x3f) <<6) \|`
`64`	`61`	`(c[2]&0x3f));`
`65`		`-}`
`66`		`-elseif ((*c&0xf0)==0xf0)`
`67`		`-{`
	`62`	`+elseif ((*c&0xf8)==0xf0)`
`68`	`63`	`return (pg_wchar) (((c[0]&0x07) <<18) \|`
`69`	`64`	`((c[1]&0x3f) <<12) \|`
`70`	`65`	`((c[2]&0x3f) <<6) \|`
`71`	`66`	`(c[3]&0x3f));`
`72`		`-}`
`73`	`67`	`else`
`74`		`-{`
`75`	`68`	`/* that is an invalid code on purpose */`
`76`	`69`	`return0xffffffff;`
`77`		`-}`
`78`	`70`	`}`
`79`	`71`
`80`	`72`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb49c879

File tree

1 file changed

1 file changed

`‎src/bin/psql/mbprint.c`

0 commit comments