X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-rules.c;h=ccf1eaaf8f43b5027038780be1975dce2349148c;hp=afd2e884e9260324acb6e8b7cd4668293ec6ab30;hb=6469c77216f02c53faeeb397e44c041d6ff57b82;hpb=ae2d346642aee4fab33c88708627bcf5b0cb317d

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index afd2e884e..ccf1eaaf8 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1454,10 +1454,10 @@ static int add_rule(struct udev_rules *rules, char *line,
 			uid = strtoul(value, &endptr, 10);
 			if (endptr[0] == '\0') {
 				rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
-			} else if (rules->resolve_names && strchr("$%", value[0]) == NULL) {
+			} else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) {
 				uid = add_uid(rules, value);
 				rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
-			} else {
+			} else if (rules->resolve_names == 0) {
 				rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL);
 			}
 			rule_tmp.rule.rule.flags = 1;
@@ -1472,10 +1472,10 @@ static int add_rule(struct udev_rules *rules, char *line,
 			gid = strtoul(value, &endptr, 10);
 			if (endptr[0] == '\0') {
 				rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
-			} else if (rules->resolve_names && strchr("$%", value[0]) == NULL) {
+			} else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) {
 				gid = add_gid(rules, value);
 				rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
-			} else {
+			} else if (rules->resolve_names == 0) {
 				rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL);
 			}
 			rule_tmp.rule.rule.flags = 1;
@@ -1649,7 +1649,7 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
 	dbg(udev, "open directory '%s'\n", dirname);
 	dir = opendir(dirname);
 	if (dir == NULL) {
-		err(udev, "unable to open '%s': %m\n", dirname);
+		info(udev, "unable to open '%s': %m\n", dirname);
 		return -1;
 	}
 
@@ -2019,7 +2019,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			rule = cur;
 			/* possibly skip rules which want to set NAME, SYMLINK, OWNER, GROUP, MODE */
 			if (!can_set_name && rule->rule.flags)
-				;//goto nomatch;
+				goto nomatch;
 			esc = ESCAPE_UNSET;
 			break;
 		case TK_M_ACTION:
@@ -2059,13 +2059,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			break;
 		case TK_M_ENV:
 			{
-				struct udev_list_entry *list_entry;
 				const char *key_name = &rules->buf[cur->key.attr_off];
 				const char *value;
 
-				list_entry = udev_device_get_properties_list_entry(event->dev);
-				list_entry = udev_list_entry_get_by_name(list_entry, key_name);
-				value = udev_list_entry_get_value(list_entry);
+				value = udev_device_get_property_value(event->dev, key_name);
 				if (value == NULL) {
 					dbg(event->udev, "ENV{%s} is not set, treat as empty\n", key_name);
 					value = "";
@@ -2507,9 +2504,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				     rule->rule.filename_line);
 				f = fopen(attr, "w");
 				if (f != NULL) {
-					if (!event->test)
-						if (fprintf(f, "%s", value) <= 0)
-							err(event->udev, "error writing ATTR{%s}: %m\n", attr);
+					if (fprintf(f, "%s", value) <= 0)
+						err(event->udev, "error writing ATTR{%s}: %m\n", attr);
 					fclose(f);
 				} else {
 					err(event->udev, "error opening ATTR{%s} for writing: %m\n", attr);