X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_multiplex.c;h=3ef6e1707ac6b599af1dce0552d33a329f5ff787;hb=63f61c5cf639953aa38e025485919b0aa1c49b59;hp=7e3dc656d6d7d48edcb3ff284bb805c8409a0d26;hpb=9af5bb2f8fdbf54c064ddbd319d61092f28a4132;p=elogind.git

diff --git a/udev_multiplex.c b/udev_multiplex.c
index 7e3dc656d..3ef6e1707 100644
--- a/udev_multiplex.c
+++ b/udev_multiplex.c
@@ -28,14 +28,14 @@
 #include <fcntl.h>
 
 #include "udev.h"
+#include "udev_libc_wrapper.h"
 #include "udev_utils.h"
 #include "logging.h"
 
-static int run_program(const char *filename, void *data)
+static int run_program(struct udevice *udev, const char *filename)
 {
 	pid_t pid;
 	int fd;
-	struct udevice *udev = data;
 
 	dbg("running %s", filename);
 
@@ -73,42 +73,44 @@ static int run_program(const char *filename, void *data)
  */
 void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix)
 {
-	char dirname[PATH_MAX];
-	char devname[NAME_SIZE];
-	char *temp;
-
-	/* skip if UDEV_NO_DEVD is set */
-	if (udev_dev_d == 0)
-		return;
-
-	strfieldcpy(devname, udev->name);
+	char dirname[PATH_SIZE];
 
 	/* chop the device name up into pieces based on '/' */
-	temp = strchr(devname, '/');
-	while (temp != NULL) {
-		temp[0] = '\0';
-		snprintf(dirname, PATH_MAX, "%s/%s", basedir, devname);
-		dirname[PATH_MAX-1] = '\0';
-		call_foreach_file(run_program, dirname, suffix, udev);
-
-		temp[0] = '/';
-		++temp;
-		temp = strchr(temp, '/');
+	if (udev->name[0] != '\0') {
+		char devname[PATH_SIZE];
+		char *temp;
+
+		strlcpy(devname, udev->name, sizeof(devname));
+		temp = strchr(devname, '/');
+		while (temp != NULL) {
+			temp[0] = '\0';
+
+			/* don't call the subsystem directory here */
+			if (strcmp(devname, udev->subsystem) != 0) {
+				snprintf(dirname, sizeof(dirname), "%s/%s", basedir, devname);
+				dirname[sizeof(dirname)-1] = '\0';
+				call_foreach_file(run_program, udev, dirname, suffix);
+			}
+
+			temp[0] = '/';
+			++temp;
+			temp = strchr(temp, '/');
+		}
 	}
 
 	if (udev->name[0] != '\0') {
-		snprintf(dirname, PATH_MAX, "%s/%s", basedir, udev->name);
-		dirname[PATH_MAX-1] = '\0';
-		call_foreach_file(run_program, dirname, suffix, udev);
+		snprintf(dirname, sizeof(dirname), "%s/%s", basedir, udev->name);
+		dirname[sizeof(dirname)-1] = '\0';
+		call_foreach_file(run_program, udev, dirname, suffix);
 	}
 
 	if (udev->subsystem[0] != '\0') {
-		snprintf(dirname, PATH_MAX, "%s/%s", basedir, udev->subsystem);
-		dirname[PATH_MAX-1] = '\0';
-		call_foreach_file(run_program, dirname, suffix, udev);
+		snprintf(dirname, sizeof(dirname), "%s/%s", basedir, udev->subsystem);
+		dirname[sizeof(dirname)-1] = '\0';
+		call_foreach_file(run_program, udev, dirname, suffix);
 	}
 
-	snprintf(dirname, PATH_MAX, "%s/default", basedir);
-	dirname[PATH_MAX-1] = '\0';
-	call_foreach_file(run_program, dirname, suffix, udev);
+	snprintf(dirname, sizeof(dirname), "%s/default", basedir);
+	dirname[sizeof(dirname)-1] = '\0';
+	call_foreach_file(run_program, udev, dirname, suffix);
 }