X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=6d1d679d9a0ccd446f988cb605c407dd545c123f;hb=bb1a77d34cd004b44b30a79d7521957c3881e497;hp=802e41d14719aeea9b3ea858cb4c8977fb379f16;hpb=03cfa1394fcc2c4386f8af22e5a4d9fdd7cecc50;p=elogind.git

diff --git a/udev.c b/udev.c
index 802e41d14..6d1d679d9 100644
--- a/udev.c
+++ b/udev.c
@@ -32,24 +32,24 @@
 #include <unistd.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
-#include "namedev.h"
+#include "udev_rules.h"
 #include "logging.h"
 
-
-#ifdef LOG
-void log_message(int level, const char *format, ...)
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
 {
 	va_list args;
 
-	if (!udev_log)
+	if (priority > udev_log_priority)
 		return;
 
 	va_start(args, format);
-	vsyslog(level, format, args);
+	vsyslog(priority, format, args);
 	va_end(args);
 }
 #endif
@@ -99,7 +99,7 @@ int main(int argc, char *argv[], char *envp[])
 	struct sysfs_class_device *class_dev;
 	struct sysfs_device *devices_dev;
 	struct udevice udev;
-	char path[SYSFS_PATH_MAX];
+	char path[PATH_SIZE];
 	const char *error;
 	const char *action;
 	const char *devpath;
@@ -114,13 +114,12 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 	logging_init("udev");
-	dbg("version %s", UDEV_VERSION);
-
 	udev_init_config();
+	dbg("version %s", UDEV_VERSION);
 
 	/* set signal handlers */
 	memset(&act, 0x00, sizeof(act));
-	act.sa_handler = (void (*) (int))sig_handler;
+	act.sa_handler = (void (*)(int)) sig_handler;
 	sigemptyset (&act.sa_mask);
 	act.sa_flags = 0;
 	sigaction(SIGALRM, &act, NULL);
@@ -130,17 +129,6 @@ int main(int argc, char *argv[], char *envp[])
 	/* trigger timeout to prevent hanging processes */
 	alarm(ALARM_TIMEOUT);
 
-	if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) {
-		dbg("udevstart");
-
-		/* disable all logging, as it's much too slow on some facilities */
-		udev_log = 0;
-
-		namedev_init();
-		retval = udev_start();
-		goto exit;
-	}
-
 	/* let the executed programs know if we handle the whole hotplug event */
 	managed_event = manage_hotplug_event();
 	if (managed_event)
@@ -156,29 +144,34 @@ int main(int argc, char *argv[], char *envp[])
 	udev_init_device(&udev, devpath, subsystem);
 
 	if (!action || !subsystem || !devpath) {
-		dbg("action, subsystem or devpath missing");
+		err("action, subsystem or devpath missing");
 		goto hotplug;
 	}
 
 	/* export logging flag, as called scripts may want to do the same as udev */
-	if (udev_log)
-		setenv("UDEV_LOG", "1", 1);
+	if (udev_log_priority) {
+		char priority[32];
+
+		sprintf(priority, "%i", udev_log_priority);
+		setenv("UDEV_LOG", priority, 1);
+	}
 
-	if (udev.type == BLOCK || udev.type == CLASS || udev.type == NET) {
+	if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
 		if (strcmp(action, "add") == 0) {
 			/* wait for sysfs and possibly add node */
 			dbg("udev add");
 
 			/* skip subsystems without "dev", but handle net devices */
-			if (udev.type != NET && subsystem_expect_no_dev(udev.subsystem)) {
+			if (udev.type != DEV_NET && subsystem_expect_no_dev(udev.subsystem)) {
 				dbg("don't care about '%s' devices", udev.subsystem);
 				goto hotplug;
 			}
 
-			snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+			snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
+			path[sizeof(path)-1] = '\0';
 			class_dev = wait_class_device_open(path);
 			if (class_dev == NULL) {
-				dbg ("open class device failed");
+				dbg("open class device failed");
 				goto hotplug;
 			}
 			dbg("opened class_dev->name='%s'", class_dev->name);
@@ -186,7 +179,7 @@ int main(int argc, char *argv[], char *envp[])
 			wait_for_class_device(class_dev, &error);
 
 			/* init rules */
-			namedev_init();
+			udev_rules_init();
 
 			/* name, create node, store in db */
 			retval = udev_add_device(&udev, class_dev);
@@ -212,12 +205,13 @@ int main(int argc, char *argv[], char *envp[])
 			if (udev_dev_d)
 				udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
 		}
-	} else if (udev.type == PHYSDEV) {
+	} else if (udev.type == DEV_DEVICE) {
 		if (strcmp(action, "add") == 0) {
 			/* wait for sysfs */
 			dbg("devices add");
 
-			snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath);
+			snprintf(path, sizeof(path), "%s%s", sysfs_path, devpath);
+			path[sizeof(path)-1] = '\0';
 			devices_dev = wait_devices_device_open(path);
 			if (!devices_dev) {
 				dbg("devices device unavailable (probably remove has beaten us)");
@@ -236,10 +230,10 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 hotplug:
+	udev_cleanup_device(&udev);
 	if (udev_hotplug_d && managed_event)
 		udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
 
-exit:
 	logging_close();
 	return retval;
 }