chiark / gitweb /
udevd: clarify worker exit status
[elogind.git] / udev / udev-rules.c
index b58ea8c6806704def661b932905341d68bf5f3df..d38c9ff4ff333c14a6bd8c3b1085d3b6197a6483 100644 (file)
@@ -139,16 +139,19 @@ enum token_type {
        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 */
        TK_M_IMPORT_DB,                 /* val */
+       TK_M_IMPORT_CMDLINE,            /* val */
        TK_M_IMPORT_PARENT,             /* val */
        TK_M_RESULT,                    /* val */
        TK_M_MAX,
 
        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 */
@@ -157,11 +160,11 @@ enum token_type {
        TK_A_OWNER_ID,                  /* uid_t */
        TK_A_GROUP_ID,                  /* gid_t */
        TK_A_MODE_ID,                   /* mode_t */
+       TK_A_STATIC_NODE,               /* val */
        TK_A_ENV,                       /* val, attr */
        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 */
@@ -172,10 +175,12 @@ enum token_type {
 /* we try to pack stuff in a way that we take only 12 bytes per token */
 struct token {
        union {
-               unsigned char type;             /* same as in rule and key */
+               unsigned char type;             /* same in rule and key */
                struct {
                        enum token_type type:8;
-                       unsigned int flags:8;
+                       bool can_set_name:1;
+                       bool has_static_node:1;
+                       unsigned int unused:6;
                        unsigned short token_count;
                        unsigned int label_off;
                        unsigned short filename_off;
@@ -269,16 +274,19 @@ static const char *token_str(enum token_type type)
                [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",
                [TK_M_IMPORT_DB] =              "M IMPORT_DB",
+               [TK_M_IMPORT_CMDLINE] =         "M IMPORT_CMDLINE",
                [TK_M_IMPORT_PARENT] =          "M IMPORT_PARENT",
                [TK_M_RESULT] =                 "M RESULT",
                [TK_M_MAX] =                    "M MAX",
 
                [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",
@@ -286,12 +294,12 @@ static const char *token_str(enum token_type type)
                [TK_A_MODE] =                   "A MODE",
                [TK_A_OWNER_ID] =               "A OWNER_ID",
                [TK_A_GROUP_ID] =               "A GROUP_ID",
+               [TK_A_STATIC_NODE] =            "A STATIC_NODE",
                [TK_A_MODE_ID] =                "A MODE_ID",
                [TK_A_ENV] =                    "A ENV",
                [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",
@@ -317,11 +325,10 @@ static void dump_token(struct udev_rules *rules, struct token *token)
                        const char *tk_ptr = (char *)token;
                        unsigned int idx = (tk_ptr - tks_ptr) / sizeof(struct token);
 
-                       dbg(rules->udev, "* RULE %s:%u, token: %u, count: %u, label: '%s', flags: 0x%02x\n",
+                       dbg(rules->udev, "* RULE %s:%u, token: %u, count: %u, label: '%s'\n",
                            &rules->buf[token->rule.filename_off], token->rule.filename_line,
                            idx, token->rule.token_count,
-                           &rules->buf[token->rule.label_off],
-                           token->rule.flags);
+                           &rules->buf[token->rule.label_off]);
                        break;
                }
        case TK_M_ACTION:
@@ -339,6 +346,7 @@ static void dump_token(struct udev_rules *rules, struct token *token)
        case TK_M_IMPORT_FILE:
        case TK_M_IMPORT_PROG:
        case TK_M_IMPORT_DB:
+       case TK_M_IMPORT_CMDLINE:
        case TK_M_IMPORT_PARENT:
        case TK_M_RESULT:
        case TK_A_NAME:
@@ -364,6 +372,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:
@@ -374,7 +383,7 @@ static void dump_token(struct udev_rules *rules, struct token *token)
                dbg(rules->udev, "%s %u\n", token_str(type), token->key.watch);
                break;
        case TK_A_DEVLINK_PRIO:
-               dbg(rules->udev, "%s %s %u\n", token_str(type), operation_str(op), token->key.devlink_prio);
+               dbg(rules->udev, "%s %u\n", token_str(type), token->key.devlink_prio);
                break;
        case TK_A_OWNER_ID:
                dbg(rules->udev, "%s %s %u\n", token_str(type), operation_str(op), token->key.uid);
@@ -385,8 +394,11 @@ static void dump_token(struct udev_rules *rules, struct token *token)
        case TK_A_MODE_ID:
                dbg(rules->udev, "%s %s %#o\n", token_str(type), operation_str(op), token->key.mode);
                break;
-       case TK_A_EVENT_TIMEOUT:
-               dbg(rules->udev, "%s %s %u\n", token_str(type), operation_str(op), token->key.event_timeout);
+       case TK_A_STATIC_NODE:
+               dbg(rules->udev, "%s '%s'\n", token_str(type), value);
+               break;
+       case TK_M_EVENT_TIMEOUT:
+               dbg(rules->udev, "%s %u\n", token_str(type), token->key.event_timeout);
                break;
        case TK_A_GOTO:
                dbg(rules->udev, "%s '%s' %u\n", token_str(type), value, token->key.rule_goto);
@@ -738,17 +750,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) != 0)
-               return -1;
+       err = udev_event_spawn(event, program, envp, sigmask, result, sizeof(result));
+       if (err < 0)
+               return err;
 
        line = result;
        while (line != NULL) {
@@ -834,7 +847,7 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout)
 
 static int attr_subst_subdir(char *attr, size_t len)
 {
-       int found = 0;
+       bool found = false;
 
        if (strstr(attr, "/*/")) {
                char *pos;
@@ -859,7 +872,7 @@ static int attr_subst_subdir(char *attr, size_t len)
                                        continue;
                                util_strscpyl(attr, len, dirname, "/", dent->d_name, tail, NULL);
                                if (stat(attr, &stats) == 0) {
-                                       found = 1;
+                                       found = true;
                                        break;
                                }
                        }
@@ -888,7 +901,7 @@ static int get_key(struct udev *udev, char **line, char **key, enum operation_ty
                return -1;
        *key = linepos;
 
-       while (1) {
+       for (;;) {
                linepos++;
                if (linepos[0] == '\0')
                        return -1;
@@ -1004,6 +1017,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
        case TK_M_IMPORT_FILE:
        case TK_M_IMPORT_PROG:
        case TK_M_IMPORT_DB:
+       case TK_M_IMPORT_CMDLINE:
        case TK_M_IMPORT_PARENT:
        case TK_M_RESULT:
        case TK_A_OWNER:
@@ -1035,6 +1049,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);
@@ -1053,7 +1068,10 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
        case TK_A_MODE_ID:
                token->key.mode = *(mode_t *)data;
                break;
-       case TK_A_EVENT_TIMEOUT:
+       case TK_A_STATIC_NODE:
+               token->key.value_off = add_string(rule_tmp->rules, value);
+               break;
+       case TK_M_EVENT_TIMEOUT:
                token->key.event_timeout = *(int *)data;
                break;
        case TK_RULE:
@@ -1171,7 +1189,7 @@ static int add_rule(struct udev_rules *rules, char *line,
        rule_tmp.rule.rule.filename_line = lineno;
 
        linepos = line;
-       while (1) {
+       for (;;) {
                char *key;
                char *value;
                enum operation_type op;
@@ -1393,6 +1411,9 @@ static int add_rule(struct udev_rules *rules, char *line,
                        } else if (attr != NULL && strstr(attr, "db")) {
                                dbg(rules->udev, "IMPORT will include db values\n");
                                rule_add_key(&rule_tmp, TK_M_IMPORT_DB, op, value, NULL);
+                       } else if (attr != NULL && strstr(attr, "cmdline")) {
+                               dbg(rules->udev, "IMPORT will include db values\n");
+                               rule_add_key(&rule_tmp, TK_M_IMPORT_CMDLINE, op, value, NULL);
                        } else if (attr != NULL && strstr(attr, "parent")) {
                                dbg(rules->udev, "IMPORT will include the parent values\n");
                                rule_add_key(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL);
@@ -1480,7 +1501,7 @@ static int add_rule(struct udev_rules *rules, char *line,
                                }
                                rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL);
                        }
-                       rule_tmp.rule.rule.flags = 1;
+                       rule_tmp.rule.rule.can_set_name = true;
                        continue;
                }
 
@@ -1495,7 +1516,7 @@ static int add_rule(struct udev_rules *rules, char *line,
                                        flag = 1;
                                rule_add_key(&rule_tmp, TK_A_DEVLINK, op, value, &flag);
                        }
-                       rule_tmp.rule.rule.flags = 1;
+                       rule_tmp.rule.rule.can_set_name = true;
                        continue;
                }
 
@@ -1512,7 +1533,7 @@ static int add_rule(struct udev_rules *rules, char *line,
                        } else if (rules->resolve_names >= 0) {
                                rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL);
                        }
-                       rule_tmp.rule.rule.flags = 1;
+                       rule_tmp.rule.rule.can_set_name = true;
                        continue;
                }
 
@@ -1529,7 +1550,7 @@ static int add_rule(struct udev_rules *rules, char *line,
                        } else if (rules->resolve_names >= 0) {
                                rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL);
                        }
-                       rule_tmp.rule.rule.flags = 1;
+                       rule_tmp.rule.rule.can_set_name = true;
                        continue;
                }
 
@@ -1542,7 +1563,7 @@ static int add_rule(struct udev_rules *rules, char *line,
                                rule_add_key(&rule_tmp, TK_A_MODE_ID, op, NULL, &mode);
                        else
                                rule_add_key(&rule_tmp, TK_A_MODE, op, value, NULL);
-                       rule_tmp.rule.rule.flags = 1;
+                       rule_tmp.rule.rule.can_set_name = true;
                        continue;
                }
 
@@ -1553,39 +1574,53 @@ static int add_rule(struct udev_rules *rules, char *line,
                        if (pos != NULL) {
                                int prio = atoi(&pos[strlen("link_priority=")]);
 
-                               rule_add_key(&rule_tmp, TK_A_DEVLINK_PRIO, 0, NULL, &prio);
+                               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, 0, 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=")];
                                if (strncmp(pos, "none", strlen("none")) == 0)
-                                       rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_NONE, 0, NULL, NULL);
+                                       rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_NONE, op, NULL, NULL);
                                else if (strncmp(pos, "replace", strlen("replace")) == 0)
-                                       rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, 0, NULL, NULL);
+                                       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;
 
-                               rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, 0, NULL, &off);
+                               rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, op, NULL, &off);
                                dbg(rules->udev, "inotify watch of device disabled\n");
                        } else {
                                pos = strstr(value, "watch");
                                if (pos != NULL) {
                                        const int on = 1;
 
-                                       rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, 0, NULL, &on);
+                                       rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, op, NULL, &on);
                                        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);
