chiark / gitweb /
log to console if syslog is not available
[elogind.git] / udev_rules.c
index b81943a17c2bfa7ca4b10be4eae08d45d2aca5e5..ad3629d39d1a3017de6a25176d53344f760d0df5 100644 (file)
@@ -1,12 +1,9 @@
 /*
  * udev_rules.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (C) 2003-2005 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.
@@ -30,7 +27,9 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <errno.h>
+#include <syslog.h>
 #include <sys/wait.h>
+#include <sys/stat.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 #include "udev_db.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;
-}
-
 /* extract possible {attr} and move str behind it */
 static char *get_format_attribute(char **str)
 {
@@ -174,21 +120,26 @@ static int get_key(char **line, char **key, char **value)
                linepos++;
 
        /* get the value*/
-       if (linepos[0] == '\0')
-               return -1;
-
        if (linepos[0] == '"') {
                linepos++;
                temp = strchr(linepos, '"');
-               if (!temp)
+               if (!temp) {
+                       dbg("missing closing quote");
                        return -1;
+               }
+               dbg("value is quoted");
                temp[0] = '\0';
        } else if (linepos[0] == '\'') {
                linepos++;
                temp = strchr(linepos, '\'');
-               if (!temp)
+               if (!temp) {
+                       dbg("missing closing quote");
                        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]))
@@ -200,7 +151,7 @@ static int get_key(char **line, char **key, char **value)
        return 0;
 }
 
-static int import_keys_into_env(const char *buf, size_t bufsize)
+static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bufsize)
 {
        char line[LINE_SIZE];
        const char *bufline;
@@ -211,7 +162,7 @@ static int import_keys_into_env(const char *buf, size_t bufsize)
        size_t count;
        int lineno;
 
-       /* loop through the whole file */
+       /* loop through the whole buffer */
        lineno = 0;
        cur = 0;
        while (cur < bufsize) {
@@ -237,11 +188,13 @@ static int import_keys_into_env(const char *buf, size_t bufsize)
                if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
-               strlcpy(line, bufline, count+1);
+               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);
                        setenv(variable, value, 1);
                }
        }
@@ -249,7 +202,7 @@ static int import_keys_into_env(const char *buf, size_t bufsize)
        return 0;
 }
 
-static int import_file_into_env(const char *filename)
+static int import_file_into_env(struct udevice *udev, const char *filename)
 {
        char *buf;
        size_t bufsize;
@@ -258,7 +211,7 @@ static int import_file_into_env(const char *filename)
                err("can't open '%s'", filename);
                return -1;
        }
-       import_keys_into_env(buf, bufsize);
+       import_keys_into_env(udev, buf, bufsize);
        file_unmap(buf, bufsize);
 
        return 0;
@@ -269,41 +222,129 @@ static int import_program_into_env(struct udevice *udev, const char *program)
        char result[1024];
        size_t reslen;
 
-       if (execute_program(program, udev->subsystem, result, sizeof(result), &reslen) != 0)
+       if (run_program(program, udev->subsystem, result, sizeof(result), &reslen, (udev_log_priority >= LOG_INFO)) != 0)
                return -1;
-       return import_keys_into_env(result, reslen);
+       return import_keys_into_env(udev, result, reslen);
 }
 
