chiark / gitweb /
use openat(), unlinkat(), fstatat()
[elogind.git] / udev / udev-rules.c
index ccf1eaaf8f43b5027038780be1975dce2349148c..6d03ab63c09553028007e8caa204b596f30fa78d 100644 (file)
@@ -140,6 +140,7 @@ enum token_type {
        TK_A_IGNORE_DEVICE,
        TK_A_STRING_ESCAPE_NONE,
        TK_A_STRING_ESCAPE_REPLACE,
+       TK_A_INOTIFY_WATCH,             /* int */
        TK_A_NUM_FAKE_PART,             /* int */
        TK_A_DEVLINK_PRIO,              /* int */
        TK_A_OWNER,                     /* val */
@@ -182,7 +183,6 @@ struct token {
                        union {
                                unsigned int attr_off;
                                int ignore_error;
-                               int i;
                                unsigned int rule_goto;
                                mode_t  mode;
                                uid_t uid;
@@ -190,6 +190,7 @@ struct token {
                                int num_fake_part;
                                int devlink_prio;
                                int event_timeout;
+                               int watch;
                        };
                } key;
        };
@@ -270,6 +271,7 @@ static const char *token_str(enum token_type type)
                [TK_A_IGNORE_DEVICE] =          "A IGNORE_DEVICE",
                [TK_A_STRING_ESCAPE_NONE] =     "A STRING_ESCAPE_NONE",
                [TK_A_STRING_ESCAPE_REPLACE] =  "A STRING_ESCAPE_REPLACE",
+               [TK_A_INOTIFY_WATCH] =          "A INOTIFY_WATCH",
                [TK_A_NUM_FAKE_PART] =          "A NUM_FAKE_PART",
                [TK_A_DEVLINK_PRIO] =           "A DEVLINK_PRIO",
                [TK_A_OWNER] =                  "A OWNER",
@@ -360,6 +362,9 @@ static void dump_token(struct udev_rules *rules, struct token *token)
                dbg(rules->udev, "%s %s '%s'(%s) %#o\n",
                    token_str(type), operation_str(op), value, string_glob_str(glob), token->key.mode);
                break;
+       case TK_A_INOTIFY_WATCH:
+               dbg(rules->udev, "%s %u\n", token_str(type), token->key.watch);
+               break;
        case TK_A_NUM_FAKE_PART:
                dbg(rules->udev, "%s %u\n", token_str(type), token->key.num_fake_part);
                break;
@@ -701,8 +706,7 @@ static int import_property_from_string(struct udev_device *dev, char *line)
 
                info(udev, "updating devpath from '%s' to '%s'\n",
                     udev_device_get_devpath(dev), val);
-               util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath));
-               util_strlcat(syspath, val, sizeof(syspath));
+               util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), val, NULL);
                udev_device_set_syspath(dev, syspath);
        } else {
                struct udev_list_entry *entry;
@@ -732,7 +736,7 @@ static int import_program_into_properties(struct udev_device *dev, const char *p
 {
        struct udev *udev = udev_device_get_udev(dev);
        char **envp;
-       char result[2048];
+       char result[4096];
        size_t reslen;
        char *line;
 
@@ -794,12 +798,9 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout)
        /* a relative path is a device attribute */
        devicepath[0] = '\0';
        if (file[0] != '/') {
-               util_strlcpy(devicepath, udev_get_sys_path(udev), sizeof(devicepath));
-               util_strlcat(devicepath, udev_device_get_devpath(dev), sizeof(devicepath));
-
-               util_strlcpy(filepath, devicepath, sizeof(filepath));
-               util_strlcat(filepath, "/", sizeof(filepath));
-               util_strlcat(filepath, file, sizeof(filepath));
+               util_strscpyl(devicepath, sizeof(devicepath),
+                             udev_get_sys_path(udev), udev_device_get_devpath(dev), NULL);
+               util_strscpyl(filepath, sizeof(filepath), devicepath, "/", file, NULL);
                file = filepath;
        }
 
@@ -824,17 +825,21 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout)
 
 static int attr_subst_subdir(char *attr, size_t len)
 {
-       char *pos;
        int found = 0;
 
-       pos = strstr(attr, "/*/");
-       if (pos != NULL) {
-               char str[UTIL_PATH_SIZE];
+       if (strstr(attr, "/*/")) {
+               char *pos;
+               char dirname[UTIL_PATH_SIZE];
+               const char *tail;
                DIR *dir;
 
-               pos[1] = '\0';
-               util_strlcpy(str, &pos[2], sizeof(str));
-               dir = opendir(attr);
+               util_strscpy(dirname, sizeof(dirname), attr);
+               pos = strstr(dirname, "/*/");
+               if (pos == NULL)
+                       return -1;
+               pos[0] = '\0';
+               tail = &pos[2];
+               dir = opendir(dirname);
                if (dir != NULL) {
                        struct dirent *dent;
 
@@ -843,18 +848,14 @@ static int attr_subst_subdir(char *attr, size_t len)
 
                                if (dent->d_name[0] == '.')
                                        continue;
-                               util_strlcat(attr, dent->d_name, len);
-                               util_strlcat(attr, str, len);
+                               util_strscpyl(attr, len, dirname, "/", dent->d_name, tail, NULL);
                                if (stat(attr, &stats) == 0) {
                                        found = 1;
                                        break;
                                }
-                               pos[1] = '\0';
                        }
                        closedir(dir);
                }
-               if (!found)
-                       util_strlcat(attr, str, len);
        }
 
        return found;
@@ -1027,9 +1028,8 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
                token->key.value_off = add_string(rule_tmp->rules, value);
                token->key.ignore_error = *(int *)data;
                break;
+       case TK_A_INOTIFY_WATCH:
        case TK_A_NUM_FAKE_PART:
-               token->key.num_fake_part = *(int *)data;
-               break;
        case TK_A_DEVLINK_PRIO:
                token->key.devlink_prio = *(int *)data;
                break;
@@ -1131,11 +1131,8 @@ static int sort_token(struct udev_rules *rules, struct rule_tmp *rule_tmp)
 static int add_rule(struct udev_rules *rules, char *line,
                    const char *filename, unsigned int filename_off, unsigned int lineno)
 {
-       int valid = 0;
        char *linepos;
        char *attr;
-       int physdev = 0;
-       int waitfor = 0;
        struct rule_tmp rule_tmp;
 
        memset(&rule_tmp, 0x00, sizeof(struct rule_tmp));
@@ -1159,7 +1156,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                                goto invalid;
                        }
                        rule_add_key(&rule_tmp, TK_M_ACTION, op, value, NULL);
-                       valid = 1;
                        continue;
                }
 
@@ -1169,7 +1165,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                                goto invalid;
                        }
                        rule_add_key(&rule_tmp, TK_M_DEVPATH, op, value, NULL);
