From e6d4f38c67d70fd2a5cfbb2abcb68512da3f4432 Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Tue, 25 Dec 2012 22:09:33 +0200 Subject: [PATCH] win32: use gnu-style for long args: --foo --- doc/usage.txt | 8 ++++---- win32/win32support.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/usage.txt b/doc/usage.txt index 35f815d..3c53f75 100644 --- a/doc/usage.txt +++ b/doc/usage.txt @@ -16,8 +16,8 @@ On Windows computers, the options are: Additional options for setting up a Windows service: - pgbouncer.exe -regservice - pgbouncer.exe -unregservice + pgbouncer.exe --regservice + pgbouncer.exe --unregservice == DESCRIPTION == @@ -133,11 +133,11 @@ Basic setup and usage as following. -h:: Show short help. --regservice:: +--regservice:: Win32: Register pgbouncer to run as Windows service. The +service_name+ config parameter value is used as name to register under. --unregservice:: +--unregservice:: Win32: Unregister Windows service. == ADMIN CONSOLE == diff --git a/win32/win32support.c b/win32/win32support.c index 50dac67..71b625d 100644 --- a/win32/win32support.c +++ b/win32/win32support.c @@ -45,8 +45,8 @@ static const char usage_str[] = " -V Show version\n" " -h Show this help screen and exit\n" "Windows service registration:\n" -" -regservice config.ini [-U username [-P password]]\n" -" -unregservice config.ini\n" +" --regservice config.ini [-U username [-P password]]\n" +" --unregservice config.ini\n" ""; static void usage(int err, char *exe) @@ -209,7 +209,7 @@ static void RegisterService(void) fprintf(stderr, "Failed to determine path name: %s\n", strerror(GetLastError())); exit(1); } - snprintf(cmdline, sizeof(cmdline), "%s -service \"%s\"", self, config_fn); + snprintf(cmdline, sizeof(cmdline), "%s --service \"%s\"", self, config_fn); manager = openSCM(); service = CreateService(manager, cf_jobname, cf_jobname, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, @@ -282,14 +282,14 @@ int main(int argc, char *argv[]) /* service cmdline */ if (argc >= 3) { - if (!strcmp(argv[1], "-service")) { + if (!strcmp(argv[1], "--service") || !strcmp(argv[1], "-service")) { cf_quiet = 1; cf_config_file = argv[2]; win32_servicestart(); return 0; } - if (!strcmp(argv[1], "-regservice")) { + if (!strcmp(argv[1], "--regservice") || !strcmp(argv[1], "-regservice")) { int i; win32_load_config(argv[2]); for (i = 3; i < argc; i++) { @@ -306,7 +306,7 @@ int main(int argc, char *argv[]) return 0; } - if (!strcmp(argv[1], "-unregservice")) { + if (!strcmp(argv[1], "--unregservice") || !strcmp(argv[1], "-unregservice")) { win32_load_config(argv[2]); UnRegisterService(); return 0; -- 2.40.0