X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=3afc31a0fad8b7cb35d4a11ea9dc74da61fc4f46;hp=c4c684d05927a8d4aa9e880a968bdb57f12705ca;hb=ae9d3bbd3dde5f6e7d2cf434a916c5f3d3bf68b0;hpb=79f651f4bd2fb395a705792eb8ce551a6021bcd6

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index c4c684d05..3afc31a0f 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -1,11 +1,6 @@
 /*
- * udev_rules_parse.c
- *
- * Userspace devfs
- *
  * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
- *
+ * Copyright (C) 2003-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -18,7 +13,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -31,35 +26,56 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "logging.h"
 #include "udev_rules.h"
 
-LIST_HEAD(udev_rule_list);
 
-static int add_config_dev(struct udev_rule *rule)
+void udev_rules_iter_init(struct udev_rules *rules)
+{
+	dbg("bufsize=%zi", rules->bufsize);
+	rules->current = 0;
+}
+
+struct udev_rule *udev_rules_iter_next(struct udev_rules *rules)
 {
-	struct udev_rule *tmp_rule;
-
-	tmp_rule = malloc(sizeof(*tmp_rule));
-	if (tmp_rule == NULL)
-		return -ENOMEM;
-	memcpy(tmp_rule, rule, sizeof(struct udev_rule));
-	list_add_tail(&tmp_rule->node, &udev_rule_list);
-
-	dbg("name='%s', symlink='%s', bus='%s', id='%s', "
-	    "sysfs_file[0]='%s', sysfs_value[0]='%s', "
-	    "kernel='%s', program='%s', result='%s', "
-	    "owner='%s', group='%s', mode=%#o, "
-	    "all_partions=%u, ignore_remove=%u, ignore_device=%u, last_rule=%u",
-	    rule->name, rule->symlink, rule->bus, rule->id,
-	    rule->sysfs_pair[0].name, rule->sysfs_pair[0].value,
-	    rule->kernel, rule->program, rule->result, rule->owner, rule->group, rule->mode,
-	    rule->partitions, rule->ignore_remove, rule->ignore_device, rule->last_rule);
+	static struct udev_rule *rule;
 
-	return 0;
+	if (!rules)
+		return NULL;
+
+	dbg("current=%zi", rules->current);
+	if (rules->current >= rules->bufsize) {
+		dbg("no more rules");
+		return NULL;
+	}
+
+	/* get next rule */
+	rule = (struct udev_rule *) (rules->buf + rules->current);
+	rules->current += sizeof(struct udev_rule) + rule->bufsize;
+
+	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)
@@ -68,7 +84,7 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 	char *temp;
 
 	linepos = *line;
-	if (!linepos)
+	if (linepos == NULL && linepos[0] == '\0')
 		return -1;
 
 	/* skip whitespace */
@@ -76,7 +92,10 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 		linepos++;
 
 	/* get the key */
+	if (linepos[0] == '\0')
+		return -1;
 	*key = linepos;
+
 	while (1) {
 		linepos++;
 		if (linepos[0] == '\0')
@@ -85,10 +104,9 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 			break;
 		if (linepos[0] == '=')
 			break;
-		if (linepos[0] == '+')
-			break;
-		if (linepos[0] == '!')
-			break;
+		if ((linepos[0] == '+') || (linepos[0] == '!') || (linepos[0] == ':'))
+			if (linepos[1] == '=')
+				break;
 	}
 
 	/* remember end of key */
@@ -97,6 +115,8 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 	/* skip whitespace after key */
 	while (isspace(linepos[0]))
 		linepos++;
+	if (linepos[0] == '\0')
+		return -1;
 
 	/* get operation type */
 	if (linepos[0] == '=' && linepos[1] == '=') {
@@ -115,6 +135,10 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 		*operation = KEY_OP_ASSIGN;
 		linepos++;
 		dbg("operator=assign");
+	} else if (linepos[0] == ':' && linepos[1] == '=') {
+		*operation = KEY_OP_ASSIGN_FINAL;
+		linepos += 2;
+		dbg("operator=assign_final");
 	} else
 		return -1;
 
@@ -125,6 +149,8 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 	/* skip whitespace after operator */
 	while (isspace(linepos[0]))
 		linepos++;
+	if (linepos[0] == '\0')
+		return -1;
 
 	/* get the value*/
 	if (linepos[0] == '"')
