X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=3b19aaf9099c8de0a848adb557d17e097f415f18;hp=b8a21a25ae5f48bb4b866f5316901a86c209920a;hb=2023350eece60db60d30e387cfb644df09b9e8b6;hpb=185a35a403cc37b3943bc68aa61745ff2b6ed17b

diff --git a/namedev.c b/namedev.c
index b8a21a25a..3b19aaf90 100644
--- a/namedev.c
+++ b/namedev.c
@@ -21,6 +21,9 @@
  *
  */
 
+/* define this to enable parsing debugging */
+/* #define DEBUG_PARSER */
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -29,92 +32,64 @@
 #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"
-
-enum config_type {
-	KERNEL_NAME	= 0,	/* must be 0 to let memset() default to this value */
-	LABEL		= 1,
-	NUMBER		= 2,
-	TOPOLOGY	= 3,
-	REPLACE		= 4,
-};
-
-#define BUS_SIZE	30
-#define FILE_SIZE	50
-#define VALUE_SIZE	100
-#define ID_SIZE		50
-#define PLACE_SIZE	50
-
-
-struct config_device {
-	struct list_head node;
-
-	enum config_type type;
-
-	char bus[BUS_SIZE];
-	char sysfs_file[FILE_SIZE];
-	char sysfs_value[VALUE_SIZE];
-	char id[ID_SIZE];
-	char place[PLACE_SIZE];
-	char kernel_name[NAME_SIZE];
-	
-	/* what to set the device to */
-	int mode;
-	char name[NAME_SIZE];
-	char owner[OWNER_SIZE];
-	char group[GROUP_SIZE];
-};
-
+#define TYPE_CALLOUT	"CALLOUT"
+#define CALLOUT_MAXARG	8
 
 static LIST_HEAD(config_device_list);
 
-static char sysfs_path[SYSFS_PATH_MAX];
-
 static void dump_dev(struct config_device *dev)
 {
 	switch (dev->type) {
 	case KERNEL_NAME:
-		dbg("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("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("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("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("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);
 		break;
 	default:
-		dbg("Unknown type of device!");
+		dbg_parse("unknown type of method");
 	}
 }
 
@@ -131,27 +106,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;
@@ -170,37 +151,15 @@ static void dump_dev_list(void)
 		dump_dev(dev);
 	}
 }
-
-static int get_value(const char *left, char **orig_string, char **ret_string)
-{
-	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;
-	}
-	return -ENODEV;
-}
 	
 static int get_pair(char **orig_string, char **left, char **right)
 {
 	char *temp;
 	char *string = *orig_string;
 
+	if (!string)
+		return -ENODEV;
+
 	/* eat any whitespace */
 	while (isspace(*string))
 		++string;
@@ -208,23 +167,43 @@ static int get_pair(char **orig_string, char **left, char **right)
 	/* 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;
 }
 
+static int get_value(const char *left, char **orig_string, char **ret_string)
+{
+	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;
+}
+
 static int namedev_init_config(void)
 {
-	char filename[255];
 	char line[255];
+	int lineno;
 	char *temp;
 	char *temp2;
 	char *temp3;
@@ -232,28 +211,29 @@ static int namedev_init_config(void)
 	int retval = 0;
 	struct config_device dev;
 
-	strcpy(filename, NAMEDEV_CONFIG_ROOT NAMEDEV_CONFIG_FILE);
-	dbg("opening %s to read as permissions config", filename);
-	fd = fopen(filename, "r");
+	dbg("opening %s to read as config", udev_config_filename);
+	fd = fopen(udev_config_filename, "r");
 	if (fd == NULL) {
-		dbg("Can't open %s", filename);
+		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)
-			break;
+			goto exit;
+		lineno++;
 
-		dbg("read %s", temp);
+		dbg_parse("read %s", temp);
 
 		/* eat the whitespace at the beginning of the line */
 		while (isspace(*temp))
 			++temp;
 
-		/* no more line? */
+		/* empty line? */
 		if (*temp == 0x00)
 			continue;
 
@@ -272,25 +252,28 @@ static int namedev_init_config(void)
 			/* BUS="bus" */
 			retval = get_value("BUS", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.bus, temp3);
+				break;
+			strfieldcpy(dev.bus, temp3);
 
 			/* file="value" */
 			temp2 = strsep(&temp, ",");
 			retval = get_pair(&temp, &temp2, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.sysfs_file, temp2);
-			strcpy(dev.sysfs_value, temp3);
+				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)
-				continue;
-			strcpy(dev.name, temp3);
+				break;
+			strfieldcpy(dev.name, temp3);
 
-			dbg("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) {
@@ -300,24 +283,25 @@ static int namedev_init_config(void)
 			/* BUS="bus" */
 			retval = get_value("BUS", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.bus, temp3);
+				break;
+			strfieldcpy(dev.bus, temp3);
 
 			/* ID="id" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("id", &temp, &temp3);
+			retval = get_value("ID", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.id, temp3);
+				break;
+			strfieldcpy(dev.id, temp3);
 
 			/* NAME="new_name" */
 			temp2 = strsep(&temp, ",");
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.name, temp3);
+				break;
+			strfieldcpy(dev.name, temp3);
 
