X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=e708f355584ec1f73b7c6db798cbcdac6ef81011;hp=7c3c2e7fc252698aed9bb4be6c3d0c551a588b14;hb=6a5aac78f4d04490fc1d0178b1d7c0cb415c2944;hpb=39e54555a961fa6c4c8e7d260a0e208439dc0cfa

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 7c3c2e7fc..e708f3555 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -52,8 +52,10 @@ struct udev_rule *udev_rules_iter_next(struct udev_rules *rules)
 		return NULL;
 
 	dbg("current=%zi", rules->current);
-	if (rules->current >= rules->bufsize)
+	if (rules->current >= rules->bufsize) {
+		dbg("no more rules");
 		return NULL;
+	}
 
 	/* get next rule */
 	rule = (struct udev_rule *) (rules->buf + rules->current);
@@ -62,6 +64,28 @@ struct udev_rule *udev_rules_iter_next(struct udev_rules *rules)
 	return rule;
 }
 
+struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, const char *label)
+{
+	static struct udev_rule *rule;
+
+next:
+	dbg("current=%zi", rules->current);
+	if (rules->current >= rules->bufsize) {
+		dbg("no more rules");
+		return NULL;
+	}
+	rule = (struct udev_rule *) (rules->buf + rules->current);
+
+	if (strcmp(&rule->buf[rule->label.val_off], label) != 0) {
+		dbg("moving forward, looking for label '%s'", label);
+		rules->current += sizeof(struct udev_rule) + rule->bufsize;
+		goto next;
+	}
+
+	dbg("found label '%s'", label);
+	return rule;
+}
+
 static int get_key(char **line, char **key, enum key_operation *operation, char **value)
 {
 	char *linepos;
@@ -217,6 +241,7 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 	int valid;
 	char *linepos;
 	char *attr;
+	size_t padding;
 	int retval;
 
 	/* get all the keys */
@@ -237,6 +262,18 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 		if (retval)
 			break;
 
+		if (strcasecmp(key, "LABEL") == 0) {
+			add_rule_key(rule, &rule->label, operation, value);
+			valid = 1;
+			continue;
+		}
+
+		if (strcasecmp(key, "GOTO") == 0) {
+			add_rule_key(rule, &rule->goto_label, operation, value);
+			valid = 1;
+			continue;
+		}
+
 		if (strcasecmp(key, "KERNEL") == 0) {
 			add_rule_key(rule, &rule->kernel_name, operation, value);
 			valid = 1;
@@ -470,11 +507,17 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 
 	/* grow buffer and add rule */
 	rule_size = sizeof(struct udev_rule) + rule->bufsize;
+	padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t);
+	dbg("add %zi padding bytes", padding);
+	rule_size += padding;
+	rule->bufsize += padding;
+
 	rules->buf = realloc(rules->buf, rules->bufsize + rule_size);
 	if (!rules->buf) {
 		err("realloc failed");
 		goto exit;
 	}
+	dbg("adding rule to offset %zi", rules->bufsize);
 	memcpy(rules->buf + rules->bufsize, rule, rule_size);
 	rules->bufsize += rule_size;
 exit: