X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.c;h=a25c2e90a8bc196b6f3a44a219b339a01505c74b;hp=aa66c7ad30a858bcdfc3b739cb7ddda2af3e5f09;hb=e03bce632196dea1f6b18885225b46daaba7fa30;hpb=be4bedd16b934c8663f8c231f07f23091cde8261

diff --git a/udev_rules.c b/udev_rules.c
index aa66c7ad3..a25c2e90a 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/wait.h>
+#include <sys/stat.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
@@ -174,21 +175,26 @@ static int get_key(char **line, char **key, char **value)
 		linepos++;
 
 	/* get the value*/
-	if (linepos[0] == '\0')
-		return -1;
-
 	if (linepos[0] == '"') {
 		linepos++;
 		temp = strchr(linepos, '"');
-		if (!temp)
+		if (!temp) {
+			dbg("missing closing quote");
 			return -1;
+		}
+		dbg("value is quoted");
 		temp[0] = '\0';
 	} else if (linepos[0] == '\'') {
 		linepos++;
 		temp = strchr(linepos, '\'');
-		if (!temp)
+		if (!temp) {
+			dbg("missing closing quote");
 			return -1;
+		}
+		dbg("value is quoted");
 		temp[0] = '\0';
+	} else if (linepos[0] == '\0') {
+		dbg("value is empty");
 	} else {
 		temp = linepos;
 		while (temp[0] && !isspace(temp[0]))
@@ -200,7 +206,7 @@ static int get_key(char **line, char **key, char **value)
 	return 0;
 }
 
-static int import_keys_into_env(const char *buf, size_t bufsize)
+static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bufsize)
 {
 	char line[LINE_SIZE];
 	const char *bufline;
@@ -211,7 +217,7 @@ static int import_keys_into_env(const char *buf, size_t bufsize)
 	size_t count;
 	int lineno;
 
-	/* loop through the whole file */
+	/* loop through the whole buffer */
 	lineno = 0;
 	cur = 0;
 	while (cur < bufsize) {
@@ -241,15 +247,16 @@ static int import_keys_into_env(const char *buf, size_t bufsize)
 
 		linepos = line;
 		if (get_key(&linepos, &variable, &value) == 0) {
-			dbg("import %s=%s", variable, value);
-			setenv(variable, value, 0);
+			dbg("import '%s=%s'", variable, value);
+			name_list_key_add(&udev->env_list, variable, value);
+			setenv(variable, value, 1);
 		}
 	}
 
 	return 0;
 }
 
-static int import_file_into_env(const char *filename)
+static int import_file_into_env(struct udevice *udev, const char *filename)
 {
 	char *buf;
 	size_t bufsize;
@@ -258,17 +265,24 @@ static int import_file_into_env(const char *filename)
 		err("can't open '%s'", filename);
 		return -1;
 	}
-	import_keys_into_env(buf, bufsize);
+	import_keys_into_env(udev, buf, bufsize);
 	file_unmap(buf, bufsize);
 
 	return 0;
 }
 
-/** Finds the lowest positive N such that <name>N isn't present in 
- *  $(udevroot) either as a file or a symlink.
- *
- *  @param  name                Name to check for
- *  @return                     0 if <name> didn't exist and N otherwise.
+static int import_program_into_env(struct udevice *udev, const char *program)
+{
+	char result[1024];
+	size_t reslen;
+
+	if (execute_program(program, udev->subsystem, result, sizeof(result), &reslen) != 0)
+		return -1;
+	return import_keys_into_env(udev, result, reslen);
+}
+
+/* finds the lowest positive N such that <name>N isn't present in the udevdb
+ * if <name> doesn't exist, 0 is returned, N otherwise
  */
 static int find_free_number(struct udevice *udev, const char *name)
 {
@@ -322,6 +336,28 @@ attr_found:
 	return 0;
 }
 
