From 885a4d3d9acdac41ca52c7ed2d358754549e0e97 Mon Sep 17 00:00:00 2001
From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Sun, 25 Jun 2006 04:37:55 +0000
Subject: [PATCH] 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.
---
src/bin/pg_ctl/pg_ctl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 046bf6ac93d..32aab1beb08 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-2006, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.69 2006/06/18 15:38:37 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.70 2006/06/25 04:37:55 alvherre Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1608,7 +1608,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);
}
--
GitLab