X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=5970ef059053cff1fc6195123bacc753529b145f;hp=d049349f22b7923e43581d413b715f3a8ebae634;hb=ae2859df40ef80d15dff39fadd470a8541bab857;hpb=c2ec26b92809193a5126d34299abfe8df7877c0c

diff --git a/namedev.c b/namedev.c
index d049349f2..5970ef059 100644
--- a/namedev.c
+++ b/namedev.c
@@ -22,7 +22,7 @@
  */
 
 /* define this to enable parsing debugging */
-/* #define DEBUG_PARSER */
+#define DEBUG_PARSER 
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -54,38 +54,38 @@ static void dump_dev(struct config_device *dev)
 	case KERNEL_NAME:
 		dbg_parse("KERNEL name ='%s'"
 			" owner = '%s', group = '%s', mode = '%#o'",
-			dev->attr.name, 
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
+			dev->name, 
+			dev->owner, dev->group, dev->mode);
 		break;
 	case LABEL:
 		dbg_parse("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
 			" owner = '%s', group = '%s', mode = '%#o'",
-			dev->attr.name, dev->bus, dev->sysfs_file, dev->sysfs_value,
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
+			dev->name, dev->bus, dev->sysfs_file, dev->sysfs_value,
+			dev->owner, dev->group, dev->mode);
 		break;
 	case NUMBER:
 		dbg_parse("NUMBER name = '%s', bus = '%s', id = '%s'"
 			" owner = '%s', group = '%s', mode = '%#o'",
-			dev->attr.name, dev->bus, dev->id,
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
+			dev->name, dev->bus, dev->id,
+			dev->owner, dev->group, dev->mode);
 		break;
 	case TOPOLOGY:
 		dbg_parse("TOPOLOGY name = '%s', bus = '%s', place = '%s'"
 			" owner = '%s', group = '%s', mode = '%#o'",
-			dev->attr.name, dev->bus, dev->place,
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
+			dev->name, dev->bus, dev->place,
+			dev->owner, dev->group, dev->mode);
 		break;
 	case REPLACE:
 		dbg_parse("REPLACE name = %s, kernel_name = %s"
 			" owner = '%s', group = '%s', mode = '%#o'",
-			dev->attr.name, dev->kernel_name,
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
+			dev->name, dev->kernel_name,
+			dev->owner, dev->group, dev->mode);
 		break;
 	case CALLOUT:
 		dbg_parse("CALLOUT name = '%s', program ='%s', bus = '%s', id = '%s'"
 			" owner = '%s', group = '%s', mode = '%#o'",
-			dev->attr.name, dev->exec_program, dev->bus, dev->id,
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
+			dev->name, dev->exec_program, dev->bus, dev->id,
+			dev->owner, dev->group, dev->mode);
 		break;
 	default:
 		dbg_parse("Unknown type of device!");
@@ -109,18 +109,18 @@ static int add_dev(struct config_device *new_dev)
 	 * this one... */
 	list_for_each(tmp, &config_device_list) {
 		struct config_device *dev = list_entry(tmp, struct config_device, node);
-		if (strcmp(dev->attr.name, new_dev->attr.name) == 0) {
+		if (strcmp(dev->name, new_dev->name) == 0) {
 			/* the same, copy the new info into this structure */
 			copy_var(dev, new_dev, type);
-			copy_var(dev, new_dev, attr.mode);
+			copy_var(dev, new_dev, mode);
 			copy_string(dev, new_dev, bus);
 			copy_string(dev, new_dev, sysfs_file);
 			copy_string(dev, new_dev, sysfs_value);
 			copy_string(dev, new_dev, id);
 			copy_string(dev, new_dev, place);
 			copy_string(dev, new_dev, kernel_name);
-			copy_string(dev, new_dev, attr.owner);
-			copy_string(dev, new_dev, attr.group);
+			copy_string(dev, new_dev, owner);
+			copy_string(dev, new_dev, group);
 			return 0;
 		}
 	}
@@ -260,11 +260,11 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.attr.name, temp3);
+			strcpy(dev.name, temp3);
 
 			dbg_parse("LABEL name = '%s', bus = '%s', "
 				"sysfs_file = '%s', sysfs_value = '%s'", 
-				dev.attr.name, dev.bus, dev.sysfs_file, 
+				dev.name, dev.bus, dev.sysfs_file, 
 				dev.sysfs_value);
 		}
 
