Check help and version argument early

Check for the help and version arguments makes sure that it's
always possible to get the version and usage even if there are
issues in other parts of the code.

diff --git a/shairport.c b/shairport.c
index 21d20dfd4bf4a862056bbacdc108fa60b416c4f6..cc1a790f21fa502063daa9a1f01859cd930a636c 100644 (file)
--- a/shairport.c
+++ b/shairport.c
@@ -1363,6 +1363,18 @@ void exit_function() {
 }
 
 int main(int argc, char **argv) {
+  /* Check if we are called with -V or --version parameter */
+  if (argc >= 2 && ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0))) {
+    print_version();
+    exit(EXIT_FAILURE);
+  }
+
+  /* Check if we are called with -h or --help parameter */
+  if (argc >= 2 && ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0))) {
+    usage(argv[0]);
+    exit(EXIT_FAILURE);
+  }
+
 #ifdef CONFIG_LIBDAEMON
   pid = getpid();
 #endif
@@ -1468,18 +1480,6 @@ int main(int argc, char **argv) {
 
   r64arrayinit();
 
-  /* Check if we are called with -V or --version parameter */
-  if (argc >= 2 && ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0))) {
-    print_version();
-    exit(EXIT_FAILURE);
-  }
-
-  /* Check if we are called with -h or --help parameter */
-  if (argc >= 2 && ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0))) {
-    usage(argv[0]);
-    exit(EXIT_FAILURE);
-  }
-
 #ifdef CONFIG_LIBDAEMON
 
   /* Reset signal handlers */