-			dbg("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) {
@@ -327,24 +311,25 @@ static int namedev_init_config(void)
 			/* BUS="bus" */
 			retval = get_value("BUS", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.bus, temp3);
+				break;
+			strfieldcpy(dev.bus, temp3);
 
 			/* PLACE="place" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("place", &temp, &temp3);
+			retval = get_value("PLACE", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.place, temp3);
+				break;
+			strfieldcpy(dev.place, temp3);
 
 			/* NAME="new_name" */
 			temp2 = strsep(&temp, ",");
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.name, temp3);
+				break;
+			strfieldcpy(dev.name, temp3);
 
-			dbg("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) {
@@ -354,16 +339,50 @@ static int namedev_init_config(void)
 			/* KERNEL="kernel_name" */
 			retval = get_value("KERNEL", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.kernel_name, temp3);
+				break;
+			strfieldcpy(dev.kernel_name, temp3);
 
 			/* NAME="new_name" */
 			temp2 = strsep(&temp, ",");
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.name, temp3);
-			dbg("REPLACE name = %s, kernel_name = %s", dev.name, dev.kernel_name);
+				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)
+				break;
+			strfieldcpy(dev.bus, temp3);
+
+			/* PROGRAM="executable" */
+			temp2 = strsep(&temp, ",");
+			retval = get_value("PROGRAM", &temp, &temp3);
+			if (retval)
+				break;
+			strfieldcpy(dev.exec_program, 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("CALLOUT name='%s', program='%s'",
+				  dev.name, dev.exec_program);
 		}
 
 		retval = add_dev(&dev);
@@ -372,7 +391,8 @@ static int namedev_init_config(void)
 			goto exit;
 		}
 	}
-
+	dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
+		  lineno, temp - line, temp);
 exit:
 	fclose(fd);
 	return retval;
@@ -381,7 +401,6 @@ exit:
 
 static int namedev_init_permissions(void)
 {
-	char filename[255];
 	char line[255];
 	char *temp;
 	char *temp2;
@@ -389,11 +408,10 @@ static int namedev_init_permissions(void)
 	int retval = 0;
 	struct config_device dev;
 
-	strcpy(filename, NAMEDEV_CONFIG_ROOT NAMEDEV_CONFIG_PERMISSION_FILE);
-	dbg("opening %s to read as permissions config", filename);
-	fd = fopen(filename, "r");
+	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", filename);
+		dbg("can't open %s", udev_config_permission_filename);
 		return -ENODEV;
 	}
 
@@ -404,13 +422,13 @@ static int namedev_init_permissions(void)
 		if (temp == NULL)
 			break;
 
-		dbg("read %s", temp);
+		dbg_parse("read %s", temp);
 
 		/* eat the whitespace at the beginning of the line */
 		while (isspace(*temp))
 			++temp;
 
-		/* no more line? */
+		/* empty line? */
 		if (*temp == 0x00)
 			continue;
 
@@ -422,17 +440,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("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);
@@ -445,93 +477,468 @@ exit:
 	return retval;
 }	
 
+static mode_t get_default_mode(struct sysfs_class_device *class_dev)
+{
+	/* just default everyone to rw for the world! */
+	return 0666;
+}
+
 
-static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int *minor)
+static int exec_callout(struct config_device *dev, char *value, int len)
 {
-	char temp[3];
-	int retval = 0;
+	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;
+	}
 
-	char *dev;
+	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("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] */
+		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\n", 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;
+		}
 
-	dev = sysfs_get_value_from_attributes(class_dev->directory->attributes, "dev");
-	if (dev == NULL)
+#ifndef __KLIBC__
+		if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
+			dbg("callout program status 0x%x", status);
+			retval = -1;
+		}
+#endif
+	}
+	return retval;
+}
+
+static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+	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)))
+			continue;
+		if (strncmp(value, dev->id, sizeof(value)) != 0)
+			continue;
+		strfieldcpy(udev->name, dev->name);
+		if (dev->mode != 0) {
+			udev->mode = dev->mode;
+			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);
+		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;
+
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != LABEL)
+			continue;
+
+		dbg_parse("look for device attribute '%s'", dev->sysfs_file);
+		/* try to find the attribute in the class device directory */
+		tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
+		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;
+		}
+
+		continue;
+
+label_found:
+		tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
+		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;
+
+		strfieldcpy(udev->name, dev->name);
+		if (dev->mode != 0) {
+			udev->mode = dev->mode;
+			strfieldcpy(udev->owner, dev->owner);
+			strfieldcpy(udev->group, dev->group);
+		}
+		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;
+	}
+	return -ENODEV;
+}
+
+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;
+
+	/* we have to have a sysfs device for NUMBER to work */
+	if (!sysfs_device)
 		return -ENODEV;
 
