TK_M_WAITFOR, /* val */
TK_M_ATTR, /* val, attr */
+ TK_M_PARENTS_MIN,
TK_M_KERNELS, /* val */
TK_M_SUBSYSTEMS, /* val */
TK_M_DRIVERS, /* val */
[TK_M_WAITFOR] = "M WAITFOR",
[TK_M_ATTR] = "M ATTR",
+ [TK_M_PARENTS_MIN] = "M PARENTS_MIN",
[TK_M_KERNELS] = "M KERNELS",
[TK_M_SUBSYSTEMS] = "M SUBSYSTEMS",
[TK_M_DRIVERS] = "M DRIVERS",
[TK_END] = "END",
};
+/* we try to pack stuff in a way that we take only 16 bytes per token */
struct token {
- enum token_type type;
union {
+ unsigned short type; /* same as in rule and key */
struct {
+ unsigned short type;
+ unsigned short flags;
unsigned int next_rule;
unsigned int label_off;
- unsigned int filename_off;
+ unsigned short filename_off;
+ unsigned short filename_line;
} rule;
struct {
+ unsigned short type;
+ unsigned short flags;
unsigned short op;
unsigned short glob;
unsigned int value_off;
unsigned int gids_max;
};
-/* NOTE: we could lookup and return existing strings, or tails of strings */
+/* we could lookup and return existing strings, or tails of strings */
static int add_string(struct udev_rules *rules, const char *str)
{
size_t len = strlen(str)+1;
{
struct udev *udev = udev_device_get_udev(dev);
char filepath[UTIL_PATH_SIZE];
- char devicepath[UTIL_PATH_SIZE] = "";
+ char devicepath[UTIL_PATH_SIZE];
struct stat stats;
int loop = timeout * WAIT_LOOP_PER_SECOND;
/* 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));
return NULL;
}
-static int rule_add_token(struct rule_tmp *rule_tmp, enum token_type type,
- enum operation_type op,
- const char *value, const void *data)
+static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
+ enum operation_type op,
+ const char *value, const void *data)
{
struct token *token = &rule_tmp->token[rule_tmp->token_cur];
const char *attr = data;
token->key.event_timeout = *(int *)data;
break;
case TK_RULE:
+ case TK_M_PARENTS_MIN:
case TK_M_PARENTS_MAX:
case TK_M_MAX:
case TK_END:
}
}
- token->type = type;
+ token->key.type = type;
token->key.op = op;
token->key.glob = glob;
rule_tmp->token_cur++;
const char *tk_ptr = (char *)token;
unsigned int off = tk_ptr - tks_ptr;
- dbg(rules->udev, "* RULE '%s', off: %u(%u), next: %u, label: '%s'\n",
- &rules->buf[token->rule.filename_off],
+ dbg(rules->udev, "* RULE %s:%u, off: %u(%u), next: %u, label: '%s', flags: 0x%02x\n",
+ &rules->buf[token->rule.filename_off], token->rule.filename_line,
off / (unsigned int) sizeof(struct token), off,
token->rule.next_rule,
- &rules->buf[token->rule.label_off]);
+ &rules->buf[token->rule.label_off],
+ token->rule.flags);
break;
}
case TK_M_ACTION:
case TK_END:
dbg(rules->udev, "* %s\n", token_str[type]);
break;
+ case TK_M_PARENTS_MIN:
case TK_M_PARENTS_MAX:
case TK_M_MAX:
case TK_UNSET:
rule_tmp.rules = rules;
rule_tmp.rule.type = TK_RULE;
rule_tmp.rule.rule.filename_off = filename_off;
+ rule_tmp.rule.rule.filename_line = lineno;
linepos = line;
while (1) {
err(rules->udev, "invalid ACTION operation\n");
goto invalid;
}
- rule_add_token(&rule_tmp, TK_M_ACTION, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_ACTION, op, value, NULL);
valid = 1;
continue;
}
err(rules->udev, "invalid DEVPATH operation\n");
goto invalid;
}
- rule_add_token(&rule_tmp, TK_M_DEVPATH, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_DEVPATH, op, value, NULL);
valid = 1;
continue;
}
err(rules->udev, "invalid KERNEL operation\n");
goto invalid;
}
- rule_add_token(&rule_tmp, TK_M_KERNEL, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_KERNEL, op, value, NULL);
valid = 1;
continue;
}
if (strcmp(value, "bus") == 0 || strcmp(value, "class") == 0)
err(rules->udev, "'%s' must be specified as 'subsystem' \n"
"please fix it in %s:%u", value, filename, lineno);
- rule_add_token(&rule_tmp, TK_M_SUBSYSTEM, op, "subsystem|class|bus", NULL);
+ rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, "subsystem|class|bus", NULL);
} else
- rule_add_token(&rule_tmp, TK_M_SUBSYSTEM, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, value, NULL);
valid = 1;
continue;
}
err(rules->udev, "invalid DRIVER operation\n");
goto invalid;
}
- rule_add_token(&rule_tmp, TK_M_DRIVER, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_DRIVER, op, value, NULL);
valid = 1;
continue;
}
goto invalid;
}
if (op < OP_MATCH_MAX) {
- rule_add_token(&rule_tmp, TK_M_ATTR, op, value, attr);
+ rule_add_key(&rule_tmp, TK_M_ATTR, op, value, attr);
} else {
- rule_add_token(&rule_tmp, TK_A_ATTR, op, value, attr);
+ rule_add_key(&rule_tmp, TK_A_ATTR, op, value, attr);
}
valid = 1;
continue;
err(rules->udev, "invalid KERNELS operation\n");
goto invalid;
}
- rule_add_token(&rule_tmp, TK_M_KERNELS, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_KERNELS, op, value, NULL);
valid = 1;
continue;
}
err(rules->udev, "invalid SUBSYSTEMS operation\n");
goto invalid;
}
- rule_add_token(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL);
valid = 1;
continue;
}
err(rules->udev, "invalid DRIVERS operation\n");
goto invalid;
}
- rule_add_token(&rule_tmp, TK_M_DRIVERS, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_DRIVERS, op, value, NULL);
valid = 1;
continue;
}
else if (strstr(attr, "../") != NULL)
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_token(&rule_tmp, TK_M_ATTRS, op, value, attr);
+ rule_add_key(&rule_tmp, TK_M_ATTRS, op, value, attr);
valid = 1;
continue;
}
if (strncmp(attr, "PHYSDEV", 7) == 0)
physdev = 1;
if (op < OP_MATCH_MAX) {
- if (rule_add_token(&rule_tmp, TK_M_ENV, op, value, attr) != 0)
+ if (rule_add_key(&rule_tmp, TK_M_ENV, op, value, attr) != 0)
goto invalid;
} else {
- if (rule_add_token(&rule_tmp, TK_A_ENV, op, value, attr) != 0)
+ if (rule_add_key(&rule_tmp, TK_A_ENV, op, value, attr) != 0)
goto invalid;
}
valid = 1;
}
if (strcasecmp(key, "PROGRAM") == 0) {
- rule_add_token(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
valid = 1;
continue;
}
err(rules->udev, "invalid RESULT operation\n");
goto invalid;
}
- rule_add_token(&rule_tmp, TK_M_RESULT, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_RESULT, op, value, NULL);
valid = 1;
continue;
}
attr = get_key_attribute(rules->udev, key + sizeof("IMPORT")-1);
if (attr != NULL && strstr(attr, "program")) {
dbg(rules->udev, "IMPORT will be executed\n");
- rule_add_token(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL);
+ 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_token(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
+ 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_token(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL);
valid = 1;
} else {
/* figure it out if it is executable */
dbg(rules->udev, "IMPORT auto mode for '%s'\n", file);
if (!lstat(file, &statbuf) && (statbuf.st_mode & S_IXUSR)) {
dbg(rules->udev, "IMPORT will be executed (autotype)\n");
- rule_add_token(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL);
+ 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_token(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
valid = 1;
}
}
attr = get_key_attribute(rules->udev, key + sizeof("TEST")-1);
if (attr != NULL) {
mode = strtol(attr, NULL, 8);
- rule_add_token(&rule_tmp, TK_M_TEST, op, value, &mode);
+ rule_add_key(&rule_tmp, TK_M_TEST, op, value, &mode);
} else {
- rule_add_token(&rule_tmp, TK_M_TEST, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_TEST, op, value, NULL);
}
valid = 1;
continue;
attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);
if (attr != NULL && strstr(attr, "ignore_error"))
flag = 1;
- rule_add_token(&rule_tmp, TK_A_RUN, op, value, &flag);
+ 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_token(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
valid = 1;
continue;
}
}
if (strcasecmp(key, "GOTO") == 0) {
- rule_add_token(&rule_tmp, TK_A_GOTO, 0, value, NULL);
+ rule_add_key(&rule_tmp, TK_A_GOTO, 0, value, NULL);
valid = 1;
continue;
}
if (strncasecmp(key, "NAME", sizeof("NAME")-1) == 0) {
if (op < OP_MATCH_MAX) {
- rule_add_token(&rule_tmp, TK_M_NAME, op, value, NULL);
+ 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");
- rule_add_token(&rule_tmp, TK_A_NAME, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL);
attr = get_key_attribute(rules->udev, key + sizeof("NAME")-1);
if (attr != NULL) {
if (strstr(attr, "all_partitions") != NULL) {
int num = DEFAULT_FAKE_PARTITIONS_COUNT;
dbg(rules->udev, "creation of partition nodes requested\n");
- rule_add_token(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num);
+ rule_add_key(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num);
}
if (strstr(attr, "ignore_remove") != NULL) {
dbg(rules->udev, "remove event should be ignored\n");
- rule_add_token(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL);
+ rule_add_key(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL);
}
}
}
+ rule_tmp.rule.rule.flags = 1;
continue;
}
if (strcasecmp(key, "SYMLINK") == 0) {
if (op < OP_MATCH_MAX)
- rule_add_token(&rule_tmp, TK_M_DEVLINK, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL);
else
- rule_add_token(&rule_tmp, TK_A_DEVLINK, op, value, NULL);
+ 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_token(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
+ rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
} else if (rules->resolve_names && strchr("$%", value[0]) == NULL) {
uid = add_uid(rules, value);
- rule_add_token(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
+ rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
} else {
- rule_add_token(&rule_tmp, TK_A_OWNER, op, value, NULL);
+ 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_token(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
+ rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
} else if (rules->resolve_names && strchr("$%", value[0]) == NULL) {
gid = add_gid(rules, value);
- rule_add_token(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
+ rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
} else {
- rule_add_token(&rule_tmp, TK_A_GROUP, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL);
}
+ rule_tmp.rule.rule.flags = 1;
valid = 1;
continue;
}
mode = strtol(value, &endptr, 8);
if (endptr[0] == '\0')
- rule_add_token(&rule_tmp, TK_A_MODE_ID, op, NULL, &mode);
+ rule_add_key(&rule_tmp, TK_A_MODE_ID, op, NULL, &mode);
else
- rule_add_token(&rule_tmp, TK_A_MODE, op, value, NULL);
+ rule_add_key(&rule_tmp, TK_A_MODE, op, value, NULL);
+ rule_tmp.rule.rule.flags = 1;
valid = 1;
continue;
}
if (strstr(value, "last_rule") != NULL) {
dbg(rules->udev, "last rule to be applied\n");
- rule_add_token(&rule_tmp, TK_A_LAST_RULE, 0, NULL, NULL);
+ rule_add_key(&rule_tmp, TK_A_LAST_RULE, 0, NULL, NULL);
}
if (strstr(value, "ignore_device") != NULL) {
dbg(rules->udev, "device should be ignored\n");
- rule_add_token(&rule_tmp, TK_A_IGNORE_DEVICE, 0, NULL, NULL);
+ rule_add_key(&rule_tmp, TK_A_IGNORE_DEVICE, 0, NULL, NULL);
}
if (strstr(value, "ignore_remove") != NULL) {
dbg(rules->udev, "remove event should be ignored\n");
- rule_add_token(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL);
+ rule_add_key(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL);
}
pos = strstr(value, "link_priority=");
if (pos != NULL) {
int prio = atoi(&pos[strlen("link_priority=")]);
- rule_add_token(&rule_tmp, TK_A_DEVLINK_PRIO, 0, NULL, &prio);
+ rule_add_key(&rule_tmp, TK_A_DEVLINK_PRIO, 0, NULL, &prio);
dbg(rules->udev, "link priority=%i\n", prio);
}
pos = strstr(value, "event_timeout=");
if (pos != NULL) {
int tout = atoi(&pos[strlen("event_timeout=")]);
- rule_add_token(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout);
+ rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout);
dbg(rules->udev, "event timout=%i\n", tout);
}
pos = strstr(value, "string_escape=");
if (pos != NULL) {
pos = &pos[strlen("string_escape=")];
if (strncmp(pos, "none", strlen("none")) == 0)
- rule_add_token(&rule_tmp, TK_A_STRING_ESCAPE_NONE, 0, NULL, NULL);
+ rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_NONE, 0, NULL, NULL);
else if (strncmp(pos, "replace", strlen("replace")) == 0)
- rule_add_token(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, 0, NULL, NULL);
+ rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, 0, NULL, NULL);
}
if (strstr(value, "all_partitions") != NULL) {
int num = DEFAULT_FAKE_PARTITIONS_COUNT;
- rule_add_token(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num);
+ rule_add_key(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num);
dbg(rules->udev, "creation of partition nodes requested\n");
}
valid = 1;
return -1;
}
-static int parse_file(struct udev_rules *rules, const char *filename)
+static int parse_file(struct udev_rules *rules, const char *filename, unsigned short filename_off)
{
FILE *f;
- unsigned int filename_off;
unsigned int first_token;
char line[UTIL_LINE_SIZE];
int line_nr = 0;
if (f == NULL)
return -1;
- filename_off = add_string(rules, filename);
first_token = rules->token_cur;
while(fgets(line, sizeof(line), f) != NULL) {
{
struct udev_rules *rules;
struct stat statbuf;
- char filename[PATH_MAX];
struct udev_list_node file_list;
struct udev_list_entry *file_loop, *file_tmp;
unsigned int prev_rule;
/* custom rules location for testing */
add_matching_files(udev, &file_list, udev_get_rules_path(udev), ".rules");
} else {
+ char filename[PATH_MAX];
struct udev_list_node sort_list;
struct udev_list_entry *sort_loop, *sort_tmp;
}
}
+ /* add all filenames to the string buffer */
+ udev_list_entry_foreach(file_loop, udev_list_get_entry(&file_list)) {
+ const char *filename = udev_list_entry_get_name(file_loop);
+ unsigned int filename_off;
+
+ filename_off = add_string(rules, filename);
+ /* the offset in the rule is limited to unsigned short */
+ if (filename_off < USHRT_MAX)
+ udev_list_entry_set_flag(file_loop, filename_off);
+ }
+
/* parse list of files */
udev_list_entry_foreach_safe(file_loop, file_tmp, udev_list_get_entry(&file_list)) {
- const char *file_name = udev_list_entry_get_name(file_loop);
+ const char *filename = udev_list_entry_get_name(file_loop);
+ unsigned int filename_off = udev_list_entry_get_flag(file_loop);
- if (stat(file_name, &statbuf) == 0 && statbuf.st_size > 0)
- parse_file(rules, file_name);
+ if (stat(filename, &statbuf) == 0 && statbuf.st_size > 0)
+ parse_file(rules, filename, filename_off);
else
- info(udev, "can not read '%s'\n", file_name);
+ info(udev, "can not read '%s'\n", filename);
udev_list_entry_remove(file_loop);
}
break;
case GL_SPLIT:
{
- char value[UTIL_PATH_SIZE];
+ const char *split;
+ size_t len;
- util_strlcpy(value, &rules->buf[token->key.value_off], sizeof(value));
- key_value = value;
- while (key_value != NULL) {
- pos = strchr(key_value, '|');
- if (pos != NULL) {
- pos[0] = '\0';
- pos = &pos[1];
- }
- dbg(rules->udev, "match %s '%s' <-> '%s'\n", token_str[token->type], key_value, val);
- match = (strcmp(key_value, val) == 0);
- if (match)
+ split = &rules->buf[token->key.value_off];
+ len = strlen(val);
+ while (1) {
+ const char *next;
+
+ next = strchr(split, '|');
+ if (next != NULL) {
+ size_t matchlen = (size_t)(next - split);
+
+ match = (matchlen == len && strncmp(split, val, matchlen) == 0);
+ if (match)
+ break;
+ } else {
+ match = (strcmp(split, val) == 0);
break;
- key_value = pos;
+ }
+ split = &next[1];
}
break;
}
static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct udev_event *event, struct token *cur)
{
- char attr[UTIL_PATH_SIZE];
const char *key_name = &rules->buf[cur->key.attr_off];
const char *key_value = &rules->buf[cur->key.value_off];
- char value[UTIL_NAME_SIZE] = "";
+ char value[UTIL_NAME_SIZE];
size_t len;
- util_strlcpy(attr, key_name, sizeof(attr));
- util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1);
+ value[0] = '\0';
+ if (key_name[0] == '[') {
+ char attr[UTIL_PATH_SIZE];
+
+ util_strlcpy(attr, key_name, sizeof(attr));
+ util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1);
+ }
if (value[0] == '\0') {
const char *val;
val = udev_device_get_sysattr_value(dev, key_name);
- if (val != NULL)
- util_strlcpy(value, val, sizeof(value));
+ if (val == NULL)
+ return -1;
+ util_strlcpy(value, val, sizeof(value));
}
- if (value[0]=='\0')
- return -1;
/* strip trailing whitespace of value, if not asked to match for it */
len = strlen(key_value);
{
struct token *cur;
struct token *rule;
+ enum escape_type esc = ESCAPE_UNSET;
+ int can_set_name;
if (rules->tokens == NULL)
return -1;
+ can_set_name = ((strcmp(udev_device_get_action(event->dev), "add") == 0 ||
+ strcmp(udev_device_get_action(event->dev), "change") == 0) &&
+ (major(udev_device_get_devnum(event->dev)) > 0 ||
+ strcmp(udev_device_get_subsystem(event->dev), "net") == 0));
+
/* loop through token list, match, run actions or forward to next rule */
cur = &rules->tokens[0];
rule = cur;
- while (cur != NULL && cur->type != TK_END) {
- enum escape_type esc = ESCAPE_UNSET;
+ while (1) {
unsigned int idx;
dump_token(rules, cur);
case TK_RULE:
/* current rule */
rule = cur;
+ /* possibly skip rules which want to set NAME, SYMLINK, OWNER, GROUP, MODE */
+ if (!can_set_name && rule->rule.flags)
+ ;//goto nomatch;
esc = ESCAPE_UNSET;
break;
case TK_M_ACTION:
/* get whole sequence of parent matches */
next = cur;
- while (next->type < TK_M_PARENTS_MAX)
+ while (next->type > TK_M_PARENTS_MIN && next->type < TK_M_PARENTS_MAX)
next++;
/* loop over parents */
util_strlcpy(owner, &rules->buf[cur->key.value_off], sizeof(owner));
udev_event_apply_format(event, owner, sizeof(owner));
event->uid = util_lookup_user(event->udev, owner);
+ info(event->udev, "OWNER %u %s:%u\n",
+ event->uid,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
break;
}
case TK_A_GROUP:
util_strlcpy(group, &rules->buf[cur->key.value_off], sizeof(group));
udev_event_apply_format(event, group, sizeof(group));
event->gid = util_lookup_group(event->udev, group);
+ info(event->udev, "GROUP %u %s:%u\n",
+ event->gid,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
break;
}
case TK_A_MODE:
err(event->udev, "invalide mode '%s' set default mode 0660\n", mode);
event->mode = 0660;
}
+ info(event->udev, "MODE %#o %s:%u\n",
+ event->mode,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
break;
}
case TK_A_OWNER_ID:
if (cur->key.op == OP_ASSIGN_FINAL)
event->owner_final = 1;
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);
break;
case TK_A_GROUP_ID:
if (event->group_final)
if (cur->key.op == OP_ASSIGN_FINAL)
event->group_final = 1;
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);
break;
case TK_A_MODE_ID:
if (event->mode_final)
if (cur->key.op == OP_ASSIGN_FINAL)
event->mode_final = 1;
event->mode = cur->key.mode;
+ info(event->udev, "MODE %#o %s:%u\n",
+ event->mode,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
break;
case TK_A_ENV:
{
info(event->udev, "%i character(s) replaced\n", count);
free(event->name);
event->name = strdup(name_str);
+ info(event->udev, "NAME '%s' %s:%u\n",
+ event->name,
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
}
break;
}
next = strchr(pos, ' ');
while (next) {
next[0] = '\0';
- info(event->udev, "add symlink '%s'\n", pos);
+ info(event->udev, "LINK '%s' %s:%u\n",
+ 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));
next = strchr(pos, ' ');
}
if (pos[0] != '\0') {
- info(event->udev, "add symlink '%s'\n", pos);
+ info(event->udev, "LINK '%s' %s:%u\n",
+ 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));
if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
udev_list_cleanup_entries(event->udev, &event->run_list);
+ info(event->udev, "RUN '%s' %s:%u\n",
+ &rules->buf[cur->key.value_off],
+ &rules->buf[rule->rule.filename_off],
+ rule->rule.filename_line);
list_entry = udev_list_entry_add(event->udev, &event->run_list,
&rules->buf[cur->key.value_off], NULL, 1, 0);
if (cur->key.ignore_error)
cur = &rules->tokens[cur->key.rule_goto];
continue;
case TK_A_LAST_RULE:
- break;
+ case TK_END:
+ return 0;
+ case TK_M_PARENTS_MIN:
case TK_M_PARENTS_MAX:
case TK_M_MAX:
- case TK_END:
case TK_UNSET:
err(rules->udev, "wrong type %u\n", cur->type);
goto nomatch;
/* fast-forward to next rule */
idx = rule->rule.next_rule;
if (idx == 0)
- break;
+ return 0;
dbg(rules->udev, "forward to rule: %u\n", idx);
cur = &rules->tokens[idx];
}
- return 0;
}
~ianmdlvl / elogind.git / blobdiff