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

hlinnaka · hlinnaka · commit ee075fcb130f · 2015-04-07T23:28:28.000+03:00
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
@@ -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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -157,21 +157,21 @@ main(int argc, char **argv)`
`157`	`157`	`/* No source given? Show usage */`
`158`	`158`	`if (datadir_source == NULL && connstr_source == NULL)`
`159`	`159`	`{`
`160`		`- pg_fatal("no source specified (--source-pgdata or --source-server)\n");`
`161`		`- pg_fatal("Try \"%s --help\" for more information.\n", progname);`
	`160`	`+ fprintf(stderr, _("no source specified (--source-pgdata or --source-server)\n"));`
	`161`	`+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);`
`162`	`162`	`exit(1);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`if (datadir_target == NULL)`
`166`	`166`	`{`
`167`		`- pg_fatal("no target data directory specified (--target-pgdata)\n");`
	`167`	`+ fprintf(stderr, _("no target data directory specified (--target-pgdata)\n"));`
`168`	`168`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);`
`169`	`169`	`exit(1);`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`if (argc != optind)`
`173`	`173`	`{`
`174`		`- pg_fatal("%s: invalid arguments\n", progname);`
	`174`	`+ fprintf(stderr, _("invalid arguments\n"));`
`175`	`175`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);`
`176`	`176`	`exit(1);`
`177`	`177`	`}`