#include "logging.h"
#include "udev_rules.h"
-LIST_HEAD(udev_rule_list);
+/* rules parsed from .rules files*/
+static LIST_HEAD(rules_list);
+static struct list_head *rules_list_current;
-static int add_config_dev(struct udev_rule *rule)
+/* mapped compiled rules stored on disk */
+static struct udev_rule *rules_array = NULL;
+static size_t rules_array_current;
+static size_t rules_array_size = 0;
+
+static size_t rules_count = 0;
+
+int udev_rules_iter_init(void)
+{
+ rules_list_current = rules_list.next;
+ rules_array_current = 0;
+
+ return 0;
+}
+
+struct udev_rule *udev_rules_iter_next(void)
+{
+ static struct udev_rule *rule;
+
+ if (rules_array) {
+ if (rules_array_current >= rules_count)
+ return NULL;
+ rule = &rules_array[rules_array_current];
+ rules_array_current++;
+ } else {
+ dbg("head=%p current=%p next=%p", &rules_list, rules_list_current, rules_list_current->next);
+ if (rules_list_current == &rules_list)
+ return NULL;
+ rule = list_entry(rules_list_current, struct udev_rule, node);
+ rules_list_current = rules_list_current->next;
+ }
+ return rule;
+}
+
+static int add_rule_to_list(struct udev_rule *rule)
{
struct udev_rule *tmp_rule;
if (tmp_rule == NULL)
return -ENOMEM;
memcpy(tmp_rule, rule, sizeof(struct udev_rule));
- list_add_tail(&tmp_rule->node, &udev_rule_list);
+ list_add_tail(&tmp_rule->node, &rules_list);
dbg("name='%s', symlink='%s', bus='%s', id='%s', "
"sysfs_file[0]='%s', sysfs_value[0]='%s', "
- "kernel='%s', program='%s', result='%s', "
+ "kernel_name='%s', program='%s', result='%s', "
"owner='%s', group='%s', mode=%#o, "
"all_partions=%u, ignore_remove=%u, ignore_device=%u, last_rule=%u",
rule->name, rule->symlink, rule->bus, rule->id,
rule->sysfs_pair[0].name, rule->sysfs_pair[0].value,
- rule->kernel, rule->program, rule->result, rule->owner, rule->group, rule->mode,
+ rule->kernel_name, rule->program, rule->result, rule->owner, rule->group, rule->mode,
rule->partitions, rule->ignore_remove, rule->ignore_device, rule->last_rule);
return 0;
break;
if (linepos[0] == '!')
break;
+ if (linepos[0] == ':')
+ break;
}
/* remember end of key */
*operation = KEY_OP_ASSIGN;
linepos++;
dbg("operator=assign");
+ } else if (linepos[0] == ':' && linepos[1] == '=') {
+ *operation = KEY_OP_ASSIGN_FINAL;
+ linepos += 2;
+ dbg("operator=assign_final");
} else
return -1;
attr++;
pos = strchr(attr, '}');
if (pos == NULL) {
- dbg("missing closing brace for format");
+ err("missing closing brace for format");
return NULL;
}
pos[0] = '\0';
struct udev_rule rule;
if (file_map(filename, &buf, &bufsize) != 0) {
- dbg("can't open '%s' as rules file", filename);
+ err("can't open '%s' as rules file", filename);
return -1;
}
dbg("reading '%s' as rules file", filename);
while (1) {
char *key;
char *value;
- enum key_operation operation = KEY_OP_UNKNOWN;
+ enum key_operation operation = KEY_OP_UNSET;
retval = get_key(&linepos, &key, &operation, &value);
if (retval)
break;
if (strcasecmp(key, KEY_KERNEL) == 0) {
- strlcpy(rule.kernel, value, sizeof(rule.kernel));
+ strlcpy(rule.kernel_name, value, sizeof(rule.kernel_name));
rule.kernel_operation = operation;
valid = 1;
continue;
continue;
}
+ if (strcasecmp(key, KEY_ACTION) == 0) {
+ strlcpy(rule.action, value, sizeof(rule.action));
+ rule.action_operation = operation;
+ valid = 1;
+ continue;
+ }
+
+ if (strcasecmp(key, KEY_DEVPATH) == 0) {
+ strlcpy(rule.devpath, value, sizeof(rule.devpath));
+ rule.devpath_operation = operation;
+ valid = 1;
+ continue;
+ }
+
if (strcasecmp(key, KEY_BUS) == 0) {
strlcpy(rule.bus, value, sizeof(rule.bus));
rule.bus_operation = operation;
struct key_pair *pair;
if (rule.sysfs_pair_count >= KEY_SYSFS_PAIRS_MAX) {
- dbg("skip rule, to many " KEY_SYSFS " keys in a single rule");
+ err("skip rule, to many " KEY_SYSFS " keys in a single rule");
goto error;
}
pair = &rule.sysfs_pair[rule.sysfs_pair_count];
attr = get_key_attribute(key + sizeof(KEY_SYSFS)-1);
if (attr == NULL) {
- dbg("error parsing " KEY_SYSFS " attribute");
+ err("error parsing " KEY_SYSFS " attribute");
goto error;
}
strlcpy(pair->name, attr, sizeof(pair->name));
struct key_pair *pair;
if (rule.env_pair_count >= KEY_ENV_PAIRS_MAX) {
- dbg("skip rule, to many " KEY_ENV " keys in a single rule");
+ err("skip rule, to many " KEY_ENV " keys in a single rule");
goto error;
}
pair = &rule.env_pair[rule.env_pair_count];
attr = get_key_attribute(key + sizeof(KEY_ENV)-1);
if (attr == NULL) {
- dbg("error parsing " KEY_ENV " attribute");
+ err("error parsing " KEY_ENV " attribute");
continue;
}
strlcpy(pair->name, attr, sizeof(pair->name));
continue;
}
+ if (strcasecmp(key, KEY_MODALIAS) == 0) {
+ strlcpy(rule.modalias, value, sizeof(rule.modalias));
+ rule.modalias_operation = operation;
+ valid = 1;
+ continue;
+ }
+
+ if (strncasecmp(key, KEY_IMPORT, sizeof(KEY_IMPORT)-1) == 0) {
+ attr = get_key_attribute(key + sizeof(KEY_IMPORT)-1);
+ if (attr && strstr(attr, "program")) {
+ dbg(KEY_IMPORT" will be executed");
+ rule.import_exec = 1;
+ } else if (attr && strstr(attr, "file")) {
+ dbg(KEY_IMPORT" will be included as file");
+ } else {
+ /* figure it out if it is executable */
+ char file[PATH_SIZE];
+ char *pos;
+ struct stat stats;
+
+ strlcpy(file, value, sizeof(file));
+ pos = strchr(file, ' ');
+ if (pos)
+ pos[0] = '\0';
+ dbg(KEY_IMPORT" auto mode for '%s'", file);
+ if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
+ dbg(KEY_IMPORT" is executable, will be executed");
+ rule.import_exec = 1;
+ }
+ }
+ strlcpy(rule.import, value, sizeof(rule.import));
+ rule.import_operation = operation;
+ valid = 1;
+ continue;
+ }
+
if (strcasecmp(key, KEY_DRIVER) == 0) {
strlcpy(rule.driver, value, sizeof(rule.driver));
rule.driver_operation = operation;
if (strncasecmp(key, KEY_NAME, sizeof(KEY_NAME)-1) == 0) {
attr = get_key_attribute(key + sizeof(KEY_NAME)-1);
- /* FIXME: remove old style options and make OPTIONS= mandatory */
if (attr != NULL) {
if (strstr(attr, OPTION_PARTITIONS) != NULL) {
dbg("creation of partition nodes requested");
rule.ignore_remove = 1;
}
}
- if (value[0] != '\0')
- strlcpy(rule.name, value, sizeof(rule.name));
- else
- rule.ignore_device = 1;
+ rule.name_operation = operation;
+ strlcpy(rule.name, value, sizeof(rule.name));
valid = 1;
continue;
}
if (strcasecmp(key, KEY_SYMLINK) == 0) {
strlcpy(rule.symlink, value, sizeof(rule.symlink));
+ rule.symlink_operation = operation;
valid = 1;
continue;
}
if (strcasecmp(key, KEY_OWNER) == 0) {
strlcpy(rule.owner, value, sizeof(rule.owner));
+ rule.owner_operation = operation;
valid = 1;
continue;
}
if (strcasecmp(key, KEY_GROUP) == 0) {
strlcpy(rule.group, value, sizeof(rule.group));
+ rule.group_operation = operation;
valid = 1;
continue;
}
if (strcasecmp(key, KEY_MODE) == 0) {
rule.mode = strtol(value, NULL, 8);
+ rule.mode_operation = operation;
+ valid = 1;
+ continue;
+ }
+
+ if (strcasecmp(key, KEY_RUN) == 0) {
+ strlcpy(rule.run, value, sizeof(rule.run));
+ rule.run_operation = operation;
valid = 1;
continue;
}
continue;
}
- dbg("unknown key '%s'", key);
+ err("unknown key '%s'", key);
goto error;
}
if (!valid)
goto error;
- /* simple plausibility checks for given keys */
- if ((rule.sysfs_pair[0].name[0] == '\0') ^
- (rule.sysfs_pair[0].value[0] == '\0')) {
- info("inconsistency in " KEY_SYSFS " key");
- goto error;
- }
-
if ((rule.result[0] != '\0') && (program_given == 0)) {
- info(KEY_RESULT " is only useful when "
- KEY_PROGRAM " is called in any rule before");
+ info(KEY_RESULT " is only useful when " KEY_PROGRAM " is called in any rule before");
goto error;
}
rule.config_line = lineno;
strlcpy(rule.config_file, filename, sizeof(rule.config_file));
- retval = add_config_dev(&rule);
+ retval = add_rule_to_list(&rule);
if (retval) {
- dbg("add_config_dev returned with error %d", retval);
+ dbg("add_rule_to_list returned with error %d", retval);
continue;
error:
- info("parse error %s, line %d:%d, rule skipped",
+ err("parse error %s, line %d:%d, rule skipped",
filename, lineno, (int) (linepos - line));
}
}
return retval;
}
+static int rules_map(const char *filename)
+{
+ char *buf;
+ size_t size;
+
+ if (file_map(filename, &buf, &size))
+ return -1;
+ if (size == 0)
+ return -1;
+ rules_array = (struct udev_rule *) buf;
+ rules_array_size = size;
+ rules_count = size / sizeof(struct udev_rule);
+ dbg("found %zi compiled rules", rules_count);
+
+ return 0;
+}
+
int udev_rules_init(void)
{
+ char comp[PATH_SIZE];
struct stat stats;
int retval;
+ strlcpy(comp, udev_rules_filename, sizeof(comp));
+ strlcat(comp, ".compiled", sizeof(comp));
+ if (stat(comp, &stats) == 0) {
+ dbg("parse compiled rules '%s'", comp);
+ return rules_map(comp);
+ }
+
if (stat(udev_rules_filename, &stats) != 0)
return -1;
- if ((stats.st_mode & S_IFMT) != S_IFDIR)
+ if ((stats.st_mode & S_IFMT) != S_IFDIR) {
+ dbg("parse single rules file '%s'", udev_rules_filename);
retval = rules_parse(udev_rules_filename);
- else {
+ } 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);
list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
struct udev_rule *rule;
struct udev_rule *temp_rule;
- list_for_each_entry_safe(rule, temp_rule, &udev_rule_list, node) {
- list_del(&rule->node);
- free(rule);
- }
+ if (rules_array)
+ file_unmap(rules_array, rules_array_size);
+ else
+ list_for_each_entry_safe(rule, temp_rule, &rules_list, node) {
+ list_del(&rule->node);
+ free(rule);
+ }
}
-
~ianmdlvl / elogind.git / blobdiff