chiark / gitweb /
volume_id: clean up linux_raid code
[elogind.git] / udev_rules.c
index 939febe8f69e20986a5b4629f69cd5f5caddbccc..55a079be8746f01eadb222cf02dfe8e1f8f9bc2a 100644 (file)
@@ -1,24 +1,19 @@
 /*
- * udev_rules.c
- *
- * Userspace devfs
- *
  * 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.
  *
  */
 
 #include <ctype.h>
 #include <unistd.h>
 #include <errno.h>
+#include <syslog.h>
+#include <dirent.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"
+#include "udev_selinux.h"
 
-
-/* compare string with pattern (supports * ? [0-9] [!A-Z]) */
-static int strcmp_pattern(const char *p, const char *s)
-{
-       if (s[0] == '\0') {
-               while (p[0] == '*')
-                       p++;
-               return (p[0] != '\0');
-       }
-       switch (p[0]) {
-       case '[':
-               {
-                       int not = 0;
-                       p++;
-                       if (p[0] == '!') {
-                               not = 1;
-                               p++;
-                       }
-                       while ((p[0] != '\0') && (p[0] != ']')) {
-                               int match = 0;
-                               if (p[1] == '-') {
-                                       if ((s[0] >= p[0]) && (s[0] <= p[2]))
-                                               match = 1;
-                                       p += 3;
-                               } else {
-                                       match = (p[0] == s[0]);
-                                       p++;
-                               }
-                               if (match ^ not) {
-                                       while ((p[0] != '\0') && (p[0] != ']'))
-                                               p++;
-                                       if (p[0] == ']')
-                                               return strcmp_pattern(p+1, s+1);
-                               }
-                       }
-               }
-               break;
-       case '*':
-               if (strcmp_pattern(p, s+1))
-                       return strcmp_pattern(p+1, s);
-               return 0;
-       case '\0':
-               if (s[0] == '\0') {
-                       return 0;
-               }
-               break;
-       default:
-               if ((p[0] == s[0]) || (p[0] == '?'))
-                       return strcmp_pattern(p+1, s+1);
-               break;
-       }
-       return 1;
-}
+extern char **environ;
 
 /* extract possible {attr} and move str behind it */
 static char *get_format_attribute(char **str)
@@ -106,13 +48,13 @@ static char *get_format_attribute(char **str)
        if (*str[0] == '{') {
                pos = strchr(*str, '}');
                if (pos == NULL) {
-                       err("missing closing brace for format");
+                       err("missing closing brace for format\n");
                        return NULL;
                }
                pos[0] = '\0';
                attr = *str+1;
                *str = pos+1;
-               dbg("attribute='%s', str='%s'", attr, *str);
+               dbg("attribute='%s', str='%s'\n", attr, *str);
        }
        return attr;
 }
@@ -127,10 +69,10 @@ static int get_format_len(char **str)
                num = (int) strtoul(*str, &tail, 10);
                if (num > 0) {
                        *str = tail;
-                       dbg("format length=%i", num);
+                       dbg("format length=%i\n", num);
                        return num;
                } else {
-                       err("format parsing error '%s'", *str);
+                       err("format parsing error '%s'\n", *str);
                }
        }
        return -1;
@@ -142,68 +84,251 @@ static int get_key(char **line, char **key, char **value)
        char *temp;
 
        linepos = *line;
-       if (!linepos)
+       if (linepos == NULL)
                return -1;
 
