[PATCH] added execelent "writing udev rules" document from Daniel Drake <dan@reactiva...

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 9b4d91f75cea26373c9aebc7688b0d992d0c3089..192bed97d812238ba26a0c17610d6694afbb607d 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -20,17 +20,18 @@
  *
  */
 
+#include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <errno.h>
 #include <ctype.h>
+#include <errno.h>
 #include <signal.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
@@ -59,7 +60,6 @@ static void sig_handler(int signum)
        switch (signum) {
                case SIGINT:
                case SIGTERM:
-                       sysbus_disconnect();
                        udevdb_exit();
                        exit(20 + signum);
                default:
@@ -68,7 +68,6 @@ static void sig_handler(int signum)
 }
 
 static char *subsystem_blacklist[] = {
-       "net",
        "scsi_host",
        "scsi_device",
        "usb_host",
@@ -85,6 +84,7 @@ static int udev_hotplug(void)
        int retval = -EINVAL;
        int i;
        struct sigaction act;
+       const int nofake = 0;
 
        action = get_action();
        if (!action) {
@@ -121,14 +121,11 @@ static int udev_hotplug(void)
                i++;
        }
 
-       /* 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_sysbus;
+               goto exit;
        }
 
        /* set up a default signal handler for now */
@@ -138,30 +135,25 @@ static int udev_hotplug(void)
        sigaction(SIGINT, &act, NULL);
        sigaction(SIGTERM, &act, NULL);
 
-       /* initialize the naming deamon */
-       namedev_init();
-
-       if (strcmp(action, "add") == 0)
-               retval = udev_add_device(devpath, subsystem, 0);
+       if (strcmp(action, "add") == 0) {
+               namedev_init();
+               retval = udev_add_device(devpath, subsystem, nofake);
+               goto action_done;
+       }
 
-       else if (strcmp(action, "remove") == 0)
+       if (strcmp(action, "remove") == 0) {
                retval = udev_remove_device(devpath, subsystem);
-
-       else {
-               dbg("unknown action '%s'", action);
-               retval = -EINVAL;
+               goto action_done;
        }
-       udevdb_exit();
 
-exit_sysbus:
-       /* disconnect from the system message bus */
-       sysbus_disconnect();
+       dbg("unknown action '%s'", action);
+       retval = -EINVAL;
 
-exit:
-       if (retval > 0)
-               retval = 0;
+action_done:
+       udevdb_exit();
 
-       return -retval;
+exit:
+       return retval;
 }
 
 int main(int argc, char *argv[], char *envp[])