X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dev_d.c;h=1ad599ead58a8bbcc65316b318d34bcacd131569;hb=8f2f874ae8d5bfdc1eda9b1f9d77f6637f6940a5;hp=483ceb4b1b983f398831a46d8db41aa48f88bd18;hpb=9b28a52a0ac9b7993c932bbfe9d86dfc814be218;p=elogind.git

diff --git a/dev_d.c b/dev_d.c
index 483ceb4b1..1ad599ead 100644
--- a/dev_d.c
+++ b/dev_d.c
@@ -11,8 +11,8 @@
 /*
  * This essentially emulates the following shell script logic in C:
  *	DIR="/etc/dev.d"
- *	export DEVNODE="whatever_dev_name_udev_just_gave"
- *	for I in "${DIR}/$DEVNODE/"*.dev "${DIR}/$1/"*.dev "${DIR}/default/"*.dev ; do
+ *	export DEVNAME="whatever_dev_name_udev_just_gave"
+ *	for I in "${DIR}/$DEVNAME/"*.dev "${DIR}/$1/"*.dev "${DIR}/default/"*.dev ; do
  *		if [ -f $I ]; then $I $1 ; fi
  *	done
  *	exit 1;
@@ -61,23 +61,44 @@ static int run_program(char *name)
  * 	subsystem/
  * 	default/
  */
-void dev_d_send(struct udevice *dev, char *subsystem, char *devpath)
+void dev_d_send(struct udevice *dev, const char *subsystem, const char *devpath)
 {
 	char dirname[256];
-	char devname[NAME_SIZE];
+	char env_devname[NAME_SIZE];
+	char *devname;
+	char *temp;
 
 	if (udev_dev_d == 0)
 		return;
 
 	if (dev->type == 'b' || dev->type == 'c') {
-		strfieldcpy(devname, udev_root);
-		strfieldcat(devname, dev->name);
+		strfieldcpy(env_devname, udev_root);
+		strfieldcat(env_devname, dev->name);
 	} else if (dev->type == 'n') {
-		strfieldcpy(devname, dev->name);
+		strfieldcpy(env_devname, dev->name);
 		setenv("DEVPATH", devpath, 1);
 	}
-	setenv("DEVNAME", devname, 1);
-	dbg("DEVNAME='%s'", devname);
+	setenv("DEVNAME", env_devname, 1);
+	dbg("DEVNAME='%s'", env_devname);
+
+	devname = strdup(dev->name);
+	if (!devname) {
+		dbg("out of memory");
+		return;
+	}
+
+	/* Chop the device name up into pieces based on '/' */
+	temp = strchr(devname, '/');
+	while (temp != NULL) {
+		*temp = 0x00;
+		strcpy(dirname, DEVD_DIR);
+		strfieldcat(dirname, devname);
+		call_foreach_file(run_program, dirname, DEVD_SUFFIX);
+
+		*temp = '/';
+		++temp;
+		temp = strchr(temp, '/');
+	}
 
 	strcpy(dirname, DEVD_DIR);
 	strfieldcat(dirname, dev->name);