-       if (strchr(linepos, '\\')) {
-               dbg("escaped characters are not supported, skip");
-               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'\n", i, argv[i]);
+                       i++;
+               }
+               argv[i] = NULL;
+       } else {
+               argv[0] = arg;
+               argv[1] = NULL;
+       }
+       info("'%s'\n", 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\n", 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\n", 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\n", 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\n", argv[0]);
+               } else {
+                       /* other problems */
+                       err("exec of program '%s' failed\n", argv[0]);
+               }
+               _exit(1);
+       case -1:
+               err("fork of '%s' failed: %s\n", 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\n", 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\n", (long)ressize);
+                                                       retval = -1;
+                                               }
+                                       }
+                                       pos = inbuf;
+                                       while ((line = strsep(&pos, "\n")))
+                                               if (pos || line[0] != '\0')
+                                                       info("'%s' (stdout) '%s'\n", 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\n", strerror(errno));
+                                               continue;
+                                       }
+                                       errbuf[count] = '\0';
+                                       pos = errbuf;
+                                       while ((line = strsep(&pos, "\n")))
+                                               if (pos || line[0] != '\0')
+                                                       info("'%s' (stderr) '%s'\n", 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'\n", result);
+                               if (reslen)
+                                       *reslen = respos;
+                       }
+               }
+               waitpid(pid, &status, 0);
+               if (WIFEXITED(status)) {
+                       info("'%s' returned with status %i\n", argv[0], WEXITSTATUS(status));
+                       if (WEXITSTATUS(status) != 0)
+                               retval = -1;
+               } else {
+                       err("'%s' abnormal exit\n", argv[0]);
+                       retval = -1;
+               }
+       }
+
+       return retval;
 }
 
 static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bufsize)
@@ -226,11 +351,6 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
                cur += count+1;
                lineno++;
 
-               if (count >= sizeof(line)) {
-                       err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
-                       continue;
-               }
-
                /* eat the whitespace */
                while ((count > 0) && isspace(bufline[0])) {
                        bufline++;
@@ -243,12 +363,24 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
                if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
-               strlcpy(line, bufline, count+1);
+               if (count >= sizeof(line)) {
+                       err("line too long, conf line skipped %s, line %d\n", udev_config_filename, lineno);
+                       continue;
+               }
+
+               memcpy(line, bufline, count);
+               line[count] = '\0';
 
                linepos = line;
                if (get_key(&linepos, &variable, &value) == 0) {
-                       dbg("import '%s=%s'", variable, value);
-                       name_list_key_add(&udev->env_list, variable, value);
+                       dbg("import '%s=%s'\n", variable, value);
+
+                       /* handle device, renamed by external tool, returning new path */
+                       if (strcmp(variable, "DEVPATH") == 0) {
+                               info("updating devpath from '%s' to '%s'\n", 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);
                }
        }
@@ -262,7 +394,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\n", filename, strerror(errno));
                return -1;
        }
        import_keys_into_env(udev, buf, bufsize);
@@ -273,29 +405,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 (execute_program(program, udev->subsystem, result, sizeof(result), &reslen) != 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\n", 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'\n", udev_parent->name);
+                       list_for_each_entry(name_loop, &udev_parent->env_list, node) {
                                char name[NAME_SIZE];
                                char *pos;
 
@@ -304,125 +439,228 @@ 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) {
-                                               dbg("import key '%s'", name_loop->name);
+                                       if (fnmatch(filter, name, 0) == 0) {
+                                               dbg("import key '%s'\n", name_loop->name);
                                                name_list_add(&udev->env_list, name_loop->name, 0);
                                                setenv(name, pos, 1);
                                        } else
-                                               dbg("skip key '%s'", name_loop->name);
+                                               dbg("skip key '%s'\n", name_loop->name);
                                }
                        }
                        rc = 0;
                } else
-                       dbg("parent not found in database");
-               udev_cleanup_device(&udev_parent);
+                       dbg("parent not found in database\n");
+               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(struct udevice *udev, const char *name)
+static int pass_env_to_socket(const char *sockpath, const char *devpath, const char *action)
 {
-       char devpath[PATH_SIZE];
-       char filename[PATH_SIZE];
-       int num = 0;
-
-       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;
-               }
+       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("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]);
+       }
 
-               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';
+       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);
+
+       count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, saddrlen);
+       if (count < 0)
+               retval = -1;
+       info("passed %zi bytes to socket '%s', \n", count, sockpath);
+
+       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_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;
-       }
-       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;
+       struct name_entry *name_loop;
+       int retval = 0;
 
