X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=a81721a9cf4378cd45f2517e8701ebde98f211f7;hp=7c8761088f304036b4a3b3994fa3e06e082ed4da;hb=fd9594b61fb5ac4106731c087af614940b066df4;hpb=cb08e0f2531f910fcd46a24b2fa0eb8049165b02

diff --git a/namedev.c b/namedev.c
index 7c8761088..a81721a9c 100644
--- a/namedev.c
+++ b/namedev.c
@@ -21,9 +21,6 @@
  *
  */
 
-/* define this to enable parsing debugging */
-/* #define DEBUG_PARSER */
-
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -39,56 +36,21 @@
 #include "udev_version.h"
 #include "namedev.h"
 #include "libsysfs/libsysfs.h"
+#include "klibc_fixups.h"
 
-#define TYPE_LABEL	"LABEL"
-#define TYPE_NUMBER	"NUMBER"
-#define TYPE_TOPOLOGY	"TOPOLOGY"
-#define TYPE_REPLACE	"REPLACE"
-#define TYPE_CALLOUT	"CALLOUT"
-
-static LIST_HEAD(config_device_list);
+LIST_HEAD(config_device_list);
 
-static void dump_dev(struct config_device *dev)
+/* s2 may end with '*' to match everything */
+static int strncmp_wildcard(char *s1, char *s2, int max)
 {
-	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);
-		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);
-		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);
-		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);
-		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);
-		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);
-		break;
-	default:
-		dbg_parse("unknown type of method");
-	}
+	int len = strlen(s2);
+	if (len > max)
+		len = max;
+	if (s2[len-1] == '*')
+		len--;
+	else
+		len = max;
+	return strncmp(s1, s2, len);
 }
 
 #define copy_var(a, b, var)		\
@@ -99,7 +61,7 @@ static void dump_dev(struct config_device *dev)
 	if (strlen(b->var))		\
 		strcpy(a->var, b->var);
 
-static int add_dev(struct config_device *new_dev)
+int add_config_dev(struct config_device *new_dev)
 {
 	struct list_head *tmp;
 	struct config_device *tmp_dev;
@@ -107,16 +69,10 @@ static int add_dev(struct config_device *new_dev)
 	/* 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);
-		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 */
+		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);
@@ -125,6 +81,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;
@@ -135,338 +92,84 @@ 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);
-	//dump_dev(tmp_dev);
+	list_add_tail(&tmp_dev->node, &config_device_list);
+	//dump_config_dev(tmp_dev);
 	return 0;
 }
 
-static void dump_dev_list(void)
-{
-	struct list_head *tmp;
-
-	list_for_each(tmp, &config_device_list) {
-		struct config_device *dev = list_entry(tmp, struct config_device, node);
-		dump_dev(dev);
-	}
-}
-	
-static int get_pair(char **orig_string, char **left, char **right)
+static mode_t get_default_mode(struct sysfs_class_device *class_dev)
 {
-	char *temp;
-	char *string = *orig_string;
-
-	if (!string)
-		return -ENODEV;
-
-	/* eat any whitespace */
-	while (isspace(*string))
-		++string;
-
-	/* split based on '=' */
-	temp = strsep(&string, "=");
-	*left = temp;
-	if (!string)
-		return -ENODEV;
-
-	/* take the right side and strip off the '"' */
-	while (isspace(*string))
-		++string;
-	if (*string == '"')
-		++string;
-	else
-		return -ENODEV;
-
-	temp = strsep(&string, "\"");
-	if (!string || *temp == '\0')
-		return -ENODEV;
-	*right = temp;
-	*orig_string = string;
-	
-	return 0;
+	/* just default everyone to rw for the world! */
+	return 0666;
 }
 
-static int get_value(const char *left, char **orig_string, char **ret_string)
+static void build_kernel_number(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
-	int retval;
-	char *left_string;
-
-	retval = get_pair(orig_string, &left_string, ret_string);
-	if (retval)
-		return retval;
-	if (strcasecmp(left_string, left) != 0)
-		return -ENODEV;
-	return 0;
+	char *dig;
+
+	/* FIXME, figure out how to handle stuff like sdaj which will not work right now. */
+	dig = class_dev->name + strlen(class_dev->name);
+	while (isdigit(*(dig-1)))
+		dig--;
+	strfieldcpy(udev->kernel_number, dig);
+	dbg("kernel_number='%s'", udev->kernel_number);
 }
 
