X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-rules.c;h=4713352826d524daaff101ee72dcd31d85af19fa;hp=e1307252d8f85281cf5e90d6afb65ed921c68617;hb=e230e966f44c0ebb4954cbd30740384e14c1ca0f;hpb=d15fcce4b3e90a27eb911bd954efd07219c1c9db

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index e1307252d..471335282 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -31,7 +31,39 @@
 #define PREALLOC_TOKEN			2048
 #define PREALLOC_STRBUF			32 * 1024
 
+struct uid_gid {
+	unsigned int name_off;
+	union {
+		uid_t	uid;
+		gid_t	gid;
+	};
+};
+
 /* KEY=="", KEY!="", KEY+="", KEY="", KEY:="" */
+struct udev_rules {
+	struct udev *udev;
+	int resolve_names;
+
+	/* every key in the rules file becomes a token */
+	struct token *tokens;
+	unsigned int token_cur;
+	unsigned int token_max;
+
+	/* all key strings are copied to a single string buffer */
+	char *buf;
+	size_t buf_cur;
+	size_t buf_max;
+	unsigned int buf_count;
+
+	/* during rule parsing, we cache uid/gid lookup results */
+	struct uid_gid *uids;
+	unsigned int uids_cur;
+	unsigned int uids_max;
+	struct uid_gid *gids;
+	unsigned int gids_cur;
+	unsigned int gids_max;
+};
+
 enum operation_type {
 	OP_UNSET,
 
@@ -44,17 +76,6 @@ enum operation_type {
 	OP_ASSIGN_FINAL,
 };
 
-static const char *operation_str[] = {
-	[OP_UNSET] =		"UNSET",
-	[OP_MATCH] =		"match",
-	[OP_NOMATCH] =		"nomatch",
-	[OP_MATCH_MAX] =	"MATCH_MAX",
-
-	[OP_ADD] =		"add",
-	[OP_ASSIGN] =		"assign",
-	[OP_ASSIGN_FINAL] =	"assign-final",
-};
-
 enum string_glob_type {
 	GL_UNSET,
 	GL_PLAIN,			/* no special chars */
@@ -65,18 +86,6 @@ enum string_glob_type {
 	GL_FORMAT,
 };
 
-#ifdef DEBUG
-static const char *string_glob_str[] = {
-	[GL_UNSET] = 		"UNSET",
-	[GL_PLAIN] = 		"plain",
-	[GL_GLOB] = 		"glob",
-	[GL_SPLIT] = 		"split",
-	[GL_SPLIT_GLOB] = 	"split-glob",
-	[GL_SOMETHING] = 	"split-glob",
-	[GL_FORMAT] = 		"format",
-};
-#endif
-
 /* tokens of a rule are sorted/handled in this order */
 enum token_type {
 	TK_UNSET,
@@ -132,6 +141,70 @@ enum token_type {
 	TK_END,
 };
 
+/* we try to pack stuff in a way that we take only 12 bytes per token */
+struct token {
+	union {
+		unsigned char type;		/* same as in rule and key */
+		struct {
+			unsigned char type;
+			unsigned char flags;
+			unsigned short token_count;
+			unsigned int label_off;
+			unsigned short filename_off;
+			unsigned short filename_line;
+		} rule;
+		struct {
+			unsigned char type;
+			unsigned char flags;
+			unsigned char op;
+			unsigned char glob;
+			unsigned int value_off;
+			union {
+				unsigned int attr_off;
+				int ignore_error;
+				int i;
+				unsigned int rule_goto;
+				mode_t  mode;
+				uid_t uid;
+				gid_t gid;
+				int num_fake_part;
+				int devlink_prio;
+				int event_timeout;
+			};
+		} key;
+	};
+};
+
+#define MAX_TK		64
+struct rule_tmp {
+	struct udev_rules *rules;
+	struct token rule;
+	struct token token[MAX_TK];
+	unsigned int token_cur;
+};
+
+#ifdef DEBUG
+static const char *operation_str[] = {
+	[OP_UNSET] =		"UNSET",
+	[OP_MATCH] =		"match",
+	[OP_NOMATCH] =		"nomatch",
+	[OP_MATCH_MAX] =	"MATCH_MAX",
+
+	[OP_ADD] =		"add",
+	[OP_ASSIGN] =		"assign",
+	[OP_ASSIGN_FINAL] =	"assign-final",
+};
+
+static const char *string_glob_str[] = {
+	[GL_UNSET] = 		"UNSET",
+	[GL_PLAIN] = 		"plain",
+	[GL_GLOB] = 		"glob",
+	[GL_SPLIT] = 		"split",
+	[GL_SPLIT_GLOB] = 	"split-glob",
+	[GL_SOMETHING] = 	"split-glob",
+	[GL_FORMAT] = 		"format",
+};
+
 static const char *token_str[] = {
 	[TK_UNSET] =			"UNSET",
 	[TK_RULE] =			"RULE",
@@ -186,75 +259,127 @@ static const char *token_str[] = {
 	[TK_END] =			"END",
 };
 
-struct token {
-	enum token_type type;
-	union {
-		struct {
-			unsigned int next_rule;
-			unsigned int label_off;
-			unsigned int filename_off;
-		} rule;
-		struct {
-			unsigned short op;
-			unsigned short glob;
-			unsigned int value_off;
-			union {
-				unsigned int attr_off;
-				int ignore_error;
-				int i;
-				unsigned int rule_goto;
-				mode_t  mode;
-				uid_t uid;
-				gid_t gid;
-				int num_fake_part;
-				int devlink_prio;
-				int event_timeout;
-			};
-		} key;
-	};
-};
-
-#define MAX_TK		64
-struct rule_tmp {
-	struct udev_rules *rules;
-	struct token rule;
-	struct token token[MAX_TK];
-	unsigned int token_cur;
-};
-
-struct uid_gid {
-	unsigned int name_off;
-	union {
-		uid_t	uid;
-		gid_t	gid;
-	};
-};
+static void dump_token(struct udev_rules *rules, struct token *token)
+{
+	enum token_type type = token->type;
+	enum operation_type op = token->key.op;
+	enum string_glob_type glob = token->key.glob;
+	const char *value = &rules->buf[token->key.value_off];
+	const char *attr = &rules->buf[token->key.attr_off];
 
-struct udev_rules {
-	struct udev *udev;
-	int resolve_names;
+	switch (type) {
+	case TK_RULE:
+		{
+			const char *tks_ptr = (char *)rules->tokens;
+			const char *tk_ptr = (char *)token;
+			unsigned int off = tk_ptr - tks_ptr;
 
-	/* every key in the rules file becomes a token */
-	struct token *tokens;
-	unsigned int token_cur;
-	unsigned int token_max;
+			dbg(rules->udev, "* RULE %s:%u, off: %u(%u), token_count: %u(%u), label: '%s', flags: 0x%02x\n",
+			    &rules->buf[token->rule.filename_off], token->rule.filename_line,
+			    off / (unsigned int) sizeof(struct token), off,
+			    token->rule.token_count,
+			    token->rule.token_count * (unsigned int) sizeof(struct token),
+			    &rules->buf[token->rule.label_off],
+			    token->rule.flags);
+			break;
+		}
+	case TK_M_ACTION:
+	case TK_M_DEVPATH:
+	case TK_M_KERNEL:
+	case TK_M_SUBSYSTEM:
+	case TK_M_DRIVER:
+	case TK_M_WAITFOR:
+	case TK_M_DEVLINK:
+	case TK_M_NAME:
+	case TK_M_KERNELS:
+	case TK_M_SUBSYSTEMS:
+	case TK_M_DRIVERS:
+	case TK_M_PROGRAM:
+	case TK_M_IMPORT_FILE:
+	case TK_M_IMPORT_PROG:
+	case TK_M_IMPORT_PARENT:
+	case TK_M_RESULT:
+	case TK_A_NAME:
+	case TK_A_DEVLINK:
+	case TK_A_OWNER:
+	case TK_A_GROUP:
+	case TK_A_MODE:
+	case TK_A_RUN:
+		dbg(rules->udev, "%s %s '%s'(%s)\n",
+		    token_str[type], operation_str[op], value, string_glob_str[glob]);
+		break;
+	case TK_M_ATTR:
+	case TK_M_ATTRS:
+	case TK_M_ENV:
+	case TK_A_ATTR:
+	case TK_A_ENV:
+		dbg(rules->udev, "%s %s '%s' '%s'(%s)\n",
+		    token_str[type], operation_str[op], attr, value, string_glob_str[glob]);
+		break;
+	case TK_A_IGNORE_DEVICE:
+	case TK_A_STRING_ESCAPE_NONE:
+	case TK_A_STRING_ESCAPE_REPLACE:
+	case TK_A_LAST_RULE:
+	case TK_A_IGNORE_REMOVE:
+		dbg(rules->udev, "%s\n", token_str[type]);
+		break;
+	case TK_M_TEST:
+		dbg(rules->udev, "%s %s '%s'(%s) %#o\n",
+		    token_str[type], operation_str[op], value, string_glob_str[glob], token->key.mode);
+		break;
+	case TK_A_NUM_FAKE_PART:
+		dbg(rules->udev, "%s %u\n", token_str[type], token->key.num_fake_part);
+		break;
+	case TK_A_DEVLINK_PRIO:
+		dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.devlink_prio);
+		break;
+	case TK_A_OWNER_ID:
+		dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.uid);
+		break;
+	case TK_A_GROUP_ID:
+		dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.gid);
+		break;
+	case TK_A_MODE_ID:
+		dbg(rules->udev, "%s %s %#o\n", token_str[type], operation_str[op], token->key.mode);
+		break;
+	case TK_A_EVENT_TIMEOUT:
+		dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.event_timeout);
+		break;
+	case TK_A_GOTO:
+		dbg(rules->udev, "%s '%s' %u\n", token_str[type], value, token->key.rule_goto);
+		break;
+	case TK_END:
+		dbg(rules->udev, "* %s\n", token_str[type]);
+		break;
+	case TK_M_PARENTS_MIN:
+	case TK_M_PARENTS_MAX:
+	case TK_M_MAX:
+	case TK_UNSET:
+		dbg(rules->udev, "unknown type %u\n", type);
+		break;
+	}
+}
 
-	/* all key strings are copied to a single string buffer */
-	char *buf;
-	size_t buf_cur;
-	size_t buf_max;
-	unsigned int buf_count;
+static void dump_rules(struct udev_rules *rules)
+{
+	unsigned int i;
 
-	/* during rule parsing, we cache uid/gid lookup results */
-	struct uid_gid *uids;
-	unsigned int uids_cur;
-	unsigned int uids_max;
-	struct uid_gid *gids;
-	unsigned int gids_cur;
-	unsigned int gids_max;
-};
+	dbg(rules->udev, "dumping %u (%zu bytes) tokens, %u (%zu bytes) strings\n",
+	    rules->token_cur,
+	    rules->token_cur * sizeof(struct token),
+	    rules->buf_count,
+	    rules->buf_cur);
+	for(i = 0; i < rules->token_cur; i++)
+		dump_token(rules, &rules->tokens[i]);
+}
+#else
+static const char **operation_str;
+static const char **token_str;
+static inline void dump_token(struct udev_rules *rules, struct token *token) {}
+static inline void dump_rules(struct udev_rules *rules) {}
+#endif /* DEBUG */
 