-attr_found:
-       strlcpy(value, tmpattr->value, len);
-       remove_trailing_char(value, '\n');
+       dbg("executing run list\n");
+       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];
 
-       dbg("found attribute '%s'", tmpattr->path);
-       return 0;
+                       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;
+               }
+       }
+
+       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'\n", 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\n", 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'\n", filepath);
+                       return -2;
+               }
+               info("wait for '%s' for %i mseconds\n", filepath, 1000 / WAIT_LOOP_PER_SECOND);
                usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
        }
-       dbg("waiting for '%s' failed", filename);
+       info("waiting for '%s' failed\n", 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;
+}
+
+static int attr_subst_subdir(char *attr, size_t len)
+{
+       char *pos;
+       int found = 0;
+
+       pos = strstr(attr, "/*/");
+       if (pos != NULL) {
+               char str[PATH_SIZE];
+               DIR *dir;
+
+               pos[1] = '\0';
+               strlcpy(str, &pos[2], sizeof(str));
+               dir = opendir(attr);
+               if (dir != NULL) {
+                       struct dirent *dent;
+
+                       for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+                               struct stat stats;
+
+                               if (dent->d_name[0] == '.')
+                                       continue;
+                               strlcat(attr, dent->d_name, len);
+                               strlcat(attr, str, len);
+                               if (stat(attr, &stats) == 0) {
+                                       found = 1;
+                                       break;
+                               }
+                               pos[1] = '\0';
+                       }
+                       closedir(dir);
+               }
+               if (!found)
+                       strlcat(attr, str, len);
+       }
+
+       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_LINKS,
                SUBST_ROOT,
-               SUBST_MODALIAS,
+               SUBST_SYS,
                SUBST_ENV,
        };
        static const struct subst_map {
@@ -430,21 +668,24 @@ 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 = "links",      .fmt = 'L',     .type = SUBST_LINKS },
+               { .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;
        const struct subst_map *subst;
@@ -468,12 +709,13 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                                        if (strncasecmp(&head[1], subst->name, strlen(subst->name)) == 0) {
                                                type = subst->type;
                                                tail = head + strlen(subst->name)+1;
-                                               dbg("will substitute format name '%s'", subst->name);
+                                               dbg("will substitute format name '%s'\n", subst->name);
                                                goto found;
                                        }
                                }
-                       }
-                       else if (head[0] == '%') {
+                               head[0] = '$';
+                               err("unknown format variable '%s'\n", head);
+                       } else if (head[0] == '%') {
                                /* substitute format char */
                                if (head[1] == '\0')
                                        break;
@@ -490,10 +732,12 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                                        if (tail[0] == subst->fmt) {
                                                type = subst->type;
                                                tail++;
-                                               dbg("will substitute format char '%c'", subst->fmt);
+                                               dbg("will substitute format char '%c'\n", subst->fmt);
                                                goto found;
                                        }
                                }
+                               head[0] = '%';
+                               err("unknown format char '%c'\n", tail[0]);
                        }
                        head++;
                }
