X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=dev_d.c;h=97c552647b27fdda1756880f8b1ed7f2a0be3852;hp=9bb9507b9b3d95701cb456c51964e61a4cdea6ab;hb=84df02dd63bf53acb5a61e9db1da067760b927e9;hpb=4a539daf1e5daa17b52239478d97f8dc7a6506b6

diff --git a/dev_d.c b/dev_d.c
index 9bb9507b9..97c552647 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,14 +61,44 @@ static int run_program(char *name)
  * 	subsystem/
  * 	default/
  */
-void dev_d_send(struct udevice *dev, char *subsystem)
+void dev_d_send(struct udevice *dev, char *subsystem, char *devpath)
 {
 	char dirname[256];
-	char devnode[NAME_SIZE];
+	char env_devname[NAME_SIZE];
+	char *devname;
+	char *temp;
 
-	strfieldcpy(devnode, udev_root);
-	strfieldcat(devnode, dev->name);
-	setenv("DEVNODE", devnode, 1);
+	if (udev_dev_d == 0)
+		return;
+
+	if (dev->type == 'b' || dev->type == 'c') {
+		strfieldcpy(env_devname, udev_root);
+		strfieldcat(env_devname, dev->name);
+	} else if (dev->type == 'n') {
+		strfieldcpy(env_devname, dev->name);
+		setenv("DEVPATH", devpath, 1);
+	}
+	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);
@@ -81,4 +111,3 @@ void dev_d_send(struct udevice *dev, char *subsystem)
 	strcpy(dirname, DEVD_DIR "default");
 	call_foreach_file(run_program, dirname, DEVD_SUFFIX);
 }
-