X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=bf2eb373f82765b6ec77c10f0c43f68c5b465d07;hp=5dbade3c6f6dffb7cfb91f385944552090c459d3;hb=63f61c5cf639953aa38e025485919b0aa1c49b59;hpb=5ef42682053f57fc031d420f0a2ae3e204421b8d

diff --git a/udev.c b/udev.c
index 5dbade3c6..bf2eb373f 100644
--- a/udev.c
+++ b/udev.c
@@ -32,6 +32,7 @@
 #include <unistd.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_sysfs.h"
@@ -40,7 +41,7 @@
 #include "logging.h"
 
 
-#ifdef LOG
+#ifdef USE_LOG
 void log_message(int level, const char *format, ...)
 {
 	va_list args;
@@ -96,16 +97,16 @@ static void asmlinkage sig_handler(int signum)
 
 int main(int argc, char *argv[], char *envp[])
 {
-	struct sigaction act;
 	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;
 	const char *subsystem;
 	int managed_event;
+	struct sigaction act;
 	int retval = -EINVAL;
 
 	if (argc == 2 && strcmp(argv[1], "-V") == 0) {
@@ -130,17 +131,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)
@@ -152,20 +142,11 @@ int main(int argc, char *argv[], char *envp[])
 	/* older kernels passed the SUBSYSTEM only as argument */
 	if (!subsystem && argc == 2)
 		subsystem = argv[1];
-	udev_init_device(&udev, devpath, subsystem);
 
-	if (!action) {
-		dbg("no action");
-		goto hotplug;
-	}
-
-	if (!subsystem) {
-		dbg("no subsystem");
-		goto hotplug;
-	}
+	udev_init_device(&udev, devpath, subsystem);
 
-	if (!devpath) {
-		dbg("no devpath");
+	if (!action || !subsystem || !devpath) {
+		dbg("action, subsystem or devpath missing");
 		goto hotplug;
 	}
 
@@ -173,7 +154,7 @@ int main(int argc, char *argv[], char *envp[])
 	if (udev_log)
 		setenv("UDEV_LOG", "1", 1);
 
-	if ((strncmp(devpath, "/block/", 7) == 0) || (strncmp(devpath, "/class/", 7) == 0)) {
+	if (udev.type == BLOCK || udev.type == CLASS || udev.type == NET) {
 		if (strcmp(action, "add") == 0) {
 			/* wait for sysfs and possibly add node */
 			dbg("udev add");
@@ -184,7 +165,8 @@ int main(int argc, char *argv[], char *envp[])
 				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");
@@ -221,12 +203,13 @@ int main(int argc, char *argv[], char *envp[])
 			if (udev_dev_d)
 				udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
 		}
-	} else if ((strncmp(devpath, "/devices/", 9) == 0)) {
+	} else if (udev.type == PHYSDEV) {
 		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)");
@@ -245,10 +228,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;
 }