win32: more fixes

- proper message id
- fix bugs in cmdline validation

diff --git a/src/main.c b/src/main.c
index 5e0a3181681078457671d261f6b1304c9b3262f6..2209cfc93665f8f554f171e2253a494338d35976 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -665,8 +665,10 @@ int main(int argc, char *argv[])
                        usage(1, argv[0]);
                }
        }
-       if (optind + 1 != argc)
-               usage(1, argv[0]);
+       if (optind + 1 != argc) {
+               fprintf(stderr, "Need config file.  See pgbouncer -h for usage.\n");
+               exit(1);
+       }
        cf_config_file = argv[optind];
 
        init_objects();

diff --git a/win32/eventmsg.mc b/win32/eventmsg.mc
index 11a430fd97ef840c4086dc75615d7a0eb1f4c68a..085c629a1f8336c76dcf383b75a9a99d4a4eecc4 100644 (file)
--- a/win32/eventmsg.mc
+++ b/win32/eventmsg.mc
@@ -1,5 +1,5 @@
 MessageId=0
-SymbolicName=0x00000000L
+SymbolicName=MSG_PGBOUNCER
 Language=English
 %1
 .

diff --git a/win32/eventmsg.rc b/win32/eventmsg.rc
index 0885a897e6f8c8941aa9a6ce627e4f9caa1e9196..a928b138ef4ce86a2b16ec9b43603462c47a7a40 100644 (file)
--- a/win32/eventmsg.rc
+++ b/win32/eventmsg.rc
@@ -1,2 +1,2 @@
-LANGUAGE 0x9,0x1
-1 11 MSG00001.bin
+LANGUAGE 0x9,0x1\r
+1 11 "MSG00001.bin"\r

diff --git a/win32/win32support.c b/win32/win32support.c
index 34788d5136640a692c81456fc7af51ee6ef0ff50..b24992e922c02e17012e976ed7a1fcb39cbf5edb 100644 (file)
--- a/win32/win32support.c
+++ b/win32/win32support.c
@@ -45,8 +45,8 @@ static char **children_config_files;
 
 static const char *usage_str =
 "Usage: %s [OPTION]... config.ini\n"
+"  -q            No console messages\n"
 "  -v            Increase verbosity\n"
-"  -u <username> Assume identity of <username>\n"
 "  -V            Show version\n"
 "  -h            Show this help screen and exit\n"
 " <windows service registration>\n"
@@ -660,12 +660,14 @@ int main(int argc, char *argv[])
 
        /* check if regular arguments are in allowed list */
        for (i = 1; i < argc; i++) {
-               char *p = argv[0];
+               char *p = argv[i];
                if (p[0] != '-')
                        continue;
                for (j = 1; p[j]; j++) {
-                       if (!strchr("avhV", p[j]))
+                       if (!strchr("qvhV", p[j]))
                                usage(1, argv[0]);
+                       if (p[j] == 'h')
+                               usage(0, argv[0]);
                }
        }