X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=1faa253c1e9b8685da16c5413d585b202383c8b0;hp=b0f1f281b114a241854b77add7f8dc378b4209d5;hb=83be97ba211c4f69e7fd9f16f57ca7210a116a7d;hpb=20051a5be96f731291705d6dce5bf3de7567d6a3

diff --git a/namedev.c b/namedev.c
index b0f1f281b..1faa253c1 100644
--- a/namedev.c
+++ b/namedev.c
@@ -29,56 +29,68 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <errno.h>
+#include <sys/wait.h>
 
 #include "list.h"
 #include "udev.h"
 #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"
+LIST_HEAD(config_device_list);
+LIST_HEAD(perm_device_list);
 
-static LIST_HEAD(config_device_list);
-
-static void dump_dev(struct config_device *dev)
+/* compare string with pattern (supports * ? [0-9] [!A-Z]) */
+static int strcmp_pattern(const char *p, const char *s)
 {
-	switch (dev->type) {
-	case KERNEL_NAME:
-		dbg("KERNEL name ='%s'"
-			" owner = '%s', group = '%s', mode = '%#o'",
-			dev->attr.name, 
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
-		break;
-	case LABEL:
-		dbg("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);
-		break;
-	case NUMBER:
-		dbg("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);
-		break;
-	case TOPOLOGY:
-		dbg("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);
+	if (*s == '\0') {
+		while (*p == '*')
+			p++;
+		return (*p != '\0');
+	}
+	switch (*p) {
+	case '[':
+		{
+			int not = 0;
+			p++;
+			if (*p == '!') {
+				not = 1;
+				p++;
+			}
+			while (*p && (*p != ']')) {
+				int match = 0;
+				if (p[1] == '-') {
+					if ((*s >= *p) && (*s <= p[2]))
+						match = 1;
+					p += 3;
+				} else {
+					match = (*p == *s);
+					p++;
+				}
+				if (match ^ not) {
+					while (*p && (*p != ']'))
+						p++;
+					return strcmp_pattern(p+1, s+1);
+				}
+			}
+		}
 		break;
-	case REPLACE:
-		dbg("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);
+	case '*':
+		if (strcmp_pattern(p, s+1))
+			return strcmp_pattern(p+1, s);
+		return 0;
+	case '\0':
+		if (*s == '\0') {
+			return 0;
+		}
 		break;
 	default:
-		dbg("Unknown type of device!");
+		if ((*p == *s) || (*p == '?'))
+			return strcmp_pattern(p+1, s+1);
+		break;
 	}
+	return 1;
 }
 
 #define copy_var(a, b, var)		\
@@ -89,427 +101,552 @@ 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;
 
-	/* 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->attr.name, new_dev->attr.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_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);
-			return 0;
-		}
+		if (strcmp_pattern(new_dev->name, dev->name))
+			continue;
+		if (strncmp(dev->bus, new_dev->bus, sizeof(dev->name)))
+			continue;
+		copy_var(dev, new_dev, type);
+		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, exec_program);
+		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;
 	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)
+int add_perm_dev(struct perm_device *new_dev)
 {
 	struct list_head *tmp;
+	struct perm_device *tmp_dev;
 
-	list_for_each(tmp, &config_device_list) {
-		struct config_device *dev = list_entry(tmp, struct config_device, node);
-		dump_dev(dev);
+	/* update the values if we already have the device */
+	list_for_each(tmp, &perm_device_list) {
+		struct perm_device *dev = list_entry(tmp, struct perm_device, node);
+		if (strcmp_pattern(new_dev->name, dev->name))
+			continue;
+		copy_var(dev, new_dev, mode);
+		copy_string(dev, new_dev, owner);
+		copy_string(dev, new_dev, group);
+		return 0;
 	}
+
+	/* not found, add new structure to the perm list */
+	tmp_dev = malloc(sizeof(*tmp_dev));
+	if (!tmp_dev)
+		return -ENOMEM;
+	memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
+	list_add_tail(&tmp_dev->node, &perm_device_list);
+	//dump_perm_dev(tmp_dev);
+	return 0;
 }
 
-static int get_value(const char *left, char **orig_string, char **ret_string)
+static struct perm_device *find_perm(char *name)
 {
-	char *temp;
-	char *string = *orig_string;
-
-	/* eat any whitespace */
-	while (isspace(*string))
-		++string;
-
-	/* split based on '=' */
-	temp = strsep(&string, "=");
-	if (strcasecmp(temp, left) == 0) {
-		/* got it, now strip off the '"' */
-		while (isspace(*string))
-			++string;
-		if (*string == '"')
-			++string;
-		temp = strsep(&string, "\"");
-		*ret_string = temp;
-		*orig_string = string;
-		return 0;
+	struct list_head *tmp;
+	struct perm_device *perm = NULL;
+
+	list_for_each(tmp, &perm_device_list) {
+		perm = list_entry(tmp, struct perm_device, node);
+		if (strcmp_pattern(perm->name, name))
+			continue;
+		return perm;
 	}
-	return -ENODEV;
+	return NULL;
 }
-	
-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;
-
-	/* eat any whitespace */
-	while (isspace(*string))
-		++string;
-
-	/* split based on '=' */
-	temp = strsep(&string, "=");
-	*left = temp;
-
-	/* take the right side and strip off the '"' */
-	while (isspace(*string))
-		++string;
-	if (*string == '"')
-		++string;
-	temp = strsep(&string, "\"");
-	*right = temp;
-	*orig_string = string;
-	
-	return 0;
+	mode_t mode = 0600;	/* default to owner rw only */
+
+	if (strlen(default_mode_str) != 0) {
+		mode = strtol(default_mode_str, NULL, 8);
+	}
+	return mode;
 }
 
-static int namedev_init_config(void)
+static void build_kernel_number(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
-	char filename[255];
-	char line[255];
-	char *temp;
-	char *temp2;
-	char *temp3;
-	FILE *fd;
-	int retval = 0;
-	struct config_device dev;
+	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);
+}
 
-	strcpy(filename, NAMEDEV_CONFIG_ROOT NAMEDEV_CONFIG_FILE);
-	dbg("opening %s to read as permissions config", filename);
-	fd = fopen(filename, "r");
-	if (fd == NULL) {
-		dbg("Can't open %s", filename);
-		return -ENODEV;
-	}
+static void apply_format(struct udevice *udev, unsigned char *string)
+{
+	char name[NAME_SIZE];
+	char *pos;
 
-	/* loop through the whole file */
 	while (1) {
-		/* get a line */
-		temp = fgets(line, sizeof(line), fd);
-		if (temp == NULL)
+		pos = strchr(string, '%');
+
+		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;
+			case 'n':
+				if (strlen(udev->kernel_number) == 0)
+					break;
+				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);
+				break;
+			case 'M':
+				sprintf(pos, "%u", udev->major);
+				dbg("substitute major number '%u'", udev->major);
+				break;
+			case 'c':
+				if (strlen(udev->callout_value) == 0)
+					break;
+				strcat(pos, udev->callout_value);
+				dbg("substitute callout output '%s'", udev->callout_value);
+				break;
+			default:
+				dbg("unknown substitution type '%%%c'", pos[1]);
+				break;
+			}
+			strcat(string, name);
+		} else
 			break;
+	}
+}
 
-		dbg("read %s", temp);
-
-		/* eat the whitespace at the beginning of the line */
-		while (isspace(*temp))
-			++temp;
-
-		/* no more line? */
-		if (*temp == 0x00)
-			continue;
 
-		/* see if this is a comment */
-		if (*temp == COMMENT_CHARACTER)
-			continue;
+static int exec_callout(struct config_device *dev, char *value, int len)
+{
+	int retval;
+	int res;
+	int status;
+	int fds[2];
+	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);
+	if (retval != 0) {
+		dbg("pipe failed");
+		return -1;
+	}
+	pid = fork();
+	if (pid == -1) {
+		dbg("fork failed");
+		return -1;
+	}
 
-		memset(&dev, 0x00, sizeof(struct config_device));
+	if (pid == 0) {
+		/* child */
+		close(STDOUT_FILENO);
+		dup(fds[1]);	/* dup write side of pipe to STDOUT */
+		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);
+		}
+		return -1; /* avoid compiler warning */
+	} else {
+		/* parent reads from fds[0] */
+		close(fds[1]);
+		retval = 0;
+		while (1) {
+			res = read(fds[0], buffer, sizeof(buffer) - 1);
+			if (res <= 0)
+				break;
+			buffer[res] = '\0';
+			if (res > len) {
+				dbg("callout len %d too short", len);
+				retval = -1;
+			}
+			if (value_set) {
+				dbg("callout value already set");
+				retval = -1;
+			} else {
+				value_set = 1;
+				strncpy(value, buffer, len);
+			}
+		}
+		dbg("callout returned '%s'", value);
+		close(fds[0]);
+		res = wait(&status);
+		if (res < 0) {
+			dbg("wait failed result %d", res);
+			retval = -1;
+		}
 
-		/* parse the line */
-		temp2 = strsep(&temp, ",");
-		if (strcasecmp(temp2, TYPE_LABEL) == 0) {
-			/* label type */
-			dev.type = LABEL;
+#ifndef __KLIBC__
+		if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
+			dbg("callout program status 0x%x", status);
+			retval = -1;
+		}
+#endif
+	}
+	return retval;
+}
 