-                       valid = 1;
                        continue;
                }
 
@@ -1179,7 +1174,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                                goto invalid;
                        }
                        rule_add_key(&rule_tmp, TK_M_KERNEL, op, value, NULL);
-                       valid = 1;
                        continue;
                }
 
@@ -1198,7 +1192,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                                rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, "subsystem|class|bus", NULL);
                        } else
                                rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, value, NULL);
-                       valid = 1;
                        continue;
                }
 
@@ -1208,7 +1201,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                                goto invalid;
                        }
                        rule_add_key(&rule_tmp, TK_M_DRIVER, op, value, NULL);
-                       valid = 1;
                        continue;
                }
 
@@ -1223,7 +1215,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                        } else {
                                rule_add_key(&rule_tmp, TK_A_ATTR, op, value, attr);
                        }
-                       valid = 1;
                        continue;
                }
 
@@ -1234,7 +1225,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                                goto invalid;
                        }
                        rule_add_key(&rule_tmp, TK_M_KERNELS, op, value, NULL);
-                       valid = 1;
                        continue;
                }
 
@@ -1245,7 +1235,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                                goto invalid;
                        }
                        rule_add_key(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL);
-                       valid = 1;
                        continue;
                }
 
@@ -1255,7 +1244,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                                goto invalid;
                        }
                        rule_add_key(&rule_tmp, TK_M_DRIVERS, op, value, NULL);