@@ -501,35 +745,42 @@ 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'\n", type ,string, tail);
 
                switch (type) {
                case SUBST_DEVPATH:
-                       strlcat(string, udev->devpath, maxsize);
-                       dbg("substitute devpath '%s'", udev->devpath);
-                       break;
-               case SUBST_ID:
-                       strlcat(string, udev->bus_id, maxsize);
-                       dbg("substitute bus_id '%s'", udev->bus_id);
+                       strlcat(string, udev->dev->devpath, maxsize);
+                       dbg("substitute devpath '%s'\n", udev->dev->devpath);
                        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'\n", 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'\n", udev->dev->kernel_number);
+                       break;
+               case SUBST_ID:
+                       if (udev->dev_parent != NULL) {
+                               strlcat(string, udev->dev_parent->kernel, maxsize);
+                               dbg("substitute id '%s'\n", udev->dev_parent->kernel);
+                       }
+                       break;
+               case SUBST_DRIVER:
+                       if (udev->dev_parent != NULL) {
+                               strlcat(string, udev->dev_parent->driver, maxsize);
+                               dbg("substitute driver '%s'\n", udev->dev_parent->driver);
+                       }
                        break;
                case SUBST_MAJOR:
                        sprintf(temp2, "%d", major(udev->devt));
                        strlcat(string, temp2, maxsize);
-                       dbg("substitute major number '%s'", temp2);
+                       dbg("substitute major number '%s'\n", temp2);
                        break;
                case SUBST_MINOR:
                        sprintf(temp2, "%d", minor(udev->devt));
                        strlcat(string, temp2, maxsize);
-                       dbg("substitute minor number '%s'", temp2);
+                       dbg("substitute minor number '%s'\n", temp2);
                        break;
                case SUBST_RESULT:
                        if (udev->program_result[0] == '\0')
@@ -539,7 +790,7 @@ found:
                        if (attr != NULL)
                                i = strtoul(attr, &rest, 10);
                        if (i > 0) {
-                               dbg("request part #%d of result string", i);
+                               dbg("request part #%d of result string\n", i);
                                cpos = udev->program_result;
                                while (--i) {
                                        while (cpos[0] != '\0' && !isspace(cpos[0]))
@@ -548,7 +799,7 @@ found:
                                                cpos++;
                                }
                                if (i > 0) {
-                                       err("requested part of result string not found");
+                                       err("requested part of result string not found\n");
                                        break;
                                }
                                strlcpy(temp2, cpos, sizeof(temp2));
@@ -559,106 +810,147 @@ found:
                                                cpos[0] = '\0';
                                }
                                strlcat(string, temp2, maxsize);
-                               dbg("substitute part of result string '%s'", temp2);
+                               dbg("substitute part of result string '%s'\n", temp2);
                        } else {
                                strlcat(string, udev->program_result, maxsize);
-                               dbg("substitute result string '%s'", udev->program_result);
+                               dbg("substitute result string '%s'\n", 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\n");
+                       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'\n", 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(udev, 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\n" , count);
                                strlcat(string, temp2, maxsize);
+                               dbg("substitute sysfs value '%s'\n", 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\n", 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'\n", udev_parent->name);
+                                               } else
+                                                       dbg("parent not found in database\n");
+                                               udev_device_cleanup(udev_parent);
+                                       }
+                               }
                        }
                        break;
                case SUBST_TEMP_NODE:
-                       if (udev->tmp_node[0] == '\0') {
-                               dbg("create temporary device node for callout");
+                       if (udev->tmp_node[0] == '\0' && major(udev->devt) > 0) {
+                               dbg("create temporary device node for callout\n");
                                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);
+                       dbg("substitute temporary device node name '%s'\n", udev->tmp_node);
+                       break;
+               case SUBST_NAME:
+                       if (udev->name[0] == '\0') {
+                               strlcat(string, udev->dev->kernel, maxsize);
+                               dbg("substitute udev->kernel '%s'\n", udev->name);
+                       } else {
+                               strlcat(string, udev->name, maxsize);
+                               dbg("substitute udev->name '%s'\n", udev->name);
+                       }
+                       break;
+               case SUBST_LINKS:
+                       if (!list_empty(&udev->symlink_list)) {
+                               struct name_entry *name_loop;
+                               char symlinks[PATH_SIZE] = "";
+
+                               list_for_each_entry(name_loop, &udev->symlink_list, node) {
+                                       strlcat(symlinks, name_loop->name, sizeof(symlinks));
+                                       strlcat(symlinks, " ", sizeof(symlinks));
+                               }
+                               remove_trailing_chars(symlinks, ' ');
+                               strlcat(string, symlinks, maxsize);
+                       }
                        break;
                case SUBST_ROOT:
                        strlcat(string, udev_root, maxsize);
-                       dbg("substitute udev_root '%s'", udev_root);
+                       dbg("substitute udev_root '%s'\n", 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'\n", sysfs_path);
                        break;
                case SUBST_ENV:
                        if (attr == NULL) {
-                               dbg("missing attribute");
+                               dbg("missing attribute\n");
                                break;
                        }
                        pos = getenv(attr);
                        if (pos == NULL) {
-                               dbg("env '%s' not avialable", attr);
+                               dbg("env '%s' not available\n", attr);
                                break;
                        }
-                       dbg("substitute env '%s=%s'", attr, pos);
+                       dbg("substitute env '%s=%s'\n", attr, pos);
                        strlcat(string, pos, maxsize);
                        break;
                default:
-                       err("unknown substitution type=%i", type);
+                       err("unknown substitution type=%i\n", type);
                        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);
+                       dbg("truncate to %i chars, subtitution string becomes '%s'\n", len, head);
                }
                strlcat(string, temp, maxsize);
        }
