break;
if (linepos[0] == '=')
break;
- if (linepos[0] == '+')
- break;
- if (linepos[0] == '!')
- break;
- if (linepos[0] == ':')
- break;
+ if ((linepos[0] == '+') || (linepos[0] == '!') || (linepos[0] == ':'))
+ if (linepos[1] == '=')
+ break;
}
/* remember end of key */
static int add_to_rules(struct udev_rules *rules, char *line, const char *filename, unsigned int lineno)
{
+ char buf[sizeof(struct udev_rule) + LINE_SIZE];
struct udev_rule *rule;
size_t rule_size;
int valid;
int physdev = 0;
int retval;
- /* get all the keys */
- rule = calloc(1, sizeof (struct udev_rule) + LINE_SIZE);
- if (!rule) {
- err("malloc failed");
- return -1;
- }
+ memset(buf, 0x00, sizeof(buf));
+ rule = (struct udev_rule *) buf;
linepos = line;
valid = 0;
+ /* get all the keys */
while (1) {
char *key;
char *value;
err("invalid SUBSYSTEM operation");
goto invalid;
}
- add_rule_key(rule, &rule->subsystem, operation, value);
+ /* 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("'%s' must be specified as 'subsystem' "
+ "please fix it in %s:%u", value, filename, lineno);
+ add_rule_key(rule, &rule->subsystem, operation, "subsystem|class|bus");
+ } else
+ add_rule_key(rule, &rule->subsystem, operation, value);
valid = 1;
continue;
}
err("invalid DRIVER operation");
goto invalid;
}
- err("DRIVER== will change in a future relase, "
- "please use DRIVERS== in %s:%u", filename, lineno);
- /* FIXME: this should be rule->driver to match only the event device */
- add_rule_key(rule, &rule->drivers, operation, value);
+ add_rule_key(rule, &rule->driver, operation, value);
valid = 1;
continue;
}
if (strncasecmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 ||
strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
+ if (operation != KEY_OP_MATCH &&
+ operation != KEY_OP_NOMATCH) {
+ err("invalid ATTRS operation");
+ goto invalid;
+ }
attr = get_key_attribute(key + sizeof("ATTRS")-1);
if (attr == NULL) {
err("error parsing ATTRS attribute");
if (strncmp(attr, "device/", 7) == 0)
err("the 'device' link is deprecated and will be removed from a future kernel, "
"please fix it in %s:%u", filename, lineno);
- else if (strchr(attr, '/') != NULL)
+ else if (strstr(attr, "../") != NULL)
err("do not reference parent sysfs directories directly, that may break with a future kernel, "
"please fix it in %s:%u", filename, lineno);
if (add_rule_key_pair(rule, &rule->attrs, operation, attr, value) != 0)
continue;
}
- if (strcasecmp(key, "RUN") == 0) {
+ if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+ attr = get_key_attribute(key + sizeof("TEST")-1);
+ if (attr != NULL)
+ rule->test_mode_mask = strtol(attr, NULL, 8);
+ add_rule_key(rule, &rule->test, operation, value);
+ valid = 1;
+ continue;
+ }
+
+ if (strncasecmp(key, "RUN", sizeof("RUN")-1) == 0) {
+ attr = get_key_attribute(key + sizeof("RUN")-1);
+ if (attr && strstr(attr, "ignore_error"))
+ rule->run_ignore_error = 1;
add_rule_key(rule, &rule->run, operation, value);
valid = 1;
continue;
}
if (strcasecmp(key, "OPTIONS") == 0) {
+ const char *pos;
+
if (strstr(value, "last_rule") != NULL) {
dbg("last rule to be applied");
rule->last_rule = 1;
dbg("remove event should be ignored");
rule->ignore_remove = 1;
}
+ pos = strstr(value, "link_priority=");
+ if (pos != NULL) {
+ rule->link_priority = atoi(&pos[strlen("link_priority=")]);
+ info("link priority=%i", rule->link_priority);
+ }
+ pos = strstr(value, "string_escape=");
+ if (pos != NULL) {
+ pos = &pos[strlen("string_escape=")];
+ if (strncmp(pos, "none", strlen("none")) == 0)
+ rule->string_escape = ESCAPE_NONE;
+ else if (strncmp(pos, "replace", strlen("replace")) == 0)
+ rule->string_escape = ESCAPE_REPLACE;
+ }
if (strstr(value, "all_partitions") != NULL) {
dbg("creation of partition nodes requested");
rule->partitions = DEFAULT_PARTITIONS_COUNT;
}
if (physdev && rule->wait_for_sysfs.operation == KEY_OP_UNSET)
- err("PHYSDEV* values are deprected and will be removed from a future kernel, "
+ err("PHYSDEV* values are deprecated and will be removed from a future kernel, "
"please fix it in %s:%u", filename, lineno);
/* skip line if not any valid key was found */
memcpy(rules->buf + rules->bufsize, rule, rule_size);
rules->bufsize += rule_size;
exit:
- free(rule);
return 0;
invalid:
- free(rule);
err("invalid rule '%s:%u'", filename, lineno);
return -1;
}
err("can't open '%s' as rules file: %s", filename, strerror(errno));
return -1;
}
- dbg("reading '%s' as rules file", filename);
+ info("reading '%s' as rules file", filename);
/* loop through the whole file */
cur = 0;
rules->resolve_names = resolve_names;
/* parse rules file or all matching files in directory */
- if (stat(udev_rules_filename, &stats) != 0)
+ if (stat(udev_rules_dir, &stats) != 0)
return -1;
if ((stats.st_mode & S_IFMT) != S_IFDIR) {
- dbg("parse single rules file '%s'", udev_rules_filename);
- retval = parse_file(rules, udev_rules_filename);
+ dbg("parse single rules file '%s'", udev_rules_dir);
+ retval = parse_file(rules, udev_rules_dir);
} else {
struct name_entry *name_loop, *name_tmp;
LIST_HEAD(name_list);
- dbg("parse rules directory '%s'", udev_rules_filename);
- retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX);
+ dbg("parse rules directory '%s'", udev_rules_dir);
+ retval = add_matching_files(&name_list, udev_rules_dir, RULESFILE_SUFFIX);
list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
if (stat(name_loop->name, &stats) == 0) {