@@ -1693,7 +1728,7 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
                return -1;
        }
 
-       while (1) {
+       for (;;) {
                struct dirent *dent;
 
                dent = readdir(dir);
@@ -1725,28 +1760,31 @@ 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 token end_token;
 
-       rules = malloc(sizeof(struct udev_rules));
+       rules = calloc(1, sizeof(struct udev_rules));
        if (rules == NULL)
                return NULL;
-       memset(rules, 0x00, sizeof(struct udev_rules));
        rules->udev = udev;
        rules->resolve_names = resolve_names;
        udev_list_init(&file_list);
 
        /* init token array and string buffer */
        rules->tokens = malloc(PREALLOC_TOKEN * sizeof(struct token));
-       if (rules->tokens == NULL)
+       if (rules->tokens == NULL) {
+               free(rules);
                return NULL;
+       }
        rules->token_max = PREALLOC_TOKEN;
 
        rules->buf = malloc(PREALLOC_STRBUF);
-       if (rules->buf == NULL)
+       if (rules->buf == NULL) {
+               free(rules->tokens);
+               free(rules);
                return NULL;
+       }
        rules->buf_max = PREALLOC_STRBUF;
        /* offset 0 is always '\0' */
        rules->buf[0] = '\0';
@@ -1755,8 +1793,12 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
            rules->token_max * sizeof(struct token), rules->token_max, sizeof(struct token), rules->buf_max);
 
        rules->trie_nodes = malloc(PREALLOC_TRIE * sizeof(struct trie_node));
-       if (rules->trie_nodes == NULL)
+       if (rules->trie_nodes == NULL) {
+               free(rules->buf);
+               free(rules->tokens);
+               free(rules);
                return NULL;
+       }
        rules->trie_nodes_max = PREALLOC_TRIE;
        /* offset 0 is the trie root, with an empty string */
        memset(rules->trie_nodes, 0x00, sizeof(struct trie_node));
@@ -1774,7 +1816,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
                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);
