wireless: defer init until after command line option processing

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index c1f55e9..fb6deed 100644 (file)
--- a/main.c
+++ b/main.c
@@ -15,7 +15,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
-#include <unistd.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <syslog.h>
@@ -25,6 +24,7 @@
 #include "config.h"
 #include "system.h"
 #include "interface.h"
+#include "wireless.h"
 
 unsigned int debug_mask = 0;
 const char *main_path = DEFAULT_MAIN_PATH;
@@ -144,6 +144,8 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
                goto error;
 
        if (!pid) {
+               int i;
+
                if (env) {
                        while (*env) {
                                putenv(*env);
@@ -151,14 +153,19 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
                        }
                }
                if (proc->dir_fd >= 0)
-                       fchdir(proc->dir_fd);
-
-               dup2(pfds[1], 0);
-               dup2(pfds[1], 1);
-               dup2(pfds[1], 2);
+                       if (fchdir(proc->dir_fd)) {}
 
                close(pfds[0]);
-               close(pfds[1]);
+
+               for (i = 0; i <= 2; i++) {
+                       if (pfds[1] == i)
+                               continue;
+
+                       dup2(pfds[1], i);
+               }
+
+               if (pfds[1] > 2)
+                       close(pfds[1]);
 
                execvp(argv[0], (char **) argv);
                exit(127);
@@ -319,6 +326,8 @@ int main(int argc, char **argv)
                return 1;
        }
 
+       wireless_init();
+
        if (system_init()) {
                fprintf(stderr, "Failed to initialize system control\n");
                return 1;