X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev_rules.c;h=dfcd87539c569f552e66e118b94d959b636bddfe;hp=3b9631b883c67e98b07676dc3575f54d42dae2b8;hb=fc233a874bc93ac82bed7eda1d6967d6281a6fe2;hpb=9d7e1b3fdd3c2bd064f33a29ea5241fdefb718ee

diff --git a/udev/udev_rules.c b/udev/udev_rules.c
index 3b9631b88..dfcd87539 100644
--- a/udev/udev_rules.c
+++ b/udev/udev_rules.c
@@ -1,20 +1,19 @@
 /*
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2008 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 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, either version 2 of the License, or
+ * (at your option) any later version.
  *
- *	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.,
- *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 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, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stddef.h>
@@ -35,7 +34,6 @@
 
 #include "udev.h"
 #include "udev_rules.h"
-#include "udev_selinux.h"
 
 extern char **environ;
 
@@ -118,22 +116,24 @@ out:
 	return 0;
 }
 
-static int run_program(struct udev *udev, const char *command, const char *subsystem,
+static int run_program(struct udev_device *dev, const char *command,
 		       char *result, size_t ressize, size_t *reslen)
 {
+	struct udev *udev = udev_device_get_udev(dev);
 	int status;
+	char **envp;
 	int outpipe[2] = {-1, -1};
 	int errpipe[2] = {-1, -1};
 	pid_t pid;
-	char arg[PATH_SIZE];
-	char program[PATH_SIZE];
+	char arg[UTIL_PATH_SIZE];
+	char program[UTIL_PATH_SIZE];
 	char *argv[(sizeof(arg) / 2) + 1];
 	int devnull;
 	int i;
-	int retval = 0;
+	int err = 0;
 
-	/* build argv from comand */
-	strlcpy(arg, command, sizeof(arg));
+	/* build argv from command */
+	util_strlcpy(arg, command, sizeof(arg));
 	i = 0;
 	if (strchr(arg, ' ') != NULL) {
 		char *pos = arg;
@@ -161,24 +161,26 @@ static int run_program(struct udev *udev, const char *command, const char *subsy
 	/* prepare pipes from child to parent */
 	if (result != NULL || udev_get_log_priority(udev) >= LOG_INFO) {
 		if (pipe(outpipe) != 0) {
-			err(udev, "pipe failed: %s\n", strerror(errno));
+			err(udev, "pipe failed: %m\n");
 			return -1;
 		}
 	}
 	if (udev_get_log_priority(udev) >= LOG_INFO) {
 		if (pipe(errpipe) != 0) {
-			err(udev, "pipe failed: %s\n", strerror(errno));
+			err(udev, "pipe failed: %m\n");
 			return -1;
 		}
 	}
 
-	/* allow programs in /lib/udev called without the path */
+	/* allow programs in /lib/udev/ to be called without the path */
 	if (strchr(argv[0], '/') == NULL) {
-		strlcpy(program, UDEV_PREFIX "/lib/udev/", sizeof(program));
-		strlcat(program, argv[0], sizeof(program));
+		util_strlcpy(program, UDEV_PREFIX "/lib/udev/", sizeof(program));
+		util_strlcat(program, argv[0], sizeof(program));
 		argv[0] = program;
 	}
 
+	envp = udev_device_get_properties_envp(dev);
+
 	pid = fork();
 	switch(pid) {
 	case 0:
@@ -198,7 +200,7 @@ static int run_program(struct udev *udev, const char *command, const char *subsy
 				dup2(devnull, STDERR_FILENO);
 			close(devnull);
 		} else
-			err(udev, "open /dev/null failed: %s\n", strerror(errno));
+			err(udev, "open /dev/null failed: %m\n");
 		if (outpipe[WRITE_END] > 0) {
 			dup2(outpipe[WRITE_END], STDOUT_FILENO);
 			close(outpipe[WRITE_END]);
@@ -207,7 +209,7 @@ static int run_program(struct udev *udev, const char *command, const char *subsy
 			dup2(errpipe[WRITE_END], STDERR_FILENO);
 			close(errpipe[WRITE_END]);
 		}
-		execv(argv[0], argv);
+		execve(argv[0], argv, envp);
 		if (errno == ENOENT || errno == ENOTDIR) {
 			/* may be on a filesytem which is not mounted right now */
 			info(udev, "program '%s' not found\n", argv[0]);
@@ -217,7 +219,7 @@ static int run_program(struct udev *udev, const char *command, const char *subsy
 		}
 		_exit(1);
 	case -1:
-		err(udev, "fork of '%s' failed: %s\n", argv[0], strerror(errno));
+		err(udev, "fork of '%s' failed: %m\n", argv[0]);
 		return -1;
 	default:
 		/* read from child if requested */
@@ -245,7 +247,7 @@ static int run_program(struct udev *udev, const char *command, const char *subsy
 				if (fdcount < 0) {
 					if (errno == EINTR)
 						continue;
-					retval = -1;
+					err = -1;
 					break;
 				}
 
@@ -260,8 +262,8 @@ static int run_program(struct udev *udev, const char *command, const char *subsy
 						close(outpipe[READ_END]);
 						outpipe[READ_END] = -1;
 						if (count < 0) {
-							err(udev, "stdin read failed: %s\n", strerror(errno));
-							retval = -1;
+							err(udev, "stdin read failed: %m\n");
+							err = -1;
 						}
 						continue;
 					}
@@ -274,7 +276,7 @@ static int run_program(struct udev *udev, const char *command, const char *subsy
 							respos += count;
 						} else {
 							err(udev, "ressize %ld too short\n", (long)ressize);
-							retval = -1;
+							err = -1;
 						}
 					}
 					pos = inbuf;
@@ -294,7 +296,7 @@ static int run_program(struct udev *udev, const char *command, const char *subsy
 						close(errpipe[READ_END]);
 						errpipe[READ_END] = -1;
 						if (count < 0)
-							err(udev, "stderr read failed: %s\n", strerror(errno));
+							err(udev, "stderr read failed: %m\n");
 						continue;
 					}
 					errbuf[count] = '\0';
@@ -321,19 +323,20 @@ static int run_program(struct udev *udev, const char *command, const char *subsy
 		if (WIFEXITED(status)) {
 			info(udev, "'%s' returned with status %i\n", argv[0], WEXITSTATUS(status));
 			if (WEXITSTATUS(status) != 0)
-				retval = -1;
+				err = -1;
 		} else {
 			err(udev, "'%s' abnormal exit\n", argv[0]);
-			retval = -1;
+			err = -1;
 		}
 	}
 
-	return retval;
+	return err;
 }
 
-static int import_keys_into_env(struct udevice *udevice, const char *buf, size_t bufsize)
+static int import_keys_into_env(struct udev_event *event, const char *buf, size_t bufsize)
 {
-	char line[LINE_SIZE];
+	struct udev_device *dev = event->dev;
+	char line[UTIL_LINE_SIZE];
 	const char *bufline;
 	char *linepos;
 	char *variable;
@@ -360,11 +363,11 @@ static int import_keys_into_env(struct udevice *udevice, const char *buf, size_t
 			continue;
 
 		/* see if this is a comment */
-		if (bufline[0] == COMMENT_CHARACTER)
+		if (bufline[0] == '#')
 			continue;
 
 		if (count >= sizeof(line)) {
-			err(udevice->udev, "line too long, skipped\n");
+			err(event->udev, "line too long, skipped\n");
 			continue;
 		}
 
@@ -373,236 +376,176 @@ static int import_keys_into_env(struct udevice *udevice, const char *buf, size_t
 
 		linepos = line;
 		if (get_key(&linepos, &variable, &value) == 0) {
-			dbg(udevice->udev, "import '%s=%s'\n", variable, value);
+			char syspath[UTIL_PATH_SIZE];
 
+			dbg(event->udev, "import '%s=%s'\n", variable, value);
 			/* handle device, renamed by external tool, returning new path */
 			if (strcmp(variable, "DEVPATH") == 0) {
-				info(udevice->udev, "updating devpath from '%s' to '%s'\n", udevice->dev->devpath, value);
-				sysfs_device_set_values(udevice->udev, udevice->dev, value, NULL, NULL);
-			} else
-				name_list_key_add(udevice->udev, &udevice->env_list, variable, value);
-			setenv(variable, value, 1);
+				info(event->udev, "updating devpath from '%s' to '%s'\n",
+				     udev_device_get_devpath(dev), value);
+				util_strlcpy(syspath, udev_get_sys_path(event->udev), sizeof(syspath));
+				util_strlcat(syspath, value, sizeof(syspath));
+				udev_device_set_syspath(dev, syspath);
+			} else {
+				struct udev_list_entry *entry;
+
+				entry = udev_device_add_property(dev, variable, value);
+				/* store in db */
+				udev_list_entry_set_flag(entry, 1);
+			}
 		}
 	}
-
 	return 0;
 }
 
-static int import_file_into_env(struct udevice *udevice, const char *filename)
+static int import_file_into_env(struct udev_event *event, const char *filename)
 {
 	char *buf;
 	size_t bufsize;
 
 	if (file_map(filename, &buf, &bufsize) != 0) {
-		err(udevice->udev, "can't open '%s': %s\n", filename, strerror(errno));
+		err(event->udev, "can't open '%s': %m\n", filename);
 		return -1;
 	}
-	import_keys_into_env(udevice, buf, bufsize);
+	import_keys_into_env(event, buf, bufsize);
 	file_unmap(buf, bufsize);
 
 	return 0;
 }
 
-static int import_program_into_env(struct udevice *udevice, const char *program)
+static int import_program_into_env(struct udev_event *event, const char *program)
 {
 	char result[2048];
 	size_t reslen;
 
-	if (run_program(udevice->udev, program, udevice->dev->subsystem, result, sizeof(result), &reslen) != 0)
+	if (run_program(event->dev, program, result, sizeof(result), &reslen) != 0)
 		return -1;
-	return import_keys_into_env(udevice, result, reslen);
+	return import_keys_into_env(event, result, reslen);
 }
 
-static int import_parent_into_env(struct udevice *udevice, const char *filter)
+static int import_parent_into_env(struct udev_event *event, const char *filter)
 {
-	struct sysfs_device *dev_parent;
-	int rc = -1;
-
-	dev_parent = sysfs_device_get_parent(udevice->udev, udevice->dev);
-	if (dev_parent != NULL) {
-		struct udevice *udev_parent;
-		struct name_entry *name_loop;
+	struct udev_device *dev_parent;
+	struct udev_list_entry *list_entry;
 
-		dbg(udevice->udev, "found parent '%s', get the node name\n", dev_parent->devpath);
-		udev_parent = udev_device_init(udevice->udev);
-		if (udev_parent == NULL)
-			return -1;
-		/* import the udev_db of the parent */
-		if (udev_db_get_device(udev_parent, dev_parent->devpath) == 0) {
-			dbg(udevice->udev, "import stored parent env '%s'\n", udev_parent->name);
-			list_for_each_entry(name_loop, &udev_parent->env_list, node) {
-				char name[NAME_SIZE];
-				char *pos;
-
-				strlcpy(name, name_loop->name, sizeof(name));
-				pos = strchr(name, '=');
-				if (pos) {
-					pos[0] = '\0';
-					pos++;
-					if (fnmatch(filter, name, 0) == 0) {
-						dbg(udevice->udev, "import key '%s'\n", name_loop->name);
-						name_list_add(udevice->udev, &udevice->env_list, name_loop->name, 0);
-						setenv(name, pos, 1);
-					} else
-						dbg(udevice->udev, "skip key '%s'\n", name_loop->name);
-				}
-			}
-			rc = 0;
-		} else
-			dbg(udevice->udev, "parent not found in database\n");
-		udev_device_cleanup(udev_parent);
-	}
+	dev_parent = udev_device_get_parent(event->dev);
+	if (dev_parent == NULL)
+		return -1;
 
-	return rc;
-}
+	dbg(event->udev, "found parent '%s', get the node name\n", udev_device_get_syspath(dev_parent));
+	udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(dev_parent)) {
+		const char *key = udev_list_entry_get_name(list_entry);
+		const char *val = udev_list_entry_get_value(list_entry);
 
-static int pass_env_to_socket(struct udev *udev, const char *sockpath, const char *devpath, const char *action)
-{
-	int sock;
-	struct sockaddr_un saddr;
-	socklen_t saddrlen;
-	struct stat stats;
-	char buf[2048];
-	size_t bufpos = 0;
-	int i;
-	ssize_t count;
-	int retval = 0;
-
-	dbg(udev, "pass environment to socket '%s'\n", sockpath);
-	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
-	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
-	saddr.sun_family = AF_LOCAL;
-	if (sockpath[0] == '@') {
-		/* abstract namespace socket requested */
-		strlcpy(&saddr.sun_path[1], &sockpath[1], sizeof(saddr.sun_path)-1);
-		saddrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]);
-	} else if (stat(sockpath, &stats) == 0 && S_ISSOCK(stats.st_mode)) {
-		/* existing socket file */
-		strlcpy(saddr.sun_path, sockpath, sizeof(saddr.sun_path));
-		saddrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path);
-	} else {
-		/* no socket file, assume abstract namespace socket */
-		strlcpy(&saddr.sun_path[1], sockpath, sizeof(saddr.sun_path)-1);
-		saddrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]);
-	}
+		if (fnmatch(filter, key, 0) == 0) {
+			struct udev_list_entry *entry;
 
-	bufpos = snprintf(buf, sizeof(buf), "%s@%s", action, devpath);
-	bufpos++;
-	for (i = 0; environ[i] != NULL && bufpos < (sizeof(buf)); i++) {
-		bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos);
-		bufpos++;
+			dbg(event->udev, "import key '%s=%s'\n", key, val);
+			entry = udev_device_add_property(event->dev, key, val);
+			/* store in db */
+			udev_list_entry_set_flag(entry, 1);
+		}
 	}