+               util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL);
                udev_list_init(&sort_list);
                add_matching_files(udev, &sort_list, filename, ".rules");
 
@@ -1834,11 +1876,21 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
        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);
+               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);
+               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_entry_delete(file_loop);
        }
 
@@ -1907,7 +1959,7 @@ static int match_key(struct udev_rules *rules, struct token *token, const char *
 {
        char *key_value = &rules->buf[token->key.value_off];
        char *pos;
-       int match = 0;
+       bool match = false;
 
        if (val == NULL)
                val = "";
@@ -1926,7 +1978,7 @@ static int match_key(struct udev_rules *rules, struct token *token, const char *
 
                        split = &rules->buf[token->key.value_off];
                        len = strlen(val);
-                       while (1) {
+                       for (;;) {
                                const char *next;
 
                                next = strchr(split, '|');
@@ -2039,7 +2091,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;
@@ -2051,19 +2103,19 @@ 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];
        rule = cur;
-       while (1) {
+       for (;;) {
                dump_token(rules, cur);
                switch (cur->type) {
                case TK_RULE:
                        /* current rule */
                        rule = cur;
                        /* possibly skip rules which want to set NAME, SYMLINK, OWNER, GROUP, MODE */
-                       if (!can_set_name && rule->rule.flags)
+                       if (!can_set_name && rule->rule.can_set_name)
                                goto nomatch;
                        esc = ESCAPE_UNSET;
                        break;
@@ -2083,14 +2135,14 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        {
                                size_t devlen = strlen(udev_get_dev_path(event->udev))+1;
                                struct udev_list_entry *list_entry;
-                               int match = 0;
+                               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 = 1;
+                                               match = true;
                                                break;
                                        }
                                }
@@ -2168,7 +2220,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
                                /* loop over parents */
                                event->dev_parent = event->dev;
-                               while (1) {
+                               for (;;) {
                                        struct token *key;
 
                                        dbg(event->udev, "parent: '%s'\n", udev_device_get_syspath(event->dev_parent));
@@ -2241,6 +2293,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                        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];
@@ -2255,7 +2311,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                     program,
                                     &rules->buf[rule->rule.filename_off],
                                     rule->rule.filename_line);
-                               if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL, NULL) != 0) {
+
+                               if (udev_event_spawn(event, program, envp, sigmask, result, sizeof(result)) < 0) {
                                        if (cur->key.op != OP_NOMATCH)
                                                goto nomatch;
                                } else {
@@ -2293,7 +2350,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                     import,
                                     &rules->buf[rule->rule.filename_off],
                                     rule->rule.filename_line);
-                               if (import_program_into_properties(event->dev, import) != 0)
+
+                               if (import_program_into_properties(event, import, sigmask) != 0)
                                        if (cur->key.op != OP_NOMATCH)
                                                goto nomatch;
                                break;
@@ -2315,6 +2373,49 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                }
                                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_flags(entry, 1);
+                                                               imported = true;
+                                                       } else if (pos[0] == '=') {
+                                                               const char *value;
+
+                                                               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;
+                                                       }
+                                               }
+                                       }
+                                       fclose(f);
+                               }
+                               if (!imported && cur->key.op != OP_NOMATCH)
+                                       goto nomatch;
+                               break;
+                       }
                case TK_M_IMPORT_PARENT:
                        {
                                char import[UTIL_PATH_SIZE];
@@ -2335,7 +2436,14 @@ 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;
+                       if (cur->key.op == OP_ASSIGN_FINAL)
+                               event->inotify_watch_final = true;
                        event->inotify_watch = cur->key.watch;
                        break;
                case TK_A_DEVLINK_PRIO:
@@ -2348,7 +2456,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                if (event->owner_final)
                                        break;
                                if (cur->key.op == OP_ASSIGN_FINAL)
-                                       event->owner_final = 1;
+                                       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",
@@ -2364,7 +2472,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                if (event->group_final)
                                        break;
                                if (cur->key.op == OP_ASSIGN_FINAL)
-                                       event->group_final = 1;
+                                       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",
@@ -2381,12 +2489,12 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                if (event->mode_final)
                                        break;
                                if (cur->key.op == OP_ASSIGN_FINAL)
-                                       event->mode_final = 1;
+                                       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 0660\n", mode);
-                                       event->mode = 0660;
+                                       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,
@@ -2398,7 +2506,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        if (event->owner_final)
                                break;
                        if (cur->key.op == OP_ASSIGN_FINAL)
-                               event->owner_final = 1;
+                               event->owner_final = true;
                        event->uid = cur->key.uid;
                        info(event->udev, "OWNER %u %s:%u\n",
                             event->uid,
@@ -2409,7 +2517,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        if (event->group_final)
                                break;
                        if (cur->key.op == OP_ASSIGN_FINAL)
-                               event->group_final = 1;
+                               event->group_final = true;
                        event->gid = cur->key.gid;
                        info(event->udev, "GROUP %u %s:%u\n",
                             event->gid,
@@ -2420,13 +2528,15 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        if (event->mode_final)
                                break;
                        if (cur->key.op == OP_ASSIGN_FINAL)
-                               event->mode_final = 1;
+                               event->mode_final = true;
                        event->mode = cur->key.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_STATIC_NODE:
+                       break;
                case TK_A_ENV:
                        {
                                const char *name = &rules->buf[cur->key.attr_off];
@@ -2460,7 +2570,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                if (event->name_final)
                                        break;
                                if (cur->key.op == OP_ASSIGN_FINAL)
-                                       event->name_final = 1;
+                                       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, "/");
@@ -2487,7 +2597,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                if (major(udev_device_get_devnum(event->dev)) == 0)
                                        break;
                                if (cur->key.op == OP_ASSIGN_FINAL)
-                                       event->devlink_final = 1;
+                                       event->devlink_final = true;
                                if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
                                        udev_device_cleanup_devlinks_list(event->dev);
 
@@ -2523,9 +2633,6 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                }
                        }
                        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];
