X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.c;h=dcd091485b8e74c433916941c5aabd9e000f8e73;hp=7ecca9468e05a65a28ad87317c39b4428aed7359;hb=39ea7c6c67de69379b603196a0eff6f7ce2e469a;hpb=40caaeec51f5d8f65245932a85396ac85265cbe5

diff --git a/udev_rules.c b/udev_rules.c
index 7ecca9468..dcd091485 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -1,21 +1,19 @@
 /*
- * udev_rules.c
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
  *	Free Software Foundation version 2 of the License.
- * 
+ *
  *	This program is distributed in the hope that it will be useful, but
  *	WITHOUT ANY WARRANTY; without even the implied warranty of
  *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *	General Public License for more details.
- * 
+ *
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -28,19 +26,16 @@
 #include <unistd.h>
 #include <errno.h>
 #include <syslog.h>
+#include <fnmatch.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
-#include "list.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "udev_version.h"
-#include "logging.h"
 #include "udev_rules.h"
-#include "udev_db.h"
 
+extern char **environ;
 
 /* extract possible {attr} and move str behind it */
 static char *get_format_attribute(char **str)
@@ -87,68 +82,251 @@ static int get_key(char **line, char **key, char **value)
 	char *temp;
 
 	linepos = *line;
-	if (!linepos)
-		return -1;
-
-	if (strchr(linepos, '\\')) {
-		dbg("escaped characters are not supported, skip");
+	if (linepos == NULL)
 		return -1;
-	}
 
 	/* skip whitespace */
 	while (isspace(linepos[0]))
 		linepos++;
 
 	/* get the key */
+	temp = strchr(linepos, '=');
+	if (temp == NULL || temp == linepos)
+		return -1;
+	temp[0] = '\0';
 	*key = linepos;
-	while (1) {
-		linepos++;
-		if (linepos[0] == '\0')
-			return -1;
-		if (isspace(linepos[0]))
-			break;
-		if (linepos[0] == '=')
-			break;
+	linepos = &temp[1];
+
+	/* get a quoted value */
+	if (linepos[0] == '"' || linepos[0] == '\'') {
+		temp = strchr(&linepos[1], linepos[0]);
+		if (temp != NULL) {
+			temp[0] = '\0';
+			*value = &linepos[1];
+			goto out;
+		}
 	}
 
-	/* terminate key */
-	linepos[0] = '\0';
-	linepos++;
+	/* get the value*/
+	temp = strchr(linepos, '\n');
+	if (temp != NULL)
+		temp[0] = '\0';
+	*value = linepos;
+out:
+	return 0;
+}
 