-/* NOTE: we could lookup and return existing strings, or tails of strings */
+/* we could lookup and return existing strings, or tails of strings */
 static int add_string(struct udev_rules *rules, const char *str)
 {
 	size_t len = strlen(str)+1;
@@ -277,7 +402,7 @@ static int add_string(struct udev_rules *rules, const char *str)
 		buf = realloc(rules->buf, rules->buf_max + add);
 		if (buf == NULL)
 			return -1;
-		info(rules->udev, "extend buffer from %zu to %zu\n", rules->buf_max, rules->buf_max + add);
+		dbg(rules->udev, "extend buffer from %zu to %zu\n", rules->buf_max, rules->buf_max + add);
 		rules->buf = buf;
 		rules->buf_max += add;
 	}
@@ -304,7 +429,7 @@ static int add_token(struct udev_rules *rules, struct token *token)
 		tokens = realloc(rules->tokens, (rules->token_max + add ) * sizeof(struct token));
 		if (tokens == NULL)
 			return -1;
-		info(rules->udev, "extend tokens from %u to %u\n", rules->token_max, rules->token_max + add);
+		dbg(rules->udev, "extend tokens from %u to %u\n", rules->token_max, rules->token_max + add);
 		rules->tokens = tokens;
 		rules->token_max += add;
 	}
@@ -343,7 +468,7 @@ static uid_t add_uid(struct udev_rules *rules, const char *owner)
 		uids = realloc(rules->uids, (rules->uids_max + add ) * sizeof(struct uid_gid));
 		if (uids == NULL)
 			return uid;
-		info(rules->udev, "extend uids from %u to %u\n", rules->uids_max, rules->uids_max + add);
+		dbg(rules->udev, "extend uids from %u to %u\n", rules->uids_max, rules->uids_max + add);
 		rules->uids = uids;
 		rules->uids_max += add;
 	}
