X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.c;h=24b9bc01ac2258f24fb85c67fb1a8c2fce5844cd;hb=04a81cac0aab2ab6a54ddc661dd57be7d5b1595a;hp=a9d66bcad708924e07a127ff95679be66b317092;hpb=70033702cda3b13150426cd176a31713d48394d9;p=elogind.git

diff --git a/namedev.c b/namedev.c
index a9d66bcad..24b9bc01a 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>
@@ -45,6 +45,7 @@
 #define TYPE_TOPOLOGY	"TOPOLOGY"
 #define TYPE_REPLACE	"REPLACE"
 #define TYPE_CALLOUT	"CALLOUT"
+#define CALLOUT_MAXARG	8
 
 static LIST_HEAD(config_device_list);
 
@@ -52,43 +53,42 @@ static void dump_dev(struct config_device *dev)
 {
 	switch (dev->type) {
 	case KERNEL_NAME:
-		dbg_parse("KERNEL name ='%s'"
-			" owner = '%s', group = '%s', mode = '%#o'",
-			dev->name, 
-			dev->owner, dev->group, dev->mode);
+		dbg_parse("KERNEL name='%s' ,"
+			  "owner='%s', group='%s', mode=%#o",
+			  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->name, dev->bus, dev->sysfs_file, dev->sysfs_value,
-			dev->owner, dev->group, dev->mode);
+		dbg_parse("LABEL name='%s', bus='%s', sysfs_file='%s', sysfs_value='%s', "
+			  "owner='%s', group='%s', mode=%#o",
+			  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->name, dev->bus, dev->id,
-			dev->owner, dev->group, dev->mode);
+		dbg_parse("NUMBER name='%s', bus='%s', id='%s', "
+			  "owner='%s', group='%s', mode=%#o",
+			  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->name, dev->bus, dev->place,
-			dev->owner, dev->group, dev->mode);
+		dbg_parse("TOPOLOGY name='%s', bus='%s', place='%s', "
+			  "owner='%s', group='%s', mode=%#o",
+			  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->name, dev->kernel_name,
-			dev->owner, dev->group, dev->mode);
+		dbg_parse("REPLACE name=%s, kernel_name=%s, "
+			  "owner='%s', group='%s', mode=%#o",
+			  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->name, dev->exec_program, dev->bus, dev->id,
-			dev->owner, dev->group, dev->mode);
+		dbg_parse("CALLOUT name='%s', program='%s', bus='%s', id='%s', "
+			  "owner='%s', group='%s', mode=%#o",
+			  dev->name, dev->exec_program, dev->bus, dev->id,
+			  dev->owner, dev->group, dev->mode);
 		break;
 	default:
-		dbg_parse("Unknown type of device!");
+		dbg_parse("unknown type of method");
 	}
 }
 
@@ -105,27 +105,33 @@ static int add_dev(struct config_device *new_dev)
 	struct list_head *tmp;
 	struct config_device *tmp_dev;
 
-	/* loop through the whole list of devices to see if we already have
-	 * this one... */
+	/* update the values if we already have the device */
 	list_for_each(tmp, &config_device_list) {
 		struct config_device *dev = list_entry(tmp, struct config_device, node);
-		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, 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, owner);
-			copy_string(dev, new_dev, group);
-			return 0;
+		int len = strlen(new_dev->name);
+		if (new_dev->name[len-1] == '*') {
+			len--;
+			if (strncmp(dev->name, new_dev->name, len))
+				continue;
+		} else {
+			if (strcmp(dev->name, new_dev->name))
+				continue;
 		}
+		/* the same, copy the new info into this structure */
+		copy_var(dev, new_dev, type);
+		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, owner);
+		copy_string(dev, new_dev, group);
+		return 0;
 	}
 
-	/* not found, lets create a new structure, and add it to the list */
+	/* not found, add new structure to the device list */
 	tmp_dev = malloc(sizeof(*tmp_dev));
 	if (!tmp_dev)
 		return -ENOMEM;