-static int namedev_init_config(void)
+static void apply_format(struct udevice *udev, unsigned char *string)
 {
-	char line[255];
-	int lineno;
-	char *temp;
-	char *temp2;
-	char *temp3;
-	FILE *fd;
-	int retval = 0;
-	struct config_device dev;
+	char name[NAME_SIZE];
+	char *pos;
 
-	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);
-		return -ENODEV;
-	}
-
-	/* loop through the whole file */
-	lineno = 0;
 	while (1) {
-		/* get a line */
-		temp = fgets(line, sizeof(line), fd);
-		if (temp == NULL)
-			goto exit;
-		lineno++;
-
-		dbg_parse("read %s", temp);
-
-		/* eat the whitespace at the beginning of the line */
-		while (isspace(*temp))
-			++temp;
-
-		/* empty line? */
-		if (*temp == 0x00)
-			continue;
+		pos = strchr(string, '%');
 
-		/* see if this is a comment */
-		if (*temp == COMMENT_CHARACTER)
-			continue;
-
-		memset(&dev, 0x00, sizeof(struct config_device));
-
-		/* parse the line */
-		temp2 = strsep(&temp, ",");
-		if (strcasecmp(temp2, TYPE_LABEL) == 0) {
-			/* label type */
-			dev.type = LABEL;
-
-			/* BUS="bus" */
-			retval = get_value("BUS", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.bus, temp3);
-
-			/* file="value" */
-			temp2 = strsep(&temp, ",");
-			retval = get_pair(&temp, &temp2, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.sysfs_file, temp2);
-			strfieldcpy(dev.sysfs_value, temp3);
-
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
-				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);
-		}
-
-		if (strcasecmp(temp2, TYPE_NUMBER) == 0) {
-			/* number type */
-			dev.type = NUMBER;
-
-			/* BUS="bus" */
-			retval = get_value("BUS", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.bus, temp3);
-
-			/* ID="id" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("ID", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.id, temp3);
-
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.name, temp3);
-
-			dbg_parse("NUMBER name='%s', bus='%s', id='%s'",
-				  dev.name, dev.bus, dev.id);
-		}
-
-		if (strcasecmp(temp2, TYPE_TOPOLOGY) == 0) {
-			/* number type */
-			dev.type = TOPOLOGY;
-
-			/* BUS="bus" */
-			retval = get_value("BUS", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.bus, temp3);
-
-			/* PLACE="place" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("PLACE", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.place, temp3);
-
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
+		if (pos) {
+			strfieldcpy(name, pos+2);
+			*pos = 0x00;
+			switch (pos[1]) {
+			case 'b':
+				if (strlen(udev->bus_id) == 0)
+					break;
+				strcat(pos, udev->bus_id);
+				dbg("substitute bus_id '%s'", udev->bus_id);
 				break;
-			strfieldcpy(dev.name, temp3);
-
-			dbg_parse("TOPOLOGY name='%s', bus='%s', place='%s'",
-				  dev.name, dev.bus, dev.place);
-		}
-
-		if (strcasecmp(temp2, TYPE_REPLACE) == 0) {
-			/* number type */
-			dev.type = REPLACE;
-
-			/* KERNEL="kernel_name" */
-			retval = get_value("KERNEL", &temp, &temp3);
-			if (retval)
+			case 'n':
+				if (strlen(udev->kernel_number) == 0)
+					break;
+				strcat(pos, udev->kernel_number);
+				dbg("substitute kernel number '%s'", udev->kernel_number);
 				break;
-			strfieldcpy(dev.kernel_name, temp3);
-
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
+			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;
-			strfieldcpy(dev.name, temp3);
-			dbg_parse("REPLACE name='%s', kernel_name='%s'",
-				  dev.name, dev.kernel_name);
-		}
-		if (strcasecmp(temp2, TYPE_CALLOUT) == 0) {
-			/* number type */
-			dev.type = CALLOUT;
-
-			/* BUS="bus" */
-			retval = get_value("BUS", &temp, &temp3);
-			if (retval)
+			case 'm':
+				sprintf(pos, "%u", udev->minor);
+				dbg("substitute minor number '%u'", udev->minor);
 				break;
-			strfieldcpy(dev.bus, temp3);
-
-			/* PROGRAM="executable" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("PROGRAM", &temp, &temp3);
-			if (retval)
+			case 'M':
+				sprintf(pos, "%u", udev->major);
+				dbg("substitute major number '%u'", udev->major);
 				break;
-			strfieldcpy(dev.exec_program, temp3);
-
-			/* ID="id" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("ID", &temp, &temp3);
-			if (retval)
+			case 'c':
+				if (strlen(udev->callout_value) == 0)
+					break;
+				strcat(pos, udev->callout_value);
+				dbg("substitute callout output '%s'", udev->callout_value);
 				break;
-			strfieldcpy(dev.id, temp3);
-
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
+			default:
+				dbg("unknown substitution type '%%%c'", pos[1]);
 				break;
-			strfieldcpy(dev.name, temp3);
-			dbg_parse("CALLOUT name='%s', program='%s'",
-				  dev.name, dev.exec_program);
-		}
-
-		retval = add_dev(&dev);
-		if (retval) {
-			dbg("add_dev returned with error %d", retval);
-			goto exit;
-		}
-	}
-	dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
-		  lineno, temp - line, temp);
-exit:
-	fclose(fd);
-	return retval;
-}	
-
-
-static int namedev_init_permissions(void)
-{
-	char line[255];
-	char *temp;
-	char *temp2;
-	FILE *fd;
-	int retval = 0;
-	struct config_device dev;
-
-	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);
-		return -ENODEV;
-	}
-
-	/* loop through the whole file */
-	while (1) {
-		/* get a line */
-		temp = fgets(line, sizeof(line), fd);
-		if (temp == NULL)
+			}
+			strcat(string, name);
+		} else
 			break;