@@ -386,7 +511,7 @@ static gid_t add_gid(struct udev_rules *rules, const char *group)
 		gids = realloc(rules->gids, (rules->gids_max + add ) * sizeof(struct uid_gid));
 		if (gids == NULL)
 			return gid;
-		info(rules->udev, "extend gids from %u to %u\n", rules->gids_max, rules->gids_max + add);
+		dbg(rules->udev, "extend gids from %u to %u\n", rules->gids_max, rules->gids_max + add);
 		rules->gids = gids;
 		rules->gids_max += add;
 	}
@@ -455,7 +580,7 @@ static int import_property_from_string(struct udev_device *dev, char *line)
 		val++;
 	}
 
-	info(udev, "adding '%s'='%s'\n", key, val);
+	dbg(udev, "adding '%s'='%s'\n", key, val);
 
 	/* handle device, renamed by external tool, returning new path */
 	if (strcmp(key, "DEVPATH") == 0) {
@@ -731,9 +856,9 @@ static char *get_key_attribute(struct udev *udev, char *str)
 	return NULL;
 }
 
-static int rule_add_token(struct rule_tmp *rule_tmp, enum token_type type,
-			  enum operation_type op,
-			  const char *value, const void *data)
+static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
+			enum operation_type op,
+			const char *value, const void *data)
 {
 	struct token *token = &rule_tmp->token[rule_tmp->token_cur];
 	const char *attr = data;
@@ -844,7 +969,7 @@ static int rule_add_token(struct rule_tmp *rule_tmp, enum token_type type,
 		}
 	}
 
-	token->type = type;
+	token->key.type = type;
 	token->key.op = op;
 	token->key.glob = glob;
 	rule_tmp->token_cur++;
@@ -855,123 +980,6 @@ static int rule_add_token(struct rule_tmp *rule_tmp, enum token_type type,
 	return 0;
 }
 
-#ifdef DEBUG
-static void dump_token(struct udev_rules *rules, struct token *token)
-{
-	enum token_type type = token->type;
-	enum operation_type op = token->key.op;
-	enum string_glob_type glob = token->key.glob;
-	const char *value = &rules->buf[token->key.value_off];
-	const char *attr = &rules->buf[token->key.attr_off];
-
-	switch (type) {
-	case TK_RULE:
-		{
-			const char *tks_ptr = (char *)rules->tokens;
-			const char *tk_ptr = (char *)token;
-			unsigned int off = tk_ptr - tks_ptr;
-
-			dbg(rules->udev, "* RULE '%s', off: %u(%u), next: %u, label: '%s'\n",
-			    &rules->buf[token->rule.filename_off],
-			    off / (unsigned int) sizeof(struct token), off,
-			    token->rule.next_rule,
-			    &rules->buf[token->rule.label_off]);
-			break;
-		}
-	case TK_M_ACTION:
-	case TK_M_DEVPATH:
-	case TK_M_KERNEL:
-	case TK_M_SUBSYSTEM:
-	case TK_M_DRIVER:
-	case TK_M_WAITFOR:
-	case TK_M_DEVLINK:
-	case TK_M_NAME:
-	case TK_M_KERNELS:
-	case TK_M_SUBSYSTEMS:
-	case TK_M_DRIVERS:
-	case TK_M_PROGRAM:
-	case TK_M_IMPORT_FILE:
-	case TK_M_IMPORT_PROG:
-	case TK_M_IMPORT_PARENT:
-	case TK_M_RESULT:
-	case TK_A_NAME:
-	case TK_A_DEVLINK:
-	case TK_A_OWNER:
-	case TK_A_GROUP:
-	case TK_A_MODE:
-	case TK_A_RUN:
-		dbg(rules->udev, "%s %s '%s'(%s)\n",
-		    token_str[type], operation_str[op], value, string_glob_str[glob]);
-		break;
-	case TK_M_ATTR:
-	case TK_M_ATTRS:
-	case TK_M_ENV:
-	case TK_A_ATTR:
-	case TK_A_ENV:
-		dbg(rules->udev, "%s %s '%s' '%s'(%s)\n",
-		    token_str[type], operation_str[op], attr, value, string_glob_str[glob]);
-		break;
-	case TK_A_IGNORE_DEVICE:
-	case TK_A_STRING_ESCAPE_NONE:
-	case TK_A_STRING_ESCAPE_REPLACE:
-	case TK_A_LAST_RULE:
-	case TK_A_IGNORE_REMOVE:
-		dbg(rules->udev, "%s\n", token_str[type]);
-		break;
-	case TK_M_TEST:
-		dbg(rules->udev, "%s %s '%s'(%s) %#o\n",
-		    token_str[type], operation_str[op], value, string_glob_str[glob], token->key.mode);
-		break;
-	case TK_A_NUM_FAKE_PART:
-		dbg(rules->udev, "%s %u\n", token_str[type], token->key.num_fake_part);
-		break;
-	case TK_A_DEVLINK_PRIO:
-		dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.devlink_prio);
-		break;
-	case TK_A_OWNER_ID:
-		dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.uid);
-		break;
-	case TK_A_GROUP_ID:
-		dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.gid);
-		break;
-	case TK_A_MODE_ID:
-		dbg(rules->udev, "%s %s %#o\n", token_str[type], operation_str[op], token->key.mode);
-		break;
-	case TK_A_EVENT_TIMEOUT:
-		dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.event_timeout);
-		break;
-	case TK_A_GOTO:
-		dbg(rules->udev, "%s '%s' %u\n", token_str[type], value, token->key.rule_goto);
-		break;
-	case TK_END:
-		dbg(rules->udev, "* %s\n", token_str[type]);
-		break;
-	case TK_M_PARENTS_MIN:
-	case TK_M_PARENTS_MAX:
-	case TK_M_MAX:
-	case TK_UNSET:
-		dbg(rules->udev, "unknown type %u\n", type);
-		break;
-	}
-}
-
-static void dump_rules(struct udev_rules *rules)
-{
-	unsigned int i;
-
-	dbg(rules->udev, "dumping %u (%zu bytes) tokens, %u (%zu bytes) strings\n",
-	    rules->token_cur,
-	    rules->token_cur * sizeof(struct token),
-	    rules->buf_count,
-	    rules->buf_cur);
-	for(i = 0; i < rules->token_cur; i++)
-		dump_token(rules, &rules->tokens[i]);
-}
-#else
-static inline void dump_token(struct udev_rules *rules, struct token *token) {}
-static inline void dump_rules(struct udev_rules *rules) {}
-#endif /* DEBUG */
-
 static int sort_token(struct udev_rules *rules, struct rule_tmp *rule_tmp)
 {
 	unsigned int i;
@@ -1020,6 +1028,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 	rule_tmp.rules = rules;
 	rule_tmp.rule.type = TK_RULE;
 	rule_tmp.rule.rule.filename_off = filename_off;
+	rule_tmp.rule.rule.filename_line = lineno;
 
 	linepos = line;
 	while (1) {
@@ -1035,7 +1044,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 				err(rules->udev, "invalid ACTION operation\n");
 				goto invalid;
 			}
-			rule_add_token(&rule_tmp, TK_M_ACTION, op, value, NULL);
+			rule_add_key(&rule_tmp, TK_M_ACTION, op, value, NULL);
 			valid = 1;
 			continue;
 		}