@@ -207,7 +213,7 @@ static int namedev_init_config(void)
 	dbg("opening %s to read as config", udev_config_filename);
 	fd = fopen(udev_config_filename, "r");
 	if (fd == NULL) {
-		dbg("Can't open %s", udev_config_filename);
+		dbg("can't open %s", udev_config_filename);
 		return -ENODEV;
 	}
 
@@ -226,7 +232,7 @@ static int namedev_init_config(void)
 		while (isspace(*temp))
 			++temp;
 
-		/* no more line? */
+		/* empty line? */
 		if (*temp == 0x00)
 			continue;
 
@@ -263,10 +269,10 @@ static int namedev_init_config(void)
 				break;
 			strfieldcpy(dev.name, temp3);
 
-			dbg_parse("LABEL name = '%s', bus = '%s', "
-				"sysfs_file = '%s', sysfs_value = '%s'", 
-				dev.name, dev.bus, dev.sysfs_file, 
-				dev.sysfs_value);
+			dbg_parse("LABEL name='%s', bus='%s', "
+				  "sysfs_file='%s', sysfs_value='%s'", 
+				  dev.name, dev.bus, dev.sysfs_file, 
+				  dev.sysfs_value);
 		}
 
 		if (strcasecmp(temp2, TYPE_NUMBER) == 0) {
@@ -281,7 +287,7 @@ static int namedev_init_config(void)
 
 			/* ID="id" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("id", &temp, &temp3);
+			retval = get_value("ID", &temp, &temp3);
 			if (retval)
 				break;
 			strfieldcpy(dev.id, temp3);
@@ -293,8 +299,8 @@ static int namedev_init_config(void)
 				break;
 			strfieldcpy(dev.name, temp3);
 
-			dbg_parse("NUMBER name = '%s', bus = '%s', id = '%s'",
-					dev.name, dev.bus, dev.id);
+			dbg_parse("NUMBER name='%s', bus='%s', id='%s'",
+				  dev.name, dev.bus, dev.id);
 		}
 
 		if (strcasecmp(temp2, TYPE_TOPOLOGY) == 0) {
@@ -309,7 +315,7 @@ static int namedev_init_config(void)
 
 			/* PLACE="place" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("place", &temp, &temp3);
+			retval = get_value("PLACE", &temp, &temp3);
 			if (retval)
 				break;
 			strfieldcpy(dev.place, temp3);
@@ -321,8 +327,8 @@ static int namedev_init_config(void)
 				break;
 			strfieldcpy(dev.name, temp3);
 
-			dbg_parse("TOPOLOGY name = '%s', bus = '%s', place = '%s'",
-					dev.name, dev.bus, dev.place);
+			dbg_parse("TOPOLOGY name='%s', bus='%s', place='%s'",
+				  dev.name, dev.bus, dev.place);
 		}
 
 		if (strcasecmp(temp2, TYPE_REPLACE) == 0) {
@@ -341,25 +347,25 @@ static int namedev_init_config(void)
 			if (retval)
 				break;
 			strfieldcpy(dev.name, temp3);
-			dbg_parse("REPLACE name = %s, kernel_name = %s",
-					dev.name, dev.kernel_name);
+			dbg_parse("REPLACE name='%s', kernel_name='%s'",
+				  dev.name, dev.kernel_name);
 		}
 		if (strcasecmp(temp2, TYPE_CALLOUT) == 0) {
 			/* number type */
 			dev.type = CALLOUT;
 
-			/* PROGRAM="executable" */
-			retval = get_value("PROGRAM", &temp, &temp3);
+			/* BUS="bus" */
+			retval = get_value("BUS", &temp, &temp3);
 			if (retval)
 				break;
-			strfieldcpy(dev.exec_program, temp3);
+			strfieldcpy(dev.bus, temp3);
 
-			/* BUS="bus" */
+			/* PROGRAM="executable" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("BUS", &temp, &temp3);
+			retval = get_value("PROGRAM", &temp, &temp3);
 			if (retval)
 				break;
-			strfieldcpy(dev.bus, temp3);
+			strfieldcpy(dev.exec_program, temp3);
 
 			/* ID="id" */
 			temp2 = strsep(&temp, ",");
@@ -374,8 +380,8 @@ static int namedev_init_config(void)
 			if (retval)
 				break;
 			strfieldcpy(dev.name, temp3);
-			dbg_parse("CALLOUT name = %s, program = %s",
-					dev.name, dev.exec_program);
+			dbg_parse("CALLOUT name='%s', program='%s'",
+				  dev.name, dev.exec_program);
 		}
 
 		retval = add_dev(&dev);