-
-		dbg_parse("read %s", temp);
-
-		/* eat the whitespace at the beginning of the line */
-		while (isspace(*temp))
-			++temp;
-
-		/* empty line? */
-		if (*temp == 0x00)
-			continue;
-
-		/* see if this is a comment */
-		if (*temp == COMMENT_CHARACTER)
-			continue;
-
-		memset(&dev, 0x00, sizeof(dev));
-
-		/* parse the line */
-		temp2 = strsep(&temp, ":");
-		strncpy(dev.name, temp2, sizeof(dev.name));
-
-		temp2 = strsep(&temp, ":");
-		strncpy(dev.owner, temp2, sizeof(dev.owner));
-
-		temp2 = strsep(&temp, ":");
-		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);
-		retval = add_dev(&dev);
-		if (retval) {
-			dbg("add_dev returned with error %d", retval);
-			goto exit;
-		}
 	}
-
-exit:
-	fclose(fd);
-	return retval;
-}	
-
-static mode_t get_default_mode(struct sysfs_class_device *class_dev)
-{
-	/* just default everyone to rw for the world! */
-	return 0666;
 }
 
 
@@ -479,6 +182,9 @@ 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'", dev->exec_program);
 	retval = pipe(fds);
@@ -496,7 +202,22 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 		/* 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("too 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);
@@ -512,7 +233,7 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 				break;
 			buffer[res] = '\0';
 			if (res > len) {
-				dbg("callout len %d too short\n", len);
+				dbg("callout len %d too short", len);
 				retval = -1;
 			}
 			if (value_set) {
@@ -523,6 +244,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) {
@@ -540,20 +262,27 @@ 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;
-	char value[ID_SIZE];
 
 	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)))
+		if (sysfs_device) {
+			dbg("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))
 			continue;
-		if (strncmp(value, dev->id, sizeof(value)) != 0)
+		if (strncmp_wildcard(udev->callout_value, dev->id, NAME_SIZE) != 0)
 			continue;
 		strfieldcpy(udev->name, dev->name);
 		if (dev->mode != 0) {
@@ -561,10 +290,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("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);
+		dbg("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;
@@ -581,7 +310,13 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 		if (dev->type != LABEL)
 			continue;
 
-		dbg_parse("look for device attribute '%s'", dev->sysfs_file);
+		if (sysfs_device) {
+			dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+			if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
+				continue;
+		}
+
+		dbg("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)
@@ -598,7 +333,7 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 
 label_found:
 		tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
-		dbg_parse("compare attribute '%s' value '%s' with '%s'",
+		dbg("compare attribute '%s' value '%s' with '%s'",
 			  dev->sysfs_file, tmpattr->value, dev->sysfs_value);
 		if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
 			continue;
@@ -609,7 +344,7 @@ label_found:
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(udev->group, dev->group);
 		}
-		dbg_parse("found matching attribute '%s', '%s' becomes '%s' "
+		dbg("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);
@@ -636,16 +371,20 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
 		if (dev->type != NUMBER)
 			continue;
 
+		dbg("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, '/');
-		dbg_parse("search '%s' in '%s', path='%s'", dev->id, temp, path);
+		dbg("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("search '%s' in '%s', path='%s'", dev->id, temp, path);
+			dbg("search '%s' in '%s', path='%s'", dev->id, temp, path);
 			if (strstr(temp, dev->id) != NULL)
 				found = 1;
 		}
@@ -657,16 +396,15 @@ 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("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);
+		dbg("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;
 }
 
-
 static int do_topology(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
 	struct config_device *dev;
@@ -684,16 +422,20 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
 		if (dev->type != TOPOLOGY)
 			continue;
 
+		dbg("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, '/');
-		dbg_parse("search '%s' in '%s', path='%s'", dev->place, temp, path);
+		dbg("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("search '%s' in '%s', path='%s'", dev->place, temp, path);
+			dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
 			if (strstr(temp, dev->place) != NULL)
 				found = 1;
 		}
@@ -706,16 +448,16 @@ 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("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);
+		dbg("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;
 }
 
-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;
@@ -725,9 +467,8 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
 		if (dev->type != REPLACE)
 			continue;
 
-		dbg_parse("compare name '%s' with '%s'",
-			  dev->kernel_name, dev->name);
-		if (strcmp(dev->kernel_name, class_dev->name) != 0)
+		dbg("compare name '%s' with '%s'", dev->kernel_name, class_dev->name);
+		if (strncmp_wildcard(class_dev->name, dev->kernel_name, NAME_SIZE) != 0)
 			continue;
 
 		strfieldcpy(udev->name, dev->name);
@@ -736,9 +477,10 @@ 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("found name, '%s' becomes '%s' - owner='%s', group='%s', mode = %#o",
-			  dev->kernel_name, udev->name, 
-			  dev->owner, dev->group, dev->mode);
+		dbg("found name, '%s' becomes '%s'"
+		    " - owner='%s', group='%s', mode = %#o",
+		    dev->kernel_name, udev->name,
+		    dev->owner, dev->group, dev->mode);
 		
 		return 0;
 	}
@@ -752,19 +494,14 @@ static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *
 	int len;
 
 	strfieldcpy(udev->name, class_dev->name);
+	/* look for permissions */
 	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 (strncmp_wildcard(class_dev->name, dev->name, sizeof(dev->name)))