@@ -1045,7 +1054,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 				err(rules->udev, "invalid DEVPATH operation\n");
 				goto invalid;
 			}
-			rule_add_token(&rule_tmp, TK_M_DEVPATH, op, value, NULL);
+			rule_add_key(&rule_tmp, TK_M_DEVPATH, op, value, NULL);
 			valid = 1;
 			continue;
 		}
@@ -1055,7 +1064,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 				err(rules->udev, "invalid KERNEL operation\n");
 				goto invalid;
 			}
-			rule_add_token(&rule_tmp, TK_M_KERNEL, op, value, NULL);
+			rule_add_key(&rule_tmp, TK_M_KERNEL, op, value, NULL);
 			valid = 1;
 			continue;
 		}
@@ -1072,9 +1081,9 @@ static int add_rule(struct udev_rules *rules, char *line,
 				if (strcmp(value, "bus") == 0 || strcmp(value, "class") == 0)
 					err(rules->udev, "'%s' must be specified as 'subsystem' \n"
 					    "please fix it in %s:%u", value, filename, lineno);
-				rule_add_token(&rule_tmp, TK_M_SUBSYSTEM, op, "subsystem|class|bus", NULL);
+				rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, "subsystem|class|bus", NULL);
 			} else
-				rule_add_token(&rule_tmp, TK_M_SUBSYSTEM, op, value, NULL);
+				rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, value, NULL);
 			valid = 1;
 			continue;
 		}
@@ -1084,7 +1093,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 				err(rules->udev, "invalid DRIVER operation\n");
 				goto invalid;
 			}
-			rule_add_token(&rule_tmp, TK_M_DRIVER, op, value, NULL);
+			rule_add_key(&rule_tmp, TK_M_DRIVER, op, value, NULL);
 			valid = 1;
 			continue;
 		}
@@ -1096,9 +1105,9 @@ static int add_rule(struct udev_rules *rules, char *line,
 				goto invalid;
 			}
 			if (op < OP_MATCH_MAX) {
-				rule_add_token(&rule_tmp, TK_M_ATTR, op, value, attr);
+				rule_add_key(&rule_tmp, TK_M_ATTR, op, value, attr);
 			} else {
-				rule_add_token(&rule_tmp, TK_A_ATTR, op, value, attr);
+				rule_add_key(&rule_tmp, TK_A_ATTR, op, value, attr);
 			}
 			valid = 1;
 			continue;
@@ -1110,7 +1119,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 				err(rules->udev, "invalid KERNELS operation\n");
 				goto invalid;
 			}
-			rule_add_token(&rule_tmp, TK_M_KERNELS, op, value, NULL);
+			rule_add_key(&rule_tmp, TK_M_KERNELS, op, value, NULL);
 			valid = 1;
 			continue;
 		}
@@ -1121,7 +1130,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 				err(rules->udev, "invalid SUBSYSTEMS operation\n");
 				goto invalid;
 			}
-			rule_add_token(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL);
+			rule_add_key(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL);
 			valid = 1;
 			continue;
 		}
@@ -1131,7 +1140,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 				err(rules->udev, "invalid DRIVERS operation\n");
 				goto invalid;
 			}
-			rule_add_token(&rule_tmp, TK_M_DRIVERS, op, value, NULL);
+			rule_add_key(&rule_tmp, TK_M_DRIVERS, op, value, NULL);
 			valid = 1;
 			continue;
 		}
@@ -1153,7 +1162,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			else if (strstr(attr, "../") != NULL)
 				err(rules->udev, "do not reference parent sysfs directories directly, "
 				    "it may break with a future kernel, please fix it in %s:%u", filename, lineno);
-			rule_add_token(&rule_tmp, TK_M_ATTRS, op, value, attr);
+			rule_add_key(&rule_tmp, TK_M_ATTRS, op, value, attr);
 			valid = 1;
 			continue;
 		}
@@ -1167,10 +1176,10 @@ static int add_rule(struct udev_rules *rules, char *line,
 			if (strncmp(attr, "PHYSDEV", 7) == 0)
 				physdev = 1;
 			if (op < OP_MATCH_MAX) {
-				if (rule_add_token(&rule_tmp, TK_M_ENV, op, value, attr) != 0)
+				if (rule_add_key(&rule_tmp, TK_M_ENV, op, value, attr) != 0)
 					goto invalid;
 			} else {
-				if (rule_add_token(&rule_tmp, TK_A_ENV, op, value, attr) != 0)
+				if (rule_add_key(&rule_tmp, TK_A_ENV, op, value, attr) != 0)
 					goto invalid;
 			}
 			valid = 1;
@@ -1178,7 +1187,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 		}
 
 		if (strcasecmp(key, "PROGRAM") == 0) {
-			rule_add_token(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
+			rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
 			valid = 1;
 			continue;
 		}
@@ -1188,7 +1197,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 				err(rules->udev, "invalid RESULT operation\n");
 				goto invalid;
 			}
-			rule_add_token(&rule_tmp, TK_M_RESULT, op, value, NULL);
+			rule_add_key(&rule_tmp, TK_M_RESULT, op, value, NULL);
 			valid = 1;
 			continue;
 		}