-                       valid = 1;
                        continue;
                }
 
@@ -1277,7 +1265,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                                err(rules->udev, "do not reference parent sysfs directories directly, "
                                    "it may break with a future kernel, please fix it in %s:%u", filename, lineno);
                        rule_add_key(&rule_tmp, TK_M_ATTRS, op, value, attr);
-                       valid = 1;
                        continue;
                }
 
@@ -1287,8 +1274,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                                err(rules->udev, "error parsing ENV attribute\n");
                                goto invalid;
                        }
-                       if (strncmp(attr, "PHYSDEV", 7) == 0)
-                               physdev = 1;
                        if (op < OP_MATCH_MAX) {
                                if (rule_add_key(&rule_tmp, TK_M_ENV, op, value, attr) != 0)
                                        goto invalid;
@@ -1296,13 +1281,11 @@ static int add_rule(struct udev_rules *rules, char *line,
                                if (rule_add_key(&rule_tmp, TK_A_ENV, op, value, attr) != 0)
                                        goto invalid;
                        }
-                       valid = 1;
                        continue;
                }
 
                if (strcasecmp(key, "PROGRAM") == 0) {
                        rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
-                       valid = 1;
                        continue;
                }
 
@@ -1312,7 +1295,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                                goto invalid;
                        }
                        rule_add_key(&rule_tmp, TK_M_RESULT, op, value, NULL);
-                       valid = 1;
                        continue;
                }
 
@@ -1321,44 +1303,33 @@ static int add_rule(struct udev_rules *rules, char *line,
                        if (attr != NULL && strstr(attr, "program")) {
                                dbg(rules->udev, "IMPORT will be executed\n");
                                rule_add_key(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL);
-                               valid = 1;
                        } else if (attr != NULL && strstr(attr, "file")) {
                                dbg(rules->udev, "IMPORT will be included as file\n");
                                rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
-                               valid = 1;
                        } 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);
-                               valid = 1;
                        } else {
                                /* figure it out if it is executable */
                                char file[UTIL_PATH_SIZE];
                                char *pos;
                                struct stat statbuf;
 
-                               util_strlcpy(file, value, sizeof(file));
+                               /* allow programs in /lib/udev called without the path */
+                               if (value[0] != '/')
+                                       util_strscpyl(file, sizeof(file), UDEV_PREFIX "/lib/udev/", value, NULL);
+                               else
+                                       util_strscpy(file, sizeof(file), value);
                                pos = strchr(file, ' ');
                                if (pos)
                                        pos[0] = '\0';
-
-                               /* allow programs in /lib/udev called without the path */
-                               if (strchr(file, '/') == NULL) {
-                                       util_strlcpy(file, UDEV_PREFIX "/lib/udev/", sizeof(file));
-                                       util_strlcat(file, value, sizeof(file));
-                                       pos = strchr(file, ' ');
-                                       if (pos)
-                                               pos[0] = '\0';
-                               }
-
                                dbg(rules->udev, "IMPORT auto mode for '%s'\n", file);
-                               if (!lstat(file, &statbuf) && (statbuf.st_mode & S_IXUSR)) {
+                               if (stat(file, &statbuf) == 0 && (statbuf.st_mode & S_IXUSR)) {
                                        dbg(rules->udev, "IMPORT will be executed (autotype)\n");
                                        rule_add_key(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL);
-                                       valid = 1;
                                } else {
                                        dbg(rules->udev, "IMPORT will be included as file (autotype)\n");
                                        rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
-                                       valid = 1;
                                }
                        }
                        continue;
@@ -1378,7 +1349,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                        } else {
                                rule_add_key(&rule_tmp, TK_M_TEST, op, value, NULL);
                        }
-                       valid = 1;
                        continue;
                }
 
