#include <time.h>
#include "udev.h"
+#include "path-util.h"
+#include "conf-files.h"
#define PREALLOC_TOKEN 2048
#define PREALLOC_STRBUF 32 * 1024
struct udev_rules {
struct udev *udev;
+ char **dirs;
+ unsigned long long *dirs_ts_usec;
int resolve_names;
/* every key in the rules file becomes a token */
size_t buf_max;
unsigned int buf_count;
- /* during rule parsing, strings are indexed to find duplicates */
+ /* during rule parsing, strings are indexed and de-duplicated */
struct trie_node *trie_nodes;
unsigned int trie_nodes_cur;
unsigned int trie_nodes_max;
TK_A_NAME, /* val */
TK_A_DEVLINK, /* val */
TK_A_ATTR, /* val, attr */
- TK_A_RUN, /* val, bool */
+ TK_A_RUN_BUILTIN, /* val, bool */
+ TK_A_RUN_PROGRAM, /* val, bool */
TK_A_GOTO, /* size_t */
TK_END,
unsigned int token_cur;
};
-#ifdef ENABLE_DEBUG
+#ifdef DEBUG
static const char *operation_str(enum operation_type type)
{
static const char *operation_strs[] = {
[TK_A_NAME] = "A NAME",
[TK_A_DEVLINK] = "A DEVLINK",
[TK_A_ATTR] = "A ATTR",
- [TK_A_RUN] = "A RUN",
+ [TK_A_RUN_BUILTIN] = "A RUN_BUILTIN",
+ [TK_A_RUN_PROGRAM] = "A RUN_PROGRAM",
[TK_A_GOTO] = "A GOTO",
[TK_END] = "END",
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'\n",
- &rules->buf[token->rule.filename_off], token->rule.filename_line,
- idx, token->rule.token_count,
- &rules->buf[token->rule.label_off]);
+ log_debug("* 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]);
break;
}
case TK_M_ACTION:
case TK_A_OWNER:
case TK_A_GROUP:
case TK_A_MODE:
- case TK_A_RUN:
- dbg(rules->udev, "%s %s '%s'(%s)\n",
- token_str(type), operation_str(op), value, string_glob_str(glob));
+ case TK_A_RUN_BUILTIN:
+ case TK_A_RUN_PROGRAM:
+ log_debug("%s %s '%s'(%s)\n",
+ token_str(type), operation_str(op), value, string_glob_str(glob));
break;
case TK_M_IMPORT_BUILTIN:
- dbg(rules->udev, "%s %i '%s'\n", token_str(type), token->key.builtin_cmd, value);
+ log_debug("%s %i '%s'\n", token_str(type), token->key.builtin_cmd, value);
break;
case TK_M_ATTR:
case TK_M_ATTRS:
case TK_M_ENV:
case TK_A_ATTR:
case TK_A_ENV:
- dbg(rules->udev, "%s %s '%s' '%s'(%s)\n",
- token_str(type), operation_str(op), attr, value, string_glob_str(glob));
+ log_debug("%s %s '%s' '%s'(%s)\n",
+ token_str(type), operation_str(op), attr, value, string_glob_str(glob));
break;
case TK_M_TAG:
case TK_A_TAG:
- dbg(rules->udev, "%s %s '%s'\n", token_str(type), operation_str(op), value);
+ log_debug("%s %s '%s'\n", token_str(type), operation_str(op), value);
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));
+ log_debug("%s\n", token_str(type));
break;
case TK_M_TEST:
- dbg(rules->udev, "%s %s '%s'(%s) %#o\n",
- token_str(type), operation_str(op), value, string_glob_str(glob), token->key.mode);
+ log_debug("%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);
+ log_debug("%s %u\n", token_str(type), token->key.watch);
break;
case TK_A_DEVLINK_PRIO:
- dbg(rules->udev, "%s %u\n", token_str(type), token->key.devlink_prio);
+ log_debug("%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);
+ log_debug("%s %s %u\n", token_str(type), operation_str(op), token->key.uid);
break;
case TK_A_GROUP_ID:
- dbg(rules->udev, "%s %s %u\n", token_str(type), operation_str(op), token->key.gid);
+ log_debug("%s %s %u\n", token_str(type), operation_str(op), token->key.gid);
break;
case TK_A_MODE_ID:
- dbg(rules->udev, "%s %s %#o\n", token_str(type), operation_str(op), token->key.mode);
+ log_debug("%s %s %#o\n", token_str(type), operation_str(op), token->key.mode);
break;
case TK_A_STATIC_NODE:
- dbg(rules->udev, "%s '%s'\n", token_str(type), value);
+ log_debug("%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);
+ log_debug("%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);
+ log_debug("%s '%s' %u\n", token_str(type), value, token->key.rule_goto);
break;
case TK_END:
- dbg(rules->udev, "* %s\n", token_str(type));
+ log_debug("* %s\n", token_str(type));
break;
case TK_M_PARENTS_MIN:
case TK_M_PARENTS_MAX:
case TK_M_MAX:
case TK_UNSET:
- dbg(rules->udev, "unknown type %u\n", type);
+ log_debug("unknown type %u\n", type);
break;
}
}
{
unsigned int i;
- dbg(rules->udev, "dumping %u (%zu bytes) tokens, %u (%zu bytes) strings\n",
- rules->token_cur,
- rules->token_cur * sizeof(struct token),
- rules->buf_count,
- rules->buf_cur);
+ log_debug("dumping %u (%zu bytes) tokens, %u (%zu bytes) strings\n",
+ rules->token_cur,
+ rules->token_cur * sizeof(struct token),
+ rules->buf_count,
+ rules->buf_cur);
for(i = 0; i < rules->token_cur; i++)
dump_token(rules, &rules->tokens[i]);
}
static inline const char *token_str(enum token_type type) { return NULL; }
static inline void dump_token(struct udev_rules *rules, struct token *token) {}
static inline void dump_rules(struct udev_rules *rules) {}
-#endif /* ENABLE_DEBUG */
+#endif /* DEBUG */
static int add_new_string(struct udev_rules *rules, const char *str, size_t bytes)
{
buf = realloc(rules->buf, rules->buf_max + add);
if (buf == NULL)
return -1;
- dbg(rules->udev, "extend buffer from %zu to %zu\n", rules->buf_max, rules->buf_max + add);
rules->buf = buf;
rules->buf_max += add;
}
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;
}
tokens = realloc(rules->tokens, (rules->token_max + add ) * sizeof(struct token));
if (tokens == NULL)
return -1;
- dbg(rules->udev, "extend tokens from %u to %u\n", rules->token_max, rules->token_max + add);
rules->tokens = tokens;
rules->token_max += add;
}
/* lookup, if we know it already */
for (i = 0; i < rules->uids_cur; i++) {
off = rules->uids[i].name_off;
- if (strcmp(&rules->buf[off], owner) == 0) {
+ if (streq(&rules->buf[off], owner)) {
uid = rules->uids[i].uid;
- dbg(rules->udev, "return existing %u for '%s'\n", uid, owner);
return uid;
}
}
uids = realloc(rules->uids, (rules->uids_max + add ) * sizeof(struct uid_gid));
if (uids == NULL)
return uid;
- dbg(rules->udev, "extend uids from %u to %u\n", rules->uids_max, rules->uids_max + add);
rules->uids = uids;
rules->uids_max += add;
}
/* lookup, if we know it already */
for (i = 0; i < rules->gids_cur; i++) {
off = rules->gids[i].name_off;
- if (strcmp(&rules->buf[off], group) == 0) {
+ if (streq(&rules->buf[off], group)) {
gid = rules->gids[i].gid;
- dbg(rules->udev, "return existing %u for '%s'\n", gid, group);
return gid;
}
}
gids = realloc(rules->gids, (rules->gids_max + add ) * sizeof(struct uid_gid));
if (gids == NULL)
return gid;
- dbg(rules->udev, "extend gids from %u to %u\n", rules->gids_max, rules->gids_max + add);
rules->gids = gids;
rules->gids_max += add;
}
static int import_property_from_string(struct udev_device *dev, char *line)
{
- struct udev *udev = udev_device_get_udev(dev);
char *key;
char *val;
size_t len;
/* unquote */
if (val[0] == '"' || val[0] == '\'') {
if (val[len-1] != val[0]) {
- info(udev, "inconsistent quoting: '%s', skip\n", line);
+ log_debug("inconsistent quoting: '%s', skip\n", line);
return -1;
}
val[len-1] = '\0';
val++;
}
- dbg(udev, "adding '%s'='%s'\n", key, val);
-
/* handle device, renamed by external tool, returning new path */
- if (strcmp(key, "DEVPATH") == 0) {
+ if (streq(key, "DEVPATH")) {
char syspath[UTIL_PATH_SIZE];
- info(udev, "updating devpath from '%s' to '%s'\n",
- udev_device_get_devpath(dev), val);
- util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), val, NULL);
+ log_debug("updating devpath from '%s' to '%s'\n",
+ udev_device_get_devpath(dev), val);
+ util_strscpyl(syspath, sizeof(syspath), "/sys", val, NULL);
udev_device_set_syspath(dev, syspath);
} else {
struct udev_list_entry *entry;
FILE *f;
char line[UTIL_LINE_SIZE];
- f = fopen(filename, "r");
+ f = fopen(filename, "re");
if (f == NULL)
return -1;
while (fgets(line, sizeof(line), f) != NULL)
static int import_parent_into_properties(struct udev_device *dev, const char *filter)
{
- struct udev *udev = udev_device_get_udev(dev);
struct udev_device *dev_parent;
struct udev_list_entry *list_entry;
if (dev_parent == NULL)
return -1;
- dbg(udev, "found parent '%s', get the node name\n", udev_device_get_syspath(dev_parent));
udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(dev_parent)) {
const char *key = udev_list_entry_get_name(list_entry);
const char *val = udev_list_entry_get_value(list_entry);
if (fnmatch(filter, key, 0) == 0) {
struct udev_list_entry *entry;
- dbg(udev, "import key '%s=%s'\n", key, val);
entry = udev_device_add_property(dev, key, val);
/* store in db, skip private keys */
if (key[0] != '.')
#define WAIT_LOOP_PER_SECOND 50
static int wait_for_file(struct udev_device *dev, const char *file, int timeout)
{
- struct udev *udev = udev_device_get_udev(dev);
char filepath[UTIL_PATH_SIZE];
char devicepath[UTIL_PATH_SIZE];
struct stat stats;
/* a relative path is a device attribute */
devicepath[0] = '\0';
if (file[0] != '/') {
- util_strscpyl(devicepath, sizeof(devicepath),
- udev_get_sys_path(udev), udev_device_get_devpath(dev), NULL);
+ util_strscpyl(devicepath, sizeof(devicepath), udev_device_get_syspath(dev), NULL);
util_strscpyl(filepath, sizeof(filepath), devicepath, "/", file, NULL);
file = filepath;
}
- dbg(udev, "will wait %i sec for '%s'\n", timeout, file);
while (--loop) {
const struct timespec duration = { 0, 1000 * 1000 * 1000 / WAIT_LOOP_PER_SECOND };
/* lookup file */
if (stat(file, &stats) == 0) {
- info(udev, "file '%s' appeared after %i loops\n", file, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
+ log_debug("file '%s' appeared after %i loops\n", file, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
return 0;
}
/* make sure, the device did not disappear in the meantime */
if (devicepath[0] != '\0' && stat(devicepath, &stats) != 0) {
- info(udev, "device disappeared while waiting for '%s'\n", file);
+ log_debug("device disappeared while waiting for '%s'\n", file);
return -2;
}
- info(udev, "wait for '%s' for %i mseconds\n", file, 1000 / WAIT_LOOP_PER_SECOND);
+ log_debug("wait for '%s' for %i mseconds\n", file, 1000 / WAIT_LOOP_PER_SECOND);
nanosleep(&duration, NULL);
}
- info(udev, "waiting for '%s' failed\n", file);
+ log_debug("waiting for '%s' failed\n", file);
return -1;
}
return -1;
temp[0] = '\0';
temp++;
- dbg(udev, "%s '%s'-'%s'\n", operation_str(*op), *key, *value);
/* move line to next key */
*line = temp;
}
/* extract possible KEY{attr} */
-static char *get_key_attribute(struct udev *udev, char *str)
+static const char *get_key_attribute(struct udev *udev, char *str)
{
char *pos;
char *attr;
attr++;
pos = strchr(attr, '}');
if (pos == NULL) {
- err(udev, "missing closing brace for format\n");
+ log_error("missing closing brace for format\n");
return NULL;
}
pos[0] = '\0';
- dbg(udev, "attribute='%s'\n", attr);
return attr;
}
return NULL;
case TK_A_STRING_ESCAPE_REPLACE:
case TK_A_DB_PERSIST:
break;
- case TK_A_RUN:
+ case TK_A_RUN_BUILTIN:
+ case TK_A_RUN_PROGRAM:
+ token->key.builtin_cmd = *(enum udev_builtin_cmd *)data;
token->key.value_off = add_string(rule_tmp->rules, value);
break;
case TK_A_INOTIFY_WATCH:
case TK_M_MAX:
case TK_END:
case TK_UNSET:
- err(rule_tmp->rules->udev, "wrong type %u\n", type);
+ log_error("wrong type %u\n", type);
return -1;
}
} else if (has_split) {
glob = GL_SPLIT;
} else if (has_glob) {
- if (strcmp(value, "?*") == 0)
+ if (streq(value, "?*"))
glob = GL_SOMETHING;
else
glob = GL_GLOB;
token->key.type = type;
token->key.op = op;
rule_tmp->token_cur++;
- if (rule_tmp->token_cur >= ARRAY_SIZE(rule_tmp->token)) {
- err(rule_tmp->rules->udev, "temporary rule array too small\n");
+ if (rule_tmp->token_cur >= ELEMENTSOF(rule_tmp->token)) {
+ log_error("temporary rule array too small\n");
return -1;
}
return 0;
const char *filename, unsigned int filename_off, unsigned int lineno)
{
char *linepos;
- char *attr;
+ const char *attr;
struct rule_tmp rule_tmp;
memset(&rule_tmp, 0x00, sizeof(struct rule_tmp));
rule_tmp.rules = rules;
rule_tmp.rule.type = TK_RULE;
- rule_tmp.rule.rule.filename_off = filename_off;
+ /* the offset in the rule is limited to unsigned short */
+ if (filename_off < USHRT_MAX)
+ rule_tmp.rule.rule.filename_off = filename_off;
rule_tmp.rule.rule.filename_line = lineno;
linepos = line;
if (get_key(rules->udev, &linepos, &key, &op, &value) != 0)
break;
- if (strcmp(key, "ACTION") == 0) {
+ if (streq(key, "ACTION")) {
if (op > OP_MATCH_MAX) {
- err(rules->udev, "invalid ACTION operation\n");
+ log_error("invalid ACTION operation\n");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_ACTION, op, value, NULL);
continue;
}
- if (strcmp(key, "DEVPATH") == 0) {
+ if (streq(key, "DEVPATH")) {
if (op > OP_MATCH_MAX) {
- err(rules->udev, "invalid DEVPATH operation\n");
+ log_error("invalid DEVPATH operation\n");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_DEVPATH, op, value, NULL);
continue;
}
- if (strcmp(key, "KERNEL") == 0) {
+ if (streq(key, "KERNEL")) {
if (op > OP_MATCH_MAX) {
- err(rules->udev, "invalid KERNEL operation\n");
+ log_error("invalid KERNEL operation\n");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_KERNEL, op, value, NULL);
continue;
}
- if (strcmp(key, "SUBSYSTEM") == 0) {
+ if (streq(key, "SUBSYSTEM")) {
if (op > OP_MATCH_MAX) {
- err(rules->udev, "invalid SUBSYSTEM operation\n");
+ log_error("invalid SUBSYSTEM operation\n");
goto invalid;
}
/* bus, class, subsystem events should all be the same */
- if (strcmp(value, "subsystem") == 0 ||
- strcmp(value, "bus") == 0 ||
- strcmp(value, "class") == 0) {
- if (strcmp(value, "bus") == 0 || strcmp(value, "class") == 0)
- err(rules->udev, "'%s' must be specified as 'subsystem' \n"
+ if (streq(value, "subsystem") ||
+ streq(value, "bus") ||
+ streq(value, "class")) {
+ if (streq(value, "bus") || streq(value, "class"))
+ log_error("'%s' must be specified as 'subsystem' \n"
"please fix it in %s:%u", value, filename, lineno);
rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, "subsystem|class|bus", NULL);
} else
continue;
}
- if (strcmp(key, "DRIVER") == 0) {
+ if (streq(key, "DRIVER")) {
if (op > OP_MATCH_MAX) {
- err(rules->udev, "invalid DRIVER operation\n");
+ log_error("invalid DRIVER operation\n");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_DRIVER, op, value, NULL);
continue;
}
- if (strncmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
+ if (startswith(key, "ATTR{")) {
attr = get_key_attribute(rules->udev, key + sizeof("ATTR")-1);
if (attr == NULL) {
- err(rules->udev, "error parsing ATTR attribute\n");
+ log_error("error parsing ATTR attribute\n");
goto invalid;
}
if (op < OP_MATCH_MAX) {
continue;
}
- if (strcmp(key, "KERNELS") == 0) {
+ if (streq(key, "KERNELS")) {
if (op > OP_MATCH_MAX) {
- err(rules->udev, "invalid KERNELS operation\n");
+ log_error("invalid KERNELS operation\n");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_KERNELS, op, value, NULL);
continue;
}
- if (strcmp(key, "SUBSYSTEMS") == 0) {
+ if (streq(key, "SUBSYSTEMS")) {
if (op > OP_MATCH_MAX) {
- err(rules->udev, "invalid SUBSYSTEMS operation\n");
+ log_error("invalid SUBSYSTEMS operation\n");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL);
continue;
}
- if (strcmp(key, "DRIVERS") == 0) {
+ if (streq(key, "DRIVERS")) {
if (op > OP_MATCH_MAX) {
- err(rules->udev, "invalid DRIVERS operation\n");
+ log_error("invalid DRIVERS operation\n");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_DRIVERS, op, value, NULL);
continue;
}
- if (strncmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0) {
+ if (startswith(key, "ATTRS{")) {
if (op > OP_MATCH_MAX) {
- err(rules->udev, "invalid ATTRS operation\n");
+ log_error("invalid ATTRS operation\n");
goto invalid;
}
attr = get_key_attribute(rules->udev, key + sizeof("ATTRS")-1);
if (attr == NULL) {
- err(rules->udev, "error parsing ATTRS attribute\n");
+ log_error("error parsing ATTRS attribute\n");
goto invalid;
}
- if (strncmp(attr, "device/", 7) == 0)
- err(rules->udev, "the 'device' link may not be available in a future kernel, "
+ if (startswith(attr, "device/"))
+ log_error("the 'device' link may not be available in a future kernel, "
"please fix it in %s:%u", filename, lineno);
else if (strstr(attr, "../") != NULL)
- err(rules->udev, "do not reference parent sysfs directories directly, "
+ log_error("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);
continue;
}
- if (strcmp(key, "TAGS") == 0) {
+ if (streq(key, "TAGS")) {
if (op > OP_MATCH_MAX) {
- err(rules->udev, "invalid TAGS operation\n");
+ log_error("invalid TAGS operation\n");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_TAGS, op, value, NULL);
continue;
}
- if (strncmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
+ if (startswith(key, "ENV{")) {
attr = get_key_attribute(rules->udev, key + sizeof("ENV")-1);
if (attr == NULL) {
- err(rules->udev, "error parsing ENV attribute\n");
+ log_error("error parsing ENV attribute\n");
goto invalid;
}
if (op < OP_MATCH_MAX) {
};
unsigned int i;
- for (i = 0; i < ARRAY_SIZE(blacklist); i++)
- if (strcmp(attr, blacklist[i]) == 0) {
- err(rules->udev, "invalid ENV attribute, '%s' can not be set %s:%u\n", attr, filename, lineno);
+ for (i = 0; i < ELEMENTSOF(blacklist); i++) {
+ if (!streq(attr, blacklist[i]))
continue;
- }
+ log_error("invalid ENV attribute, '%s' can not be set %s:%u\n", attr, filename, lineno);
+ goto invalid;
+ }
if (rule_add_key(&rule_tmp, TK_A_ENV, op, value, attr) != 0)
goto invalid;
}
continue;
}
- if (strcmp(key, "TAG") == 0) {
+ if (streq(key, "TAG")) {
if (op < OP_MATCH_MAX)
rule_add_key(&rule_tmp, TK_M_TAG, op, value, NULL);
else
continue;
}
- if (strcmp(key, "PROGRAM") == 0) {
+ if (streq(key, "PROGRAM")) {
rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
continue;
}
- if (strcmp(key, "RESULT") == 0) {
+ if (streq(key, "RESULT")) {
if (op > OP_MATCH_MAX) {
- err(rules->udev, "invalid RESULT operation\n");
+ log_error("invalid RESULT operation\n");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_RESULT, op, value, NULL);
continue;
}
- if (strncmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
+ if (startswith(key, "IMPORT")) {
attr = get_key_attribute(rules->udev, key + sizeof("IMPORT")-1);
if (attr == NULL) {
- err(rules->udev, "IMPORT{} type missing, ignoring IMPORT %s:%u\n", filename, lineno);
+ log_error("IMPORT{} type missing, ignoring IMPORT %s:%u\n", filename, lineno);
continue;
}
- if (strstr(attr, "program")) {
+ if (streq(attr, "program")) {
/* find known built-in command */
if (value[0] != '/') {
enum udev_builtin_cmd cmd;
cmd = udev_builtin_lookup(value);
if (cmd < UDEV_BUILTIN_MAX) {
- info(rules->udev, "IMPORT found builtin '%s', replacing %s:%u\n",
- value, filename, lineno);
+ log_debug("IMPORT found builtin '%s', replacing %s:%u\n",
+ value, filename, lineno);
rule_add_key(&rule_tmp, TK_M_IMPORT_BUILTIN, op, value, &cmd);
continue;
}
}
- dbg(rules->udev, "IMPORT will be executed\n");
rule_add_key(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL);
- } else if (strstr(attr, "builtin")) {
+ } else if (streq(attr, "builtin")) {
enum udev_builtin_cmd cmd = udev_builtin_lookup(value);
- dbg(rules->udev, "IMPORT execute builtin\n");
if (cmd < UDEV_BUILTIN_MAX)
rule_add_key(&rule_tmp, TK_M_IMPORT_BUILTIN, op, value, &cmd);
else
- err(rules->udev, "IMPORT{builtin}: '%s' unknown %s:%u\n", value, filename, lineno);
- } else if (strstr(attr, "file")) {
- dbg(rules->udev, "IMPORT will be included as file\n");
+ log_error("IMPORT{builtin}: '%s' unknown %s:%u\n", value, filename, lineno);
+ } else if (streq(attr, "file")) {
rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
- } else if (strstr(attr, "db")) {
- dbg(rules->udev, "IMPORT will include db values\n");
+ } else if (streq(attr, "db")) {
rule_add_key(&rule_tmp, TK_M_IMPORT_DB, op, value, NULL);
- } else if (strstr(attr, "cmdline")) {
- dbg(rules->udev, "IMPORT will include db values\n");
+ } else if (streq(attr, "cmdline")) {
rule_add_key(&rule_tmp, TK_M_IMPORT_CMDLINE, op, value, NULL);
- } else if (strstr(attr, "parent")) {
- dbg(rules->udev, "IMPORT will include the parent values\n");
+ } else if (streq(attr, "parent")) {
rule_add_key(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL);
- }
+ } else
+ log_error("IMPORT{} unknown type, ignoring IMPORT %s:%u\n", filename, lineno);
continue;
}
- if (strncmp(key, "TEST", sizeof("TEST")-1) == 0) {
+ if (startswith(key, "TEST")) {
mode_t mode = 0;
if (op > OP_MATCH_MAX) {
- err(rules->udev, "invalid TEST operation\n");
+ log_error("invalid TEST operation\n");
goto invalid;
}
attr = get_key_attribute(rules->udev, key + sizeof("TEST")-1);
continue;
}
- if (strcmp(key, "RUN") == 0) {
- if (strncmp(value, "socket:", 7) == 0)
- err(rules->udev, "RUN+=\"socket:...\" support will be removed from a future udev release. "
- "Please remove it from: %s:%u and use libudev to subscribe to events.\n", filename, lineno);
- rule_add_key(&rule_tmp, TK_A_RUN, op, value, NULL);
+ if (startswith(key, "RUN")) {
+ attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);
+ if (attr == NULL)
+ attr = "program";
+
+ if (streq(attr, "builtin")) {
+ enum udev_builtin_cmd cmd = udev_builtin_lookup(value);
+
+ if (cmd < UDEV_BUILTIN_MAX)
+ rule_add_key(&rule_tmp, TK_A_RUN_BUILTIN, op, value, &cmd);
+ else
+ log_error("IMPORT{builtin}: '%s' unknown %s:%u\n", value, filename, lineno);
+ } else if (streq(attr, "program")) {
+ enum udev_builtin_cmd cmd = UDEV_BUILTIN_MAX;
+
+ rule_add_key(&rule_tmp, TK_A_RUN_PROGRAM, op, value, &cmd);
+ } else {
+ log_error("RUN{} unknown type, ignoring RUN %s:%u\n", filename, lineno);
+ }
+
continue;
}
- if (strcmp(key, "WAIT_FOR") == 0 || strcmp(key, "WAIT_FOR_SYSFS") == 0) {
+ if (streq(key, "WAIT_FOR") || streq(key, "WAIT_FOR_SYSFS")) {
rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
continue;
}
- if (strcmp(key, "LABEL") == 0) {
+ if (streq(key, "LABEL")) {
rule_tmp.rule.rule.label_off = add_string(rules, value);
continue;
}
- if (strcmp(key, "GOTO") == 0) {
+ if (streq(key, "GOTO")) {
rule_add_key(&rule_tmp, TK_A_GOTO, 0, value, NULL);
continue;
}
- if (strncmp(key, "NAME", sizeof("NAME")-1) == 0) {
+ if (startswith(key, "NAME")) {
if (op < OP_MATCH_MAX) {
rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL);
} else {
- if (strcmp(value, "%k") == 0) {
- err(rules->udev, "NAME=\"%%k\" is ignored, because it breaks kernel supplied names, "
+ if (streq(value, "%k")) {
+ log_error("NAME=\"%%k\" is ignored, because it breaks kernel supplied names, "
"please remove it from %s:%u\n", filename, lineno);
continue;
}
if (value[0] == '\0') {
- info(rules->udev, "NAME=\"\" is ignored, because udev will not delete any device nodes, "
- "please remove it from %s:%u\n", filename, lineno);
+ log_debug("NAME=\"\" is ignored, because udev will not delete any device nodes, "
+ "please remove it from %s:%u\n", filename, lineno);
continue;
}
rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL);
continue;
}
- if (strncmp(key, "SYMLINK", sizeof("SYMLINK")-1) == 0) {
+ if (startswith(key, "SYMLINK")) {
if (op < OP_MATCH_MAX) {
rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL);
} else {
continue;
}
- if (strcmp(key, "OWNER") == 0) {
+ if (streq(key, "OWNER")) {
uid_t uid;
char *endptr;
continue;
}
- if (strcmp(key, "GROUP") == 0) {
+ if (streq(key, "GROUP")) {
gid_t gid;
char *endptr;
continue;
}
- if (strcmp(key, "MODE") == 0) {
+ if (streq(key, "MODE")) {
mode_t mode;
char *endptr;
continue;
}
- if (strcmp(key, "OPTIONS") == 0) {
+ if (streq(key, "OPTIONS")) {
const char *pos;
pos = strstr(value, "link_priority=");
int prio = atoi(&pos[strlen("link_priority=")]);
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=");
int tout = atoi(&pos[strlen("event_timeout=")]);
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)
+ if (startswith(pos, "none"))
rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_NONE, op, NULL, NULL);
- else if (strncmp(pos, "replace", strlen("replace")) == 0)
+ else if (startswith(pos, "replace"))
rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, op, NULL, NULL);
}
const int off = 0;
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, op, 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);
+ log_error("unknown key '%s' in %s:%u\n", key, filename, lineno);
goto invalid;
}
return 0;
invalid:
- err(rules->udev, "invalid rule '%s:%u'\n", filename, lineno);
+ log_error("invalid rule '%s:%u'\n", filename, lineno);
return -1;
}
-static int parse_file(struct udev_rules *rules, const char *filename, unsigned short filename_off)
+static int parse_file(struct udev_rules *rules, const char *filename)
{
FILE *f;
unsigned int first_token;
+ unsigned int filename_off;
char line[UTIL_LINE_SIZE];
int line_nr = 0;
unsigned int i;
- info(rules->udev, "reading '%s' as rules file\n", filename);
+ if (null_or_empty_path(filename)) {
+ log_debug("skip empty file: %s\n", filename);
+ return 0;
+ }
+ log_debug("read rules file: %s\n", filename);
- f = fopen(filename, "r");
+ f = fopen(filename, "re");
if (f == NULL)
return -1;
first_token = rules->token_cur;
+ filename_off = add_string(rules, filename);
while (fgets(line, sizeof(line), f) != NULL) {
char *key;
}
if (len+1 >= sizeof(line)) {
- err(rules->udev, "line too long '%s':%u, ignored\n", filename, line_nr);
+ log_error("line too long '%s':%u, ignored\n", filename, line_nr);
continue;
}
add_rule(rules, key, filename, filename_off, line_nr);
continue;
if (rules->tokens[j].rule.label_off == 0)
continue;
- if (strcmp(label, &rules->buf[rules->tokens[j].rule.label_off]) != 0)
+ if (!streq(label, &rules->buf[rules->tokens[j].rule.label_off]))
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);
- }
- }
- return 0;
-}
-
-static int add_matching_files(struct udev *udev, struct udev_list *file_list, const char *dirname, const char *suffix)
-{
- DIR *dir;
- struct dirent *dent;
- char filename[UTIL_PATH_SIZE];
-
- dbg(udev, "open directory '%s'\n", dirname);
- dir = opendir(dirname);
- if (dir == NULL) {
- info(udev, "unable to open '%s': %m\n", dirname);
- return -1;
- }
-
- for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
- if (dent->d_name[0] == '.')
- continue;
-
- /* look for file matching with specified suffix */
- if (suffix != NULL) {
- const char *ext;
-
- ext = strrchr(dent->d_name, '.');
- if (ext == NULL)
- continue;
- if (strcmp(ext, suffix) != 0)
- continue;
+ log_error("GOTO '%s' has no matching label in: '%s'\n", label, filename);
}
- util_strscpyl(filename, sizeof(filename), dirname, "/", dent->d_name, NULL);
- dbg(udev, "put file '%s' into list\n", filename);
- /*
- * the basename is the key, the filename the value
- * identical basenames from different directories override each other
- * entries are sorted after basename
- */
- udev_list_entry_add(file_list, dent->d_name, filename);
}
-
- closedir(dir);
return 0;
}
{
struct udev_rules *rules;
struct udev_list file_list;
- struct udev_list_entry *file_loop;
struct token end_token;
- char **s;
+ char **files, **f;
+ int r;
rules = calloc(1, sizeof(struct udev_rules));
if (rules == NULL)
/* offset 0 is always '\0' */
rules->buf[0] = '\0';
rules->buf_cur = 1;
- 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) {
memset(rules->trie_nodes, 0x00, sizeof(struct trie_node));
rules->trie_nodes_cur = 1;
- for (udev_get_rules_path(udev, &s, NULL); *s != NULL; s++)
- add_matching_files(udev, &file_list, *s, ".rules");
+ rules->dirs = strv_new(SYSCONFDIR "/udev/rules.d",
+ "/run/udev/rules.d",
+ UDEVLIBEXECDIR "/rules.d",
+ NULL);
+ if (!rules->dirs) {
+ log_error("failed to build config directory array");
+ return NULL;
+ }
+ if (!path_strv_canonicalize(rules->dirs)) {
+ log_error("failed to canonicalize config directories\n");
+ return NULL;
+ }
+ strv_uniq(rules->dirs);
- /* add all filenames to the string buffer */
- udev_list_entry_foreach(file_loop, udev_list_get_entry(&file_list)) {
- const char *filename = udev_list_entry_get_value(file_loop);
- unsigned int filename_off;
+ rules->dirs_ts_usec = calloc(strv_length(rules->dirs), sizeof(long long));
+ udev_rules_check_timestamp(rules);
- filename_off = add_string(rules, filename);
- /* the offset in the rule is limited to unsigned short */
- if (filename_off < USHRT_MAX)
- udev_list_entry_set_num(file_loop, filename_off);
+ r = conf_files_list_strv(&files, ".rules", (const char **)rules->dirs);
+ if (r < 0) {
+ log_error("failed to enumerate rules files: %s\n", strerror(-r));
+ return NULL;
}
- /* parse all rules files */
- udev_list_entry_foreach(file_loop, udev_list_get_entry(&file_list)) {
- const char *filename = udev_list_entry_get_value(file_loop);
- unsigned int filename_off = udev_list_entry_get_num(file_loop);
- struct stat st;
+ /*
+ * The offset value in the rules strct is limited; add all
+ * rules file names to the beginning of the string buffer.
+ */
+ STRV_FOREACH(f, files)
+ add_string(rules, *f);
- if (stat(filename, &st) != 0) {
- err(udev, "can not find '%s': %m\n", filename);
- continue;
- }
- if (S_ISREG(st.st_mode) && st.st_size <= 0) {
- info(udev, "ignore empty '%s'\n", filename);
- continue;
- }
- if (S_ISCHR(st.st_mode)) {
- info(udev, "ignore masked '%s'\n", filename);
- continue;
- }
- parse_file(rules, filename, filename_off);
- }
- udev_list_cleanup(&file_list);
+ STRV_FOREACH(f, files)
+ parse_file(rules, *f);
+
+ strv_free(files);
memset(&end_token, 0x00, sizeof(struct token));
end_token.type = TK_END;
rules->buf_max = rules->buf_cur;
}
}
- 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));
+ log_debug("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);
+ log_debug("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);
free(rules->trie_nodes);
free(rules->uids);
free(rules->gids);
+ strv_free(rules->dirs);
+ free(rules->dirs_ts_usec);
free(rules);
return NULL;
}
+bool udev_rules_check_timestamp(struct udev_rules *rules)
+{
+ unsigned int i;
+ bool changed = false;
+
+ if (rules == NULL)
+ goto out;
+
+ for (i = 0; rules->dirs[i]; i++) {
+ struct stat stats;
+
+ if (stat(rules->dirs[i], &stats) < 0)
+ continue;
+
+ if (rules->dirs_ts_usec[i] == ts_usec(&stats.st_mtim))
+ continue;
+
+ /* first check */
+ if (rules->dirs_ts_usec[i] != 0) {
+ log_debug("reload - timestamp of '%s' changed\n", rules->dirs[i]);
+ changed = true;
+ }
+
+ /* update timestamp */
+ rules->dirs_ts_usec[i] = ts_usec(&stats.st_mtim);
+ }
+out:
+ return changed;
+}
+
static int match_key(struct udev_rules *rules, struct token *token, const char *val)
{
char *key_value = &rules->buf[token->key.value_off];
switch (token->key.glob) {
case GL_PLAIN:
- match = (strcmp(key_value, val) == 0);
+ match = (streq(key_value, val));
break;
case GL_GLOB:
match = (fnmatch(key_value, val, 0) == 0);
break;
case GL_SPLIT:
{
- const char *split;
+ const char *s;
size_t len;
- split = &rules->buf[token->key.value_off];
+ s = &rules->buf[token->key.value_off];
len = strlen(val);
for (;;) {
const char *next;
- next = strchr(split, '|');
+ next = strchr(s, '|');
if (next != NULL) {
- size_t matchlen = (size_t)(next - split);
+ size_t matchlen = (size_t)(next - s);
- match = (matchlen == len && strncmp(split, val, matchlen) == 0);
+ match = (matchlen == len && strncmp(s, val, matchlen) == 0);
if (match)
break;
} else {
- match = (strcmp(split, val) == 0);
+ match = (streq(s, val));
break;
}
- split = &next[1];
+ s = &next[1];
}
break;
}
pos[0] = '\0';
pos = &pos[1];
}
- dbg(rules->udev, "match %s '%s' <-> '%s'\n", token_str(token->type), key_value, val);
match = (fnmatch(key_value, val, 0) == 0);
if (match)
break;
return -1;
}
- if (match && (token->key.op == OP_MATCH)) {
- dbg(rules->udev, "%s is true (matching value)\n", token_str(token->type));
+ if (match && (token->key.op == OP_MATCH))
return 0;
- }
- if (!match && (token->key.op == OP_NOMATCH)) {
- dbg(rules->udev, "%s is true (non-matching value)\n", token_str(token->type));
+ if (!match && (token->key.op == OP_NOMATCH))
return 0;
- }
- dbg(rules->udev, "%s is not true\n", token_str(token->type));
return -1;
}
}
while (len > 0 && isspace(vbuf[--len]))
vbuf[len] = '\0';
- dbg(rules->udev, "removed trailing whitespace from '%s'\n", value);
}
}
if (rules->tokens == NULL)
return -1;
- can_set_name = ((strcmp(udev_device_get_action(event->dev), "remove") != 0) &&
+ can_set_name = ((!streq(udev_device_get_action(event->dev), "remove")) &&
(major(udev_device_get_devnum(event->dev)) > 0 ||
udev_device_get_ifindex(event->dev) > 0));
goto nomatch;
break;
case TK_M_DEVLINK: {
- size_t devlen = strlen(udev_get_dev_path(event->udev))+1;
struct udev_list_entry *list_entry;
bool match = false;
udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(event->dev)) {
const char *devlink;
- devlink = &udev_list_entry_get_name(list_entry)[devlen];
+ devlink = udev_list_entry_get_name(list_entry) + strlen("/dev/");
if (match_key(rules, cur, devlink) == 0) {
match = true;
break;
const char *value;
value = udev_device_get_property_value(event->dev, key_name);
- if (value == NULL) {
- dbg(event->udev, "ENV{%s} is not set, treat as empty\n", key_name);
+ if (value == NULL)
value = "";
- }
if (match_key(rules, cur, value))
goto nomatch;
break;
bool match = false;
udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(event->dev)) {
- if (strcmp(&rules->buf[cur->key.value_off], udev_list_entry_get_name(list_entry)) == 0) {
+ if (streq(&rules->buf[cur->key.value_off], udev_list_entry_get_name(list_entry))) {
match = true;
break;
}
for (;;) {
struct token *key;
- dbg(event->udev, "parent: '%s'\n", udev_device_get_syspath(event->dev_parent));
/* loop over sequence of parent match keys */
for (key = cur; key < next; key++ ) {
dump_token(rules, key);
default:
goto nomatch;
}
- dbg(event->udev, "parent key matched\n");
}
- dbg(event->udev, "all parent keys matched\n");
break;
try_parent:
attr_subst_subdir(filename, sizeof(filename));
match = (stat(filename, &statbuf) == 0);
- dbg(event->udev, "'%s' %s", filename, match ? "exists\n" : "does not exist\n");
- if (match && cur->key.mode > 0) {
+ if (match && cur->key.mode > 0)
match = ((statbuf.st_mode & cur->key.mode) > 0);
- dbg(event->udev, "'%s' has mode=%#o and %s %#o\n", filename, statbuf.st_mode,
- match ? "matches" : "does not match", cur->key.mode);
- }
if (match && cur->key.op == OP_NOMATCH)
goto nomatch;
if (!match && cur->key.op == OP_MATCH)
break;
}
case TK_M_EVENT_TIMEOUT:
- info(event->udev, "OPTIONS event_timeout=%u\n", cur->key.event_timeout);
+ log_debug("OPTIONS event_timeout=%u\n", cur->key.event_timeout);
event->timeout_usec = cur->key.event_timeout * 1000 * 1000;
break;
case TK_M_PROGRAM: {
event->program_result = NULL;
udev_event_apply_format(event, &rules->buf[cur->key.value_off], program, sizeof(program));
envp = udev_device_get_properties_envp(event->dev);
- info(event->udev, "PROGRAM '%s' %s:%u\n",
- program,
- &rules->buf[rule->rule.filename_off],
- rule->rule.filename_line);
+ log_debug("PROGRAM '%s' %s:%u\n",
+ program,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
if (udev_event_spawn(event, program, envp, sigmask, result, sizeof(result)) < 0) {
if (cur->key.op != OP_NOMATCH)
if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) {
count = util_replace_chars(result, UDEV_ALLOWED_CHARS_INPUT);
if (count > 0)
- info(event->udev, "%i character(s) replaced\n" , count);
+ log_debug("%i character(s) replaced\n" , count);
}
event->program_result = strdup(result);
- dbg(event->udev, "storing result '%s'\n", event->program_result);
if (cur->key.op == OP_NOMATCH)
goto nomatch;
}
char import[UTIL_PATH_SIZE];
udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import));
- info(event->udev, "IMPORT '%s' %s:%u\n",
- import,
- &rules->buf[rule->rule.filename_off],
- rule->rule.filename_line);
+ log_debug("IMPORT '%s' %s:%u\n",
+ import,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
if (import_program_into_properties(event, import, sigmask) != 0)
if (cur->key.op != OP_NOMATCH)
if (udev_builtin_run_once(cur->key.builtin_cmd)) {
/* check if we ran already */
if (event->builtin_run & (1 << cur->key.builtin_cmd)) {
- info(event->udev, "IMPORT builtin skip '%s' %s:%u\n",
- udev_builtin_name(cur->key.builtin_cmd),
- &rules->buf[rule->rule.filename_off],
- rule->rule.filename_line);
+ log_debug("IMPORT builtin skip '%s' %s:%u\n",
+ udev_builtin_name(cur->key.builtin_cmd),
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
/* return the result from earlier run */
if (event->builtin_ret & (1 << cur->key.builtin_cmd))
if (cur->key.op != OP_NOMATCH)
}
udev_event_apply_format(event, &rules->buf[cur->key.value_off], command, sizeof(command));
- info(event->udev, "IMPORT builtin '%s' %s:%u\n",
- udev_builtin_name(cur->key.builtin_cmd),
- &rules->buf[rule->rule.filename_off],
- rule->rule.filename_line);
+ log_debug("IMPORT builtin '%s' %s:%u\n",
+ udev_builtin_name(cur->key.builtin_cmd),
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
if (udev_builtin_run(event->dev, cur->key.builtin_cmd, command, false) != 0) {
/* remember failure */
- info(rules->udev, "IMPORT builtin '%s' returned non-zero\n",
- udev_builtin_name(cur->key.builtin_cmd));
+ log_debug("IMPORT builtin '%s' returned non-zero\n",
+ udev_builtin_name(cur->key.builtin_cmd));
event->builtin_ret |= (1 << cur->key.builtin_cmd);
if (cur->key.op != OP_NOMATCH)
goto nomatch;
FILE *f;
bool imported = false;
- f = fopen("/proc/cmdline", "r");
+ f = fopen("/proc/cmdline", "re");
if (f != NULL) {
char cmdline[4096];
event->owner_final = true;
udev_event_apply_format(event, &rules->buf[cur->key.value_off], owner, sizeof(owner));
event->uid = util_lookup_user(event->udev, owner);
- info(event->udev, "OWNER %u %s:%u\n",
- event->uid,
- &rules->buf[rule->rule.filename_off],
- rule->rule.filename_line);
+ log_debug("OWNER %u %s:%u\n",
+ event->uid,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
break;
}
case TK_A_GROUP: {
event->group_final = true;
udev_event_apply_format(event, &rules->buf[cur->key.value_off], group, sizeof(group));
event->gid = util_lookup_group(event->udev, group);
- info(event->udev, "GROUP %u %s:%u\n",
- event->gid,
- &rules->buf[rule->rule.filename_off],
- rule->rule.filename_line);
+ log_debug("GROUP %u %s:%u\n",
+ event->gid,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
break;
}
case TK_A_MODE: {
udev_event_apply_format(event, &rules->buf[cur->key.value_off], mode_str, sizeof(mode_str));
mode = strtol(mode_str, &endptr, 8);
if (endptr[0] != '\0') {
- err(event->udev, "ignoring invalid mode '%s'\n", mode_str);
+ log_error("ignoring invalid mode '%s'\n", mode_str);
break;
}
if (cur->key.op == OP_ASSIGN_FINAL)
event->mode_final = true;
event->mode_set = true;
event->mode = mode;
- info(event->udev, "MODE %#o %s:%u\n",
- event->mode,
- &rules->buf[rule->rule.filename_off],
- rule->rule.filename_line);
+ log_debug("MODE %#o %s:%u\n",
+ event->mode,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
break;
}
case TK_A_OWNER_ID:
if (cur->key.op == OP_ASSIGN_FINAL)
event->owner_final = true;
event->uid = cur->key.uid;
- info(event->udev, "OWNER %u %s:%u\n",
- event->uid,
- &rules->buf[rule->rule.filename_off],
- rule->rule.filename_line);
+ log_debug("OWNER %u %s:%u\n",
+ event->uid,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
break;
case TK_A_GROUP_ID:
if (event->group_final)
if (cur->key.op == OP_ASSIGN_FINAL)
event->group_final = true;
event->gid = cur->key.gid;
- info(event->udev, "GROUP %u %s:%u\n",
- event->gid,
- &rules->buf[rule->rule.filename_off],
- rule->rule.filename_line);
+ log_debug("GROUP %u %s:%u\n",
+ event->gid,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
break;
case TK_A_MODE_ID:
if (event->mode_final)
event->mode_final = true;
event->mode_set = 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);
+ log_debug("MODE %#o %s:%u\n",
+ event->mode,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
break;
case TK_A_ENV: {
const char *name = &rules->buf[cur->key.attr_off];
(*p >= '0' && *p <= '9') ||
*p == '-' || *p == '_')
continue;
- err(event->udev, "ignoring invalid tag name '%s'\n", tag);
+ log_error("ignoring invalid tag name '%s'\n", tag);
break;
}
udev_device_add_tag(event->dev, tag);
if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) {
count = util_replace_chars(name_str, "/");
if (count > 0)
- info(event->udev, "%i character(s) replaced\n", count);
+ log_debug("%i character(s) replaced\n", count);
}
- if (major(udev_device_get_devnum(event->dev))) {
- size_t devlen = strlen(udev_get_dev_path(event->udev))+1;
-
- if (strcmp(name_str, &udev_device_get_devnode(event->dev)[devlen]) != 0) {
- err(event->udev, "NAME=\"%s\" ignored, kernel device nodes "
- "can not be renamed; please fix it in %s:%u\n", name,
- &rules->buf[rule->rule.filename_off], rule->rule.filename_line);
- break;
- }
+ if (major(udev_device_get_devnum(event->dev)) &&
+ (!streq(name_str, udev_device_get_devnode(event->dev) + strlen("/dev/")))) {
+ log_error("NAME=\"%s\" ignored, kernel device nodes "
+ "can not be renamed; please fix it in %s:%u\n", name,
+ &rules->buf[rule->rule.filename_off], rule->rule.filename_line);
+ break;
}
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);
+ log_debug("NAME '%s' %s:%u\n",
+ event->name,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
break;
}
case TK_A_DEVLINK: {
else if (esc == ESCAPE_REPLACE)
count = util_replace_chars(temp, "/");
if (count > 0)
- info(event->udev, "%i character(s) replaced\n" , count);
- dbg(event->udev, "rule applied, added symlink(s) '%s'\n", temp);
+ log_debug("%i character(s) replaced\n" , count);
pos = temp;
while (isspace(pos[0]))
pos++;
next = strchr(pos, ' ');
while (next != NULL) {
next[0] = '\0';
- info(event->udev, "LINK '%s' %s:%u\n", pos,
- &rules->buf[rule->rule.filename_off], rule->rule.filename_line);
- util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", pos, NULL);
+ log_debug("LINK '%s' %s:%u\n", pos,
+ &rules->buf[rule->rule.filename_off], rule->rule.filename_line);
+ util_strscpyl(filename, sizeof(filename), "/dev/", pos, NULL);
udev_device_add_devlink(event->dev, filename, cur->key.devlink_unique);
while (isspace(next[1]))
next++;
next = strchr(pos, ' ');
}
if (pos[0] != '\0') {
- info(event->udev, "LINK '%s' %s:%u\n", pos,
- &rules->buf[rule->rule.filename_off], rule->rule.filename_line);
- util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", pos, NULL);
+ log_debug("LINK '%s' %s:%u\n", pos,
+ &rules->buf[rule->rule.filename_off], rule->rule.filename_line);
+ util_strscpyl(filename, sizeof(filename), "/dev/", pos, NULL);
udev_device_add_devlink(event->dev, filename, cur->key.devlink_unique);
}
break;
attr_subst_subdir(attr, sizeof(attr));
udev_event_apply_format(event, &rules->buf[cur->key.value_off], value, sizeof(value));
- info(event->udev, "ATTR '%s' writing '%s' %s:%u\n", attr, value,
- &rules->buf[rule->rule.filename_off],
- rule->rule.filename_line);
- f = fopen(attr, "w");
+ log_debug("ATTR '%s' writing '%s' %s:%u\n", attr, value,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
+ f = fopen(attr, "we");
if (f != NULL) {
if (fprintf(f, "%s", value) <= 0)
- err(event->udev, "error writing ATTR{%s}: %m\n", attr);
+ log_error("error writing ATTR{%s}: %m\n", attr);
fclose(f);
} else {
- err(event->udev, "error opening ATTR{%s} for writing: %m\n", attr);
+ log_error("error opening ATTR{%s} for writing: %m\n", attr);
}
break;
}
- case TK_A_RUN: {
+ case TK_A_RUN_BUILTIN:
+ case TK_A_RUN_PROGRAM: {
+ struct udev_list_entry *entry;
+
if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
udev_list_cleanup(&event->run_list);
- info(event->udev, "RUN '%s' %s:%u\n",
- &rules->buf[cur->key.value_off],
- &rules->buf[rule->rule.filename_off],
- rule->rule.filename_line);
- udev_list_entry_add(&event->run_list, &rules->buf[cur->key.value_off], NULL);
+ log_debug("RUN '%s' %s:%u\n",
+ &rules->buf[cur->key.value_off],
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
+ entry = udev_list_entry_add(&event->run_list, &rules->buf[cur->key.value_off], NULL);
+ udev_list_entry_set_num(entry, cur->key.builtin_cmd);
break;
}
case TK_A_GOTO:
case TK_M_PARENTS_MAX:
case TK_M_MAX:
case TK_UNSET:
- err(rules->udev, "wrong type %u\n", cur->type);
+ log_error("wrong type %u\n", cur->type);
goto nomatch;
}
nomatch:
/* fast-forward to next rule */
cur = rule + rule->rule.token_count;
- dbg(rules->udev, "forward to rule: %u\n",
- (unsigned int) (cur - rules->tokens));
}
}
/* 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), "/",
+ util_strscpyl(filename, sizeof(filename), "/dev/",
&rules->buf[cur->key.value_off], NULL);
if (stat(filename, &stats) != 0)
goto next;
}
if (mode != (stats.st_mode & 01777)) {
chmod(filename, mode);
- info(rules->udev, "chmod '%s' %#o\n", filename, mode);
+ log_debug("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);
+ log_debug("chown '%s' %u %u\n", filename, uid, gid);
}
utimensat(AT_FDCWD, filename, NULL, 0);
~ianmdlvl / elogind.git / blobdiff