mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Returns exit status 1 if invalid encoding name or

Browse Source 
encoding number is given.
This commit is contained in:
Tatsuo Ishii 2002-10-20 11:33:48 +00:00
parent c918be6a17
commit 29eabaa958
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/pg_encoding/pg_encoding.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/pg_encoding.c,v 1.10 2001/10/25 05:49:53 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/pg_encoding.c,v 1.11 2002/10/20 11:33:48 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -57,8 +57,12 @@ main(int argc, char **argv)
if ((name = (char *) pg_encoding_to_char(enc))) if ((name = (char *) pg_encoding_to_char(enc)))
{ {
if (be_only && pg_valid_server_encoding(name) < 0) if (be_only && pg_valid_server_encoding(name) < 0)
exit(0); exit(1);
printf("%s\n", name); /* pg_encoding_to_char() returns "" if invalid encoding number is given */
else if (strcmp("", name))
printf("%s\n", name);
else
exit(1);
} }
exit(0); exit(0);
} }
@ -70,9 +74,12 @@ main(int argc, char **argv)
if ((enc = pg_char_to_encoding(p)) >= 0) if ((enc = pg_char_to_encoding(p)) >= 0)
{ {
if (be_only && pg_valid_server_encoding(p) < 0) if (be_only && pg_valid_server_encoding(p) < 0)
exit(0); exit(1);
printf("%d\n", enc); printf("%d\n", enc);
} }
else
exit(1);
exit(0); exit(0);
} }
exit(1); exit(1);