+			continue;
 		if (dev->mode != 0) {
-			dbg_parse("found permissions for '%s'", class_dev->name);
+			dbg("found permissions for '%s'", class_dev->name);
 			udev->mode = dev->mode;
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(udev->group, dev->group);
@@ -772,7 +509,7 @@ static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *
 	}
 }
 
-static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
+int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
 	struct sysfs_device *sysfs_device = NULL;
 	struct sysfs_class_device *class_dev_parent = NULL;
@@ -791,20 +528,20 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 		 * up in the kernel...
 		 */
 		if (strstr(class_dev->path, "block")) {
-			dbg_parse("looking at block device...");
+			dbg("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...");
+				dbg("really is a partition");
 				strfieldcpy(path, class_dev->path);
 				temp = strrchr(path, '/');
 				*temp = 0x00;
-				dbg_parse("looking for a class device at '%s'", path);
+				dbg("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);
+					dbg("class_dev_parent->name='%s'", class_dev_parent->name);
 					if (class_dev_parent->sysdevice)
 						sysfs_device = class_dev_parent->sysdevice;
 				}
@@ -813,14 +550,18 @@ 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("sysfs_device->path='%s'", sysfs_device->path);
+		dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
+		dbg("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);
+		dbg("class_dev->name = '%s'", class_dev->name);
 	}
 
+	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;
 
@@ -836,7 +577,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;
 
@@ -845,44 +586,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 
 found:
 	/* substitute placeholder in NAME  */
-	while (1) {
-		char *pos = strchr(udev->name, '%');
-		char *dig;
-		char name[NAME_SIZE];
-		if (pos) {
-			strfieldcpy(name, pos+2);
-			*pos = 0x00;
-			switch (pos[1]) {
-			case 'b':
-				if (!sysfs_device)
-					break;
-				strcat(udev->name, sysfs_device->bus_id);
-				dbg("bus_id inserted: %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("substitute kernel number '%s'", dig);
-				break;
-			case 'm':
-				sprintf(pos, "%u", udev->minor);
-				dbg("substitute minor number '%u'", udev->minor);
-				break;
-			case 'M':
-				sprintf(pos, "%u", udev->major);
-				dbg("substitute major number '%u'", udev->major);
-				break;
-			default:
-				dbg("unknown substitution type '%%%c'", pos[1]);
-				break;
-			}
-			strcat(udev->name, name);
-		} else
-			break;
-	}
+	apply_format(udev, udev->name);
 
 done:
 	/* mode was never set above */
@@ -898,22 +602,11 @@ done:
 	return 0;
 }
 
-int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev)
-{
-	int retval;
-
-	retval = get_attr(class_dev, dev);
-	if (retval)
-		dbg("get_attr failed");
-
-	return retval;
-}
-
 int namedev_init(void)
 {
 	int retval;
 	
-	retval = namedev_init_config();
+	retval = namedev_init_rules();
 	if (retval)
 		return retval;
 
@@ -921,8 +614,6 @@ int namedev_init(void)
 	if (retval)
 		return retval;
 
-	dump_dev_list();
+	dump_config_dev_list();
 	return retval;
 }
-
-