-	/* skip whitespace */
-	while (isspace(linepos[0]))
-		linepos++;
+static int run_program(const char *command, const char *subsystem,
+		char *result, size_t ressize, size_t *reslen)
+{
+	int status;
+	int outpipe[2] = {-1, -1};
+	int errpipe[2] = {-1, -1};
+	pid_t pid;
+	char arg[PATH_SIZE];
+	char program[PATH_SIZE];
+	char *argv[(sizeof(arg) / 2) + 1];
+	int devnull;
+	int i;
+	int retval = 0;
+
+	/* build argv from comand */
+	strlcpy(arg, command, sizeof(arg));
+	i = 0;
+	if (strchr(arg, ' ') != NULL) {
+		char *pos = arg;
+
+		while (pos != NULL) {
+			if (pos[0] == '\'') {
+				/* don't separate if in apostrophes */
+				pos++;
+				argv[i] = strsep(&pos, "\'");
+				while (pos != NULL && pos[0] == ' ')
+					pos++;
+			} else {
+				argv[i] = strsep(&pos, " ");
+			}
+			dbg("arg[%i] '%s'", i, argv[i]);
+			i++;
+		}
+		argv[i] = NULL;
+	} else {
+		argv[0] = arg;
+		argv[1] = NULL;
+	}
+	info("'%s'", command);
 
-	/* get the value*/
-	if (linepos[0] == '"') {
-		linepos++;
-		temp = strchr(linepos, '"');
-		if (!temp) {
-			dbg("missing closing quote");
+	/* prepare pipes from child to parent */
+	if (result != NULL || udev_log_priority >= LOG_INFO) {
+		if (pipe(outpipe) != 0) {
+			err("pipe failed: %s", strerror(errno));
 			return -1;
 		}
-		dbg("value is quoted");
-		temp[0] = '\0';
-	} else if (linepos[0] == '\'') {
-		linepos++;
-		temp = strchr(linepos, '\'');
-		if (!temp) {
-			dbg("missing closing quote");
+	}
+	if (udev_log_priority >= LOG_INFO) {
+		if (pipe(errpipe) != 0) {
+			err("pipe failed: %s", strerror(errno));
 			return -1;
 		}
-		dbg("value is quoted");
-		temp[0] = '\0';
-	} else if (linepos[0] == '\0') {
-		dbg("value is empty");
-	} else {
-		temp = linepos;
-		while (temp[0] && !isspace(temp[0]))
-			temp++;
-		temp[0] = '\0';
 	}
-	*value = linepos;
 
-	return 0;
+	/* allow programs in /lib/udev called without the path */
+	if (strchr(argv[0], '/') == NULL) {
+		strlcpy(program, "/lib/udev/", sizeof(program));
+		strlcat(program, argv[0], sizeof(program));
+		argv[0] = program;
+	}
+
+	pid = fork();
+	switch(pid) {
+	case 0:
+		/* child closes parent ends of pipes */
+		if (outpipe[READ_END] > 0)
+			close(outpipe[READ_END]);
+		if (errpipe[READ_END] > 0)
+			close(errpipe[READ_END]);
+
+		/* discard child output or connect to pipe */
+		devnull = open("/dev/null", O_RDWR);
+		if (devnull > 0) {
+			dup2(devnull, STDIN_FILENO);
+			if (outpipe[WRITE_END] < 0)
+				dup2(devnull, STDOUT_FILENO);
+			if (errpipe[WRITE_END] < 0)
+				dup2(devnull, STDERR_FILENO);
+			close(devnull);
+		} else
+			err("open /dev/null failed: %s", strerror(errno));
+		if (outpipe[WRITE_END] > 0) {
+			dup2(outpipe[WRITE_END], STDOUT_FILENO);
+			close(outpipe[WRITE_END]);
+		}
+		if (errpipe[WRITE_END] > 0) {
+			dup2(errpipe[WRITE_END], STDERR_FILENO);
+			close(errpipe[WRITE_END]);
+		}
+		execv(argv[0], argv);
+		if (errno == ENOENT || errno == ENOTDIR) {
+			/* may be on a filesytem which is not mounted right now */
+			info("program '%s' not found", argv[0]);
+		} else {
+			/* other problems */
+			err("exec of program '%s' failed", argv[0]);
+		}
+		_exit(1);
+	case -1:
+		err("fork of '%s' failed: %s", argv[0], strerror(errno));
+		return -1;
+	default:
+		/* read from child if requested */
+		if (outpipe[READ_END] > 0 || errpipe[READ_END] > 0) {
+			ssize_t count;
+			size_t respos = 0;
+
+			/* parent closes child ends of pipes */
+			if (outpipe[WRITE_END] > 0)
+				close(outpipe[WRITE_END]);
+			if (errpipe[WRITE_END] > 0)
+				close(errpipe[WRITE_END]);
+
+			/* read child output */
+			while (outpipe[READ_END] > 0 || errpipe[READ_END] > 0) {
+				int fdcount;
+				fd_set readfds;
+
+				FD_ZERO(&readfds);
+				if (outpipe[READ_END] > 0)
+					FD_SET(outpipe[READ_END], &readfds);
+				if (errpipe[READ_END] > 0)
+					FD_SET(errpipe[READ_END], &readfds);
+				fdcount = select(UDEV_MAX(outpipe[READ_END], errpipe[READ_END])+1, &readfds, NULL, NULL, NULL);
+				if (fdcount < 0) {
+					if (errno == EINTR)
+						continue;
+					retval = -1;
+					break;
+				}
+
+				/* get stdout */
+				if (outpipe[READ_END] > 0 && FD_ISSET(outpipe[READ_END], &readfds)) {
+					char inbuf[1024];
+					char *pos;
+					char *line;
+
+					count = read(outpipe[READ_END], inbuf, sizeof(inbuf)-1);
+					if (count <= 0) {
+						close(outpipe[READ_END]);
+						outpipe[READ_END] = -1;
+						if (count < 0) {
+							err("stdin read failed: %s", strerror(errno));
+							retval = -1;
+						}
+						continue;
+					}
+					inbuf[count] = '\0';
+
+					/* store result for rule processing */
+					if (result) {
+						if (respos + count < ressize) {
+							memcpy(&result[respos], inbuf, count);
+							respos += count;
+						} else {
+							err("ressize %ld too short", (long)ressize);
+							retval = -1;
+						}
+					}
+					pos = inbuf;
+					while ((line = strsep(&pos, "\n")))
+						if (pos || line[0] != '\0')
+							info("'%s' (stdout) '%s'", argv[0], line);
+				}
+
+				/* get stderr */
+				if (errpipe[READ_END] > 0 && FD_ISSET(errpipe[READ_END], &readfds)) {
+					char errbuf[1024];
+					char *pos;
+					char *line;
+
+					count = read(errpipe[READ_END], errbuf, sizeof(errbuf)-1);
+					if (count <= 0) {
+						close(errpipe[READ_END]);
+						errpipe[READ_END] = -1;
+						if (count < 0)
+							err("stderr read failed: %s", strerror(errno));
+						continue;
+					}
+					errbuf[count] = '\0';
+					pos = errbuf;
+					while ((line = strsep(&pos, "\n")))
+						if (pos || line[0] != '\0')
+							info("'%s' (stderr) '%s'", argv[0], line);
+				}
+			}
+			if (outpipe[READ_END] > 0)
+				close(outpipe[READ_END]);
+			if (errpipe[READ_END] > 0)
+				close(errpipe[READ_END]);
+
+			/* return the childs stdout string */
+			if (result) {
+				result[respos] = '\0';
+				dbg("result='%s'", result);
+				if (reslen)
+					*reslen = respos;
+			}
+		}
+		waitpid(pid, &status, 0);
+		if (WIFEXITED(status)) {
+			info("'%s' returned with status %i", argv[0], WEXITSTATUS(status));
+			if (WEXITSTATUS(status) != 0)
+				retval = -1;
+		} else {
+			err("'%s' abnormal exit", argv[0]);
+			retval = -1;
+		}
+	}
+
+	return retval;
 }
 
 static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bufsize)
@@ -194,7 +372,13 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
 		linepos = line;
 		if (get_key(&linepos, &variable, &value) == 0) {
 			dbg("import '%s=%s'", variable, value);
-			name_list_key_add(&udev->env_list, variable, value);
+
+			/* handle device, renamed by external tool, returning new path */
+			if (strcmp(variable, "DEVPATH") == 0) {
+				info("updating devpath from '%s' to '%s'", udev->dev->devpath, value);
+				sysfs_device_set_values(udev->dev, value, NULL, NULL);
+			} else
+				name_list_key_add(&udev->env_list, variable, value);
 			setenv(variable, value, 1);
 		}
 	}
@@ -208,7 +392,7 @@ static int import_file_into_env(struct udevice *udev, const char *filename)
 	size_t bufsize;
 
 	if (file_map(filename, &buf, &bufsize) != 0) {
-		err("can't open '%s'", filename);
+		err("can't open '%s': %s", filename, strerror(errno));
 		return -1;
 	}
 	import_keys_into_env(udev, buf, bufsize);
@@ -219,29 +403,32 @@ static int import_file_into_env(struct udevice *udev, const char *filename)
 
 static int import_program_into_env(struct udevice *udev, const char *program)
 {
-	char result[1024];
+	char result[2048];
 	size_t reslen;
 
-	if (run_program(program, udev->subsystem, result, sizeof(result), &reslen, (udev_log_priority >= LOG_INFO)) != 0)
+	if (run_program(program, udev->dev->subsystem, result, sizeof(result), &reslen) != 0)
 		return -1;
 	return import_keys_into_env(udev, result, reslen);
 }
 
-static int import_parent_into_env(struct udevice *udev, struct sysfs_class_device *class_dev, const char *filter)
+static int import_parent_into_env(struct udevice *udev, const char *filter)
 {
-	struct sysfs_class_device *parent = sysfs_get_classdev_parent(class_dev);
+	struct sysfs_device *dev_parent;
 	int rc = -1;
 
-	if (parent != NULL) {
-		struct udevice udev_parent;
+	dev_parent = sysfs_device_get_parent(udev->dev);
+	if (dev_parent != NULL) {
+		struct udevice *udev_parent;
 		struct name_entry *name_loop;
 
-		dbg("found parent '%s', get the node name", parent->path);
-		udev_init_device(&udev_parent, NULL, NULL, NULL);
+		dbg("found parent '%s', get the node name", dev_parent->devpath);
+		udev_parent = udev_device_init(NULL);
+		if (udev_parent == NULL)
+			return -1;
 		/* import the udev_db of the parent */
-		if (udev_db_get_device(&udev_parent, &parent->path[strlen(sysfs_path)]) == 0) {
-			dbg("import stored parent env '%s'", udev_parent.name);
-			list_for_each_entry(name_loop, &udev_parent.env_list, node) {
+		if (udev_db_get_device(udev_parent, dev_parent->devpath) == 0) {
+			dbg("import stored parent env '%s'", udev_parent->name);
+			list_for_each_entry(name_loop, &udev_parent->env_list, node) {
 				char name[NAME_SIZE];
 				char *pos;
 
@@ -250,7 +437,7 @@ static int import_parent_into_env(struct udevice *udev, struct sysfs_class_devic
 				if (pos) {
 					pos[0] = '\0';
 					pos++;
-					if (strcmp_pattern(filter, name) == 0) {
+					if (fnmatch(filter, name, 0) == 0) {
 						dbg("import key '%s'", name_loop->name);
 						name_list_add(&udev->env_list, name_loop->name, 0);
 						setenv(name, pos, 1);
@@ -261,121 +448,167 @@ static int import_parent_into_env(struct udevice *udev, struct sysfs_class_devic
 			rc = 0;
 		} else
 			dbg("parent not found in database");
-		udev_cleanup_device(&udev_parent);
+		udev_device_cleanup(udev_parent);
 	}
 
 	return rc;
 }
 
-/* finds the lowest positive N such that <name>N isn't present in the udevdb
- * if <name> doesn't exist, 0 is returned, N otherwise
- */
-static int find_free_number(const char *name)
+static int pass_env_to_socket(const char *sockname, const char *devpath, const char *action)
 {
-	char devpath[PATH_SIZE];
-	char filename[PATH_SIZE];
-	int num = 0;
+	int sock;
+	struct sockaddr_un saddr;
+	socklen_t addrlen;
+	char buf[2048];
+	size_t bufpos = 0;
+	int i;
+	ssize_t count;
+	int retval = 0;
+
+	dbg("pass environment to socket '%s'", sockname);
+	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
+	saddr.sun_family = AF_LOCAL;
+	/* abstract namespace only */
+	strcpy(&saddr.sun_path[1], sockname);
+	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+
+	bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
+	bufpos++;
+	for (i = 0; environ[i] != NULL && bufpos < (sizeof(buf)-1); i++) {
+		bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos-1);
+		bufpos++;
+	}
+	if (bufpos > sizeof(buf))
+		bufpos = sizeof(buf);
 
-	strlcpy(filename, name, sizeof(filename));
-	while (1) {
-		dbg("look for existing node '%s'", filename);
-		if (udev_db_search_name(devpath, sizeof(devpath), filename) != 0) {
-			dbg("free num=%d", num);
-			return num;
-		}
+	count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, addrlen);
+	if (count < 0)
+		retval = -1;
+	info("passed %zi bytes to socket '%s', ", count, sockname);
 
-		num++;
-		if (num > 1000) {
-			info("find_free_number gone crazy (num=%d), aborted", num);
-			return -1;
-		}
-		snprintf(filename, sizeof(filename), "%s%d", name, num);
-		filename[sizeof(filename)-1] = '\0';
-	}
+	close(sock);
+	return retval;
 }
 
-static int find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device,
-				const char *name, char *value, size_t len)
+int udev_rules_run(struct udevice *udev)
 {
-	struct sysfs_class_device *class_dev_parent;
-	struct sysfs_attribute *tmpattr;
-
-	dbg("look for device attribute '%s'", name);
-	if (class_dev) {
-		dbg("look for class attribute '%s/%s'", class_dev->path, name);
-		tmpattr = sysfs_get_classdev_attr(class_dev, name);
-		if (tmpattr)
-			goto attr_found;
-		class_dev_parent = sysfs_get_classdev_parent(class_dev);
-		if (class_dev_parent) {
-			tmpattr = sysfs_get_classdev_attr(class_dev_parent, name);
-			if (tmpattr)
-				goto attr_found;
+	struct name_entry *name_loop;
+	int retval = 0;
+
+	dbg("executing run list");
+	list_for_each_entry(name_loop, &udev->run_list, node) {
+		if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0) {
+			pass_env_to_socket(&name_loop->name[strlen("socket:")], udev->dev->devpath, udev->action);
+		} else {
+			char program[PATH_SIZE];
+
+			strlcpy(program, name_loop->name, sizeof(program));
+			udev_rules_apply_format(udev, program, sizeof(program));
+			if (run_program(program, udev->dev->subsystem, NULL, 0, NULL) != 0)
+				if (!name_loop->ignore_error)
+					retval = -1;
 		}
 	}
-	if (sysfs_device) {
-		dbg("look for devices attribute '%s/%s'", sysfs_device->path, name);
-		tmpattr = sysfs_get_device_attr(sysfs_device, name);
-		if (tmpattr)
-			goto attr_found;
-	}
-	return -1;
 
-attr_found:
-	strlcpy(value, tmpattr->value, len);
-	remove_trailing_char(value, '\n');
-
-	dbg("found attribute '%s'", tmpattr->path);
-	return 0;
+	return retval;
 }
 
-#define WAIT_LOOP_PER_SECOND			20
+#define WAIT_LOOP_PER_SECOND		50
 static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
 {
-	char filename[PATH_SIZE];
+	char devicepath[PATH_SIZE];
+	char filepath[PATH_SIZE];
 	struct stat stats;
 	int loop = timeout * WAIT_LOOP_PER_SECOND;
 
-	snprintf(filename, sizeof(filename), "%s%s/%s", sysfs_path, udev->devpath, file);
-	filename[sizeof(filename)-1] = '\0';
-	dbg("wait %i sec for '%s'", timeout, filename);
+	strlcpy(devicepath, sysfs_path, sizeof(devicepath));
+	strlcat(devicepath, udev->dev->devpath, sizeof(devicepath));
+	strlcpy(filepath, devicepath, sizeof(filepath));
+	strlcat(filepath, "/", sizeof(filepath));
+	strlcat(filepath, file, sizeof(filepath));
 
+	dbg("will wait %i sec for '%s'", timeout, filepath);
 	while (--loop) {
-		if (stat(filename, &stats) == 0) {
-			dbg("file appeared after %i loops", (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
+		/* lookup file */
+		if (stat(filepath, &stats) == 0) {
+			info("file '%s' appeared after %i loops", filepath, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
 			return 0;
 		}
+		/* make sure, the device did not disappear in the meantime */
+		if (stat(devicepath, &stats) != 0) {
+			info("device disappeared while waiting for '%s'", filepath);
+			return -2;
+		}
+		info("wait for '%s' for %i mseconds", filepath, 1000 / WAIT_LOOP_PER_SECOND);
 		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
 	}
-	dbg("waiting for '%s' failed", filename);
+	info("waiting for '%s' failed", filepath);
 	return -1;
 }
 
-static void apply_format(struct udevice *udev, char *string, size_t maxsize,
-			 struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
+/* handle "[$SUBSYSTEM/$KERNEL]<attribute>" lookup */
+static int attr_get_by_subsys_id(const char *attrstr, char *devpath, size_t len, char **attr)
+{
+	char subsys[NAME_SIZE];
+	char *attrib;
+	char *id;
+	int found = 0;
+
+	if (attrstr[0] != '[')
+		goto out;
+
+	strlcpy(subsys, &attrstr[1], sizeof(subsys));
+
+	attrib = strchr(subsys, ']');
+	if (attrib == NULL)
+		goto out;
+	attrib[0] = '\0';
+	attrib = &attrib[1];
+
+	id = strchr(subsys, '/');
+	if (id == NULL)
+		goto out;
+	id[0] = '\0';
+	id = &id[1];
+
+	if (sysfs_lookup_devpath_by_subsys_id(devpath, len, subsys, id)) {
+		if (attr != NULL) {
+			if (attrib[0] != '\0')
+				*attr = attrib;
+			else
+				*attr = NULL;
+		}
+		found = 1;
+	}
+out:
+	return found;
+}
+
+void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 {
 	char temp[PATH_SIZE];
 	char temp2[PATH_SIZE];
 	char *head, *tail, *pos, *cpos, *attr, *rest;
 	int len;
 	int i;
-	unsigned int next_free_number;
-	struct sysfs_class_device *class_dev_parent;
+	int count;
 	enum subst_type {
 		SUBST_UNKNOWN,
 		SUBST_DEVPATH,
-		SUBST_ID,
+		SUBST_KERNEL,
 		SUBST_KERNEL_NUMBER,
-		SUBST_KERNEL_NAME,
+		SUBST_ID,
+		SUBST_DRIVER,
 		SUBST_MAJOR,
 		SUBST_MINOR,
 		SUBST_RESULT,
-		SUBST_SYSFS,
-		SUBST_ENUM,
+		SUBST_ATTR,
 		SUBST_PARENT,
 		SUBST_TEMP_NODE,
+		SUBST_NAME,
 		SUBST_ROOT,
-		SUBST_MODALIAS,
+		SUBST_SYS,
 		SUBST_ENV,
 	};
 	static const struct subst_map {
@@ -383,20 +616,22 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 		char fmt;
 		enum subst_type type;
 	} map[] = {
-		{ .name = "devpath",		.fmt = 'p',	.type = SUBST_DEVPATH },
-		{ .name = "id",			.fmt = 'b',	.type = SUBST_ID },
-		{ .name = "number",		.fmt = 'n',	.type = SUBST_KERNEL_NUMBER },
-		{ .name = "kernel",		.fmt = 'k',	.type = SUBST_KERNEL_NAME },
-		{ .name = "major",		.fmt = 'M',	.type = SUBST_MAJOR },
-		{ .name = "minor",		.fmt = 'm',	.type = SUBST_MINOR },
-		{ .name = "result",		.fmt = 'c',	.type = SUBST_RESULT },
-		{ .name = "sysfs",		.fmt = 's',	.type = SUBST_SYSFS },
-		{ .name = "enum",		.fmt = 'e',	.type = SUBST_ENUM },
-		{ .name = "parent",		.fmt = 'P',	.type = SUBST_PARENT },
-		{ .name = "tempnode",		.fmt = 'N',	.type = SUBST_TEMP_NODE },
-		{ .name = "root",		.fmt = 'r',	.type = SUBST_ROOT },
-		{ .name = "modalias",		.fmt = 'A',	.type = SUBST_MODALIAS },
-		{ .name = "env",		.fmt = 'E',	.type = SUBST_ENV },
+		{ .name = "devpath",	.fmt = 'p',	.type = SUBST_DEVPATH },
+		{ .name = "number",	.fmt = 'n',	.type = SUBST_KERNEL_NUMBER },
+		{ .name = "kernel",	.fmt = 'k',	.type = SUBST_KERNEL },
+		{ .name = "id",		.fmt = 'b',	.type = SUBST_ID },
+		{ .name = "driver",	.fmt = 'd',	.type = SUBST_DRIVER },
+		{ .name = "major",	.fmt = 'M',	.type = SUBST_MAJOR },
+		{ .name = "minor",	.fmt = 'm',	.type = SUBST_MINOR },
+		{ .name = "result",	.fmt = 'c',	.type = SUBST_RESULT },
+		{ .name = "attr",	.fmt = 's',	.type = SUBST_ATTR },
+		{ .name = "sysfs",	.fmt = 's',	.type = SUBST_ATTR },
+		{ .name = "parent",	.fmt = 'P',	.type = SUBST_PARENT },
+		{ .name = "tempnode",	.fmt = 'N',	.type = SUBST_TEMP_NODE },
+		{ .name = "name",	.fmt = 'D',	.type = SUBST_NAME },
+		{ .name = "root",	.fmt = 'r',	.type = SUBST_ROOT },
+		{ .name = "sys",	.fmt = 'S',	.type = SUBST_SYS },
+		{ .name = "env",	.fmt = 'E',	.type = SUBST_ENV },
 		{ NULL, '\0', 0 }
 	};
 	enum subst_type type;
@@ -425,8 +660,9 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 						goto found;
 					}
 				}
-			}
-			else if (head[0] == '%') {
+				head[0] = '$';
+				err("unknown format variable '%s'", head);
+			} else if (head[0] == '%') {
 				/* substitute format char */
 				if (head[1] == '\0')
 					break;
@@ -447,6 +683,8 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 						goto found;
 					}
 				}
+				head[0] = '%';
+				err("unknown format char '%c'", tail[0]);
 			}
 			head++;
 		}
@@ -454,25 +692,32 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 found:
 		attr = get_format_attribute(&tail);
 		strlcpy(temp, tail, sizeof(temp));
-		dbg("format=%i, string='%s', tail='%s', class_dev=%p, sysfs_dev=%p",
-		    type ,string, tail, class_dev, sysfs_device);
+		dbg("format=%i, string='%s', tail='%s'", type ,string, tail);
 
 		switch (type) {
 		case SUBST_DEVPATH:
-			strlcat(string, udev->devpath, maxsize);
-			dbg("substitute devpath '%s'", udev->devpath);
+			strlcat(string, udev->dev->devpath, maxsize);
+			dbg("substitute devpath '%s'", udev->dev->devpath);
 			break;
-		case SUBST_ID:
-			strlcat(string, udev->bus_id, maxsize);
-			dbg("substitute bus_id '%s'", udev->bus_id);
-			break;
-		case SUBST_KERNEL_NAME:
-			strlcat(string, udev->kernel_name, maxsize);
-			dbg("substitute kernel name '%s'", udev->kernel_name);
+		case SUBST_KERNEL:
+			strlcat(string, udev->dev->kernel, maxsize);
+			dbg("substitute kernel name '%s'", udev->dev->kernel);
 			break;
 		case SUBST_KERNEL_NUMBER:
-			strlcat(string, udev->kernel_number, maxsize);
-			dbg("substitute kernel number '%s'", udev->kernel_number);
+			strlcat(string, udev->dev->kernel_number, maxsize);
+			dbg("substitute kernel number '%s'", udev->dev->kernel_number);
+			break;
+		case SUBST_ID:
+			if (udev->dev_parent != NULL) {
+				strlcat(string, udev->dev_parent->kernel, maxsize);
+				dbg("substitute id '%s'", udev->dev_parent->kernel);
+			}
+			break;
+		case SUBST_DRIVER:
+			if (udev->dev_parent != NULL) {
+				strlcat(string, udev->dev_parent->driver, maxsize);
+				dbg("substitute driver '%s'", udev->dev_parent->driver);
+			}
 			break;
 		case SUBST_MAJOR:
 			sprintf(temp2, "%d", major(udev->devt));
@@ -518,78 +763,101 @@ found:
 				dbg("substitute result string '%s'", udev->program_result);
 			}
 			break;
-		case SUBST_SYSFS:
-			if (attr == NULL) {
-				dbg("missing attribute");
-				break;
-			}
-			if (find_sysfs_attribute(class_dev, sysfs_device, attr, temp2, sizeof(temp2)) != 0) {
-				struct sysfs_device *parent_device;
-
-				dbg("sysfs attribute '%s' not found, walk up the physical devices", attr);
-				parent_device = sysfs_get_device_parent(sysfs_device);
-				while (parent_device) {
-					dbg("looking at '%s'", parent_device->path);
-					if (find_sysfs_attribute(NULL, parent_device, attr, temp2, sizeof(temp2)) == 0)
+		case SUBST_ATTR:
+			if (attr == NULL)
+				err("missing file parameter for attr");
+			else {
+				char devpath[PATH_SIZE];
+				char *attrib;
+				const char *value = NULL;
+				size_t size;
+
+				if (attr_get_by_subsys_id(attr, devpath, sizeof(devpath), &attrib)) {
+					if (attrib != NULL)
+						value = sysfs_attr_get_value(devpath, attrib);
+					else
 						break;
-					parent_device = sysfs_get_device_parent(parent_device);
 				}
-				if (!parent_device)
+
+				/* try the current device, other matches may have selected */
+				if (value == NULL && udev->dev_parent != NULL && udev->dev_parent != udev->dev)
+					value = sysfs_attr_get_value(udev->dev_parent->devpath, attr);
+
+				/* look at all devices along the chain of parents */
+				if (value == NULL) {
+					struct sysfs_device *dev_parent = udev->dev;
+
+					do {
+						dbg("looking at '%s'", dev_parent->devpath);
+						value = sysfs_attr_get_value(dev_parent->devpath, attr);
+						if (value != NULL) {
+							strlcpy(temp2, value, sizeof(temp2));
+							break;
+						}
+						dev_parent = sysfs_device_get_parent(dev_parent);
+					} while (dev_parent != NULL);
+				}
+
+				if (value == NULL)
 					break;
-			}
-			/* strip trailing whitespace of sysfs value */
-			i = strlen(temp2);
-			while (i > 0 && isspace(temp2[i-1]))
-				temp2[--i] = '\0';
-			replace_untrusted_chars(temp2);
-			strlcat(string, temp2, maxsize);
-			dbg("substitute sysfs value '%s'", temp2);
-			break;
-		case SUBST_ENUM:
-			next_free_number = find_free_number(string);
-			if (next_free_number > 0) {
-				sprintf(temp2, "%d", next_free_number);
+
+				/* strip trailing whitespace, and replace unwanted characters */
+				size = strlcpy(temp2, value, sizeof(temp2));
+				if (size >= sizeof(temp2))
+					size = sizeof(temp2)-1;
+				while (size > 0 && isspace(temp2[size-1]))
+					temp2[--size] = '\0';
+				count = replace_chars(temp2, ALLOWED_CHARS_INPUT);
+				if (count > 0)
+					info("%i character(s) replaced" , count);
 				strlcat(string, temp2, maxsize);
+				dbg("substitute sysfs value '%s'", temp2);
 			}
 			break;
 		case SUBST_PARENT:
-			if (!class_dev)
-				break;
-			class_dev_parent = sysfs_get_classdev_parent(class_dev);
-			if (class_dev_parent != NULL) {
-				struct udevice udev_parent;
-
-				dbg("found parent '%s', get the node name", class_dev_parent->path);
-				udev_init_device(&udev_parent, NULL, NULL, NULL);
-				/* lookup the name in the udev_db with the DEVPATH of the parent */
-				if (udev_db_get_device(&udev_parent, &class_dev_parent->path[strlen(sysfs_path)]) == 0) {
-					strlcat(string, udev_parent.name, maxsize);
-					dbg("substitute parent node name'%s'", udev_parent.name);
-				} else
-					dbg("parent not found in database");
-				udev_cleanup_device(&udev_parent);
+			{
+				struct sysfs_device *dev_parent;
+
+				dev_parent = sysfs_device_get_parent(udev->dev);
+				if (dev_parent != NULL) {
+					struct udevice *udev_parent;
+
+					dbg("found parent '%s', get the node name", dev_parent->devpath);
+					udev_parent = udev_device_init(NULL);
+					if (udev_parent != NULL) {
+						/* lookup the name in the udev_db with the DEVPATH of the parent */
+						if (udev_db_get_device(udev_parent, dev_parent->devpath) == 0) {
+							strlcat(string, udev_parent->name, maxsize);
+							dbg("substitute parent node name'%s'", udev_parent->name);
+						} else
+							dbg("parent not found in database");
+						udev_device_cleanup(udev_parent);
+					}
+				}
 			}
 			break;
 		case SUBST_TEMP_NODE:
-			if (udev->tmp_node[0] == '\0') {
+			if (udev->tmp_node[0] == '\0' && major(udev->devt) > 0) {
 				dbg("create temporary device node for callout");
 				snprintf(udev->tmp_node, sizeof(udev->tmp_node), "%s/.tmp-%u-%u",
 					 udev_root, major(udev->devt), minor(udev->devt));
 				udev->tmp_node[sizeof(udev->tmp_node)-1] = '\0';
-				udev_make_node(udev, udev->tmp_node, udev->devt, 0600, 0, 0);
+				udev_node_mknod(udev, udev->tmp_node, udev->devt, 0600, 0, 0);
 			}
 			strlcat(string, udev->tmp_node, maxsize);
 			dbg("substitute temporary device node name '%s'", udev->tmp_node);
 			break;
+		case SUBST_NAME:
+			strlcat(string, udev->name, maxsize);
+			dbg("substitute udev->name '%s'", udev->name);
+			break;
 		case SUBST_ROOT:
 			strlcat(string, udev_root, maxsize);
 			dbg("substitute udev_root '%s'", udev_root);
 			break;
-		case SUBST_MODALIAS:
-			if (find_sysfs_attribute(NULL, sysfs_device, "modalias", temp2, sizeof(temp2)) != 0)
-				break;
-			strlcat(string, temp2, maxsize);
-			dbg("substitute MODALIAS '%s'", temp2);
+		case SUBST_SYS:
+			strlcat(string, sysfs_path, maxsize);
+			dbg("substitute sysfs_path '%s'", sysfs_path);
 			break;
 		case SUBST_ENV:
 			if (attr == NULL) {
@@ -598,7 +866,7 @@ found:
 			}
 			pos = getenv(attr);
 			if (pos == NULL) {
-				dbg("env '%s' not avialable", attr);
+				dbg("env '%s' not available", attr);
 				break;
 			}
 			dbg("substitute env '%s=%s'", attr, pos);
@@ -609,7 +877,7 @@ found:
 			break;
 		}
 		/* possibly truncate to format-char specified length */
-		if (len != -1) {
+		if (len >= 0 && len < (int)strlen(head)) {
 			head[len] = '\0';
 			dbg("truncate to %i chars, subtitution string becomes '%s'", len, head);
 		}
@@ -629,17 +897,18 @@ static char *key_pair_name(struct udev_rule *rule, struct key_pair *pair)
 
 static int match_key(const char *key_name, struct udev_rule *rule, struct key *key, const char *val)
 {
-	int match;
 	char value[PATH_SIZE];
 	char *key_value;
 	char *pos;
+	int match = 0;
 
-	if (key->operation == KEY_OP_UNSET)
+	if (key->operation != KEY_OP_MATCH &&
+	    key->operation != KEY_OP_NOMATCH)
 		return 0;
 
+	/* look for a matching string, parts are separated by '|' */
 	strlcpy(value, rule->buf + key->val_off, sizeof(value));
 	key_value = value;
-
 	dbg("key %s value='%s'", key_name, key_value);
 	while (key_value) {
 		pos = strchr(key_value, '|');
@@ -647,249 +916,380 @@ static int match_key(const char *key_name, struct udev_rule *rule, struct key *k
 			pos[0] = '\0';
 			pos++;
 		}
+
 		dbg("match %s '%s' <-> '%s'", key_name, key_value, val);
-		match = (strcmp_pattern(key_value, val) == 0);
-		if (match && (key->operation != KEY_OP_NOMATCH)) {
-			dbg("%s is true (matching value)", key_name);
-			return 0;
-		}
-		if (!match && (key->operation == KEY_OP_NOMATCH)) {
-			dbg("%s is true (non-matching value)", key_name);
-			return 0;
-		}
+		match = (fnmatch(key_value, val, 0) == 0);
+		if (match)
+			break;
+
 		key_value = pos;
 	}
-	dbg("%s is false", key_name);
+
+	if (match && (key->operation == KEY_OP_MATCH)) {
+		dbg("%s is true (matching value)", key_name);
+		return 0;
+	}
+	if (!match && (key->operation == KEY_OP_NOMATCH)) {
+		dbg("%s is true (non-matching value)", key_name);
+		return 0;
+	}
 	return -1;
 }
 
-static int match_rule(struct udevice *udev, struct udev_rule *rule,
-		      struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
+/* match a single rule against a given device and possibly its parent devices */
+static int match_rule(struct udevice *udev, struct udev_rule *rule)
 {
-	struct sysfs_device *parent_device = sysfs_device;
+	int i;
 
 	if (match_key("ACTION", rule, &rule->action, udev->action))
-		goto exit;
+		goto nomatch;
+
+	if (match_key("KERNEL", rule, &rule->kernel, udev->dev->kernel))
+		goto nomatch;
 
-	if (match_key("KERNEL", rule, &rule->kernel_name, udev->kernel_name))
-		goto exit;
+	if (match_key("SUBSYSTEM", rule, &rule->subsystem, udev->dev->subsystem))
+		goto nomatch;
 
-	if (match_key("SUBSYSTEM", rule, &rule->subsystem, udev->subsystem))
-		goto exit;
+	if (match_key("DEVPATH", rule, &rule->devpath, udev->dev->devpath))
+		goto nomatch;
 
-	if (match_key("DEVPATH", rule, &rule->devpath, udev->devpath))
-		goto exit;
+	if (match_key("DRIVER", rule, &rule->driver, udev->dev->driver))
+		goto nomatch;
 
-	if (rule->modalias.operation != KEY_OP_UNSET) {
-		char value[NAME_SIZE];
+	/* match NAME against a value assigned by an earlier rule */
+	if (match_key("NAME", rule, &rule->name, udev->name))
+		goto nomatch;
+
+	/* match against current list of symlinks */
+	if (rule->symlink_match.operation == KEY_OP_MATCH ||
+	    rule->symlink_match.operation == KEY_OP_NOMATCH) {
+		struct name_entry *name_loop;
+		int match = 0;
 
-		if (find_sysfs_attribute(NULL, sysfs_device, "modalias", value, sizeof(value)) != 0) {
-			dbg("MODALIAS value not found");
-			goto exit;
+		list_for_each_entry(name_loop, &udev->symlink_list, node) {
+			if (match_key("SYMLINK", rule, &rule->symlink_match, name_loop->name) == 0) {
+				match = 1;
+				break;
+			}
 		}
-		if (match_key("MODALIAS", rule, &rule->modalias, value))
-			goto exit;
+		if (!match)
+			goto nomatch;
 	}
 
-	if (rule->env.count) {
-		int i;
+	for (i = 0; i < rule->env.count; i++) {
+		struct key_pair *pair = &rule->env.keys[i];
 
-		dbg("check %i ENV keys", rule->env.count);
-		for (i = 0; i < rule->env.count; i++) {
-			struct key_pair *pair = &rule->env.keys[i];
+		/* we only check for matches, assignments will be handled later */
+		if (pair->key.operation == KEY_OP_MATCH ||
+		    pair->key.operation == KEY_OP_NOMATCH) {
 			const char *key_name = key_pair_name(rule, pair);
 			const char *value = getenv(key_name);
 
 			if (!value) {
-				dbg("ENV{'%s'} is not set", key_name);
+				dbg("ENV{'%s'} is not set, treat as empty", key_name);
 				value = "";
 			}
 			if (match_key("ENV", rule, &pair->key, value))
-				goto exit;
+				goto nomatch;
 		}
-		dbg("all %i ENV keys matched", rule->env.count);
 	}
 
-	if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
+	if (rule->test.operation == KEY_OP_MATCH ||
+	    rule->test.operation == KEY_OP_NOMATCH) {
+		char filename[PATH_SIZE];
+		char devpath[PATH_SIZE];
+		char *attr;
+		struct stat statbuf;
 		int match;
 
-		match = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
-		if (match && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH)) {
-			dbg("WAIT_FOR_SYSFS is true (matching value)");
-			return 0;
-		}
-		if (!match && (rule->wait_for_sysfs.operation == KEY_OP_NOMATCH)) {
-			dbg("WAIT_FOR_SYSFS is true, (non matching value)");
-			return 0;
-		}
-		dbg("WAIT_FOR_SYSFS is false");
-		return -1;
-	}
+		strlcpy(filename, key_val(rule, &rule->test), sizeof(filename));
+		udev_rules_apply_format(udev, filename, sizeof(filename));
 
-	/* walk up the chain of physical devices and find a match */
-	while (1) {
-		/* check for matching driver */
-		if (rule->driver.operation != KEY_OP_UNSET) {
-			if (parent_device == NULL) {
-				dbg("device has no sysfs_device");
-				goto exit;
+		if (attr_get_by_subsys_id(filename, devpath, sizeof(devpath), &attr)) {
+			strlcpy(filename, sysfs_path, sizeof(filename));
+			strlcat(filename, devpath, sizeof(filename));
+			if (attr != NULL) {
+				strlcat(filename, "/", sizeof(filename));
+				strlcat(filename, attr, sizeof(filename));
 			}
-			if (match_key("DRIVER", rule, &rule->driver, parent_device->driver_name))
-				goto try_parent;
+		} else if (filename[0] != '/') {
+			char tmp[PATH_SIZE];
+
+			strlcpy(tmp, sysfs_path, sizeof(tmp));
+			strlcat(tmp, udev->dev->devpath, sizeof(tmp));
+			strlcat(tmp, "/", sizeof(tmp));
+			strlcat(tmp, filename, sizeof(tmp));
+			strlcpy(filename, tmp, sizeof(filename));
 		}
 
-		/* check for matching bus value */
-		if (rule->bus.operation != KEY_OP_UNSET) {
-			if (parent_device == NULL) {
-				dbg("device has no sysfs_device");
-				goto exit;
-			}
-			if (match_key("BUS", rule, &rule->bus, parent_device->bus))
-				goto try_parent;
+		match = (stat(filename, &statbuf) == 0);
+		info("'%s' %s", filename, match ? "exists" : "does not exist");
+		if (match && rule->test_mode_mask > 0) {
+			match = ((statbuf.st_mode & rule->test_mode_mask) > 0);
+			info("'%s' has mode=%#o and %s %#o", filename, statbuf.st_mode,
+			     match ? "matches" : "does not match",
+			     rule->test_mode_mask);
 		}
+		if (match && rule->test.operation == KEY_OP_NOMATCH)
+			goto nomatch;
+		if (!match && rule->test.operation == KEY_OP_MATCH)
+			goto nomatch;
+		dbg("TEST key is true");
+	}
+
+	if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
+		int found;
+
+		found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 10) == 0);
+		if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH))
+			goto nomatch;
+	}
+
+	/* check for matching sysfs attribute pairs */
+	for (i = 0; i < rule->attr.count; i++) {
+		struct key_pair *pair = &rule->attr.keys[i];
 
-		/* check for matching bus id */
-		if (rule->id.operation != KEY_OP_UNSET) {
-			if (parent_device == NULL) {
-				dbg("device has no sysfs_device");
-				goto exit;
+		if (pair->key.operation == KEY_OP_MATCH ||
+		    pair->key.operation == KEY_OP_NOMATCH) {
+			const char *key_name = key_pair_name(rule, pair);
+			const char *key_value = key_val(rule, &pair->key);
+			char devpath[PATH_SIZE];
+			char *attrib;
+			const char *value = NULL;
+			char val[VALUE_SIZE];
+			size_t len;
+
+			if (attr_get_by_subsys_id(key_name, devpath, sizeof(devpath), &attrib)) {
+				if (attrib != NULL)
+					value = sysfs_attr_get_value(devpath, attrib);
+				else
+					goto nomatch;
+			}
+			if (value == NULL)
+				value = sysfs_attr_get_value(udev->dev->devpath, key_name);
+			if (value == NULL)
+				goto nomatch;
+			strlcpy(val, value, sizeof(val));
+
+			/* strip trailing whitespace of value, if not asked to match for it */
+			len = strlen(key_value);
+			if (len > 0 && !isspace(key_value[len-1])) {
+				len = strlen(val);
+				while (len > 0 && isspace(val[len-1]))
+					val[--len] = '\0';
+				dbg("removed %zi trailing whitespace chars from '%s'", strlen(val)-len, val);
 			}
-			if (match_key("ID", rule, &rule->id, parent_device->bus_id))
-				goto try_parent;
+
+			if (match_key("ATTR", rule, &pair->key, val))
+				goto nomatch;
 		}
+	}
 
-		/* check for matching sysfs pairs */
-		if (rule->sysfs.count) {
-			int i;
+	/* walk up the chain of parent devices and find a match */
+	udev->dev_parent = udev->dev;
+	while (1) {
+		/* check for matching kernel device name */
+		if (match_key("KERNELS", rule, &rule->kernels, udev->dev_parent->kernel))
+			goto try_parent;
+
+		/* check for matching subsystem value */
+		if (match_key("SUBSYSTEMS", rule, &rule->subsystems, udev->dev_parent->subsystem))
+			goto try_parent;
+
+		/* check for matching driver */
+		if (match_key("DRIVERS", rule, &rule->drivers, udev->dev_parent->driver))
+			goto try_parent;
 
-			dbg("check %i SYSFS keys", rule->sysfs.count);
-			for (i = 0; i < rule->sysfs.count; i++) {
-				struct key_pair *pair = &rule->sysfs.keys[i];
+		/* check for matching sysfs attribute pairs */
+		for (i = 0; i < rule->attrs.count; i++) {
+			struct key_pair *pair = &rule->attrs.keys[i];
+
+			if (pair->key.operation == KEY_OP_MATCH ||
+			    pair->key.operation == KEY_OP_NOMATCH) {
 				const char *key_name = key_pair_name(rule, pair);
 				const char *key_value = key_val(rule, &pair->key);
-				char value[VALUE_SIZE];
+				const char *value;
+				char val[VALUE_SIZE];
 				size_t len;
 
-				if (find_sysfs_attribute(class_dev, parent_device, key_name, value, sizeof(value)) != 0)
+				value = sysfs_attr_get_value(udev->dev_parent->devpath, key_name);
+				if (value == NULL)
+					value = sysfs_attr_get_value(udev->dev->devpath, key_name);
+				if (value == NULL)
 					goto try_parent;
+				strlcpy(val, value, sizeof(val));
 
 				/* strip trailing whitespace of value, if not asked to match for it */
 				len = strlen(key_value);
-				if (len && !isspace(key_value[len-1])) {
-					len = strlen(value);
-					while (len > 0 && isspace(value[len-1]))
-						value[--len] = '\0';
-					dbg("removed %zi trailing whitespace chars from '%s'", strlen(value)-len, value);
+				if (len > 0 && !isspace(key_value[len-1])) {
+					len = strlen(val);
+					while (len > 0 && isspace(val[len-1]))
+						val[--len] = '\0';
+					dbg("removed %zi trailing whitespace chars from '%s'", strlen(val)-len, val);
 				}
 
-				if (match_key("SYSFS", rule, &pair->key, value))
+				if (match_key("ATTRS", rule, &pair->key, val))
 					goto try_parent;
 			}
-			dbg("all %i SYSFS keys matched", rule->sysfs.count);
 		}
 
-		/* found matching physical device  */
+		/* found matching device  */
 		break;
 try_parent:
+		/* move to parent device */
 		dbg("try parent sysfs device");
-		parent_device = sysfs_get_device_parent(parent_device);
-		if (parent_device == NULL)
-			goto exit;
-		dbg("look at sysfs_device->path='%s'", parent_device->path);
-		dbg("look at sysfs_device->bus_id='%s'", parent_device->bus_id);
+		udev->dev_parent = sysfs_device_get_parent(udev->dev_parent);
+		if (udev->dev_parent == NULL)
+			goto nomatch;
+		dbg("looking at dev_parent->devpath='%s'", udev->dev_parent->devpath);
+		dbg("looking at dev_parent->kernel='%s'", udev->dev_parent->kernel);
+	}
+
+	/* execute external program */
+	if (rule->program.operation != KEY_OP_UNSET) {
+		char program[PATH_SIZE];
+		char result[PATH_SIZE];
+
+		strlcpy(program, key_val(rule, &rule->program), sizeof(program));
+		udev_rules_apply_format(udev, program, sizeof(program));
+		if (run_program(program, udev->dev->subsystem, result, sizeof(result), NULL) != 0) {
+			dbg("PROGRAM is false");
+			udev->program_result[0] = '\0';
+			if (rule->program.operation != KEY_OP_NOMATCH)
+				goto nomatch;
+		} else {
+			int count;
+
+			dbg("PROGRAM matches");
+			remove_trailing_chars(result, '\n');
+			if (rule->string_escape == ESCAPE_UNSET ||
+			    rule->string_escape == ESCAPE_REPLACE) {
+				count = replace_chars(result, ALLOWED_CHARS_INPUT);
+				if (count > 0)
+					info("%i character(s) replaced" , count);
+			}
+			dbg("result is '%s'", result);
+			strlcpy(udev->program_result, result, sizeof(udev->program_result));
+			dbg("PROGRAM returned successful");
+			if (rule->program.operation == KEY_OP_NOMATCH)
+				goto nomatch;
+		}
+		dbg("PROGRAM key is true");
 	}
 
-	/* import variables from file into environment */
+	/* check for matching result of external program */
+	if (match_key("RESULT", rule, &rule->result, udev->program_result))
+		goto nomatch;
+
+	/* import variables returned from program or or file into environment */
 	if (rule->import.operation != KEY_OP_UNSET) {
 		char import[PATH_SIZE];
 		int rc = -1;
 
 		strlcpy(import, key_val(rule, &rule->import), sizeof(import));
-		apply_format(udev, import, sizeof(import), class_dev, sysfs_device);
+		udev_rules_apply_format(udev, import, sizeof(import));
 		dbg("check for IMPORT import='%s'", import);
 		if (rule->import_type == IMPORT_PROGRAM) {
 			rc = import_program_into_env(udev, import);
 		} else if (rule->import_type == IMPORT_FILE) {
 			dbg("import file import='%s'", import);
 			rc = import_file_into_env(udev, import);
-		} else if (rule->import_type == IMPORT_PARENT && class_dev) {
+		} else if (rule->import_type == IMPORT_PARENT) {
 			dbg("import parent import='%s'", import);
-			rc = import_parent_into_env(udev, class_dev, import);
+			rc = import_parent_into_env(udev, import);
 		}
-		if (rc) {
+		if (rc != 0) {
 			dbg("IMPORT failed");
 			if (rule->import.operation != KEY_OP_NOMATCH)
-				goto exit;
+				goto nomatch;
 		} else
 			dbg("IMPORT '%s' imported", key_val(rule, &rule->import));
 		dbg("IMPORT key is true");
 	}
 
-	/* execute external program */
-	if (rule->program.operation != KEY_OP_UNSET) {
-		char program[PATH_SIZE];
-		char result[PATH_SIZE];
+	/* rule matches, if we have ENV assignments export it */
+	for (i = 0; i < rule->env.count; i++) {
+		struct key_pair *pair = &rule->env.keys[i];
 
-		strlcpy(program, key_val(rule, &rule->program), sizeof(program));
-		apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
-		if (run_program(program, udev->subsystem, result, sizeof(result), NULL, (udev_log_priority >= LOG_INFO)) != 0) {
-			dbg("PROGRAM is false");
-			udev->program_result[0] = '\0';
-			if (rule->program.operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg("PROGRAM matches");
-			remove_trailing_char(result, '\n');
-			replace_untrusted_chars(result);
-			dbg("result is '%s'", result);
-			strlcpy(udev->program_result, result, sizeof(udev->program_result));
-			dbg("PROGRAM returned successful");
-			if (rule->program.operation == KEY_OP_NOMATCH)
-				goto exit;
+		if (pair->key.operation == KEY_OP_ASSIGN) {
+			char temp_value[NAME_SIZE];
+			const char *key_name = key_pair_name(rule, pair);
+			const char *value = key_val(rule, &pair->key);
+
+			/* make sure we don't write to the same string we possibly read from */
+			strlcpy(temp_value, value, sizeof(temp_value));
+			udev_rules_apply_format(udev, temp_value, NAME_SIZE);
+
+			if (temp_value[0] == '\0') {
+				name_list_key_remove(&udev->env_list, key_name);
+				unsetenv(key_name);
+				info("unset ENV '%s'", key_name);
+			} else {
+				struct name_entry *entry;
+
+				entry = name_list_key_add(&udev->env_list, key_name, temp_value);
+				if (entry == NULL)
+					break;
+				putenv(entry->name);
+				info("set ENV '%s'", entry->name);
+			}
 		}
-		dbg("PROGRAM key is true");
 	}
 
-	/* check for matching result of external program */
-	if (match_key("RESULT", rule, &rule->result, udev->program_result))
-		goto exit;
+	/* if we have ATTR assignments, write value to sysfs file */
+	for (i = 0; i < rule->attr.count; i++) {
+		struct key_pair *pair = &rule->attr.keys[i];
 
-	/* rule matches */
+		if (pair->key.operation == KEY_OP_ASSIGN) {
+			const char *key_name = key_pair_name(rule, pair);
+			char devpath[PATH_SIZE];
+			char *attrib;
+			char attr[PATH_SIZE] = "";
+			char value[NAME_SIZE];
+			FILE *f;
+
+			if (attr_get_by_subsys_id(key_name, devpath, sizeof(devpath), &attrib)) {
+				if (attrib != NULL) {
+					strlcpy(attr, sysfs_path, sizeof(attr));
+					strlcat(attr, devpath, sizeof(attr));
+					strlcat(attr, "/", sizeof(attr));
+					strlcat(attr, attrib, sizeof(attr));
+				}
+			}
+
+			if (attr[0] == '\0') {
+				strlcpy(attr, sysfs_path, sizeof(attr));
+				strlcat(attr, udev->dev->devpath, sizeof(attr));
+				strlcat(attr, "/", sizeof(attr));
+				strlcat(attr, key_name, sizeof(attr));
+			}
+
+			strlcpy(value, key_val(rule, &pair->key), sizeof(value));
+			udev_rules_apply_format(udev, value, sizeof(value));
+			info("writing '%s' to sysfs file '%s'", value, attr);
+			f = fopen(attr, "w");
+			if (f != NULL) {
+				if (!udev->test_run)
+					if (fprintf(f, "%s", value) <= 0)
+						err("error writing ATTR{%s}: %s", attr, strerror(errno));
+				fclose(f);
+			} else
+				err("error opening ATTR{%s} for writing: %s", attr, strerror(errno));
+		}
+	}
 	return 0;
 
-exit:
+nomatch:
 	return -1;
 }
 
-int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev, struct sysfs_class_device *class_dev)
+int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 {
-	struct sysfs_class_device *class_dev_parent;
-	struct sysfs_device *sysfs_device = NULL;
 	struct udev_rule *rule;
 	int name_set = 0;
 
-	dbg("class_dev->name='%s'", class_dev->name);
-
-	/* Figure out where the "device"-symlink is at.  For char devices this will
-	 * always be in the class_dev->path.  On block devices, only the main block
-	 * device will have the device symlink in it's path. All partition devices
-	 * need to look at the symlink in its parent directory.
-	 */
-	class_dev_parent = sysfs_get_classdev_parent(class_dev);
-	if (class_dev_parent != NULL) {
-		dbg("given class device has a parent, use this instead");
-		sysfs_device = sysfs_get_classdev_device(class_dev_parent);
-	} else {
-		sysfs_device = sysfs_get_classdev_device(class_dev);
-	}
-
-	if (sysfs_device) {
-		dbg("found devices device: path='%s', bus_id='%s', bus='%s'",
-		    sysfs_device->path, sysfs_device->bus_id, sysfs_device->bus);
-		strlcpy(udev->bus_id, sysfs_device->bus_id, sizeof(udev->bus_id));
-	}
-
-	dbg("udev->kernel_name='%s'", udev->kernel_name);
+	dbg("udev->dev->devpath='%s'", udev->dev->devpath);
+	dbg("udev->dev->kernel='%s'", udev->dev->kernel);
 
 	/* look for a matching rule to apply */
 	udev_rules_iter_init(rules);
@@ -898,16 +1298,19 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev, struct s
 		if (rule == NULL)
 			break;
 
-		if (name_set && rule->name.operation != KEY_OP_UNSET) {
+		if (name_set &&
+		    (rule->name.operation == KEY_OP_ASSIGN ||
+		     rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+		     rule->name.operation == KEY_OP_ADD)) {
 			dbg("node name already set, rule ignored");
 			continue;
 		}
 
 		dbg("process rule");
-		if (match_rule(udev, rule, class_dev, sysfs_device) == 0) {
+		if (match_rule(udev, rule) == 0) {
 			/* apply options */
 			if (rule->ignore_device) {
-				info("rule applied, '%s' is ignored", udev->kernel_name);
+				info("rule applied, '%s' is ignored", udev->dev->kernel);
 				udev->ignore_device = 1;
 				return 0;
 			}
@@ -915,8 +1318,13 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev, struct s
 				udev->ignore_remove = 1;
 				dbg("remove event should be ignored");
 			}
+			if (rule->link_priority != 0) {
+				udev->link_priority = rule->link_priority;
+				info("link_priority=%i", udev->link_priority);
+			}
 			/* apply all_partitions option only at a main block device */
-			if (rule->partitions && udev->type == DEV_BLOCK && udev->kernel_number[0] == '\0') {
+			if (rule->partitions &&
+			    strcmp(udev->dev->subsystem, "block") == 0 && udev->dev->kernel_number[0] == '\0') {
 				udev->partitions = rule->partitions;
 				dbg("creation of partition nodes requested");
 			}
@@ -926,45 +1334,49 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev, struct s
 				if (rule->mode_operation == KEY_OP_ASSIGN_FINAL)
 					udev->mode_final = 1;
 				udev->mode = rule->mode;
-				dbg("applied mode=%#o to '%s'", rule->mode, udev->kernel_name);
+				dbg("applied mode=%#o to '%s'", rule->mode, udev->dev->kernel);
 			}
 			if (!udev->owner_final && rule->owner.operation != KEY_OP_UNSET) {
 				if (rule->owner.operation == KEY_OP_ASSIGN_FINAL)
 					udev->owner_final = 1;
 				strlcpy(udev->owner, key_val(rule, &rule->owner), sizeof(udev->owner));
-				apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
-				dbg("applied owner='%s' to '%s'", udev->owner, udev->kernel_name);
+				udev_rules_apply_format(udev, udev->owner, sizeof(udev->owner));
+				dbg("applied owner='%s' to '%s'", udev->owner, udev->dev->kernel);
 			}
 			if (!udev->group_final && rule->group.operation != KEY_OP_UNSET) {
 				if (rule->group.operation == KEY_OP_ASSIGN_FINAL)
 					udev->group_final = 1;
 				strlcpy(udev->group, key_val(rule, &rule->group), sizeof(udev->group));
-				apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
-				dbg("applied group='%s' to '%s'", udev->group, udev->kernel_name);
+				udev_rules_apply_format(udev, udev->group, sizeof(udev->group));
+				dbg("applied group='%s' to '%s'", udev->group, udev->dev->kernel);
 			}
 
 			/* collect symlinks */
-			if (!udev->symlink_final && rule->symlink.operation != KEY_OP_UNSET) {
+			if (!udev->symlink_final &&
+			    (rule->symlink.operation == KEY_OP_ASSIGN ||
+			     rule->symlink.operation == KEY_OP_ASSIGN_FINAL ||
+			     rule->symlink.operation == KEY_OP_ADD)) {
 				char temp[PATH_SIZE];
 				char *pos, *next;
+				int count;
 
 				if (rule->symlink.operation == KEY_OP_ASSIGN_FINAL)
 					udev->symlink_final = 1;
-				if (rule->symlink.operation == KEY_OP_ASSIGN || rule->symlink.operation == KEY_OP_ASSIGN_FINAL) {
-					struct name_entry *name_loop;
-					struct name_entry *temp_loop;
-
+				if (rule->symlink.operation == KEY_OP_ASSIGN ||
+				    rule->symlink.operation == KEY_OP_ASSIGN_FINAL) {
 					info("reset symlink list");
-					list_for_each_entry_safe(name_loop, temp_loop, &udev->symlink_list, node) {
-						list_del(&name_loop->node);
-						free(name_loop);
-					}
+					name_list_cleanup(&udev->symlink_list);
 				}
+				/* allow  multiple symlinks separated by spaces */
 				strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp));
-				apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
-				dbg("rule applied, added symlink '%s'", temp);
-
-				/* add multiple symlinks separated by spaces */
+				udev_rules_apply_format(udev, temp, sizeof(temp));
+				if (rule->string_escape == ESCAPE_UNSET ||
+				    rule->string_escape == ESCAPE_REPLACE) {
+					count = replace_chars(temp, ALLOWED_CHARS_FILE " ");
+					if (count > 0)
+						info("%i character(s) replaced" , count);
+				}
+				dbg("rule applied, added symlink(s) '%s'", temp);
 				pos = temp;
 				while (isspace(pos[0]))
 					pos++;
@@ -985,36 +1397,40 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev, struct s
 			}
 
 			/* set name, later rules with name set will be ignored */
-			if (rule->name.operation != KEY_OP_UNSET) {
+			if (rule->name.operation == KEY_OP_ASSIGN ||
+			    rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+			    rule->name.operation == KEY_OP_ADD) {
+				int count;
+
 				name_set = 1;
 				strlcpy(udev->name, key_val(rule, &rule->name), sizeof(udev->name));
-				apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+				udev_rules_apply_format(udev, udev->name, sizeof(udev->name));
+				if (rule->string_escape == ESCAPE_UNSET ||
+				    rule->string_escape == ESCAPE_REPLACE) {
+					count = replace_chars(udev->name, ALLOWED_CHARS_FILE);
+					if (count > 0)
+						info("%i character(s) replaced", count);
+				}
 
-				info("rule applied, '%s' becomes '%s'", udev->kernel_name, udev->name);
-				if (udev->type != DEV_NET)
+				info("rule applied, '%s' becomes '%s'", udev->dev->kernel, udev->name);
+				if (strcmp(udev->dev->subsystem, "net") != 0)
 					dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i",
 					    udev->name, udev->owner, udev->group, udev->mode, udev->partitions);
 			}
 
 			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
-				char program[PATH_SIZE];
+				struct name_entry *entry;
 
 				if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
 					udev->run_final = 1;
 				if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
-					struct name_entry *name_loop;
-					struct name_entry *temp_loop;
-
 					info("reset run list");
-					list_for_each_entry_safe(name_loop, temp_loop, &udev->run_list, node) {
-						list_del(&name_loop->node);
-						free(name_loop);
-					}
+					name_list_cleanup(&udev->run_list);
 				}
-				strlcpy(program, key_val(rule, &rule->run), sizeof(program));
-				apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
-				dbg("add run '%s'", program);
-				name_list_add(&udev->run_list, program, 0);
+				dbg("add run '%s'", key_val(rule, &rule->run));
+				entry = name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
+				if (rule->run_ignore_error)
+					entry->ignore_error = 1;
 			}
 
 			if (rule->last_rule) {
@@ -1030,8 +1446,8 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev, struct s
 	}
 
 	if (!name_set) {
-		strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
 		info("no node name set, will use kernel name '%s'", udev->name);
+		strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
 	}
 
 	if (udev->tmp_node[0] != '\0') {
@@ -1043,20 +1459,11 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev, struct s
 	return 0;
 }
 
-int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev,
-		       struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_dev)
+int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 {
 	struct udev_rule *rule;
 
-	if (class_dev && !sysfs_dev)
-		sysfs_dev = sysfs_get_classdev_device(class_dev);
-	if (sysfs_dev) {
-		dbg("found devices device: path='%s', bus_id='%s', bus='%s'",
-		    sysfs_dev->path, sysfs_dev->bus_id, sysfs_dev->bus);
-		strlcpy(udev->bus_id, sysfs_dev->bus_id, sizeof(udev->bus_id));
-	}
-
-	dbg("udev->kernel_name='%s'", udev->kernel_name);
+	dbg("udev->kernel='%s'", udev->dev->kernel);
 
 	/* look for a matching rule to apply */
 	udev_rules_iter_init(rules);
@@ -1066,36 +1473,41 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev,
 			break;
 
 		dbg("process rule");
-		if (rule->name.operation != KEY_OP_UNSET || rule->symlink.operation != KEY_OP_UNSET ||
-		    rule->mode_operation != KEY_OP_UNSET || rule->owner.operation != KEY_OP_UNSET || rule->group.operation != KEY_OP_UNSET) {
+		if (rule->name.operation == KEY_OP_ASSIGN ||
+		    rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+		    rule->name.operation == KEY_OP_ADD ||
+		    rule->symlink.operation == KEY_OP_ASSIGN ||
+		    rule->symlink.operation == KEY_OP_ASSIGN_FINAL ||
+		    rule->symlink.operation == KEY_OP_ADD ||
+		    rule->mode_operation != KEY_OP_UNSET ||
+		    rule->owner.operation != KEY_OP_UNSET || rule->group.operation != KEY_OP_UNSET) {
 			dbg("skip rule that names a device");
 			continue;
 		}
 
-		if (match_rule(udev, rule, class_dev, sysfs_dev) == 0) {
+		if (match_rule(udev, rule) == 0) {
 			if (rule->ignore_device) {
-				info("rule applied, '%s' is ignored", udev->kernel_name);
+				info("rule applied, '%s' is ignored", udev->dev->kernel);
 				udev->ignore_device = 1;
 				return 0;
 			}
+			if (rule->ignore_remove) {
+				udev->ignore_remove = 1;
+				dbg("remove event should be ignored");
+			}
 
 			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
-				char program[PATH_SIZE];
-
-				if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
-					struct name_entry *name_loop;
-					struct name_entry *temp_loop;
+				struct name_entry *entry;
 
+				if (rule->run.operation == KEY_OP_ASSIGN ||
+				    rule->run.operation == KEY_OP_ASSIGN_FINAL) {
 					info("reset run list");
-					list_for_each_entry_safe(name_loop, temp_loop, &udev->run_list, node) {
-						list_del(&name_loop->node);
-						free(name_loop);
-					}
+					name_list_cleanup(&udev->run_list);
 				}
-				strlcpy(program, key_val(rule, &rule->run), sizeof(program));
-				apply_format(udev, program, sizeof(program), class_dev, sysfs_dev);
-				dbg("add run '%s'", program);
-				name_list_add(&udev->run_list, program, 0);
+				dbg("add run '%s'", key_val(rule, &rule->run));
+				entry = name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
+				if (rule->run_ignore_error)
+					entry->ignore_error = 1;
 				if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
 					break;
 			}