chiark / gitweb /
rules: static_node - use 0660 if group is given to get the cigar
[elogind.git] / udev / udev-rules.c
index 52f121c29a73181eaac0db3292cc90be49ec2df1..56a258d8adb920638ccd511f4ec5b1579f697215 100644 (file)
@@ -136,9 +136,11 @@ enum token_type {
        TK_M_SUBSYSTEMS,                /* val */
        TK_M_DRIVERS,                   /* val */
        TK_M_ATTRS,                     /* val, attr */
+       TK_M_TAGS,                      /* val */
        TK_M_PARENTS_MAX,
 
        TK_M_TEST,                      /* val, mode_t */
+       TK_M_EVENT_TIMEOUT,             /* int */
        TK_M_PROGRAM,                   /* val */
        TK_M_IMPORT_FILE,               /* val */
        TK_M_IMPORT_PROG,               /* val */
@@ -150,6 +152,7 @@ enum token_type {
 
        TK_A_STRING_ESCAPE_NONE,
        TK_A_STRING_ESCAPE_REPLACE,
+       TK_A_DB_PERSIST,
        TK_A_INOTIFY_WATCH,             /* int */
        TK_A_DEVLINK_PRIO,              /* int */
        TK_A_OWNER,                     /* val */
@@ -163,7 +166,6 @@ enum token_type {
        TK_A_TAG,                       /* val */
        TK_A_NAME,                      /* val */
        TK_A_DEVLINK,                   /* val */
-       TK_A_EVENT_TIMEOUT,             /* int */
        TK_A_ATTR,                      /* val, attr */
        TK_A_RUN,                       /* val, bool */
        TK_A_GOTO,                      /* size_t */
@@ -270,9 +272,11 @@ static const char *token_str(enum token_type type)
                [TK_M_SUBSYSTEMS] =             "M SUBSYSTEMS",
                [TK_M_DRIVERS] =                "M DRIVERS",
                [TK_M_ATTRS] =                  "M ATTRS",
+               [TK_M_TAGS] =                   "M TAGS",
                [TK_M_PARENTS_MAX] =            "M PARENTS_MAX",
 
                [TK_M_TEST] =                   "M TEST",
+               [TK_M_EVENT_TIMEOUT] =          "M EVENT_TIMEOUT",
                [TK_M_PROGRAM] =                "M PROGRAM",
                [TK_M_IMPORT_FILE] =            "M IMPORT_FILE",
                [TK_M_IMPORT_PROG] =            "M IMPORT_PROG",
@@ -284,6 +288,7 @@ static const char *token_str(enum token_type type)
 
                [TK_A_STRING_ESCAPE_NONE] =     "A STRING_ESCAPE_NONE",
                [TK_A_STRING_ESCAPE_REPLACE] =  "A STRING_ESCAPE_REPLACE",
+               [TK_A_DB_PERSIST] =             "A DB_PERSIST",
                [TK_A_INOTIFY_WATCH] =          "A INOTIFY_WATCH",
                [TK_A_DEVLINK_PRIO] =           "A DEVLINK_PRIO",
                [TK_A_OWNER] =                  "A OWNER",
@@ -297,7 +302,6 @@ static const char *token_str(enum token_type type)
                [TK_A_TAG] =                    "A ENV",
                [TK_A_NAME] =                   "A NAME",
                [TK_A_DEVLINK] =                "A DEVLINK",
-               [TK_A_EVENT_TIMEOUT] =          "A EVENT_TIMEOUT",
                [TK_A_ATTR] =                   "A ATTR",
                [TK_A_RUN] =                    "A RUN",
                [TK_A_GOTO] =                   "A GOTO",
@@ -340,6 +344,7 @@ static void dump_token(struct udev_rules *rules, struct token *token)
        case TK_M_KERNELS:
        case TK_M_SUBSYSTEMS:
        case TK_M_DRIVERS:
+       case TK_M_TAGS:
        case TK_M_PROGRAM:
        case TK_M_IMPORT_FILE:
        case TK_M_IMPORT_PROG:
@@ -370,6 +375,7 @@ static void dump_token(struct udev_rules *rules, struct token *token)
                break;
        case TK_A_STRING_ESCAPE_NONE:
        case TK_A_STRING_ESCAPE_REPLACE:
+       case TK_A_DB_PERSIST:
                dbg(rules->udev, "%s\n", token_str(type));
                break;
        case TK_M_TEST:
@@ -394,7 +400,7 @@ static void dump_token(struct udev_rules *rules, struct token *token)
        case TK_A_STATIC_NODE:
                dbg(rules->udev, "%s '%s'\n", token_str(type), value);
                break;
-       case TK_A_EVENT_TIMEOUT:
+       case TK_M_EVENT_TIMEOUT:
                dbg(rules->udev, "%s %u\n", token_str(type), token->key.event_timeout);
                break;
        case TK_A_GOTO:
@@ -728,7 +734,7 @@ static int import_property_from_string(struct udev_device *dev, char *line)
                entry = udev_device_add_property(dev, key, val);
                /* store in db, skip private keys */
                if (key[0] != '.')
-                       udev_list_entry_set_flags(entry, 1);
+                       udev_list_entry_set_num(entry, true);
        }
        return 0;
 }
@@ -747,17 +753,18 @@ static int import_file_into_properties(struct udev_device *dev, const char *file
        return 0;
 }
 
-static int import_program_into_properties(struct udev_device *dev, const char *program)
+static int import_program_into_properties(struct udev_event *event, const char *program, const sigset_t *sigmask)
 {
-       struct udev *udev = udev_device_get_udev(dev);
+       struct udev_device *dev = event->dev;
        char **envp;
-       char result[4096];
-       size_t reslen;
+       char result[UTIL_LINE_SIZE];
        char *line;
+       int err;
 
        envp = udev_device_get_properties_envp(dev);
-       if (util_run_program(udev, program, envp, result, sizeof(result), &reslen, NULL, false) != 0)
-               return -1;
+       err = udev_event_spawn(event, program, envp, sigmask, result, sizeof(result));
+       if (err < 0)
+               return err;
 
        line = result;
        while (line != NULL) {
@@ -796,7 +803,7 @@ static int import_parent_into_properties(struct udev_device *dev, const char *fi
                        entry = udev_device_add_property(dev, key, val);
                        /* store in db, skip private keys */
                        if (key[0] != '.')
-                               udev_list_entry_set_flags(entry, 1);
+                               udev_list_entry_set_num(entry, true);
                }
        }
        return 0;
@@ -1009,6 +1016,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
        case TK_M_KERNELS:
        case TK_M_SUBSYSTEMS:
        case TK_M_DRIVERS:
+       case TK_M_TAGS:
        case TK_M_PROGRAM:
        case TK_M_IMPORT_FILE:
        case TK_M_IMPORT_PROG:
@@ -1045,6 +1053,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
                break;
        case TK_A_STRING_ESCAPE_NONE:
        case TK_A_STRING_ESCAPE_REPLACE:
+       case TK_A_DB_PERSIST:
                break;
        case TK_A_RUN:
                token->key.value_off = add_string(rule_tmp->rules, value);
@@ -1066,7 +1075,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
        case TK_A_STATIC_NODE:
                token->key.value_off = add_string(rule_tmp->rules, value);
                break;
-       case TK_A_EVENT_TIMEOUT:
+       case TK_M_EVENT_TIMEOUT:
                token->key.event_timeout = *(int *)data;
                break;
        case TK_RULE:
@@ -1337,6 +1346,15 @@ static int add_rule(struct udev_rules *rules, char *line,
                        continue;
                }
 
+               if (strcmp(key, "TAGS") == 0) {
+                       if (op > OP_MATCH_MAX) {
+                               err(rules->udev, "invalid TAGS operation\n");
+                               goto invalid;
+                       }
+                       rule_add_key(&rule_tmp, TK_M_TAGS, op, value, NULL);
+                       continue;
+               }
+
                if (strncmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
                        if (!sysfs_warn) {
                                sysfs_warn = true;
@@ -1572,13 +1590,15 @@ static int add_rule(struct udev_rules *rules, char *line,
                                rule_add_key(&rule_tmp, TK_A_DEVLINK_PRIO, op, NULL, &prio);
                                dbg(rules->udev, "link priority=%i\n", prio);
                        }
+
                        pos = strstr(value, "event_timeout=");
                        if (pos != NULL) {
                                int tout = atoi(&pos[strlen("event_timeout=")]);
 
-                               rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, op, NULL, &tout);
+                               rule_add_key(&rule_tmp, TK_M_EVENT_TIMEOUT, op, NULL, &tout);
                                dbg(rules->udev, "event timeout=%i\n", tout);
                        }
+
                        pos = strstr(value, "string_escape=");
                        if (pos != NULL) {
                                pos = &pos[strlen("string_escape=")];
@@ -1587,6 +1607,11 @@ static int add_rule(struct udev_rules *rules, char *line,
                                else if (strncmp(pos, "replace", strlen("replace")) == 0)
                                        rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, op, NULL, NULL);
                        }
+
+                       pos = strstr(value, "db_persist");
+                       if (pos != NULL)
+                               rule_add_key(&rule_tmp, TK_A_DB_PERSIST, op, NULL, NULL);
+
                        pos = strstr(value, "nowatch");
                        if (pos != NULL) {
                                const int off = 0;
@@ -1602,11 +1627,13 @@ static int add_rule(struct udev_rules *rules, char *line,
                                        dbg(rules->udev, "inotify watch of device requested\n");
                                }
                        }
+
                        pos = strstr(value, "static_node=");
                        if (pos != NULL) {
                                rule_add_key(&rule_tmp, TK_A_STATIC_NODE, op, &pos[strlen("static_node=")], NULL);
                                rule_tmp.rule.rule.has_static_node = true;
                        }
+
                        continue;
                }
                err(rules->udev, "unknown key '%s' in %s:%u\n", key, filename, lineno);
@@ -1705,6 +1732,7 @@ static int parse_file(struct udev_rules *rules, const char *filename, unsigned s
 static int add_matching_files(struct udev *udev, struct udev_list_node *file_list, const char *dirname, const char *suffix)
 {
        DIR *dir;
+       struct dirent *dent;
        char filename[UTIL_PATH_SIZE];
 
        dbg(udev, "open directory '%s'\n", dirname);
@@ -1714,13 +1742,7 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
                return -1;
        }
 
-       for (;;) {
-               struct dirent *dent;
-
-               dent = readdir(dir);
-               if (dent == NULL || dent->d_name[0] == '\0')
-                       break;
-
+       for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
                if (dent->d_name[0] == '.')
                        continue;
 
@@ -1736,7 +1758,12 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
                }
                util_strscpyl(filename, sizeof(filename), dirname, "/", dent->d_name, NULL);
                dbg(udev, "put file '%s' into list\n", filename);
-               udev_list_entry_add(udev, file_list, filename, NULL, 1, 1);
+               /*
+                * the basename is the key, the filename the value
+                * identical basenames from different directories overwrite each other
+                * entries are sorted after basename
+                */
+               udev_list_entry_add(udev, file_list, dent->d_name, filename, UDEV_LIST_UNIQUE|UDEV_LIST_SORT);
        }
 
        closedir(dir);
@@ -1746,9 +1773,8 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
 struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 {
        struct udev_rules *rules;
-       struct stat statbuf;
        struct udev_list_node file_list;
-       struct udev_list_entry *file_loop, *file_tmp;
+       struct udev_list_entry *file_loop;
        struct token end_token;
 
        rules = calloc(1, sizeof(struct udev_rules));
@@ -1791,85 +1817,55 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
        memset(rules->trie_nodes, 0x00, sizeof(struct trie_node));
        rules->trie_nodes_cur = 1;
 
-       if (udev_get_rules_path(udev) != NULL) {
-               /* custom rules location for testing */
-               add_matching_files(udev, &file_list, udev_get_rules_path(udev), ".rules");
-       } else {
-               char filename[PATH_MAX];
-               struct udev_list_node sort_list;
-               struct udev_list_entry *sort_loop, *sort_tmp;
-
-               /* read user/custom rules */
-               add_matching_files(udev, &file_list, SYSCONFDIR "/udev/rules.d", ".rules");
-
-               /* read dynamic/temporary rules */
-               util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/rules.d", NULL);
-               udev_list_init(&sort_list);
-               add_matching_files(udev, &sort_list, filename, ".rules");
-
-               /* read default rules */
-               add_matching_files(udev, &sort_list, LIBEXECDIR "/rules.d", ".rules");
+       if (udev_get_rules_path(udev) == NULL) {
+               char filename[UTIL_PATH_SIZE];
 
-               /* sort all rules files by basename into list of files */
-               udev_list_entry_foreach_safe(sort_loop, sort_tmp, udev_list_get_entry(&sort_list)) {
-                       const char *sort_name = udev_list_entry_get_name(sort_loop);
-                       const char *sort_base = strrchr(sort_name, '/');
+               /* /lib/udev -- default/package rules */
+               add_matching_files(udev, &file_list, LIBEXECDIR "/rules.d", ".rules");
 
-                       if (sort_base == NULL)
-                               continue;
-                       /* sort entry into existing list */
-                       udev_list_entry_foreach_safe(file_loop, file_tmp, udev_list_get_entry(&file_list)) {
-                               const char *file_name = udev_list_entry_get_name(file_loop);
-                               const char *file_base = strrchr(file_name, '/');
+               /* /etc/udev -- system-specific/user/admin rules */
+               add_matching_files(udev, &file_list, SYSCONFDIR "/udev/rules.d", ".rules");
 
-                               if (file_base == NULL)
-                                       continue;
-                               if (strcmp(file_base, sort_base) == 0) {
-                                       info(udev, "rule file basename '%s' already added, ignoring '%s'\n",
-                                            file_name, sort_name);
-                                       udev_list_entry_delete(sort_loop);
-                                       sort_loop = NULL;
-                                       break;
-                               }
-                               if (strcmp(file_base, sort_base) > 0) {
-                                       /* found later file, insert before */
-                                       udev_list_entry_remove(sort_loop);
-                                       udev_list_entry_insert_before(sort_loop, file_loop);
-                                       sort_loop = NULL;
-                                       break;
-                               }
-                       }
-                       /* current file already handled */
-                       if (sort_loop == NULL)
-                               continue;
-                       /* no later file, append to end of list */
-                       udev_list_entry_remove(sort_loop);
-                       udev_list_entry_append(sort_loop, &file_list);
-               }
+               /* /run/udev -- throw-away/temporary rules */
+               util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL);
+               add_matching_files(udev, &file_list, filename, ".rules");
+       } else {
+               /* custom rules files location for testing */
+               add_matching_files(udev, &file_list, udev_get_rules_path(udev), ".rules");
        }
 
        /* add all filenames to the string buffer */
        udev_list_entry_foreach(file_loop, udev_list_get_entry(&file_list)) {
-               const char *filename = udev_list_entry_get_name(file_loop);
+               const char *filename = udev_list_entry_get_value(file_loop);
                unsigned int filename_off;
 
                filename_off = add_string(rules, filename);
                /* the offset in the rule is limited to unsigned short */
                if (filename_off < USHRT_MAX)
-                       udev_list_entry_set_flags(file_loop, filename_off);
+                       udev_list_entry_set_num(file_loop, filename_off);
        }
 
-       /* parse list of files */
-       udev_list_entry_foreach_safe(file_loop, file_tmp, udev_list_get_entry(&file_list)) {
-               const char *filename = udev_list_entry_get_name(file_loop);
-               unsigned int filename_off = udev_list_entry_get_flags(file_loop);
+       /* parse all rules files */
+       udev_list_entry_foreach(file_loop, udev_list_get_entry(&file_list)) {
+               const char *filename = udev_list_entry_get_value(file_loop);
+               unsigned int filename_off = udev_list_entry_get_num(file_loop);
+               struct stat st;
 
-               if (stat(filename, &statbuf) == 0 && statbuf.st_size > 0)
-                       parse_file(rules, filename, filename_off);
-               else
-                       err(udev, "can not read '%s'\n", filename);
-               udev_list_entry_delete(file_loop);
+               if (stat(filename, &st) != 0) {
+                       err(udev, "can not find '%s': %m\n", filename);
+                       continue;
+               }
+               if (S_ISREG(st.st_mode) && st.st_size <= 0) {
+                       info(udev, "ignore empty '%s'\n", filename);
+                       continue;
+               }
+               if (S_ISCHR(st.st_mode)) {
+                       info(udev, "ignore masked '%s'\n", filename);
+                       continue;
+               }
+               parse_file(rules, filename, filename_off);
        }
+       udev_list_cleanup_entries(udev, &file_list);
 
        memset(&end_token, 0x00, sizeof(struct token));
        end_token.type = TK_END;
@@ -2068,7 +2064,7 @@ enum escape_type {
        ESCAPE_REPLACE,
 };
 
-int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event)
+int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event, const sigset_t *sigmask)
 {
        struct token *cur;
        struct token *rule;
@@ -2080,7 +2076,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
        can_set_name = ((strcmp(udev_device_get_action(event->dev), "remove") != 0) &&
                        (major(udev_device_get_devnum(event->dev)) > 0 ||
-                        strcmp(udev_device_get_subsystem(event->dev), "net") == 0));
+                        udev_device_get_ifindex(event->dev) > 0));
 
        /* loop through token list, match, run actions or forward to next rule */
        cur = &rules->tokens[0];
@@ -2108,58 +2104,55 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        if (match_key(rules, cur, udev_device_get_sysname(event->dev)) != 0)
                                goto nomatch;
                        break;
-               case TK_M_DEVLINK:
-                       {
-                               size_t devlen = strlen(udev_get_dev_path(event->udev))+1;
-                               struct udev_list_entry *list_entry;
-                               bool match = false;
-
-                               udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(event->dev)) {
-                                       const char *devlink;
-
-                                       devlink =  &udev_list_entry_get_name(list_entry)[devlen];
-                                       if (match_key(rules, cur, devlink) == 0) {
-                                               match = true;
-                                               break;
-                                       }
+               case TK_M_DEVLINK: {
+                       size_t devlen = strlen(udev_get_dev_path(event->udev))+1;
+                       struct udev_list_entry *list_entry;
+                       bool match = false;
+
+                       udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(event->dev)) {
+                               const char *devlink;
+
+                               devlink =  &udev_list_entry_get_name(list_entry)[devlen];
+                               if (match_key(rules, cur, devlink) == 0) {
+                                       match = true;
+                                       break;
                                }
-                               if (!match)
-                                       goto nomatch;
-                               break;
                        }
+                       if (!match)
+                               goto nomatch;
+                       break;
+               }
                case TK_M_NAME:
                        if (match_key(rules, cur, event->name) != 0)
                                goto nomatch;
                        break;
-               case TK_M_ENV:
-                       {
-                               const char *key_name = &rules->buf[cur->key.attr_off];
-                               const char *value;
-
-                               value = udev_device_get_property_value(event->dev, key_name);
-                               if (value == NULL) {
-                                       dbg(event->udev, "ENV{%s} is not set, treat as empty\n", key_name);
-                                       value = "";
-                               }
-                               if (match_key(rules, cur, value))
-                                       goto nomatch;
-                               break;
+               case TK_M_ENV: {
+                       const char *key_name = &rules->buf[cur->key.attr_off];
+                       const char *value;
+
+                       value = udev_device_get_property_value(event->dev, key_name);
+                       if (value == NULL) {
+                               dbg(event->udev, "ENV{%s} is not set, treat as empty\n", key_name);
+                               value = "";
                        }
-               case TK_M_TAG:
-                       {
-                               struct udev_list_entry *list_entry;
-                               bool match = false;
-
-                               udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(event->dev)) {
-                                       if (strcmp(&rules->buf[cur->key.value_off], udev_list_entry_get_name(list_entry)) == 0) {
-                                               match = true;
-                                               break;
-                                       }
+                       if (match_key(rules, cur, value))
+                               goto nomatch;
+                       break;
+               }
+               case TK_M_TAG: {
+                       struct udev_list_entry *list_entry;
+                       bool match = false;
+
+                       udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(event->dev)) {
+                               if (strcmp(&rules->buf[cur->key.value_off], udev_list_entry_get_name(list_entry)) == 0) {
+                                       match = true;
+                                       break;
                                }
-                               if (!match && (cur->key.op != OP_NOMATCH))
-                                       goto nomatch;
-                               break;
                        }
+                       if (!match && (cur->key.op != OP_NOMATCH))
+                               goto nomatch;
+                       break;
+               }
                case TK_M_SUBSYSTEM:
                        if (match_key(rules, cur, udev_device_get_subsystem(event->dev)) != 0)
                                goto nomatch;
@@ -2168,17 +2161,16 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        if (match_key(rules, cur, udev_device_get_driver(event->dev)) != 0)
                                goto nomatch;
                        break;
-               case TK_M_WAITFOR:
-                       {
-                               char filename[UTIL_PATH_SIZE];
-                               int found;
-
-                               udev_event_apply_format(event, &rules->buf[cur->key.value_off], filename, sizeof(filename));
-                               found = (wait_for_file(event->dev, filename, 10) == 0);
-                               if (!found && (cur->key.op != OP_NOMATCH))
-                                       goto nomatch;
-                               break;
-                       }
+               case TK_M_WAITFOR: {
+                       char filename[UTIL_PATH_SIZE];
+                       int found;
+
+                       udev_event_apply_format(event, &rules->buf[cur->key.value_off], filename, sizeof(filename));
+                       found = (wait_for_file(event->dev, filename, 10) == 0);
+                       if (!found && (cur->key.op != OP_NOMATCH))
+                               goto nomatch;
+                       break;
+               }
                case TK_M_ATTR:
                        if (match_attr(rules, event->dev, event, cur) != 0)
                                goto nomatch;
@@ -2187,216 +2179,223 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                case TK_M_SUBSYSTEMS:
                case TK_M_DRIVERS:
                case TK_M_ATTRS:
-                       {
-                               struct token *next;
+               case TK_M_TAGS: {
+                       struct token *next;
 
-                               /* get whole sequence of parent matches */
-                               next = cur;
-                               while (next->type > TK_M_PARENTS_MIN && next->type < TK_M_PARENTS_MAX)
-                                       next++;
+                       /* get whole sequence of parent matches */
+                       next = cur;
+                       while (next->type > TK_M_PARENTS_MIN && next->type < TK_M_PARENTS_MAX)
+                               next++;
 
-                               /* loop over parents */
-                               event->dev_parent = event->dev;
-                               for (;;) {
-                                       struct token *key;
-
-                                       dbg(event->udev, "parent: '%s'\n", udev_device_get_syspath(event->dev_parent));
-                                       /* loop over sequence of parent match keys */
-                                       for (key = cur; key < next; key++ ) {
-                                               dump_token(rules, key);
-                                               switch(key->type) {
-                                               case TK_M_KERNELS:
-                                                       if (match_key(rules, key, udev_device_get_sysname(event->dev_parent)) != 0)
-                                                               goto try_parent;
-                                                       break;
-                                               case TK_M_SUBSYSTEMS:
-                                                       if (match_key(rules, key, udev_device_get_subsystem(event->dev_parent)) != 0)
-                                                               goto try_parent;
-                                                       break;
-                                               case TK_M_DRIVERS:
-                                                       if (match_key(rules, key, udev_device_get_driver(event->dev_parent)) != 0)
-                                                               goto try_parent;
-                                                       break;
-                                               case TK_M_ATTRS:
-                                                       if (match_attr(rules, event->dev_parent, event, key) != 0)
-                                                               goto try_parent;
-                                                       break;
-                                               default:
-                                                       goto nomatch;
-                                               }
-                                               dbg(event->udev, "parent key matched\n");
-                                       }
-                                       dbg(event->udev, "all parent keys matched\n");
-                                       /* all keys matched */
-                                       break;
-
-                               try_parent:
-                                       event->dev_parent = udev_device_get_parent(event->dev_parent);
-                                       if (event->dev_parent == NULL)
-                                               goto nomatch;
-                               }
-                               /* move behind our sequence of parent match keys */
-                               cur = next;
-                               continue;
-                       }
-               case TK_M_TEST:
-                       {
-                               char filename[UTIL_PATH_SIZE];
-                               struct stat statbuf;
-                               int match;
-
-                               udev_event_apply_format(event, &rules->buf[cur->key.value_off], filename, sizeof(filename));
-                               if (util_resolve_subsys_kernel(event->udev, filename, filename, sizeof(filename), 0) != 0) {
-                                       if (filename[0] != '/') {
-                                               char tmp[UTIL_PATH_SIZE];
+                       /* loop over parents */
+                       event->dev_parent = event->dev;
+                       for (;;) {
+                               struct token *key;
+
+                               dbg(event->udev, "parent: '%s'\n", udev_device_get_syspath(event->dev_parent));
+                               /* loop over sequence of parent match keys */
+                               for (key = cur; key < next; key++ ) {
+                                       dump_token(rules, key);
+                                       switch(key->type) {
+                                       case TK_M_KERNELS:
+                                               if (match_key(rules, key, udev_device_get_sysname(event->dev_parent)) != 0)
+                                                       goto try_parent;
+                                               break;
+                                       case TK_M_SUBSYSTEMS:
+                                               if (match_key(rules, key, udev_device_get_subsystem(event->dev_parent)) != 0)
+                                                       goto try_parent;
+                                               break;
+                                       case TK_M_DRIVERS:
+                                               if (match_key(rules, key, udev_device_get_driver(event->dev_parent)) != 0)
+                                                       goto try_parent;
+                                               break;
+                                       case TK_M_ATTRS:
+                                               if (match_attr(rules, event->dev_parent, event, key) != 0)
+                                                       goto try_parent;
+                                               break;
+                                       case TK_M_TAGS: {
+                                               bool match = udev_device_has_tag(event->dev_parent, &rules->buf[cur->key.value_off]);
 
-                                               util_strscpy(tmp, sizeof(tmp), filename);
-                                               util_strscpyl(filename, sizeof(filename),
-                                                             udev_device_get_syspath(event->dev), "/", tmp, NULL);
+                                               if (match && key->key.op == OP_NOMATCH)
+                                                       goto try_parent;
+                                               if (!match && key->key.op == OP_MATCH)
+                                                       goto try_parent;
+                                               break;
                                        }
-                               }
-                               attr_subst_subdir(filename, sizeof(filename));
-
-                               match = (stat(filename, &statbuf) == 0);
-                               dbg(event->udev, "'%s' %s", filename, match ? "exists\n" : "does not exist\n");
-                               if (match && cur->key.mode > 0) {
-                                       match = ((statbuf.st_mode & cur->key.mode) > 0);
-                                       dbg(event->udev, "'%s' has mode=%#o and %s %#o\n", filename, statbuf.st_mode,
-                                           match ? "matches" : "does not match", cur->key.mode);
-                               }
-                               if (match && cur->key.op == OP_NOMATCH)
-                                       goto nomatch;
-                               if (!match && cur->key.op == OP_MATCH)
-                                       goto nomatch;
-                               break;
-                       }
-               case TK_M_PROGRAM:
-                       {
-                               char program[UTIL_PATH_SIZE];
-                               char **envp;
-                               char result[UTIL_PATH_SIZE];
-
-                               free(event->program_result);
-                               event->program_result = NULL;
-                               udev_event_apply_format(event, &rules->buf[cur->key.value_off], program, sizeof(program));
-                               envp = udev_device_get_properties_envp(event->dev);
-                               info(event->udev, "PROGRAM '%s' %s:%u\n",
-                                    program,
-                                    &rules->buf[rule->rule.filename_off],
-                                    rule->rule.filename_line);
-                               if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL, NULL, false) != 0) {
-                                       if (cur->key.op != OP_NOMATCH)
+                                       default:
                                                goto nomatch;
-                               } else {
-                                       int count;
-
-                                       util_remove_trailing_chars(result, '\n');
-                                       if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) {
-                                               count = udev_util_replace_chars(result, UDEV_ALLOWED_CHARS_INPUT);
-                                               if (count > 0)
-                                                       info(event->udev, "%i character(s) replaced\n" , count);
                                        }
-                                       event->program_result = strdup(result);
-                                       dbg(event->udev, "storing result '%s'\n", event->program_result);
-                                       if (cur->key.op == OP_NOMATCH)
-                                               goto nomatch;
+                                       dbg(event->udev, "parent key matched\n");
                                }
+                               dbg(event->udev, "all parent keys matched\n");
                                break;
+
+                       try_parent:
+                               event->dev_parent = udev_device_get_parent(event->dev_parent);
+                               if (event->dev_parent == NULL)
+                                       goto nomatch;
                        }
-               case TK_M_IMPORT_FILE:
-                       {
-                               char import[UTIL_PATH_SIZE];
+                       /* move behind our sequence of parent match keys */
+                       cur = next;
+                       continue;
+               }
+               case TK_M_TEST: {
+                       char filename[UTIL_PATH_SIZE];
+                       struct stat statbuf;
+                       int match;
 
-                               udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import));
-                               if (import_file_into_properties(event->dev, import) != 0)
-                                       if (cur->key.op != OP_NOMATCH)
-                                               goto nomatch;
-                               break;
+                       udev_event_apply_format(event, &rules->buf[cur->key.value_off], filename, sizeof(filename));
+                       if (util_resolve_subsys_kernel(event->udev, filename, filename, sizeof(filename), 0) != 0) {
+                               if (filename[0] != '/') {
+                                       char tmp[UTIL_PATH_SIZE];
+
+                                       util_strscpy(tmp, sizeof(tmp), filename);
+                                       util_strscpyl(filename, sizeof(filename),
+                                                     udev_device_get_syspath(event->dev), "/", tmp, NULL);
+                               }
                        }
-               case TK_M_IMPORT_PROG:
-                       {
-                               char import[UTIL_PATH_SIZE];
-
-                               udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import));
-                               info(event->udev, "IMPORT '%s' %s:%u\n",
-                                    import,
-                                    &rules->buf[rule->rule.filename_off],
-                                    rule->rule.filename_line);
-                               if (import_program_into_properties(event->dev, import) != 0)
-                                       if (cur->key.op != OP_NOMATCH)
-                                               goto nomatch;
-                               break;
+                       attr_subst_subdir(filename, sizeof(filename));
+
+                       match = (stat(filename, &statbuf) == 0);
+                       dbg(event->udev, "'%s' %s", filename, match ? "exists\n" : "does not exist\n");
+                       if (match && cur->key.mode > 0) {
+                               match = ((statbuf.st_mode & cur->key.mode) > 0);
+                               dbg(event->udev, "'%s' has mode=%#o and %s %#o\n", filename, statbuf.st_mode,
+                                   match ? "matches" : "does not match", cur->key.mode);
                        }
-               case TK_M_IMPORT_DB:
-                       {
-                               const char *key = &rules->buf[cur->key.value_off];
-                               const char *value;
+                       if (match && cur->key.op == OP_NOMATCH)
+                               goto nomatch;
+                       if (!match && cur->key.op == OP_MATCH)
+                               goto nomatch;
+                       break;
+               }
+               case TK_M_EVENT_TIMEOUT:
+                       info(event->udev, "OPTIONS event_timeout=%u\n", cur->key.event_timeout);
+                       event->timeout_usec = cur->key.event_timeout * 1000 * 1000;
+                       break;
+               case TK_M_PROGRAM: {
+                       char program[UTIL_PATH_SIZE];
+                       char **envp;
+                       char result[UTIL_PATH_SIZE];
+
+                       free(event->program_result);
+                       event->program_result = NULL;
+                       udev_event_apply_format(event, &rules->buf[cur->key.value_off], program, sizeof(program));
+                       envp = udev_device_get_properties_envp(event->dev);
+                       info(event->udev, "PROGRAM '%s' %s:%u\n",
+                            program,
+                            &rules->buf[rule->rule.filename_off],
+                            rule->rule.filename_line);
 
-                               value = udev_device_get_property_value(event->dev_db, key);
-                               if (value != NULL) {
-                                       struct udev_list_entry *entry;
+                       if (udev_event_spawn(event, program, envp, sigmask, result, sizeof(result)) < 0) {
+                               if (cur->key.op != OP_NOMATCH)
+                                       goto nomatch;
+                       } else {
+                               int count;
 
-                                       entry = udev_device_add_property(event->dev, key, value);
-                                       udev_list_entry_set_flags(entry, 1);
-                               } else {
-                                       if (cur->key.op != OP_NOMATCH)
-                                               goto nomatch;
+                               util_remove_trailing_chars(result, '\n');
+                               if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) {
+                                       count = udev_util_replace_chars(result, UDEV_ALLOWED_CHARS_INPUT);
+                                       if (count > 0)
+                                               info(event->udev, "%i character(s) replaced\n" , count);
                                }
-                               break;
+                               event->program_result = strdup(result);
+                               dbg(event->udev, "storing result '%s'\n", event->program_result);
+                               if (cur->key.op == OP_NOMATCH)
+                                       goto nomatch;
                        }
-               case TK_M_IMPORT_CMDLINE:
-                       {
-                               FILE *f;
-                               bool imported = false;
-
-                               f = fopen("/proc/cmdline", "r");
-                               if (f != NULL) {
-                                       char cmdline[4096];
-
-                                       if (fgets(cmdline, sizeof(cmdline), f) != NULL) {
-                                               const char *key = &rules->buf[cur->key.value_off];
-                                               char *pos;
-
-                                               pos = strstr(cmdline, key);
-                                               if (pos != NULL) {
-                                                       struct udev_list_entry *entry;
-
-                                                       pos += strlen(key);
-                                                       if (pos[0] == '\0' || isspace(pos[0])) {
-                                                               /* we import simple flags as 'FLAG=1' */
-                                                               entry = udev_device_add_property(event->dev, key, "1");
-                                                               udev_list_entry_set_flags(entry, 1);
-                                                               imported = true;
-                                                       } else if (pos[0] == '=') {
-                                                               const char *value;
+                       break;
+               }
+               case TK_M_IMPORT_FILE: {
+                       char import[UTIL_PATH_SIZE];
+
+                       udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import));
+                       if (import_file_into_properties(event->dev, import) != 0)
+                               if (cur->key.op != OP_NOMATCH)
+                                       goto nomatch;
+                       break;
+               }
+               case TK_M_IMPORT_PROG: {
+                       char import[UTIL_PATH_SIZE];
+
+                       udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import));
+                       info(event->udev, "IMPORT '%s' %s:%u\n",
+                            import,
+                            &rules->buf[rule->rule.filename_off],
+                            rule->rule.filename_line);
 
+                       if (import_program_into_properties(event, import, sigmask) != 0)
+                               if (cur->key.op != OP_NOMATCH)
+                                       goto nomatch;
+                       break;
+               }
+               case TK_M_IMPORT_DB: {
+                       const char *key = &rules->buf[cur->key.value_off];
+                       const char *value;
+
+                       value = udev_device_get_property_value(event->dev_db, key);
+                       if (value != NULL) {
+                               struct udev_list_entry *entry;
+
+                               entry = udev_device_add_property(event->dev, key, value);
+                               udev_list_entry_set_num(entry, true);
+                       } else {
+                               if (cur->key.op != OP_NOMATCH)
+                                       goto nomatch;
+                       }
+                       break;
+               }
+               case TK_M_IMPORT_CMDLINE: {
+                       FILE *f;
+                       bool imported = false;
+
+                       f = fopen("/proc/cmdline", "r");
+                       if (f != NULL) {
+                               char cmdline[4096];
+
+                               if (fgets(cmdline, sizeof(cmdline), f) != NULL) {
+                                       const char *key = &rules->buf[cur->key.value_off];
+                                       char *pos;
+
+                                       pos = strstr(cmdline, key);
+                                       if (pos != NULL) {
+                                               struct udev_list_entry *entry;
+
+                                               pos += strlen(key);
+                                               if (pos[0] == '\0' || isspace(pos[0])) {
+                                                       /* we import simple flags as 'FLAG=1' */
+                                                       entry = udev_device_add_property(event->dev, key, "1");
+                                                       udev_list_entry_set_num(entry, true);
+                                                       imported = true;
+                                               } else if (pos[0] == '=') {
+                                                       const char *value;
+
+                                                       pos++;
+                                                       value = pos;
+                                                       while (pos[0] != '\0' && !isspace(pos[0]))
                                                                pos++;
-                                                               value = pos;
-                                                               while (pos[0] != '\0' && !isspace(pos[0]))
-                                                                       pos++;
-                                                               pos[0] = '\0';
-                                                               entry = udev_device_add_property(event->dev, key, value);
-                                                               udev_list_entry_set_flags(entry, 1);
-                                                               imported = true;
-                                                       }
+                                                       pos[0] = '\0';
+                                                       entry = udev_device_add_property(event->dev, key, value);
+                                                       udev_list_entry_set_num(entry, true);
+                                                       imported = true;
                                                }
                                        }
-                                       fclose(f);
                                }
-                               if (!imported && cur->key.op != OP_NOMATCH)
-                                       goto nomatch;
-                               break;
+                               fclose(f);
                        }
-               case TK_M_IMPORT_PARENT:
-                       {
-                               char import[UTIL_PATH_SIZE];
+                       if (!imported && cur->key.op != OP_NOMATCH)
+                               goto nomatch;
+                       break;
+               }
+               case TK_M_IMPORT_PARENT: {
+                       char import[UTIL_PATH_SIZE];
 
-                               udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import));
-                               if (import_parent_into_properties(event->dev, import) != 0)
-                                       if (cur->key.op != OP_NOMATCH)
-                                               goto nomatch;
-                               break;
-                       }
+                       udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import));
+                       if (import_parent_into_properties(event->dev, import) != 0)
+                               if (cur->key.op != OP_NOMATCH)
+                                       goto nomatch;
+                       break;
+               }
                case TK_M_RESULT:
                        if (match_key(rules, cur, event->program_result) != 0)
                                goto nomatch;
