From ee075fcb130f834bd5913940b97ad53fd4d21e93 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 7 Apr 2015 23:28:28 +0300 Subject: [PATCH] Fix reporting of missing or invalid command line arguments in pg_rewind. pg_fatal never returns, so a multi-line message cannot be printed by calling it twice. Michael Paquier and Fujii Masao --- src/bin/pg_rewind/pg_rewind.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c index 04d6a46432..93341a3c83 100644 --- a/src/bin/pg_rewind/pg_rewind.c +++ b/src/bin/pg_rewind/pg_rewind.c @@ -157,21 +157,21 @@ main(int argc, char **argv) /* No source given? Show usage */ if (datadir_source == NULL && connstr_source == NULL) { - pg_fatal("no source specified (--source-pgdata or --source-server)\n"); - pg_fatal("Try \"%s --help\" for more information.\n", progname); + fprintf(stderr, _("no source specified (--source-pgdata or --source-server)\n")); + fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); exit(1); } 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); exit(1); } 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); exit(1); } -- 2.40.0