-			/* BUS="bus" */
-			retval = get_value("BUS", &temp, &temp3);
-			if (retval)
-				continue;
-			strcpy(dev.bus, temp3);
+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;
 
-			/* file="value" */
-			temp2 = strsep(&temp, ",");
-			retval = get_pair(&temp, &temp2, &temp3);
-			if (retval)
-				continue;
-			strcpy(dev.sysfs_file, temp2);
-			strcpy(dev.sysfs_value, temp3);
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != CALLOUT)
+			continue;
 
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
+		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;
-			strcpy(dev.attr.name, temp3);
-
-			dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'", dev.attr.name, dev.bus, dev.sysfs_file, dev.sysfs_value);
 		}
 
-		if (strcasecmp(temp2, TYPE_NUMBER) == 0) {
-			/* number type */
-			dev.type = NUMBER;
+		/* 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 (strcmp_pattern(dev->id, udev->callout_value) != 0)
+			continue;
+		strfieldcpy(udev->name, dev->name);
+		dbg("callout returned matching value '%s', '%s' becomes '%s'",
+		    dev->id, class_dev->name, udev->name);
+		return 0;
+	}
+	return -ENODEV;
+}
 
-			/* BUS="bus" */
-			retval = get_value("BUS", &temp, &temp3);
-			if (retval)
-				continue;
-			strcpy(dev.bus, temp3);
+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 *c;
 
-			/* ID="id" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("id", &temp, &temp3);
-			if (retval)
-				continue;
-			strcpy(dev.id, temp3);
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != LABEL)
+			continue;
 
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
+		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;
-			strcpy(dev.attr.name, temp3);
+		}
 
-			dbg("NUMBER name = '%s', bus = '%s', id = '%s'", dev.attr.name, dev.bus, dev.id);
+		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)
+			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;
 		}
 
-		if (strcasecmp(temp2, TYPE_TOPOLOGY) == 0) {
-			/* number type */
-			dev.type = TOPOLOGY;
+		continue;
 
-			/* BUS="bus" */
-			retval = get_value("BUS", &temp, &temp3);
-			if (retval)
-				continue;
-			strcpy(dev.bus, temp3);
+label_found:
+		c = tmpattr->value + strlen(tmpattr->value)-1;
+		if (*c == '\n')
+			*c = 0x00;
+		dbg("compare attribute '%s' value '%s' with '%s'",
+			  dev->sysfs_file, tmpattr->value, dev->sysfs_value);
+		if (strcmp_pattern(dev->sysfs_value, tmpattr->value) != 0)
+			continue;
 
-			/* PLACE="place" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("place", &temp, &temp3);
-			if (retval)
-				continue;
-			strcpy(dev.place, temp3);
+		strfieldcpy(udev->name, dev->name);
+		dbg("found matching attribute '%s', '%s' becomes '%s' ",
+		    dev->sysfs_file, class_dev->name, udev->name);
 
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
-				continue;
-			strcpy(dev.attr.name, temp3);
+		return 0;
+	}
+	return -ENODEV;
+}
 
-			dbg("TOPOLOGY name = '%s', bus = '%s', place = '%s'", dev.attr.name, dev.bus, dev.place);
-		}
+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;
 
-		if (strcasecmp(temp2, TYPE_REPLACE) == 0) {
-			/* number type */
-			dev.type = REPLACE;
+	/* we have to have a sysfs device for NUMBER to work */
+	if (!sysfs_device)
+		return -ENODEV;
 
-			/* KERNEL="kernel_name" */
-			retval = get_value("KERNEL", &temp, &temp3);
-			if (retval)
-				continue;
-			strcpy(dev.kernel_name, temp3);
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != NUMBER)
+			continue;
 
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
-				continue;
-			strcpy(dev.attr.name, temp3);
-			dbg("REPLACE name = %s, kernel_name = %s", dev.attr.name, dev.kernel_name);
-		}
+		dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+		if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
+			continue;
 
