|
@ -8,7 +8,7 @@ |
|
|
static char *argv0 = NULL; |
|
|
static char *argv0 = NULL; |
|
|
static bool allow_core_files = false; |
|
|
static bool allow_core_files = false; |
|
|
static time_t start_time; |
|
|
static time_t start_time; |
|
|
@@ -2055,6 +2056,9 @@ do_help(void)
|
|
|
|
|
|
|
|
|
@@ -2049,6 +2050,9 @@ do_help(void)
|
|
|
#endif |
|
|
#endif |
|
|
printf(_(" -s, --silent only print errors, no informational messages\n")); |
|
|
printf(_(" -s, --silent only print errors, no informational messages\n")); |
|
|
printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n")); |
|
|
printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n")); |
|
@ -18,7 +18,7 @@ |
|
|
printf(_(" -V, --version output version information, then exit\n")); |
|
|
printf(_(" -V, --version output version information, then exit\n")); |
|
|
printf(_(" -w, --wait wait until operation completes (default)\n")); |
|
|
printf(_(" -w, --wait wait until operation completes (default)\n")); |
|
|
printf(_(" -W, --no-wait do not wait until operation completes\n")); |
|
|
printf(_(" -W, --no-wait do not wait until operation completes\n")); |
|
|
@@ -2267,6 +2271,7 @@ main(int argc, char **argv)
|
|
|
|
|
|
|
|
|
@@ -2261,6 +2265,7 @@ main(int argc, char **argv)
|
|
|
{"options", required_argument, NULL, 'o'}, |
|
|
{"options", required_argument, NULL, 'o'}, |
|
|
{"silent", no_argument, NULL, 's'}, |
|
|
{"silent", no_argument, NULL, 's'}, |
|
|
{"timeout", required_argument, NULL, 't'}, |
|
|
{"timeout", required_argument, NULL, 't'}, |
|
@ -26,7 +26,7 @@ |
|
|
{"core-files", no_argument, NULL, 'c'}, |
|
|
{"core-files", no_argument, NULL, 'c'}, |
|
|
{"wait", no_argument, NULL, 'w'}, |
|
|
{"wait", no_argument, NULL, 'w'}, |
|
|
{"no-wait", no_argument, NULL, 'W'}, |
|
|
{"no-wait", no_argument, NULL, 'W'}, |
|
|
@@ -2307,20 +2312,6 @@ main(int argc, char **argv)
|
|
|
|
|
|
|
|
|
@@ -2301,20 +2306,6 @@ main(int argc, char **argv)
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -47,7 +47,7 @@ |
|
|
|
|
|
|
|
|
env_wait = getenv("PGCTLTIMEOUT"); |
|
|
env_wait = getenv("PGCTLTIMEOUT"); |
|
|
if (env_wait != NULL) |
|
|
if (env_wait != NULL) |
|
|
@@ -2407,11 +2398,15 @@ main(int argc, char **argv)
|
|
|
|
|
|
|
|
|
@@ -2400,11 +2391,15 @@ main(int argc, char **argv)
|
|
|
wait_seconds_arg = true; |
|
|
wait_seconds_arg = true; |
|
|
break; |
|
|
break; |
|
|
case 'U': |
|
|
case 'U': |
|
@ -63,7 +63,7 @@ |
|
|
break; |
|
|
break; |
|
|
case 'w': |
|
|
case 'w': |
|
|
do_wait = true; |
|
|
do_wait = true; |
|
|
@@ -2493,6 +2488,41 @@ main(int argc, char **argv)
|
|
|
|
|
|
|
|
|
@@ -2486,6 +2481,41 @@ main(int argc, char **argv)
|
|
|
exit(1); |
|
|
exit(1); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|