@@ -157,7 +183,7 @@ static char *get_key_attribute(char *str)
 		attr++;
 		pos = strchr(attr, '}');
 		if (pos == NULL) {
-			dbg("missing closing brace for format");
+			err("missing closing brace for format");
 			return NULL;
 		}
 		pos[0] = '\0';
@@ -168,279 +194,596 @@ static char *get_key_attribute(char *str)
 	return NULL;
 }
 
-static int rules_parse(struct udevice *udev, const char *filename)
+static int add_rule_key(struct udev_rule *rule, struct key *key,
+			enum key_operation operation, const char *value)
 {
-	char line[LINE_SIZE];
-	char *bufline;
-	int lineno;
-	char *linepos;
-	char *attr;
-	char *buf;
-	size_t bufsize;
-	size_t cur;
-	size_t count;
-	int program_given = 0;
-	int valid;
-	int retval = 0;
-	struct udev_rule rule;
+	size_t val_len = strnlen(value, PATH_SIZE);
 
-	if (file_map(filename, &buf, &bufsize) != 0) {
-		dbg("can't open '%s' as rules file", filename);
+	key->operation = operation;
+
+	key->val_off = rule->bufsize;
+	strlcpy(rule->buf + rule->bufsize, value, val_len+1);
+	rule->bufsize += val_len+1;
+
+	return 0;
+}
+
+static int add_rule_key_pair(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);
+
+	if (pairs->count >= PAIRS_MAX) {
+		err("skip, too many keys of the same type in a single rule");
 		return -1;
 	}
-	dbg("reading '%s' as rules file", filename);
 
-	/* loop through the whole file */
-	cur = 0;
-	lineno = 0;
-	while (cur < bufsize) {
-		unsigned int i, j;
+	add_rule_key(rule, &pairs->keys[pairs->count].key, operation, value);
 
-		count = buf_get_line(buf, bufsize, cur);
-		bufline = &buf[cur];
-		cur += count+1;
-		lineno++;
+	/* add the key-name of the pair */
+	pairs->keys[pairs->count].key_name_off = rule->bufsize;
+	strlcpy(rule->buf + rule->bufsize, key, key_len+1);
+	rule->bufsize += key_len+1;
 
-		if (count >= sizeof(line)) {
-			info("line too long, rule skipped %s, line %d", filename, lineno);
-			continue;
-		}
+	pairs->count++;
 
-		/* eat the whitespace */
-		while ((count > 0) && isspace(bufline[0])) {
-			bufline++;
-			count--;
-		}
-		if (count == 0)
-			continue;
+	return 0;
+}
 
-		/* see if this is a comment */
-		if (bufline[0] == COMMENT_CHARACTER)
-			continue;
+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];
+	struct udev_rule *rule;
+	size_t rule_size;
+	int valid;
+	char *linepos;
+	char *attr;
+	size_t padding;
+	int physdev = 0;
+	int retval;
 
-		/* skip backslash and newline from multi line rules */
-		for (i = j = 0; i < count; i++) {
-			if (bufline[i] == '\\' && bufline[i+1] == '\n')
-				continue;
+	memset(buf, 0x00, sizeof(buf));
+	rule = (struct udev_rule *) buf;
+	linepos = line;
+	valid = 0;
 
-			line[j++] = bufline[i];
-		}
-		line[j] = '\0';
-		dbg("read '%s'", line);
+	/* get all the keys */
+	while (1) {
+		char *key;
+		char *value;
+		enum key_operation operation = KEY_OP_UNSET;
 
-		/* get all known keys */
-		memset(&rule, 0x00, sizeof(struct udev_rule));
-		linepos = line;
-		valid = 0;
+		retval = get_key(&linepos, &key, &operation, &value);
+		if (retval)
+			break;
 
-		while (1) {
-			char *key;
-			char *value;
-			enum key_operation operation = KEY_OP_UNKNOWN;
+		if (strcasecmp(key, "ACTION") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid ACTION operation");
+				goto invalid;
+			}
+			add_rule_key(rule, &rule->action, operation, value);
+			valid = 1;
+			continue;
+		}
 
-			retval = get_key(&linepos, &key, &operation, &value);
-			if (retval)
-				break;
+		if (strcasecmp(key, "DEVPATH") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid DEVPATH operation");
+				goto invalid;
+			}
+			add_rule_key(rule, &rule->devpath, operation, value);
+			valid = 1;
+			continue;
+		}
 