-		retval = add_dev(&dev);
-		if (retval) {
-			dbg("add_dev returned with error %d", retval);
-			goto exit;
+		found = 0;
+		strfieldcpy(path, sysfs_device->path);
+		temp = strrchr(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("search '%s' in '%s', path='%s'", dev->id, temp, path);
+			if (strstr(temp, dev->id) != NULL)
+				found = 1;
 		}
+		if (!found)
+			continue;
+		strfieldcpy(udev->name, dev->name);
+		dbg("found matching id '%s', '%s' becomes '%s'",
+		    dev->id, class_dev->name, udev->name);
+		return 0;
 	}
+	return -ENODEV;
+}
 
-exit:
-	fclose(fd);
-	return retval;
-}	
-
-
-static int namedev_init_permissions(void)
+static int do_topology(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
-	char filename[255];
-	char line[255];
-	char *temp;
-	char *temp2;
-	FILE *fd;
-	int retval = 0;
-	struct config_device dev;
+	struct config_device *dev;
+	struct list_head *tmp;
+	char path[SYSFS_PATH_MAX];
+	int found;
+	char *temp = NULL;
 
-	strcpy(filename, NAMEDEV_CONFIG_ROOT NAMEDEV_CONFIG_PERMISSION_FILE);
-	dbg("opening %s to read as permissions config", filename);
-	fd = fopen(filename, "r");
-	if (fd == NULL) {
-		dbg("Can't open %s", filename);
+	/* we have to have a sysfs device for TOPOLOGY to work */
+	if (!sysfs_device)
 		return -ENODEV;
-	}
-
-	/* loop through the whole file */
-	while (1) {
-		/* get a line */
-		temp = fgets(line, sizeof(line), fd);
-		if (temp == NULL)
-			break;
-
-		dbg("read %s", temp);
 
-		/* eat the whitespace at the beginning of the line */
-		while (isspace(*temp))
-			++temp;
-
-		/* no more line? */
-		if (*temp == 0x00)
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != TOPOLOGY)
 			continue;
 
-		/* see if this is a comment */
-		if (*temp == COMMENT_CHARACTER)
+		dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+		if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
 			continue;
 
-		memset(&dev, 0x00, sizeof(dev));
+		found = 0;
+		strfieldcpy(path, sysfs_device->path);
+		temp = strrchr(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("search '%s' in '%s', path='%s'", dev->place, temp, path);
+			if (strstr(temp, dev->place) != NULL)
+				found = 1;
+		}
+		if (!found)
+			continue;
 
-		/* parse the line */
-		temp2 = strsep(&temp, ":");
-		strncpy(dev.attr.name, temp2, sizeof(dev.attr.name));
+		strfieldcpy(udev->name, dev->name);
+		dbg("found matching place '%s', '%s' becomes '%s'",
+		    dev->place, class_dev->name, udev->name);
+		return 0;
+	}
+	return -ENODEV;
+}
 
