X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev_rules_parse.c;h=5a9552ffde9202af968434de95ace4d984ae6d6d;hb=98f10a9e2ada5d72a0c39b94a5b59d9da4f28753;hp=1c5f36d491356159b7ae422906c0ed4d6c242ef9;hpb=31c1f537450e96f8ddd6a0fad2adaefe57996f03;p=elogind.git
diff --git a/udev/udev_rules_parse.c b/udev/udev_rules_parse.c
index 1c5f36d49..5a9552ffd 100644
--- a/udev/udev_rules_parse.c
+++ b/udev/udev_rules_parse.c
@@ -16,8 +16,6 @@
* along with this program. If not, see .
*/
-#include "config.h"
-
#include
#include
#include
@@ -33,7 +31,7 @@
void udev_rules_iter_init(struct udev_rules_iter *iter, struct udev_rules *rules)
{
- dbg(iter->rules->udev, "bufsize=%zi\n", rules->bufsize);
+ dbg(rules->udev, "bufsize=%zi\n", rules->bufsize);
iter->rules = rules;
iter->current = 0;
}
@@ -47,9 +45,9 @@ struct udev_rule *udev_rules_iter_next(struct udev_rules_iter *iter)
if (!rules)
return NULL;
- dbg(iter->rules->udev, "current=%zi\n", iter->current);
+ dbg(rules->udev, "current=%zi\n", iter->current);
if (iter->current >= rules->bufsize) {
- dbg(iter->rules->udev, "no more rules\n");
+ dbg(rules->udev, "no more rules\n");
return NULL;
}
@@ -60,29 +58,40 @@ struct udev_rule *udev_rules_iter_next(struct udev_rules_iter *iter)
return rule;
}
-struct udev_rule *udev_rules_iter_label(struct udev_rules_iter *iter, const char *label)
+struct udev_rule *udev_rules_iter_goto(struct udev_rules_iter *iter, size_t rule_off)
+{
+ struct udev_rules *rules = iter->rules;
+ struct udev_rule *rule;
+
+ dbg(rules->udev, "current=%zi\n", iter->current);
+ iter->current = rule_off;
+ rule = (struct udev_rule *) (rules->buf + iter->current);
+
+ return rule;
+}
+
+static size_t find_label(const struct udev_rules_iter *iter, const char *label)
{
struct udev_rule *rule;
struct udev_rules *rules = iter->rules;
- size_t start = iter->current;
+ size_t current = iter->current;
next:
- dbg(iter->rules->udev, "current=%zi\n", iter->current);
- if (iter->current >= rules->bufsize) {
+ dbg(rules->udev, "current=%zi\n", current);
+ if (current >= rules->bufsize) {
err(rules->udev, "LABEL='%s' not found, GOTO will be ignored\n", label);
- iter->current = start;
- return NULL;
+ return iter->current;
}
- rule = (struct udev_rule *) (rules->buf + iter->current);
+ rule = (struct udev_rule *) (rules->buf + current);
if (strcmp(&rule->buf[rule->label.val_off], label) != 0) {
dbg(rules->udev, "moving forward, looking for label '%s'\n", label);
- iter->current += sizeof(struct udev_rule) + rule->bufsize;
+ current += sizeof(struct udev_rule) + rule->bufsize;
goto next;
}
dbg(rules->udev, "found label '%s'\n", label);
- return rule;
+ return current;
}
static int get_key(struct udev_rules *rules, char **line, char **key, enum key_operation *operation, char **value)
@@ -204,7 +213,7 @@ static char *get_key_attribute(struct udev_rules *rules, char *str)
static int add_rule_key(struct udev_rule *rule, struct key *key,
enum key_operation operation, const char *value)
{
- size_t val_len = strnlen(value, PATH_SIZE);
+ size_t val_len = strnlen(value, UTIL_PATH_SIZE);
key->operation = operation;
@@ -218,7 +227,7 @@ static int add_rule_key(struct udev_rule *rule, struct key *key,
static int add_rule_key_pair(struct udev_rules *rules, struct udev_rule *rule, struct key_pairs *pairs,
enum key_operation operation, const char *key, const char *value)
{
- size_t key_len = strnlen(key, PATH_SIZE);
+ size_t key_len = strnlen(key, UTIL_PATH_SIZE);
if (pairs->count >= PAIRS_MAX) {
err(rules->udev, "skip, too many keys of the same type in a single rule\n");
@@ -239,7 +248,7 @@ static int add_rule_key_pair(struct udev_rules *rules, struct udev_rule *rule, s
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];
+ char buf[sizeof(struct udev_rule) + UTIL_LINE_SIZE];
struct udev_rule *rule;
size_t rule_size;
int valid;
@@ -444,7 +453,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
rule->import_type = IMPORT_PARENT;
} else {
/* figure it out if it is executable */
- char file[PATH_SIZE];
+ char file[UTIL_PATH_SIZE];
char *pos;
struct stat statbuf;
@@ -668,7 +677,7 @@ invalid:
static int parse_file(struct udev_rules *rules, const char *filename)
{
- char line[LINE_SIZE];
+ char line[UTIL_LINE_SIZE];
char *bufline;
unsigned int lineno;
char *buf;
@@ -676,9 +685,14 @@ static int parse_file(struct udev_rules *rules, const char *filename)
size_t cur;
size_t count;
int retval = 0;
+ size_t start;
+ struct udev_rule *rule;
+ struct udev_rules_iter iter;
+
+ start = rules->bufsize;
if (file_map(filename, &buf, &bufsize) != 0) {
- err(rules->udev, "can't open '%s' as rules file: %s\n", filename, strerror(errno));
+ err(rules->udev, "can't open '%s' as rules file: %m\n", filename);
return -1;
}
info(rules->udev, "reading '%s' as rules file\n", filename);
@@ -703,7 +717,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
continue;
/* see if this is a comment */
- if (bufline[0] == COMMENT_CHARACTER)
+ if (bufline[0] == '#')
continue;
if (count >= sizeof(line)) {
@@ -724,6 +738,22 @@ static int parse_file(struct udev_rules *rules, const char *filename)
add_to_rules(rules, line, filename, lineno);
}
+ /* Compute all goto targets within this file */
+ udev_rules_iter_init(&iter, rules);
+ udev_rules_iter_goto(&iter, start);
+ while((rule = udev_rules_iter_next(&iter))) {
+ if (rule->goto_label.operation != KEY_OP_UNSET) {
+ char *goto_label = &rule->buf[rule->goto_label.val_off];
+
+ dbg(rules->udev, "resolving goto label '%s'\n", goto_label);
+ rule->goto_rule_off = find_label(&iter, goto_label);
+ if (rule->goto_rule_off == iter.current) {
+ err(rules->udev, "goto nonexistent label '%s' in '%s'\n",
+ goto_label, filename);
+ }
+ }
+ }
+
file_unmap(buf, bufsize);
return retval;
}
@@ -801,7 +831,7 @@ int udev_rules_init(struct udev *udev, struct udev_rules *rules, int resolve_nam
else
dbg(udev, "empty rules file '%s'\n", name_loop->name);
} else
- err(udev, "could not read '%s': %s\n", name_loop->name, strerror(errno));
+ err(udev, "could not read '%s': %m\n", name_loop->name);
list_del(&name_loop->node);
free(name_loop);
}