-			if (strcasecmp(key, KEY_KERNEL) == 0) {
-				strlcpy(rule.kernel, value, sizeof(rule.kernel));
-				rule.kernel_operation = operation;
-				valid = 1;
-				continue;
+		if (strcasecmp(key, "KERNEL") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid KERNEL operation");
+				goto invalid;
 			}
+			add_rule_key(rule, &rule->kernel, operation, value);
+			valid = 1;
+			continue;
+		}
 
-			if (strcasecmp(key, KEY_SUBSYSTEM) == 0) {
-				strlcpy(rule.subsystem, value, sizeof(rule.subsystem));
-				rule.subsystem_operation = operation;
-				valid = 1;
-				continue;
+		if (strcasecmp(key, "SUBSYSTEM") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid SUBSYSTEM operation");
+				goto invalid;
 			}
+			/* bus, class, subsystem events should all be the same */
+			if (strcmp(value, "subsystem") == 0 ||
+			    strcmp(value, "bus") == 0 ||
+			    strcmp(value, "class") == 0) {
+				if (strcmp(value, "bus") == 0 || strcmp(value, "class") == 0)
+					err("'%s' must be specified as 'subsystem' "
+					    "please fix it in %s:%u", value, filename, lineno);
+				add_rule_key(rule, &rule->subsystem, operation, "subsystem|class|bus");
+			} else
+				add_rule_key(rule, &rule->subsystem, operation, value);
+			valid = 1;
+			continue;
+		}
 
-			if (strcasecmp(key, KEY_BUS) == 0) {
-				strlcpy(rule.bus, value, sizeof(rule.bus));
-				rule.bus_operation = operation;
-				valid = 1;
-				continue;
+		if (strcasecmp(key, "DRIVER") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid DRIVER operation");
+				goto invalid;
 			}
+			add_rule_key(rule, &rule->driver, operation, value);
+			valid = 1;
+			continue;
+		}
 
-			if (strcasecmp(key, KEY_ID) == 0) {
-				strlcpy(rule.id, value, sizeof(rule.id));
-				rule.id_operation = operation;
-				valid = 1;
-				continue;
+		if (strncasecmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
+			attr = get_key_attribute(key + sizeof("ATTR")-1);
+			if (attr == NULL) {
+				err("error parsing ATTR attribute");
+				goto invalid;
 			}
+			if (add_rule_key_pair(rule, &rule->attr, operation, attr, value) != 0)
+				goto invalid;
+			valid = 1;
+			continue;
+		}
 
-			if (strncasecmp(key, KEY_SYSFS, sizeof(KEY_SYSFS)-1) == 0) {
-				struct key_pair *pair;
+		if (strcasecmp(key, "KERNELS") == 0 ||
+		    strcasecmp(key, "ID") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid KERNELS operation");
+				goto invalid;
+			}
+			add_rule_key(rule, &rule->kernels, operation, value);
+			valid = 1;
+			continue;
+		}
 
-				if (rule.sysfs_pair_count >= KEY_SYSFS_PAIRS_MAX) {
-					dbg("skip rule, to many " KEY_SYSFS " keys in a single rule");
-					goto error;
-				}
-				pair = &rule.sysfs_pair[rule.sysfs_pair_count];
-				rule.sysfs_pair_count++;
+		if (strcasecmp(key, "SUBSYSTEMS") == 0 ||
+		    strcasecmp(key, "BUS") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid SUBSYSTEMS operation");
+				goto invalid;
+			}
+			add_rule_key(rule, &rule->subsystems, operation, value);
+			valid = 1;
+			continue;
+		}
 
-				attr = get_key_attribute(key + sizeof(KEY_SYSFS)-1);
-				if (attr == NULL) {
-					dbg("error parsing " KEY_SYSFS " attribute");
-					continue;
-				}
-				strlcpy(pair->name, attr, sizeof(pair->name));
-				strlcpy(pair->value, value, sizeof(pair->value));
-				pair->operation = operation;
-				valid = 1;
-				continue;
+		if (strcasecmp(key, "DRIVERS") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid DRIVERS operation");
+				goto invalid;
 			}
+			add_rule_key(rule, &rule->drivers, operation, value);
+			valid = 1;
+			continue;
+		}
 