-/* 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 import_parent_into_env(struct udevice *udev, struct sysfs_class_device *class_dev, const char *filter)
 {
-       char devpath[PATH_SIZE];
+       struct sysfs_class_device *parent = sysfs_get_classdev_parent(class_dev);
+       int rc = -1;
+
+       if (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);
+               /* 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) {
+                               char name[NAME_SIZE];
+                               char *pos;
+
+                               strlcpy(name, name_loop->name, sizeof(name));
+                               pos = strchr(name, '=');
+                               if (pos) {
+                                       pos[0] = '\0';
+                                       pos++;
+                                       if (strcmp_pattern(filter, name) == 0) {
+                                               dbg("import key '%s'", 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);
+                               }
+                       }
+                       rc = 0;
+               } else
+                       dbg("parent not found in database");
+               udev_cleanup_device(&udev_parent);
+       }
+
+       return rc;
+}
+
+static int match_name_and_get_number(const char *base, const char *devname)
+{
+       size_t baselen;
+       char *endptr;
+       int num;
+
+       baselen = strlen(base);
+       if (strncmp(base, devname, baselen) != 0)
+               return -1;
+       if (devname[baselen] == '\0')
+               return 0;
+       if (!isdigit(devname[baselen]))
+               return -1;
+       num = strtoul(&devname[baselen], &endptr, 10);
+       if (endptr[0] != '\0')
+               return -1;
+       return num;
+}
+
+/* finds the lowest positive device number such that <name>N isn't present in the udevdb
+ * if <name> doesn't exist, 0 is returned, N otherwise */
+static int find_free_number(const char *base, const char *devpath)
+{
+       char db_devpath[PATH_SIZE];
        char filename[PATH_SIZE];
+       struct udevice udev_db;
        int num = 0;
 
-       strlcpy(filename, name, sizeof(filename));
+       /* check if the device already owns a matching name */
+       udev_init_device(&udev_db, NULL, NULL, NULL);
+       if (udev_db_get_device(&udev_db, devpath) == 0) {
+               struct name_entry *name_loop;
+               int devnum;
+
+               devnum = match_name_and_get_number(base, udev_db.name);
+               if (devnum >= 0) {
+                       num = devnum;
+                       dbg("device '%s', already has the node '%s' with num %u, use it", devpath, base, num);
+                       goto out;
+               }
+               list_for_each_entry(name_loop, &udev_db.symlink_list, node) {
+                       devnum = match_name_and_get_number(base, name_loop->name);
+                       if (devnum >= 0) {
+                               num = devnum;
+                               dbg("device '%s', already has a symlink '%s' with num %u, use it", devpath, base, num);
+                               goto out;
+                       }
+               }
+       }
+
+       /* just search the database again and again until a free name is found */
+       strlcpy(filename, base, sizeof(filename));
        while (1) {
                dbg("look for existing node '%s'", filename);
-               if (udev_db_search_name(devpath, sizeof(devpath), filename) != 0) {
+               if (udev_db_lookup_name(filename, db_devpath, sizeof(db_devpath)) != 0) {
                        dbg("free num=%d", num);
-                       return num;
+                       break;
                }
 
                num++;
-               if (num > 1000) {
-                       info("find_free_number gone crazy (num=%d), aborted", num);
-                       return -1;
+               if (num > 100000) {
+                       err("find_free_number aborted at num=%d", num);
+                       num = -1;
+                       break;
                }
-               snprintf(filename, sizeof(filename), "%s%d", name, num);
+               snprintf(filename, sizeof(filename), "%s%d", base, num);
                filename[sizeof(filename)-1] = '\0';
        }
+
+out:
+       udev_cleanup_device(&udev_db);
+       return num;
 }
 
 static int find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device,
                                const char *name, char *value, size_t len)
 {
+       struct sysfs_class_device *class_dev_parent;
        struct sysfs_attribute *tmpattr;
 
        dbg("look for device attribute '%s'", name);
@@ -312,6 +353,12 @@ static int find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sys
                tmpattr = sysfs_get_classdev_attr(class_dev, name);
                if (tmpattr)
                        goto attr_found;
+               class_dev_parent = sysfs_get_classdev_parent(class_dev);
+               if (class_dev_parent) {
+                       tmpattr = sysfs_get_classdev_attr(class_dev_parent, name);
+                       if (tmpattr)
+                               goto attr_found;
+               }
        }
        if (sysfs_device) {
                dbg("look for devices attribute '%s/%s'", sysfs_device->path, name);
@@ -323,12 +370,34 @@ static int find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sys
 
 attr_found:
        strlcpy(value, tmpattr->value, len);
-       remove_trailing_char(value, '\n');
+       remove_trailing_chars(value, '\n');
 
        dbg("found attribute '%s'", tmpattr->path);
        return 0;
 }
 
+#define WAIT_LOOP_PER_SECOND                   20
+static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
+{
+       char filename[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);
+
+       while (--loop) {
+               if (stat(filename, &stats) == 0) {
+                       info("file appeared after %i loops", (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
+                       return 0;
+               }
+               usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
+       }
+       info("waiting for '%s' failed", filename);
+       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)
 {
@@ -337,6 +406,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
        char *head, *tail, *pos, *cpos, *attr, *rest;
        int len;
        int i;
+       int count;
        unsigned int next_free_number;
        struct sysfs_class_device *class_dev_parent;
        enum subst_type {
@@ -375,7 +445,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                { .name = "root",               .fmt = 'r',     .type = SUBST_ROOT },
                { .name = "modalias",           .fmt = 'A',     .type = SUBST_MODALIAS },
                { .name = "env",                .fmt = 'E',     .type = SUBST_ENV },
-               {}
+               { NULL, '\0', 0 }
        };
        enum subst_type type;
        const struct subst_map *subst;
@@ -519,12 +589,14 @@ found:
                        i = strlen(temp2);
                        while (i > 0 && isspace(temp2[i-1]))
                                temp2[--i] = '\0';
-                       replace_untrusted_chars(temp2);
+                       count = replace_untrusted_chars(temp2);
+                       if (count)
+                               info("%i untrusted character(s) replaced" , count);
                        strlcat(string, temp2, maxsize);
                        dbg("substitute sysfs value '%s'", temp2);
                        break;
                case SUBST_ENUM:
-                       next_free_number = find_free_number(udev, string);
+                       next_free_number = find_free_number(string, udev->devpath);
                        if (next_free_number > 0) {
                                sprintf(temp2, "%d", next_free_number);
                                strlcat(string, temp2, maxsize);
@@ -575,10 +647,12 @@ found:
                                break;
                        }
                        pos = getenv(attr);
-                       if (pos == NULL)
+                       if (pos == NULL) {
+                               dbg("env '%s' not available", attr);
                                break;
-                       strlcat(string, pos, maxsize);
+                       }
                        dbg("substitute env '%s=%s'", attr, pos);
+                       strlcat(string, pos, maxsize);
                        break;
                default:
                        err("unknown substitution type=%i", type);
@@ -593,215 +667,173 @@ found:
        }
 }
 
+static char *key_val(struct udev_rule *rule, struct key *key)
+{
+       return rule->buf + key->val_off;
+}
+
+static char *key_pair_name(struct udev_rule *rule, struct key_pair *pair)
+{
+       return rule->buf + pair->key_name_off;
+}
+
+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;
+
+       if (key->operation == KEY_OP_UNSET)
+               return 0;
+
+       strlcpy(value, rule->buf + key->val_off, sizeof(value));
+       key_value = value;
+
+       dbg("key %s value='%s'", key_name, key_value);
+       while (key_value) {
+               pos = strchr(key_value, '|');
+               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;
+               }
+               key_value = pos;
+       }
+       dbg("%s is false", key_name);
+       return -1;
+}
+
+/* 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_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
        struct sysfs_device *parent_device = sysfs_device;
+       int i;
 
-       if (rule->action_operation != KEY_OP_UNSET) {
-               dbg("check for " KEY_ACTION " rule->action='%s' udev->action='%s'",
-                   rule->action, udev->action);
-               if (strcmp_pattern(rule->action, udev->action) != 0) {
-                       dbg(KEY_ACTION " is not matching");
-                       if (rule->action_operation != KEY_OP_NOMATCH)
-                               goto exit;
-               } else {
-                       dbg(KEY_ACTION " matches");
-                       if (rule->action_operation == KEY_OP_NOMATCH)
-                               goto exit;
-               }
-               dbg(KEY_ACTION " key is true");
-       }
+       if (match_key("ACTION", rule, &rule->action, udev->action))
+               goto exit;
 
-       if (rule->kernel_operation != KEY_OP_UNSET) {
-               dbg("check for " KEY_KERNEL " rule->kernel='%s' udev_kernel_name='%s'",
-                   rule->kernel, udev->kernel_name);
-               if (strcmp_pattern(rule->kernel, udev->kernel_name) != 0) {
-                       dbg(KEY_KERNEL " is not matching");
-                       if (rule->kernel_operation != KEY_OP_NOMATCH)
-                               goto exit;
-               } else {
-                       dbg(KEY_KERNEL " matches");
-                       if (rule->kernel_operation == KEY_OP_NOMATCH)
-                               goto exit;
-               }
-               dbg(KEY_KERNEL " key is true");
-       }
+       if (match_key("KERNEL", rule, &rule->kernel_name, udev->kernel_name))
+               goto exit;
 
-       if (rule->subsystem_operation != KEY_OP_UNSET) {
-               dbg("check for " KEY_SUBSYSTEM " rule->subsystem='%s' udev->subsystem='%s'",
-                   rule->subsystem, udev->subsystem);
-               if (strcmp_pattern(rule->subsystem, udev->subsystem) != 0) {
-                       dbg(KEY_SUBSYSTEM " is not matching");
-                       if (rule->subsystem_operation != KEY_OP_NOMATCH)
-                               goto exit;
-               } else {
-                       dbg(KEY_SUBSYSTEM " matches");
-                       if (rule->subsystem_operation == KEY_OP_NOMATCH)
-                               goto exit;
-               }
-               dbg(KEY_SUBSYSTEM " key is true");
-       }
+       if (match_key("SUBSYSTEM", rule, &rule->subsystem, udev->subsystem))
+               goto exit;
 
-       if (rule->devpath_operation != KEY_OP_UNSET) {
-               dbg("check for " KEY_DEVPATH " rule->devpath='%s' udev->devpath='%s'",
-                   rule->devpath, udev->devpath);
-               if (strcmp_pattern(rule->devpath, udev->devpath) != 0) {
-                       dbg(KEY_DEVPATH " is not matching");
-                       if (rule->devpath_operation != KEY_OP_NOMATCH)
-                               goto exit;
-               } else {
-                       dbg(KEY_DEVPATH " matches");
-                       if (rule->devpath_operation == KEY_OP_NOMATCH)
-                               goto exit;
-               }
-               dbg(KEY_DEVPATH " key is true");
-       }
+       if (match_key("DEVPATH", rule, &rule->devpath, udev->devpath))
+               goto exit;
 
-       if (rule->modalias_operation != KEY_OP_UNSET) {
+       if (rule->modalias.operation != KEY_OP_UNSET) {
                char value[NAME_SIZE];
 
                if (find_sysfs_attribute(NULL, sysfs_device, "modalias", value, sizeof(value)) != 0) {
-                       dbg(KEY_MODALIAS " value not found");
+                       dbg("MODALIAS value not found");
                        goto exit;
                }
-               dbg("check for " KEY_MODALIAS " rule->modalias='%s' modalias='%s'",
-                   rule->modalias, value);
-               if (strcmp_pattern(rule->modalias, value) != 0) {
-                       dbg(KEY_MODALIAS " is not matching");
-                       if (rule->modalias_operation != KEY_OP_NOMATCH)
-                               goto exit;
-               } else {
-                       dbg(KEY_MODALIAS " matches");
-                       if (rule->modalias_operation == KEY_OP_NOMATCH)
-                               goto exit;
-               }
-               dbg(KEY_MODALIAS " key is true");
+               if (match_key("MODALIAS", rule, &rule->modalias, value))
+                       goto exit;
        }
 
-       if (rule->env_pair_count) {
-               int i;
+       for (i = 0; i < rule->env.count; i++) {
+               struct key_pair *pair = &rule->env.keys[i];
 
-               dbg("check for " KEY_ENV " pairs");
-               for (i = 0; i < rule->env_pair_count; i++) {
-                       struct key_pair *pair;
-                       const char *value;
+               /* we only check for matches, assignments will be handled later */
+               if (pair->key.operation != KEY_OP_ASSIGN) {
+                       const char *key_name = key_pair_name(rule, pair);
+                       const char *value = getenv(key_name);
 
-                       pair = &rule->env_pair[i];
-                       value = getenv(pair->name);
                        if (!value) {
-                               dbg(KEY_ENV "{'%s'} is not found", pair->name);
-                               goto exit;
-                       }
-                       if (strcmp_pattern(pair->value, value) != 0) {
-                               dbg(KEY_ENV "{'%s'} is not matching", pair->name);
-                               if (pair->operation != KEY_OP_NOMATCH)
-                                       goto exit;
-                       } else {
-                               dbg(KEY_ENV "{'%s'} matches", pair->name);
-                               if (pair->operation == KEY_OP_NOMATCH)
-                                       goto exit;
+                               dbg("ENV{'%s'} is not set, treat as empty", key_name);
+                               value = "";
                        }
+                       if (match_key("ENV", rule, &pair->key, value))
+                               goto exit;
+               }
+       }
+
+       if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
+               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;
                }
