X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-rules.c;h=59fdb71853efa25a539612775bfc490f39348df4;hb=75cb1ac51ea0176926c749bd0f22c19ce8b20e5f;hp=a4a86b664a6c770c9c33bf3c3cb4ad7b4533c9b4;hpb=1f084fe5811ce251d516a8022f8c7c27d0ef1f53;p=elogind.git

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index a4a86b664..59fdb7185 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -125,6 +125,7 @@ enum token_type {
 	TK_M_DEVLINK,			/* val */
 	TK_M_NAME,			/* val */
 	TK_M_ENV,			/* val, attr */
+	TK_M_TAG,			/* val */
 	TK_M_SUBSYSTEM,			/* val */
 	TK_M_DRIVER,			/* val */
 	TK_M_WAITFOR,			/* val */
@@ -149,7 +150,6 @@ enum token_type {
 	TK_A_STRING_ESCAPE_NONE,
 	TK_A_STRING_ESCAPE_REPLACE,
 	TK_A_INOTIFY_WATCH,		/* int */
-	TK_A_NUM_FAKE_PART,		/* int */
 	TK_A_DEVLINK_PRIO,		/* int */
 	TK_A_OWNER,			/* val */
 	TK_A_GROUP,			/* val */
@@ -158,10 +158,10 @@ enum token_type {
 	TK_A_GROUP_ID,			/* gid_t */
 	TK_A_MODE_ID,			/* mode_t */
 	TK_A_ENV,			/* val, attr */
+	TK_A_TAG,			/* val */
 	TK_A_NAME,			/* val */
 	TK_A_DEVLINK,			/* val */
 	TK_A_EVENT_TIMEOUT,		/* int */
-	TK_A_IGNORE_REMOVE,
 	TK_A_ATTR,			/* val, attr */
 	TK_A_RUN,			/* val, bool */
 	TK_A_GOTO,			/* size_t */
@@ -255,6 +255,7 @@ static const char *token_str(enum token_type type)
 		[TK_M_DEVLINK] =		"M DEVLINK",
 		[TK_M_NAME] =			"M NAME",
 		[TK_M_ENV] =			"M ENV",
+		[TK_M_TAG] =			"M TAG",
 		[TK_M_SUBSYSTEM] =		"M SUBSYSTEM",
 		[TK_M_DRIVER] =			"M DRIVER",
 		[TK_M_WAITFOR] =		"M WAITFOR",
@@ -279,7 +280,6 @@ static const char *token_str(enum token_type type)
 		[TK_A_STRING_ESCAPE_NONE] =	"A STRING_ESCAPE_NONE",
 		[TK_A_STRING_ESCAPE_REPLACE] =	"A STRING_ESCAPE_REPLACE",
 		[TK_A_INOTIFY_WATCH] = 		"A INOTIFY_WATCH",
-		[TK_A_NUM_FAKE_PART] =		"A NUM_FAKE_PART",
 		[TK_A_DEVLINK_PRIO] =		"A DEVLINK_PRIO",
 		[TK_A_OWNER] =			"A OWNER",
 		[TK_A_GROUP] =			"A GROUP",
@@ -288,10 +288,10 @@ static const char *token_str(enum token_type type)
 		[TK_A_GROUP_ID] =		"A GROUP_ID",
 		[TK_A_MODE_ID] =		"A MODE_ID",
 		[TK_A_ENV] =			"A ENV",
+		[TK_A_TAG] =			"A ENV",
 		[TK_A_NAME] =			"A NAME",
 		[TK_A_DEVLINK] =		"A DEVLINK",
 		[TK_A_EVENT_TIMEOUT] =		"A EVENT_TIMEOUT",
-		[TK_A_IGNORE_REMOVE] =		"A IGNORE_REMOVE",
 		[TK_A_ATTR] =			"A ATTR",
 		[TK_A_RUN] =			"A RUN",
 		[TK_A_GOTO] =			"A GOTO",
@@ -358,9 +358,12 @@ static void dump_token(struct udev_rules *rules, struct token *token)
 		dbg(rules->udev, "%s %s '%s' '%s'(%s)\n",
 		    token_str(type), operation_str(op), attr, value, string_glob_str(glob));
 		break;
+	case TK_M_TAG:
+	case TK_A_TAG:
+		dbg(rules->udev, "%s %s '%s'\n", token_str(type), operation_str(op), value);
+		break;
 	case TK_A_STRING_ESCAPE_NONE:
 	case TK_A_STRING_ESCAPE_REPLACE:
-	case TK_A_IGNORE_REMOVE:
 		dbg(rules->udev, "%s\n", token_str(type));
 		break;
 	case TK_M_TEST:
@@ -1008,6 +1011,8 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
 	case TK_A_MODE:
 	case TK_A_NAME:
 	case TK_A_GOTO:
+	case TK_M_TAG:
+	case TK_A_TAG:
 		token->key.value_off = add_string(rule_tmp->rules, value);
 		break;
 	case TK_M_ENV:
@@ -1030,14 +1035,12 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
 		break;
 	case TK_A_STRING_ESCAPE_NONE:
 	case TK_A_STRING_ESCAPE_REPLACE:
-	case TK_A_IGNORE_REMOVE:
 		break;
 	case TK_A_RUN:
 		token->key.value_off = add_string(rule_tmp->rules, value);
 		token->key.fail_on_error = *(int *)data;
 		break;
 	case TK_A_INOTIFY_WATCH:
-	case TK_A_NUM_FAKE_PART:
 	case TK_A_DEVLINK_PRIO:
 		token->key.devlink_prio = *(int *)data;
 		break;
@@ -1357,6 +1360,14 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
+		if (strcmp(key, "TAG") == 0) {
+			if (op < OP_MATCH_MAX)
+				rule_add_key(&rule_tmp, TK_M_TAG, op, value, NULL);
+			else
+				rule_add_key(&rule_tmp, TK_A_TAG, op, value, NULL);
+			continue;
+		}
+
 		if (strcmp(key, "PROGRAM") == 0) {
 			rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
 			continue;
@@ -1457,19 +1468,14 @@ static int add_rule(struct udev_rules *rules, char *line,
 			if (op < OP_MATCH_MAX) {
 				rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL);
 			} else {
+				if (strcmp(value, "%k") == 0) {
+					err(rules->udev, "NAME=\"%%k\" is ignored because it breaks kernel supplied names, "
+					    "please remove it from %s:%u\n", filename, lineno);
+					continue;
+				}
 				if (value[0] == '\0')
-					info(rules->udev, "name empty, node creation suppressed\n");
-				else if (strcmp(value, "%k") == 0)
-					err(rules->udev, "NAME=\"%%k\" is superfluous and breaks "
-					    "kernel supplied names, please remove it from %s:%u\n", filename, lineno);
+					continue;
 				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, "ignore_remove") != NULL) {
-						dbg(rules->udev, "remove event should be ignored\n");
-						rule_add_key(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL);
-					}
-				}
 			}
 			rule_tmp.rule.rule.flags = 1;
 			continue;
@@ -1540,10 +1546,6 @@ static int add_rule(struct udev_rules *rules, char *line,
 		if (strcmp(key, "OPTIONS") == 0) {
 			const char *pos;
 
-			if (strstr(value, "ignore_remove") != NULL) {
-				dbg(rules->udev, "remove event should be ignored\n");
-				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=")]);
@@ -2111,6 +2113,21 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 					goto nomatch;
 				break;
 			}
+		case TK_M_TAG:
+			{
+				struct udev_list_entry *list_entry;
+				bool match = false;
+
+				udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(event->dev)) {
+					if (strcmp(&rules->buf[cur->key.value_off], udev_list_entry_get_name(list_entry)) == 0) {
+						match = true;
+						break;
+					}
+				}
+				if (!match && (cur->key.op != OP_NOMATCH))
+					goto nomatch;
+				break;
+			}
 		case TK_M_SUBSYSTEM:
 			if (match_key(rules, cur, udev_device_get_subsystem(event->dev)) != 0)
 				goto nomatch;
@@ -2426,6 +2443,11 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				}
 				break;
 			}
+		case TK_A_TAG:
+			if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
+				udev_device_cleanup_tags_list(event->dev);
+			udev_device_add_tag(event->dev, &rules->buf[cur->key.value_off]);
+			break;
 		case TK_A_NAME:
 			{
 				const char *name  = &rules->buf[cur->key.value_off];
@@ -2501,9 +2523,6 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 		case TK_A_EVENT_TIMEOUT:
 			udev_device_set_event_timeout(event->dev, cur->key.event_timeout);
 			break;
-		case TK_A_IGNORE_REMOVE:
-			udev_device_set_ignore_remove(event->dev, 1);
-			break;
 		case TK_A_ATTR:
 			{
 				const char *key_name = &rules->buf[cur->key.attr_off];