@@ -290,10 +290,10 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.attr.name, temp3);
+			strcpy(dev.name, temp3);
 
 			dbg_parse("NUMBER name = '%s', bus = '%s', id = '%s'",
-					dev.attr.name, dev.bus, dev.id);
+					dev.name, dev.bus, dev.id);
 		}
 
 		if (strcasecmp(temp2, TYPE_TOPOLOGY) == 0) {
@@ -318,10 +318,10 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.attr.name, temp3);
+			strcpy(dev.name, temp3);
 
 			dbg_parse("TOPOLOGY name = '%s', bus = '%s', place = '%s'",
-					dev.attr.name, dev.bus, dev.place);
+					dev.name, dev.bus, dev.place);
 		}
 
 		if (strcasecmp(temp2, TYPE_REPLACE) == 0) {
@@ -339,9 +339,9 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.attr.name, temp3);
+			strcpy(dev.name, temp3);
 			dbg_parse("REPLACE name = %s, kernel_name = %s",
-					dev.attr.name, dev.kernel_name);
+					dev.name, dev.kernel_name);
 		}
 		if (strcasecmp(temp2, TYPE_CALLOUT) == 0) {
 			/* number type */
@@ -372,9 +372,9 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.attr.name, temp3);
+			strcpy(dev.name, temp3);
 			dbg_parse("CALLOUT name = %s, program = %s",
-					dev.attr.name, dev.exec_program);
+					dev.name, dev.exec_program);
 		}
 
 		retval = add_dev(&dev);
@@ -431,19 +431,19 @@ static int namedev_init_permissions(void)
 
 		/* parse the line */
 		temp2 = strsep(&temp, ":");
-		strncpy(dev.attr.name, temp2, sizeof(dev.attr.name));
+		strncpy(dev.name, temp2, sizeof(dev.name));
 
 		temp2 = strsep(&temp, ":");
-		strncpy(dev.attr.owner, temp2, sizeof(dev.attr.owner));
+		strncpy(dev.owner, temp2, sizeof(dev.owner));
 
 		temp2 = strsep(&temp, ":");
-		strncpy(dev.attr.group, temp2, sizeof(dev.attr.owner));
+		strncpy(dev.group, temp2, sizeof(dev.owner));
 
-		dev.attr.mode = strtol(temp, NULL, 8);
+		dev.mode = strtol(temp, NULL, 8);
 
 		dbg_parse("name = %s, owner = %s, group = %s, mode = %#o",
-				dev.attr.name, dev.attr.owner, dev.attr.group,
-				dev.attr.mode);
+				dev.name, dev.owner, dev.group,
+				dev.mode);
 		retval = add_dev(&dev);
 		if (retval) {
 			dbg("add_dev returned with error %d", retval);
@@ -527,247 +527,350 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 			retval = -1;
 		}
 
+#ifndef __KLIBC__
 		if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
 			dbg("callout program status 0x%x", status);
 			retval = -1;
 		}
+#endif
 	}
 	return retval;
 }
 
-static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *attr)
+static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
+	struct config_device *dev;
 	struct list_head *tmp;
-	int retval = 0;
-	int found;
+	char value[ID_SIZE];
 
-	attr->mode = 0;
-	if (class_dev->sysdevice) {
-		dbg_parse("class_dev->sysdevice->path = '%s'", class_dev->sysdevice->path);
-		dbg_parse("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
-	} else {
-		dbg_parse("class_dev->name = '%s'", class_dev->name);
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != CALLOUT)
+			continue;
+
+		if (exec_callout(dev, value, sizeof(value)))
+			continue;
+		if (strncmp(value, dev->id, sizeof(value)) != 0)
+			continue;
+		strcpy(udev->name, dev->name);
+		if (dev->mode != 0) {
+			udev->mode = dev->mode;
+			strcpy(udev->owner, dev->owner);
+			strcpy(udev->group, dev->group);
+		}
+		dbg_parse("device callout '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+			dev->id, udev->name, 
+			dev->owner, dev->group, dev->mode);
+		return 0;
 	}