-               dbg(KEY_ENV " key is true");
+               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;
        }
 
        /* 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 (rule->driver.operation != KEY_OP_UNSET) {
                        if (parent_device == NULL) {
                                dbg("device has no sysfs_device");
                                goto exit;
                        }
-                       dbg("check for " KEY_DRIVER " rule->driver='%s' sysfs_device->driver_name='%s'",
-                           rule->driver, parent_device->driver_name);
-                       if (strcmp_pattern(rule->driver, parent_device->driver_name) != 0) {
-                               dbg(KEY_DRIVER " is not matching");
-                               if (rule->driver_operation != KEY_OP_NOMATCH)
-                                       goto try_parent;
-                       } else {
-                               dbg(KEY_DRIVER " matches");
-                               if (rule->driver_operation == KEY_OP_NOMATCH)
-                                       goto try_parent;
-                       }
-                       dbg(KEY_DRIVER " key is true");
+                       if (match_key("DRIVER", rule, &rule->driver, parent_device->driver_name))
+                               goto try_parent;
                }
 
                /* check for matching bus value */
-               if (rule->bus_operation != KEY_OP_UNSET) {
+               if (rule->bus.operation != KEY_OP_UNSET) {
                        if (parent_device == NULL) {
                                dbg("device has no sysfs_device");
                                goto exit;
                        }
-                       dbg("check for " KEY_BUS " rule->bus='%s' sysfs_device->bus='%s'",
-                           rule->bus, parent_device->bus);
-                       if (strcmp_pattern(rule->bus, parent_device->bus) != 0) {
-                               dbg(KEY_BUS " is not matching");
-                               if (rule->bus_operation != KEY_OP_NOMATCH)
-                                       goto try_parent;
-                       } else {
-                               dbg(KEY_BUS " matches");
-                               if (rule->bus_operation == KEY_OP_NOMATCH)
-                                       goto try_parent;
-                       }
-                       dbg(KEY_BUS " key is true");
+                       if (match_key("BUS", rule, &rule->bus, parent_device->bus))
+                               goto try_parent;
                }
 
                /* check for matching bus id */
-               if (rule->id_operation != KEY_OP_UNSET) {
+               if (rule->id.operation != KEY_OP_UNSET) {
                        if (parent_device == NULL) {
                                dbg("device has no sysfs_device");
                                goto exit;
                        }
-                       dbg("check " KEY_ID);
-                       if (strcmp_pattern(rule->id, parent_device->bus_id) != 0) {
-                               dbg(KEY_ID " is not matching");
-                               if (rule->id_operation != KEY_OP_NOMATCH)
-                                       goto try_parent;
-                       } else {
-                               dbg(KEY_ID " matches");
-                               if (rule->id_operation == KEY_OP_NOMATCH)
-                                       goto try_parent;
-                       }
-                       dbg(KEY_ID " key is true");
+                       if (match_key("ID", rule, &rule->id, parent_device->bus_id))
+                               goto try_parent;
                }
 
                /* check for matching sysfs pairs */
-               if (rule->sysfs_pair_count) {
-                       int i;
-
-                       dbg("check " KEY_SYSFS " pairs");
-                       for (i = 0; i < rule->sysfs_pair_count; i++) {
-                               struct key_pair *pair;
+               if (rule->sysfs.count) {
+                       dbg("check %i SYSFS keys", rule->sysfs.count);
+                       for (i = 0; i < rule->sysfs.count; i++) {
+                               struct key_pair *pair = &rule->sysfs.keys[i];
+                               const char *key_name = key_pair_name(rule, pair);
+                               const char *key_value = key_val(rule, &pair->key);
                                char value[VALUE_SIZE];
                                size_t len;
 
-                               pair = &rule->sysfs_pair[i];
-                               if (find_sysfs_attribute(class_dev, parent_device, pair->name, value, sizeof(value)) != 0)
+                               if (find_sysfs_attribute(class_dev, parent_device, key_name, value, sizeof(value)) != 0)
                                        goto try_parent;
 
                                /* strip trailing whitespace of value, if not asked to match for it */
-                               len = strlen(pair->value);
-                               if (len && !isspace(pair->value[len-1])) {
+                               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 %i trailing whitespace chars from '%s'", strlen(value)-len, value);
+                                       dbg("removed %zi trailing whitespace chars from '%s'", strlen(value)-len, value);
                                }
 
-                               dbg("compare attribute '%s' value '%s' with '%s'", pair->name, value, pair->value);
-                               if (strcmp_pattern(pair->value, value) != 0) {
-                                       dbg(KEY_SYSFS "{'%s'} is not matching", pair->name);
-                                       if (pair->operation != KEY_OP_NOMATCH)
-                                               goto try_parent;
-                               } else {
-                                       dbg(KEY_SYSFS "{'%s'} matches", pair->name);
-                                       if (pair->operation == KEY_OP_NOMATCH)
-                                               goto try_parent;
-                               }
+                               if (match_key("SYSFS", rule, &pair->key, value))
+                                       goto try_parent;
                        }
-                       dbg(KEY_SYSFS " keys are true");
+                       dbg("all %i SYSFS keys matched", rule->sysfs.count);
                }
 
                /* found matching physical device  */
@@ -815,83 +847,91 @@ try_parent:
                dbg("look at sysfs_device->bus_id='%s'", parent_device->bus_id);
        }
 
-       /* import variables from file into environment */
-       if (rule->import_operation != KEY_OP_UNSET) {
-               char import[PATH_SIZE];
-               int rc = -1;
-
-               strlcpy(import, rule->import, sizeof(import));
-               apply_format(udev, import, sizeof(import), class_dev, sysfs_device);
-               dbg("check for " KEY_IMPORT " import='%s'", import);
-               if (rule->import_exec) {
-                       dbg("run executable file import='%s'", import);
-                       rc = import_program_into_env(udev, import);
-               } else {
-                       dbg("import file import='%s'", import);
-                       rc = import_file_into_env(import);
-               }
-               if (rc) {
-                       dbg(KEY_IMPORT " failed");
-                       if (rule->import_operation != KEY_OP_NOMATCH)
-                               goto exit;
-               } else
-                       dbg(KEY_IMPORT " '%s' imported", rule->import);
-               dbg(KEY_IMPORT " key is true");
-       }
-
        /* execute external program */
-       if (rule->program_operation != KEY_OP_UNSET) {
+       if (rule->program.operation != KEY_OP_UNSET) {
                char program[PATH_SIZE];
                char result[PATH_SIZE];
 
-               strlcpy(program, rule->program, sizeof(program));
+               strlcpy(program, key_val(rule, &rule->program), sizeof(program));
                apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
-               dbg("check for " KEY_PROGRAM " program='%s", program);
-               if (execute_program(program, udev->subsystem, result, sizeof(result), NULL) != 0) {
-                       dbg(KEY_PROGRAM " is not matching");
-                       if (rule->program_operation != KEY_OP_NOMATCH)
+               if (run_program(program, udev->subsystem, result, sizeof(result), NULL, (udev_log_priority >= LOG_INFO)) != 0) {
+                       dbg("PROGRAM is false");
+                       udev->program_result[0] = '\0';
+                       if (rule->program.operation != KEY_OP_NOMATCH)
                                goto exit;
                } else {
-                       dbg(KEY_PROGRAM " matches");
-                       remove_trailing_char(result, '\n');
-                       replace_untrusted_chars(result);
+                       int count;
+
+                       dbg("PROGRAM matches");
+                       remove_trailing_chars(result, '\n');
+                       count = replace_untrusted_chars(result);
+                       if (count)
+                               info("%i untrusted character(s) replaced" , count);
                        dbg("result is '%s'", result);
                        strlcpy(udev->program_result, result, sizeof(udev->program_result));
-                       dbg(KEY_PROGRAM " returned successful");
-                       if (rule->program_operation == KEY_OP_NOMATCH)
+                       dbg("PROGRAM returned successful");
+                       if (rule->program.operation == KEY_OP_NOMATCH)
                                goto exit;
                }
-               dbg(KEY_PROGRAM " key is true");
+               dbg("PROGRAM key is true");
        }
 
        /* check for matching result of external program */
-       if (rule->result_operation != KEY_OP_UNSET) {
-               dbg("check for " KEY_RESULT " rule->result='%s', udev->program_result='%s'",
-                  rule->result, udev->program_result);
-               if (strcmp_pattern(rule->result, udev->program_result) != 0) {
-                       dbg(KEY_RESULT " is not matching");
-                       if (rule->result_operation != KEY_OP_NOMATCH)
-                               goto exit;
-               } else {
-                       dbg(KEY_RESULT " matches");
-                       if (rule->result_operation == KEY_OP_NOMATCH)
+       if (match_key("RESULT", rule, &rule->result, udev->program_result))
+               goto exit;
+
+       /* 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);
+               if (rule->import_type == IMPORT_PROGRAM) {
+                       rc = import_program_into_env(udev, import);
+               } else if (rule->import_type == IMPORT_FILE) {
+                       dbg("import file import='%s'", import);
+                       rc = import_file_into_env(udev, import);
+               } else if (rule->import_type == IMPORT_PARENT && class_dev) {
+                       dbg("import parent import='%s'", import);
+                       rc = import_parent_into_env(udev, class_dev, import);
+               }
+               if (rc) {
+                       dbg("IMPORT failed");
+                       if (rule->import.operation != KEY_OP_NOMATCH)
                                goto exit;
+               } else
+                       dbg("IMPORT '%s' imported", key_val(rule, &rule->import));
+               dbg("IMPORT key is true");
+       }
+
+       /* 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];
+
+               if (pair->key.operation == KEY_OP_ASSIGN) {
+                       const char *key_name = key_pair_name(rule, pair);
+                       const char *value = key_val(rule, &pair->key);
+
+                       name_list_key_add(&udev->env_list, key_name, value);
+                       setenv(key_name, value, 1);
+                       dbg("export ENV '%s=%s'", key_name, value);
                }
-               dbg(KEY_RESULT " key is true");
        }
 
-       /* rule matches */
        return 0;
 
 exit:
        return -1;
 }
 
-int udev_rules_get_name(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)
 {
        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);
 
@@ -917,13 +957,13 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
        dbg("udev->kernel_name='%s'", udev->kernel_name);
 
        /* look for a matching rule to apply */
-       udev_rules_iter_init();
+       udev_rules_iter_init(rules);
        while (1) {
-               rule = udev_rules_iter_next();
+               rule = udev_rules_iter_next(rules);
                if (rule == NULL)
                        break;
 
-               if (udev->name_set && rule->name_operation != KEY_OP_UNSET) {
+               if (name_set && rule->name.operation != KEY_OP_UNSET) {
                        dbg("node name already set, rule ignored");
                        continue;
                }
@@ -932,8 +972,7 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
                if (match_rule(udev, rule, class_dev, sysfs_device) == 0) {
                        /* apply options */
                        if (rule->ignore_device) {
-                               info("configured rule in '%s[%i]' applied, '%s' is ignored",
-                                    rule->config_file, rule->config_line, udev->kernel_name);
+                               info("rule applied, '%s' is ignored", udev->kernel_name);
                                udev->ignore_device = 1;
                                return 0;
                        }
@@ -952,114 +991,108 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
                                if (rule->mode_operation == KEY_OP_ASSIGN_FINAL)
                                        udev->mode_final = 1;
                                udev->mode = rule->mode;
-                               dbg("applied mode=%#o to '%s'", udev->mode, udev->kernel_name);
+                               dbg("applied mode=%#o to '%s'", rule->mode, udev->kernel_name);
                        }
-                       if (!udev->owner_final && rule->owner[0] != '\0') {
-                               if (rule->owner_operation == KEY_OP_ASSIGN_FINAL)
+                       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, rule->owner, sizeof(udev->owner));
+                               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);
                        }
-                       if (!udev->group_final && rule->group[0] != '\0') {
-                               if (rule->group_operation == KEY_OP_ASSIGN_FINAL)
+                       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, rule->group, sizeof(udev->group));
+                               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);
                        }
 
                        /* collect symlinks */
-                       if (!udev->symlink_final && rule->symlink_operation != KEY_OP_UNSET) {
+                       if (!udev->symlink_final && rule->symlink.operation != KEY_OP_UNSET) {
                                char temp[PATH_SIZE];
                                char *pos, *next;
+                               int count;
 
-                               if (rule->symlink_operation == KEY_OP_ASSIGN_FINAL)
+                               if (rule->symlink.operation == KEY_OP_ASSIGN_FINAL)
                                        udev->symlink_final = 1;
-                               if (rule->symlink_operation == KEY_OP_ASSIGN || rule->symlink_operation == KEY_OP_ASSIGN_FINAL) {
-                                       struct name_entry *name_loop;
-                                       struct name_entry *temp_loop;
-
+                               if (rule->symlink.operation == KEY_OP_ASSIGN || rule->symlink.operation == KEY_OP_ASSIGN_FINAL) {
                                        info("reset symlink list");
-                                       list_for_each_entry_safe(name_loop, temp_loop, &udev->symlink_list, node) {
-                                               list_del(&name_loop->node);
-                                               free(name_loop);
-                                       }
+                                       name_list_cleanup(&udev->symlink_list);
                                }
-                               if (rule->symlink[0] != '\0') {
-                                       info("configured rule in '%s[%i]' applied, added symlink '%s'",
-                                            rule->config_file, rule->config_line, rule->symlink);
-                                       strlcpy(temp, rule->symlink, sizeof(temp));
-                                       apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
-
-                                       /* add multiple symlinks separated by spaces */
-                                       pos = temp;
-                                       next = strchr(temp, ' ');
-                                       while (next) {
-                                               next[0] = '\0';
-                                               info("add symlink '%s'", pos);
-                                               name_list_add(&udev->symlink_list, pos, 0);
-                                               pos = &next[1];
-                                               next = strchr(pos, ' ');
-                                       }
+                               strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp));
+                               apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
+                               count = replace_untrusted_chars(temp);
+                               if (count)
+                                       info("%i untrusted character(s) replaced" , count);
+                               dbg("rule applied, added symlink(s) '%s'", temp);
+
+                               /* add multiple symlinks separated by spaces */
+                               pos = temp;
+                               while (isspace(pos[0]))
+                                       pos++;
+                               next = strchr(pos, ' ');
+                               while (next) {
+                                       next[0] = '\0';
+                                       info("add symlink '%s'", pos);
+                                       name_list_add(&udev->symlink_list, pos, 0);
+                                       while (isspace(next[1]))
+                                               next++;
+                                       pos = &next[1];
+                                       next = strchr(pos, ' ');
+                               }
+                               if (pos[0] != '\0') {
                                        info("add symlink '%s'", 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) {
-                               udev->name_set = 1;
-                               if (rule->name[0] == '\0') {
-                                       info("configured rule in '%s[%i]' applied, node handling for '%s' supressed",
-                                            rule->config_file, rule->config_line, udev->kernel_name);
-                               } else {
-                                       strlcpy(udev->name, rule->name, sizeof(udev->name));
-                                       apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
-                                       strlcpy(udev->config_file, rule->config_file, sizeof(udev->config_file));
-                                       udev->config_line = rule->config_line;
-
-                                       info("configured rule in '%s:%i' applied, '%s' becomes '%s'",
-                                            rule->config_file, rule->config_line, udev->kernel_name, rule->name);
-                                       if (udev->type != DEV_NET)
-                                               dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i",
-                                                   udev->name, udev->owner, udev->group, udev->mode, udev->partitions);
-                               }
+                       if (rule->name.operation != KEY_OP_UNSET) {
+                               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);
+                               count = replace_untrusted_chars(udev->name);
+                               if (count)
+                                       info("%i untrusted character(s) replaced", 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",
+                                           udev->name, udev->owner, udev->group, udev->mode, udev->partitions);
                        }
 
-                       if (!udev->run_final && rule->run_operation != KEY_OP_UNSET) {
+                       if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
                                char program[PATH_SIZE];
 
-                               if (rule->run_operation == KEY_OP_ASSIGN_FINAL)
+                               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;
-
+                               if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
                                        info("reset run list");
-                                       list_for_each_entry_safe(name_loop, temp_loop, &udev->run_list, node) {
-                                               list_del(&name_loop->node);
-                                               free(name_loop);
-                                       }
-                               }
-                               if (rule->run[0] != '\0') {
-                                       strlcpy(program, 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);
+                                       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);
                        }
 
                        if (rule->last_rule) {
                                dbg("last rule to be applied");
                                break;
                        }
+
+                       if (rule->goto_label.operation != KEY_OP_UNSET) {
+                               dbg("moving forward to label '%s'", key_val(rule, &rule->goto_label));
+                               udev_rules_iter_label(rules, key_val(rule, &rule->goto_label));
+                       }
                }
        }
 
-       if (udev->name[0] == '\0') {
+       if (!name_set) {
                strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
-               info("no rule found, use kernel name '%s'", udev->name);
+               info("no node name set, will use kernel name '%s'", udev->name);
        }
 
        if (udev->tmp_node[0] != '\0') {
@@ -1071,55 +1104,54 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
        return 0;
 }
 
-int udev_rules_get_run(struct udevice *udev, struct sysfs_device *sysfs_device)
+int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev,
+                      struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_dev)
 {
        struct udev_rule *rule;
 
+       if (class_dev && !sysfs_dev)
+               sysfs_dev = sysfs_get_classdev_device(class_dev);
+       if (sysfs_dev) {
+               dbg("found devices device: path='%s', bus_id='%s', bus='%s'",
+                   sysfs_dev->path, sysfs_dev->bus_id, sysfs_dev->bus);
+               strlcpy(udev->bus_id, sysfs_dev->bus_id, sizeof(udev->bus_id));
+       }
+
+       dbg("udev->kernel_name='%s'", udev->kernel_name);
+
        /* look for a matching rule to apply */
-       udev_rules_iter_init();
+       udev_rules_iter_init(rules);
        while (1) {
-               rule = udev_rules_iter_next();
+               rule = udev_rules_iter_next(rules);
                if (rule == NULL)
                        break;
 
                dbg("process rule");
-               if (rule->run_operation == KEY_OP_UNSET)
-                       continue;
-
-               if (rule->name_operation != KEY_OP_UNSET || rule->symlink_operation != KEY_OP_UNSET ||
-                   rule->mode != 0000 || rule->owner[0] != '\0' || rule->group[0] != '\0') {
+               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");
                        continue;
                }
 
-               if (match_rule(udev, rule, NULL, sysfs_device) == 0) {
+               if (match_rule(udev, rule, class_dev, sysfs_dev) == 0) {
                        if (rule->ignore_device) {
-                               info("configured rule in '%s[%i]' applied, '%s' is ignored",
-                                    rule->config_file, rule->config_line, udev->kernel_name);
+                               info("rule applied, '%s' is ignored", udev->kernel_name);
                                udev->ignore_device = 1;
                                return 0;
                        }
 
-                       if (!udev->run_final && rule->run_operation != KEY_OP_UNSET) {
+                       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;
-
+                               if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
                                        info("reset run list");
-                                       list_for_each_entry_safe(name_loop, temp_loop, &udev->run_list, node) {
-                                               list_del(&name_loop->node);
-                                               free(name_loop);
-                                       }
+                                       name_list_cleanup(&udev->run_list);
                                }
-                               if (rule->run[0] != '\0') {
-                                       strlcpy(program, 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);
-                               }
-                               if (rule->run_operation == KEY_OP_ASSIGN_FINAL)
+                               strlcpy(program, key_val(rule, &rule->run), sizeof(program));
+                               apply_format(udev, program, sizeof(program), class_dev, sysfs_dev);
+                               dbg("add run '%s'", program);
+                               name_list_add(&udev->run_list, program, 0);
+                               if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
                                        break;
                        }
 
@@ -1127,6 +1159,11 @@ int udev_rules_get_run(struct udevice *udev, struct sysfs_device *sysfs_device)
                                dbg("last rule to be applied");
                                break;
                        }
+
+                       if (rule->goto_label.operation != KEY_OP_UNSET) {
+                               dbg("moving forward to label '%s'", key_val(rule, &rule->goto_label));
+                               udev_rules_iter_label(rules, key_val(rule, &rule->goto_label));
+                       }
                }
        }