-		temp2 = strsep(&temp, ":");
-		strncpy(dev.attr.owner, temp2, sizeof(dev.attr.owner));
+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;
 
-		temp2 = strsep(&temp, ":");
-		strncpy(dev.attr.group, temp2, sizeof(dev.attr.owner));
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != REPLACE)
+			continue;
 
-		dev.attr.mode = strtol(temp, NULL, 8);
+		dbg("compare name '%s' with '%s'", dev->kernel_name, class_dev->name);
+		if (strcmp_pattern(dev->kernel_name, class_dev->name) != 0)
+			continue;
 
-		dbg("name = %s, owner = %s, group = %s, mode = %#o", dev.attr.name, dev.attr.owner, dev.attr.group, dev.attr.mode);
-		retval = add_dev(&dev);
-		if (retval) {
-			dbg("add_dev returned with error %d", retval);
-			goto exit;
-		}
+		strfieldcpy(udev->name, dev->name);
+		dbg("found name, '%s' becomes '%s'", dev->kernel_name, udev->name);
+		
+		return 0;
 	}
+	return -ENODEV;
+}
 
-exit:
-	fclose(fd);
-	return retval;
-}	
-
-static int get_default_mode(struct sysfs_class_device *class_dev)
+static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
-	/* just default everyone to rw for the world! */
-	return 0666;
+	/* heh, this is pretty simple... */
+	strfieldcpy(udev->name, class_dev->name);
 }
 
-
-static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *attr)
+int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
-	struct list_head *tmp;
+	struct sysfs_device *sysfs_device = NULL;
+	struct sysfs_class_device *class_dev_parent = NULL;
 	int retval = 0;