@@ -384,7 +390,7 @@ static int namedev_init_config(void)
 			goto exit;
 		}
 	}
-	dbg_parse("%s:%d:%Zd: error parsing ``%s''", udev_config_filename,
+	dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
 		  lineno, temp - line, temp);
 exit:
 	fclose(fd);
@@ -404,7 +410,7 @@ static int namedev_init_permissions(void)
 	dbg("opening %s to read as permissions config", udev_config_permission_filename);
 	fd = fopen(udev_config_permission_filename, "r");
 	if (fd == NULL) {
-		dbg("Can't open %s", udev_config_permission_filename);
+		dbg("can't open %s", udev_config_permission_filename);
 		return -ENODEV;
 	}
 
@@ -421,7 +427,7 @@ static int namedev_init_permissions(void)
 		while (isspace(*temp))
 			++temp;
 
-		/* no more line? */
+		/* empty line? */
 		if (*temp == 0x00)
 			continue;
 
@@ -433,19 +439,31 @@ static int namedev_init_permissions(void)
 
 		/* parse the line */
 		temp2 = strsep(&temp, ":");
+		if (!temp2) {
+			dbg("cannot parse line: %s", line);
+			continue;
+		}
 		strncpy(dev.name, temp2, sizeof(dev.name));
 
 		temp2 = strsep(&temp, ":");
+		if (!temp2) {
+			dbg("cannot parse line: %s", line);
+			continue;
+		}
 		strncpy(dev.owner, temp2, sizeof(dev.owner));
 
 		temp2 = strsep(&temp, ":");
+		if (!temp2) {
+			dbg("cannot parse line: %s", line);
+			continue;
+		}
 		strncpy(dev.group, temp2, sizeof(dev.owner));
 
 		dev.mode = strtol(temp, NULL, 8);
 
-		dbg_parse("name = %s, owner = %s, group = %s, mode = %#o",
-				dev.name, dev.owner, dev.group,
-				dev.mode);
+		dbg_parse("name='%s', owner='%s', group='%s', mode=%#o",
+			  dev.name, dev.owner, dev.group,
+			  dev.mode);
 		retval = add_dev(&dev);
 		if (retval) {
 			dbg("add_dev returned with error %d", retval);
@@ -474,8 +492,11 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 	pid_t pid;
 	int value_set = 0;
 	char buffer[256];
+	char *arg;
+	char *args[CALLOUT_MAXARG];
+	int i;
 
-	dbg("callout to %s\n", dev->exec_program);
+	dbg("callout to '%s'", dev->exec_program);
 	retval = pipe(fds);
 	if (retval != 0) {
 		dbg("pipe failed");
@@ -488,21 +509,32 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 	}
 
 	if (pid == 0) {
-		/*
-		 * child 
-		 */
+		/* child */
 		close(STDOUT_FILENO);
 		dup(fds[1]);	/* dup write side of pipe to STDOUT */
-		retval = execve(dev->exec_program, main_argv, main_envp);
+		if (strchr(dev->exec_program, ' ')) {
+			/* callout with arguments */
+			arg = dev->exec_program;
+			for (i=0; i < CALLOUT_MAXARG-1; i++) {
+				args[i] = strsep(&arg, " ");
+				if (args[i] == NULL)
+					break;
+			}
+			if (args[i]) {
+				dbg("to many args - %d", i);
+				args[i] = NULL;
+			}
+			retval = execve(args[0], args, main_envp);
+		} else {
+			retval = execve(dev->exec_program, main_argv, main_envp);
+		}
 		if (retval != 0) {
 			dbg("child execve failed");
 			exit(1);
 		}
 		return -1; /* avoid compiler warning */
 	} else {
-		/*
-		 * Parent reads from fds[0].
-		 */
+		/* parent reads from fds[0] */
 		close(fds[1]);
 		retval = 0;
 		while (1) {
@@ -522,6 +554,7 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 				strncpy(value, buffer, len);
 			}
 		}
+		dbg("callout returned '%s'", value);
 		close(fds[0]);
 		res = wait(&status);
 		if (res < 0) {
@@ -560,9 +593,10 @@ static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(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);
+		dbg_parse("callout returned matching value '%s', '%s' becomes '%s'"
+			  " - owner='%s', group='%s', mode =%#o",
+			  dev->id, class_dev->name, udev->name,
+			  dev->owner, dev->group, dev->mode);
 		return 0;
 	}
 	return -ENODEV;
@@ -579,8 +613,7 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 		if (dev->type != LABEL)
 			continue;
 
-		dbg_parse("LABEL: match file '%s' with value '%s'",
-				dev->sysfs_file, dev->sysfs_value);
+		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);
 		if (tmpattr)
