X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=122d34c1a5397b7e85ae20ea3c027eaefac3725d;hp=958fa4eb0a3292e981ba4f3b1b9cd735750947ee;hb=f22e9686fd4f8e602e8dc11a4b06765206f26edf;hpb=9a50eb497fa9d54e0dbb249f5a58d3c16bb937d0

diff --git a/udev.c b/udev.c
index 958fa4eb0..122d34c1a 100644
--- a/udev.c
+++ b/udev.c
@@ -41,7 +41,6 @@
 
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message(int level, const char *format, ...)
 {
 	va_list args;
@@ -55,27 +54,32 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
-/* (for now) true if udevsend is the helper */
+/* decide if we should manage the whole hotplug event
+ * for now look if the kernel calls udevsend instead of /sbin/hotplug
+ */
 static int manage_hotplug_event(void) {
 	char helper[256];
 	int fd;
 	int len;
 
+	/* don't handle hotplug.d if we are called directly */
+	if (!getenv("UDEVD_EVENT"))
+		return 0;
+
 	fd = open("/proc/sys/kernel/hotplug", O_RDONLY);
 	if (fd < 0)
-		goto exit;
+		return 0;
 
 	len = read(fd, helper, 256);
 	close(fd);
 
 	if (len < 0)
-		goto exit;
+		return 0;
 	helper[len] = '\0';
 
 	if (strstr(helper, "udevsend"))
 		return 1;
 
-exit:
 	return 0;
 }
 
@@ -97,31 +101,36 @@ int main(int argc, char *argv[], char *envp[])
 	struct sysfs_device *devices_dev;
 	struct udevice udev;
 	char path[SYSFS_PATH_MAX];
-	int retval = -EINVAL;
 	const char *error;
-	const char *action = getenv("ACTION");
-	const char *devpath = getenv("DEVPATH");
-	const char *subsystem = argv[1];
+	const char *action;
+	const char *devpath;
+	const char *subsystem;
+	int managed_event;
+	int retval = -EINVAL;
+
+	if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+		printf("%s\n", UDEV_VERSION);
+		exit(0);
+	}
 
-	dbg("version %s", UDEV_VERSION);
 	logging_init("udev");
+	dbg("version %s", UDEV_VERSION);
+
 	udev_init_config();
 
 	/* set signal handlers */
+	memset(&act, 0x00, sizeof(act));
 	act.sa_handler = (void (*) (int))sig_handler;
 	sigemptyset (&act.sa_mask);
 	act.sa_flags = 0;
-	/* alarm must not restart syscalls*/
 	sigaction(SIGALRM, &act, NULL);
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
 
-	/* trigger timeout to interrupt blocking syscalls */
+	/* trigger timeout to prevent hanging processes */
 	alarm(ALARM_TIMEOUT);
 
-	udev_set_values(&udev, devpath, subsystem, action);
-
-	if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
+	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 */
@@ -132,6 +141,19 @@ int main(int argc, char *argv[], char *envp[])
 		goto exit;
 	}
 
+	/* let the executed programs know if we handle the whole hotplug event */
+	managed_event = manage_hotplug_event();
+	if (managed_event)
+		setenv("MANAGED_EVENT", "1", 1);
+
+	action = getenv("ACTION");
+	devpath = getenv("DEVPATH");
+	subsystem = getenv("SUBSYSTEM");
+	/* 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;
@@ -172,7 +194,7 @@ int main(int argc, char *argv[], char *envp[])
 
 			wait_for_class_device(class_dev, &error);
 
-			/* init rules, permissions */
+			/* init rules */
 			namedev_init();
 
 			/* name, create node, store in db */
@@ -194,9 +216,10 @@ int main(int argc, char *argv[], char *envp[])
 		}
 
 		/* run dev.d/ scripts if we created/deleted a node or changed a netif name */
-		if (udev_dev_d && udev.devname[0] != '\0') {
+		if (udev.devname[0] != '\0') {
 			setenv("DEVNAME", udev.devname, 1);
-			udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+			if (udev_dev_d)
+				udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
 		}
 	} else if ((strncmp(devpath, "/devices/", 9) == 0)) {
 		if (strcmp(action, "add") == 0) {
@@ -222,7 +245,7 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 hotplug:
-	if (udev_hotplug_d && manage_hotplug_event())
+	if (udev_hotplug_d && managed_event)
 		udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
 
 exit: