Fix setup of udev context before loading any plugins

[platform/upstream/connman.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 581446e..ede37a0 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -40,12 +40,19 @@ static GMainLoop *main_loop = NULL;
 
 static void sig_term(int sig)
 {
+       connman_info("Terminating");
+
        g_main_loop_quit(main_loop);
 }
 
+static void sig_debug(int sig)
+{
+       __connman_toggle_debug();
+}
+
 static void disconnect_callback(DBusConnection *conn, void *user_data)
 {
-       DBG("D-Bus disconnect");
+       connman_error("D-Bus disconnect");
 
        g_main_loop_quit(main_loop);
 }
@@ -54,6 +61,7 @@ static gchar *option_device = NULL;
 static gchar *option_plugin = NULL;
 static gchar *option_nodevice = NULL;
 static gchar *option_noplugin = NULL;
+static gchar *option_wifi = NULL;
 static gboolean option_detach = TRUE;
 static gboolean option_compat = FALSE;
 static gboolean option_debug = FALSE;
@@ -69,6 +77,8 @@ static GOptionEntry options[] = {
                                "Specify plugins to load", "NAME" },
        { "noplugin", 'P', 0, G_OPTION_ARG_STRING, &option_noplugin,
                                "Specify plugins not to load", "NAME" },
+       { "wifi", 'W', 0, G_OPTION_ARG_STRING, &option_wifi,
+                               "Specify driver for WiFi/Supplicant", "NAME" },
        { "nodaemon", 'n', G_OPTION_FLAG_REVERSE,
                                G_OPTION_ARG_NONE, &option_detach,
                                "Don't fork daemon to background" },
@@ -83,6 +93,18 @@ static GOptionEntry options[] = {
        { NULL },
 };
 
+const char *connman_option_get_string(const char *key)
+{
+       if (g_strcmp0(key, "wifi") == 0) {
+               if (option_wifi == NULL)
+                       return "wext";
+               else
+                       return option_wifi;
+       }
+
+       return NULL;
+}
+
 int main(int argc, char *argv[])
 {
        GOptionContext *context;
@@ -122,11 +144,17 @@ int main(int argc, char *argv[])
                }
        }
 
-       mkdir(STATEDIR, S_IRUSR | S_IWUSR | S_IXUSR |
-                       S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+       if (mkdir(STATEDIR, S_IRUSR | S_IWUSR | S_IXUSR |
+                               S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) < 0) {
+               if (errno != EEXIST)
+                       perror("Failed to create state directory");
+       }
 
-       mkdir(STORAGEDIR, S_IRUSR | S_IWUSR | S_IXUSR |
-                       S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+       if (mkdir(STORAGEDIR, S_IRUSR | S_IWUSR | S_IXUSR |
+                               S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) < 0) {
+               if (errno != EEXIST)
+                       perror("Failed to create storage directory");
+       }
 
        main_loop = g_main_loop_new(NULL, FALSE);
 
@@ -194,6 +222,9 @@ int main(int argc, char *argv[])
        sigaction(SIGINT, &sa, NULL);
        sigaction(SIGTERM, &sa, NULL);
 
+       sa.sa_handler = sig_debug;
+       sigaction(SIGUSR2, &sa, NULL);
+
        g_main_loop_run(main_loop);
 
        __connman_element_stop();
@@ -220,9 +251,5 @@ selftest:
 
        g_main_loop_unref(main_loop);
 
-       rmdir(STORAGEDIR);
-
-       rmdir(STATEDIR);
-
        return 0;
 }