@@ -676,268 +968,403 @@ 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);
+       dbg("key %s value='%s'\n", key_name, key_value);
        while (key_value) {
                pos = strchr(key_value, '|');
                if (pos) {
                        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;
-               }
+
+               dbg("match %s '%s' <-> '%s'\n", key_name, key_value, val);
+               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)\n", key_name);
+               return 0;
+       }
+       if (!match && (key->operation == KEY_OP_NOMATCH)) {
+               dbg("%s is true (non-matching value)\n", 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_name, udev->kernel_name))
-               goto exit;
+       if (match_key("KERNEL", rule, &rule->kernel, udev->dev->kernel))
+               goto nomatch;
 
-       if (match_key("SUBSYSTEM", rule, &rule->subsystem, udev->subsystem))
-               goto exit;
+       if (match_key("SUBSYSTEM", rule, &rule->subsystem, udev->dev->subsystem))
+               goto nomatch;
 
-       if (match_key("DEVPATH", rule, &rule->devpath, udev->devpath))
-               goto exit;
+       if (match_key("DEVPATH", rule, &rule->devpath, udev->dev->devpath))
+               goto nomatch;
 
-       if (rule->modalias.operation != KEY_OP_UNSET) {
-               char value[NAME_SIZE];
+       if (match_key("DRIVER", rule, &rule->driver, udev->dev->driver))
+               goto nomatch;
 
-               if (find_sysfs_attribute(NULL, sysfs_device, "modalias", value, sizeof(value)) != 0) {
-                       dbg("MODALIAS value not found");
-                       goto exit;
+       /* 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;
+
+               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\n", 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;
+               attr_subst_subdir(filename, sizeof(filename));
+
+               match = (stat(filename, &statbuf) == 0);
+               info("'%s' %s", filename, match ? "exists" : "does not exist\n");
+               if (match && rule->test_mode_mask > 0) {
+                       match = ((statbuf.st_mode & rule->test_mode_mask) > 0);
+                       info("'%s' has mode=%#o and %s %#o\n", 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\n");
+       }
+
+       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'\n", 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'\n", 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:
-               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);
+               /* move to parent device */
+               dbg("try parent sysfs device\n");
+               udev->dev_parent = sysfs_device_get_parent(udev->dev_parent);
+               if (udev->dev_parent == NULL)
+                       goto nomatch;
+               dbg("looking at dev_parent->devpath='%s'\n", udev->dev_parent->devpath);
+               dbg("looking at dev_parent->kernel='%s'\n", 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\n");
+                       udev->program_result[0] = '\0';
+                       if (rule->program.operation != KEY_OP_NOMATCH)
+                               goto nomatch;
+               } else {
+                       int count;
+
+                       dbg("PROGRAM matches\n");
+                       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\n" , count);
+                       }
+                       dbg("result is '%s'\n", result);
+                       strlcpy(udev->program_result, result, sizeof(udev->program_result));
+                       dbg("PROGRAM returned successful\n");
+                       if (rule->program.operation == KEY_OP_NOMATCH)
+                               goto nomatch;
+               }
+               dbg("PROGRAM key is true\n");
        }
 
