From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 16 Jan 2010 08:31:08 +0000 (+0100)
Subject: Move -h to the end of the emp_server -h output
X-Git-Tag: v4.3.24~11
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=8ededa44f96cd2ed95fd139feb12e5e5f8a8a598

Move -h to the end of the emp_server -h output

This is consistent with the other programs.
---

diff --git a/src/server/main.c b/src/server/main.c
index bfc63179b..a53a4c087 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -105,7 +105,6 @@ print_usage(char *program_name)
 	   "  -e CONFIG-FILE  configuration file\n"
 	   "                  (default %s)\n"
 	   "  -E ACTION       what to do on oops: abort, crash-dump, nothing (default)\n"
-	   "  -h              display this help and exit\n"
 #ifdef _WIN32
 	   "  -i              install service `%s'\n"
 	   "  -I NAME         install service NAME\n"
@@ -117,6 +116,7 @@ print_usage(char *program_name)
 #endif
 	   "  -s              enable stack checking\n"
 	   "  -R RANDOM-SEED  random seed\n"
+	   "  -h              display this help and exit\n"
 	   "  -v              display version information and exit\n",
 	   program_name, dflt_econfig
 #ifdef _WIN32
@@ -200,6 +200,8 @@ main(int argc, char **argv)
 	}
     }
 
+    /* silently ignore operands for backward compatibility */
+
 #if defined(_WIN32)
     if ((!daemonize || flags || config_file != NULL) &&
 	remove_service_set) {