From: Kay Sievers <kay.sievers@suse.de>
Date: Sun, 13 Aug 2006 03:32:09 +0000 (+0200)
Subject: udevd: read DRIVER from the environment
X-Git-Tag: 174~2199
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=254efc14a40204969fcf861498fb8b62a16141d1;ds=sidebyside

udevd: read DRIVER from the environment
---

diff --git a/udev.h b/udev.h
index 95a2b88f5..be01aeaa2 100644
--- a/udev.h
+++ b/udev.h
@@ -109,7 +109,8 @@ extern dev_t udev_device_get_devt(struct udevice *udev);
 extern char sysfs_path[PATH_SIZE];
 extern int sysfs_init(void);
 extern void sysfs_cleanup(void);
-extern void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath, const char *subsystem);
+extern void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath,
+				    const char *subsystem, const char *driver);
 extern struct sysfs_device *sysfs_device_get(const char *devpath);
 extern struct sysfs_device *sysfs_device_get_parent(struct sysfs_device *dev);
 extern struct sysfs_device *sysfs_device_get_parent_with_subsystem(struct sysfs_device *dev, const char *subsystem);
diff --git a/udev_sysfs.c b/udev_sysfs.c
index ddc0b4679..85ea4d15e 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -79,13 +79,16 @@ void sysfs_cleanup(void)
 	}
 }
 
-void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath, const char *subsystem)
+void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath,
+			     const char *subsystem, const char *driver)
 {
 	char *pos;
 
 	strlcpy(dev->devpath, devpath, sizeof(dev->devpath));
 	if (subsystem != NULL)
 		strlcpy(dev->subsystem, subsystem, sizeof(dev->subsystem));
+	if (driver != NULL)
+		strlcpy(dev->driver, driver, sizeof(dev->driver));
 
 	/* set kernel name */
 	pos = strrchr(dev->devpath, '/');
@@ -181,7 +184,7 @@ struct sysfs_device *sysfs_device_get(const char *devpath)
 		return NULL;
 	memset(dev, 0x00, sizeof(struct sysfs_device));
 
-	sysfs_device_set_values(dev, devpath_real, NULL);
+	sysfs_device_set_values(dev, devpath_real, NULL, NULL);
 
 	/* get subsystem */
 	if (strncmp(dev->devpath, "/class/", 7) == 0) {
diff --git a/udevd.c b/udevd.c
index af9e118c5..f4f918900 100644
--- a/udevd.c
+++ b/udevd.c
@@ -118,7 +118,7 @@ static int udev_event_process(struct udevd_uevent_msg *msg)
 	if (udev == NULL)
 		return -1;
 	strlcpy(udev->action, msg->action, sizeof(udev->action));
-	sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem);
+	sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem, msg->driver);
 	udev->devt = msg->devt;
 
 	retval = udev_device_event(&rules, udev);
@@ -593,6 +593,8 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz
 			msg->devpath = &key[8];
 		else if (strncmp(key, "SUBSYSTEM=", 10) == 0)
 			msg->subsystem = &key[10];
+		else if (strncmp(key, "DRIVER=", 7) == 0)
+			msg->driver = &key[7];
 		else if (strncmp(key, "SEQNUM=", 7) == 0)
 			msg->seqnum = strtoull(&key[7], NULL, 10);
 		else if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
diff --git a/udevd.h b/udevd.h
index 688e6d52e..c1f0fd6a1 100644
--- a/udevd.h
+++ b/udevd.h
@@ -64,6 +64,7 @@ struct udevd_uevent_msg {
 	char *action;
 	char *devpath;
 	char *subsystem;
+	char *driver;
 	dev_t devt;
 	unsigned long long seqnum;
 	char *physdevpath;