+#define WAIT_LOOP_PER_SECOND			20
+static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
+{
+	char filename[PATH_SIZE];
+	struct stat stats;
+	int loop = timeout * WAIT_LOOP_PER_SECOND;
+
+	snprintf(filename, sizeof(filename), "%s%s/%s", sysfs_path, udev->devpath, file);
+	filename[sizeof(filename)-1] = '\0';
+	dbg("wait %i sec for '%s'", timeout, filename);
+
+	while (--loop) {
+		if (stat(filename, &stats) == 0) {
+			dbg("file appeared after %i loops", (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
+			return 0;
+		}
+		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
+	}
+	dbg("waiting for '%s' failed", filename);
+	return -1;
+}
+
 static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 			 struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
@@ -586,215 +622,164 @@ found:
 	}
 }
 
+static char *key_val(struct udev_rule *rule, struct key *key)
+{
+	return rule->buf + key->val_off;
+}
+
+static char *key_pair_name(struct udev_rule *rule, struct key_pair *pair)
+{
+	return rule->buf + pair->key_name_off;
+}
+
+static int match_key(const char *key_name, struct udev_rule *rule, struct key *key, const char *val)
+{
+	int match;
+	char *key_value;
+
+	if (key->operation == KEY_OP_UNSET)
+		return 0;
+
+	key_value = rule->buf + key->val_off;
+
+	dbg("check for %s '%s' <-> '%s'", key_name, key_value, val);
+	match = (strcmp_pattern(key_value, val) == 0);
+	if (match && (key->operation != KEY_OP_NOMATCH)) {
+		dbg("%s is matching (matching value)", key_name);
+		return 0;
+	}
+	if (!match && (key->operation == KEY_OP_NOMATCH)) {
+		dbg("%s is matching, (non matching value)", key_name);
+		return 0;
+	}
+
+	dbg("%s is not matching", key_name);
+	return -1;
+}
+
 static int match_rule(struct udevice *udev, struct udev_rule *rule,
 		      struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
 	struct sysfs_device *parent_device = sysfs_device;
 
-	if (rule->action_operation != KEY_OP_UNSET) {
-		dbg("check for " KEY_ACTION " rule->action='%s' udev->action='%s'",
-		    rule->action, udev->action);
-		if (strcmp_pattern(rule->action, udev->action) != 0) {
-			dbg(KEY_ACTION " is not matching");
-			if (rule->action_operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg(KEY_ACTION " matches");
-			if (rule->action_operation == KEY_OP_NOMATCH)
-				goto exit;
-		}
-		dbg(KEY_ACTION " key is true");
-	}
+	if (match_key("ACTION", rule, &rule->action, udev->action))
+		goto exit;
 
-	if (rule->kernel_operation != KEY_OP_UNSET) {
-		dbg("check for " KEY_KERNEL " rule->kernel='%s' udev_kernel_name='%s'",
-		    rule->kernel, udev->kernel_name);
-		if (strcmp_pattern(rule->kernel, udev->kernel_name) != 0) {
-			dbg(KEY_KERNEL " is not matching");
-			if (rule->kernel_operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg(KEY_KERNEL " matches");
-			if (rule->kernel_operation == KEY_OP_NOMATCH)
-				goto exit;
-		}
-		dbg(KEY_KERNEL " key is true");
-	}
+	if (match_key("KERNEL", rule, &rule->kernel_name, udev->kernel_name))
+		goto exit;
 
-	if (rule->subsystem_operation != KEY_OP_UNSET) {
-		dbg("check for " KEY_SUBSYSTEM " rule->subsystem='%s' udev->subsystem='%s'",
-		    rule->subsystem, udev->subsystem);
-		if (strcmp_pattern(rule->subsystem, udev->subsystem) != 0) {
-			dbg(KEY_SUBSYSTEM " is not matching");
-			if (rule->subsystem_operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg(KEY_SUBSYSTEM " matches");
-			if (rule->subsystem_operation == KEY_OP_NOMATCH)
-				goto exit;
-		}
-		dbg(KEY_SUBSYSTEM " key is true");
-	}
+	if (match_key("SUBSYSTEM", rule, &rule->subsystem, udev->subsystem))
+		goto exit;
 
-	if (rule->devpath_operation != KEY_OP_UNSET) {
-		dbg("check for " KEY_DEVPATH " rule->devpath='%s' udev->devpath='%s'",
-		    rule->devpath, udev->devpath);
-		if (strcmp_pattern(rule->devpath, udev->devpath) != 0) {
-			dbg(KEY_DEVPATH " is not matching");
-			if (rule->devpath_operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg(KEY_DEVPATH " matches");
-			if (rule->devpath_operation == KEY_OP_NOMATCH)
-				goto exit;
-		}
-		dbg(KEY_DEVPATH " key is true");
-	}
+	if (match_key("DEVPATH", rule, &rule->devpath, udev->devpath))
+		goto exit;
 
-	if (rule->modalias_operation != KEY_OP_UNSET) {
+	if (rule->modalias.operation != KEY_OP_UNSET) {
 		char value[NAME_SIZE];
 
 		if (find_sysfs_attribute(NULL, sysfs_device, "modalias", value, sizeof(value)) != 0) {
-			dbg(KEY_MODALIAS " value not found");
+			dbg("MODALIAS value not found");
 			goto exit;
 		}
-		dbg("check for " KEY_MODALIAS " rule->modalias='%s' modalias='%s'",
-		    rule->modalias, value);
-		if (strcmp_pattern(rule->modalias, value) != 0) {
-			dbg(KEY_MODALIAS " is not matching");
-			if (rule->modalias_operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg(KEY_MODALIAS " matches");
-			if (rule->modalias_operation == KEY_OP_NOMATCH)
-				goto exit;
-		}
-		dbg(KEY_MODALIAS " key is true");
+		if (match_key("MODALIAS", rule, &rule->modalias, value))
+			goto exit;
 	}
 
-	if (rule->env_pair_count) {
+	if (rule->env.count) {
 		int i;
 
-		dbg("check for " KEY_ENV " pairs");
-		for (i = 0; i < rule->env_pair_count; i++) {
-			struct key_pair *pair;
-			const char *value;
+		dbg("check %i ENV keys", rule->env.count);
+		for (i = 0; i < rule->env.count; i++) {
+			struct key_pair *pair = &rule->env.keys[i];
+			const char *key_name = key_pair_name(rule, pair);
+			const char *value = getenv(key_name);
 
-			pair = &rule->env_pair[i];
-			value = getenv(pair->name);
 			if (!value) {
-				dbg(KEY_ENV "{'%s'} is not found", pair->name);
+				dbg("ENV{'%s'} is not found", key_name);
 				goto exit;
 			}
-			if (strcmp_pattern(pair->value, value) != 0) {
-				dbg(KEY_ENV "{'%s'} is not matching", pair->name);
-				if (pair->operation != KEY_OP_NOMATCH)
-					goto exit;
-			} else {
-				dbg(KEY_ENV "{'%s'} matches", pair->name);
-				if (pair->operation == KEY_OP_NOMATCH)
-					goto exit;
-			}
+			if (match_key("ENV", rule, &pair->key, value))
+				goto exit;
 		}
-		dbg(KEY_ENV " key is true");
+		dbg("all %i ENV keys matched", rule->env.count);
+	}
+
+	if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
+		int match;
+
+		match = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
+		if (match && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH)) {
+			dbg("WAIT_FOR_SYSFS is matching (matching value)");
+			return 0;
+		}
+		if (!match && (rule->wait_for_sysfs.operation == KEY_OP_NOMATCH)) {
+			dbg("WAIT_FOR_SYSFS is matching, (non matching value)");
+			return 0;
+		}
+		dbg("WAIT_FOR_SYSFS is not matching");
+		return -1;
 	}
 
 	/* walk up the chain of physical devices and find a match */
 	while (1) {
 		/* check for matching driver */
-		if (rule->driver_operation != KEY_OP_UNSET) {
+		if (rule->driver.operation != KEY_OP_UNSET) {
 			if (parent_device == NULL) {
 				dbg("device has no sysfs_device");
 				goto exit;
 			}
-			dbg("check for " KEY_DRIVER " rule->driver='%s' sysfs_device->driver_name='%s'",
-			    rule->driver, parent_device->driver_name);
-			if (strcmp_pattern(rule->driver, parent_device->driver_name) != 0) {
-				dbg(KEY_DRIVER " is not matching");
-				if (rule->driver_operation != KEY_OP_NOMATCH)
-					goto try_parent;
-			} else {
-				dbg(KEY_DRIVER " matches");
-				if (rule->driver_operation == KEY_OP_NOMATCH)
-					goto try_parent;
-			}
-			dbg(KEY_DRIVER " key is true");
+			if (match_key("DRIVER", rule, &rule->driver, parent_device->driver_name))
+				goto try_parent;
 		}
 
 		/* check for matching bus value */
-		if (rule->bus_operation != KEY_OP_UNSET) {
+		if (rule->bus.operation != KEY_OP_UNSET) {
 			if (parent_device == NULL) {
 				dbg("device has no sysfs_device");
 				goto exit;
 			}
-			dbg("check for " KEY_BUS " rule->bus='%s' sysfs_device->bus='%s'",
-			    rule->bus, parent_device->bus);
-			if (strcmp_pattern(rule->bus, parent_device->bus) != 0) {
-				dbg(KEY_BUS " is not matching");
-				if (rule->bus_operation != KEY_OP_NOMATCH)
-					goto try_parent;
-			} else {
-				dbg(KEY_BUS " matches");
-				if (rule->bus_operation == KEY_OP_NOMATCH)
-					goto try_parent;
-			}
-			dbg(KEY_BUS " key is true");
+			if (match_key("BUS", rule, &rule->bus, parent_device->bus))
+				goto try_parent;
 		}
 
 		/* check for matching bus id */
-		if (rule->id_operation != KEY_OP_UNSET) {
+		if (rule->id.operation != KEY_OP_UNSET) {
 			if (parent_device == NULL) {
 				dbg("device has no sysfs_device");
 				goto exit;
 			}
-			dbg("check " KEY_ID);
-			if (strcmp_pattern(rule->id, parent_device->bus_id) != 0) {
-				dbg(KEY_ID " is not matching");
-				if (rule->id_operation != KEY_OP_NOMATCH)
-					goto try_parent;
-			} else {
-				dbg(KEY_ID " matches");
-				if (rule->id_operation == KEY_OP_NOMATCH)
-					goto try_parent;
-			}
-			dbg(KEY_ID " key is true");
+			if (match_key("ID", rule, &rule->id, parent_device->bus_id))
+				goto try_parent;
 		}
 
 		/* check for matching sysfs pairs */
-		if (rule->sysfs_pair_count) {
+		if (rule->sysfs.count) {
 			int i;
 
-			dbg("check " KEY_SYSFS " pairs");
-			for (i = 0; i < rule->sysfs_pair_count; i++) {
-				struct key_pair *pair;
+			dbg("check %i SYSFS keys", rule->sysfs.count);
+			for (i = 0; i < rule->sysfs.count; i++) {
+				struct key_pair *pair = &rule->sysfs.keys[i];
+				const char *key_name = key_pair_name(rule, pair);
+				const char *key_value = key_val(rule, &pair->key);
 				char value[VALUE_SIZE];
 				size_t len;
 
-				pair = &rule->sysfs_pair[i];
-				if (find_sysfs_attribute(class_dev, parent_device, pair->name, value, sizeof(value)) != 0)
+				if (find_sysfs_attribute(class_dev, parent_device, key_name, value, sizeof(value)) != 0)
 					goto try_parent;
 
 				/* strip trailing whitespace of value, if not asked to match for it */
-				len = strlen(pair->value);
-				if (len && !isspace(pair->value[len-1])) {
+				len = strlen(key_value);
+				if (len && !isspace(key_value[len-1])) {
 					len = strlen(value);
 					while (len > 0 && isspace(value[len-1]))
 						value[--len] = '\0';
-					dbg("removed %i trailing whitespace chars from '%s'", strlen(value)-len, value);
+					dbg("removed %zi trailing whitespace chars from '%s'", strlen(value)-len, value);
 				}
 
-				dbg("compare attribute '%s' value '%s' with '%s'", pair->name, value, pair->value);
-				if (strcmp_pattern(pair->value, value) != 0) {
-					dbg(KEY_SYSFS "{'%s'} is not matching", pair->name);
-					if (pair->operation != KEY_OP_NOMATCH)
-						goto try_parent;
-				} else {
-					dbg(KEY_SYSFS "{'%s'} matches", pair->name);
-					if (pair->operation == KEY_OP_NOMATCH)
-						goto try_parent;
-				}
+				if (match_key("SYSFS", rule, &pair->key, value))
+					goto try_parent;
 			}
-			dbg(KEY_SYSFS " keys are true");
+			dbg("all %i SYSFS keys matched", rule->sysfs.count);
 		}
 
 		/* found matching physical device  */
@@ -809,61 +794,57 @@ try_parent:
 	}
 
 	/* import variables from file into environment */
-	if (rule->import_operation != KEY_OP_UNSET) {
+	if (rule->import.operation != KEY_OP_UNSET) {
 		char import[PATH_SIZE];
+		int rc = -1;
 
-		strlcpy(import, rule->import, sizeof(import));
+		strlcpy(import, key_val(rule, &rule->import), sizeof(import));
 		apply_format(udev, import, sizeof(import), class_dev, sysfs_device);
-		dbg("check for " KEY_IMPORT " import='%s", import);
-		if (import_file_into_env(import) != 0) {
-			dbg(KEY_IMPORT " failed");
-			if (rule->import_operation != KEY_OP_NOMATCH)
+		dbg("check for IMPORT import='%s'", import);
+		if (rule->import_exec) {
+			dbg("run executable file import='%s'", import);
+			rc = import_program_into_env(udev, import);
+		} else {
+			dbg("import file import='%s'", import);
+			rc = import_file_into_env(udev, import);
+		}
+		if (rc) {
+			dbg("IMPORT failed");
+			if (rule->import.operation != KEY_OP_NOMATCH)
 				goto exit;
 		} else
-			dbg(KEY_IMPORT " file '%s' imported", rule->import);
-		dbg(KEY_IMPORT " key is true");
+			dbg("IMPORT '%s' imported", key_val(rule, &rule->import));
+		dbg("IMPORT key is true");
 	}
 
 	/* execute external program */
-	if (rule->program_operation != KEY_OP_UNSET) {
+	if (rule->program.operation != KEY_OP_UNSET) {
 		char program[PATH_SIZE];
 		char result[PATH_SIZE];
 
-		strlcpy(program, rule->program, sizeof(program));
+		strlcpy(program, key_val(rule, &rule->program), sizeof(program));
 		apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
-		dbg("check for " KEY_PROGRAM " program='%s", program);
+		dbg("check for PROGRAM program='%s", program);
 		if (execute_program(program, udev->subsystem, result, sizeof(result), NULL) != 0) {
-			dbg(KEY_PROGRAM " is not matching");
-			if (rule->program_operation != KEY_OP_NOMATCH)
+			dbg("PROGRAM is not matching");
+			if (rule->program.operation != KEY_OP_NOMATCH)
 				goto exit;
 		} else {
-			dbg(KEY_PROGRAM " matches");
+			dbg("PROGRAM matches");
 			remove_trailing_char(result, '\n');
 			replace_untrusted_chars(result);
 			dbg("result is '%s'", result);
 			strlcpy(udev->program_result, result, sizeof(udev->program_result));
-			dbg(KEY_PROGRAM " returned successful");
-			if (rule->program_operation == KEY_OP_NOMATCH)
+			dbg("PROGRAM returned successful");
+			if (rule->program.operation == KEY_OP_NOMATCH)
 				goto exit;
 		}
-		dbg(KEY_PROGRAM " key is true");
+		dbg("PROGRAM key is true");
 	}
 
 	/* check for matching result of external program */
-	if (rule->result_operation != KEY_OP_UNSET) {
-		dbg("check for " KEY_RESULT " rule->result='%s', udev->program_result='%s'",
-		   rule->result, udev->program_result);
-		if (strcmp_pattern(rule->result, udev->program_result) != 0) {
-			dbg(KEY_RESULT " is not matching");
-			if (rule->result_operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg(KEY_RESULT " matches");
-			if (rule->result_operation == KEY_OP_NOMATCH)
-				goto exit;
-		}
-		dbg(KEY_RESULT " key is true");
-	}
+	if (match_key("RESULT", rule, &rule->result, udev->program_result))
+		goto exit;
 
 	/* rule matches */
 	return 0;
@@ -872,11 +853,12 @@ exit:
 	return -1;
 }
 
-int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_dev)
+int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev, struct sysfs_class_device *class_dev)
 {
 	struct sysfs_class_device *class_dev_parent;
 	struct sysfs_device *sysfs_device = NULL;
 	struct udev_rule *rule;
+	int name_set = 0;
 
 	dbg("class_dev->name='%s'", class_dev->name);
 
@@ -902,13 +884,13 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
 	dbg("udev->kernel_name='%s'", udev->kernel_name);
 
 	/* look for a matching rule to apply */
-	udev_rules_iter_init();
+	udev_rules_iter_init(rules);
 	while (1) {
-		rule = udev_rules_iter_next();
+		rule = udev_rules_iter_next(rules);
 		if (rule == NULL)
 			break;
 
-		if (udev->name_set && rule->name_operation != KEY_OP_UNSET) {
+		if (name_set && rule->name.operation != KEY_OP_UNSET) {
 			dbg("node name already set, rule ignored");
 			continue;
 		}
@@ -917,8 +899,7 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
 		if (match_rule(udev, rule, class_dev, sysfs_device) == 0) {
 			/* apply options */
 			if (rule->ignore_device) {
-				info("configured rule in '%s[%i]' applied, '%s' is ignored",
-				     rule->config_file, rule->config_line, udev->kernel_name);
+				info("rule applied, '%s' is ignored", udev->kernel_name);
 				udev->ignore_device = 1;
 				return 0;
 			}
@@ -937,31 +918,31 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
 				if (rule->mode_operation == KEY_OP_ASSIGN_FINAL)
 					udev->mode_final = 1;
 				udev->mode = rule->mode;
-				dbg("applied mode=%#o to '%s'", udev->mode, udev->kernel_name);
+				dbg("applied mode=%#o to '%s'", rule->mode, udev->kernel_name);
 			}
-			if (!udev->owner_final && rule->owner[0] != '\0') {
-				if (rule->owner_operation == KEY_OP_ASSIGN_FINAL)
+			if (!udev->owner_final && rule->owner.operation != KEY_OP_UNSET) {
+				if (rule->owner.operation == KEY_OP_ASSIGN_FINAL)
 					udev->owner_final = 1;
-				strlcpy(udev->owner, rule->owner, sizeof(udev->owner));
+				strlcpy(udev->owner, key_val(rule, &rule->owner), sizeof(udev->owner));
 				apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
 				dbg("applied owner='%s' to '%s'", udev->owner, udev->kernel_name);
 			}
-			if (!udev->group_final && rule->group[0] != '\0') {
-				if (rule->group_operation == KEY_OP_ASSIGN_FINAL)
+			if (!udev->group_final && rule->group.operation != KEY_OP_UNSET) {
+				if (rule->group.operation == KEY_OP_ASSIGN_FINAL)
 					udev->group_final = 1;
-				strlcpy(udev->group, rule->group, sizeof(udev->group));
-				apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
+				strlcpy(udev->group, key_val(rule, &rule->group), sizeof(udev->group));
+				apply_format(udev, key_val(rule, &rule->group), sizeof(udev->group), class_dev, sysfs_device);
 				dbg("applied group='%s' to '%s'", udev->group, udev->kernel_name);
 			}
 
 			/* collect symlinks */
-			if (!udev->symlink_final && rule->symlink_operation != KEY_OP_UNSET) {
+			if (!udev->symlink_final && rule->symlink.operation != KEY_OP_UNSET) {
 				char temp[PATH_SIZE];
 				char *pos, *next;
 
-				if (rule->symlink_operation == KEY_OP_ASSIGN_FINAL)
+				if (rule->symlink.operation == KEY_OP_ASSIGN_FINAL)
 					udev->symlink_final = 1;
-				if (rule->symlink_operation == KEY_OP_ASSIGN || rule->symlink_operation == KEY_OP_ASSIGN_FINAL) {
+				if (rule->symlink.operation == KEY_OP_ASSIGN || rule->symlink.operation == KEY_OP_ASSIGN_FINAL) {
 					struct name_entry *name_loop;
 					struct name_entry *temp_loop;
 
@@ -971,53 +952,48 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
 						free(name_loop);
 					}
 				}
-				if (rule->symlink[0] != '\0') {
-					info("configured rule in '%s[%i]' applied, added symlink '%s'",
-					     rule->config_file, rule->config_line, rule->symlink);
-					strlcpy(temp, rule->symlink, sizeof(temp));
-					apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
-
-					/* add multiple symlinks separated by spaces */
-					pos = temp;
-					next = strchr(temp, ' ');
-					while (next) {
-						next[0] = '\0';
-						info("add symlink '%s'", pos);
-						name_list_add(&udev->symlink_list, pos, 0);
-						pos = &next[1];
-						next = strchr(pos, ' ');
-					}
+				strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp));
+				apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
+				info("rule applied, added symlink '%s'", temp);
+
+				/* add multiple symlinks separated by spaces */
+				pos = temp;
+				while (isspace(pos[0]))
+					pos++;
+				next = strchr(pos, ' ');
+				while (next) {
+					next[0] = '\0';
+					info("add symlink '%s'", pos);
+					name_list_add(&udev->symlink_list, pos, 0);
+					while (isspace(next[1]))
+						next++;
+					pos = &next[1];
+					next = strchr(pos, ' ');
+				}
+				if (pos[0] != '\0') {
 					info("add symlink '%s'", pos);
 					name_list_add(&udev->symlink_list, pos, 0);
 				}
 			}
 
 			/* set name, later rules with name set will be ignored */
-			if (rule->name_operation != KEY_OP_UNSET) {
-				udev->name_set = 1;
-				if (rule->name[0] == '\0') {
-					info("configured rule in '%s[%i]' applied, node handling for '%s' supressed",
-					     rule->config_file, rule->config_line, udev->kernel_name);
-				} else {
-					strlcpy(udev->name, rule->name, sizeof(udev->name));
-					apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
-					strlcpy(udev->config_file, rule->config_file, sizeof(udev->config_file));
-					udev->config_line = rule->config_line;
-
-					info("configured rule in '%s:%i' applied, '%s' becomes '%s'",
-					     rule->config_file, rule->config_line, udev->kernel_name, rule->name);
-					if (udev->type != DEV_NET)
-						dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i",
-						    udev->name, udev->owner, udev->group, udev->mode, udev->partitions);
-				}
+			if (rule->name.operation != KEY_OP_UNSET) {
+				name_set = 1;
+				strlcpy(udev->name, key_val(rule, &rule->name), sizeof(udev->name));
+				apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+
+				info("rule applied, '%s' becomes '%s'", udev->kernel_name, udev->name);
+				if (udev->type != DEV_NET)
+					dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i",
+					    udev->name, udev->owner, udev->group, udev->mode, udev->partitions);
 			}
 
-			if (!udev->run_final && rule->run_operation != KEY_OP_UNSET) {
+			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
 				char program[PATH_SIZE];
 
-				if (rule->run_operation == KEY_OP_ASSIGN_FINAL)
+				if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
 					udev->run_final = 1;
-				if (rule->run_operation == KEY_OP_ASSIGN || rule->run_operation == KEY_OP_ASSIGN_FINAL) {
+				if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
 					struct name_entry *name_loop;
 					struct name_entry *temp_loop;
 
@@ -1027,12 +1003,10 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
 						free(name_loop);
 					}
 				}
-				if (rule->run[0] != '\0') {
-					strlcpy(program, rule->run, sizeof(program));
-					apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
-					dbg("add run '%s'", program);
-					name_list_add(&udev->run_list, program, 0);
-				}
+				strlcpy(program, key_val(rule, &rule->run), sizeof(program));
+				apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
+				dbg("add run '%s'", program);
+				name_list_add(&udev->run_list, program, 0);
 			}
 
 			if (rule->last_rule) {
@@ -1042,9 +1016,9 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
 		}
 	}
 
-	if (udev->name[0] == '\0') {
+	if (!name_set) {
 		strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
-		info("no rule found, use kernel name '%s'", udev->name);
+		info("no rule found, will use kernel name '%s'", udev->name);
 	}
 
 	if (udev->tmp_node[0] != '\0') {
@@ -1056,39 +1030,35 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
 	return 0;
 }
 
-int udev_rules_get_run(struct udevice *udev, struct sysfs_device *sysfs_device)
+int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
 	struct udev_rule *rule;
 
 	/* look for a matching rule to apply */
-	udev_rules_iter_init();
+	udev_rules_iter_init(rules);
 	while (1) {
-		rule = udev_rules_iter_next();
+		rule = udev_rules_iter_next(rules);
 		if (rule == NULL)
 			break;
 
 		dbg("process rule");
-		if (rule->run_operation == KEY_OP_UNSET)
-			continue;
-
-		if (rule->name_operation != KEY_OP_UNSET || rule->symlink_operation != KEY_OP_UNSET ||
-		    rule->mode != 0000 || rule->owner[0] != '\0' || rule->group[0] != '\0') {
+		if (rule->name.operation != KEY_OP_UNSET || rule->symlink.operation != KEY_OP_UNSET ||
+		    rule->mode_operation != KEY_OP_UNSET || rule->owner.operation != KEY_OP_UNSET || rule->group.operation != KEY_OP_UNSET) {
 			dbg("skip rule that names a device");
 			continue;
 		}
 
 		if (match_rule(udev, rule, NULL, sysfs_device) == 0) {
 			if (rule->ignore_device) {
-				info("configured rule in '%s[%i]' applied, '%s' is ignored",
-				     rule->config_file, rule->config_line, udev->kernel_name);
+				info("rule applied, '%s' is ignored", udev->kernel_name);
 				udev->ignore_device = 1;
 				return 0;
 			}
 
-			if (!udev->run_final && rule->run_operation != KEY_OP_UNSET) {
+			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
 				char program[PATH_SIZE];
 
-				if (rule->run_operation == KEY_OP_ASSIGN || rule->run_operation == KEY_OP_ASSIGN_FINAL) {
+				if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
 					struct name_entry *name_loop;
 					struct name_entry *temp_loop;
 
@@ -1098,13 +1068,11 @@ int udev_rules_get_run(struct udevice *udev, struct sysfs_device *sysfs_device)
 						free(name_loop);
 					}
 				}
-				if (rule->run[0] != '\0') {
-					strlcpy(program, rule->run, sizeof(program));
-					apply_format(udev, program, sizeof(program), NULL, sysfs_device);
-					dbg("add run '%s'", program);
-					name_list_add(&udev->run_list, program, 0);
-				}
-				if (rule->run_operation == KEY_OP_ASSIGN_FINAL)
+				strlcpy(program, key_val(rule, &rule->run), sizeof(program));
+				apply_format(udev, program, sizeof(program), NULL, sysfs_device);
+				dbg("add run '%s'", program);
+				name_list_add(&udev->run_list, program, 0);
+				if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
 					break;
 			}