X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=9b4d91f75cea26373c9aebc7688b0d992d0c3089;hb=3e16482d259c4a768b24a82bc0ed0e3a77954210;hp=0f01fa41d2a04e6b08cda306c7d61d6345c146de;hpb=f8911dbb0404902502085c7bb204f2f9c5bc1b9c;p=elogind.git

diff --git a/udev.c b/udev.c
index 0f01fa41d..9b4d91f75 100644
--- a/udev.c
+++ b/udev.c
@@ -27,23 +27,32 @@
 #include <ctype.h>
 #include <signal.h>
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char **main_argv;
 char **main_envp;
-unsigned char logname[42];
 
-int log_ok(void)
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message(int level, const char *format, ...)
 {
-	return udev_log;
+	va_list args;
+
+	if (!udev_log)
+		return;
+
+	va_start(args, format);
+	vsyslog(level, format, args);
+	va_end(args);
 }
+#endif
 
 static void sig_handler(int signum)
 {
@@ -58,40 +67,17 @@ static void sig_handler(int signum)
 	}
 }
 
-static inline char *get_action(void)
-{
-	char *action;
-
-	action = getenv("ACTION");
-	return action;
-}
-
-static inline char *get_devpath(void)
-{
-	char *devpath;
-
-	devpath = getenv("DEVPATH");
-	return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
-	char *seqnum;
-
-	seqnum = getenv("SEQNUM");
-	return seqnum;
-}
-
 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;
@@ -102,13 +88,13 @@ static int udev_hotplug(int argc, char **argv)
 
 	action = get_action();
 	if (!action) {
-		dbg ("no action?");
+		dbg("no action?");
 		goto exit;
 	}
 
 	devpath = get_devpath();
 	if (!devpath) {
-		dbg ("no devpath?");
+		dbg("no devpath?");
 		goto exit;
 	}
 	dbg("looking at '%s'", devpath);
@@ -121,7 +107,11 @@ static int udev_hotplug(int argc, char **argv)
 	}
 
 	/* skip blacklisted subsystems */
-	subsystem = argv[1];
+	subsystem = get_subsystem(main_argv[1]);
+	if (!subsystem) {
+		dbg("no subsystem?");
+		goto exit;
+	}
 	i = 0;
 	while (subsystem_blacklist[i][0] != '\0') {
 		if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
@@ -134,9 +124,6 @@ static int udev_hotplug(int argc, char **argv)
 	/* 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) {
@@ -155,7 +142,7 @@ static int udev_hotplug(int argc, char **argv)
 	namedev_init();
 
 	if (strcmp(action, "add") == 0)
-		retval = udev_add_device(devpath, subsystem);
+		retval = udev_add_device(devpath, subsystem, 0);
 
 	else if (strcmp(action, "remove") == 0)
 		retval = udev_remove_device(devpath, subsystem);
@@ -177,15 +164,17 @@ 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");
-	dbg("version %s", UDEV_VERSION);
 
-	return udev_hotplug(argc, argv);
-}
+	/* initialize our configuration */
+	udev_init_config();
 
+	dbg("version %s", UDEV_VERSION);
 
+	return udev_hotplug();
+}