@@ -2407,6 +2406,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                case TK_A_STRING_ESCAPE_REPLACE:
                        esc = ESCAPE_REPLACE;
                        break;
+               case TK_A_DB_PERSIST:
+                       udev_device_set_db_persist(event->dev);
+                       break;
                case TK_A_INOTIFY_WATCH:
                        if (event->inotify_watch_final)
                                break;
@@ -2417,59 +2419,59 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                case TK_A_DEVLINK_PRIO:
                        udev_device_set_devlink_priority(event->dev, cur->key.devlink_prio);
                        break;
-               case TK_A_OWNER:
-                       {
-                               char owner[UTIL_NAME_SIZE];
+               case TK_A_OWNER: {
+                       char owner[UTIL_NAME_SIZE];
 
-                               if (event->owner_final)
-                                       break;
-                               if (cur->key.op == OP_ASSIGN_FINAL)
-                                       event->owner_final = true;
-                               udev_event_apply_format(event, &rules->buf[cur->key.value_off], owner, sizeof(owner));
-                               event->uid = util_lookup_user(event->udev, owner);
-                               info(event->udev, "OWNER %u %s:%u\n",
-                                    event->uid,
-                                    &rules->buf[rule->rule.filename_off],
-                                    rule->rule.filename_line);
+                       if (event->owner_final)
                                break;
-                       }
-               case TK_A_GROUP:
-                       {
-                               char group[UTIL_NAME_SIZE];
+                       if (cur->key.op == OP_ASSIGN_FINAL)
+                               event->owner_final = true;
+                       udev_event_apply_format(event, &rules->buf[cur->key.value_off], owner, sizeof(owner));
+                       event->uid = util_lookup_user(event->udev, owner);
+                       info(event->udev, "OWNER %u %s:%u\n",
+                            event->uid,
+                            &rules->buf[rule->rule.filename_off],
+                            rule->rule.filename_line);
+                       break;
+               }
+               case TK_A_GROUP: {
+                       char group[UTIL_NAME_SIZE];
 
-                               if (event->group_final)
-                                       break;
-                               if (cur->key.op == OP_ASSIGN_FINAL)
-                                       event->group_final = true;
-                               udev_event_apply_format(event, &rules->buf[cur->key.value_off], group, sizeof(group));
-                               event->gid = util_lookup_group(event->udev, group);
-                               info(event->udev, "GROUP %u %s:%u\n",
-                                    event->gid,
-                                    &rules->buf[rule->rule.filename_off],
-                                    rule->rule.filename_line);
+                       if (event->group_final)
                                break;
-                       }
-               case TK_A_MODE:
-                       {
-                               char mode[UTIL_NAME_SIZE];
-                               char *endptr;
+                       if (cur->key.op == OP_ASSIGN_FINAL)
+                               event->group_final = true;
+                       udev_event_apply_format(event, &rules->buf[cur->key.value_off], group, sizeof(group));
+                       event->gid = util_lookup_group(event->udev, group);
+                       info(event->udev, "GROUP %u %s:%u\n",
+                            event->gid,
+                            &rules->buf[rule->rule.filename_off],
+                            rule->rule.filename_line);
+                       break;
+               }
+               case TK_A_MODE: {
+                       char mode_str[UTIL_NAME_SIZE];
+                       mode_t mode;
+                       char *endptr;
 
-                               if (event->mode_final)
-                                       break;
-                               if (cur->key.op == OP_ASSIGN_FINAL)
-                                       event->mode_final = true;
-                               udev_event_apply_format(event, &rules->buf[cur->key.value_off], mode, sizeof(mode));
-                               event->mode = strtol(mode, &endptr, 8);
-                               if (endptr[0] != '\0') {
-                                       err(event->udev, "invalide mode '%s' set default mode 0600\n", mode);
-                                       event->mode = 0600;
-                               }
-                               info(event->udev, "MODE %#o %s:%u\n",
-                                    event->mode,
-                                    &rules->buf[rule->rule.filename_off],
-                                    rule->rule.filename_line);
+                       if (event->mode_final)
+                               break;
+                       udev_event_apply_format(event, &rules->buf[cur->key.value_off], mode_str, sizeof(mode_str));
+                       mode = strtol(mode_str, &endptr, 8);
+                       if (endptr[0] != '\0') {
+                               err(event->udev, "ignoring invalid mode '%s'\n", mode_str);
                                break;
                        }
+                       if (cur->key.op == OP_ASSIGN_FINAL)
+                               event->mode_final = true;
+                       event->mode_set = true;
+                       event->mode = mode;
+                       info(event->udev, "MODE %#o %s:%u\n",
+                            event->mode,
+                            &rules->buf[rule->rule.filename_off],
+                            rule->rule.filename_line);
+                       break;
+               }
                case TK_A_OWNER_ID:
                        if (event->owner_final)
                                break;
@@ -2497,6 +2499,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                break;
                        if (cur->key.op == OP_ASSIGN_FINAL)
                                event->mode_final = true;
+                       event->mode_set = true;
                        event->mode = cur->key.mode;
                        info(event->udev, "MODE %#o %s:%u\n",
                             event->mode,
@@ -2505,146 +2508,142 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        break;
                case TK_A_STATIC_NODE:
                        break;
-               case TK_A_ENV:
-                       {
-                               const char *name = &rules->buf[cur->key.attr_off];
-                               char *value = &rules->buf[cur->key.value_off];
-
-                               if (value[0] != '\0') {
-                                       char temp_value[UTIL_NAME_SIZE];
-                                       struct udev_list_entry *entry;
-
-                                       udev_event_apply_format(event, value, temp_value, sizeof(temp_value));
-                                       entry = udev_device_add_property(event->dev, name, temp_value);
-                                       /* store in db, skip private keys */
-                                       if (name[0] != '.')
-                                               udev_list_entry_set_flags(entry, 1);
-                               } else {
-                                       udev_device_add_property(event->dev, name, NULL);
-                               }
-                               break;
+               case TK_A_ENV: {
+                       const char *name = &rules->buf[cur->key.attr_off];
+                       char *value = &rules->buf[cur->key.value_off];
+
+                       if (value[0] != '\0') {
+                               char temp_value[UTIL_NAME_SIZE];
+                               struct udev_list_entry *entry;
+
+                               udev_event_apply_format(event, value, temp_value, sizeof(temp_value));
+                               entry = udev_device_add_property(event->dev, name, temp_value);
+                               /* store in db, skip private keys */
+                               if (name[0] != '.')
+                                       udev_list_entry_set_num(entry, true);
+                       } else {
+                               udev_device_add_property(event->dev, name, NULL);
                        }
-               case TK_A_TAG:
+                       break;
+               }
+               case TK_A_TAG: {
+                       char tag[UTIL_PATH_SIZE];
+
+                       udev_event_apply_format(event, &rules->buf[cur->key.value_off], tag, sizeof(tag));
                        if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
                                udev_device_cleanup_tags_list(event->dev);
-                       udev_device_add_tag(event->dev, &rules->buf[cur->key.value_off]);
+                       udev_device_add_tag(event->dev, tag);
                        break;
-               case TK_A_NAME:
-                       {
-                               const char *name  = &rules->buf[cur->key.value_off];
-                               char name_str[UTIL_PATH_SIZE];
-                               int count;
+               }
+               case TK_A_NAME: {
+                       const char *name  = &rules->buf[cur->key.value_off];
+                       char name_str[UTIL_PATH_SIZE];
+                       int count;
 
-                               if (event->name_final)
-                                       break;
-                               if (cur->key.op == OP_ASSIGN_FINAL)
-                                       event->name_final = true;
-                               udev_event_apply_format(event, name, name_str, sizeof(name_str));
-                               if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) {
-                                       count = udev_util_replace_chars(name_str, "/");
-                                       if (count > 0)
-                                               info(event->udev, "%i character(s) replaced\n", count);
-                               }
-                               free(event->name);
-                               event->name = strdup(name_str);
-                               info(event->udev, "NAME '%s' %s:%u\n",
-                                    event->name,
-                                    &rules->buf[rule->rule.filename_off],
-                                    rule->rule.filename_line);
+                       if (event->name_final)
                                break;
-                       }
-               case TK_A_DEVLINK:
-                       {
-                               char temp[UTIL_PATH_SIZE];
-                               char filename[UTIL_PATH_SIZE];
-                               char *pos, *next;
-                               int count = 0;
-
-                               if (event->devlink_final)
-                                       break;
-                               if (major(udev_device_get_devnum(event->dev)) == 0)
-                                       break;
-                               if (cur->key.op == OP_ASSIGN_FINAL)
-                                       event->devlink_final = true;
-                               if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
-                                       udev_device_cleanup_devlinks_list(event->dev);
-
-                               /* allow  multiple symlinks separated by spaces */
-                               udev_event_apply_format(event, &rules->buf[cur->key.value_off], temp, sizeof(temp));
-                               if (esc == ESCAPE_UNSET)
-                                       count = udev_util_replace_chars(temp, "/ ");
-                               else if (esc == ESCAPE_REPLACE)
-                                       count = udev_util_replace_chars(temp, "/");
+                       if (cur->key.op == OP_ASSIGN_FINAL)
+                               event->name_final = true;
+                       udev_event_apply_format(event, name, name_str, sizeof(name_str));
+                       if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) {
+                               count = udev_util_replace_chars(name_str, "/");
                                if (count > 0)
-                                       info(event->udev, "%i character(s) replaced\n" , count);
-                               dbg(event->udev, "rule applied, added symlink(s) '%s'\n", temp);
-                               pos = temp;
-                               while (isspace(pos[0]))
-                                       pos++;
-                               next = strchr(pos, ' ');
-                               while (next != NULL) {
-                                       next[0] = '\0';
-                                       info(event->udev, "LINK '%s' %s:%u\n", pos,
-                                            &rules->buf[rule->rule.filename_off], rule->rule.filename_line);
-                                       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", pos, NULL);
-                                       udev_device_add_devlink(event->dev, filename, cur->key.devlink_unique);
-                                       while (isspace(next[1]))
-                                               next++;
-                                       pos = &next[1];
-                                       next = strchr(pos, ' ');
-                               }
-                               if (pos[0] != '\0') {
-                                       info(event->udev, "LINK '%s' %s:%u\n", pos,
-                                            &rules->buf[rule->rule.filename_off], rule->rule.filename_line);
-                                       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", pos, NULL);
-                                       udev_device_add_devlink(event->dev, filename, cur->key.devlink_unique);
-                               }
+                                       info(event->udev, "%i character(s) replaced\n", count);
                        }
+                       free(event->name);
+                       event->name = strdup(name_str);
+                       info(event->udev, "NAME '%s' %s:%u\n",
+                            event->name,
+                            &rules->buf[rule->rule.filename_off],
+                            rule->rule.filename_line);
                        break;
-               case TK_A_EVENT_TIMEOUT:
-                       udev_device_set_event_timeout(event->dev, cur->key.event_timeout);
-                       break;
-               case TK_A_ATTR:
-                       {
-                               const char *key_name = &rules->buf[cur->key.attr_off];
-                               char attr[UTIL_PATH_SIZE];
-                               char value[UTIL_NAME_SIZE];
-                               FILE *f;
-
-                               if (util_resolve_subsys_kernel(event->udev, key_name, attr, sizeof(attr), 0) != 0)
-                                       util_strscpyl(attr, sizeof(attr), udev_device_get_syspath(event->dev), "/", key_name, NULL);
-                               attr_subst_subdir(attr, sizeof(attr));
-
-                               udev_event_apply_format(event, &rules->buf[cur->key.value_off], value, sizeof(value));
-                               info(event->udev, "ATTR '%s' writing '%s' %s:%u\n", attr, value,
-                                    &rules->buf[rule->rule.filename_off],
-                                    rule->rule.filename_line);
-                               f = fopen(attr, "w");
-                               if (f != NULL) {
-                                       if (fprintf(f, "%s", value) <= 0)
-                                               err(event->udev, "error writing ATTR{%s}: %m\n", attr);
-                                       fclose(f);
-                               } else {
-                                       err(event->udev, "error opening ATTR{%s} for writing: %m\n", attr);
-                               }
+               }
+               case TK_A_DEVLINK: {
+                       char temp[UTIL_PATH_SIZE];
+                       char filename[UTIL_PATH_SIZE];
+                       char *pos, *next;
+                       int count = 0;
+
+                       if (event->devlink_final)
                                break;
-                       }
-               case TK_A_RUN:
-                       {
-                               struct udev_list_entry *list_entry;
-
-                               if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
-                                       udev_list_cleanup_entries(event->udev, &event->run_list);
-                               info(event->udev, "RUN '%s' %s:%u\n",
-                                    &rules->buf[cur->key.value_off],
-                                    &rules->buf[rule->rule.filename_off],
-                                    rule->rule.filename_line);
-                               list_entry = udev_list_entry_add(event->udev, &event->run_list,
-                                                                &rules->buf[cur->key.value_off], NULL, 1, 0);
-                               if (cur->key.fail_on_error)
-                                       udev_list_entry_set_flags(list_entry, 1);
+                       if (major(udev_device_get_devnum(event->dev)) == 0)
                                break;
+                       if (cur->key.op == OP_ASSIGN_FINAL)
+                               event->devlink_final = true;
+                       if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
+                               udev_device_cleanup_devlinks_list(event->dev);
+
+                       /* allow  multiple symlinks separated by spaces */
+                       udev_event_apply_format(event, &rules->buf[cur->key.value_off], temp, sizeof(temp));
+                       if (esc == ESCAPE_UNSET)
+                               count = udev_util_replace_chars(temp, "/ ");
+                       else if (esc == ESCAPE_REPLACE)
+                               count = udev_util_replace_chars(temp, "/");
+                       if (count > 0)
+                               info(event->udev, "%i character(s) replaced\n" , count);
+                       dbg(event->udev, "rule applied, added symlink(s) '%s'\n", temp);
+                       pos = temp;
+                       while (isspace(pos[0]))
+                               pos++;
+                       next = strchr(pos, ' ');
+                       while (next != NULL) {
+                               next[0] = '\0';
+                               info(event->udev, "LINK '%s' %s:%u\n", pos,
+                                    &rules->buf[rule->rule.filename_off], rule->rule.filename_line);
+                               util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", pos, NULL);
+                               udev_device_add_devlink(event->dev, filename, cur->key.devlink_unique);
+                               while (isspace(next[1]))
+                                       next++;
+                               pos = &next[1];
+                               next = strchr(pos, ' ');
                        }
+                       if (pos[0] != '\0') {
+                               info(event->udev, "LINK '%s' %s:%u\n", pos,
+                                    &rules->buf[rule->rule.filename_off], rule->rule.filename_line);
+                               util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", pos, NULL);
+                               udev_device_add_devlink(event->dev, filename, cur->key.devlink_unique);
+                       }
+                       break;
+               }
+               case TK_A_ATTR: {
+                       const char *key_name = &rules->buf[cur->key.attr_off];
+                       char attr[UTIL_PATH_SIZE];
+                       char value[UTIL_NAME_SIZE];
+                       FILE *f;
+
+                       if (util_resolve_subsys_kernel(event->udev, key_name, attr, sizeof(attr), 0) != 0)
+                               util_strscpyl(attr, sizeof(attr), udev_device_get_syspath(event->dev), "/", key_name, NULL);
+                       attr_subst_subdir(attr, sizeof(attr));
+
+                       udev_event_apply_format(event, &rules->buf[cur->key.value_off], value, sizeof(value));
+                       info(event->udev, "ATTR '%s' writing '%s' %s:%u\n", attr, value,
+                            &rules->buf[rule->rule.filename_off],
+                            rule->rule.filename_line);
+                       f = fopen(attr, "w");
+                       if (f != NULL) {
+                               if (fprintf(f, "%s", value) <= 0)
+                                       err(event->udev, "error writing ATTR{%s}: %m\n", attr);
+                               fclose(f);
+                       } else {
+                               err(event->udev, "error opening ATTR{%s} for writing: %m\n", attr);
+                       }
+                       break;
+               }
+               case TK_A_RUN: {
+                       struct udev_list_entry *list_entry;
+
+                       if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
+                               udev_list_cleanup_entries(event->udev, &event->run_list);
+                       info(event->udev, "RUN '%s' %s:%u\n",
+                            &rules->buf[cur->key.value_off],
+                            &rules->buf[rule->rule.filename_off],
+                            rule->rule.filename_line);
+                       list_entry = udev_list_entry_add(event->udev, &event->run_list,
+                                                        &rules->buf[cur->key.value_off], NULL, UDEV_LIST_UNIQUE);
+                       if (cur->key.fail_on_error)
+                               udev_list_entry_set_num(list_entry, true);
+                       break;
+               }
                case TK_A_GOTO:
                        if (cur->key.rule_goto == 0)
                                break;
@@ -2710,8 +2709,9 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
                case TK_A_STATIC_NODE: {
                        char filename[UTIL_PATH_SIZE];
                        struct stat stats;
+
                        /* we assure, that the permissions tokens are sorted before the static token */
-                       if (mode == 0 && uid == 0 && gid == 0)
+                       if (uid == 0 && gid == 0)
                                goto next;
                        util_strscpyl(filename, sizeof(filename), udev_get_dev_path(rules->udev), "/",
                                      &rules->buf[cur->key.value_off], NULL);
@@ -2719,14 +2719,19 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
                                goto next;
                        if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode))
                                goto next;
-                       if (mode != 0 && mode != (stats.st_mode & 0777)) {
+
+                       if (mode == 0 && gid > 0)
+                               mode = 0660;
+                       if (mode != (stats.st_mode & 0777)) {
                                chmod(filename, mode);
                                info(rules->udev, "chmod '%s' %#o\n", filename, mode);
                        }
+
                        if ((uid != 0 && uid != stats.st_uid) || (gid != 0 && gid != stats.st_gid)) {
                                chown(filename, uid, gid);
                                info(rules->udev, "chown '%s' %u %u\n", filename, uid, gid);
                        }
+
                        utimensat(AT_FDCWD, filename, NULL, 0);
                        break;
                }