config: fix incompatible with jshn network-device entry

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index bbae97b72238e1333b3c3ced59bcb9ac30b75bd4..ec7b1be036337ec61c9fd04eac05cc0691193859 100644 (file)
--- a/main.c
+++ b/main.c
@@ -26,6 +26,7 @@
 #include "interface.h"
 #include "wireless.h"
 #include "proto.h"
+#include "extdev.h"
 
 unsigned int debug_mask = 0;
 const char *main_path = DEFAULT_MAIN_PATH;
@@ -56,12 +57,14 @@ static bool use_syslog = true;
 static void
 netifd_delete_process(struct netifd_process *proc)
 {
+       while (ustream_poll(&proc->log.stream));
        list_del(&proc->list);
        ustream_free(&proc->log.stream);
        close(proc->log.fd.fd);
 }
 
 void
+__attribute__((format(printf, 2, 0)))
 netifd_log_message(int priority, const char *format, ...)
 {
        va_list vl;
@@ -126,9 +129,9 @@ netifd_process_cb(struct uloop_process *proc, int ret)
        struct netifd_process *np;
        np = container_of(proc, struct netifd_process, uloop);
 
-       while (ustream_poll(&np->log.stream));
        netifd_delete_process(np);
-       return np->cb(np, ret);
+       np->cb(np, ret);
+       return;
 }
 
 int
@@ -173,9 +176,6 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
                exit(127);
        }
 
-       if (pid < 0)
-               goto error;
-
        close(pfds[1]);
        proc->uloop.cb = netifd_process_cb;
        proc->uloop.pid = pid;
@@ -211,9 +211,9 @@ static void netifd_do_restart(struct uloop_timeout *timeout)
        execvp(global_argv[0], global_argv);
 }
 
-void netifd_reload(void)
+int netifd_reload(void)
 {
-       config_init_all();
+       return config_init_all();
 }
 
 void netifd_restart(void)
@@ -235,10 +235,10 @@ static int usage(const char *progname)
                " -p <path>:            Path to netifd addons (default: %s)\n"
                " -c <path>:            Path to UCI configuration\n"
                " -h <path>:            Path to the hotplug script\n"
+               "                       (default: "DEFAULT_HOTPLUG_PATH")\n"
                " -r <path>:            Path to resolv.conf\n"
                " -l <level>:           Log output level (default: %d)\n"
                " -S:                   Use stderr instead of syslog for log messages\n"
-               "                       (default: "DEFAULT_HOTPLUG_PATH")\n"
                "\n", progname, main_path, DEFAULT_LOG_LEVEL);
 
        return 1;
@@ -305,8 +305,8 @@ int main(int argc, char **argv)
                        break;
                case 'l':
                        log_level = atoi(optarg);
-                       if (log_level >= ARRAY_SIZE(log_class))
-                               log_level = ARRAY_SIZE(log_class) - 1;
+                       if (log_level >= (int)ARRAY_SIZE(log_class))
+                               log_level = (int)ARRAY_SIZE(log_class) - 1;
                        break;
 #ifndef DUMMY_MODE
                case 'S':
@@ -328,6 +328,7 @@ int main(int argc, char **argv)
        }
 
        proto_shell_init();
+       extdev_init();
        wireless_init();
 
        if (system_init()) {