[PATCH] move the signal handling registration to after we have initialized enough...

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 272afbab6e7ae8b3d8937f091ddf11382b527eae..17eade221ec867a8420c56bc77f6b28c9c5f8a44 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -28,9 +28,11 @@
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
+#include <signal.h>
 
 #include "udev.h"
 #include "udev_version.h"
+#include "udev_dbus.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -39,15 +41,21 @@
 char **main_argv;
 char **main_envp;
 
-char sysfs_path[SYSFS_PATH_MAX];
-char udev_config_dir[PATH_MAX];
-char udev_root[PATH_MAX];
-char udev_db_filename[PATH_MAX+NAME_MAX];
-char udev_permission_filename[PATH_MAX+NAME_MAX];
-char udev_rules_filename[PATH_MAX+NAME_MAX];
-char udev_config_filename[PATH_MAX+NAME_MAX];
-char default_mode_str[NAME_MAX];
-
+static void sig_handler(int signum)
+{
+       dbg("caught signal %d", signum);
+       switch (signum) {
+               case SIGINT:
+               case SIGTERM:
+               case SIGKILL:
+                       sysbus_disconnect();
+                       udevdb_exit();
+                       exit(20 + signum);
+                       break;
+               default:
+                       dbg("unhandled signal");
+       }
+}
 
 static inline char *get_action(void)
 {
@@ -79,7 +87,7 @@ int main(int argc, char **argv, char **envp)
        char *devpath;
        char *subsystem;
        int retval = -EINVAL;
-       
+
        main_argv = argv;
        main_envp = envp;
 
@@ -121,13 +129,21 @@ int main(int argc, char **argv, char **envp)
        /* initialize our configuration */
        udev_init_config();
 
+       /* connect to the system message bus */
+       sysbus_connect();
+
        /* initialize udev database */
        retval = udevdb_init(UDEVDB_DEFAULT);
        if (retval != 0) {
                dbg("unable to initialize database");
-               goto exit;
+               goto exit_sysbus;
        }
 
+       /* set up a default signal handler for now */
+       signal(SIGINT, sig_handler);
+       signal(SIGTERM, sig_handler);
+       signal(SIGKILL, sig_handler);
+
        /* initialize the naming deamon */
        namedev_init();
 
@@ -143,6 +159,10 @@ int main(int argc, char **argv, char **envp)
        }
        udevdb_exit();
 
-exit:  
+exit_sysbus:
+       /* disconnect from the system message bus */
+       sysbus_disconnect();
+
+exit:
        return retval;
 }