-	int found;
-
-	dbg("class_dev->sysdevice->directory->path = '%s'", class_dev->sysdevice->directory->path);
-	dbg("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
-	list_for_each(tmp, &config_device_list) {
-		struct config_device *dev = list_entry(tmp, struct config_device, node);
-		switch (dev->type) {
-		case LABEL:
-			dbg("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);
-			break;
-		case NUMBER:
-			dbg("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);
-			break;
-		case TOPOLOGY:
-			{
-			char path[SYSFS_PATH_MAX];
-			char *temp;
-
-			found = 0;	
-			strcpy(path, class_dev->sysdevice->directory->path);
-			temp = strrchr(path, '/');
-			dbg("TOPOLOGY path = '%s'", path);
-			dbg("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
-			if (strstr(temp, dev->place) != NULL) {
-				found = 1;
-			} else {
-				*temp = 0x00;
+	char *temp = NULL;
+	struct perm_device *perm;
+
+	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("looking at block device");
+			if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
+				char path[SYSFS_PATH_MAX];
+
+				dbg("really is a partition");
+				strfieldcpy(path, class_dev->path);
 				temp = strrchr(path, '/');
-				dbg("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
-				if (strstr(temp, dev->place) != NULL)
-					found = 1;
+				*temp = 0x00;
+				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("class_dev_parent->name='%s'", class_dev_parent->name);
+					if (class_dev_parent->sysdevice)
+						sysfs_device = class_dev_parent->sysdevice;
+				}
 			}
-			if (!found)
-				continue;
+		}
+	}
 
-			strcpy(attr->name, dev->attr.name);
-			attr->mode = dev->attr.mode;
-			strcpy(attr->owner, dev->attr.owner);
-			strcpy(attr->group, dev->attr.group);
-			dbg("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-				dev->place, attr->name, 
-				dev->attr.owner, dev->attr.group, dev->attr.mode);
-			return retval;
-			break;
-			}
-		case REPLACE:
-			if (strcmp(dev->kernel_name, class_dev->name) != 0)
-				continue;
-			strcpy(attr->name, dev->attr.name);
-			attr->mode = dev->attr.mode;
-			strcpy(attr->owner, dev->attr.owner);
-			strcpy(attr->group, dev->attr.group);
-			dbg("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-				dev->kernel_name, attr->name, 
-				dev->attr.owner, dev->attr.group, dev->attr.mode);
-			return retval;
-			break;
-		default:
-			dbg("Unknown type of device!");
-			break;
-		}	
+	if (sysfs_device) {
+		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("class_dev->name = '%s'", class_dev->name);
 	}
-	attr->mode = get_default_mode(class_dev);
-	attr->owner[0] = 0x00;
-	attr->group[0] = 0x00;
-	strcpy(attr->name, class_dev->name);
-	return retval;
-}
 
-int namedev_name_device(struct sysfs_class_device *class_dev, struct device_attr *attr)
-{
-	int retval;
+	build_kernel_number(class_dev, udev);
+
+	/* rules are looked at in priority order */
+	retval = do_callout(class_dev, udev, sysfs_device);
+	if (retval == 0)
+		goto found;
+
+	retval = do_label(class_dev, udev, sysfs_device);
+	if (retval == 0)
+		goto found;
+
+	retval = do_number(class_dev, udev, sysfs_device);
+	if (retval == 0)
+		goto found;
+
+	retval = do_topology(class_dev, udev, sysfs_device);
+	if (retval == 0)
+		goto found;
+
+	retval = do_replace(class_dev, udev, sysfs_device);
+	if (retval == 0)
+		goto found;
+
+	do_kernelname(class_dev, udev);
+	goto done;
+
+found:
+	/* substitute placeholder in NAME  */
+	apply_format(udev, udev->name);
+
+done:
+	perm = find_perm(udev->name);
+	if (perm) {
+		udev->mode = perm->mode;
+		strfieldcpy(udev->owner, perm->owner);
+		strfieldcpy(udev->group, perm->group);
+	} else {
+		/* no matching perms found :( */
+		udev->mode = get_default_mode(class_dev);
+		udev->owner[0] = 0x00;
+		udev->group[0] = 0x00;
+	}
+	dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
+	    udev->name, udev->owner, udev->group, udev->mode);
 
-	retval = get_attr(class_dev, attr);
-	if (retval)
-		dbg("get_attr failed");
+	if (class_dev_parent)
+		sysfs_close_class_device(class_dev_parent);
 
-	return retval;
+	return 0;
 }
 
 int namedev_init(void)
 {
 	int retval;
-	
-	retval = namedev_init_config();
+
+	retval = namedev_init_rules();
 	if (retval)
 		return retval;
 
@@ -517,8 +654,7 @@ int namedev_init(void)
 	if (retval)
 		return retval;
 
-	dump_dev_list();
+	dump_config_dev_list();
+	dump_perm_dev_list();
 	return retval;
 }
-
-