Tweak for initdb: if more command-line arguments were specified than

Neil Conway · Neil Conway · commit 087a271327ae · 2007-08-04T21:01:09.000Z
expected, exit with an error, rather than complaining about the error
on stderr but continuing onward.
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.138 2007/07/11 23:15:38 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.139 2007/08/04 21:01:09 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2583,6 +2583,7 @@ main(int argc, char *argv[])
 				progname, argv[optind + 1]);
 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
 				progname);
+		exit(1);
 	}
 
 	if (pwprompt && pwfilename)

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`* Portions Copyright (c) 1994, Regents of the University of California`
`43`	`43`	`* Portions taken from FreeBSD.`
`44`	`44`	`*`
`45`		`- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.138 2007/07/11 23:15:38 tgl Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.139 2007/08/04 21:01:09 neilc Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -2583,6 +2583,7 @@ main(int argc, char *argv[])`
`2583`	`2583`	`progname, argv[optind + 1]);`
`2584`	`2584`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"),`
`2585`	`2585`	`progname);`
	`2586`	`+ exit(1);`
`2586`	`2587`	`}`
`2587`	`2588`
`2588`	`2589`	`if (pwprompt && pwfilename)`