mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix reporting of missing or invalid command line arguments in pg_rewind.

Browse Source 
pg_fatal never returns, so a multi-line message cannot be printed by
calling it twice.

Michael Paquier and Fujii Masao
This commit is contained in:
Heikki Linnakangas 2015-04-07 23:28:28 +03:00
parent 4e17e32f53
commit ee075fcb13
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/pg_rewind/pg_rewind.c
View File

@ -157,21 +157,21 @@ main(int argc, char **argv)
/* No source given? Show usage */ /* No source given? Show usage */
if (datadir_source == NULL && connstr_source == NULL) if (datadir_source == NULL && connstr_source == NULL)
{ {
pg_fatal("no source specified (--source-pgdata or --source-server)\n"); fprintf(stderr, _("no source specified (--source-pgdata or --source-server)\n"));
pg_fatal("Try \"%s --help\" for more information.\n", progname); fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1); exit(1);
} }
if (datadir_target == NULL) if (datadir_target == NULL)
{ {
pg_fatal("no target data directory specified (--target-pgdata)\n"); fprintf(stderr, _("no target data directory specified (--target-pgdata)\n"));
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1); exit(1);
} }
if (argc != optind) if (argc != optind)
{ {
pg_fatal("%s: invalid arguments\n", progname); fprintf(stderr, _("invalid arguments\n"));
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1); exit(1);
} }