X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev_rules_parse.c;h=c42bd08c51f1d2490da2f5fce7a126976a57c58a;hp=b7ae06a20d9340a7b7624a70ad6038e933015505;hb=ff6c1cb139336915dd0d0a3092bc65cecc2bc75f;hpb=120ff8a0e8666b9be84fbd1c22ceeef1b1bd0158

diff --git a/udev/udev_rules_parse.c b/udev/udev_rules_parse.c
index b7ae06a20..c42bd08c5 100644
--- a/udev/udev_rules_parse.c
+++ b/udev/udev_rules_parse.c
@@ -31,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;
 }
@@ -79,8 +79,8 @@ static size_t find_label(const struct udev_rules_iter *iter, const char *label)
 next:
 	dbg(rules->udev, "current=%zi\n", current);
 	if (current >= rules->bufsize) {
-		err(rules->udev, "LABEL='%s' not found, GOTO will be ignored\n", label);
-		return iter->current;
+		dbg(rules->udev, "LABEL='%s' not found\n", label);
+		return 0;
 	}
 	rule = (struct udev_rule *) (rules->buf + current);
 
@@ -747,9 +747,10 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 
 			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",
+			if (rule->goto_rule_off == 0) {
+				err(rules->udev, "ignore goto to nonexistent label '%s' in '%s'\n",
 				    goto_label, filename);
+				rule->goto_rule_off = iter.current;
 			}
 		}
 	}