+	return -ENODEV;
+}
+
+static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+{
+	struct sysfs_attribute *tmpattr = NULL;
+	struct config_device *dev;
+	struct list_head *tmp;
+	char *temp = NULL;
+
 	list_for_each(tmp, &config_device_list) {
-		struct config_device *dev = list_entry(tmp, struct config_device, node);
-		switch (dev->type) {
-		case LABEL:
-			{
-			struct sysfs_attribute *tmpattr = NULL;
-			struct sysfs_class_device *class_dev_parent = NULL;
-			char *temp = NULL;
-
-			dbg_parse("LABEL: match file '%s' with value '%s'",
-					dev->sysfs_file, dev->sysfs_value);
-			/* try to find the attribute in the class device directory */
-			tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != LABEL)
+			continue;
+
+		dbg_parse("LABEL: match file '%s' with value '%s'",
+				dev->sysfs_file, dev->sysfs_value);
+		/* try to find the attribute in the class device directory */
+		tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
+		if (tmpattr)
+			goto label_found;
+
+		/* look in the class device directory if present */
+		if (sysfs_device) {
+			tmpattr = sysfs_get_device_attr(sysfs_device, dev->sysfs_file);
 			if (tmpattr)
 				goto label_found;
+		}
 
-			/* look in the class device directory if present */
-			if (class_dev->sysdevice) {
-				tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
-				if (tmpattr)
-					goto label_found;
-			}
+		continue;
 
-			/* bah, let's go backwards up a level to see if the device is there,
-			 * as block partitions don't point to the physical device.  Need to fix that
-			 * up in the kernel...
-			 */
-			if (strstr(class_dev->path, "block")) {
-				dbg_parse("looking at block device...");
-				if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
-					char path[SYSFS_PATH_MAX];
-
-					dbg_parse("really is a partition...");
-					strcpy(path, class_dev->path);
-					temp = strrchr(path, '/');
-					*temp = 0x00;
-					dbg_parse("looking for a class device at '%s'", path);
-					class_dev_parent = sysfs_open_class_device(path);
-					if (class_dev_parent == NULL) {
-						dbg("sysfs_open_class_device at '%s' failed", path);
-						continue;
-					}
-					dbg_parse("class_dev_parent->name = %s", class_dev_parent->name);
+label_found:
+		tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
+		dbg_parse("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, tmpattr->value, dev->sysfs_value);
+		if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
+			continue;
 
-					/* try to find the attribute in the class device directory */
-					tmpattr = sysfs_get_classdev_attr(class_dev_parent, dev->sysfs_file);
-					if (tmpattr) 
-						goto label_found;
-
-					/* look in the class device directory if present */
-					if (class_dev_parent->sysdevice) {
-						tmpattr = sysfs_get_classdev_attr(class_dev_parent, dev->sysfs_file);
-						if (tmpattr) 
-							goto label_found;
-					}
-					
-				}
-			}
-			if (class_dev_parent)
-				sysfs_close_class_device(class_dev_parent);
+		strcpy(udev->name, dev->name);
+		if (dev->mode != 0) {
+			udev->mode = dev->mode;
+			strcpy(udev->owner, dev->owner);
+			strcpy(udev->group, dev->group);
+		}
+		dbg_parse("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+			dev->sysfs_file, dev->sysfs_value, udev->name, 
+			dev->owner, dev->group, dev->mode);
 
-			continue;
+		return 0;
+	}
+	return -ENODEV;
+}
 
-label_found:
-			tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
-			dbg_parse("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, tmpattr->value, dev->sysfs_value);
-			if (strcmp(dev->sysfs_value, tmpattr->value) != 0) {
-				if (class_dev_parent) 
-					sysfs_close_class_device(class_dev_parent);
-				continue;
-			}
+static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+{
+	struct config_device *dev;
+	struct list_head *tmp;
+	char path[SYSFS_PATH_MAX];
+	int found;
+	char *temp = NULL;
 
-			strcpy(attr->name, dev->attr.name);
-			if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
-				temp = &class_dev->path[strlen(class_dev->path)-1];
-				strcat(attr->name, temp);
-			}
-			if (dev->attr.mode != 0) {
-				attr->mode = dev->attr.mode;
-				strcpy(attr->owner, dev->attr.owner);
-				strcpy(attr->group, dev->attr.group);
-			}
-			dbg_parse("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-				dev->sysfs_file, dev->sysfs_value, attr->name, 
-				dev->attr.owner, dev->attr.group, dev->attr.mode);
-			if (class_dev_parent)
-				sysfs_close_class_device(class_dev_parent);
-			goto done;
-			break;
-			}
-		case NUMBER:
-			{
-			char path[SYSFS_PATH_MAX];
-			char *temp;
+	/* we have to have a sysfs device for NUMBER to work */
+	if (!sysfs_device)
+		return -ENODEV;
 
-			found = 0;
-			if (!class_dev->sysdevice)
-				continue;
-			strcpy(path, class_dev->sysdevice->path);
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != NUMBER)
+			continue;
+
+		found = 0;
+		strcpy(path, sysfs_device->path);
+		temp = strrchr(path, '/');
+		dbg_parse("NUMBER path = '%s'", path);
+		dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
+		if (strstr(temp, dev->id) != NULL) {
+			found = 1;
+		} else {
+			*temp = 0x00;
 			temp = strrchr(path, '/');
-			dbg_parse("NUMBER path = '%s'", path);
 			dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
-			if (strstr(temp, dev->id) != NULL) {
+			if (strstr(temp, dev->id) != NULL)
 				found = 1;
-			} else {
-				*temp = 0x00;
-				temp = strrchr(path, '/');
-				dbg_parse("NUMBERY temp = '%s' id = '%s'", temp, dev->id);
-				if (strstr(temp, dev->id) != NULL)
-					found = 1;
-			}
-			if (!found)
-				continue;
+		}
+		if (!found)
+			continue;
+		strcpy(udev->name, dev->name);
+		if (dev->mode != 0) {
+			udev->mode = dev->mode;
+			strcpy(udev->owner, dev->owner);
+			strcpy(udev->group, dev->group);
+		}
+		dbg_parse("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+			dev->id, udev->name, 
+			dev->owner, dev->group, dev->mode);
+		return 0;
+	}
+	return -ENODEV;
+}
 
