From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Sun, 25 Jun 2006 04:38:08 +0000 (+0000)
Subject: Our version of getopt_long does not set optarg upon detecting an error, as
X-Git-Tag: REL8_0_9~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd7f34ba788e619dd6a5589be61fc94bfd5e426a;p=thirdparty%2Fpostgresql.git

Our version of getopt_long does not set optarg upon detecting an error, as
opposed to what other versions apparently do, so it's not safe to print an
error message.  Besides, getopt_long itself already did, so it's redundant
anyway.
---

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 5aa96f8865f..a698246fb29 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.53.4.3 2006/01/14 16:18:30 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.53.4.4 2006/06/25 04:38:08 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1415,7 +1415,7 @@ main(int argc, char **argv)
 					wait_set = true;
 					break;
 				default:
-					write_stderr(_("%s: invalid option %s\n"), progname, optarg);
+					/* getopt_long already issued a suitable error message */
 					do_advice();
 					exit(1);
 			}