-	if (bufpos > sizeof(buf))
-		bufpos = sizeof(buf);
-
-	count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, saddrlen);
-	if (count < 0)
-		retval = -1;
-	info(udev, "passed %zi bytes to socket '%s', \n", count, sockpath);
-
-	close(sock);
-	return retval;
+	return 0;
 }
 
-int udev_rules_run(struct udevice *udevice)
+int udev_rules_run(struct udev_event *event)
 {
-	struct name_entry *name_loop;
-	int retval = 0;
+	struct udev_list_entry *list_entry;
+	int err = 0;
 
-	dbg(udevice->udev, "executing run list\n");
-	list_for_each_entry(name_loop, &udevice->run_list, node) {
-		if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0) {
-			pass_env_to_socket(udevice->udev, &name_loop->name[strlen("socket:")], udevice->dev->devpath, udevice->action);
+	dbg(event->udev, "executing run list\n");
+	udev_list_entry_foreach(list_entry, udev_list_get_entry(&event->run_list)) {
+		const char *cmd = udev_list_entry_get_name(list_entry);
+
+		if (strncmp(cmd, "socket:", strlen("socket:")) == 0) {
+			struct udev_monitor *monitor;
+
+			monitor = udev_monitor_new_from_socket(event->udev, &cmd[strlen("socket:")]);
+			if (monitor == NULL)
+				continue;
+			udev_monitor_send_device(monitor, event->dev);
+			udev_monitor_unref(monitor);
 		} else {
-			char program[PATH_SIZE];
+			char program[UTIL_PATH_SIZE];
 
-			strlcpy(program, name_loop->name, sizeof(program));
-			udev_rules_apply_format(udevice, program, sizeof(program));
-			if (run_program(udevice->udev, program, udevice->dev->subsystem, NULL, 0, NULL) != 0)
-				if (!name_loop->ignore_error)
-					retval = -1;
+			util_strlcpy(program, cmd, sizeof(program));
+			udev_rules_apply_format(event, program, sizeof(program));
+			if (run_program(event->dev, program, NULL, 0, NULL) != 0) {
+				if (!udev_list_entry_get_flag(list_entry))
+					err = -1;
+			}
 		}
 	}
-
-	return retval;
+	return err;
 }
 
 #define WAIT_LOOP_PER_SECOND		50
-static int wait_for_file(struct udevice *udevice, const char *file, int timeout)
+static int wait_for_file(struct udev_event *event, const char *file, int timeout)
 {
-	char filepath[PATH_SIZE];
-	char devicepath[PATH_SIZE] = "";
+	char filepath[UTIL_PATH_SIZE];
+	char devicepath[UTIL_PATH_SIZE] = "";
 	struct stat stats;
 	int loop = timeout * WAIT_LOOP_PER_SECOND;
 
 	/* a relative path is a device attribute */
 	if (file[0] != '/') {
-		strlcpy(devicepath, udev_get_sys_path(udevice->udev), sizeof(devicepath));
-		strlcat(devicepath, udevice->dev->devpath, sizeof(devicepath));
+		util_strlcpy(devicepath, udev_get_sys_path(event->udev), sizeof(devicepath));
+		util_strlcat(devicepath, udev_device_get_devpath(event->dev), sizeof(devicepath));
 
-		strlcpy(filepath, devicepath, sizeof(filepath));
-		strlcat(filepath, "/", sizeof(filepath));
-		strlcat(filepath, file, sizeof(filepath));
+		util_strlcpy(filepath, devicepath, sizeof(filepath));
+		util_strlcat(filepath, "/", sizeof(filepath));
+		util_strlcat(filepath, file, sizeof(filepath));
 		file = filepath;
 	}
 
-	dbg(udevice->udev, "will wait %i sec for '%s'\n", timeout, file);
+	dbg(event->udev, "will wait %i sec for '%s'\n", timeout, file);
 	while (--loop) {
 		/* lookup file */
 		if (stat(file, &stats) == 0) {
-			info(udevice->udev, "file '%s' appeared after %i loops\n", file, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
+			info(event->udev, "file '%s' appeared after %i loops\n", file, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
 			return 0;
 		}
 		/* make sure, the device did not disappear in the meantime */
 		if (devicepath[0] != '\0' && stat(devicepath, &stats) != 0) {
-			info(udevice->udev, "device disappeared while waiting for '%s'\n", file);
+			info(event->udev, "device disappeared while waiting for '%s'\n", file);
 			return -2;
 		}
-		info(udevice->udev, "wait for '%s' for %i mseconds\n", file, 1000 / WAIT_LOOP_PER_SECOND);
+		info(event->udev, "wait for '%s' for %i mseconds\n", file, 1000 / WAIT_LOOP_PER_SECOND);
 		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
 	}
-	info(udevice->udev, "waiting for '%s' failed\n", file);
+	info(event->udev, "waiting for '%s' failed\n", file);
 	return -1;
 }
 
 /* handle "[$SUBSYSTEM/$KERNEL]<attribute>" lookup */
-static int attr_get_by_subsys_id(struct udev *udev, const char *attrstr, char *devpath, size_t len, char **attr)
+static int split_subsys_sysname(struct udev *udev, char *attrstr, char **subsys, char **sysname, char **attr)
 {
-	char subsys[NAME_SIZE];
 	char *pos;
-	char *id;
-	char *attrib;
-	int found = 0;
 
 	if (attrstr[0] != '[')
-		goto out;
+		return -1;
 
-	attrib = strchr(&attrstr[1], ']');
-	if (attrib == NULL)
-		goto out;
-	attrib = &attrib[1];
+	*subsys = &attrstr[1];
+	pos = strchr(*subsys, ']');
+	if (pos == NULL)
+		return -1;
+	pos[0] = '\0';
+	pos = &pos[1];
+
+	if (pos[0] == '/')
+		pos = &pos[1];
+	if (pos[0] != '\0')
+		*attr = pos;
+	else
+		*attr = NULL;
 
-	strlcpy(subsys, &attrstr[1], sizeof(subsys));
-	pos = strchr(subsys, ']');
+	pos = strchr(*subsys, '/');
 	if (pos == NULL)
-		goto out;
+		return -1;
 	pos[0] = '\0';
-	id = strchr(subsys, '/');
-	if (id == NULL)
-		goto out;
-	id[0] = '\0';
-	id = &id[1];
-	if (sysfs_lookup_devpath_by_subsys_id(udev, devpath, len, subsys, id)) {
-		if (attr != NULL) {
-			if (attrib[0] != '\0')
-				*attr = attrib;
-			else
-				*attr = NULL;
-		}
-		found = 1;
-	}
-out:
-	return found;
+	*sysname = &pos[1];
+	return 0;
 }
 
 static int attr_subst_subdir(char *attr, size_t len)
@@ -612,11 +555,11 @@ static int attr_subst_subdir(char *attr, size_t len)
 
 	pos = strstr(attr, "/*/");
 	if (pos != NULL) {
-		char str[PATH_SIZE];
+		char str[UTIL_PATH_SIZE];
 		DIR *dir;
 
 		pos[1] = '\0';
-		strlcpy(str, &pos[2], sizeof(str));
+		util_strlcpy(str, &pos[2], sizeof(str));
 		dir = opendir(attr);
 		if (dir != NULL) {
 			struct dirent *dent;
@@ -626,8 +569,8 @@ static int attr_subst_subdir(char *attr, size_t len)
 
 				if (dent->d_name[0] == '.')
 					continue;
-				strlcat(attr, dent->d_name, len);
-				strlcat(attr, str, len);
+				util_strlcat(attr, dent->d_name, len);
+				util_strlcat(attr, str, len);
 				if (stat(attr, &stats) == 0) {
 					found = 1;
 					break;
@@ -637,17 +580,18 @@ static int attr_subst_subdir(char *attr, size_t len)
 			closedir(dir);
 		}
 		if (!found)
-			strlcat(attr, str, len);
+			util_strlcat(attr, str, len);
 	}
 
 	return found;
 }
 
-void udev_rules_apply_format(struct udevice *udevice, char *string, size_t maxsize)
+void udev_rules_apply_format(struct udev_event *event, char *string, size_t maxsize)
 {
-	char temp[PATH_SIZE];
-	char temp2[PATH_SIZE];
-	char *head, *tail, *pos, *cpos, *attr, *rest;
+	struct udev_device *dev = event->dev;
+	char temp[UTIL_PATH_SIZE];
+	char temp2[UTIL_PATH_SIZE];
+	char *head, *tail, *cpos, *attr, *rest;
 	int len;
 	int i;
 	int count;
@@ -706,8 +650,8 @@ void udev_rules_apply_format(struct udevice *udevice, char *string, size_t maxsi
 				if (head[1] == '\0')
 					break;
 				if (head[1] == '$') {
-					strlcpy(temp, head+2, sizeof(temp));
-					strlcpy(head+1, temp, maxsize);
+					util_strlcpy(temp, head+2, sizeof(temp));
+					util_strlcpy(head+1, temp, maxsize);
 					head++;
 					continue;
 				}
@@ -716,89 +660,95 @@ void udev_rules_apply_format(struct udevice *udevice, char *string, size_t maxsi
 					if (strncasecmp(&head[1], subst->name, strlen(subst->name)) == 0) {
 						type = subst->type;
 						tail = head + strlen(subst->name)+1;
-						dbg(udevice->udev, "will substitute format name '%s'\n", subst->name);
+						dbg(event->udev, "will substitute format name '%s'\n", subst->name);
 						goto found;
 					}
 				}
 				head[0] = '$';
-				err(udevice->udev, "unknown format variable '%s'\n", head);
+				err(event->udev, "unknown format variable '%s'\n", head);
 			} else if (head[0] == '%') {
 				/* substitute format char */
 				if (head[1] == '\0')
 					break;
 				if (head[1] == '%') {
-					strlcpy(temp, head+2, sizeof(temp));
-					strlcpy(head+1, temp, maxsize);
+					util_strlcpy(temp, head+2, sizeof(temp));
+					util_strlcpy(head+1, temp, maxsize);
 					head++;
 					continue;
 				}
 				head[0] = '\0';
 				tail = head+1;
-				len = get_format_len(udevice->udev, &tail);
+				len = get_format_len(event->udev, &tail);
 				for (subst = map; subst->name; subst++) {
 					if (tail[0] == subst->fmt) {
 						type = subst->type;
 						tail++;
-						dbg(udevice->udev, "will substitute format char '%c'\n", subst->fmt);
+						dbg(event->udev, "will substitute format char '%c'\n", subst->fmt);
 						goto found;
 					}
 				}
 				head[0] = '%';
-				err(udevice->udev, "unknown format char '%c'\n", tail[0]);
+				err(event->udev, "unknown format char '%c'\n", tail[0]);
 			}
 			head++;
 		}
 		break;
 found:
-		attr = get_format_attribute(udevice->udev, &tail);
-		strlcpy(temp, tail, sizeof(temp));
-		dbg(udevice->udev, "format=%i, string='%s', tail='%s'\n", type ,string, tail);
+		attr = get_format_attribute(event->udev, &tail);
+		util_strlcpy(temp, tail, sizeof(temp));
+		dbg(event->udev, "format=%i, string='%s', tail='%s'\n", type ,string, tail);
 
 		switch (type) {
 		case SUBST_DEVPATH:
-			strlcat(string, udevice->dev->devpath, maxsize);
-			dbg(udevice->udev, "substitute devpath '%s'\n", udevice->dev->devpath);
+			util_strlcat(string, udev_device_get_devpath(dev), maxsize);
+			dbg(event->udev, "substitute devpath '%s'\n", udev_device_get_devpath(dev));
 			break;
 		case SUBST_KERNEL:
-			strlcat(string, udevice->dev->kernel, maxsize);
-			dbg(udevice->udev, "substitute kernel name '%s'\n", udevice->dev->kernel);
+			util_strlcat(string, udev_device_get_sysname(dev), maxsize);
+			dbg(event->udev, "substitute kernel name '%s'\n", udev_device_get_sysname(dev));
 			break;
 		case SUBST_KERNEL_NUMBER:
-			strlcat(string, udevice->dev->kernel_number, maxsize);
-			dbg(udevice->udev, "substitute kernel number '%s'\n", udevice->dev->kernel_number);
+			if (udev_device_get_sysnum(dev) == NULL)
+				break;
+			util_strlcat(string, udev_device_get_sysnum(dev), maxsize);
+			dbg(event->udev, "substitute kernel number '%s'\n", udev_device_get_sysnum(dev));
 			break;
 		case SUBST_ID:
-			if (udevice->dev_parent != NULL) {
-				strlcat(string, udevice->dev_parent->kernel, maxsize);
-				dbg(udevice->udev, "substitute id '%s'\n", udevice->dev_parent->kernel);
+			if (event->dev_parent != NULL) {
+				util_strlcat(string, udev_device_get_sysname(event->dev_parent), maxsize);
+				dbg(event->udev, "substitute id '%s'\n", udev_device_get_sysname(event->dev_parent));
 			}
 			break;
 		case SUBST_DRIVER:
-			if (udevice->dev_parent != NULL) {
-				strlcat(string, udevice->dev_parent->driver, maxsize);
-				dbg(udevice->udev, "substitute driver '%s'\n", udevice->dev_parent->driver);
+			if (event->dev_parent != NULL) {
+				const char *driver = udev_device_get_driver(event->dev_parent);
+
+				if (driver == NULL)
+					break;
+				util_strlcat(string, driver, maxsize);
+				dbg(event->udev, "substitute driver '%s'\n", driver);
 			}
 			break;
 		case SUBST_MAJOR:
-			sprintf(temp2, "%d", major(udevice->devt));
-			strlcat(string, temp2, maxsize);
-			dbg(udevice->udev, "substitute major number '%s'\n", temp2);
+			sprintf(temp2, "%d", major(udev_device_get_devnum(dev)));
+			util_strlcat(string, temp2, maxsize);
+			dbg(event->udev, "substitute major number '%s'\n", temp2);
 			break;
 		case SUBST_MINOR:
-			sprintf(temp2, "%d", minor(udevice->devt));
-			strlcat(string, temp2, maxsize);
-			dbg(udevice->udev, "substitute minor number '%s'\n", temp2);
+			sprintf(temp2, "%d", minor(udev_device_get_devnum(dev)));
+			util_strlcat(string, temp2, maxsize);
+			dbg(event->udev, "substitute minor number '%s'\n", temp2);
 			break;
 		case SUBST_RESULT:
-			if (udevice->program_result[0] == '\0')
+			if (event->program_result[0] == '\0')
 				break;
 			/* get part part of the result string */
 			i = 0;
 			if (attr != NULL)
 				i = strtoul(attr, &rest, 10);
 			if (i > 0) {
-				dbg(udevice->udev, "request part #%d of result string\n", i);
-				cpos = udevice->program_result;
+				dbg(event->udev, "request part #%d of result string\n", i);
+				cpos = event->program_result;
 				while (--i) {
 					while (cpos[0] != '\0' && !isspace(cpos[0]))
 						cpos++;
@@ -806,158 +756,172 @@ found:
 						cpos++;
 				}
 				if (i > 0) {
-					err(udevice->udev, "requested part of result string not found\n");
+					err(event->udev, "requested part of result string not found\n");
 					break;
 				}
-				strlcpy(temp2, cpos, sizeof(temp2));
+				util_strlcpy(temp2, cpos, sizeof(temp2));
 				/* %{2+}c copies the whole string from the second part on */
 				if (rest[0] != '+') {
 					cpos = strchr(temp2, ' ');
 					if (cpos)
 						cpos[0] = '\0';
 				}
-				strlcat(string, temp2, maxsize);
-				dbg(udevice->udev, "substitute part of result string '%s'\n", temp2);
+				util_strlcat(string, temp2, maxsize);
+				dbg(event->udev, "substitute part of result string '%s'\n", temp2);
 			} else {
-				strlcat(string, udevice->program_result, maxsize);
-				dbg(udevice->udev, "substitute result string '%s'\n", udevice->program_result);
+				util_strlcat(string, event->program_result, maxsize);
+				dbg(event->udev, "substitute result string '%s'\n", event->program_result);
 			}
 			break;
 		case SUBST_ATTR:
 			if (attr == NULL)
-				err(udevice->udev, "missing file parameter for attr\n");
+				err(event->udev, "missing file parameter for attr\n");
 			else {
-				char devpath[PATH_SIZE];
+				char *subsys;
+				char *sysname;
 				char *attrib;
-				const char *value = NULL;
+				char value[UTIL_NAME_SIZE] = "";
 				size_t size;
 
-				if (attr_get_by_subsys_id(udevice->udev, attr, devpath, sizeof(devpath), &attrib)) {
-					if (attrib != NULL)
-						value = sysfs_attr_get_value(udevice->udev, devpath, attrib);
-					else
+				if (split_subsys_sysname(event->udev, attr, &subsys, &sysname, &attrib) == 0) {
+					struct udev_device *d;
+					const char *val;
+
+					if (attrib == NULL)
+						break;
+					d = udev_device_new_from_subsystem_sysname(event->udev, subsys, sysname);
+					if (d == NULL)
 						break;
+					val = udev_device_get_attr_value(d, attrib);
+					if (val != NULL)
+						util_strlcpy(value, val, sizeof(value));
+					udev_device_unref(d);
 				}
 
 				/* try the current device, other matches may have selected */
-				if (value == NULL && udevice->dev_parent != NULL && udevice->dev_parent != udevice->dev)
-					value = sysfs_attr_get_value(udevice->udev, udevice->dev_parent->devpath, attr);
+				if (value[0]=='\0' && event->dev_parent != NULL && event->dev_parent != event->dev) {
+					const char *val;
+
+					val = udev_device_get_attr_value(event->dev_parent, attr);
+					if (val != NULL)
+						util_strlcpy(value, val, sizeof(value));
+				}
 
 				/* look at all devices along the chain of parents */
-				if (value == NULL) {
-					struct sysfs_device *dev_parent = udevice->dev;
+				if (value[0]=='\0') {
+					struct udev_device *dev_parent = dev;
+					const char *val;
 
 					do {
-						dbg(udevice->udev, "looking at '%s'\n", dev_parent->devpath);
-						value = sysfs_attr_get_value(udevice->udev, dev_parent->devpath, attr);
-						if (value != NULL)
+						dbg(event->udev, "looking at '%s'\n", udev_device_get_syspath(dev_parent));
+						val = udev_device_get_attr_value(dev_parent, attr);
+						if (val != NULL) {
+							util_strlcpy(value, val, sizeof(value));
 							break;
-						dev_parent = sysfs_device_get_parent(udevice->udev, dev_parent);
+						}
+						dev_parent = udev_device_get_parent(dev_parent);
 					} while (dev_parent != NULL);
 				}
 
-				if (value == NULL)
+				if (value[0]=='\0')
 					break;
 
 				/* 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);
+				size = strlen(value);
+				while (size > 0 && isspace(value[--size]))
+					value[size] = '\0';
+				count = util_replace_chars(value, ALLOWED_CHARS_INPUT);
 				if (count > 0)
-					info(udevice->udev, "%i character(s) replaced\n" , count);
-				strlcat(string, temp2, maxsize);
-				dbg(udevice->udev, "substitute sysfs value '%s'\n", temp2);
+					info(event->udev, "%i character(s) replaced\n" , count);
+				util_strlcat(string, value, maxsize);
+				dbg(event->udev, "substitute sysfs value '%s'\n", value);
 			}
 			break;
 		case SUBST_PARENT:
 			{
-				struct sysfs_device *dev_parent;
-
-				dev_parent = sysfs_device_get_parent(udevice->udev, udevice->dev);
-				if (dev_parent != NULL) {
-					struct udevice *udev_parent;
-
-					dbg(udevice->udev, "found parent '%s', get the node name\n", dev_parent->devpath);
-					udev_parent = udev_device_init(udevice->udev);
-					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(udevice->udev, "substitute parent node name'%s'\n", udev_parent->name);
-						} else
-							dbg(udevice->udev, "parent not found in database\n");
-						udev_device_cleanup(udev_parent);
-					}
+				struct udev_device *dev_parent;
+				const char *devnode;
+
+				dev_parent = udev_device_get_parent(event->dev);
+				if (dev_parent == NULL)
+					break;
+				devnode = udev_device_get_devnode(dev_parent);
+				if (devnode != NULL) {
+					size_t devlen = strlen(udev_get_dev_path(event->udev))+1;
+
+					util_strlcat(string, &devnode[devlen], maxsize);
+					dbg(event->udev, "found parent '%s', got node name '%s'\n",
+					    udev_device_get_syspath(dev_parent), &devnode[devlen]);
 				}
 			}
 			break;
 		case SUBST_TEMP_NODE:
-			if (udevice->tmp_node[0] == '\0' && major(udevice->devt) > 0) {
-				dbg(udevice->udev, "create temporary device node for callout\n");
-				snprintf(udevice->tmp_node, sizeof(udevice->tmp_node), "%s/.tmp-%u-%u",
-					 udev_get_dev_path(udevice->udev), major(udevice->devt), minor(udevice->devt));
-				udevice->tmp_node[sizeof(udevice->tmp_node)-1] = '\0';
-				udev_node_mknod(udevice, udevice->tmp_node, udevice->devt, 0600, 0, 0);
+			if (event->tmp_node[0] == '\0' && major(udev_device_get_devnum(dev)) > 0) {
+				dbg(event->udev, "create temporary device node for callout\n");
+				snprintf(event->tmp_node, sizeof(event->tmp_node), "%s/.tmp-%u-%u",
+					 udev_get_dev_path(event->udev),
+					 major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
+				udev_node_mknod(dev, event->tmp_node, makedev(0,0), 0600, 0, 0);
 			}
-			strlcat(string, udevice->tmp_node, maxsize);
-			dbg(udevice->udev, "substitute temporary device node name '%s'\n", udevice->tmp_node);
+			util_strlcat(string, event->tmp_node, maxsize);
+			dbg(event->udev, "substitute temporary device node name '%s'\n", event->tmp_node);
 			break;
 		case SUBST_NAME:
-			if (udevice->name[0] == '\0') {
-				strlcat(string, udevice->dev->kernel, maxsize);
-				dbg(udevice->udev, "substitute udevice->kernel '%s'\n", udevice->name);
+			if (event->name != NULL) {
+				util_strlcat(string, event->name, maxsize);
+				dbg(event->udev, "substitute name '%s'\n", event->name);
 			} else {
-				strlcat(string, udevice->name, maxsize);
-				dbg(udevice->udev, "substitute udevice->name '%s'\n", udevice->name);
+				util_strlcat(string, udev_device_get_sysname(dev), maxsize);
+				dbg(event->udev, "substitute sysname '%s'\n", udev_device_get_sysname(dev));
 			}
 			break;
 		case SUBST_LINKS:
-			if (!list_empty(&udevice->symlink_list)) {
-				struct name_entry *name_loop;
-				char symlinks[PATH_SIZE] = "";
+			{
+				struct udev_list_entry *list_entry;
 
-				list_for_each_entry(name_loop, &udevice->symlink_list, node) {
-					strlcat(symlinks, name_loop->name, sizeof(symlinks));
-					strlcat(symlinks, " ", sizeof(symlinks));
+				list_entry = udev_device_get_properties_list_entry(dev);
+				util_strlcpy(string, udev_list_entry_get_name(list_entry), maxsize);
+				udev_list_entry_foreach(list_entry, udev_list_entry_get_next(list_entry)) {
+					util_strlcat(string, " ", maxsize);
+					util_strlcat(string, udev_list_entry_get_name(list_entry), maxsize);
 				}
-				remove_trailing_chars(symlinks, ' ');
-				strlcat(string, symlinks, maxsize);
 			}
 			break;
 		case SUBST_ROOT:
-			strlcat(string, udev_get_dev_path(udevice->udev), maxsize);
-			dbg(udevice->udev, "substitute udev_root '%s'\n", udev_get_dev_path(udevice->udev));
+			util_strlcat(string, udev_get_dev_path(event->udev), maxsize);
+			dbg(event->udev, "substitute udev_root '%s'\n", udev_get_dev_path(event->udev));
 			break;
 		case SUBST_SYS:
-			strlcat(string, udev_get_sys_path(udevice->udev), maxsize);
-			dbg(udevice->udev, "substitute sys_path '%s'\n", udev_get_sys_path(udevice->udev));
+			util_strlcat(string, udev_get_sys_path(event->udev), maxsize);
+			dbg(event->udev, "substitute sys_path '%s'\n", udev_get_sys_path(event->udev));
 			break;
 		case SUBST_ENV:
 			if (attr == NULL) {
-				dbg(udevice->udev, "missing attribute\n");
+				dbg(event->udev, "missing attribute\n");
 				break;
-			}
-			pos = getenv(attr);
-			if (pos == NULL) {
-				dbg(udevice->udev, "env '%s' not available\n", attr);
+			} else {
+				struct udev_list_entry *list_entry;
+				const char *value;
+
+				list_entry = udev_device_get_properties_list_entry(event->dev);
+				list_entry = udev_list_entry_get_by_name(list_entry, attr);
+				if (list_entry == NULL)
+					break;
+				value = udev_list_entry_get_value(list_entry);
+				dbg(event->udev, "substitute env '%s=%s'\n", attr, value);
+				util_strlcat(string, value, maxsize);
 				break;
 			}
-			dbg(udevice->udev, "substitute env '%s=%s'\n", attr, pos);
-			strlcat(string, pos, maxsize);
-			break;
 		default:
-			err(udevice->udev, "unknown substitution type=%i\n", type);
+			err(event->udev, "unknown substitution type=%i\n", type);
 			break;
 		}
 		/* possibly truncate to format-char specified length */
 		if (len >= 0 && len < (int)strlen(head)) {
 			head[len] = '\0';
-			dbg(udevice->udev, "truncate to %i chars, subtitution string becomes '%s'\n", len, head);
+			dbg(event->udev, "truncate to %i chars, subtitution string becomes '%s'\n", len, head);
 		}
-		strlcat(string, temp, maxsize);
+		util_strlcat(string, temp, maxsize);
 	}
 }
 
@@ -973,7 +937,7 @@ static char *key_pair_name(struct udev_rule *rule, struct key_pair *pair)
 
 static int match_key(struct udev *udev, const char *key_name, struct udev_rule *rule, struct key *key, const char *val)
 {
-	char value[PATH_SIZE];
+	char value[UTIL_PATH_SIZE];
 	char *key_value;
 	char *pos;
 	int match = 0;
@@ -982,15 +946,18 @@ static int match_key(struct udev *udev, const char *key_name, struct udev_rule *
 	    key->operation != KEY_OP_NOMATCH)
 		return 0;
 
+	if (val == NULL)
+		val = "";
+
 	/* look for a matching string, parts are separated by '|' */
-	strlcpy(value, rule->buf + key->val_off, sizeof(value));
+	util_strlcpy(value, rule->buf + key->val_off, sizeof(value));
 	key_value = value;
 	dbg(udev, "key %s value='%s'\n", key_name, key_value);
-	while (key_value) {
+	while (key_value != NULL) {
 		pos = strchr(key_value, '|');
-		if (pos) {
+		if (pos != NULL) {
 			pos[0] = '\0';
-			pos++;
+			pos = &pos[1];
 		}
 
 		dbg(udev, "match %s '%s' <-> '%s'\n", key_name, key_value, val);
@@ -1013,37 +980,42 @@ static int match_key(struct udev *udev, const char *key_name, struct udev_rule *
 }
 
 /* match a single rule against a given device and possibly its parent devices */
-static int match_rule(struct udevice *udevice, struct udev_rule *rule)
+static int match_rule(struct udev_event *event, struct udev_rule *rule)
 {
+	struct udev_device *dev = event->dev;
 	int i;
 
-	if (match_key(udevice->udev, "ACTION", rule, &rule->action, udevice->action))
+	if (match_key(event->udev, "ACTION", rule, &rule->action, udev_device_get_action(dev)))
 		goto nomatch;
 
-	if (match_key(udevice->udev, "KERNEL", rule, &rule->kernel, udevice->dev->kernel))
+	if (match_key(event->udev, "KERNEL", rule, &rule->kernel, udev_device_get_sysname(dev)))
 		goto nomatch;
 
-	if (match_key(udevice->udev, "SUBSYSTEM", rule, &rule->subsystem, udevice->dev->subsystem))
+	if (match_key(event->udev, "SUBSYSTEM", rule, &rule->subsystem, udev_device_get_subsystem(dev)))
 		goto nomatch;
 
-	if (match_key(udevice->udev, "DEVPATH", rule, &rule->devpath, udevice->dev->devpath))
+	if (match_key(event->udev, "DEVPATH", rule, &rule->devpath, udev_device_get_devpath(dev)))
 		goto nomatch;
 
-	if (match_key(udevice->udev, "DRIVER", rule, &rule->driver, udevice->dev->driver))
+	if (match_key(event->udev, "DRIVER", rule, &rule->driver, udev_device_get_driver(dev)))
 		goto nomatch;
 
 	/* match NAME against a value assigned by an earlier rule */
-	if (match_key(udevice->udev, "NAME", rule, &rule->name, udevice->name))
+	if (match_key(event->udev, "NAME", rule, &rule->name, event->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;
+		size_t devlen = strlen(udev_get_dev_path(event->udev))+1;
+		struct udev_list_entry *list_entry;
 		int match = 0;
 
-		list_for_each_entry(name_loop, &udevice->symlink_list, node) {
-			if (match_key(udevice->udev, "SYMLINK", rule, &rule->symlink_match, name_loop->name) == 0) {
+		udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) {
+			const char *devlink;
+
+			devlink =  &udev_list_entry_get_name(list_entry)[devlen];
+			if (match_key(event->udev, "SYMLINK", rule, &rule->symlink_match, devlink) == 0) {
 				match = 1;
 				break;
 			}
@@ -1058,53 +1030,61 @@ static int match_rule(struct udevice *udevice, struct udev_rule *rule)
 		/* we only check for matches, assignments will be handled later */
 		if (pair->key.operation == KEY_OP_MATCH ||
 		    pair->key.operation == KEY_OP_NOMATCH) {
+			struct udev_list_entry *list_entry;
 			const char *key_name = key_pair_name(rule, pair);
-			const char *value = getenv(key_name);
+			const char *value;
 
-			if (!value) {
-				dbg(udevice->udev, "ENV{'%s'} is not set, treat as empty\n", key_name);
+			list_entry = udev_device_get_properties_list_entry(event->dev);
+			list_entry = udev_list_entry_get_by_name(list_entry, key_name);
+			value = udev_list_entry_get_value(list_entry);
+			if (value == NULL) {
+				dbg(event->udev, "ENV{%s} is not set, treat as empty\n", key_name);
 				value = "";
 			}
-			if (match_key(udevice->udev, "ENV", rule, &pair->key, value))
+			if (match_key(event->udev, "ENV", rule, &pair->key, value))
 				goto nomatch;
 		}
 	}
 
 	if (rule->test.operation == KEY_OP_MATCH ||
 	    rule->test.operation == KEY_OP_NOMATCH) {
-		char filename[PATH_SIZE];
-		char devpath[PATH_SIZE];
-		char *attr;
+		char filename[UTIL_PATH_SIZE];
+		char *subsys;
+		char *sysname;
+		char *attrib;
 		struct stat statbuf;
 		int match;
 
-		strlcpy(filename, key_val(rule, &rule->test), sizeof(filename));
-		udev_rules_apply_format(udevice, filename, sizeof(filename));
+		util_strlcpy(filename, key_val(rule, &rule->test), sizeof(filename));
+		udev_rules_apply_format(event, filename, sizeof(filename));
 
-		if (attr_get_by_subsys_id(udevice->udev, filename, devpath, sizeof(devpath), &attr)) {
-			strlcpy(filename, udev_get_sys_path(udevice->udev), sizeof(filename));
-			strlcat(filename, devpath, sizeof(filename));
-			if (attr != NULL) {
-				strlcat(filename, "/", sizeof(filename));
-				strlcat(filename, attr, sizeof(filename));
+		if (split_subsys_sysname(event->udev, filename, &subsys, &sysname, &attrib) == 0) {
+			struct udev_device *d;
+			d = udev_device_new_from_subsystem_sysname(event->udev, subsys, sysname);
+			if (d != NULL) {
+				util_strlcpy(filename, udev_device_get_syspath(d), sizeof(filename));
+				if (attrib != NULL) {
+					util_strlcat(filename, "/", sizeof(filename));
+					util_strlcat(filename, attrib, sizeof(filename));
+				}
+				udev_device_unref(d);
 			}
 		} else if (filename[0] != '/') {
-			char tmp[PATH_SIZE];
+			char tmp[UTIL_PATH_SIZE];
 
-			strlcpy(tmp, udev_get_sys_path(udevice->udev), sizeof(tmp));
-			strlcat(tmp, udevice->dev->devpath, sizeof(tmp));
-			strlcat(tmp, "/", sizeof(tmp));
-			strlcat(tmp, filename, sizeof(tmp));
-			strlcpy(filename, tmp, sizeof(filename));
+			util_strlcpy(tmp, udev_device_get_syspath(dev), sizeof(tmp));
+			util_strlcat(tmp, "/", sizeof(tmp));
+			util_strlcat(tmp, filename, sizeof(tmp));
+			util_strlcpy(filename, tmp, sizeof(filename));
 		}
 
 		attr_subst_subdir(filename, sizeof(filename));
 
 		match = (stat(filename, &statbuf) == 0);
-		info(udevice->udev, "'%s' %s", filename, match ? "exists\n" : "does not exist\n");
+		info(event->udev, "'%s' %s", filename, match ? "exists\n" : "does not exist\n");
 		if (match && rule->test_mode_mask > 0) {
 			match = ((statbuf.st_mode & rule->test_mode_mask) > 0);
-			info(udevice->udev, "'%s' has mode=%#o and %s %#o\n", filename, statbuf.st_mode,
+			info(event->udev, "'%s' has mode=%#o and %s %#o\n", filename, statbuf.st_mode,
 			     match ? "matches" : "does not match",
 			     rule->test_mode_mask);
 		}
@@ -1112,16 +1092,16 @@ static int match_rule(struct udevice *udevice, struct udev_rule *rule)
 			goto nomatch;
 		if (!match && rule->test.operation == KEY_OP_MATCH)
 			goto nomatch;
-		dbg(udevice->udev, "TEST key is true\n");
+		dbg(event->udev, "TEST key is true\n");
 	}
 
 	if (rule->wait_for.operation != KEY_OP_UNSET) {
-		char filename[PATH_SIZE];
+		char filename[UTIL_PATH_SIZE];
 		int found;
 
-		strlcpy(filename, key_val(rule, &rule->wait_for), sizeof(filename));
-		udev_rules_apply_format(udevice, filename, sizeof(filename));
-		found = (wait_for_file(udevice, filename, 10) == 0);
+		util_strlcpy(filename, key_val(rule, &rule->wait_for), sizeof(filename));
+		udev_rules_apply_format(event, filename, sizeof(filename));
+		found = (wait_for_file(event, filename, 10) == 0);
 		if (!found && (rule->wait_for.operation != KEY_OP_NOMATCH))
 			goto nomatch;
 	}
@@ -1132,53 +1112,72 @@ static int match_rule(struct udevice *udevice, struct udev_rule *rule)
 
 		if (pair->key.operation == KEY_OP_MATCH ||
 		    pair->key.operation == KEY_OP_NOMATCH) {
+			char attr[UTIL_PATH_SIZE];
 			const char *key_name = key_pair_name(rule, pair);
 			const char *key_value = key_val(rule, &pair->key);
-			char devpath[PATH_SIZE];
+			char *subsys;
+			char *sysname;
 			char *attrib;
-			const char *value = NULL;
-			char val[VALUE_SIZE];
+			char value[UTIL_NAME_SIZE] = "";
 			size_t len;
 
-			if (attr_get_by_subsys_id(udevice->udev, key_name, devpath, sizeof(devpath), &attrib)) {
-				if (attrib != NULL)
-					value = sysfs_attr_get_value(udevice->udev, devpath, attrib);
-				else
+			util_strlcpy(attr, key_name, sizeof(attr));
+			if (split_subsys_sysname(event->udev, attr, &subsys, &sysname, &attrib) == 0) {
+				struct udev_device *d;
+				const char *val;
+
+				if (attrib == NULL)
 					goto nomatch;
+				d = udev_device_new_from_subsystem_sysname(event->udev, subsys, sysname);
+				if (d == NULL)
+					goto nomatch;
+				val = udev_device_get_attr_value(d, attrib);
+				if (val != NULL)
+					util_strlcpy(value, val, sizeof(value));
+				udev_device_unref(d);
+			}
+
+			if (value[0]=='\0') {
+				const char *val;
+
+				val = udev_device_get_attr_value(dev, key_name);
+				if (val != NULL)
+					util_strlcpy(value, val, sizeof(value));
 			}
-			if (value == NULL)
-				value = sysfs_attr_get_value(udevice->udev, udevice->dev->devpath, key_name);
-			if (value == NULL)
+
+			if (value[0]=='\0')
 				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(udevice->udev, "removed %zi trailing whitespace chars from '%s'\n", strlen(val)-len, val);
+				len = strlen(value);
+				while (len > 0 && isspace(value[--len]))
+					value[len] = '\0';
+				dbg(event->udev, "removed trailing whitespace from '%s'\n", value);
 			}
 
-			if (match_key(udevice->udev, "ATTR", rule, &pair->key, val))
+			if (match_key(event->udev, "ATTR", rule, &pair->key, value))
 				goto nomatch;
 		}
 	}
 
 	/* walk up the chain of parent devices and find a match */
-	udevice->dev_parent = udevice->dev;
+	event->dev_parent = dev;
 	while (1) {
 		/* check for matching kernel device name */
-		if (match_key(udevice->udev, "KERNELS", rule, &rule->kernels, udevice->dev_parent->kernel))
+		if (match_key(event->udev, "KERNELS", rule,
+			      &rule->kernels, udev_device_get_sysname(event->dev_parent)))
 			goto try_parent;
 
 		/* check for matching subsystem value */
-		if (match_key(udevice->udev, "SUBSYSTEMS", rule, &rule->subsystems, udevice->dev_parent->subsystem))
+		if (match_key(event->udev, "SUBSYSTEMS", rule,
+			      &rule->subsystems, udev_device_get_subsystem(event->dev_parent)))
 			goto try_parent;
 
 		/* check for matching driver */
-		if (match_key(udevice->udev, "DRIVERS", rule, &rule->drivers, udevice->dev_parent->driver))
+		if (match_key(event->udev, "DRIVERS", rule,
+			      &rule->drivers, udev_device_get_driver(event->dev_parent)))
 			goto try_parent;
 
 		/* check for matching sysfs attribute pairs */
@@ -1189,27 +1188,27 @@ static int match_rule(struct udevice *udevice, struct udev_rule *rule)
 			    pair->key.operation == KEY_OP_NOMATCH) {
 				const char *key_name = key_pair_name(rule, pair);
 				const char *key_value = key_val(rule, &pair->key);
-				const char *value;
-				char val[VALUE_SIZE];
+				const char *val;
+				char value[UTIL_NAME_SIZE];
 				size_t len;
 
-				value = sysfs_attr_get_value(udevice->udev, udevice->dev_parent->devpath, key_name);
-				if (value == NULL)
-					value = sysfs_attr_get_value(udevice->udev, udevice->dev->devpath, key_name);
-				if (value == NULL)
+				val = udev_device_get_attr_value(event->dev_parent, key_name);
+				if (val == NULL)
+					val = udev_device_get_attr_value(dev, key_name);
+				if (val == NULL)
 					goto try_parent;
-				strlcpy(val, value, sizeof(val));
+				util_strlcpy(value, val, sizeof(value));
 
 				/* 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(udevice->udev, "removed %zi trailing whitespace chars from '%s'\n", strlen(val)-len, val);
+					len = strlen(value);
+					while (len > 0 && isspace(value[--len]))
+						value[len] = '\0';
+					dbg(event->udev, "removed trailing whitespace from '%s'\n", value);
 				}
 
-				if (match_key(udevice->udev, "ATTRS", rule, &pair->key, val))
+				if (match_key(event->udev, "ATTRS", rule, &pair->key, value))
 					goto try_parent;
 			}
 		}
@@ -1218,74 +1217,74 @@ static int match_rule(struct udevice *udevice, struct udev_rule *rule)
 		break;
 try_parent:
 		/* move to parent device */
-		dbg(udevice->udev, "try parent sysfs device\n");
-		udevice->dev_parent = sysfs_device_get_parent(udevice->udev, udevice->dev_parent);
-		if (udevice->dev_parent == NULL)
+		dbg(event->udev, "try parent sysfs device\n");
+		event->dev_parent = udev_device_get_parent(event->dev_parent);
+		if (event->dev_parent == NULL)
 			goto nomatch;
-		dbg(udevice->udev, "looking at dev_parent->devpath='%s'\n", udevice->dev_parent->devpath);
-		dbg(udevice->udev, "looking at dev_parent->kernel='%s'\n", udevice->dev_parent->kernel);
+		dbg(event->udev, "looking at dev_parent->devpath='%s'\n",
+		    udev_device_get_syspath(event->dev_parent));
 	}
 
 	/* 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(udevice, program, sizeof(program));
-		if (run_program(udevice->udev, program, udevice->dev->subsystem, result, sizeof(result), NULL) != 0) {
-			dbg(udevice->udev, "PROGRAM is false\n");
-			udevice->program_result[0] = '\0';
+		char program[UTIL_PATH_SIZE];
+		char result[UTIL_PATH_SIZE];
+
+		util_strlcpy(program, key_val(rule, &rule->program), sizeof(program));
+		udev_rules_apply_format(event, program, sizeof(program));
+		if (run_program(event->dev, program, result, sizeof(result), NULL) != 0) {
+			dbg(event->udev, "PROGRAM is false\n");
+			event->program_result[0] = '\0';
 			if (rule->program.operation != KEY_OP_NOMATCH)
 				goto nomatch;
 		} else {
 			int count;
 
-			dbg(udevice->udev, "PROGRAM matches\n");
-			remove_trailing_chars(result, '\n');
+			dbg(event->udev, "PROGRAM matches\n");
+			util_remove_trailing_chars(result, '\n');
 			if (rule->string_escape == ESCAPE_UNSET ||
 			    rule->string_escape == ESCAPE_REPLACE) {
-				count = replace_chars(result, ALLOWED_CHARS_INPUT);
+				count = util_replace_chars(result, ALLOWED_CHARS_INPUT);
 				if (count > 0)
-					info(udevice->udev, "%i character(s) replaced\n" , count);
+					info(event->udev, "%i character(s) replaced\n" , count);
 			}
-			dbg(udevice->udev, "result is '%s'\n", result);
-			strlcpy(udevice->program_result, result, sizeof(udevice->program_result));
-			dbg(udevice->udev, "PROGRAM returned successful\n");
+			dbg(event->udev, "result is '%s'\n", result);
+			util_strlcpy(event->program_result, result, sizeof(event->program_result));
+			dbg(event->udev, "PROGRAM returned successful\n");
 			if (rule->program.operation == KEY_OP_NOMATCH)
 				goto nomatch;
 		}
-		dbg(udevice->udev, "PROGRAM key is true\n");
+		dbg(event->udev, "PROGRAM key is true\n");
 	}
 
 	/* check for matching result of external program */
-	if (match_key(udevice->udev, "RESULT", rule, &rule->result, udevice->program_result))
+	if (match_key(event->udev, "RESULT", rule, &rule->result, event->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];
+		char import[UTIL_PATH_SIZE];
 		int rc = -1;
 
-		strlcpy(import, key_val(rule, &rule->import), sizeof(import));
-		udev_rules_apply_format(udevice, import, sizeof(import));
-		dbg(udevice->udev, "check for IMPORT import='%s'\n", import);
+		util_strlcpy(import, key_val(rule, &rule->import), sizeof(import));
+		udev_rules_apply_format(event, import, sizeof(import));
+		dbg(event->udev, "check for IMPORT import='%s'\n", import);
 		if (rule->import_type == IMPORT_PROGRAM) {
-			rc = import_program_into_env(udevice, import);
+			rc = import_program_into_env(event, import);
 		} else if (rule->import_type == IMPORT_FILE) {
-			dbg(udevice->udev, "import file import='%s'\n", import);
-			rc = import_file_into_env(udevice, import);
+			dbg(event->udev, "import file import='%s'\n", import);
+			rc = import_file_into_env(event, import);
 		} else if (rule->import_type == IMPORT_PARENT) {
-			dbg(udevice->udev, "import parent import='%s'\n", import);
-			rc = import_parent_into_env(udevice, import);
+			dbg(event->udev, "import parent import='%s'\n", import);
+			rc = import_parent_into_env(event, import);
 		}
 		if (rc != 0) {
-			dbg(udevice->udev, "IMPORT failed\n");
+			dbg(event->udev, "IMPORT failed\n");
 			if (rule->import.operation != KEY_OP_NOMATCH)
 				goto nomatch;
 		} else
-			dbg(udevice->udev, "IMPORT '%s' imported\n", key_val(rule, &rule->import));
-		dbg(udevice->udev, "IMPORT key is true\n");
+			dbg(event->udev, "IMPORT '%s' imported\n", key_val(rule, &rule->import));
+		dbg(event->udev, "IMPORT key is true\n");
 	}
 
 	/* rule matches, if we have ENV assignments export it */
@@ -1293,26 +1292,21 @@ try_parent:
 		struct key_pair *pair = &rule->env.keys[i];
 
 		if (pair->key.operation == KEY_OP_ASSIGN) {
-			char temp_value[NAME_SIZE];
+			char temp_value[UTIL_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(udevice, temp_value, NAME_SIZE);
+			util_strlcpy(temp_value, value, sizeof(temp_value));
+			udev_rules_apply_format(event, temp_value, sizeof(temp_value));
 
-			if (temp_value[0] == '\0') {
-				name_list_key_remove(udevice->udev, &udevice->env_list, key_name);
-				unsetenv(key_name);
-				info(udevice->udev, "unset ENV '%s'\n", key_name);
-			} else {
-				struct name_entry *entry;
+			if (temp_value[0] != '\0') {
+				struct udev_list_entry *entry;
 
-				entry = name_list_key_add(udevice->udev, &udevice->env_list, key_name, temp_value);
-				if (entry == NULL)
-					break;
-				putenv(entry->name);
-				info(udevice->udev, "set ENV '%s'\n", entry->name);
+				info(event->udev, "set ENV '%s=%s'\n", key_name, temp_value);
+				entry = udev_device_add_property(dev, key_name, temp_value);
+				/* store in db */
+				udev_list_entry_set_flag(entry, 1);
 			}
 		}
 	}
@@ -1323,41 +1317,45 @@ try_parent:
 
 		if (pair->key.operation == KEY_OP_ASSIGN) {
 			const char *key_name = key_pair_name(rule, pair);
-			char devpath[PATH_SIZE];
+			char *subsys;
+			char *sysname;
 			char *attrib;
-			char attr[PATH_SIZE] = "";
-			char value[NAME_SIZE];
+			char attr[UTIL_PATH_SIZE];
+			char value[UTIL_NAME_SIZE];
 			FILE *f;
 
-			if (attr_get_by_subsys_id(udevice->udev, key_name, devpath, sizeof(devpath), &attrib)) {
-				if (attrib != NULL) {
-					strlcpy(attr, udev_get_sys_path(udevice->udev), sizeof(attr));
-					strlcat(attr, devpath, sizeof(attr));
-					strlcat(attr, "/", sizeof(attr));
-					strlcat(attr, attrib, sizeof(attr));
-				}
-			}
+			util_strlcpy(attr, key_name, sizeof(attr));
+			if (split_subsys_sysname(event->udev, attr, &subsys, &sysname, &attrib) == 0) {
+				struct udev_device *d;
 
-			if (attr[0] == '\0') {
-				strlcpy(attr, udev_get_sys_path(udevice->udev), sizeof(attr));
-				strlcat(attr, udevice->dev->devpath, sizeof(attr));
-				strlcat(attr, "/", sizeof(attr));
-				strlcat(attr, key_name, sizeof(attr));
+				d = udev_device_new_from_subsystem_sysname(event->udev, subsys, sysname);
+				if (d != NULL) {
+					util_strlcpy(attr, udev_device_get_syspath(d), sizeof(attr));
+					if (attrib != NULL) {
+						util_strlcat(attr, "/", sizeof(attr));
+						util_strlcat(attr, attrib, sizeof(attr));
+					}
+					udev_device_unref(d);
+				}
+			} else {
+				util_strlcpy(attr, udev_device_get_syspath(dev), sizeof(attr));
+				util_strlcat(attr, "/", sizeof(attr));
+				util_strlcat(attr, key_name, sizeof(attr));
 			}
 
 			attr_subst_subdir(attr, sizeof(attr));
 
-			strlcpy(value, key_val(rule, &pair->key), sizeof(value));
-			udev_rules_apply_format(udevice, value, sizeof(value));
-			info(udevice->udev, "writing '%s' to sysfs file '%s'\n", value, attr);
+			util_strlcpy(value, key_val(rule, &pair->key), sizeof(value));
+			udev_rules_apply_format(event, value, sizeof(value));
+			info(event->udev, "writing '%s' to sysfs file '%s'\n", value, attr);
 			f = fopen(attr, "w");
 			if (f != NULL) {
-				if (!udevice->test_run)
+				if (!event->test)
 					if (fprintf(f, "%s", value) <= 0)
-						err(udevice->udev, "error writing ATTR{%s}: %s\n", attr, strerror(errno));
+						err(event->udev, "error writing ATTR{%s}: %m\n", attr);
 				fclose(f);
 			} else
-				err(udevice->udev, "error opening ATTR{%s} for writing: %s\n", attr, strerror(errno));
+				err(event->udev, "error opening ATTR{%s} for writing: %m\n", attr);
 		}
 	}
 	return 0;
@@ -1366,14 +1364,14 @@ nomatch:
 	return -1;
 }
 
-int udev_rules_get_name(struct udev_rules *rules, struct udevice *udevice)
+int udev_rules_get_name(struct udev_rules *rules, struct udev_event *event)
 {
+	struct udev_device *dev = event->dev;
 	struct udev_rules_iter iter;
 	struct udev_rule *rule;
 	int name_set = 0;
 
-	dbg(udevice->udev, "udevice->dev->devpath='%s'\n", udevice->dev->devpath);
-	dbg(udevice->udev, "udevice->dev->kernel='%s'\n", udevice->dev->kernel);
+	dbg(event->udev, "device: '%s'\n", udev_device_get_syspath(dev));
 
 	/* look for a matching rule to apply */
 	udev_rules_iter_init(&iter, rules);
@@ -1386,104 +1384,115 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udevice)
 		    (rule->name.operation == KEY_OP_ASSIGN ||
 		     rule->name.operation == KEY_OP_ASSIGN_FINAL ||
 		     rule->name.operation == KEY_OP_ADD)) {
-			dbg(udevice->udev, "node name already set, rule ignored\n");
+			dbg(event->udev, "node name already set, rule ignored\n");
 			continue;
 		}
 
-		dbg(udevice->udev, "process rule\n");
-		if (match_rule(udevice, rule) == 0) {
+		dbg(event->udev, "process rule\n");
+		if (match_rule(event, rule) == 0) {
 			/* apply options */
 			if (rule->ignore_device) {
-				info(udevice->udev, "rule applied, '%s' is ignored\n", udevice->dev->kernel);
-				udevice->ignore_device = 1;
+				info(event->udev, "rule applied, '%s' is ignored\n", udev_device_get_sysname(dev));
+				event->ignore_device = 1;
 				return 0;
 			}
 			if (rule->ignore_remove) {
-				udevice->ignore_remove = 1;
-				dbg(udevice->udev, "remove event should be ignored\n");
+				udev_device_set_ignore_remove(dev, 1);
+				dbg(event->udev, "remove event should be ignored\n");
 			}
 			if (rule->link_priority != 0) {
-				udevice->link_priority = rule->link_priority;
-				info(udevice->udev, "link_priority=%i\n", udevice->link_priority);
+				udev_device_set_devlink_priority(dev, rule->link_priority);
+				info(event->udev, "devlink_priority=%i\n", rule->link_priority);
 			}
 			if (rule->event_timeout >= 0) {
-				udevice->event_timeout = rule->event_timeout;
-				info(udevice->udev, "event_timeout=%i\n", udevice->event_timeout);
+				udev_device_set_event_timeout(dev, rule->event_timeout);
+				info(event->udev, "event_timeout=%i\n", rule->event_timeout);
 			}
-			/* apply all_partitions option only at a main block device */
-			if (rule->partitions &&
-			    strcmp(udevice->dev->subsystem, "block") == 0 && udevice->dev->kernel_number[0] == '\0') {
-				udevice->partitions = rule->partitions;
-				dbg(udevice->udev, "creation of partition nodes requested\n");
+			/* apply all_partitions option only at a disk device */
+			if (rule->partitions > 0 &&
+			    strcmp(udev_device_get_subsystem(dev), "block") == 0 &&
+			    udev_device_get_sysnum(dev) == NULL) {
+				udev_device_set_num_fake_partitions(dev, rule->partitions);
+				dbg(event->udev, "creation of partition nodes requested\n");
 			}
 
 			/* apply permissions */
-			if (!udevice->mode_final && rule->mode.operation != KEY_OP_UNSET) {
+			if (!event->mode_final && rule->mode.operation != KEY_OP_UNSET) {
 				if (rule->mode.operation == KEY_OP_ASSIGN_FINAL)
-					udevice->mode_final = 1;
+					event->mode_final = 1;
 				char buf[20];
-				strlcpy(buf, key_val(rule, &rule->mode), sizeof(buf));
-				udev_rules_apply_format(udevice, buf, sizeof(buf));
-				udevice->mode = strtol(buf, NULL, 8);
-				dbg(udevice->udev, "applied mode=%#o to '%s'\n", udevice->mode, udevice->dev->kernel);
+				util_strlcpy(buf, key_val(rule, &rule->mode), sizeof(buf));
+				udev_rules_apply_format(event, buf, sizeof(buf));
+				event->mode = strtol(buf, NULL, 8);
+				dbg(event->udev, "applied mode=%#o to '%s'\n",
+				    event->mode, udev_device_get_sysname(dev));
 			}
-			if (!udevice->owner_final && rule->owner.operation != KEY_OP_UNSET) {
+			if (!event->owner_final && rule->owner.operation != KEY_OP_UNSET) {
 				if (rule->owner.operation == KEY_OP_ASSIGN_FINAL)
-					udevice->owner_final = 1;
-				strlcpy(udevice->owner, key_val(rule, &rule->owner), sizeof(udevice->owner));
-				udev_rules_apply_format(udevice, udevice->owner, sizeof(udevice->owner));
-				dbg(udevice->udev, "applied owner='%s' to '%s'\n", udevice->owner, udevice->dev->kernel);
+					event->owner_final = 1;
+				util_strlcpy(event->owner, key_val(rule, &rule->owner), sizeof(event->owner));
+				udev_rules_apply_format(event, event->owner, sizeof(event->owner));
+				dbg(event->udev, "applied owner='%s' to '%s'\n",
+				    event->owner, udev_device_get_sysname(dev));
 			}
-			if (!udevice->group_final && rule->group.operation != KEY_OP_UNSET) {
+			if (!event->group_final && rule->group.operation != KEY_OP_UNSET) {
 				if (rule->group.operation == KEY_OP_ASSIGN_FINAL)
-					udevice->group_final = 1;
-				strlcpy(udevice->group, key_val(rule, &rule->group), sizeof(udevice->group));
-				udev_rules_apply_format(udevice, udevice->group, sizeof(udevice->group));
-				dbg(udevice->udev, "applied group='%s' to '%s'\n", udevice->group, udevice->dev->kernel);
+					event->group_final = 1;
+				util_strlcpy(event->group, key_val(rule, &rule->group), sizeof(event->group));
+				udev_rules_apply_format(event, event->group, sizeof(event->group));
+				dbg(event->udev, "applied group='%s' to '%s'\n",
+				    event->group, udev_device_get_sysname(dev));
 			}
 
 			/* collect symlinks */
-			if (!udevice->symlink_final &&
+			if (!event->devlink_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 temp[UTIL_PATH_SIZE];
+				char filename[UTIL_PATH_SIZE];
 				char *pos, *next;
-				int count;
+				int count = 0;
 
 				if (rule->symlink.operation == KEY_OP_ASSIGN_FINAL)
-					udevice->symlink_final = 1;
+					event->devlink_final = 1;
 				if (rule->symlink.operation == KEY_OP_ASSIGN ||
 				    rule->symlink.operation == KEY_OP_ASSIGN_FINAL) {
-					info(udevice->udev, "reset symlink list\n");
-					name_list_cleanup(udevice->udev, &udevice->symlink_list);
+					info(event->udev, "reset symlink list\n");
+					udev_device_cleanup_devlinks_list(dev);
 				}
 				/* allow  multiple symlinks separated by spaces */
-				strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp));
-				udev_rules_apply_format(udevice, 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(udevice->udev, "%i character(s) replaced\n" , count);
-				}
-				dbg(udevice->udev, "rule applied, added symlink(s) '%s'\n", temp);
+				util_strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp));
+				udev_rules_apply_format(event, temp, sizeof(temp));
+				if (rule->string_escape == ESCAPE_UNSET)
+					count = util_replace_chars(temp, ALLOWED_CHARS_FILE " ");
+				else if (rule->string_escape == ESCAPE_REPLACE)
+					count = util_replace_chars(temp, ALLOWED_CHARS_FILE);
+				if (count > 0)
+					info(event->udev, "%i character(s) replaced\n" , count);
+				dbg(event->udev, "rule applied, added symlink(s) '%s'\n", temp);
 				pos = temp;
 				while (isspace(pos[0]))
 					pos++;
 				next = strchr(pos, ' ');
 				while (next) {
 					next[0] = '\0';
-					info(udevice->udev, "add symlink '%s'\n", pos);
-					name_list_add(udevice->udev, &udevice->symlink_list, pos, 0);
+					info(event->udev, "add symlink '%s'\n", pos);
+					util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename));
+					util_strlcat(filename, "/", sizeof(filename));
+					util_strlcat(filename, pos, sizeof(filename));
+					udev_device_add_devlink(dev, filename);
 					while (isspace(next[1]))
 						next++;
 					pos = &next[1];
 					next = strchr(pos, ' ');
 				}
 				if (pos[0] != '\0') {
-					info(udevice->udev, "add symlink '%s'\n", pos);
-					name_list_add(udevice->udev, &udevice->symlink_list, pos, 0);
+					info(event->udev, "add symlink '%s'\n", pos);
+					util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename));
+					util_strlcat(filename, "/", sizeof(filename));
+					util_strlcat(filename, pos, sizeof(filename));
+					udev_device_add_devlink(dev, filename);
 				}
 			}
 
@@ -1494,68 +1503,72 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udevice)
 				int count;
 
 				name_set = 1;
-				strlcpy(udevice->name, key_val(rule, &rule->name), sizeof(udevice->name));
-				udev_rules_apply_format(udevice, udevice->name, sizeof(udevice->name));
+				util_strlcpy(event->name, key_val(rule, &rule->name), sizeof(event->name));
+				udev_rules_apply_format(event, event->name, sizeof(event->name));
 				if (rule->string_escape == ESCAPE_UNSET ||
 				    rule->string_escape == ESCAPE_REPLACE) {
-					count = replace_chars(udevice->name, ALLOWED_CHARS_FILE);
+					count = util_replace_chars(event->name, ALLOWED_CHARS_FILE);
 					if (count > 0)
-						info(udevice->udev, "%i character(s) replaced\n", count);
+						info(event->udev, "%i character(s) replaced\n", count);
 				}
 
-				info(udevice->udev, "rule applied, '%s' becomes '%s'\n", udevice->dev->kernel, udevice->name);
-				if (strcmp(udevice->dev->subsystem, "net") != 0)
-					dbg(udevice->udev, "name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i\n",
-					    udevice->name, udevice->owner, udevice->group, udevice->mode, udevice->partitions);
+				info(event->udev, "rule applied, '%s' becomes '%s'\n",
+				     udev_device_get_sysname(dev), event->name);
+				if (strcmp(udev_device_get_subsystem(dev), "net") != 0)
+					dbg(event->udev, "'%s' owner='%s', group='%s', mode=%#o partitions=%i\n",
+					    event->name, event->owner, event->group, event->mode,
+					    udev_device_get_num_fake_partitions(dev));
 			}
 
-			if (!udevice->run_final && rule->run.operation != KEY_OP_UNSET) {
-				struct name_entry *entry;
+			if (!event->run_final && rule->run.operation != KEY_OP_UNSET) {
+				struct udev_list_entry *list_entry;
 
 				if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
-					udevice->run_final = 1;
+					event->run_final = 1;
 				if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
-					info(udevice->udev, "reset run list\n");
-					name_list_cleanup(udevice->udev, &udevice->run_list);
+					info(event->udev, "reset run list\n");
+					udev_list_cleanup(event->udev, &event->run_list);
 				}
-				dbg(udevice->udev, "add run '%s'\n", key_val(rule, &rule->run));
-				entry = name_list_add(udevice->udev, &udevice->run_list, key_val(rule, &rule->run), 0);
-				if (rule->run_ignore_error)
-					entry->ignore_error = 1;
+				dbg(event->udev, "add run '%s'\n", key_val(rule, &rule->run));
+				list_entry = udev_list_entry_add(event->udev, &event->run_list,
+								 key_val(rule, &rule->run), NULL, 1, 0);
+				if (rule->run_ignore_error && list_entry != NULL)
+					udev_list_entry_set_flag(list_entry, 1);
 			}
 
 			if (rule->last_rule) {
-				dbg(udevice->udev, "last rule to be applied\n");
+				dbg(event->udev, "last rule to be applied\n");
 				break;
 			}
 
 			if (rule->goto_label.operation != KEY_OP_UNSET) {
-				dbg(udevice->udev, "moving forward to label '%s'\n", key_val(rule, &rule->goto_label));
-				udev_rules_iter_label(&iter, key_val(rule, &rule->goto_label));
+				dbg(event->udev, "moving forward to label '%s'\n", key_val(rule, &rule->goto_label));
+				udev_rules_iter_goto(&iter, rule->goto_rule_off);
 			}
 		}
 	}
 
 	if (!name_set) {
-		info(udevice->udev, "no node name set, will use kernel name '%s'\n", udevice->dev->kernel);
-		strlcpy(udevice->name, udevice->dev->kernel, sizeof(udevice->name));
+		info(event->udev, "no node name set, will use kernel name '%s'\n",
+		     udev_device_get_sysname(dev));
+		util_strlcpy(event->name, udev_device_get_sysname(dev), sizeof(event->name));
 	}
 
-	if (udevice->tmp_node[0] != '\0') {
-		dbg(udevice->udev, "removing temporary device node\n");
-		unlink_secure(udevice->udev, udevice->tmp_node);
-		udevice->tmp_node[0] = '\0';
+	if (event->tmp_node[0] != '\0') {
+		dbg(event->udev, "removing temporary device node\n");
+		unlink_secure(event->udev, event->tmp_node);
+		event->tmp_node[0] = '\0';
 	}
-
 	return 0;
 }
 
-int udev_rules_get_run(struct udev_rules *rules, struct udevice *udevice)
+int udev_rules_get_run(struct udev_rules *rules, struct udev_event *event)
 {
+	struct udev_device *dev = event->dev;
 	struct udev_rules_iter iter;
 	struct udev_rule *rule;
 
-	dbg(udevice->udev, "udevice->kernel='%s'\n", udevice->dev->kernel);
+	dbg(event->udev, "sysname: '%s'\n", udev_device_get_sysname(dev));
 
 	/* look for a matching rule to apply */
 	udev_rules_iter_init(&iter, rules);
@@ -1564,7 +1577,7 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udevice)
 		if (rule == NULL)
 			break;
 
-		dbg(udevice->udev, "process rule\n");
+		dbg(event->udev, "process rule\n");
 		if (rule->name.operation == KEY_OP_ASSIGN ||
 		    rule->name.operation == KEY_OP_ASSIGN_FINAL ||
 		    rule->name.operation == KEY_OP_ADD ||
@@ -1573,45 +1586,46 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udevice)
 		    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(udevice->udev, "skip rule that names a device\n");
+			dbg(event->udev, "skip rule that names a device\n");
 			continue;
 		}
 
-		if (match_rule(udevice, rule) == 0) {
+		if (match_rule(event, rule) == 0) {
 			if (rule->ignore_device) {
-				info(udevice->udev, "rule applied, '%s' is ignored\n", udevice->dev->kernel);
-				udevice->ignore_device = 1;
+				info(event->udev, "rule applied, '%s' is ignored\n", udev_device_get_sysname(dev));
+				event->ignore_device = 1;
 				return 0;
 			}
 			if (rule->ignore_remove) {
-				udevice->ignore_remove = 1;
-				dbg(udevice->udev, "remove event should be ignored\n");
+				udev_device_set_ignore_remove(dev, 1);
+				dbg(event->udev, "remove event should be ignored\n");
 			}
 
-			if (!udevice->run_final && rule->run.operation != KEY_OP_UNSET) {
-				struct name_entry *entry;
+			if (!event->run_final && rule->run.operation != KEY_OP_UNSET) {
+				struct udev_list_entry *list_entry;
 
 				if (rule->run.operation == KEY_OP_ASSIGN ||
 				    rule->run.operation == KEY_OP_ASSIGN_FINAL) {
-					info(udevice->udev, "reset run list\n");
-					name_list_cleanup(udevice->udev, &udevice->run_list);
+					info(event->udev, "reset run list\n");
+					udev_list_cleanup(event->udev, &event->run_list);
 				}
-				dbg(udevice->udev, "add run '%s'\n", key_val(rule, &rule->run));
-				entry = name_list_add(udevice->udev, &udevice->run_list, key_val(rule, &rule->run), 0);
-				if (rule->run_ignore_error)
-					entry->ignore_error = 1;
+				dbg(event->udev, "add run '%s'\n", key_val(rule, &rule->run));
+				list_entry = udev_list_entry_add(event->udev, &event->run_list,
+								 key_val(rule, &rule->run), NULL, 1, 0);
+				if (rule->run_ignore_error && list_entry != NULL)
+					udev_list_entry_set_flag(list_entry, 1);
 				if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
 					break;
 			}
 
 			if (rule->last_rule) {
-				dbg(udevice->udev, "last rule to be applied\n");
+				dbg(event->udev, "last rule to be applied\n");
 				break;
 			}
 
 			if (rule->goto_label.operation != KEY_OP_UNSET) {
-				dbg(udevice->udev, "moving forward to label '%s'\n", key_val(rule, &rule->goto_label));
-				udev_rules_iter_label(&iter, key_val(rule, &rule->goto_label));
+				dbg(event->udev, "moving forward to label '%s'\n", key_val(rule, &rule->goto_label));
+				udev_rules_iter_goto(&iter, rule->goto_rule_off);
 			}
 		}
 	}