(main) [_WIN32]: Add check to command line checks to ensure

-p is not used with install or remove sevice options.

(main) [_WIN32]: Improve error messages for errors found
duing the command line checks.

diff --git a/src/server/main.c b/src/server/main.c
index f9006c101bc2b03c35ae2543effef1adf9e336f4..aa248f07d8ef7917878d984b303385f21b3b9057 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -168,20 +168,20 @@ main(int argc, char **argv)
     }
 
 #if defined(_WIN32)
-    if ((debug || datadir_set || config_file != NULL) &&
+    if ((debug || flags || datadir_set || config_file != NULL) &&
        remove_service_set) {
-       fprintf(stderr, "Can't use -d, -D or -e with either "
-           "-r or -R options when starting the server\n");
+       fprintf(stderr, "Can't use -p, -d, -D or -e with either "
+           "-r or -R options\n");
        exit(EXIT_FAILURE);
     }
-    if (debug && install_service_set) {
-       fprintf(stderr, "Can't use -d with either "
-           "-i or -I options when starting the server\n");
+    if ((debug || flags) && install_service_set) {
+       fprintf(stderr, "Can't use -d or -p with either "
+           "-i or -I options\n");
        exit(EXIT_FAILURE);
     }
     if (install_service_set && remove_service_set) {
-       fprintf(stderr, "Can't use both -r or -R and -i or -I options when starting "
-           "the server\n");
+       fprintf(stderr, "Can't use both -r or -R and -i or -I "
+           "options\n");
        exit(EXIT_FAILURE);
     }
 #endif /* _WIN32 */