-       /* 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);
-               dbg("check for IMPORT import='%s'", import);
+               udev_rules_apply_format(udev, import, sizeof(import));
+               dbg("check for IMPORT import='%s'\n", import);
                if (rule->import_type == IMPORT_PROGRAM) {
-                       dbg("run executable file import='%s'", import);
                        rc = import_program_into_env(udev, import);
                } else if (rule->import_type == IMPORT_FILE) {
-                       dbg("import file import='%s'", import);
+                       dbg("import file import='%s'\n", import);
                        rc = import_file_into_env(udev, import);
-               } else if (rule->import_type == IMPORT_PARENT && class_dev) {
-                       dbg("import parent import='%s'", import);
-                       rc = import_parent_into_env(udev, class_dev, import);
+               } else if (rule->import_type == IMPORT_PARENT) {
+                       dbg("import parent import='%s'\n", import);
+                       rc = import_parent_into_env(udev, import);
                }
-               if (rc) {
-                       dbg("IMPORT failed");
+               if (rc != 0) {
+                       dbg("IMPORT failed\n");
                        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");
+                       dbg("IMPORT '%s' imported\n", key_val(rule, &rule->import));
+               dbg("IMPORT key is true\n");
        }
 
-       /* 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);
-               dbg("check for PROGRAM program='%s", program);
-               if (execute_program(program, udev->subsystem, result, sizeof(result), NULL) != 0) {
-                       dbg("PROGRAM is false");
-                       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'\n", 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'\n", 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];
+
+               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));
+                               }
+                       }
 
-       /* rule matches */
+                       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));
+                       }
+
+                       attr_subst_subdir(attr, 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'\n", 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\n", attr, strerror(errno));
+                               fclose(f);
+                       } else
+                               err("error opening ATTR{%s} for writing: %s\n", 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'\n", udev->dev->devpath);
+       dbg("udev->dev->kernel='%s'\n", udev->dev->kernel);
 
        /* look for a matching rule to apply */
        udev_rules_iter_init(rules);
@@ -946,80 +1373,96 @@ 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) {
-                       dbg("node name already set, rule ignored");
+               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\n");
                        continue;
                }
 
-               dbg("process rule");
-               if (match_rule(udev, rule, class_dev, sysfs_device) == 0) {
+               dbg("process rule\n");
+               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\n", udev->dev->kernel);
                                udev->ignore_device = 1;
                                return 0;
                        }
                        if (rule->ignore_remove) {
                                udev->ignore_remove = 1;
-                               dbg("remove event should be ignored");
+                               dbg("remove event should be ignored\n");
+                       }
+                       if (rule->link_priority != 0) {
+                               udev->link_priority = rule->link_priority;
+                               info("link_priority=%i\n", udev->link_priority);
+                       }
+                       if (rule->event_timeout >= 0) {
+                               udev->event_timeout = rule->event_timeout;
+                               info("event_timeout=%i\n", udev->event_timeout);
                        }
                        /* 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");
+                               dbg("creation of partition nodes requested\n");
                        }
 
                        /* apply permissions */
