X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=fe7dddaf55bafa0138562a731d67d4738c310906;hp=7c422f78779f1f1408ea63f01115314dc0bc5ce8;hb=6e3e3c3416864eca74cb885f64c453eb531eed63;hpb=958479a0dead606c6e44490a30a7040773654281

diff --git a/namedev.c b/namedev.c
index 7c422f787..fe7dddaf5 100644
--- a/namedev.c
+++ b/namedev.c
@@ -29,50 +29,59 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <errno.h>
+#include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#include <sys/sysinfo.h>
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
+#include "logging.h"
 #include "namedev.h"
-#include "libsysfs/libsysfs.h"
 #include "klibc_fixups.h"
+#include "udevdb.h"
+
+static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
 
 LIST_HEAD(config_device_list);
 LIST_HEAD(perm_device_list);
 
+
 /* compare string with pattern (supports * ? [0-9] [!A-Z]) */
 static int strcmp_pattern(const char *p, const char *s)
 {
-	if (*s == '\0') {
-		while (*p == '*')
+	if (s[0] == '\0') {
+		while (p[0] == '*')
 			p++;
-		return (*p != '\0');
+		return (p[0] != '\0');
 	}
-	switch (*p) {
+	switch (p[0]) {
 	case '[':
 		{
 			int not = 0;
 			p++;
-			if (*p == '!') {
+			if (p[0] == '!') {
 				not = 1;
 				p++;
 			}
-			while (*p && (*p != ']')) {
+			while ((p[0] != '\0') && (p[0] != ']')) {
 				int match = 0;
 				if (p[1] == '-') {
-					if ((*s >= *p) && (*s <= p[2]))
+					if ((s[0] >= p[0]) && (s[0] <= p[2]))
 						match = 1;
 					p += 3;
 				} else {
-					match = (*p == *s);
+					match = (p[0] == s[0]);
 					p++;
 				}
 				if (match ^ not) {
-					while (*p && (*p != ']'))
+					while ((p[0] != '\0') && (p[0] != ']'))
 						p++;
-					return strcmp_pattern(p+1, s+1);
+					if (p[0] == ']')
+						return strcmp_pattern(p+1, s+1);
 				}
 			}
 		}
@@ -82,189 +91,265 @@ static int strcmp_pattern(const char *p, const char *s)
 			return strcmp_pattern(p+1, s);
 		return 0;
 	case '\0':
-		if (*s == '\0') {
+		if (s[0] == '\0') {
 			return 0;
 		}
 		break;
 	default:
-		if ((*p == *s) || (*p == '?'))
+		if ((p[0] == s[0]) || (p[0] == '?'))
 			return strcmp_pattern(p+1, s+1);
 		break;
 	}
 	return 1;
 }
 
-#define copy_var(a, b, var)		\
-	if (b->var)			\
-		a->var = b->var;
+static struct perm_device *find_perm(char *name)
+{
+	struct perm_device *perm;
 
-#define copy_string(a, b, var)		\
-	if (strlen(b->var))		\
-		strcpy(a->var, b->var);
+	list_for_each_entry(perm, &perm_device_list, node) {
+		if (strcmp_pattern(perm->name, name))
+			continue;
+		return perm;
+	}
+	return NULL;
+}
 
-int add_config_dev(struct config_device *new_dev)
+static mode_t get_default_mode(void)
 {
-	struct config_device *tmp_dev;
-
-	tmp_dev = malloc(sizeof(*tmp_dev));
-	if (tmp_dev == NULL)
-		return -ENOMEM;
-	memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
-	list_add_tail(&tmp_dev->node, &config_device_list);
-	//dump_config_dev(tmp_dev);
-	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;
 }
 
-int add_perm_dev(struct perm_device *new_dev)
+static char *get_default_owner(void)
 {
-	struct list_head *tmp;
-	struct perm_device *tmp_dev;
+	if (strlen(default_owner_str) == 0)
+		strfieldcpy(default_owner_str, "root");
 
-	/* 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;
-	}
+	return default_owner_str;
+}
 
-	/* 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 char *get_default_group(void)
+{
+	if (strlen(default_group_str) == 0)
+		strfieldcpy(default_group_str, "root");
+
+	return default_group_str;
 }
 
-static struct perm_device *find_perm(char *name)
+/* extract possible {attr} and move str behind it */
+static char *get_format_attribute(char **str)
 {
-	struct list_head *tmp;
-	struct perm_device *perm = NULL;
+	char *pos;
+	char *attr = 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;
+	if (*str[0] == '{') {
+		pos = strchr(*str, '}');
+		if (pos == NULL) {
+			dbg("missing closing brace for format");
+			return NULL;
+		}
+		pos[0] = '\0';
+		attr = *str+1;
+		*str = pos+1;
+		dbg("attribute='%s', str='%s'", attr, *str);
 	}
-	return NULL;
+	return attr;
 }
 
-static mode_t get_default_mode(struct sysfs_class_device *class_dev)
+/* extract possible format length and move str behind it*/
+static int get_format_len(char **str)
 {
-	mode_t mode = 0600;	/* default to owner rw only */
+	int num;
+	char *tail;
 
-	if (strlen(default_mode_str) != 0) {
-		mode = strtol(default_mode_str, NULL, 8);
+	if (isdigit(*str[0])) {
+		num = (int) strtoul(*str, &tail, 10);
+		if (num > 0) {
+			*str = tail;
+			dbg("format length=%i", num);
+			return num;
+		} else {
+			dbg("format parsing error '%s'", *str);
+		}
 	}
-	return mode;
+	return -1;
 }
 
-static void apply_format(struct udevice *udev, unsigned char *string)
+/** Finds the lowest positive N such that <name>N isn't present in 
+ *  $(udevroot) either as a file or a symlink.
+ *
+ *  @param  name                Name to check for
+ *  @return                     0 if <name> didn't exist and N otherwise.
+ */
+static unsigned int find_free_number (struct udevice *udev, char *name)
 {
-	char name[NAME_SIZE];
 	char temp[NAME_SIZE];
+	char path[NAME_SIZE];
+	struct udevice dev;
+	int result;
+
+	/* have to sweep the database for each lookup */
+	result = 0;
+	strncpy(temp, name, sizeof (temp));
+	while (1) {
+		if (udevdb_get_dev_byname(temp, path, &dev) != 0)
+			goto found;
+		/* symlink might be stale if $(udevroot) isn't cleaned; check
+		 * on major/minor to see if it's the same device
+		 */
+		if (dev.major == udev->major && dev.minor == udev->minor)
+			goto found;
+		snprintf (temp, sizeof(temp), "%s%d", name, ++result);
+	}
+
+found:
+	return result;
+}
+
+static void apply_format(struct udevice *udev, char *string, size_t maxsize,
+			 struct sysfs_class_device *class_dev,
+			 struct sysfs_device *sysfs_device)
+{
+	char temp[NAME_SIZE];
+	char temp2[NAME_SIZE];
 	char *tail;
 	char *pos;
-	char *pos2;
-	char *pos3;
-	int num;
+	char *attr;
+	int len;
+	int i;
+	char c;
+	char *spos;
+	char *rest;
+	int slen;
+	struct sysfs_attribute *tmpattr;
+	unsigned int next_free_number;
 
+	pos = string;
 	while (1) {
-		num = 0;
-		pos = strchr(string, '%');
-
-		if (pos) {
-			*pos = '\0';
-			tail = pos+1;
-			if (isdigit(tail[0])) {
-				num = (int) strtoul(&pos[1], &tail, 10);
-				if (tail == NULL) {
-					dbg("format parsing error '%s'", pos+1);
-					break;
-				}
-			}
-			strfieldcpy(name, tail+1);
+		pos = strchr(pos, '%');
+		if (pos == NULL)
+			break;
 
-			switch (tail[0]) {
-			case 'b':
-				if (strlen(udev->bus_id) == 0)
-					break;
-				strcat(pos, udev->bus_id);
-				dbg("substitute bus_id '%s'", udev->bus_id);
-				break;
-			case 'k':
-				if (strlen(udev->kernel_name) == 0)
-					break;
-				strcat(pos, udev->kernel_name);
-				dbg("substitute kernel name '%s'", udev->kernel_name);
+		pos[0] = '\0';
+		tail = pos+1;
+		len = get_format_len(&tail);
+		c = tail[0];
+		strfieldcpy(temp, tail+1);
+		tail = temp;
+		dbg("format=%c, string='%s', tail='%s'",c , string, tail);
+		attr = get_format_attribute(&tail);
+
+
+		switch (c) {
+		case 'b':
+			if (strlen(udev->bus_id) == 0)
 				break;
-			case 'n':
-				if (strlen(udev->kernel_number) == 0)
-					break;
-				strcat(pos, udev->kernel_number);
-				dbg("substitute kernel number '%s'", udev->kernel_number);
+			strfieldcatmax(string, udev->bus_id, maxsize);
+			dbg("substitute bus_id '%s'", udev->bus_id);
+			break;
+		case 'k':
+			if (strlen(udev->kernel_name) == 0)
 				break;
-			case 'D':
-				if (strlen(udev->kernel_number) == 0) {
-					strcat(pos, "disc");
-					break;
-				}
-				strcat(pos, "part");
-				strcat(pos, udev->kernel_number);
-				dbg("substitute kernel number '%s'", udev->kernel_number);
+			strfieldcatmax(string, udev->kernel_name, maxsize);
+			dbg("substitute kernel name '%s'", udev->kernel_name);
+			break;
+		case 'n':
+			if (strlen(udev->kernel_number) == 0)
 				break;
-			case 'm':
-				sprintf(pos, "%u", udev->minor);
-				dbg("substitute minor number '%u'", udev->minor);
+			strfieldcatmax(string, udev->kernel_number, maxsize);
+			dbg("substitute kernel number '%s'", udev->kernel_number);
 				break;
-			case 'M':
-				sprintf(pos, "%u", udev->major);
-				dbg("substitute major number '%u'", udev->major);
+		case 'm':
+			strintcatmax(string, udev->minor, maxsize);
+			dbg("substitute minor number '%u'", udev->minor);
+			break;
+		case 'M':
+			strintcatmax(string, udev->major, maxsize);
+			dbg("substitute major number '%u'", udev->major);
+			break;
+		case 'c':
+			if (strlen(udev->program_result) == 0)
 				break;
-			case 'c':
-				if (strlen(udev->callout_value) == 0)
+			/* get part part of the result string */
+			i = 0;
+			if (attr != NULL)
+				i = strtoul(attr, &rest, 10);
+			if (i > 0) {
+				foreach_strpart(udev->program_result, " \n\r", spos, slen) {
+					i--;
+					if (i == 0)
+						break;
+				}
+				if (i > 0) {
+					dbg("requested part of result string not found");
 					break;
-				if (num) {
-					/* get part of return string */
-					strncpy(temp, udev->callout_value, sizeof(temp));
-					pos2 = temp;
-					while (num) {
-						num--;
-						pos3 = strsep(&pos2, " ");
-						if (pos3 == NULL) {
-							dbg("requested part of callout string not found");
-							break;
-						}
-					}
-					strcat(pos, pos3);
-					dbg("substitute partial callout output '%s'", pos3);
-				} else {
-					strcat(pos, udev->callout_value);
-					dbg("substitute callout output '%s'", udev->callout_value);
 				}
-				break;
-			default:
-				dbg("unknown substitution type '%%%c'", pos[1]);
-				break;
+				if (rest[0] == '+')
+					strfieldcpy(temp2, spos);
+				else
+					strfieldcpymax(temp2, spos, slen+1);
+				strfieldcatmax(string, temp2, maxsize);
+				dbg("substitute part of result string '%s'", temp2);
+			} else {
+				strfieldcatmax(string, udev->program_result, maxsize);
+				dbg("substitute result string '%s'", udev->program_result);
+			}
+			break;
+		case 's':
+			if (attr != NULL) {
+				tmpattr = find_sysfs_attribute(class_dev, sysfs_device, attr);
+				if (tmpattr == NULL) {
+					dbg("sysfa attribute '%s' not found", attr);
+					break;
+				}
+				strfieldcatmax(string, tmpattr->value, maxsize);
+				dbg("substitute sysfs value '%s'", tmpattr->value);
+			} else {
+				dbg("missing attribute");
+			}
+			break;
+		case '%':
+			strfieldcatmax(string, "%", maxsize);
+			pos++;
+			break;
+		case 'e':
+			next_free_number = find_free_number(udev, string);
+			if (next_free_number > 0) {
+				snprintf(temp2, sizeof(temp2), "%d", next_free_number);
+				strfieldcatmax(string, temp2, maxsize);
 			}
-			strcat(string, name);
-		} else
 			break;
+		default:
+			dbg("unknown substitution type '%%%c'", c);
+			break;
+		}
+		/* truncate to specified length */
+		if (len > 0)
+			pos[len] = '\0';
+
+		strfieldcatmax(string, tail, maxsize);
 	}
 }
 
+/* 
+ * Note, we can have multiple files for different busses in here due
+ * to the mess that USB has for its device tree...
+ */
 static struct bus_file {
 	char *bus;
 	char *file;
 } bus_files[] = {
 	{ .bus = "scsi",	.file = "vendor" },
 	{ .bus = "usb",		.file = "idVendor" },
+	{ .bus = "usb",		.file = "iInterface" },
+	{ .bus = "usb-serial",	.file = "detach_state" },
+	{ .bus = "ide",		.file = "detach_state" },
+	{ .bus = "pci",		.file = "vendor" },
 	{}
 };
 
@@ -281,427 +366,498 @@ static void wait_for_device_to_initialize(struct sysfs_device *sysfs_device)
 	 */
 	struct bus_file *b = &bus_files[0];
 	struct sysfs_attribute *tmpattr;
-	int loop;
+	int found = 0;
+	int loop = SECONDS_TO_WAIT_FOR_FILE;
 
 	while (1) {
-		if (b->bus == NULL)
-			break;
+		if (b->bus == NULL) {
+			if (!found)
+				break;
+			/* sleep to give the kernel a chance to create the file */
+			sleep(1);
+			--loop;
+			if (loop == 0)
+				break;
+			b = &bus_files[0];
+		}
 		if (strcmp(sysfs_device->bus, b->bus) == 0) {
-			tmpattr = NULL;
-			loop = SECONDS_TO_WAIT_FOR_FILE;
-			while (loop--) {
-				dbg("looking for file '%s' on bus '%s'", b->file, b->bus);
-				tmpattr = sysfs_get_device_attr(sysfs_device, b->file);
-				if (tmpattr) {
-					/* found it! */
-					goto exit;
-				}
-				/* sleep to give the kernel a chance to create the file */
-				sleep(1);
+			found = 1;
+			dbg("looking for file '%s' on bus '%s'", b->file, b->bus);
+			tmpattr = sysfs_get_device_attr(sysfs_device, b->file);
+			if (tmpattr) {
+				/* found it! */
+				goto exit;
 			}
-			dbg("Timed out waiting for '%s' file, continuing on anyway...", b->file);
-			goto exit;
+			dbg("can't find '%s' file", b->file);
 		}
-		b++;
+		++b;
 	}
-	dbg("Did not find bus type '%s' on list of bus_id_files, contact greg@kroah.com", sysfs_device->bus);
+	if (!found)
+		dbg("did not find bus type '%s' on list of bus_id_files, "
+		    "contact greg@kroah.com", sysfs_device->bus);
 exit:
 	return; /* here to prevent compiler warning... */
 }
 
-static int exec_callout(struct config_device *dev, char *value, int len)
+static void fix_kernel_name(struct udevice *udev)
+{
+	char *temp = udev->kernel_name;
+
+	while (*temp != 0x00) {
+		/* Some block devices have a ! in their name, 
+		 * we need to change that to / */
+		if (*temp == '!')
+			*temp = '/';
+		++temp;
+	}
+}
+
+static int execute_program(char *path, char *value, int len)
 {
 	int retval;
-	int res;
+	int count;
 	int status;
 	int fds[2];
 	pid_t pid;
-	int value_set = 0;
-	char buffer[256];
 	char *pos;
-	char *args[CALLOUT_MAXARG];
+	char arg[PROGRAM_SIZE];
+	char *argv[sizeof(arg) / 2];
 	int i;
 
-	dbg("callout to '%s'", dev->exec_program);
+	i = 0;
+	if (strchr(path, ' ')) {
+		strfieldcpy(arg, path);
+		pos = arg;
+		while (pos != NULL) {
+			if (pos[0] == '\'') {
+				/* don't separate if in apostrophes */
+				pos++;
+				argv[i] = strsep(&pos, "\'");
+				while (pos && pos[0] == ' ')
+					pos++;
+			} else {
+				argv[i] = strsep(&pos, " ");
+			}
+			dbg("arg[%i] '%s'", i, argv[i]);
+			i++;
+		}
+	}
+	argv[i] =  NULL;
+
 	retval = pipe(fds);
 	if (retval != 0) {
 		dbg("pipe failed");
 		return -1;
 	}
-	pid = fork();
-	if (pid == -1) {
-		dbg("fork failed");
-		return -1;
-	}
 
-	if (pid == 0) {
+	pid = fork();
+	switch(pid) {
+	case 0:
 		/* child */
-		close(STDOUT_FILENO);
-		dup(fds[1]);	/* dup write side of pipe to STDOUT */
-		if (strchr(dev->exec_program, ' ')) {
-			/* callout with arguments */
-			pos = dev->exec_program;
-			for (i=0; i < CALLOUT_MAXARG-1; i++) {
-				args[i] = strsep(&pos, " ");
-				if (args[i] == NULL)
-					break;
-			}
-			if (args[i]) {
-				dbg("too many args - %d", i);
-				args[i] = NULL;
-			}
-			retval = execve(args[0], args, main_envp);
+		/* dup2 write side of pipe to STDOUT */
+		dup2(fds[1], STDOUT_FILENO);
+		if (argv[0] !=  NULL) {
+			dbg("execute '%s' with given arguments", argv[0]);
+			retval = execv(argv[0], argv);
 		} else {
-			retval = execve(dev->exec_program, main_argv, main_envp);
+			dbg("execute '%s' with main argument", path);
+			retval = execv(path, main_argv);
 		}
-		if (retval != 0) {
-			dbg("child execve failed");
-			exit(1);
-		}
-		return -1; /* avoid compiler warning */
-	} else {
+
+		info(FIELD_PROGRAM " execution of '%s' failed", path);
+		exit(1);
+	case -1:
+		dbg("fork failed");
+		return -1;
+	default:
 		/* parent reads from fds[0] */
 		close(fds[1]);
 		retval = 0;
+		i = 0;
 		while (1) {
-			res = read(fds[0], buffer, sizeof(buffer) - 1);
-			if (res <= 0)
+			count = read(fds[0], value + i, len - i-1);
+			if (count <= 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");
+
+			i += count;
+			if (i >= len-1) {
+				dbg("result len %d too short", len);
 				retval = -1;
-			} else {
-				value_set = 1;
-				strncpy(value, buffer, len);
-				pos = value + strlen(value)-1;
-				if (pos[0] == '\n')
-				pos[0] = '\0';
-				dbg("callout returned '%s'", value);
+				break;
 			}
 		}
-		close(fds[0]);
-		res = wait(&status);
-		if (res < 0) {
-			dbg("wait failed result %d", res);
+
+		if (count < 0) {
+			dbg("read failed with '%s'", strerror(errno));
 			retval = -1;
 		}
 
-#ifndef __KLIBC__
+		if (i > 0 && value[i-1] == '\n')
+			i--;
+		value[i] = '\0';
+		dbg("result is '%s'", value);
+
+		close(fds[0]);
+		wait(&status);
+
 		if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
-			dbg("callout program status 0x%x", status);
+			dbg("exec program status 0x%x", status);
 			retval = -1;
 		}
-#endif
 	}
 	return retval;
 }
 
-static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr)
 {
-	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 != CALLOUT)
-			continue;
+	struct sysfs_attribute *tmpattr = NULL;
+	char *c;
 
-		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'", attr);
+	/* try to find the attribute in the class device directory */
+	tmpattr = sysfs_get_classdev_attr(class_dev, attr);
+	if (tmpattr)
+		goto attr_found;
 
-		/* 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);
-		strfieldcpy(udev->symlink, dev->symlink);
-		dbg("callout returned matching value '%s', '%s' becomes '%s'",
-		    dev->id, class_dev->name, udev->name);
-		return 0;
+	/* look in the class device directory if present */
+	if (sysfs_device) {
+		tmpattr = sysfs_get_device_attr(sysfs_device, attr);
+		if (tmpattr)
+			goto attr_found;
 	}
-	return -ENODEV;
+
+	return NULL;
+
+attr_found:
+	c = strchr(tmpattr->value, '\n');
+	if (c != NULL)
+		c[0] = '\0';
+
+	dbg("found attribute '%s'", tmpattr->path);
+	return tmpattr;
 }
 
-static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static int compare_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, struct sysfs_pair *pair)
 {
-	struct sysfs_attribute *tmpattr = NULL;
-	struct config_device *dev;
-	struct list_head *tmp;
-	char *c;
-
-	list_for_each(tmp, &config_device_list) {
-		dev = list_entry(tmp, struct config_device, node);
-		if (dev->type != LABEL)
-			continue;
+	struct sysfs_attribute *tmpattr;
+	int i;
+	int len;
 
-		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;
-		}
+	if ((pair == NULL) || (pair->file[0] == '\0') || (pair->value == '\0'))
+		return -ENODEV;
 
-		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;
+	tmpattr = find_sysfs_attribute(class_dev, sysfs_device, pair->file);
+	if (tmpattr == NULL)
+		return -ENODEV;
 
-		/* 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;
+	/* strip trailing whitespace of value, if not asked to match for it */
+	if (! isspace(pair->value[strlen(pair->value)-1])) {
+		i = len = strlen(tmpattr->value);
+		while (i > 0 &&  isspace(tmpattr->value[i-1]))
+			i--;
+		if (i < len) {
+			tmpattr->value[i] = '\0';
+			dbg("remove %i trailing whitespace chars from '%s'",
+			    len - i, tmpattr->value);
 		}
+	}
 
-		continue;
+	dbg("compare attribute '%s' value '%s' with '%s'",
+		  pair->file, tmpattr->value, pair->value);
+	if (strcmp_pattern(pair->value, tmpattr->value) != 0)
+		return -ENODEV;
 
-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;
+	dbg("found matching attribute '%s' with value '%s'",
+	    pair->file, pair->value);
+	return 0;
+}
 
-		strfieldcpy(udev->name, dev->name);
-		strfieldcpy(udev->symlink, dev->symlink);
-		dbg("found matching attribute '%s', '%s' becomes '%s' ",
-		    dev->sysfs_file, class_dev->name, udev->name);
+static int match_sysfs_pairs(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
+{
+	struct sysfs_pair *pair;
+	int i;
 
-		return 0;
+	for (i = 0; i < MAX_SYSFS_PAIRS; ++i) {
+		pair = &dev->sysfs_pair[i];
+		if ((pair->file[0] == '\0') || (pair->value[0] == '\0'))
+			break;
+		if (compare_sysfs_attribute(class_dev, sysfs_device, pair) != 0) {
+			dbg("sysfs attribute doesn't match");
+			return -ENODEV;
+		}
 	}
-	return -ENODEV;
+
+	return 0;
 }
 
-static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static int match_id(struct config_device *dev, struct sysfs_class_device *class_dev, 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 */
+	/* we have to have a sysfs device for ID to work */
 	if (!sysfs_device)
 		return -ENODEV;
 
-	list_for_each(tmp, &config_device_list) {
-		dev = list_entry(tmp, struct config_device, node);
-		if (dev->type != 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("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);
-		strfieldcpy(udev->symlink, dev->symlink);
-		dbg("found matching id '%s', '%s' becomes '%s'",
-		    dev->id, class_dev->name, udev->name);
+	strfieldcpy(path, sysfs_device->path);
+	temp = strrchr(path, '/');
+	temp++;
+	dbg("search '%s' in '%s', path='%s'", dev->id, temp, path);
+	if (strcmp_pattern(dev->id, temp) != 0)
+		return -ENODEV;
+	else
 		return 0;
-	}
-	return -ENODEV;
 }
 
-static int do_topology(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static int match_place(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
-	struct config_device *dev;
-	struct list_head *tmp;
 	char path[SYSFS_PATH_MAX];
 	int found;
 	char *temp = NULL;
 
-	/* we have to have a sysfs device for TOPOLOGY to work */
+	/* we have to have a sysfs device for PLACE to work */
 	if (!sysfs_device)
 		return -ENODEV;
 
-	list_for_each(tmp, &config_device_list) {
-		dev = list_entry(tmp, struct config_device, node);
-		if (dev->type != TOPOLOGY)
-			continue;
-
-		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);
+	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) {
+		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;
-
-		strfieldcpy(udev->name, dev->name);
-		strfieldcpy(udev->symlink, dev->symlink);
-		dbg("found matching place '%s', '%s' becomes '%s'",
-		    dev->place, class_dev->name, udev->name);
-		return 0;
 	}
-	return -ENODEV;
+	if (!found) {
+		dbg("place doesn't match");
+		return -ENODEV;
+	}
+
+	return 0;
 }
 
-static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static int whitelist_search(struct sysfs_class_device *class_dev)
 {
-	struct config_device *dev;
-	struct list_head *tmp;
-
-	list_for_each(tmp, &config_device_list) {
-		dev = list_entry(tmp, struct config_device, node);
-		if (dev->type != REPLACE)
-			continue;
-
-		dbg("compare name '%s' with '%s'", dev->kernel_name, class_dev->name);
-		if (strcmp_pattern(dev->kernel_name, class_dev->name) != 0)
-			continue;
-
-		strfieldcpy(udev->name, dev->name);
-		strfieldcpy(udev->symlink, dev->symlink);
-		dbg("found name, '%s' becomes '%s'", dev->kernel_name, udev->name);
-		
+	char *sysblock = "/sys/block";
+  	int i;
+
+  	static char *list[] = {
+  		"nb",
+  		"ram",
+  		"loop",
+		"fd",
+  		"md",
+		"dos_cd",
+		"double",
+  		"flash",
+		"msd",
+		"rflash",
+  		"rom",
+		"rrom",
+  		"sbpcd",
+  		"pcd",
+  		"pf",
+  		"scd",
+  		"ubd",
+		NULL,
+  	};
+
+	if (strncmp(class_dev->path, sysblock, strlen(sysblock)))
 		return 0;
-	}
-	return -ENODEV;
-}
 
-static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *udev)
-{
-	/* heh, this is pretty simple... */
-	strfieldcpy(udev->name, class_dev->name);
+	for (i=0; list[i] != NULL; i++)
+		if (!strncmp(class_dev->name, list[i], strlen(list[i])))
+			return 1;
+
+	return 0;
 }
 
 static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_dev)
 {
 	struct sysfs_device *sysfs_device;
 	struct sysfs_class_device *class_dev_parent;
+	struct timespec tspec;
 	int loop;
 
-	/* FIXME!!! */
-	/* This is needed here as we can easily out-race the placement of the
-	 * device symlink by the kernel.  The call to sleep(1); will be removed
-	 * once libsysfs can be queried for sysfs_get_classdev_device()
-	 * multiple times and have it return the proper information when the
-	 * class device really shows up.  For now, we live with the time
-	 * delay...
+	/* Figure out where the device symlink is at.  For char devices this will
+	 * always be in the class_dev->path.  But for block devices, it's different.
+	 * The main block device will have the device symlink in it's path, but
+	 * all partitions have the symlink in its parent directory.
+	 * But we need to watch out for block devices that do not have parents, yet
+	 * look like a partition (fd0, loop0, etc.)  They all do not have a device
+	 * symlink yet.  We do sit and spin on waiting for them right now unless
+	 * they happen to be in the whitelist in which case we exit.
 	 */
-	sleep(1);
+	class_dev_parent = sysfs_get_classdev_parent(class_dev);
+	if (class_dev_parent != NULL) 
+		dbg("given class device has a parent, use this instead");
 
-#if 0	/* FIXME
-	   Something like this could also work, but for some reason doesn't,
-	   I also tried just stat() on the device symlink, but that still
-	   has nasty races, I'm probably doing something stupid... :( */
+	tspec.tv_sec = 0;
+	tspec.tv_nsec = 10000000;  /* sleep 10 millisec */
 	loop = 10;
 	while (loop--) {
-		struct stat buf;
-		int retval;
-		char filename[SYSFS_PATH_MAX + 6];
-
-		strcpy(filename, class_dev->path);
-		strcat(filename, "/device");
-		dbg("looking for '%s'", filename);
-		retval = stat(filename, &buf);
-		if (!retval)
-			break;
-
-		/* 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 (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) {
-			if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
-				class_dev_parent = sysfs_get_classdev_parent(class_dev);
-				if (class_dev_parent == NULL) {
-					dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
-				} else {
-					strcpy(filename, class_dev_parent->path);
-					strcat(filename, "/device");
-					dbg("looking for '%s'", filename);
-					retval = stat(filename, &buf);
-					if (!retval)
-						break;
-				}
+		if (udev_sleep) {
+			if (whitelist_search(class_dev)) {
+				sysfs_device = NULL;
+				goto exit;
 			}
+			nanosleep(&tspec, NULL);
 		}
-		/* sleep to give the kernel a chance to create the device file */
-		sleep(1);
-	}
-#endif
-	loop = 1;	/* FIXME put a real value in here for when everything is fixed... */
-	while (loop--) {
-		/* find the sysfs_device for this class device */
-		/* Wouldn't it really be nice if libsysfs could do this for us? */
-		sysfs_device = sysfs_get_classdev_device(class_dev);
+
+		if (class_dev_parent)
+			sysfs_device = sysfs_get_classdev_device(class_dev_parent);
+		else
+			sysfs_device = sysfs_get_classdev_device(class_dev);
 		if (sysfs_device != NULL)
-			goto exit;
+			goto device_found;
+	}
+	dbg("timed out waiting for device symlink, continuing on anyway...");
 
-		/* 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 (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) {
-			dbg("looking at block device");
-			if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
-				dbg("really is a partition");
-				class_dev_parent = sysfs_get_classdev_parent(class_dev);
-				if (class_dev_parent == NULL) {
-					dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
-				} else {
-					dbg("class_dev_parent->name='%s'", class_dev_parent->name);
-					sysfs_device = sysfs_get_classdev_device(class_dev_parent);
-					if (sysfs_device != NULL)
-						goto exit;
-				}
-			}
+device_found:
+        /* We have another issue with just the wait above - the sysfs part of
+	 * the kernel may not be quick enough to have created the link to the
+	 * device under the "bus" subsystem. Due to this, the sysfs_device->bus
+	 * will not contain the actual bus name :(
+	 */
+        if (sysfs_device) {
+		if (sysfs_device->bus[0] != '\0')
+			goto bus_found;
+
+		loop = 10;
+		tspec.tv_nsec = 10000000;
+		while (loop--) {
+			if (udev_sleep)
+				nanosleep(&tspec, NULL);
+			sysfs_get_device_bus(sysfs_device);
+			
+			if (sysfs_device->bus[0] != '\0')
+				goto bus_found;
 		}
-		/* sleep to give the kernel a chance to create the link */
-		sleep(1);
-
+		dbg("timed out waiting to find the device bus, continuing on anyway");
+		goto exit;
+bus_found:
+		dbg("device %s is registered with bus '%s'",
+				sysfs_device->name, sysfs_device->bus);
 	}
-	dbg("Timed out waiting for device symlink, continuing on anyway...");
 exit:
 	return sysfs_device;
 }
 
+static int match_rule(struct config_device *dev, struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+{
+	while (1) {
+		/* check for matching bus value */
+		if (dev->bus[0] != '\0') {
+			if (sysfs_device == NULL) {
+				dbg("device has no bus");
+				goto try_parent;
+			}
+			dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+			if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
+				dbg(FIELD_BUS " is not matching");
+				goto try_parent;
+			} else {
+				dbg(FIELD_BUS " matches");
+			}
+		}
+
+		/* check for matching kernel name*/
+		if (dev->kernel[0] != '\0') {
+			dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'", dev->kernel, class_dev->name);
+			if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
+				dbg(FIELD_KERNEL " is not matching");
+				goto try_parent;
+			} else {
+				dbg(FIELD_KERNEL " matches");
+			}
+		}
+
+		/* check for matching bus id */
+		if (dev->id[0] != '\0') {
+			dbg("check " FIELD_ID);
+			if (match_id(dev, class_dev, sysfs_device) != 0) {
+				dbg(FIELD_ID " is not matching");
+				goto try_parent;
+			} else {
+				dbg(FIELD_ID " matches");
+			}
+		}
+
+		/* check for matching place of device */
+		if (dev->place[0] != '\0') {
+			dbg("check " FIELD_PLACE);
+			if (match_place(dev, class_dev, sysfs_device) != 0) {
+				dbg(FIELD_PLACE " is not matching");
+				goto try_parent;
+			} else {
+				dbg(FIELD_PLACE " matches");
+			}
+		}
+
+		/* check for matching sysfs pairs */
+		if (dev->sysfs_pair[0].file[0] != '\0') {
+			dbg("check " FIELD_SYSFS " pairs");
+			if (match_sysfs_pairs(dev, class_dev, sysfs_device) != 0) {
+				dbg(FIELD_SYSFS " is not matching");
+				goto try_parent;
+			} else {
+				dbg(FIELD_SYSFS " matches");
+			}
+		}
+
+		/* execute external program */
+		if (dev->program[0] != '\0') {
+			char program[PROGRAM_SIZE];
+
+			dbg("check " FIELD_PROGRAM);
+			strfieldcpy(program, dev->program);
+			apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
+			if (execute_program(program, udev->program_result, NAME_SIZE) != 0) {
+				dbg(FIELD_PROGRAM " returned nonzero");
+				goto try_parent;
+			} else {
+				dbg(FIELD_PROGRAM " returned successful");
+			}
+		}
+
+		/* check for matching result of external program */
+		if (dev->result[0] != '\0') {
+			dbg("check for " FIELD_RESULT
+			    " dev->result='%s', udev->program_result='%s'",
+			    dev->result, udev->program_result);
+			if (strcmp_pattern(dev->result, udev->program_result) != 0) {
+				dbg(FIELD_RESULT " is not matching");
+				goto try_parent;
+			} else {
+				dbg(FIELD_RESULT " matches");
+			}
+		}
+
+		/* Yeah, we matched! */
+		return 0;
+
+try_parent:
+		dbg("try parent sysfs device");
+		sysfs_device = sysfs_get_device_parent(sysfs_device);
+		if (sysfs_device == NULL)
+			return -ENODEV;
+		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);
+	}
+
+}
+
 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;
-	int retval = 0;
+	struct config_device *dev;
 	struct perm_device *perm;
+	struct sysinfo info;
 	char *pos;
 
 	udev->mode = 0;
@@ -714,11 +870,12 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 		dbg("sysfs_device->bus='%s'", sysfs_device->bus);
 		strfieldcpy(udev->bus_id, sysfs_device->bus_id);
 		wait_for_device_to_initialize(sysfs_device);
-	} else {
-		dbg("class_dev->name = '%s'", class_dev->name);
 	}
+	dbg("class_dev->name = '%s'", class_dev->name);
 
 	strfieldcpy(udev->kernel_name, class_dev->name);
+	fix_kernel_name(udev);
+	dbg("udev->kernel_name = '%s'", udev->kernel_name);
 
 	/* get kernel number */
 	pos = class_dev->name + strlen(class_dev->name);
@@ -727,50 +884,84 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 	strfieldcpy(udev->kernel_number, pos);
 	dbg("kernel_number='%s'", udev->kernel_number);
 
-	/* 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;
+	/* look for a matching rule to apply */
+	list_for_each_entry(dev, &config_device_list, node) {
+		dbg("process rule");
+		if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
+			if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
+				info("configured rule in '%s' at line %i applied, '%s' is ignored",
+				     dev->config_file, dev->config_line, udev->kernel_name);
+				return -1;
+			}
 
-	retval = do_number(class_dev, udev, sysfs_device);
-	if (retval == 0)
-		goto found;
+			if (dev->symlink[0] != '\0') {
+				char temp[NAME_SIZE];
 
-	retval = do_topology(class_dev, udev, sysfs_device);
-	if (retval == 0)
-		goto found;
+				info("configured rule in '%s' at line %i applied, added symlink '%s'",
+				     dev->config_file, dev->config_line, dev->symlink);
+				strfieldcpy(temp, dev->symlink);
+				apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
+				if (udev->symlink[0] != '\0')
+					strfieldcat(udev->symlink, " ");
+				strfieldcat(udev->symlink, temp);
+			}
 
-	retval = do_replace(class_dev, udev, sysfs_device);
-	if (retval == 0)
-		goto found;
+			if (dev->name[0] != '\0') {
+				/* apply all_partitions flag only at a main block device */
+				if (dev->partitions > 0 &&
+				    (udev->type != 'b' || udev->kernel_number[0] != '\0'))
+					continue;
 
-	do_kernelname(class_dev, udev);
-	goto done;
+				info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+				     dev->config_file, dev->config_line, udev->kernel_name, dev->name);
+				strfieldcpy(udev->name, dev->name);
+				goto found;
+			}
+		}
+	}
+	/* no rule was found so we use the kernel name */
+	strfieldcpy(udev->name, udev->kernel_name);
+	if (udev->type == 'n')
+		goto done;
+	else
+		goto perms;
 
 found:
-	/* substitute placeholder */
-	apply_format(udev, udev->name);
-	apply_format(udev, udev->symlink);
+	apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+	strfieldcpy(udev->config_file, dev->config_file);
+	udev->config_line = dev->config_line;
 
-done:
+	if (udev->type == 'n')
+		goto done;
+
+	udev->partitions = dev->partitions;
+
+	/* get permissions given in rule */
+	set_empty_perms(udev, dev->mode,
+			      dev->owner,
+			      dev->group);
+
+perms:
+	/* get permissions given in config file or set defaults */
 	perm = find_perm(udev->name);
-	if (perm) {
-		udev->mode = perm->mode;
-		strfieldcpy(udev->owner, perm->owner);
-		strfieldcpy(udev->group, perm->group);
+	if (perm != NULL) {
+		set_empty_perms(udev, perm->mode,
+				      perm->owner,
+				      perm->group);
 	} else {
-		/* no matching perms found :( */
-		udev->mode = get_default_mode(class_dev);
-		udev->owner[0] = 0x00;
-		udev->group[0] = 0x00;
+		set_empty_perms(udev, get_default_mode(),
+				      get_default_owner(),
+				      get_default_group());
 	}
+
 	dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
 	    udev->name, udev->owner, udev->group, udev->mode);
 
+done:
+	/* store time of action */
+	sysinfo(&info);
+	udev->config_uptime = info.uptime;
+
 	return 0;
 }