X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-rules.c;h=5f6ed06c9c01e11b70088d7589f8385fdfafdf46;hp=da1d32203761e7054330bc93b9fb9be283f3ba43;hb=f7c5b04f69e004912327f082be8645b65bb1ff5d;hpb=065db052211d3bf08d9b0f698a79a8798faf11d2

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index da1d32203..5f6ed06c9 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2009 Kay Sievers <kay.sievers@vrfy.org>
  * Copyright (C) 2008 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -103,7 +103,13 @@ enum string_glob_type {
 	GL_SPLIT,			/* multi-value A|B */
 	GL_SPLIT_GLOB,			/* multi-value with glob A*|B* */
 	GL_SOMETHING,			/* commonly used "?*" */
-	GL_FORMAT,
+};
+
+enum string_subst_type {
+	SB_UNSET,
+	SB_NONE,
+	SB_FORMAT,
+	SB_SUBSYS,
 };
 
 /* tokens of a rule are sorted/handled in this order */
@@ -167,18 +173,19 @@ struct token {
 	union {
 		unsigned char type;		/* same as in rule and key */
 		struct {
-			unsigned char type;
-			unsigned char flags;
+			enum token_type type:8;
+			unsigned int flags:8;
 			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;
+			enum token_type type:8;
+			enum operation_type op:8;
+			enum string_glob_type glob:8;
+			enum string_subst_type subst:4;
+			enum string_subst_type attrsubst:4;
 			unsigned int value_off;
 			union {
 				unsigned int attr_off;
@@ -204,7 +211,7 @@ struct rule_tmp {
 	unsigned int token_cur;
 };
 
-#ifdef DEBUG
+#ifdef ENABLE_DEBUG
 static const char *operation_str(enum operation_type type)
 {
 	static const char *operation_strs[] = {
@@ -230,7 +237,6 @@ static const char *string_glob_str(enum string_glob_type type)
 		[GL_SPLIT] = 		"split",
 		[GL_SPLIT_GLOB] = 	"split-glob",
 		[GL_SOMETHING] = 	"split-glob",
-		[GL_FORMAT] = 		"format",
 	};
 
 	return string_glob_strs[type];
@@ -415,7 +421,7 @@ static inline const char *operation_str(enum operation_type type) { return NULL;
 static inline const char *token_str(enum token_type type) { return NULL; }
 static inline void dump_token(struct udev_rules *rules, struct token *token) {}
 static inline void dump_rules(struct udev_rules *rules) {}
-#endif /* DEBUG */
+#endif /* ENABLE_DEBUG */
 
 static int add_new_string(struct udev_rules *rules, const char *str, size_t bytes)
 {
@@ -712,8 +718,9 @@ static int import_property_from_string(struct udev_device *dev, char *line)
 		struct udev_list_entry *entry;
 
 		entry = udev_device_add_property(dev, key, val);
-		/* store in db */
-		udev_list_entry_set_flag(entry, 1);
+		/* store in db, skip private keys */
+		if (key[0] != '.')
+			udev_list_entry_set_flag(entry, 1);
 	}
 	return 0;
 }
@@ -779,8 +786,9 @@ static int import_parent_into_properties(struct udev_device *dev, const char *fi
 
 			dbg(udev, "import key '%s=%s'\n", key, val);
 			entry = udev_device_add_property(dev, key, val);
-			/* store in db */
-			udev_list_entry_set_flag(entry, 1);
+			/* store in db, skip private keys */
+			if (key[0] != '.')
+				udev_list_entry_set_flag(entry, 1);
 		}
 	}
 	return 0;
@@ -975,8 +983,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
 			const char *value, const void *data)
 {
 	struct token *token = &rule_tmp->token[rule_tmp->token_cur];
-	const char *attr = data;
-	enum string_glob_type glob;
+	const char *attr = NULL;
 
 	memset(token, 0x00, sizeof(struct token));
 
@@ -1010,6 +1017,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
 	case TK_M_ATTRS:
 	case TK_A_ATTR:
 	case TK_A_ENV:
+		attr = data;
 		token->key.value_off = add_string(rule_tmp->rules, value);
 		token->key.attr_off = add_string(rule_tmp->rules, attr);
 		break;
@@ -1055,36 +1063,51 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
 		return -1;
 	}
 
-	glob = GL_PLAIN;
-	if (value != NULL) {
-		if (type < TK_M_MAX) {
-			/* check if we need to split or call fnmatch() while matching rules */
-			int has_split;
-			int has_glob;
-
-			has_split = (strchr(value, '|') != NULL);
-			has_glob = (strchr(value, '*') != NULL || strchr(value, '?') != NULL ||
-				    strchr(value, '[') != NULL || strchr(value, ']') != NULL);
-			if (has_split && has_glob) {
-				glob = GL_SPLIT_GLOB;
-			} else if (has_split) {
-				glob = GL_SPLIT;
-			} else if (has_glob) {
-				if (strcmp(value, "?*") == 0)
-					glob = GL_SOMETHING;
-				else
-					glob = GL_GLOB;
-			}
+	if (value != NULL && type < TK_M_MAX) {
+		/* check if we need to split or call fnmatch() while matching rules */
+		enum string_glob_type glob;
+		int has_split;
+		int has_glob;
+
+		has_split = (strchr(value, '|') != NULL);
+		has_glob = (strchr(value, '*') != NULL || strchr(value, '?') != NULL || strchr(value, '[') != NULL);
+		if (has_split && has_glob) {
+			glob = GL_SPLIT_GLOB;
+		} else if (has_split) {
+			glob = GL_SPLIT;
+		} else if (has_glob) {
+			if (strcmp(value, "?*") == 0)
+				glob = GL_SOMETHING;
+			else
+				glob = GL_GLOB;
 		} else {
-			/* check if we need to substitute format strings for matching rules */
-			if (strchr(value, '%') != NULL || strchr(value, '$') != NULL)
-				glob = GL_FORMAT;
+			glob = GL_PLAIN;
 		}
+		token->key.glob = glob;
+	}
+
+	if (value != NULL && type > TK_M_MAX) {
+		/* check if assigned value has substitution chars */
+		if (value[0] == '[')
+			token->key.subst = SB_SUBSYS;
+		else if (strchr(value, '%') != NULL || strchr(value, '$') != NULL)
+			token->key.subst = SB_FORMAT;
+		else
+			token->key.subst = SB_NONE;
+	}
+
+	if (attr != NULL) {
+		/* check if property/attribut name has substitution chars */
+		if (attr[0] == '[')
+			token->key.attrsubst = SB_SUBSYS;
+		else if (strchr(attr, '%') != NULL || strchr(attr, '$') != NULL)
+			token->key.attrsubst = SB_FORMAT;
+		else
+			token->key.attrsubst = SB_NONE;
 	}
 
 	token->key.type = type;
 	token->key.op = op;
-	token->key.glob = glob;
 	rule_tmp->token_cur++;
 	if (rule_tmp->token_cur >= ARRAY_SIZE(rule_tmp->token)) {
 		err(rule_tmp->rules->udev, "temporary rule array too small\n");
@@ -1150,7 +1173,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 		if (get_key(rules->udev, &linepos, &key, &op, &value) != 0)
 			break;
 
-		if (strcasecmp(key, "ACTION") == 0) {
+		if (strcmp(key, "ACTION") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid ACTION operation\n");
 				goto invalid;
@@ -1159,7 +1182,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "DEVPATH") == 0) {
+		if (strcmp(key, "DEVPATH") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid DEVPATH operation\n");
 				goto invalid;
@@ -1168,7 +1191,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "KERNEL") == 0) {
+		if (strcmp(key, "KERNEL") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid KERNEL operation\n");
 				goto invalid;
@@ -1177,7 +1200,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "SUBSYSTEM") == 0) {
+		if (strcmp(key, "SUBSYSTEM") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid SUBSYSTEM operation\n");
 				goto invalid;
@@ -1195,7 +1218,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "DRIVER") == 0) {
+		if (strcmp(key, "DRIVER") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid DRIVER operation\n");
 				goto invalid;
@@ -1204,7 +1227,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strncasecmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
+		if (strncmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
 			attr = get_key_attribute(rules->udev, key + sizeof("ATTR")-1);
 			if (attr == NULL) {
 				err(rules->udev, "error parsing ATTR attribute\n");
@@ -1218,8 +1241,8 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "KERNELS") == 0 ||
-		    strcasecmp(key, "ID") == 0) {
+		if (strcmp(key, "KERNELS") == 0 ||
+		    strcmp(key, "ID") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid KERNELS operation\n");
 				goto invalid;
@@ -1228,8 +1251,8 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "SUBSYSTEMS") == 0 ||
-		    strcasecmp(key, "BUS") == 0) {
+		if (strcmp(key, "SUBSYSTEMS") == 0 ||
+		    strcmp(key, "BUS") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid SUBSYSTEMS operation\n");
 				goto invalid;
@@ -1238,7 +1261,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "DRIVERS") == 0) {
+		if (strcmp(key, "DRIVERS") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid DRIVERS operation\n");
 				goto invalid;
@@ -1247,8 +1270,8 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strncasecmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 ||
-		    strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
+		if (strncmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 ||
+		    strncmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid ATTRS operation\n");
 				goto invalid;
@@ -1268,7 +1291,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strncasecmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
+		if (strncmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
 			attr = get_key_attribute(rules->udev, key + sizeof("ENV")-1);
 			if (attr == NULL) {
 				err(rules->udev, "error parsing ENV attribute\n");
@@ -1284,12 +1307,12 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "PROGRAM") == 0) {
+		if (strcmp(key, "PROGRAM") == 0) {
 			rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
 			continue;
 		}
 
-		if (strcasecmp(key, "RESULT") == 0) {
+		if (strcmp(key, "RESULT") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid RESULT operation\n");
 				goto invalid;
@@ -1298,7 +1321,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strncasecmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
+		if (strncmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
 			attr = get_key_attribute(rules->udev, key + sizeof("IMPORT")-1);
 			if (attr != NULL && strstr(attr, "program")) {
 				dbg(rules->udev, "IMPORT will be executed\n");
@@ -1317,7 +1340,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 
 				/* allow programs in /lib/udev called without the path */
 				if (value[0] != '/')
-					util_strscpyl(file, sizeof(file), UDEV_PREFIX "/lib/udev/", value, NULL);
+					util_strscpyl(file, sizeof(file), LIBEXECDIR "/", value, NULL);
 				else
 					util_strscpy(file, sizeof(file), value);
 				pos = strchr(file, ' ');
@@ -1335,7 +1358,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+		if (strncmp(key, "TEST", sizeof("TEST")-1) == 0) {
 			mode_t mode = 0;
 
 			if (op > OP_MATCH_MAX) {
@@ -1352,32 +1375,32 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strncasecmp(key, "RUN", sizeof("RUN")-1) == 0) {
+		if (strncmp(key, "RUN", sizeof("RUN")-1) == 0) {
 			int flag = 0;
 
 			attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);
-			if (attr != NULL && strstr(attr, "ignore_error"))
+			if (attr != NULL && strstr(attr, "record_failed"))
 				flag = 1;
 			rule_add_key(&rule_tmp, TK_A_RUN, op, value, &flag);
 			continue;
 		}
 
-		if (strcasecmp(key, "WAIT_FOR") == 0 || strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
+		if (strcmp(key, "WAIT_FOR") == 0 || strcmp(key, "WAIT_FOR_SYSFS") == 0) {
 			rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
 			continue;
 		}
 
-		if (strcasecmp(key, "LABEL") == 0) {
+		if (strcmp(key, "LABEL") == 0) {
 			rule_tmp.rule.rule.label_off = add_string(rules, value);
 			continue;
 		}
 
-		if (strcasecmp(key, "GOTO") == 0) {
+		if (strcmp(key, "GOTO") == 0) {
 			rule_add_key(&rule_tmp, TK_A_GOTO, 0, value, NULL);
 			continue;
 		}
 
-		if (strncasecmp(key, "NAME", sizeof("NAME")-1) == 0) {
+		if (strncmp(key, "NAME", sizeof("NAME")-1) == 0) {
 			if (op < OP_MATCH_MAX) {
 				rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL);
 			} else {
@@ -1402,7 +1425,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "SYMLINK") == 0) {
+		if (strcmp(key, "SYMLINK") == 0) {
 			if (op < OP_MATCH_MAX)
 				rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL);
 			else
@@ -1411,7 +1434,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "OWNER") == 0) {
+		if (strcmp(key, "OWNER") == 0) {
 			uid_t uid;
 			char *endptr;
 
@@ -1428,7 +1451,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "GROUP") == 0) {
+		if (strcmp(key, "GROUP") == 0) {
 			gid_t gid;
 			char *endptr;
 
@@ -1445,7 +1468,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "MODE") == 0) {
+		if (strcmp(key, "MODE") == 0) {
 			mode_t mode;
 			char *endptr;
 
@@ -1458,7 +1481,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "OPTIONS") == 0) {
+		if (strcmp(key, "OPTIONS") == 0) {
 			const char *pos;
 
 			if (strstr(value, "last_rule") != NULL) {
@@ -1641,10 +1664,8 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
 			if (strcmp(ext, suffix) != 0)
 				continue;
 		}
-		dbg(udev, "put file '%s/%s' into list\n", dirname, dent->d_name);
-
-		snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->d_name);
-		filename[sizeof(filename)-1] = '\0';
+		util_strscpyl(filename, sizeof(filename), dirname, "/", dent->d_name, NULL);
+		dbg(udev, "put file '%s' into list\n", filename);
 		udev_list_entry_add(udev, file_list, filename, NULL, 1, 1);
 	}
 
@@ -1715,7 +1736,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 		add_matching_files(udev, &sort_list, filename, ".rules");
 
 		/* read default rules */
-		add_matching_files(udev, &sort_list, UDEV_PREFIX "/lib/udev/rules.d", ".rules");
+		add_matching_files(udev, &sort_list, LIBEXECDIR "/rules.d", ".rules");
 
 		/* sort all rules files by basename into list of files */
 		udev_list_entry_foreach_safe(sort_loop, sort_tmp, udev_list_get_entry(&sort_list)) {
@@ -1903,7 +1924,6 @@ static int match_key(struct udev_rules *rules, struct token *token, const char *
 	case GL_SOMETHING:
 		match = (val[0] != '\0');
 		break;
-	case GL_FORMAT:
 	case GL_UNSET:
 		return -1;
 	}
@@ -1922,35 +1942,51 @@ static int match_key(struct udev_rules *rules, struct token *token, const char *
 
 static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct udev_event *event, struct token *cur)
 {
-	const char *key_name = &rules->buf[cur->key.attr_off];
-	const char *key_value = &rules->buf[cur->key.value_off];
-	char value[UTIL_NAME_SIZE];
+	const char *name;
+	char nbuf[UTIL_NAME_SIZE];
+	const char *value;
+	char vbuf[UTIL_NAME_SIZE];
 	size_t len;
 
-	value[0] = '\0';
-	if (key_name[0] == '[') {
-		char attr[UTIL_PATH_SIZE];
-
-		util_strscpy(attr, sizeof(attr), key_name);
-		util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1);
-	}
-	if (value[0] == '\0') {
-		const char *val;
-
-		val = udev_device_get_sysattr_value(dev, key_name);
-		if (val == NULL)
+	name = &rules->buf[cur->key.attr_off];
+	switch (cur->key.attrsubst) {
+	case SB_FORMAT:
+		udev_event_apply_format(event, name, nbuf, sizeof(nbuf));
+		name = nbuf;
+		/* fall through */
+	case SB_NONE:
+		value = udev_device_get_sysattr_value(dev, name);
+		if (value == NULL)
+			return -1;
+		break;
+	case SB_SUBSYS:
+		if (util_resolve_subsys_kernel(event->udev, name, vbuf, sizeof(vbuf), 1) != 0)
 			return -1;
-		util_strscpy(value, sizeof(value), val);
+		value = vbuf;
+		break;
+	default:
+		return -1;
 	}
 
-	/* strip trailing whitespace of value, if not asked to match for it */
-	len = strlen(key_value);
-	if (len > 0 && !isspace(key_value[len-1])) {
-		len = strlen(value);
-		while (len > 0 && isspace(value[--len]))
-			value[len] = '\0';
-		dbg(rules->udev, "removed trailing whitespace from '%s'\n", value);
+	/* remove trailing whitespace, if not asked to match for it */
+	len = strlen(value);
+	if (len > 0 && isspace(value[len-1])) {
+		const char *key_value;
+		size_t klen;
+
+		key_value = &rules->buf[cur->key.value_off];
+		klen = strlen(key_value);
+		if (klen > 0 && !isspace(key_value[klen-1])) {
+			if (value != vbuf) {
+				util_strscpy(vbuf, sizeof(vbuf), value);
+				value = vbuf;
+			}
+			while (len > 0 && isspace(vbuf[--len]))
+				vbuf[len] = '\0';
+			dbg(rules->udev, "removed trailing whitespace from '%s'\n", value);
+		}
 	}
+
 	return match_key(rules, cur, value);
 }
 
@@ -2340,8 +2376,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
 					udev_event_apply_format(event, value, temp_value, sizeof(temp_value));
 					entry = udev_device_add_property(event->dev, name, temp_value);
-					/* store in db */
-					udev_list_entry_set_flag(entry, 1);
+					/* store in db, skip private keys */
+					if (name[0] != '.')
+						udev_list_entry_set_flag(entry, 1);
 				} else {
 					udev_device_add_property(event->dev, name, NULL);
 				}