@@ -1197,15 +1206,15 @@ static int add_rule(struct udev_rules *rules, char *line,
 			attr = get_key_attribute(rules->udev, key + sizeof("IMPORT")-1);
 			if (attr != NULL && strstr(attr, "program")) {
 				dbg(rules->udev, "IMPORT will be executed\n");
-				rule_add_token(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL);
+				rule_add_key(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL);
 				valid = 1;
 			} else if (attr != NULL && strstr(attr, "file")) {
 				dbg(rules->udev, "IMPORT will be included as file\n");
-				rule_add_token(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
+				rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
 				valid = 1;
 			} else if (attr != NULL && strstr(attr, "parent")) {
 				dbg(rules->udev, "IMPORT will include the parent values\n");
-				rule_add_token(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL);
+				rule_add_key(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL);
 				valid = 1;
 			} else {
 				/* figure it out if it is executable */
@@ -1230,11 +1239,11 @@ static int add_rule(struct udev_rules *rules, char *line,
 				dbg(rules->udev, "IMPORT auto mode for '%s'\n", file);
 				if (!lstat(file, &statbuf) && (statbuf.st_mode & S_IXUSR)) {
 					dbg(rules->udev, "IMPORT will be executed (autotype)\n");
-					rule_add_token(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL);
+					rule_add_key(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL);
 					valid = 1;
 				} else {
 					dbg(rules->udev, "IMPORT will be included as file (autotype)\n");
-					rule_add_token(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
+					rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
 					valid = 1;
 				}
 			}
@@ -1251,9 +1260,9 @@ static int add_rule(struct udev_rules *rules, char *line,
 			attr = get_key_attribute(rules->udev, key + sizeof("TEST")-1);
 			if (attr != NULL) {
 				mode = strtol(attr, NULL, 8);
-				rule_add_token(&rule_tmp, TK_M_TEST, op, value, &mode);
+				rule_add_key(&rule_tmp, TK_M_TEST, op, value, &mode);
 			} else {
-				rule_add_token(&rule_tmp, TK_M_TEST, op, value, NULL);
+				rule_add_key(&rule_tmp, TK_M_TEST, op, value, NULL);
 			}
 			valid = 1;
 			continue;
@@ -1265,13 +1274,13 @@ static int add_rule(struct udev_rules *rules, char *line,
 			attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);
 			if (attr != NULL && strstr(attr, "ignore_error"))
 				flag = 1;
-			rule_add_token(&rule_tmp, TK_A_RUN, op, value, &flag);
+			rule_add_key(&rule_tmp, TK_A_RUN, op, value, &flag);
 			valid = 1;
 			continue;
 		}
 
 		if (strcasecmp(key, "WAIT_FOR") == 0 || strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
-			rule_add_token(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
+			rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
 			valid = 1;
 			continue;
 		}
@@ -1283,40 +1292,42 @@ static int add_rule(struct udev_rules *rules, char *line,
 		}
 
 		if (strcasecmp(key, "GOTO") == 0) {
-			rule_add_token(&rule_tmp, TK_A_GOTO, 0, value, NULL);
+			rule_add_key(&rule_tmp, TK_A_GOTO, 0, value, NULL);
 			valid = 1;
 			continue;
 		}
 
 		if (strncasecmp(key, "NAME", sizeof("NAME")-1) == 0) {
 			if (op < OP_MATCH_MAX) {
-				rule_add_token(&rule_tmp, TK_M_NAME, op, value, NULL);
+				rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL);
 			} else {
 				if (value[0] == '\0')
 					dbg(rules->udev, "name empty, node creation suppressed\n");
-				rule_add_token(&rule_tmp, TK_A_NAME, op, value, NULL);
+				rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL);
 				attr = get_key_attribute(rules->udev, key + sizeof("NAME")-1);
 				if (attr != NULL) {
 					if (strstr(attr, "all_partitions") != NULL) {
 						int num = DEFAULT_FAKE_PARTITIONS_COUNT;
 
 						dbg(rules->udev, "creation of partition nodes requested\n");
-						rule_add_token(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num);
+						rule_add_key(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num);
 					}
 					if (strstr(attr, "ignore_remove") != NULL) {
 						dbg(rules->udev, "remove event should be ignored\n");
-						rule_add_token(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL);
+						rule_add_key(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL);
 					}
 				}
 			}
+			rule_tmp.rule.rule.flags = 1;
 			continue;
 		}
 
 		if (strcasecmp(key, "SYMLINK") == 0) {
 			if (op < OP_MATCH_MAX)
-				rule_add_token(&rule_tmp, TK_M_DEVLINK, op, value, NULL);
+				rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL);
 			else
-				rule_add_token(&rule_tmp, TK_A_DEVLINK, op, value, NULL);
+				rule_add_key(&rule_tmp, TK_A_DEVLINK, op, value, NULL);
+			rule_tmp.rule.rule.flags = 1;
 			valid = 1;
 			continue;
 		}
@@ -1327,13 +1338,14 @@ static int add_rule(struct udev_rules *rules, char *line,
 
 			uid = strtoul(value, &endptr, 10);
 			if (endptr[0] == '\0') {
-				rule_add_token(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
+				rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
 			} else if (rules->resolve_names && strchr("$%", value[0]) == NULL) {
 				uid = add_uid(rules, value);
-				rule_add_token(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
+				rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
 			} else {
-				rule_add_token(&rule_tmp, TK_A_OWNER, op, value, NULL);
+				rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL);
 			}
+			rule_tmp.rule.rule.flags = 1;
 			valid = 1;
 			continue;
 		}
@@ -1344,13 +1356,14 @@ static int add_rule(struct udev_rules *rules, char *line,
 
 			gid = strtoul(value, &endptr, 10);
 			if (endptr[0] == '\0') {
-				rule_add_token(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
+				rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
 			} else if (rules->resolve_names && strchr("$%", value[0]) == NULL) {
 				gid = add_gid(rules, value);
-				rule_add_token(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
+				rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
 			} else {
-				rule_add_token(&rule_tmp, TK_A_GROUP, op, value, NULL);
+				rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL);
 			}
+			rule_tmp.rule.rule.flags = 1;
 			valid = 1;
 			continue;
 		}
@@ -1361,9 +1374,10 @@ static int add_rule(struct udev_rules *rules, char *line,
 
 			mode = strtol(value, &endptr, 8);
 			if (endptr[0] == '\0')
-				rule_add_token(&rule_tmp, TK_A_MODE_ID, op, NULL, &mode);
+				rule_add_key(&rule_tmp, TK_A_MODE_ID, op, NULL, &mode);
 			else
-				rule_add_token(&rule_tmp, TK_A_MODE, op, value, NULL);
+				rule_add_key(&rule_tmp, TK_A_MODE, op, value, NULL);
+			rule_tmp.rule.rule.flags = 1;
 			valid = 1;
 			continue;
 		}
@@ -1373,42 +1387,42 @@ static int add_rule(struct udev_rules *rules, char *line,
 
 			if (strstr(value, "last_rule") != NULL) {
 				dbg(rules->udev, "last rule to be applied\n");
-				rule_add_token(&rule_tmp, TK_A_LAST_RULE, 0, NULL, NULL);
+				rule_add_key(&rule_tmp, TK_A_LAST_RULE, 0, NULL, NULL);
 			}
 			if (strstr(value, "ignore_device") != NULL) {
 				dbg(rules->udev, "device should be ignored\n");
-				rule_add_token(&rule_tmp, TK_A_IGNORE_DEVICE, 0, NULL, NULL);
+				rule_add_key(&rule_tmp, TK_A_IGNORE_DEVICE, 0, NULL, NULL);
 			}
 			if (strstr(value, "ignore_remove") != NULL) {
 				dbg(rules->udev, "remove event should be ignored\n");
-				rule_add_token(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL);
+				rule_add_key(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL);
 			}
 			pos = strstr(value, "link_priority=");
 			if (pos != NULL) {
 				int prio = atoi(&pos[strlen("link_priority=")]);
 
-				rule_add_token(&rule_tmp, TK_A_DEVLINK_PRIO, 0, NULL, &prio);
+				rule_add_key(&rule_tmp, TK_A_DEVLINK_PRIO, 0, NULL, &prio);
 				dbg(rules->udev, "link priority=%i\n", prio);
 			}
 			pos = strstr(value, "event_timeout=");
 			if (pos != NULL) {
 				int tout = atoi(&pos[strlen("event_timeout=")]);
 
-				rule_add_token(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout);
+				rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout);
 				dbg(rules->udev, "event timout=%i\n", tout);
 			}
 			pos = strstr(value, "string_escape=");
 			if (pos != NULL) {
 				pos = &pos[strlen("string_escape=")];
 				if (strncmp(pos, "none", strlen("none")) == 0)
-					rule_add_token(&rule_tmp, TK_A_STRING_ESCAPE_NONE, 0, NULL, NULL);
+					rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_NONE, 0, NULL, NULL);
 				else if (strncmp(pos, "replace", strlen("replace")) == 0)
-					rule_add_token(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, 0, NULL, NULL);
+					rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, 0, NULL, NULL);
 			}
 			if (strstr(value, "all_partitions") != NULL) {
 				int num = DEFAULT_FAKE_PARTITIONS_COUNT;
 
-				rule_add_token(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num);
+				rule_add_key(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num);
 				dbg(rules->udev, "creation of partition nodes requested\n");
 			}
 			valid = 1;
@@ -1426,22 +1440,23 @@ static int add_rule(struct udev_rules *rules, char *line,
 		goto invalid;
 
 	/* add rule token */
+	rule_tmp.rule.rule.token_count = 1 + rule_tmp.token_cur;
 	if (add_token(rules, &rule_tmp.rule) != 0)
 		goto invalid;
 
 	/* add tokens to list, sorted by type */
 	if (sort_token(rules, &rule_tmp) != 0)
 		goto invalid;
+
 	return 0;
 invalid:
 	err(rules->udev, "invalid rule '%s:%u'\n", filename, lineno);
 	return -1;
 }
 
-static int parse_file(struct udev_rules *rules, const char *filename)
+static int parse_file(struct udev_rules *rules, const char *filename, unsigned short filename_off)
 {
 	FILE *f;
-	unsigned int filename_off;
 	unsigned int first_token;
 	char line[UTIL_LINE_SIZE];
 	int line_nr = 0;
@@ -1453,7 +1468,6 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 	if (f == NULL)
 		return -1;
 
-	filename_off = add_string(rules, filename);
 	first_token = rules->token_cur;
 
 	while(fgets(line, sizeof(line), f) != NULL) {
@@ -1514,7 +1528,6 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 
 static int add_matching_files(struct udev *udev, struct udev_list_node *file_list, const char *dirname, const char *suffix)
 {
-	struct dirent *ent;
 	DIR *dir;
 	char filename[UTIL_PATH_SIZE];
 
@@ -1526,26 +1539,28 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
 	}
 
 	while (1) {
-		ent = readdir(dir);
-		if (ent == NULL || ent->d_name[0] == '\0')
+		struct dirent *dent;
+
+		dent = readdir(dir);
+		if (dent == NULL || dent->d_name[0] == '\0')
 			break;
 
-		if ((ent->d_name[0] == '.') || (ent->d_name[0] == '#'))
+		if (dent->d_name[0] == '.')
 			continue;
 
 		/* look for file matching with specified suffix */
 		if (suffix != NULL) {
 			const char *ext;
 
-			ext = strrchr(ent->d_name, '.');
+			ext = strrchr(dent->d_name, '.');
 			if (ext == NULL)
 				continue;
 			if (strcmp(ext, suffix) != 0)
 				continue;
 		}
-		dbg(udev, "put file '%s/%s' into list\n", dirname, ent->d_name);
+		dbg(udev, "put file '%s/%s' into list\n", dirname, dent->d_name);
 
-		snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name);
+		snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->d_name);
 		filename[sizeof(filename)-1] = '\0';
 		udev_list_entry_add(udev, file_list, filename, NULL, 1, 1);
 	}
@@ -1558,12 +1573,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 {
 	struct udev_rules *rules;
 	struct stat statbuf;
-	char filename[PATH_MAX];
 	struct udev_list_node file_list;
 	struct udev_list_entry *file_loop, *file_tmp;
-	unsigned int prev_rule;
 	struct token end_token;
-	unsigned int i;
 
 	rules = malloc(sizeof(struct udev_rules));
 	if (rules == NULL)
@@ -1585,13 +1597,14 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 	/* offset 0 is always '\0' */
 	rules->buf[0] = '\0';
 	rules->buf_cur = 1;
-	info(udev, "prealloc %zu bytes tokens (%u * %zu bytes), %zu bytes buffer\n",
-	     rules->token_max * sizeof(struct token), rules->token_max, sizeof(struct token), rules->buf_max);
+	dbg(udev, "prealloc %zu bytes tokens (%u * %zu bytes), %zu bytes buffer\n",
+	    rules->token_max * sizeof(struct token), rules->token_max, sizeof(struct token), rules->buf_max);
 
 	if (udev_get_rules_path(udev) != NULL) {
 		/* custom rules location for testing */
 		add_matching_files(udev, &file_list, udev_get_rules_path(udev), ".rules");
 	} else {
+		char filename[PATH_MAX];
 		struct udev_list_node sort_list;
 		struct udev_list_entry *sort_loop, *sort_tmp;
 
@@ -1620,7 +1633,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 
 			if (sort_base == NULL)
 				continue;
-
+			/* sort entry into existing list */
 			udev_list_entry_foreach_safe(file_loop, file_tmp, udev_list_get_entry(&file_list)) {
 				const char *file_name = udev_list_entry_get_name(file_loop);
 				const char *file_base = strrchr(file_name, '/');
@@ -1630,42 +1643,54 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 				if (strcmp(file_base, sort_base) == 0) {
 					info(udev, "rule file basename '%s' already added, ignoring '%s'\n",
 					     file_name, sort_name);
-					udev_list_entry_remove(sort_loop);
+					udev_list_entry_delete(sort_loop);
 					sort_loop = NULL;
 					break;
 				}
-				if (strcmp(file_base, sort_base) > 0)
+				if (strcmp(file_base, sort_base) > 0) {
+					/* found later file, insert before */
+					udev_list_entry_remove(sort_loop);
+					udev_list_entry_insert_before(sort_loop, file_loop);
+					sort_loop = NULL;
 					break;
+				}
 			}
-			if (sort_loop != NULL)
-				udev_list_entry_move_before(sort_loop, file_loop);
+			/* current file already handled */
+			if (sort_loop == NULL)
+				continue;
+			/* no later file, append to end of list */
+			udev_list_entry_remove(sort_loop);
+			udev_list_entry_append(sort_loop, &file_list);
 		}
 	}
 
+	/* add all filenames to the string buffer */
+	udev_list_entry_foreach(file_loop, udev_list_get_entry(&file_list)) {
+		const char *filename = udev_list_entry_get_name(file_loop);
+		unsigned int filename_off;
+
+		filename_off = add_string(rules, filename);
+		/* the offset in the rule is limited to unsigned short */
+		if (filename_off < USHRT_MAX)
+			udev_list_entry_set_flag(file_loop, filename_off);
+	}
+
 	/* parse list of files */
 	udev_list_entry_foreach_safe(file_loop, file_tmp, udev_list_get_entry(&file_list)) {
-		const char *file_name = udev_list_entry_get_name(file_loop);
+		const char *filename = udev_list_entry_get_name(file_loop);
+		unsigned int filename_off = udev_list_entry_get_flag(file_loop);
 
-		if (stat(file_name, &statbuf) == 0 && statbuf.st_size > 0)
-			parse_file(rules, file_name);
+		if (stat(filename, &statbuf) == 0 && statbuf.st_size > 0)
+			parse_file(rules, filename, filename_off);
 		else
-			info(udev, "can not read '%s'\n", file_name);
-		udev_list_entry_remove(file_loop);
+			info(udev, "can not read '%s'\n", filename);
+		udev_list_entry_delete(file_loop);
 	}
 
 	memset(&end_token, 0x00, sizeof(struct token));
 	end_token.type = TK_END;
 	add_token(rules, &end_token);
 
-	/* link all TK_RULE tokens to be able to fast-forward to next TK_RULE */
-	prev_rule = 0;
-	for (i = 1; i < rules->token_cur; i++) {
-		if (rules->tokens[i].type == TK_RULE) {
-			rules->tokens[prev_rule].rule.next_rule = i;
-			prev_rule = i;
-		}
-	}
-
 	/* shrink allocated token and string buffer */
 	if (rules->token_cur < rules->token_max) {
 		struct token *tokens;
@@ -1685,7 +1710,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 			rules->buf_max = rules->buf_cur;
 		}
 	}
-	info(udev, "shrunk to %lu bytes tokens (%u * %zu bytes), %zu bytes buffer\n",
+	info(udev, "shrunk to %zu bytes tokens (%u * %zu bytes), %zu bytes buffer\n",
 	     rules->token_max * sizeof(struct token), rules->token_max, sizeof(struct token), rules->buf_max);
 
 	/* cleanup uid/gid cache */
@@ -1839,21 +1864,28 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 	struct token *cur;
 	struct token *rule;
 	enum escape_type esc = ESCAPE_UNSET;
+	int can_set_name;
 
 	if (rules->tokens == NULL)
 		return -1;
 
+	can_set_name = ((strcmp(udev_device_get_action(event->dev), "add") == 0 ||
+			 strcmp(udev_device_get_action(event->dev), "change") == 0) &&
+			(major(udev_device_get_devnum(event->dev)) > 0 ||
+			 strcmp(udev_device_get_subsystem(event->dev), "net") == 0));
+
 	/* loop through token list, match, run actions or forward to next rule */
 	cur = &rules->tokens[0];
 	rule = cur;
 	while (1) {
-		unsigned int idx;
-
 		dump_token(rules, cur);
 		switch (cur->type) {
 		case TK_RULE:
 			/* current rule */
 			rule = cur;
+			/* possibly skip rules which want to set NAME, SYMLINK, OWNER, GROUP, MODE */
+			if (!can_set_name && rule->rule.flags)
+				;//goto nomatch;
 			esc = ESCAPE_UNSET;
 			break;
 		case TK_M_ACTION:
@@ -2009,11 +2041,11 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				attr_subst_subdir(filename, sizeof(filename));
 
 				match = (stat(filename, &statbuf) == 0);
-				info(event->udev, "'%s' %s", filename, match ? "exists\n" : "does not exist\n");
+				dbg(event->udev, "'%s' %s", filename, match ? "exists\n" : "does not exist\n");
 				if (match && cur->key.mode > 0) {
 					match = ((statbuf.st_mode & cur->key.mode) > 0);
-					info(event->udev, "'%s' has mode=%#o and %s %#o\n", filename, statbuf.st_mode,
-					     match ? "matches" : "does not match", cur->key.mode);
+					dbg(event->udev, "'%s' has mode=%#o and %s %#o\n", filename, statbuf.st_mode,
+					    match ? "matches" : "does not match", cur->key.mode);
 				}
 				if (match && cur->key.op == OP_NOMATCH)
 					goto nomatch;
@@ -2032,6 +2064,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				util_strlcpy(program, &rules->buf[cur->key.value_off], sizeof(program));
 				udev_event_apply_format(event, program, sizeof(program));
 				envp = udev_device_get_properties_envp(event->dev);
+				info(event->udev, "PROGRAM '%s' %s:%u\n",
+				     program,
+				     &rules->buf[rule->rule.filename_off],
+				     rule->rule.filename_line);
 				if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL) != 0) {
 					if (cur->key.op != OP_NOMATCH)
 						goto nomatch;
@@ -2040,7 +2076,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
 					util_remove_trailing_chars(result, '\n');
 					if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) {
-						count = util_replace_chars(result, ALLOWED_CHARS_INPUT);
+						count = udev_util_replace_chars(result, UDEV_ALLOWED_CHARS_INPUT);
 						if (count > 0)
 							info(event->udev, "%i character(s) replaced\n" , count);
 					}
@@ -2068,6 +2104,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
 				util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import));
 				udev_event_apply_format(event, import, sizeof(import));