@@ -597,7 +630,8 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 
 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);
+		dbg_parse("compare attribute '%s' value '%s' with '%s'",
+			  dev->sysfs_file, tmpattr->value, dev->sysfs_value);
 		if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
 			continue;
 
@@ -607,9 +641,10 @@ label_found:
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(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);
+		dbg_parse("found matching attribute '%s', '%s' becomes '%s' "
+			  "- owner='%s', group='%s', mode=%#o",
+			  dev->sysfs_file, class_dev->name, udev->name,
+			  dev->owner, dev->group, dev->mode);
 
 		return 0;
 	}
@@ -636,14 +671,13 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
 		found = 0;
 		strfieldcpy(path, sysfs_device->path);
 		temp = strrchr(path, '/');
-		dbg_parse("NUMBER path = '%s'", path);
-		dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
+		dbg_parse("search '%s' in '%s', path='%s'", dev->id, temp, path);
 		if (strstr(temp, dev->id) != NULL) {
 			found = 1;
 		} else {
 			*temp = 0x00;
 			temp = strrchr(path, '/');
-			dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
+			dbg_parse("search '%s' in '%s', path='%s'", dev->id, temp, path);
 			if (strstr(temp, dev->id) != NULL)
 				found = 1;
 		}
@@ -655,9 +689,10 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(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);
+		dbg_parse("found matching id '%s', '%s' becomes '%s'"
+			  " - owner='%s', group ='%s', mode=%#o",
+			  dev->id, class_dev->name, udev->name,
+			  dev->owner, dev->group, dev->mode);
 		return 0;
 	}
 	return -ENODEV;
@@ -684,14 +719,13 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
 		found = 0;
 		strfieldcpy(path, sysfs_device->path);
 		temp = strrchr(path, '/');
-		dbg_parse("TOPOLOGY path = '%s'", path);
-		dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
+		dbg_parse("search '%s' in '%s', path='%s'", dev->place, temp, path);
 		if (strstr(temp, dev->place) != NULL) {
 			found = 1;
 		} else {
 			*temp = 0x00;
 			temp = strrchr(path, '/');
-			dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
+			dbg_parse("search '%s' in '%s', path='%s'", dev->place, temp, path);
 			if (strstr(temp, dev->place) != NULL)
 				found = 1;
 		}
@@ -704,10 +738,10 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(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);
-		
+		dbg_parse("found matching place '%s', '%s' becomes '%s'"
+			  " - owner='%s', group ='%s', mode=%#o",
+			  dev->place, class_dev->name, udev->name,
+			  dev->owner, dev->group, dev->mode);
 		return 0;
 	}
 	return -ENODEV;