-	dbg("dev = %s", dev);
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != NUMBER)
+			continue;
+
+		found = 0;
+		strfieldcpy(path, sysfs_device->path);
+		temp = strrchr(path, '/');
+		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("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);
+		if (dev->mode != 0) {
+			udev->mode = dev->mode;
+			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);
+		return 0;
+	}
+	return -ENODEV;
+}
+
 
-	temp[0] = dev[0];
-	temp[1] = dev[1];
-	temp[2] = 0x00;
-	*major = (int)strtol(&temp[0], NULL, 16);
+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;
 
-	temp[0] = dev[2];
-	temp[1] = dev[3];
-	temp[2] = 0x00;
-	*minor = (int)strtol(&temp[0], NULL, 16);
+	/* we have to have a sysfs device for TOPOLOGY to work */
+	if (!sysfs_device)
+		return -ENODEV;
 
-	dbg("found major = %d, minor = %d", *major, *minor);
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		if (dev->type != TOPOLOGY)
+			continue;
 
-	retval = 0;
-	return retval;
+		found = 0;
+		strfieldcpy(path, sysfs_device->path);
+		temp = strrchr(path, '/');
+		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("search '%s' in '%s', path='%s'", dev->place, temp, path);
+			if (strstr(temp, dev->place) != NULL)
+				found = 1;
+		}
+		if (!found)
+			continue;
+
+		strfieldcpy(udev->name, dev->name);
+		if (dev->mode != 0) {
+			udev->mode = dev->mode;
+			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);
+		return 0;
+	}
+	return -ENODEV;
 }
 
-static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *attr)
+static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
+	struct config_device *dev;
 	struct list_head *tmp;
-	int retval = 0;
 
-	retval = get_major_minor(class_dev, &attr->major, &attr->minor);
-	if (retval) {
-		dbg ("get_major_minor failed");
-		goto exit;
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		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)
+			continue;
+
+		strfieldcpy(udev->name, dev->name);
+		if (dev->mode != 0) {
+			udev->mode = dev->mode;
+			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);
+		
+		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) {
-		struct config_device *dev = list_entry(tmp, struct config_device, node);
-		if (strcmp(dev->name, class_dev->name) == 0) {
-			attr->mode = dev->mode;
-			strcpy(attr->owner, dev->owner);
-			strcpy(attr->group, dev->group);
-			/* FIXME  put the proper name here!!! */
-			strcpy(attr->name, dev->name);
-			dbg("%s - owner = %s, group = %s, mode = %#o", dev->name, dev->owner, dev->group, dev->mode);
-			goto exit;
+		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);
 		}
 	}
-	attr->mode = 0666;
-	attr->owner[0] = 0x00;
-	attr->group[0] = 0x00;
-	strcpy(attr->name, class_dev->name);
-exit:
-	return retval;
 }
 
-int namedev_name_device(char *device_name, struct device_attr *attr)
+static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
-	char dev_path[SYSFS_PATH_MAX];
-	struct sysfs_class_device *class_dev;
-	int retval;
+	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...");
+				strfieldcpy(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);
+				} else {
+					dbg_parse("class_dev_parent->name=%s", class_dev_parent->name);
+					if (class_dev_parent->sysdevice)
+						sysfs_device = class_dev_parent->sysdevice;
+				}
+			}
+		}
+	}
+		
+	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(dev_path, sysfs_path);
-	strcat(dev_path, device_name);
+	/* rules are looked at in priority order */
+	retval = do_callout(class_dev, udev);
+	if (retval == 0)
+		goto found;
 
-	dbg("looking at %s", dev_path);
+	retval = do_label(class_dev, udev, sysfs_device);
+	if (retval == 0)
+		goto found;
 
-	/* open up the sysfs class device for this thing... */
-	class_dev = sysfs_open_class_device(dev_path);
-	if (class_dev == NULL) {
-		dbg ("sysfs_open_class_device failed");
-		return -ENODEV;
+	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);
+	if (retval == 0)
+		goto found;
+
+	do_kernelname(class_dev, udev);
+	goto done;
+
+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;
 	}
-	dbg("class_dev->name = %s", class_dev->name);
-	
-	retval = get_attr(class_dev, attr);
-	if (retval) {
-		dbg ("get_attr failed");
-		goto exit;
+
+done:
+	/* mode was never set above */
+	if (!udev->mode) {
+		udev->mode = get_default_mode(class_dev);
+		udev->owner[0] = 0x00;
+		udev->group[0] = 0x00;
 	}
-exit:
-	sysfs_close_class_device(class_dev);
+
+	if (class_dev_parent)
+		sysfs_close_class_device(class_dev_parent);
+
+	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;
 }
 
@@ -539,11 +946,6 @@ int namedev_init(void)
 {
 	int retval;
 	
-	retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-	if (retval)
-		return retval;
-	dbg("sysfs_path = %s", sysfs_path);
-
 	retval = namedev_init_config();
 	if (retval)
 		return retval;