X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=ea64f3404f101450eee5c02ad058e71f9da1729a;hp=21815b694a2a524bc49b0effaeb3682ec048b604;hb=0db6d4cc61523ee7f3f627f807c01f86ee2d36ab;hpb=f7b4eca455c7dbf850d984892756f22dbd9ddc3d

diff --git a/namedev.c b/namedev.c
index 21815b694..ea64f3404 100644
--- a/namedev.c
+++ b/namedev.c
@@ -124,6 +124,8 @@ static int add_dev(struct config_device *new_dev)
 		struct config_device *dev = list_entry(tmp, struct config_device, node);
 		if (strncmp_wildcard(dev->name, new_dev->name, sizeof(dev->name)))
 			continue;
+		if (strncmp(dev->bus, new_dev->bus, sizeof(dev->name)))
+			continue;
 		copy_var(dev, new_dev, type);
 		copy_var(dev, new_dev, mode);
 		copy_string(dev, new_dev, bus);
@@ -132,6 +134,7 @@ static int add_dev(struct config_device *new_dev)
 		copy_string(dev, new_dev, id);
 		copy_string(dev, new_dev, place);
 		copy_string(dev, new_dev, kernel_name);
+		copy_string(dev, new_dev, exec_program);
 		copy_string(dev, new_dev, owner);
 		copy_string(dev, new_dev, group);
 		return 0;
@@ -142,7 +145,7 @@ static int add_dev(struct config_device *new_dev)
 	if (!tmp_dev)
 		return -ENOMEM;
 	memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
-	list_add(&tmp_dev->node, &config_device_list);
+	list_add_tail(&tmp_dev->node, &config_device_list);
 	//dump_dev(tmp_dev);
 	return 0;
 }
@@ -464,6 +467,10 @@ static int namedev_init_permissions(void)
 		}
 		strncpy(dev.group, temp2, sizeof(dev.owner));
 
+		if (!temp) {
+			dbg("cannot parse line: %s", line);
+			continue;
+		}
 		dev.mode = strtol(temp, NULL, 8);
 
 		dbg_parse("name='%s', owner='%s', group='%s', mode=%#o",
@@ -514,7 +521,7 @@ static void apply_format(struct udevice *udev, unsigned char *string)
 			case 'b':
 				if (strlen(udev->bus_id) == 0)
 					break;
-				strcat(string, udev->bus_id);
+				strcat(pos, udev->bus_id);
 				dbg("substitute bus_id '%s'", udev->bus_id);
 				break;
 			case 'n':
@@ -523,6 +530,15 @@ static void apply_format(struct udevice *udev, unsigned char *string)
 				strcat(pos, udev->kernel_number);
 				dbg("substitute kernel number '%s'", udev->kernel_number);
 				break;
+			case 'D':
+				if (strlen(udev->kernel_number) == 0) {
+					strcat(pos, "disk");
+					break;
+				}
+				strcat(pos, "part");
+				strcat(pos, udev->kernel_number);
+				dbg("substitute kernel number '%s'", udev->kernel_number);
+				break;
 			case 'm':
 				sprintf(pos, "%u", udev->minor);
 				dbg("substitute minor number '%u'", udev->minor);
@@ -637,7 +653,7 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 	return retval;
 }
 
-static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev)
+static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
 	struct config_device *dev;
 	struct list_head *tmp;
@@ -647,6 +663,12 @@ static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev
 		if (dev->type != CALLOUT)
 			continue;
 
+		if (sysfs_device) {
+			dbg_parse("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+			if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
+				continue;
+		}
+
 		/* substitute anything that needs to be in the program name */
 		apply_format(udev, dev->exec_program);
 		if (exec_callout(dev, udev->callout_value, NAME_SIZE))
@@ -679,6 +701,12 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 		if (dev->type != LABEL)
 			continue;
 
+		if (sysfs_device) {
+			dbg_parse("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+			if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
+				continue;
+		}
+
 		dbg_parse("look for device attribute '%s'", dev->sysfs_file);
 		/* try to find the attribute in the class device directory */
 		tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
@@ -734,6 +762,10 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
 		if (dev->type != NUMBER)
 			continue;
 
+		dbg_parse("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+		if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
+			continue;
+
 		found = 0;
 		strfieldcpy(path, sysfs_device->path);
 		temp = strrchr(path, '/');
@@ -782,6 +814,10 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
 		if (dev->type != TOPOLOGY)
 			continue;
 
+		dbg_parse("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+		if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
+			continue;
+
 		found = 0;
 		strfieldcpy(path, sysfs_device->path);
 		temp = strrchr(path, '/');
@@ -813,7 +849,7 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
 	return -ENODEV;
 }
 
-static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev)
+static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
 	struct config_device *dev;
 	struct list_head *tmp;
@@ -824,8 +860,8 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
 			continue;
 
 		dbg_parse("compare name '%s' with '%s'",
-			  dev->kernel_name, dev->name);
-		if (strcmp(dev->kernel_name, class_dev->name) != 0)
+			  dev->kernel_name, class_dev->name);
+		if (strncmp_wildcard(class_dev->name, dev->kernel_name, NAME_SIZE) != 0)
 			continue;
 
 		strfieldcpy(udev->name, dev->name);
@@ -908,6 +944,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 	if (sysfs_device) {
 		dbg_parse("sysfs_device->path='%s'", sysfs_device->path);
 		dbg_parse("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
+		dbg_parse("sysfs_device->bus='%s'", sysfs_device->bus);
 		strfieldcpy(udev->bus_id, sysfs_device->bus_id);
 	} else {
 		dbg_parse("class_dev->name = '%s'", class_dev->name);
@@ -916,7 +953,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 	build_kernel_number(class_dev, udev);
 
 	/* rules are looked at in priority order */
-	retval = do_callout(class_dev, udev);
+	retval = do_callout(class_dev, udev, sysfs_device);
 	if (retval == 0)
 		goto found;
 
@@ -932,7 +969,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 	if (retval == 0)
 		goto found;
 
-	retval = do_replace(class_dev, udev);
+	retval = do_replace(class_dev, udev, sysfs_device);
 	if (retval == 0)
 		goto found;