@@ -723,7 +757,7 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
 		if (dev->type != REPLACE)
 			continue;
 
-		dbg_parse("REPLACE: replace name '%s' with '%s'",
+		dbg_parse("compare name '%s' with '%s'",
 			  dev->kernel_name, dev->name);
 		if (strcmp(dev->kernel_name, class_dev->name) != 0)
 			continue;
@@ -734,15 +768,42 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(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);
+		dbg_parse("found name, '%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 void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+	struct config_device *dev;
+	struct list_head *tmp;
+	int len;
+
+	strfieldcpy(udev->name, class_dev->name);
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		len = strlen(dev->name);
+		if (dev->name[len-1] == '*') {
+			len--;
+			if (strncmp(dev->name, class_dev->name, len))
+				continue;
+		} else {
+			if (strcmp(dev->name, class_dev->name))
+				continue;
+		}
+		if (dev->mode != 0) {
+			dbg_parse("found permissions for '%s'", class_dev->name);
+			udev->mode = dev->mode;
+			strfieldcpy(udev->owner, dev->owner);
+			strfieldcpy(udev->group, dev->group);
+		}
+	}
+}
+
 static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
 	struct sysfs_device *sysfs_device = NULL;
@@ -775,7 +836,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 				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);
+					dbg_parse("class_dev_parent->name=%s", class_dev_parent->name);
 					if (class_dev_parent->sysdevice)
 						sysfs_device = class_dev_parent->sysdevice;
 				}
@@ -784,8 +845,8 @@ 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->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);
 	}
@@ -793,27 +854,28 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 	/* rules are looked at in priority order */
 	retval = do_callout(class_dev, udev);
 	if (retval == 0)
-		goto done;
+		goto found;
 
 	retval = do_label(class_dev, udev, sysfs_device);
 	if (retval == 0)
-		goto done;
+		goto found;
 
 	retval = do_number(class_dev, udev, sysfs_device);
 	if (retval == 0)
-		goto done;
+		goto found;
 
 	retval = do_topology(class_dev, udev, sysfs_device);
 	if (retval == 0)
-		goto done;
+		goto found;
 
 	retval = do_replace(class_dev, udev);
 	if (retval == 0)
-		goto done;
+		goto found;
 
-	strfieldcpy(udev->name, class_dev->name);
+	do_kernelname(class_dev, udev);
+	goto done;
 
-done:
+found:
 	/* substitute placeholder in NAME  */
 	while (1) {
 		char *pos = strchr(udev->name, '%');
@@ -827,7 +889,7 @@ done:
 				if (!sysfs_device)
 					break;
 				strcat(udev->name, sysfs_device->bus_id);
-				dbg("bus_id appended: %s", 
+				dbg("bus_id inserted: %s", 
 						sysfs_device->bus_id);
 				break;
 			case 'n':
@@ -835,18 +897,18 @@ done:
 				while (isdigit(*(dig-1)))
 					dig--;
 				strcat(udev->name, dig);
-				dbg("kernel number appended: %s", dig);
+				dbg("substitute kernel number '%s'", dig);
 				break;
 			case 'm':
 				sprintf(pos, "%u", udev->minor);
-				dbg("minor number appended: %u", udev->minor);
+				dbg("substitute minor number '%u'", udev->minor);
 				break;
 			case 'M':
 				sprintf(pos, "%u", udev->major);
-				dbg("major number appended: %u", udev->major);
+				dbg("substitute major number '%u'", udev->major);
 				break;
 			default:
-				dbg("unknown substitution type: %%%c", pos[1]);
+				dbg("unknown substitution type '%%%c'", pos[1]);
 				break;
 			}
 			strcat(udev->name, name);
@@ -854,6 +916,7 @@ done:
 			break;
 	}
 
+done:
 	/* mode was never set above */
 	if (!udev->mode) {
 		udev->mode = get_default_mode(class_dev);