Commit29eabaa

committed

Returns exit status 1 if invalid encoding name or

encoding number is given.

1 parentc918be6 commit29eabaaCopy full SHA for 29eabaa

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 11 additions & 4 deletions

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/bin/pg_encoding/Attic/pg_encoding.c,v 1.10 2001/10/25 05:49:53 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/pg_encoding.c,v 1.11 2002/10/20 11:33:48 ishii Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -57,8 +57,12 @@ main(int argc, char **argv)`
`57`	`57`	`if ((name= (char*)pg_encoding_to_char(enc)))`
`58`	`58`	`{`
`59`	`59`	`if (be_only&&pg_valid_server_encoding(name)<0)`
`60`		`-exit(0);`
`61`		`-printf("%s\n",name);`
	`60`	`+exit(1);`
	`61`	`+/* pg_encoding_to_char() returns "" if invalid encoding number is given */`
	`62`	`+elseif (strcmp("",name))`
	`63`	`+printf("%s\n",name);`
	`64`	`+else`
	`65`	`+exit(1);`
`62`	`66`	`}`
`63`	`67`	`exit(0);`
`64`	`68`	`}`
`@@ -70,9 +74,12 @@ main(int argc, char **argv)`
`70`	`74`	`if ((enc=pg_char_to_encoding(p)) >=0)`
`71`	`75`	`{`
`72`	`76`	`if (be_only&&pg_valid_server_encoding(p)<0)`
`73`		`-exit(0);`
	`77`	`+exit(1);`
`74`	`78`	`printf("%d\n",enc);`
`75`	`79`	`}`
	`80`	`+else`
	`81`	`+exit(1);`
	`82`	`+`
`76`	`83`	`exit(0);`
`77`	`84`	`}`
`78`	`85`	`exit(1);`

Comments

(0)