@@ -1389,26 +1359,21 @@ static int add_rule(struct udev_rules *rules, char *line,
                        if (attr != NULL && strstr(attr, "ignore_error"))
                                flag = 1;
                        rule_add_key(&rule_tmp, TK_A_RUN, op, value, &flag);
-                       valid = 1;
                        continue;
                }
 
                if (strcasecmp(key, "WAIT_FOR") == 0 || strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
                        rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
-                       valid = 1;
-                       waitfor = 1;
                        continue;
                }
 
                if (strcasecmp(key, "LABEL") == 0) {
                        rule_tmp.rule.rule.label_off = add_string(rules, value);
-                       valid = 1;
                        continue;
                }
 
                if (strcasecmp(key, "GOTO") == 0) {
                        rule_add_key(&rule_tmp, TK_A_GOTO, 0, value, NULL);
-                       valid = 1;
                        continue;
                }
 
@@ -1417,7 +1382,7 @@ static int add_rule(struct udev_rules *rules, char *line,
                                rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL);
                        } else {
                                if (value[0] == '\0')
-                                       dbg(rules->udev, "name empty, node creation suppressed\n");
+                                       info(rules->udev, "name empty, node creation suppressed\n");
                                rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL);
                                attr = get_key_attribute(rules->udev, key + sizeof("NAME")-1);
                                if (attr != NULL) {
@@ -1443,7 +1408,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                        else
                                rule_add_key(&rule_tmp, TK_A_DEVLINK, op, value, NULL);
                        rule_tmp.rule.rule.flags = 1;
-                       valid = 1;
                        continue;
                }
 
@@ -1457,11 +1421,10 @@ static int add_rule(struct udev_rules *rules, char *line,
                        } else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) {
                                uid = add_uid(rules, value);
                                rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
-                       } else if (rules->resolve_names == 0) {
+                       } else if (rules->resolve_names >= 0) {
                                rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL);
                        }
                        rule_tmp.rule.rule.flags = 1;
-                       valid = 1;
                        continue;
                }
 
@@ -1475,11 +1438,10 @@ static int add_rule(struct udev_rules *rules, char *line,
                        } else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) {
                                gid = add_gid(rules, value);
                                rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
-                       } else if (rules->resolve_names == 0) {
+                       } else if (rules->resolve_names >= 0) {
                                rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL);
                        }
                        rule_tmp.rule.rule.flags = 1;
-                       valid = 1;
                        continue;
                }
 
@@ -1493,7 +1455,6 @@ static int add_rule(struct udev_rules *rules, char *line,
                        else
                                rule_add_key(&rule_tmp, TK_A_MODE, op, value, NULL);
                        rule_tmp.rule.rule.flags = 1;
-                       valid = 1;
                        continue;
                }
 
@@ -1540,20 +1501,26 @@ static int add_rule(struct udev_rules *rules, char *line,
                                rule_add_key(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num);
                                dbg(rules->udev, "creation of partition nodes requested\n");
                        }
-                       valid = 1;
+                       pos = strstr(value, "nowatch");
+                       if (pos != NULL) {
+                               const int off = 0;
+
+                               rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, 0, 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);
+                                       dbg(rules->udev, "inotify watch of device requested\n");
+                               }
+                       }
                        continue;
                }
                err(rules->udev, "unknown key '%s' in %s:%u\n", key, filename, lineno);
        }
 
-       if (physdev && !waitfor)
-               err(rules->udev, "PHYSDEV* values are deprecated and not available on recent kernels, "
-                   "please fix it in %s:%u\n", filename, lineno);
-
-       /* skip line if no valid key was found */
-       if (!valid)
-               goto invalid;
-
        /* add rule token */
        rule_tmp.rule.rule.token_count = 1 + rule_tmp.token_cur;
        if (add_token(rules, &rule_tmp.rule) != 0)
@@ -1633,6 +1600,7 @@ static int parse_file(struct udev_rules *rules, const char *filename, unsigned s
                                if (strcmp(label, &rules->buf[rules->tokens[j].rule.label_off]) != 0)
                                        continue;
                                rules->tokens[i].key.rule_goto = j;
+                               break;
                        }
                        if (rules->tokens[i].key.rule_goto == 0)
                                err(rules->udev, "GOTO '%s' has no matching label in: '%s'\n", label, filename);
@@ -1673,10 +1641,8 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
                        if (strcmp(ext, suffix) != 0)
                                continue;
                }