-			strcpy(attr->name, dev->attr.name);
-			if (dev->attr.mode != 0) {
-				attr->mode = dev->attr.mode;
-				strcpy(attr->owner, dev->attr.owner);
-				strcpy(attr->group, dev->attr.group);
-			}
-			dbg_parse("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-				dev->id, attr->name, 
-				dev->attr.owner, dev->attr.group, dev->attr.mode);
-			goto done;
-			break;
-			}
-		case TOPOLOGY:
-			{
-			char path[SYSFS_PATH_MAX];
-			char *temp;
 
-			if (!class_dev->sysdevice)
-				continue;
-			found = 0;	
-			strcpy(path, class_dev->sysdevice->path);
+static int do_topology(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+{
+	struct config_device *dev;
+	struct list_head *tmp;
+	char path[SYSFS_PATH_MAX];
+	int found;
+	char *temp = NULL;
+
+	/* we have to have a sysfs device for TOPOLOGY to work */
+	if (!sysfs_device)
+		return -ENODEV;
+
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != TOPOLOGY)
+			continue;
+
+		found = 0;
+		strcpy(path, sysfs_device->path);
+		temp = strrchr(path, '/');
+		dbg_parse("TOPOLOGY path = '%s'", path);
+		dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
+		if (strstr(temp, dev->place) != NULL) {
+			found = 1;
+		} else {
+			*temp = 0x00;
 			temp = strrchr(path, '/');
-			dbg_parse("TOPOLOGY path = '%s'", path);
 			dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
-			if (strstr(temp, dev->place) != NULL) {
+			if (strstr(temp, dev->place) != NULL)
 				found = 1;
-			} else {
-				*temp = 0x00;
+		}
+		if (!found)
+			continue;
+
+		strcpy(udev->name, dev->name);
+		if (dev->mode != 0) {
+			udev->mode = dev->mode;
+			strcpy(udev->owner, dev->owner);
+			strcpy(udev->group, dev->group);
+		}
+		dbg_parse("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+			dev->place, udev->name, 
+			dev->owner, dev->group, dev->mode);
+		
+		return 0;
+	}
+	return -ENODEV;
+}
+
+static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+	struct config_device *dev;
+	struct list_head *tmp;
+
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != REPLACE)
+			continue;
+
+		dbg_parse("REPLACE: replace name '%s' with '%s'",
+			  dev->kernel_name, dev->name);
+		if (strcmp(dev->kernel_name, class_dev->name) != 0)
+			continue;
+
+		strcpy(udev->name, dev->name);
+		if (dev->mode != 0) {
+			udev->mode = dev->mode;
+			strcpy(udev->owner, dev->owner);
+			strcpy(udev->group, dev->group);
+		}
+		dbg_parse("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+			dev->kernel_name, udev->name, 
+			dev->owner, dev->group, dev->mode);
+		
+		return 0;
+	}
+	return -ENODEV;
+}
+
+static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+	struct sysfs_device *sysfs_device = NULL;
+	struct sysfs_class_device *class_dev_parent = NULL;
+	int retval = 0;
+	char *temp = NULL;
+
+	udev->mode = 0;
+
+	/* find the sysfs_device for this class device */
+	/* Wouldn't it really be nice if libsysfs could do this for us? */
+	if (class_dev->sysdevice) {
+		sysfs_device = class_dev->sysdevice;
+	} else {
+		/* bah, let's go backwards up a level to see if the device is there,
+		 * as block partitions don't point to the physical device.  Need to fix that
+		 * up in the kernel...
+		 */
+		if (strstr(class_dev->path, "block")) {
+			dbg_parse("looking at block device...");
+			if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
+				char path[SYSFS_PATH_MAX];
+
+				dbg_parse("really is a partition...");
+				strcpy(path, class_dev->path);
 				temp = strrchr(path, '/');
-				dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
-				if (strstr(temp, dev->place) != NULL)
-					found = 1;
+				*temp = 0x00;
+				dbg_parse("looking for a class device at '%s'", path);
+				class_dev_parent = sysfs_open_class_device(path);
+				if (class_dev_parent == NULL) {
+					dbg("sysfs_open_class_device at '%s' failed", path);
+				} else {
+					dbg_parse("class_dev_parent->name = %s", class_dev_parent->name);
+					if (class_dev_parent->sysdevice)
+						sysfs_device = class_dev_parent->sysdevice;
+				}
 			}
-			if (!found)
-				continue;
+		}
+	}
+		
+	if (sysfs_device) {
+		dbg_parse("sysfs_device->path = '%s'", sysfs_device->path);
+		dbg_parse("sysfs_device->bus_id = '%s'", sysfs_device->bus_id);
+	} else {
+		dbg_parse("class_dev->name = '%s'", class_dev->name);
+	}
 
