Merge branch 'wdd_fix' into 'master'

Fixup parsing cmdline See merge request mer-core/dsme!35
sailfishos · Jun 7, 2021 · 9e500c5 · 9e500c5
2 parents 4cc8501 + 2e9e780
commit 9e500c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/dsme/dsme-server.c b/dsme/dsme-server.c
@@ -267,6 +267,13 @@ int main(int argc, char *argv[])
   signal(SIGHUP,  signal_handler);
   signal(SIGPIPE, signal_handler);
 
+  parse_options(argc, argv, &module_names);
+
+  if (!module_names) {
+      usage(argv[0]);
+      goto EXIT;
+  }
+
   /* protect DSME from oom; notice that this must be done before any
    * calls to pthread_create() in order to have all threads protected
    */
@@ -293,13 +300,6 @@ int main(int argc, char *argv[])
       fprintf(stderr, ME "Couldn't set dynamic priority: %s\n", strerror(errno));
   }
 
-  parse_options(argc, argv, &module_names);
-
-  if (!module_names) {
-      usage(argv[0]);
-      goto EXIT;
-  }
-
   dsme_log_open(logging_method,
                 logging_verbosity,
                 0,

diff --git a/dsme/dsme-wdd.c b/dsme/dsme-wdd.c
@@ -575,6 +575,10 @@ static void trap_terminating_signals(void)
   */
 int main(int argc, char *argv[])
 {
+    // parse command line options
+    int daemon = 0;
+    parse_options(argc, argv, &daemon);
+
     fprintf(stderr, "DSME %s starting up\n", STRINGIFY(PRG_VERSION));
 
     // do the first kick right away
@@ -619,11 +623,6 @@ int main(int argc, char *argv[])
         fprintf(stderr, ME "Couldn't lock to RAM: %s\n", strerror(errno));
     }
 
-
-    // parse command line options
-    int daemon = 0;
-    parse_options(argc, argv, &daemon);
-
     // daemonize
     if (daemon && daemonize() == -1) {
         return EXIT_FAILURE;