[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 67b86e5916ced757a921bbbd442bee3e876c6298..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,6 +41,22 @@
 char **main_argv;
 char **main_envp;
 
+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)
 {
        char *action;
@@ -63,67 +81,13 @@ static inline char *get_seqnum(void)
        return seqnum;
 }
 
-#ifdef USE_DBUS
-
-/** Global variable for the connection the to system message bus or #NULL
- *  if we cannot connect or acquire the org.kernel.udev service
- */
-DBusConnection* sysbus_connection;
-
-/** Disconnect from the system message bus */
-static void sysbus_disconnect()
-{
-        if (sysbus_connection == NULL)
-                return;
-
-        dbus_connection_disconnect(sysbus_connection);
-        sysbus_connection = NULL;
-}
-
-/** Connect to the system message bus */
-static void sysbus_connect()
-{
-        DBusError error;
-
-        /* Connect to a well-known bus instance, the system bus */
-        dbus_error_init(&error);
-        sysbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
-        if (sysbus_connection == NULL) {
-                dbg("cannot connect to system message bus, error %s: %s", 
-                    error.name, error.message);
-                dbus_error_free(&error);
-                return;
-        }
-
-        /*  Acquire the org.kernel.udev service such that listeners
-         *  know that the message is really from us and not from a
-         *  random attacker. See the file udev_sysbus_policy.conf for
-         *  details.
-         *
-         *  Note that a service can have multiple owners (though there
-         *  is a concept of a primary owner for reception of messages)
-         *  so no race is introduced if two copies of udev is running
-         *  at the same time.
-         */
-        dbus_bus_acquire_service(sysbus_connection, "org.kernel.udev", 0, 
-                                 &error);
-        if (dbus_error_is_set(&error)) {
-                printf("cannot acquire org.kernel.udev service, error %s: %s'",
-                       error.name, error.message);
-                sysbus_disconnect();
-                return;
-        }
-}
-
-#endif /* USE_DBUS */
-
 int main(int argc, char **argv, char **envp)
 {
        char *action;
        char *devpath;
        char *subsystem;
        int retval = -EINVAL;
-       
+
        main_argv = argv;
        main_envp = envp;
 
@@ -165,18 +129,21 @@ int main(int argc, char **argv, char **envp)
        /* initialize our configuration */
        udev_init_config();
 
-#ifdef USE_DBUS
-        /* connect to the system message bus */
-        sysbus_connect();
-#endif /* USE_DBUS */
+       /* 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();
 
@@ -192,11 +159,10 @@ int main(int argc, char **argv, char **envp)
        }
        udevdb_exit();
 
-#ifdef USE_DBUS
-        /* disconnect from the system message bus */
-        sysbus_disconnect();
-#endif /* USE_DBUS */
+exit_sysbus:
+       /* disconnect from the system message bus */
+       sysbus_disconnect();
 
-exit:  
+exit:
        return retval;
 }