LIST_HEAD(udev_rule_list);
-static int add_config_dev(struct udev_rule *new_rule)
+static int add_config_dev(struct udev_rule *rule)
{
struct udev_rule *tmp_rule;
tmp_rule = malloc(sizeof(*tmp_rule));
if (tmp_rule == NULL)
return -ENOMEM;
- memcpy(tmp_rule, new_rule, sizeof(*tmp_rule));
+ memcpy(tmp_rule, rule, sizeof(struct udev_rule));
list_add_tail(&tmp_rule->node, &udev_rule_list);
- udev_rule_dump(tmp_rule);
- return 0;
-}
-
-void udev_rule_dump(struct udev_rule *rule)
-{
dbg("name='%s', symlink='%s', bus='%s', id='%s', "
"sysfs_file[0]='%s', sysfs_value[0]='%s', "
- "kernel='%s', program='%s', result='%s'"
- "owner='%s', group='%s', mode=%#o",
+ "kernel='%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].file, rule->sysfs_pair[0].value,
- rule->kernel, rule->program, rule->result,
- rule->owner, rule->group, rule->mode);
-}
-
-void udev_rule_list_dump(void)
-{
- struct udev_rule *rule;
+ rule->sysfs_pair[0].name, rule->sysfs_pair[0].value,
+ rule->kernel, rule->program, rule->result, rule->owner, rule->group, rule->mode,
+ rule->partitions, rule->ignore_remove, rule->ignore_device, rule->last_rule);
- list_for_each_entry(rule, &udev_rule_list, node)
- udev_rule_dump(rule);
+ return 0;
}
static int get_key(char **line, char **key, enum key_operation *operation, char **value)
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';
return NULL;
}
-static int rules_parse(struct udevice *udev, const char *filename)
+static int rules_parse(const char *filename)
{
char line[LINE_SIZE];
char *bufline;
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)
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;
}
if (strncasecmp(key, KEY_SYSFS, sizeof(KEY_SYSFS)-1) == 0) {
- struct sysfs_pair *pair = &rule.sysfs_pair[0];
- int sysfs_pair_num = 0;
-
- /* find first unused pair */
- while (pair->file[0] != '\0') {
- ++sysfs_pair_num;
- if (sysfs_pair_num >= MAX_SYSFS_PAIRS) {
- pair = NULL;
- break;
- }
- ++pair;
+ struct key_pair *pair;
+
+ if (rule.sysfs_pair_count >= KEY_SYSFS_PAIRS_MAX) {
+ err("skip rule, to many " KEY_SYSFS " keys in a single rule");
+ goto error;
}
- if (pair) {
- attr = get_key_attribute(key + sizeof(KEY_SYSFS)-1);
- if (attr == NULL) {
- dbg("error parsing " KEY_SYSFS " attribute");
- continue;
- }
- strlcpy(pair->file, attr, sizeof(pair->file));
- strlcpy(pair->value, value, sizeof(pair->value));
- pair->operation = operation;
- valid = 1;
+ pair = &rule.sysfs_pair[rule.sysfs_pair_count];
+ attr = get_key_attribute(key + sizeof(KEY_SYSFS)-1);
+ if (attr == NULL) {
+ err("error parsing " KEY_SYSFS " attribute");
+ goto error;
}
+ strlcpy(pair->name, attr, sizeof(pair->name));
+ strlcpy(pair->value, value, sizeof(pair->value));
+ pair->operation = operation;
+ rule.sysfs_pair_count++;
+ valid = 1;
+ continue;
+ }
+
+ if (strncasecmp(key, KEY_ENV, sizeof(KEY_ENV)-1) == 0) {
+ struct key_pair *pair;
+
+ if (rule.env_pair_count >= KEY_ENV_PAIRS_MAX) {
+ 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) {
+ err("error parsing " KEY_ENV " attribute");
+ continue;
+ }
+ strlcpy(pair->name, attr, sizeof(pair->name));
+ strlcpy(pair->value, value, sizeof(pair->value));
+ pair->operation = operation;
+ rule.env_pair_count++;
+ valid = 1;
+ 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_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.partitions = DEFAULT_PARTITIONS_COUNT;
}
+ /* FIXME: remove old style option and make OPTIONS= mandatory */
if (strstr(attr, OPTION_IGNORE_REMOVE) != NULL) {
dbg("remove event should be ignored");
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].file[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;
}
dbg("add_config_dev 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 -1;
if ((stats.st_mode & S_IFMT) != S_IFDIR)
- retval = rules_parse(NULL, udev_rules_filename);
- else
- retval = call_foreach_file(rules_parse, NULL, udev_rules_filename, RULEFILE_SUFFIX);
+ retval = rules_parse(udev_rules_filename);
+ else {
+ struct name_entry *name_loop, *name_tmp;
+ LIST_HEAD(name_list);
+
+ retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX);
+
+ list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
+ rules_parse(name_loop->name);
+ list_del(&name_loop->node);
+ }
+ }
return retval;
}
~ianmdlvl / elogind.git / blobdiff