static char *argv0 = NULL;
static bool allow_core_files = false;
static time_t start_time;
-@@ -2055,6 +2056,9 @@ do_help(void)
+@@ -2087,6 +2088,9 @@ do_help(void)
#endif
printf(_(" -s, --silent only print errors, no informational messages\n"));
printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n"));
printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -w, --wait wait until operation completes (default)\n"));
printf(_(" -W, --no-wait do not wait until operation completes\n"));
-@@ -2267,6 +2271,7 @@ main(int argc, char **argv)
+@@ -2299,6 +2303,7 @@ main(int argc, char **argv)
{"options", required_argument, NULL, 'o'},
{"silent", no_argument, NULL, 's'},
{"timeout", required_argument, NULL, 't'},
{"core-files", no_argument, NULL, 'c'},
{"wait", no_argument, NULL, 'w'},
{"no-wait", no_argument, NULL, 'W'},
-@@ -2307,20 +2312,6 @@ main(int argc, char **argv)
+@@ -2339,20 +2344,6 @@ main(int argc, char **argv)
}
}
env_wait = getenv("PGCTLTIMEOUT");
if (env_wait != NULL)
-@@ -2407,11 +2398,15 @@ main(int argc, char **argv)
+@@ -2439,11 +2430,15 @@ main(int argc, char **argv)
wait_seconds_arg = true;
break;
case 'U':
break;
case 'w':
do_wait = true;
-@@ -2493,6 +2488,41 @@ main(int argc, char **argv)
+@@ -2525,6 +2520,41 @@ main(int argc, char **argv)
exit(1);
}