-			strcpy(attr->name, dev->attr.name);
-			if (dev->attr.mode != 0) {
-				attr->mode = dev->attr.mode;
-				strcpy(attr->owner, dev->attr.owner);
-				strcpy(attr->group, dev->attr.group);
-			}
-			dbg_parse("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-				dev->place, attr->name, 
-				dev->attr.owner, dev->attr.group, dev->attr.mode);
-			goto done;
-			break;
-			}
-		case CALLOUT:
-			{
-			char value[ID_SIZE];
+	/* rules are looked at in priority order */
+	retval = do_callout(class_dev, udev);
+	if (retval == 0)
+		goto done;
 
-			if (exec_callout(dev, value, sizeof(value)))
-				continue;
-			if (strncmp(value, dev->id, sizeof(value)) != 0)
-				continue;
-			strcpy(attr->name, dev->attr.name);
-			if (dev->attr.mode != 0) {
-				attr->mode = dev->attr.mode;
-				strcpy(attr->owner, dev->attr.owner);
-				strcpy(attr->group, dev->attr.group);
-			}
-			dbg_parse("device callout '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-				dev->id, attr->name, 
-				dev->attr.owner, dev->attr.group, dev->attr.mode);
-			goto done;
-			break;
-			}
-		case REPLACE:
-			if (strcmp(dev->kernel_name, class_dev->name) != 0)
-				continue;
-			strcpy(attr->name, dev->attr.name);
-			if (dev->attr.mode != 0) {
-				attr->mode = dev->attr.mode;
-				strcpy(attr->owner, dev->attr.owner);
-				strcpy(attr->group, dev->attr.group);
+	retval = do_label(class_dev, udev, sysfs_device);
+	if (retval == 0)
+		goto done;
+
+	retval = do_number(class_dev, udev, sysfs_device);
+	if (retval == 0)
+		goto done;
+
+	retval = do_topology(class_dev, udev, sysfs_device);
+	if (retval == 0)
+		goto done;
+
+	retval = do_replace(class_dev, udev);
+	if (retval == 0)
+		goto done;
+
+	strcpy(udev->name, class_dev->name);
+
+done:
+	/* substitute placeholder in NAME  */
+	while (1) {
+		char *pos = strchr(udev->name, '%');
+		char *dig;
+		char name[NAME_SIZE];
+		if (pos) {
+			strcpy(name, pos+2);
+			*pos = 0x00;
+			switch (pos[1]) {
+			case 'b':
+				if (!sysfs_device)
+					break;
+				strcat(udev->name, sysfs_device->bus_id);
+				dbg("bus_id appended: %s", 
+						sysfs_device->bus_id);
+				break;
+			case 'n':
+				dig = class_dev->name + strlen(class_dev->name);
+				while (isdigit(*(dig-1)))
+					dig--;
+				strcat(udev->name, dig);
+				dbg("kernel number appended: %s", dig);
+				break;
+			case 'm':
+				sprintf(pos, "%u", udev->minor);
+				dbg("minor number appended: %u", udev->minor);
+				break;
+			case 'M':
+				sprintf(pos, "%u", udev->major);
+				dbg("major number appended: %u", udev->major);
+				break;
+			default:
+				dbg("unknown substitution type: %%%c", pos[1]);
+				break;
 			}
-			dbg_parse("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-				dev->kernel_name, attr->name, 
-				dev->attr.owner, dev->attr.group, dev->attr.mode);
-			goto done;
-			break;
-		case KERNEL_NAME:
+			strcat(udev->name, name);
+		} else
 			break;
-		default:
-			dbg_parse("Unknown type of device '%d'", dev->type);
-			break;
-		}	
 	}
-	strcpy(attr->name, class_dev->name);
 
-done:
 	/* mode was never set above */
-	if (!attr->mode) {
-		attr->mode = get_default_mode(class_dev);
-		attr->owner[0] = 0x00;
-		attr->group[0] = 0x00;
+	if (!udev->mode) {
+		udev->mode = get_default_mode(class_dev);
+		udev->owner[0] = 0x00;
+		udev->group[0] = 0x00;
 	}
-	return retval;
+
+	if (class_dev_parent)
+		sysfs_close_class_device(class_dev_parent);
+
+	return 0;
 }
 
-int namedev_name_device(struct sysfs_class_device *class_dev, struct device_attr *attr)
+int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev)
 {
 	int retval;
 
-	retval = get_attr(class_dev, attr);
+	retval = get_attr(class_dev, dev);
 	if (retval)
 		dbg("get_attr failed");