From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Tue, 7 Apr 2015 20:28:28 +0000 (+0300)
Subject: Fix reporting of missing or invalid command line arguments in pg_rewind.
X-Git-Tag: REL9_5_ALPHA1~477
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee075fcb130f834bd5913940b97ad53fd4d21e93;p=postgresql

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
---

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);
 	}