+				info(event->udev, "IMPORT '%s' %s:%u\n",
+				     import,
+				     &rules->buf[rule->rule.filename_off],
+				     rule->rule.filename_line);
 				if (import_program_into_properties(event->dev, import) != 0)
 					if (cur->key.op != OP_NOMATCH)
 						goto nomatch;
@@ -2120,6 +2160,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				util_strlcpy(owner,  &rules->buf[cur->key.value_off], sizeof(owner));
 				udev_event_apply_format(event, owner, sizeof(owner));
 				event->uid = util_lookup_user(event->udev, owner);
+				info(event->udev, "OWNER %u %s:%u\n",
+				     event->uid,
+				     &rules->buf[rule->rule.filename_off],
+				     rule->rule.filename_line);
 				break;
 			}
 		case TK_A_GROUP:
@@ -2133,6 +2177,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				util_strlcpy(group, &rules->buf[cur->key.value_off], sizeof(group));
 				udev_event_apply_format(event, group, sizeof(group));
 				event->gid = util_lookup_group(event->udev, group);
+				info(event->udev, "GROUP %u %s:%u\n",
+				     event->gid,
+				     &rules->buf[rule->rule.filename_off],
+				     rule->rule.filename_line);
 				break;
 			}
 		case TK_A_MODE:
@@ -2151,6 +2199,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 					err(event->udev, "invalide mode '%s' set default mode 0660\n", mode);
 					event->mode = 0660;
 				}
+				info(event->udev, "MODE %#o %s:%u\n",
+				     event->mode,
+				     &rules->buf[rule->rule.filename_off],
+				     rule->rule.filename_line);
 				break;
 			}
 		case TK_A_OWNER_ID:
@@ -2159,6 +2211,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			if (cur->key.op == OP_ASSIGN_FINAL)
 				event->owner_final = 1;
 			event->uid = cur->key.uid;
+			info(event->udev, "OWNER %u %s:%u\n",
+			     event->uid,
+			     &rules->buf[rule->rule.filename_off],
+			     rule->rule.filename_line);
 			break;
 		case TK_A_GROUP_ID:
 			if (event->group_final)
@@ -2166,6 +2222,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			if (cur->key.op == OP_ASSIGN_FINAL)
 				event->group_final = 1;
 			event->gid = cur->key.gid;
+			info(event->udev, "GROUP %u %s:%u\n",
+			     event->gid,
+			     &rules->buf[rule->rule.filename_off],
+			     rule->rule.filename_line);
 			break;
 		case TK_A_MODE_ID:
 			if (event->mode_final)
@@ -2173,6 +2233,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			if (cur->key.op == OP_ASSIGN_FINAL)
 				event->mode_final = 1;
 			event->mode = cur->key.mode;