-               dbg(udev, "put file '%s/%s' into list\n", dirname, dent->d_name);
-
-               snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->d_name);
-               filename[sizeof(filename)-1] = '\0';
+               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);
        }
 
@@ -1736,8 +1702,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_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
-               util_strlcat(filename, "/.udev/rules.d", sizeof(filename));
+               util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/rules.d", NULL);
                if (stat(filename, &statbuf) != 0) {
                        util_create_path(udev, filename);
                        udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755);
@@ -1917,7 +1882,7 @@ static int match_key(struct udev_rules *rules, struct token *token, const char *
                {
                        char value[UTIL_PATH_SIZE];
 
-                       util_strlcpy(value, &rules->buf[token->key.value_off], sizeof(value));
+                       util_strscpy(value, sizeof(value), &rules->buf[token->key.value_off]);
                        key_value = value;
                        while (key_value != NULL) {
                                pos = strchr(key_value, '|');
@@ -1964,7 +1929,7 @@ static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct
        if (key_name[0] == '[') {
                char attr[UTIL_PATH_SIZE];
 
-               util_strlcpy(attr, key_name, sizeof(attr));
+               util_strscpy(attr, sizeof(attr), key_name);
                util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1);
        }
        if (value[0] == '\0') {
@@ -1973,7 +1938,7 @@ static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct
                val = udev_device_get_sysattr_value(dev, key_name);
                if (val == NULL)
                        return -1;
-               util_strlcpy(value, val, sizeof(value));
+               util_strscpy(value, sizeof(value), val);
        }
 
        /* strip trailing whitespace of value, if not asked to match for it */
@@ -2084,8 +2049,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                char filename[UTIL_PATH_SIZE];
                                int found;
 
-                               util_strlcpy(filename, &rules->buf[cur->key.value_off], sizeof(filename));
-                               udev_event_apply_format(event, filename, sizeof(filename));
+                               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;
@@ -2157,18 +2121,16 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                struct stat statbuf;
                                int match;
 
-                               util_strlcpy(filename, &rules->buf[cur->key.value_off], sizeof(filename));
-                               udev_event_apply_format(event, filename, sizeof(filename));
-                               if (util_resolve_subsys_kernel(event->udev, NULL, filename, sizeof(filename), 0) != 0)
+                               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_strlcpy(tmp, udev_device_get_syspath(event->dev), sizeof(tmp));
-                                               util_strlcat(tmp, "/", sizeof(tmp));
-                                               util_strlcat(tmp, filename, sizeof(tmp));
-                                               util_strlcpy(filename, tmp, sizeof(filename));
+                                               util_strscpy(tmp, sizeof(tmp), filename);
+                                               util_strscpyl(filename, sizeof(filename),
+                                                             udev_device_get_syspath(event->dev), "/", tmp, NULL);
                                        }
-
+                               }
                                attr_subst_subdir(filename, sizeof(filename));
 
                                match = (stat(filename, &statbuf) == 0);
@@ -2192,8 +2154,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
                                free(event->program_result);
                                event->program_result = NULL;
-                               util_strlcpy(program, &rules->buf[cur->key.value_off], sizeof(program));
-                               udev_event_apply_format(event, program, sizeof(program));
+                               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,
@@ -2222,8 +2183,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        {
                                char import[UTIL_PATH_SIZE];
 
-                               util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import));
-                               udev_event_apply_format(event, import, sizeof(import));
+                               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;
@@ -2233,8 +2193,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        {
                                char import[UTIL_PATH_SIZE];
 
-                               util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import));
-                               udev_event_apply_format(event, import, sizeof(import));
+                               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],
@@ -2248,8 +2207,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        {
                                char import[UTIL_PATH_SIZE];
 
-                               util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import));
-                               udev_event_apply_format(event, import, sizeof(import));
+                               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;
@@ -2277,6 +2235,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                break;
                        udev_device_set_num_fake_partitions(event->dev, cur->key.num_fake_part);
                        break;
+               case TK_A_INOTIFY_WATCH:
+                       event->inotify_watch = cur->key.watch;
+                       break;
                case TK_A_DEVLINK_PRIO:
                        udev_device_set_devlink_priority(event->dev, cur->key.devlink_prio);
                        break;
