/*
- * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2008-2009 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
GL_SPLIT, /* multi-value A|B */
GL_SPLIT_GLOB, /* multi-value with glob A*|B* */
GL_SOMETHING, /* commonly used "?*" */
- GL_FORMAT,
+};
+
+enum string_subst_type {
+ SB_UNSET,
+ SB_NONE,
+ SB_FORMAT,
+ SB_SUBSYS,
};
/* tokens of a rule are sorted/handled in this order */
union {
unsigned char type; /* same as in rule and key */
struct {
- unsigned char type;
- unsigned char flags;
+ enum token_type type:8;
+ unsigned int flags:8;
unsigned short token_count;
unsigned int label_off;
unsigned short filename_off;
unsigned short filename_line;
} rule;
struct {
- unsigned char type;
- unsigned char flags;
- unsigned char op;
- unsigned char glob;
+ enum token_type type:8;
+ enum operation_type op:8;
+ enum string_glob_type glob:8;
+ enum string_subst_type subst:4;
+ enum string_subst_type attrsubst:4;
unsigned int value_off;
union {
unsigned int attr_off;
[GL_SPLIT] = "split",
[GL_SPLIT_GLOB] = "split-glob",
[GL_SOMETHING] = "split-glob",
- [GL_FORMAT] = "format",
};
return string_glob_strs[type];
const char *value, const void *data)
{
struct token *token = &rule_tmp->token[rule_tmp->token_cur];
- const char *attr = data;
- enum string_glob_type glob;
+ const char *attr = NULL;
memset(token, 0x00, sizeof(struct token));
case TK_M_ATTRS:
case TK_A_ATTR:
case TK_A_ENV:
+ attr = data;
token->key.value_off = add_string(rule_tmp->rules, value);
token->key.attr_off = add_string(rule_tmp->rules, attr);
break;
return -1;
}
- glob = GL_PLAIN;
- if (value != NULL) {
- if (type < TK_M_MAX) {
- /* check if we need to split or call fnmatch() while matching rules */
- int has_split;
- int has_glob;
-
- has_split = (strchr(value, '|') != NULL);
- has_glob = (strchr(value, '*') != NULL || strchr(value, '?') != NULL ||
- strchr(value, '[') != NULL || strchr(value, ']') != NULL);
- if (has_split && has_glob) {
- glob = GL_SPLIT_GLOB;
- } else if (has_split) {
- glob = GL_SPLIT;
- } else if (has_glob) {
- if (strcmp(value, "?*") == 0)
- glob = GL_SOMETHING;
- else
- glob = GL_GLOB;
- }
+ if (value != NULL && type < TK_M_MAX) {
+ /* check if we need to split or call fnmatch() while matching rules */
+ enum string_glob_type glob;
+ int has_split;
+ int has_glob;
+
+ has_split = (strchr(value, '|') != NULL);
+ has_glob = (strchr(value, '*') != NULL || strchr(value, '?') != NULL || strchr(value, '[') != NULL);
+ if (has_split && has_glob) {
+ glob = GL_SPLIT_GLOB;
+ } else if (has_split) {
+ glob = GL_SPLIT;
+ } else if (has_glob) {
+ if (strcmp(value, "?*") == 0)
+ glob = GL_SOMETHING;
+ else
+ glob = GL_GLOB;
} else {
- /* check if we need to substitute format strings for matching rules */
- if (strchr(value, '%') != NULL || strchr(value, '$') != NULL)
- glob = GL_FORMAT;
+ glob = GL_PLAIN;
}
+ token->key.glob = glob;
+ }
+
+ if (value != NULL && type > TK_M_MAX) {
+ /* check if assigned value has substitution chars */
+ if (value[0] == '[')
+ token->key.subst = SB_SUBSYS;
+ else if (strchr(value, '%') != NULL || strchr(value, '$') != NULL)
+ token->key.subst = SB_FORMAT;
+ else
+ token->key.subst = SB_NONE;
+ }
+
+ if (attr != NULL) {
+ /* check if property/attribut name has substitution chars */
+ if (attr[0] == '[')
+ token->key.attrsubst = SB_SUBSYS;
+ else if (strchr(attr, '%') != NULL || strchr(attr, '$') != NULL)
+ token->key.attrsubst = SB_FORMAT;
+ else
+ token->key.attrsubst = SB_NONE;
}
token->key.type = type;
token->key.op = op;
- token->key.glob = glob;
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 (get_key(rules->udev, &linepos, &key, &op, &value) != 0)
break;
- if (strcasecmp(key, "ACTION") == 0) {
+ if (strcmp(key, "ACTION") == 0) {
if (op > OP_MATCH_MAX) {
err(rules->udev, "invalid ACTION operation\n");
goto invalid;
continue;
}
- if (strcasecmp(key, "DEVPATH") == 0) {
+ if (strcmp(key, "DEVPATH") == 0) {
if (op > OP_MATCH_MAX) {
err(rules->udev, "invalid DEVPATH operation\n");
goto invalid;
continue;
}
- if (strcasecmp(key, "KERNEL") == 0) {
+ if (strcmp(key, "KERNEL") == 0) {
if (op > OP_MATCH_MAX) {
err(rules->udev, "invalid KERNEL operation\n");
goto invalid;
continue;
}
- if (strcasecmp(key, "SUBSYSTEM") == 0) {
+ if (strcmp(key, "SUBSYSTEM") == 0) {
if (op > OP_MATCH_MAX) {
err(rules->udev, "invalid SUBSYSTEM operation\n");
goto invalid;
continue;
}
- if (strcasecmp(key, "DRIVER") == 0) {
+ if (strcmp(key, "DRIVER") == 0) {
if (op > OP_MATCH_MAX) {
err(rules->udev, "invalid DRIVER operation\n");
goto invalid;
continue;
}
- if (strncasecmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
+ if (strncmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
attr = get_key_attribute(rules->udev, key + sizeof("ATTR")-1);
if (attr == NULL) {
err(rules->udev, "error parsing ATTR attribute\n");
continue;
}
- if (strcasecmp(key, "KERNELS") == 0 ||
- strcasecmp(key, "ID") == 0) {
+ if (strcmp(key, "KERNELS") == 0 ||
+ strcmp(key, "ID") == 0) {
if (op > OP_MATCH_MAX) {
err(rules->udev, "invalid KERNELS operation\n");
goto invalid;
continue;
}
- if (strcasecmp(key, "SUBSYSTEMS") == 0 ||
- strcasecmp(key, "BUS") == 0) {
+ if (strcmp(key, "SUBSYSTEMS") == 0 ||
+ strcmp(key, "BUS") == 0) {
if (op > OP_MATCH_MAX) {
err(rules->udev, "invalid SUBSYSTEMS operation\n");
goto invalid;
continue;
}
- if (strcasecmp(key, "DRIVERS") == 0) {
+ if (strcmp(key, "DRIVERS") == 0) {
if (op > OP_MATCH_MAX) {
err(rules->udev, "invalid DRIVERS operation\n");
goto invalid;
continue;
}
- if (strncasecmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 ||
- strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
+ if (strncmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 ||
+ strncmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
if (op > OP_MATCH_MAX) {
err(rules->udev, "invalid ATTRS operation\n");
goto invalid;
continue;
}
- if (strncasecmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
+ if (strncmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
attr = get_key_attribute(rules->udev, key + sizeof("ENV")-1);
if (attr == NULL) {
err(rules->udev, "error parsing ENV attribute\n");
continue;
}
- if (strcasecmp(key, "PROGRAM") == 0) {
+ if (strcmp(key, "PROGRAM") == 0) {
rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
continue;
}
- if (strcasecmp(key, "RESULT") == 0) {
+ if (strcmp(key, "RESULT") == 0) {
if (op > OP_MATCH_MAX) {
err(rules->udev, "invalid RESULT operation\n");
goto invalid;
continue;
}
- if (strncasecmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
+ if (strncmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
attr = get_key_attribute(rules->udev, key + sizeof("IMPORT")-1);
if (attr != NULL && strstr(attr, "program")) {
dbg(rules->udev, "IMPORT will be executed\n");
continue;
}
- if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+ if (strncmp(key, "TEST", sizeof("TEST")-1) == 0) {
mode_t mode = 0;
if (op > OP_MATCH_MAX) {
continue;
}
- if (strncasecmp(key, "RUN", sizeof("RUN")-1) == 0) {
+ if (strncmp(key, "RUN", sizeof("RUN")-1) == 0) {
int flag = 0;
attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);
continue;
}
- if (strcasecmp(key, "WAIT_FOR") == 0 || strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
+ if (strcmp(key, "WAIT_FOR") == 0 || strcmp(key, "WAIT_FOR_SYSFS") == 0) {
rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
continue;
}
- if (strcasecmp(key, "LABEL") == 0) {
+ if (strcmp(key, "LABEL") == 0) {
rule_tmp.rule.rule.label_off = add_string(rules, value);
continue;
}
- if (strcasecmp(key, "GOTO") == 0) {
+ if (strcmp(key, "GOTO") == 0) {
rule_add_key(&rule_tmp, TK_A_GOTO, 0, value, NULL);
continue;
}
- if (strncasecmp(key, "NAME", sizeof("NAME")-1) == 0) {
+ if (strncmp(key, "NAME", sizeof("NAME")-1) == 0) {
if (op < OP_MATCH_MAX) {
rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL);
} else {
continue;
}
- if (strcasecmp(key, "SYMLINK") == 0) {
+ if (strcmp(key, "SYMLINK") == 0) {
if (op < OP_MATCH_MAX)
rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL);
else
continue;
}
- if (strcasecmp(key, "OWNER") == 0) {
+ if (strcmp(key, "OWNER") == 0) {
uid_t uid;
char *endptr;
continue;
}
- if (strcasecmp(key, "GROUP") == 0) {
+ if (strcmp(key, "GROUP") == 0) {
gid_t gid;
char *endptr;
continue;
}
- if (strcasecmp(key, "MODE") == 0) {
+ if (strcmp(key, "MODE") == 0) {
mode_t mode;
char *endptr;
continue;
}
- if (strcasecmp(key, "OPTIONS") == 0) {
+ if (strcmp(key, "OPTIONS") == 0) {
const char *pos;
if (strstr(value, "last_rule") != NULL) {
case GL_SOMETHING:
match = (val[0] != '\0');
break;
- case GL_FORMAT:
case GL_UNSET:
return -1;
}
static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct udev_event *event, struct token *cur)
{
- 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];
+ const char *name;
+ char nbuf[UTIL_NAME_SIZE];
+ const char *value;
+ char vbuf[UTIL_NAME_SIZE];
size_t len;
- value[0] = '\0';
- if (key_name[0] == '[') {
- char attr[UTIL_PATH_SIZE];
-
- util_strscpy(attr, sizeof(attr), key_name);
- 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)
+ name = &rules->buf[cur->key.attr_off];
+ switch (cur->key.attrsubst) {
+ case SB_FORMAT:
+ udev_event_apply_format(event, name, nbuf, sizeof(nbuf));
+ name = nbuf;
+ /* fall through */
+ case SB_NONE:
+ value = udev_device_get_sysattr_value(dev, name);
+ if (value == NULL)
+ return -1;
+ break;
+ case SB_SUBSYS:
+ if (util_resolve_subsys_kernel(event->udev, name, vbuf, sizeof(vbuf), 1) != 0)
return -1;
- util_strscpy(value, sizeof(value), val);
+ value = vbuf;
+ break;
+ default:
+ return -1;
}
- /* strip trailing whitespace of value, if not asked to match for it */
- len = strlen(key_value);
- if (len > 0 && !isspace(key_value[len-1])) {
- len = strlen(value);
- while (len > 0 && isspace(value[--len]))
- value[len] = '\0';
- dbg(rules->udev, "removed trailing whitespace from '%s'\n", value);
+ /* remove trailing whitespace, if not asked to match for it */
+ len = strlen(value);
+ if (len > 0 && isspace(value[len-1])) {
+ const char *key_value;
+ size_t klen;
+
+ key_value = &rules->buf[cur->key.value_off];
+ klen = strlen(key_value);
+ if (klen > 0 && !isspace(key_value[klen-1])) {
+ if (value != vbuf) {
+ util_strscpy(vbuf, sizeof(vbuf), value);
+ value = vbuf;
+ }
+ while (len > 0 && isspace(vbuf[--len]))
+ vbuf[len] = '\0';
+ dbg(rules->udev, "removed trailing whitespace from '%s'\n", value);
+ }
}
+
return match_key(rules, cur, value);
}