/*
* Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2008 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*/
#include <stddef.h>
+#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#define PREALLOC_TOKEN 2048
#define PREALLOC_STRBUF 32 * 1024
+#define PREALLOC_TRIE 256
struct uid_gid {
unsigned int name_off;
};
};
-/* KEY=="", KEY!="", KEY+="", KEY="", KEY:="" */
+struct trie_node {
+ /* this node's first child */
+ unsigned int child_idx;
+ /* the next child of our parent node's child list */
+ unsigned int next_child_idx;
+ /* this node's last child (shortcut for append) */
+ unsigned int last_child_idx;
+ unsigned int value_off;
+ unsigned short value_len;
+ unsigned char key;
+};
+
struct udev_rules {
struct udev *udev;
int resolve_names;
size_t buf_max;
unsigned int buf_count;
- /* during rule parsing, we cache uid/gid lookup results */
+ /* during rule parsing, strings are indexed to find duplicates */
+ struct trie_node *trie_nodes;
+ unsigned int trie_nodes_cur;
+ unsigned int trie_nodes_max;
+
+ /* during rule parsing, uid/gid lookup results are cached */
struct uid_gid *uids;
unsigned int uids_cur;
unsigned int uids_max;
unsigned int gids_max;
};
+/* KEY=="", KEY!="", KEY+="", KEY="", KEY:="" */
enum operation_type {
OP_UNSET,
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 */
union {
unsigned int attr_off;
int ignore_error;
- int i;
unsigned int rule_goto;
mode_t mode;
uid_t uid;
int num_fake_part;
int devlink_prio;
int event_timeout;
+ int watch;
};
} key;
};
[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",
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;
static inline void dump_rules(struct udev_rules *rules) {}
#endif /* DEBUG */
-/* we could lookup and return existing strings, or tails of strings */
-static int add_string(struct udev_rules *rules, const char *str)
+static int add_new_string(struct udev_rules *rules, const char *str, size_t bytes)
{
- size_t len = strlen(str)+1;
int off;
- /* offset 0 is always '\0' */
- if (str[0] == '\0')
- return 0;
-
/* grow buffer if needed */
- if (rules->buf_cur + len+1 >= rules->buf_max) {
+ if (rules->buf_cur + bytes+1 >= rules->buf_max) {
char *buf;
unsigned int add;
/* double the buffer size */
add = rules->buf_max;
- if (add < len * 8)
- add = len * 8;
+ if (add < bytes * 8)
+ add = bytes * 8;
buf = realloc(rules->buf, rules->buf_max + add);
if (buf == NULL)
rules->buf_max += add;
}
off = rules->buf_cur;
- memcpy(&rules->buf[rules->buf_cur], str, len);
- rules->buf_cur += len;
+ memcpy(&rules->buf[rules->buf_cur], str, bytes);
+ rules->buf_cur += bytes;
rules->buf_count++;
return off;
}
-static int add_token(struct udev_rules *rules, struct token *token)
+static int add_string(struct udev_rules *rules, const char *str)
{
+ unsigned int node_idx;
+ struct trie_node *new_node;
+ unsigned int new_node_idx;
+ unsigned char key;
+ unsigned short len;
+ unsigned int depth;
+ unsigned int off;
+ struct trie_node *parent;
+
+ /* walk trie, start from last character of str to find matching tails */
+ len = strlen(str);
+ key = str[len-1];
+ node_idx = 0;
+ for (depth = 0; depth <= len; depth++) {
+ struct trie_node *node;
+ unsigned int child_idx;
+
+ node = &rules->trie_nodes[node_idx];
+ off = node->value_off + node->value_len - len;
+
+ /* match against current node */
+ if (depth == len || (node->value_len >= len && memcmp(&rules->buf[off], str, len) == 0))
+ return off;
+
+ /* lookup child node */
+ key = str[len - 1 - depth];
+ child_idx = node->child_idx;
+ while (child_idx > 0) {
+ struct trie_node *child;
+
+ child = &rules->trie_nodes[child_idx];
+ if (child->key == key)
+ break;
+ child_idx = child->next_child_idx;
+ }
+ if (child_idx == 0)
+ break;
+ node_idx = child_idx;
+ }
+
+ /* string not found, add it */
+ off = add_new_string(rules, str, len + 1);
+
+ /* grow trie nodes if needed */
+ if (rules->trie_nodes_cur >= rules->trie_nodes_max) {
+ struct trie_node *nodes;
+ unsigned int add;
+ /* double the buffer size */
+ add = rules->trie_nodes_max;
+ if (add < 8)
+ add = 8;
+
+ nodes = realloc(rules->trie_nodes, (rules->trie_nodes_max + add) * sizeof(struct trie_node));
+ if (nodes == NULL)
+ return -1;
+ dbg(rules->udev, "extend trie nodes from %u to %u\n",
+ rules->trie_nodes_max, rules->trie_nodes_max + add);
+ rules->trie_nodes = nodes;
+ rules->trie_nodes_max += add;
+ }
+
+ /* get a new node */
+ new_node_idx = rules->trie_nodes_cur;
+ rules->trie_nodes_cur++;
+ new_node = &rules->trie_nodes[new_node_idx];
+ memset(new_node, 0x00, sizeof(struct trie_node));
+ new_node->value_off = off;
+ new_node->value_len = len;
+ new_node->key = key;
+
+ /* join the parent's child list */
+ parent = &rules->trie_nodes[node_idx];
+ if (parent->child_idx == 0) {
+ parent->child_idx = new_node_idx;
+ } else {
+ struct trie_node *last_child;
+
+ last_child = &rules->trie_nodes[parent->last_child_idx];
+ last_child->next_child_idx = new_node_idx;
+ }
+ parent->last_child_idx = new_node_idx;
+ return off;
+}
+
+static int add_token(struct udev_rules *rules, struct token *token)
+{
/* grow buffer if needed */
if (rules->token_cur+1 >= rules->token_max) {
struct token *tokens;
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;
{
struct udev *udev = udev_device_get_udev(dev);
char **envp;
- char result[2048];
+ char result[4096];
size_t reslen;
char *line;
/* 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;
}
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;
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;
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;
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;
struct rule_tmp rule_tmp;
memset(&rule_tmp, 0x00, sizeof(struct rule_tmp));
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_ACTION, op, value, NULL);
- valid = 1;
continue;
}
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_DEVPATH, op, value, NULL);
- valid = 1;
continue;
}
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_KERNEL, op, value, NULL);
- valid = 1;
continue;
}
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;
}
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_DRIVER, op, value, NULL);
- valid = 1;
continue;
}
} else {
rule_add_key(&rule_tmp, TK_A_ATTR, op, value, attr);
}
- valid = 1;
continue;
}
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_KERNELS, op, value, NULL);
- valid = 1;
continue;
}
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL);
- valid = 1;
continue;
}
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_DRIVERS, op, value, NULL);
- valid = 1;
continue;
}
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;
}
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;
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;
}
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_RESULT, op, value, NULL);
- valid = 1;
continue;
}
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;
} else {
rule_add_key(&rule_tmp, TK_M_TEST, op, value, NULL);
}
- valid = 1;
continue;
}
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;
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;
}
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) {
else
rule_add_key(&rule_tmp, TK_A_DEVLINK, op, value, NULL);
rule_tmp.rule.rule.flags = 1;
- valid = 1;
continue;
}
uid = strtoul(value, &endptr, 10);
if (endptr[0] == '\0') {
rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
- } else if (rules->resolve_names && strchr("$%", value[0]) == NULL) {
+ } 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 {
+ } 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;
}
gid = strtoul(value, &endptr, 10);
if (endptr[0] == '\0') {
rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
- } else if (rules->resolve_names && strchr("$%", value[0]) == NULL) {
+ } 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 {
+ } 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;
}
else
rule_add_key(&rule_tmp, TK_A_MODE, op, value, NULL);
rule_tmp.rule.rule.flags = 1;
- valid = 1;
continue;
}
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)
- err(rules->udev, "PHYSDEV* values are deprecated and not available on recent kernels, \n"
- "please fix it in %s:%u", filename, lineno);
-
- /* skip line if not any 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)
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);
dbg(udev, "open directory '%s'\n", dirname);
dir = opendir(dirname);
if (dir == NULL) {
- err(udev, "unable to open '%s': %m\n", dirname);
+ info(udev, "unable to open '%s': %m\n", dirname);
return -1;
}
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);
}
if (rules->tokens == NULL)
return NULL;
rules->token_max = PREALLOC_TOKEN;
+
rules->buf = malloc(PREALLOC_STRBUF);
if (rules->buf == NULL)
return NULL;
dbg(udev, "prealloc %zu bytes tokens (%u * %zu bytes), %zu bytes buffer\n",
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)
+ 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));
+ 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");
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);
rules->buf_max = rules->buf_cur;
}
}
- info(udev, "shrunk to %zu bytes tokens (%u * %zu bytes), %zu bytes buffer\n",
+ info(udev, "rules use %zu bytes tokens (%u * %zu bytes), %zu bytes buffer\n",
rules->token_max * sizeof(struct token), rules->token_max, sizeof(struct token), rules->buf_max);
+ info(udev, "temporary index used %zu bytes (%u * %zu bytes)\n",
+ rules->trie_nodes_cur * sizeof(struct trie_node),
+ rules->trie_nodes_cur, sizeof(struct trie_node));
+
+ /* cleanup trie */
+ free(rules->trie_nodes);
+ rules->trie_nodes = NULL;
+ rules->trie_nodes_cur = 0;
+ rules->trie_nodes_max = 0;
/* cleanup uid/gid cache */
free(rules->uids);
return;
free(rules->tokens);
free(rules->buf);
+ free(rules->trie_nodes);
free(rules->uids);
free(rules->gids);
free(rules);
{
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, '|');
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') {
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 */
rule = cur;
/* possibly skip rules which want to set NAME, SYMLINK, OWNER, GROUP, MODE */
if (!can_set_name && rule->rule.flags)
- ;//goto nomatch;
+ goto nomatch;
esc = ESCAPE_UNSET;
break;
case TK_M_ACTION:
break;
case TK_M_ENV:
{
- struct udev_list_entry *list_entry;
const char *key_name = &rules->buf[cur->key.attr_off];
const char *value;
- list_entry = udev_device_get_properties_list_entry(event->dev);
- list_entry = udev_list_entry_get_by_name(list_entry, key_name);
- value = udev_list_entry_get_value(list_entry);
+ 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 = "";
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;
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);
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,
{
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;
{
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],
{
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;
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;
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,
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,
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);
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);
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:
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)
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++;
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);
}
}
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);
f = fopen(attr, "w");
if (f != NULL) {
- if (!event->test)
- if (fprintf(f, "%s", value) <= 0)
- err(event->udev, "error writing ATTR{%s}: %m\n", attr);
+ 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_GOTO:
+ if (cur->key.rule_goto == 0)
+ break;
cur = &rules->tokens[cur->key.rule_goto];
continue;
case TK_A_LAST_RULE: