X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=52b98c8d452efb8d99a94a82005d42ce797479ba;hp=9b4d91f75cea26373c9aebc7688b0d992d0c3089;hb=ddc8f83132368098e63634dd355cde7d787fc85c;hpb=d00bd1724bd9f75f5a7b8e0368428c2f0d6d3c26

diff --git a/udev.c b/udev.c
index 9b4d91f75..52b98c8d4 100644
--- 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:
@@ -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,24 +135,19 @@ static int udev_hotplug(void)
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
 
-	/* initialize the naming deamon */
-	namedev_init();
-
-	if (strcmp(action, "add") == 0)
+	if (strcmp(action, "add") == 0) {
+		namedev_init();
 		retval = udev_add_device(devpath, subsystem, 0);
-
-	else if (strcmp(action, "remove") == 0)
-		retval = udev_remove_device(devpath, subsystem);
-
-	else {
-		dbg("unknown action '%s'", action);
-		retval = -EINVAL;
+	} else {
+		if (strcmp(action, "remove") == 0) {
+			retval = udev_remove_device(devpath, subsystem);
+		} else {
+			dbg("unknown action '%s'", action);
+			retval = -EINVAL;
+		}
 	}
-	udevdb_exit();
 
-exit_sysbus:
-	/* disconnect from the system message bus */
-	sysbus_disconnect();
+	udevdb_exit();
 
 exit:
 	if (retval > 0)