X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_sysfs.c;h=c4afe0cffba90a95f88ecf4feef4928e3073f765;hb=38895e573c6f17014393dc35a9e53d5f016172c3;hp=ddc0b46790066e30bede2c9bb0026a271633795c;hpb=7e75cfa6fe0818ffb76c2a5a88c8572f04bda879;p=elogind.git

diff --git a/udev_sysfs.c b/udev_sysfs.c
index ddc0b4679..c4afe0cff 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -79,24 +79,27 @@ 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, '/');
 	if (pos == NULL)
 		return;
 
-	strlcpy(dev->kernel_name, &pos[1], sizeof(dev->kernel_name));
-	dbg("kernel_name='%s'", dev->kernel_name);
+	strlcpy(dev->kernel, &pos[1], sizeof(dev->kernel));
+	dbg("kernel='%s'", dev->kernel);
 
 	/* some devices have '!' in their name, change that to '/' */
-	pos = dev->kernel_name;
+	pos = dev->kernel;
 	while (pos[0] != '\0') {
 		if (pos[0] == '!')
 			pos[0] = '/';
@@ -104,7 +107,7 @@ void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath, cons
 	}
 
 	/* get kernel number */
-	pos = &dev->kernel_name[strlen(dev->kernel_name)];
+	pos = &dev->kernel[strlen(dev->kernel)];
 	while (isdigit(pos[-1]))
 		pos--;
 	strlcpy(dev->kernel_number, pos, sizeof(dev->kernel_number));
@@ -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) {