+			info(event->udev, "MODE %#o %s:%u\n",
+			     event->mode,
+			     &rules->buf[rule->rule.filename_off],
+			     rule->rule.filename_line);
 			break;
 		case TK_A_ENV:
 			{
@@ -2211,11 +2275,15 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				util_strlcpy(name_str, name, sizeof(name_str));
 				udev_event_apply_format(event, name_str, sizeof(name_str));
 				if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) {
-					count = util_replace_chars(name_str, ALLOWED_CHARS_FILE);
+					count = udev_util_replace_chars(name_str, "/");
 					if (count > 0)
 						info(event->udev, "%i character(s) replaced\n", count);
 					free(event->name);
 					event->name = strdup(name_str);
+					info(event->udev, "NAME '%s' %s:%u\n",
+					     event->name,
+					     &rules->buf[rule->rule.filename_off],
+					     rule->rule.filename_line);
 				}
 				break;
 			}
@@ -2239,9 +2307,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				util_strlcpy(temp, &rules->buf[cur->key.value_off], sizeof(temp));
 				udev_event_apply_format(event, temp, sizeof(temp));
 				if (esc == ESCAPE_UNSET)
-					count = util_replace_chars(temp, ALLOWED_CHARS_FILE " ");
+					count = udev_util_replace_chars(temp, "/ ");
 				else if (esc == ESCAPE_REPLACE)
-					count = util_replace_chars(temp, ALLOWED_CHARS_FILE);
+					count = udev_util_replace_chars(temp, "/");
 				if (count > 0)
 					info(event->udev, "%i character(s) replaced\n" , count);
 				dbg(event->udev, "rule applied, added symlink(s) '%s'\n", temp);
@@ -2251,7 +2319,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				next = strchr(pos, ' ');
 				while (next) {
 					next[0] = '\0';
-					info(event->udev, "add symlink '%s'\n", pos);
+					info(event->udev, "LINK '%s' %s:%u\n",
+					     pos,
+					     &rules->buf[rule->rule.filename_off],
+					     rule->rule.filename_line);
 					util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename));
 					util_strlcat(filename, "/", sizeof(filename));
 					util_strlcat(filename, pos, sizeof(filename));
@@ -2262,7 +2333,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 					next = strchr(pos, ' ');
 				}
 				if (pos[0] != '\0') {
-					info(event->udev, "add symlink '%s'\n", pos);
+					info(event->udev, "LINK '%s' %s:%u\n",
+					     pos,
+					     &rules->buf[rule->rule.filename_off],
+					     rule->rule.filename_line);
 					util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename));
 					util_strlcat(filename, "/", sizeof(filename));
 					util_strlcat(filename, pos, sizeof(filename));
@@ -2294,7 +2368,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
 				util_strlcpy(value, &rules->buf[cur->key.value_off], sizeof(value));
 				udev_event_apply_format(event, value, sizeof(value));
-				info(event->udev, "writing '%s' to sysfs file '%s'\n", value, attr);
+				info(event->udev, "ATTR '%s' writing '%s' %s:%u\n", attr, value,
+				     &rules->buf[rule->rule.filename_off],
+				     rule->rule.filename_line);
 				f = fopen(attr, "w");
 				if (f != NULL) {
 					if (!event->test)
@@ -2312,6 +2388,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
 				if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
 					udev_list_cleanup_entries(event->udev, &event->run_list);
+				info(event->udev, "RUN '%s' %s:%u\n",
+				     &rules->buf[cur->key.value_off],
+				     &rules->buf[rule->rule.filename_off],
+				     rule->rule.filename_line);
 				list_entry = udev_list_entry_add(event->udev, &event->run_list,
 								 &rules->buf[cur->key.value_off], NULL, 1, 0);
 				if (cur->key.ignore_error)
@@ -2337,10 +2417,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 		continue;
 	nomatch:
 		/* fast-forward to next rule */
-		idx = rule->rule.next_rule;
-		if (idx == 0)
-			return 0;
-		dbg(rules->udev, "forward to rule: %u\n", idx);
-		cur = &rules->tokens[idx];
+		cur = rule + rule->rule.token_count;
+		dbg(rules->udev, "forward to rule: %u\n",
+		                 (unsigned int) (cur - rules->tokens));
 	}
 }