-                       if (!udev->mode_final && rule->mode != 0000) {
-                               if (rule->mode_operation == KEY_OP_ASSIGN_FINAL)
+                       if (!udev->mode_final && rule->mode.operation != KEY_OP_UNSET) {
+                               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);
+                               udev->mode = strtol(key_val(rule, &rule->mode), NULL, 8);
+                               dbg("applied mode=%#o to '%s'\n", udev->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'\n", 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'\n", 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;
-
-                                       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);
-                                       }
+                               if (rule->symlink.operation == KEY_OP_ASSIGN ||
+                                   rule->symlink.operation == KEY_OP_ASSIGN_FINAL) {
+                                       info("reset symlink list\n");
+                                       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);
-                               info("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\n" , count);
+                               }
+                               dbg("rule applied, added symlink(s) '%s'\n", temp);
                                pos = temp;
                                while (isspace(pos[0]))
                                        pos++;
                                next = strchr(pos, ' ');
                                while (next) {
                                        next[0] = '\0';
-                                       info("add symlink '%s'", pos);
+                                       info("add symlink '%s'\n", pos);
                                        name_list_add(&udev->symlink_list, pos, 0);
                                        while (isspace(next[1]))
                                                next++;
@@ -1027,63 +1470,67 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev, struct s
                                        next = strchr(pos, ' ');
                                }
                                if (pos[0] != '\0') {
-                                       info("add symlink '%s'", pos);
+                                       info("add symlink '%s'\n", pos);
                                        name_list_add(&udev->symlink_list, pos, 0);
                                }
                        }
 
                        /* 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\n", count);
+                               }
 
-                               info("rule applied, '%s' becomes '%s'", udev->kernel_name, udev->name);
-                               if (udev->type != DEV_NET)
-                                       dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i",
+                               info("rule applied, '%s' becomes '%s'\n", 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\n",
                                            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);
-                                       }
+                                       info("reset run list\n");
+                                       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'\n", 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) {
-                               dbg("last rule to be applied");
+                               dbg("last rule to be applied\n");
                                break;
                        }
 
                        if (rule->goto_label.operation != KEY_OP_UNSET) {
-                               dbg("moving forward to label '%s'", key_val(rule, &rule->goto_label));
+                               dbg("moving forward to label '%s'\n", key_val(rule, &rule->goto_label));
                                udev_rules_iter_label(rules, key_val(rule, &rule->goto_label));
                        }
                }
        }
 
        if (!name_set) {
-               strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
-               info("no rule found, will use kernel name '%s'", udev->name);
+               info("no node name set, will use kernel name '%s'\n", udev->dev->kernel);
+               strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
        }
 
        if (udev->tmp_node[0] != '\0') {
-               dbg("removing temporary device node");
+               dbg("removing temporary device node\n");
                unlink_secure(udev->tmp_node);
                udev->tmp_node[0] = '\0';
        }
@@ -1091,10 +1538,12 @@ 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_device *sysfs_device)
+int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 {
        struct udev_rule *rule;
 
+       dbg("udev->kernel='%s'\n", udev->dev->kernel);
+
        /* look for a matching rule to apply */
        udev_rules_iter_init(rules);
        while (1) {
@@ -1102,45 +1551,55 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev, struct sy
                if (rule == NULL)
                        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) {
-                       dbg("skip rule that names a device");
+               dbg("process rule\n");
+               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\n");
                        continue;
                }
 
-               if (match_rule(udev, rule, NULL, sysfs_device) == 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\n", udev->dev->kernel);
                                udev->ignore_device = 1;
                                return 0;
                        }
+                       if (rule->ignore_remove) {
+                               udev->ignore_remove = 1;
+                               dbg("remove event should be ignored\n");
+                       }
 
                        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;
 
-                                       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);
-                                       }
+                               if (rule->run.operation == KEY_OP_ASSIGN ||
+                                   rule->run.operation == KEY_OP_ASSIGN_FINAL) {
+                                       info("reset run list\n");
+                                       name_list_cleanup(&udev->run_list);
                                }
-                               strlcpy(program, key_val(rule, &rule->run), sizeof(program));
-                               apply_format(udev, program, sizeof(program), NULL, sysfs_device);
-                               dbg("add run '%s'", program);
-                               name_list_add(&udev->run_list, program, 0);
+                               dbg("add run '%s'\n", 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;
                        }
 
                        if (rule->last_rule) {
-                               dbg("last rule to be applied");
+                               dbg("last rule to be applied\n");
                                break;
                        }
+
+                       if (rule->goto_label.operation != KEY_OP_UNSET) {
+                               dbg("moving forward to label '%s'\n", key_val(rule, &rule->goto_label));
+                               udev_rules_iter_label(rules, key_val(rule, &rule->goto_label));
+                       }
                }
        }