-			if (strcasecmp(key, KEY_DRIVER) == 0) {
-				strlcpy(rule.driver, value, sizeof(rule.driver));
-				rule.driver_operation = operation;
-				valid = 1;
-				continue;
+		if (strncasecmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 ||
+		    strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid ATTRS operation");
+				goto invalid;
 			}
+			attr = get_key_attribute(key + sizeof("ATTRS")-1);
+			if (attr == NULL) {
+				err("error parsing ATTRS attribute");
+				goto invalid;
+			}
+			if (strncmp(attr, "device/", 7) == 0)
+				err("the 'device' link is deprecated and will be removed from a future kernel, "
+				    "please fix it in %s:%u", filename, lineno);
+			else if (strstr(attr, "../") != NULL)
+				err("do not reference parent sysfs directories directly, that may break with a future kernel, "
+				    "please fix it in %s:%u", filename, lineno);
+			if (add_rule_key_pair(rule, &rule->attrs, operation, attr, value) != 0)
+				goto invalid;
+			valid = 1;
+			continue;
+		}
 
-			if (strcasecmp(key, KEY_RESULT) == 0) {
-				strlcpy(rule.result, value, sizeof(rule.result));
-				rule.result_operation = operation;
-				valid = 1;
-				continue;
+		if (strncasecmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
+			attr = get_key_attribute(key + sizeof("ENV")-1);
+			if (attr == NULL) {
+				err("error parsing ENV attribute");
+				goto invalid;
 			}
+			if (strncmp(attr, "PHYSDEV", 7) == 0)
+				physdev = 1;
+			if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
+				goto invalid;
+			valid = 1;
+			continue;
+		}
 
-			if (strcasecmp(key, KEY_PROGRAM) == 0) {
-				strlcpy(rule.program, value, sizeof(rule.program));
-				rule.program_operation = operation;
-				program_given = 1;
-				valid = 1;
-				continue;
+		if (strcasecmp(key, "PROGRAM") == 0) {
+			add_rule_key(rule, &rule->program, operation, value);
+			valid = 1;
+			continue;
+		}
+
+		if (strcasecmp(key, "RESULT") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid RESULT operation");
+				goto invalid;
 			}
+			add_rule_key(rule, &rule->result, operation, value);
+			valid = 1;
+			continue;
+		}
 
-			if (strncasecmp(key, KEY_NAME, sizeof(KEY_NAME)-1) == 0) {
-				attr = get_key_attribute(key + sizeof(KEY_NAME)-1);
-				/* FIXME: remove old style options and make OPTIONS= mandatory */
-				if (attr != NULL) {
-					if (strstr(attr, OPTION_PARTITIONS) != NULL) {
-						dbg("creation of partition nodes requested");
-						rule.partitions = DEFAULT_PARTITIONS_COUNT;
-					}
-					if (strstr(attr, OPTION_IGNORE_REMOVE) != NULL) {
-						dbg("remove event should be ignored");
-						rule.ignore_remove = 1;
-					}
+		if (strncasecmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
+			attr = get_key_attribute(key + sizeof("IMPORT")-1);
+			if (attr != NULL && strstr(attr, "program")) {
+				dbg("IMPORT will be executed");
+				rule->import_type  = IMPORT_PROGRAM;
+			} else if (attr != NULL && strstr(attr, "file")) {
+				dbg("IMPORT will be included as file");
+				rule->import_type  = IMPORT_FILE;
+			} else if (attr != NULL && strstr(attr, "parent")) {
+				dbg("IMPORT will include the parent values");
+				rule->import_type = IMPORT_PARENT;
+			} else {
+				/* figure it out if it is executable */
+				char file[PATH_SIZE];
+				char *pos;
+				struct stat statbuf;
+
+				strlcpy(file, value, sizeof(file));
+				pos = strchr(file, ' ');
+				if (pos)
+					pos[0] = '\0';
+
+				/* allow programs in /lib/udev called without the path */
+				if (strchr(file, '/') == NULL) {
+					strlcpy(file, "/lib/udev/", sizeof(file));
+					strlcat(file, value, sizeof(file));
+					pos = strchr(file, ' ');
+					if (pos)
+						pos[0] = '\0';
 				}
-				if (value[0] != '\0')
-					strlcpy(rule.name, value, sizeof(rule.name));
-				else
-					rule.ignore_device = 1;
-				valid = 1;
-				continue;
-			}
 
-			if (strcasecmp(key, KEY_SYMLINK) == 0) {
-				strlcpy(rule.symlink, value, sizeof(rule.symlink));
-				valid = 1;
-				continue;
+				dbg("IMPORT auto mode for '%s'", file);
+				if (!lstat(file, &statbuf) && (statbuf.st_mode & S_IXUSR)) {
+					dbg("IMPORT is executable, will be executed (autotype)");
+					rule->import_type  = IMPORT_PROGRAM;
+				} else {
+					dbg("IMPORT is not executable, will be included as file (autotype)");
+					rule->import_type  = IMPORT_FILE;
+				}
 			}
+			add_rule_key(rule, &rule->import, operation, value);
+			valid = 1;
+			continue;
+		}
 
-			if (strcasecmp(key, KEY_OWNER) == 0) {
-				strlcpy(rule.owner, value, sizeof(rule.owner));
-				valid = 1;
-				continue;
-			}
+		if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+			attr = get_key_attribute(key + sizeof("TEST")-1);
+			if (attr != NULL)
+				rule->test_mode_mask = strtol(attr, NULL, 8);
+			add_rule_key(rule, &rule->test, operation, value);
+			valid = 1;
+			continue;
+		}
 
-			if (strcasecmp(key, KEY_GROUP) == 0) {
-				strlcpy(rule.group, value, sizeof(rule.group));
-				valid = 1;
-				continue;
+		if (strncasecmp(key, "RUN", sizeof("RUN")-1) == 0) {
+			attr = get_key_attribute(key + sizeof("RUN")-1);
+			if (attr != NULL) {
+				if (strstr(attr, "ignore_error"))
+					rule->run_ignore_error = 1;
 			}
+			add_rule_key(rule, &rule->run, operation, value);
+			valid = 1;
+			continue;
+		}
 
-			if (strcasecmp(key, KEY_MODE) == 0) {
-				rule.mode = strtol(value, NULL, 8);
-				valid = 1;
-				continue;
-			}
+		if (strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
+			add_rule_key(rule, &rule->wait_for_sysfs, operation, value);
+			valid = 1;
+			continue;
+		}
 
-			if (strcasecmp(key, KEY_OPTIONS) == 0) {
-				if (strstr(value, OPTION_LAST_RULE) != NULL) {
-					dbg("last rule to be applied");
-					rule.last_rule = 1;
-				}
-				if (strstr(value, OPTION_IGNORE_DEVICE) != NULL) {
-					dbg("device should be ignored");
-					rule.ignore_device = 1;
+		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 (strncasecmp(key, "NAME", sizeof("NAME")-1) == 0) {
+			attr = get_key_attribute(key + sizeof("NAME")-1);
+			if (attr != NULL) {
+				if (strstr(attr, "all_partitions") != NULL) {
+					dbg("creation of partition nodes requested");
+					rule->partitions = DEFAULT_PARTITIONS_COUNT;
 				}
-				if (strstr(value, OPTION_IGNORE_REMOVE) != NULL) {
+				if (strstr(attr, "ignore_remove") != NULL) {
 					dbg("remove event should be ignored");
-					rule.ignore_remove = 1;
+					rule->ignore_remove = 1;
 				}
-				if (strstr(value, OPTION_PARTITIONS) != NULL) {
-					dbg("creation of partition nodes requested");
-					rule.partitions = DEFAULT_PARTITIONS_COUNT;
+			}
+			if (value[0] == '\0')
+				dbg("name empty, node creation supressed");
+			add_rule_key(rule, &rule->name, operation, value);
+			continue;
+		}
+
+		if (strcasecmp(key, "SYMLINK") == 0) {
+			if (operation == KEY_OP_MATCH ||
+			    operation == KEY_OP_NOMATCH)
+				add_rule_key(rule, &rule->symlink_match, operation, value);
+			else
+				add_rule_key(rule, &rule->symlink, operation, value);
+			valid = 1;
+			continue;
+		}
+
+		if (strcasecmp(key, "OWNER") == 0) {
+			valid = 1;
+			if (rules->resolve_names && (!strchr(value, '$') && !strchr(value, '%'))) {
+				char *endptr;
+				strtoul(value, &endptr, 10);
+				if (endptr[0] != '\0') {
+					char owner[32];
+					uid_t uid = lookup_user(value);
+					dbg("replacing username='%s' by id=%i", value, uid);
+					sprintf(owner, "%u", (unsigned int) uid);
+					add_rule_key(rule, &rule->owner, operation, owner);
+					continue;
 				}
-				valid = 1;
-				continue;
 			}
 
-			dbg("unknown key '%s'", key);
-			goto error;
+			add_rule_key(rule, &rule->owner, operation, value);
+			continue;
 		}
 
-		/* skip line if not any valid key was found */
-		if (!valid)
-			goto error;
+		if (strcasecmp(key, "GROUP") == 0) {
+			valid = 1;
+			if (rules->resolve_names && (!strchr(value, '$') && !strchr(value, '%'))) {
+				char *endptr;
+				strtoul(value, &endptr, 10);
+				if (endptr[0] != '\0') {
+					char group[32];
+					gid_t gid = lookup_group(value);
+					dbg("replacing groupname='%s' by id=%i", value, gid);
+					sprintf(group, "%u", (unsigned int) gid);
+					add_rule_key(rule, &rule->group, operation, group);
+					continue;
+				}
+			}
+
+			add_rule_key(rule, &rule->group, operation, value);
+			continue;
+		}
 
-		/* simple plausibility checks for given keys */
-		if ((rule.sysfs_pair[0].name[0] == '\0') ^
-		    (rule.sysfs_pair[0].value[0] == '\0')) {
-			info("inconsistency in " KEY_SYSFS " key");
-			goto error;
+		if (strcasecmp(key, "MODE") == 0) {
+			rule->mode = strtol(value, NULL, 8);
+			rule->mode_operation = operation;
+			valid = 1;
+			continue;
 		}
 
-		if ((rule.result[0] != '\0') && (program_given == 0)) {
-			info(KEY_RESULT " is only useful when "
-			     KEY_PROGRAM " is called in any rule before");
-			goto error;
+		if (strcasecmp(key, "OPTIONS") == 0) {
+			const char *pos;
+
+			if (strstr(value, "last_rule") != NULL) {
+				dbg("last rule to be applied");
+				rule->last_rule = 1;
+			}
+			if (strstr(value, "ignore_device") != NULL) {
+				dbg("device should be ignored");
+				rule->ignore_device = 1;
+			}
+			if (strstr(value, "ignore_remove") != NULL) {
+				dbg("remove event should be ignored");
+				rule->ignore_remove = 1;
+			}
+			pos = strstr(value, "link_priority=");
+			if (pos != NULL) {
+				rule->link_priority = atoi(&pos[strlen("link_priority=")]);
+				dbg("link priority=%i", rule->link_priority);
+			}
+			pos = strstr(value, "string_escape=");
+			if (pos != NULL) {
+				pos = &pos[strlen("string_escape=")];
+				if (strncmp(pos, "none", strlen("none")) == 0)
+					rule->string_escape = ESCAPE_NONE;
+				else if (strncmp(pos, "replace", strlen("replace")) == 0)
+					rule->string_escape = ESCAPE_REPLACE;
+			}
+			if (strstr(value, "all_partitions") != NULL) {
+				dbg("creation of partition nodes requested");
+				rule->partitions = DEFAULT_PARTITIONS_COUNT;
+			}
+			valid = 1;
+			continue;
+		}
+
+		err("unknown key '%s' in %s:%u", key, filename, lineno);
+	}
+
+	if (physdev && rule->wait_for_sysfs.operation == KEY_OP_UNSET)
+		err("PHYSDEV* values are deprecated and will be removed from a future kernel, "
+		    "please fix it in %s:%u", filename, lineno);
+
+	/* skip line if not any valid key was found */
+	if (!valid)
+		goto invalid;
+
+	/* 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:
+	return 0;
+
+invalid:
+	err("invalid rule '%s:%u'", filename, lineno);
+	return -1;
+}
+
+static int parse_file(struct udev_rules *rules, const char *filename)
+{
+	char line[LINE_SIZE];
+	char *bufline;
+	unsigned int lineno;
+	char *buf;
+	size_t bufsize;
+	size_t cur;
+	size_t count;
+	int retval = 0;
+
+	if (file_map(filename, &buf, &bufsize) != 0) {
+		err("can't open '%s' as rules file: %s", filename, strerror(errno));
+		return -1;
+	}
+	info("reading '%s' as rules file", filename);
+
+	/* loop through the whole file */
+	cur = 0;
+	lineno = 0;
+	while (cur < bufsize) {
+		unsigned int i, j;
+
+		count = buf_get_line(buf, bufsize, cur);
+		bufline = &buf[cur];
+		cur += count+1;
+		lineno++;
+
+		/* eat the whitespace */
+		while ((count > 0) && isspace(bufline[0])) {
+			bufline++;
+			count--;
 		}
+		if (count == 0)
+			continue;
 
-		rule.config_line = lineno;
-		strlcpy(rule.config_file, filename, sizeof(rule.config_file));
-		retval = add_config_dev(&rule);
-		if (retval) {
-			dbg("add_config_dev returned with error %d", retval);
+		/* see if this is a comment */
+		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
-error:
-			info("parse error %s, line %d:%d, rule skipped",
-			     filename, lineno, (int) (linepos - line));
+
+		if (count >= sizeof(line)) {
+			err("line too long, rule skipped '%s:%u'", filename, lineno);
+			continue;
+		}
+
+		/* skip backslash and newline from multiline rules */
+		for (i = j = 0; i < count; i++) {
+			if (bufline[i] == '\\' && bufline[i+1] == '\n')
+				continue;
+
+			line[j++] = bufline[i];
 		}
+		line[j] = '\0';
+
+		dbg("read '%s'", line);
+		add_to_rules(rules, line, filename, lineno);
 	}
 
 	file_unmap(buf, bufsize);
 	return retval;
 }
 
-int udev_rules_init(void)
+int udev_rules_init(struct udev_rules *rules, int resolve_names)
 {
-	struct stat stats;
-	int retval;
+	struct stat statbuf;
+	char filename[PATH_MAX];
+	LIST_HEAD(name_list);
+	LIST_HEAD(dyn_list);
+	struct name_entry *name_loop, *name_tmp;
+	struct name_entry *dyn_loop, *dyn_tmp;
+	int retval = 0;
+
+	memset(rules, 0x00, sizeof(struct udev_rules));
+	rules->resolve_names = resolve_names;
 
-	if (stat(udev_rules_filename, &stats) != 0)
+	/* read main config from single file or all files in a directory */
+	if (stat(udev_rules_dir, &statbuf) != 0)
 		return -1;
+	if ((statbuf.st_mode & S_IFMT) != S_IFDIR) {
+		dbg("parse single rules file '%s'", udev_rules_dir);
+		name_list_add(&name_list, udev_rules_dir, 1);
+	} else {
+		dbg("parse rules directory '%s'", udev_rules_dir);
+		retval = add_matching_files(&name_list, udev_rules_dir, RULESFILE_SUFFIX);
+	}
 
-	if ((stats.st_mode & S_IFMT) != S_IFDIR)
-		retval = rules_parse(NULL, udev_rules_filename);
-	else
-		retval = call_foreach_file(rules_parse, NULL, udev_rules_filename, RULEFILE_SUFFIX);
+	/* read dynamic rules directory */
+	strlcpy(filename, udev_root, sizeof(filename));
+	strlcat(filename, "/"RULES_DYN_DIR, sizeof(filename));
+	if (stat(filename, &statbuf) != 0) {
+		create_path(filename);
+		mkdir(filename, 0755);
+	}
+	add_matching_files(&dyn_list, filename, RULESFILE_SUFFIX);
+
+	/* sort dynamic rules files by basename into list of files */
+	list_for_each_entry_safe(dyn_loop, dyn_tmp, &dyn_list, node) {
+		const char *dyn_base = strrchr(dyn_loop->name, '/');
+
+		if (dyn_base == NULL)
+			continue;
+
+		list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
+			const char *name_base = strrchr(name_loop->name, '/');
+
+			if (name_base == NULL)
+				continue;
+
+			if (strcmp(name_base, dyn_base) > 0)
+				break;
+		}
+		list_move_tail(&dyn_loop->node, &name_loop->node);
+	}
+
+	/* parse list of files */
+	list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
+		if (stat(name_loop->name, &statbuf) == 0) {
+			if (statbuf.st_size)
+				parse_file(rules, name_loop->name);
+			else
+				dbg("empty rules file '%s'", name_loop->name);
+		} else
+			err("could not read '%s': %s", name_loop->name, strerror(errno));
+		list_del(&name_loop->node);
+		free(name_loop);
+	}
 
 	return retval;
 }
 
-void udev_rules_close(void)
+void udev_rules_cleanup(struct udev_rules *rules)
 {
-	struct udev_rule *rule;
-	struct udev_rule *temp_rule;
-
-	list_for_each_entry_safe(rule, temp_rule, &udev_rule_list, node) {
-		list_del(&rule->node);
-		free(rule);
+	if (rules->buf) {
+		free(rules->buf);
+		rules->buf = NULL;
 	}
 }