From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 20 Nov 2007 19:24:26 +0000 (+0000)
Subject: Fix pg_ctl -t to register -t value, per Alvaro.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=d74e553ffce77889e8358fb083a4ac02744eb593;p=users%2Fbernd%2Fpostgres.git

Fix pg_ctl -t to register -t value, per Alvaro.
---

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 0627c7a93f..b8bf1488a3 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -77,10 +77,11 @@ typedef enum
 	RUN_AS_SERVICE_COMMAND
 } CtlCommand;
 
+#define DEFAULT_WAIT	60
 
 static bool do_wait = false;
 static bool wait_set = false;
-static int	wait_seconds = 60;
+static int	wait_seconds = DEFAULT_WAIT;
 static bool silent_mode = false;
 static ShutdownMode shutdown_mode = SMART_MODE;
 static int	sig = SIGTERM;		/* default */
@@ -1031,6 +1032,10 @@ pgwin32_CommandLine(bool registration)
 	if (registration && do_wait)
 		strcat(cmdLine, " -w");
 
+	if (registration && wait_seconds != DEFAULT_WAIT)
+		/* concatenate */
+		sprintf(cmdLine + strlen(cmdLine), " -t %d", wait_seconds);
+
 	if (post_opts)
 	{
 		strcat(cmdLine, " ");
@@ -1472,7 +1477,8 @@ do_help(void)
 	printf(_("Usage:\n"));
 	printf(_("  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"), progname);
 	printf(_("  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"), progname);
-	printf(_("  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n                   [-o \"OPTIONS\"]\n"), progname);
+	printf(_("  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
+		 "                 [-o \"OPTIONS\"]\n"), progname);
 	printf(_("  %s reload  [-D DATADIR] [-s]\n"), progname);
 	printf(_("  %s status  [-D DATADIR]\n"), progname);
 	printf(_("  %s kill    SIGNALNAME PID\n"), progname);