@@ -2592,3 +2699,75 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                 (unsigned int) (cur - rules->tokens));
        }
 }
+
+void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
+{
+       struct token *cur;
+       struct token *rule;
+       uid_t uid = 0;
+       gid_t gid = 0;
+       mode_t mode = 0;
+
+       if (rules->tokens == NULL)
+               return;
+
+       cur = &rules->tokens[0];
+       rule = cur;
+       for (;;) {
+               switch (cur->type) {
+               case TK_RULE:
+                       /* current rule */
+                       rule = cur;
+
+                       /* skip rules without a static_node tag */
+                       if (!rule->rule.has_static_node)
+                               goto next;
+
+                       uid = 0;
+                       gid = 0;
+                       mode = 0;
+                       break;
+               case TK_A_OWNER_ID:
+                       uid = cur->key.uid;
+                       break;
+               case TK_A_GROUP_ID:
+                       gid = cur->key.gid;
+                       break;
+               case TK_A_MODE_ID:
+                       mode = cur->key.mode;
+                       break;
+               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)
+                               goto next;
+                       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(rules->udev), "/",
+                                     &rules->buf[cur->key.value_off], NULL);
+                       if (stat(filename, &stats) != 0)
+                               goto next;
+                       if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode))
+                               goto next;
+                       if (mode != 0 && 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;
+               }
+               case TK_END:
+                       return;
+               }
+
+               cur++;
+               continue;
+next:
+               /* fast-forward to next rule */
+               cur = rule + rule->rule.token_count;
+               continue;
+       }
+}