X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=192bed97d812238ba26a0c17610d6694afbb607d;hp=4486707f426a68f748cf23133fb1afd24c35232a;hb=b1ea9f3ef5aad038b4d31cb3e79749de9afb41f8;hpb=e964c2c05d3d6e2bdb21b3461ed7a4e85315cbc1

diff --git a/udev.c b/udev.c
index 4486707f4..192bed97d 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"
@@ -40,8 +41,8 @@ char **main_argv;
 char **main_envp;
 
 #ifdef LOG
-unsigned char logname[42];
-void log_message (int level, const char *format, ...)
+unsigned char logname[LOGNAME_SIZE];
+void log_message(int level, const char *format, ...)
 {
 	va_list args;
 
@@ -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,15 +68,15 @@ static void sig_handler(int signum)
 }
 
 static char *subsystem_blacklist[] = {
-	"net",
 	"scsi_host",
 	"scsi_device",
 	"usb_host",
 	"pci_bus",
-	"",
+	"pcmcia_socket",
+	""
 };
 
-static int udev_hotplug(int argc, char **argv)
+static int udev_hotplug(void)
 {
 	char *action;
 	char *devpath;
@@ -84,6 +84,7 @@ static int udev_hotplug(int argc, char **argv)
 	int retval = -EINVAL;
 	int i;
 	struct sigaction act;
+	const int nofake = 0;
 
 	action = get_action();
 	if (!action) {
@@ -106,7 +107,7 @@ static int udev_hotplug(int argc, char **argv)
 	}
 
 	/* skip blacklisted subsystems */
-	subsystem = get_subsystem(argv[1]);
+	subsystem = get_subsystem(main_argv[1]);
 	if (!subsystem) {
 		dbg("no subsystem?");
 		goto exit;
@@ -120,17 +121,11 @@ static int udev_hotplug(int argc, char **argv)
 		i++;
 	}
 
-	/* connect to the system message bus */
-	sysbus_connect();
-
-	/* initialize our configuration */
-	udev_init_config();
-
 	/* 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 */
@@ -140,39 +135,38 @@ static int udev_hotplug(int argc, char **argv)
 	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)
+int main(int argc, char *argv[], char *envp[])
 {
 	main_argv = argv;
 	main_envp = envp;
 
 	init_logging("udev");
+
+	/* initialize our configuration */
+	udev_init_config();
+
 	dbg("version %s", UDEV_VERSION);
 
-	return udev_hotplug(argc, argv);
+	return udev_hotplug();
 }