@@ -2288,8 +2249,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                        break;
                                if (cur->key.op == OP_ASSIGN_FINAL)
                                        event->owner_final = 1;
-                               util_strlcpy(owner,  &rules->buf[cur->key.value_off], sizeof(owner));
-                               udev_event_apply_format(event, owner, sizeof(owner));
+                               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,
@@ -2305,8 +2265,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                        break;
                                if (cur->key.op == OP_ASSIGN_FINAL)
                                        event->group_final = 1;
-                               util_strlcpy(group, &rules->buf[cur->key.value_off], sizeof(group));
-                               udev_event_apply_format(event, group, sizeof(group));
+                               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,
@@ -2323,8 +2282,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 = 1;
-                               util_strlcpy(mode, &rules->buf[cur->key.value_off], sizeof(mode));
-                               udev_event_apply_format(event, mode, sizeof(mode));
+                               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);
@@ -2378,8 +2336,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                        char temp_value[UTIL_NAME_SIZE];
                                        struct udev_list_entry *entry;
 
-                                       util_strlcpy(temp_value, value, sizeof(temp_value));
-                                       udev_event_apply_format(event, temp_value, sizeof(temp_value));
+                                       udev_event_apply_format(event, value, temp_value, sizeof(temp_value));
                                        entry = udev_device_add_property(event->dev, name, temp_value);
                                        /* store in db */
                                        udev_list_entry_set_flag(entry, 1);
@@ -2398,24 +2355,18 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                        break;
                                if (cur->key.op == OP_ASSIGN_FINAL)
                                        event->name_final = 1;
-                               if (name[0] == '\0') {
-                                       free(event->name);
-                                       event->name = NULL;
-                                       break;
-                               }
-                               util_strlcpy(name_str, name, sizeof(name_str));
-                               udev_event_apply_format(event, name_str, sizeof(name_str));
+                               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);
                                }
+                               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_DEVLINK:
@@ -2435,8 +2386,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                        udev_device_cleanup_devlinks_list(event->dev);
 
                                /* allow  multiple symlinks separated by spaces */
-                               util_strlcpy(temp, &rules->buf[cur->key.value_off], sizeof(temp));
-                               udev_event_apply_format(event, temp, sizeof(temp));
+                               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)
@@ -2454,9 +2404,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                             pos,
                                             &rules->buf[rule->rule.filename_off],
                                             rule->rule.filename_line);
-                                       util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename));
-                                       util_strlcat(filename, "/", sizeof(filename));
-                                       util_strlcat(filename, pos, sizeof(filename));
+                                       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", pos, NULL);
                                        udev_device_add_devlink(event->dev, filename);
                                        while (isspace(next[1]))
                                                next++;
@@ -2468,9 +2416,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                             pos,
                                             &rules->buf[rule->rule.filename_off],
                                             rule->rule.filename_line);
-                                       util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename));
-                                       util_strlcat(filename, "/", sizeof(filename));
-                                       util_strlcat(filename, pos, sizeof(filename));
+                                       util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", pos, NULL);
                                        udev_device_add_devlink(event->dev, filename);
                                }
                        }
@@ -2488,17 +2434,11 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                char value[UTIL_NAME_SIZE];
                                FILE *f;
 
-                               util_strlcpy(attr, key_name, sizeof(attr));
-                               if (util_resolve_subsys_kernel(event->udev, key_name, attr, sizeof(attr), 0) != 0) {
-                                       util_strlcpy(attr, udev_device_get_syspath(event->dev), sizeof(attr));
-                                       util_strlcat(attr, "/", sizeof(attr));
-                                       util_strlcat(attr, key_name, sizeof(attr));
-                               }
-
+                               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));
 
-                               util_strlcpy(value, &rules->buf[cur->key.value_off], sizeof(value));
-                               udev_event_apply_format(event, value, sizeof(value));
+                               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);
@@ -2529,6 +2469,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                break;
                        }
                case TK_A_GOTO:
+                       if (cur->key.rule_goto == 0)
+                               break;
                        cur = &rules->tokens[cur->key.rule_goto];
                        continue;
                case TK_A_LAST_RULE: