X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.c;h=49306295ff8ad85292c3f4031b9f43a8a2081a4c;hp=ee4632513acd317a6f1d3e357005311d8864f2bf;hb=95776dc6ec174f47fa4dd4d8abf5d457223e5dd4;hpb=3d6d12c6b17e6ea84112bd3a7aac19d8b614fc1c

diff --git a/udev_rules.c b/udev_rules.c
index ee4632513..49306295f 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -263,88 +263,6 @@ static int import_parent_into_env(struct udevice *udev, const char *filter)
 	return rc;
 }
 
-static int match_name_and_get_number(const char *base, const char *devname)
-{
-	size_t baselen;
-	char *endptr;
-	int num;
-
-	baselen = strlen(base);
-	if (strncmp(base, devname, baselen) != 0)
-		return -1;
-	if (devname[baselen] == '\0')
-		return 0;
-	if (!isdigit(devname[baselen]))
-		return -1;
-	num = strtoul(&devname[baselen], &endptr, 10);
-	if (endptr[0] != '\0')
-		return -1;
-	return num;
-}
-
-/* finds the lowest positive device number such that <name>N isn't present in the udevdb
- * if <name> doesn't exist, 0 is returned, N otherwise */
-static int find_free_number(const char *base, const char *devpath)
-{
-	char db_devpath[PATH_SIZE];
-	char filename[PATH_SIZE];
-	struct udevice *udev_db;
-	int num = 0;
-	static int warn = 1;
-
-	if (warn) {
-		err("%%e is deprecated, will be removed and is unlikely to work correctly. Don't use it.");
-		warn = 0;
-	}
-
-	/* check if the device already owns a matching name */
-	udev_db = udev_device_init();
-	if (udev_db == NULL)
-		return -1;
-	if (udev_db_get_device(udev_db, devpath) == 0) {
-		struct name_entry *name_loop;
-		int devnum;
-
-		devnum = match_name_and_get_number(base, udev_db->name);
-		if (devnum >= 0) {
-			num = devnum;
-			dbg("device '%s', already has the node '%s' with num %u, use it", devpath, base, num);
-			goto out;
-		}
-		list_for_each_entry(name_loop, &udev_db->symlink_list, node) {
-			devnum = match_name_and_get_number(base, name_loop->name);
-			if (devnum >= 0) {
-				num = devnum;
-				dbg("device '%s', already has a symlink '%s' with num %u, use it", devpath, base, num);
-				goto out;
-			}
-		}
-	}
-
-	/* just search the database again and again until a free name is found */
-	strlcpy(filename, base, sizeof(filename));
-	while (1) {
-		dbg("look for existing node '%s'", filename);
-		if (udev_db_lookup_name(filename, db_devpath, sizeof(db_devpath)) != 0) {
-			dbg("free num=%d", num);
-			break;
-		}
-
-		num++;
-		if (num > 100000) {
-			err("find_free_number aborted at num=%d", num);
-			num = -1;
-			break;
-		}
-		snprintf(filename, sizeof(filename), "%s%d", base, num);
-		filename[sizeof(filename)-1] = '\0';
-	}
-
-out:
-	udev_device_cleanup(udev_db);
-	return num;
-}
-
 #define WAIT_LOOP_PER_SECOND		50
 static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
 {
@@ -386,22 +304,19 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 	int len;
 	int i;
 	int count;
-	unsigned int next_free_number;
 	enum subst_type {
 		SUBST_UNKNOWN,
 		SUBST_DEVPATH,
+		SUBST_KERNEL,
 		SUBST_KERNEL_NUMBER,
-		SUBST_KERNEL_NAME,
 		SUBST_ID,
 		SUBST_MAJOR,
 		SUBST_MINOR,
 		SUBST_RESULT,
-		SUBST_SYSFS,
-		SUBST_ENUM,
+		SUBST_ATTR,
 		SUBST_PARENT,
 		SUBST_TEMP_NODE,
 		SUBST_ROOT,
-		SUBST_MODALIAS,
 		SUBST_ENV,
 	};
 	static const struct subst_map {
@@ -409,20 +324,19 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		char fmt;
 		enum subst_type type;
 	} map[] = {
-		{ .name = "devpath",		.fmt = 'p',	.type = SUBST_DEVPATH },
-		{ .name = "number",		.fmt = 'n',	.type = SUBST_KERNEL_NUMBER },
-		{ .name = "kernel",		.fmt = 'k',	.type = SUBST_KERNEL_NAME },
-		{ .name = "id",			.fmt = 'b',	.type = SUBST_ID },
-		{ .name = "major",		.fmt = 'M',	.type = SUBST_MAJOR },
-		{ .name = "minor",		.fmt = 'm',	.type = SUBST_MINOR },
-		{ .name = "result",		.fmt = 'c',	.type = SUBST_RESULT },
-		{ .name = "sysfs",		.fmt = 's',	.type = SUBST_SYSFS },
-		{ .name = "enum",		.fmt = 'e',	.type = SUBST_ENUM },
-		{ .name = "parent",		.fmt = 'P',	.type = SUBST_PARENT },
-		{ .name = "tempnode",		.fmt = 'N',	.type = SUBST_TEMP_NODE },
-		{ .name = "root",		.fmt = 'r',	.type = SUBST_ROOT },
-		{ .name = "modalias",		.fmt = 'A',	.type = SUBST_MODALIAS },
-		{ .name = "env",		.fmt = 'E',	.type = SUBST_ENV },
+		{ .name = "devpath",	.fmt = 'p',	.type = SUBST_DEVPATH },
+		{ .name = "number",	.fmt = 'n',	.type = SUBST_KERNEL_NUMBER },
+		{ .name = "kernel",	.fmt = 'k',	.type = SUBST_KERNEL },
+		{ .name = "id",		.fmt = 'b',	.type = SUBST_ID },
+		{ .name = "major",	.fmt = 'M',	.type = SUBST_MAJOR },
+		{ .name = "minor",	.fmt = 'm',	.type = SUBST_MINOR },
+		{ .name = "result",	.fmt = 'c',	.type = SUBST_RESULT },
+		{ .name = "attr",	.fmt = 's',	.type = SUBST_ATTR },
+		{ .name = "sysfs",	.fmt = 's',	.type = SUBST_ATTR },
+		{ .name = "parent",	.fmt = 'P',	.type = SUBST_PARENT },
+		{ .name = "tempnode",	.fmt = 'N',	.type = SUBST_TEMP_NODE },
+		{ .name = "root",	.fmt = 'r',	.type = SUBST_ROOT },
+		{ .name = "env",	.fmt = 'E',	.type = SUBST_ENV },
 		{ NULL, '\0', 0 }
 	};
 	enum subst_type type;
@@ -486,9 +400,9 @@ found:
 			strlcat(string, udev->dev->devpath, maxsize);
 			dbg("substitute devpath '%s'", udev->dev->devpath);
 			break;
-		case SUBST_KERNEL_NAME:
-			strlcat(string, udev->dev->kernel_name, maxsize);
-			dbg("substitute kernel name '%s'", udev->dev->kernel_name);
+		case SUBST_KERNEL:
+			strlcat(string, udev->dev->kernel, maxsize);
+			dbg("substitute kernel name '%s'", udev->dev->kernel);
 			break;
 		case SUBST_KERNEL_NUMBER:
 			strlcat(string, udev->dev->kernel_number, maxsize);
@@ -496,8 +410,8 @@ found:
 			break;
 		case SUBST_ID:
 			if (udev->dev_parent != NULL) {
-				strlcat(string, udev->dev_parent->kernel_name, maxsize);
-				dbg("substitute id '%s'", udev->dev_parent->kernel_name);
+				strlcat(string, udev->dev_parent->kernel, maxsize);
+				dbg("substitute id '%s'", udev->dev_parent->kernel);
 			}
 			break;
 		case SUBST_MAJOR:
@@ -544,7 +458,7 @@ found:
 				dbg("substitute result string '%s'", udev->program_result);
 			}
 			break;
-		case SUBST_SYSFS:
+		case SUBST_ATTR:
 			if (attr == NULL) {
 				dbg("missing attribute");
 				break;
@@ -574,13 +488,6 @@ found:
 				dbg("substitute sysfs value '%s'", temp2);
 			}
 			break;
-		case SUBST_ENUM:
-			next_free_number = find_free_number(string, udev->dev->devpath);
-			if (next_free_number > 0) {
-				sprintf(temp2, "%d", next_free_number);
-				strlcat(string, temp2, maxsize);
-			}
-			break;
 		case SUBST_PARENT:
 			{
 				struct sysfs_device *dev_parent;
@@ -618,24 +525,6 @@ found:
 			strlcat(string, udev_root, maxsize);
 			dbg("substitute udev_root '%s'", udev_root);
 			break;
-		case SUBST_MODALIAS:
-			{
-				const char *value;
-				static int warn = 1;
-
-				if (warn) {
-					err("$modalias is deprecated, use $env{MODALIAS} or "
-					    "$sysfs{modalias} instead.");
-					warn = 0;
-				}
-
-				value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
-				if (value != NULL) {
-					strlcat(string, value, maxsize);
-					dbg("substitute MODALIAS '%s'", temp2);
-				}
-			}
-			break;
 		case SUBST_ENV:
 			if (attr == NULL) {
 				dbg("missing attribute");
@@ -717,7 +606,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 	if (match_key("ACTION", rule, &rule->action, udev->action))
 		goto nomatch;
 
-	if (match_key("KERNEL", rule, &rule->kernel_name, udev->dev->kernel_name))
+	if (match_key("KERNEL", rule, &rule->kernel, udev->dev->kernel))
 		goto nomatch;
 
 	if (match_key("SUBSYSTEM", rule, &rule->subsystem, udev->dev->subsystem))
@@ -726,27 +615,12 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 	if (match_key("DEVPATH", rule, &rule->devpath, udev->dev->devpath))
 		goto nomatch;
 
-	/* compare NAME against a previously assigned value */
-	if (match_key("NAME", rule, &rule->name, udev->name))
+	if (match_key("DRIVER", rule, &rule->driver, udev->dev->driver))
 		goto nomatch;
 
-	if (rule->modalias.operation != KEY_OP_UNSET) {
-		const char *value;
-		static int warn = 1;
-
-		if (warn) {
-			err("MODALIAS is deprecated, use ENV{MODALIAS} or SYSFS{modalias} instead.");
-			warn = 0;
-		}
-
-		value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
-		if (value == NULL) {
-			dbg("MODALIAS value not found");
-			goto nomatch;
-		}
-		if (match_key("MODALIAS", rule, &rule->modalias, value))
-			goto nomatch;
-	}
+	/* match NAME against a value assigned by an earlier rule */
+	if (match_key("NAME", rule, &rule->name, udev->name))
+		goto nomatch;
 
 	for (i = 0; i < rule->env.count; i++) {
 		struct key_pair *pair = &rule->env.keys[i];
@@ -776,26 +650,57 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 		}
 	}
 
+	/* check for matching sysfs attrubute pairs */
+	if (rule->attr.count) {
+		dbg("check %i ATTR keys", rule->attr.count);
+		for (i = 0; i < rule->attr.count; i++) {
+			struct key_pair *pair = &rule->attr.keys[i];
+			const char *key_name = key_pair_name(rule, pair);
+			const char *key_value = key_val(rule, &pair->key);
+			const char *value;
+			char val[VALUE_SIZE];
+			size_t len;
+
+			value = sysfs_attr_get_value(udev->dev->devpath, key_name);
+			if (value == NULL)
+				goto nomatch;
+			strlcpy(val, value, sizeof(val));
+
+			/* 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(val);
+				while (len > 0 && isspace(val[len-1]))
+					val[--len] = '\0';
+				dbg("removed %zi trailing whitespace chars from '%s'", strlen(val)-len, val);
+			}
+
+			if (match_key("ATTR", rule, &pair->key, val))
+				goto nomatch;
+		}
+		dbg("all %i ATTR keys matched", rule->attr.count);
+	}
+
 	/* walk up the chain of parent devices and find a match */
 	udev->dev_parent = udev->dev;
 	while (1) {
-		/* check for matching driver */
-		if (match_key("DRIVER", rule, &rule->driver, udev->dev_parent->driver))
+		/* check for matching kernel device name */
+		if (match_key("KERNELS", rule, &rule->kernels, udev->dev_parent->kernel))
 			goto try_parent;
 
-		/* check for matching subsystem/bus value */
-		if (match_key("BUS", rule, &rule->bus, udev->dev_parent->subsystem))
+		/* check for matching subsystem value */
+		if (match_key("SUBSYSTEMS", rule, &rule->subsystems, udev->dev_parent->subsystem))
 			goto try_parent;
 
-		/* check for matching bus id (device name) */
-		if (match_key("ID", rule, &rule->id, udev->dev_parent->kernel_name))
+		/* check for matching driver */
+		if (match_key("DRIVERS", rule, &rule->drivers, udev->dev_parent->driver))
 			goto try_parent;
 
-		/* check for matching sysfs pairs */
-		if (rule->sysfs.count) {
-			dbg("check %i SYSFS keys", rule->sysfs.count);
-			for (i = 0; i < rule->sysfs.count; i++) {
-				struct key_pair *pair = &rule->sysfs.keys[i];
+		/* check for matching sysfs attrubute pairs */
+		if (rule->attrs.count) {
+			dbg("check %i ATTRS keys", rule->attrs.count);
+			for (i = 0; i < rule->attrs.count; i++) {
+				struct key_pair *pair = &rule->attrs.keys[i];
 				const char *key_name = key_pair_name(rule, pair);
 				const char *key_value = key_val(rule, &pair->key);
 				const char *value;
@@ -818,10 +723,10 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 					dbg("removed %zi trailing whitespace chars from '%s'", strlen(val)-len, val);
 				}
 
-				if (match_key("SYSFS", rule, &pair->key, val))
+				if (match_key("ATTRS", rule, &pair->key, val))
 					goto try_parent;
 			}
-			dbg("all %i SYSFS keys matched", rule->sysfs.count);
+			dbg("all %i ATTRS keys matched", rule->attrs.count);
 		}
 
 		/* found matching device  */
@@ -833,7 +738,7 @@ try_parent:
 		if (udev->dev_parent == NULL)
 			goto nomatch;
 		dbg("looking at dev_parent->devpath='%s'", udev->dev_parent->devpath);
-		dbg("looking at dev_parent->bus_kernel_name='%s'", udev->dev_parent->kernel_name);
+		dbg("looking at dev_parent->kernel='%s'", udev->dev_parent->kernel);
 	}
 
 	/* execute external program */
@@ -924,7 +829,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 	int name_set = 0;
 
 	dbg("udev->dev->devpath='%s'", udev->dev->devpath);
-	dbg("udev->dev->kernel_name='%s'", udev->dev->kernel_name);
+	dbg("udev->dev->kernel='%s'", udev->dev->kernel);
 
 	/* look for a matching rule to apply */
 	udev_rules_iter_init(rules);
@@ -945,7 +850,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 		if (match_rule(udev, rule) == 0) {
 			/* apply options */
 			if (rule->ignore_device) {
-				info("rule applied, '%s' is ignored", udev->dev->kernel_name);
+				info("rule applied, '%s' is ignored", udev->dev->kernel);
 				udev->ignore_device = 1;
 				return 0;
 			}
@@ -965,21 +870,21 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 				if (rule->mode_operation == KEY_OP_ASSIGN_FINAL)
 					udev->mode_final = 1;
 				udev->mode = rule->mode;
-				dbg("applied mode=%#o to '%s'", rule->mode, udev->dev->kernel_name);
+				dbg("applied mode=%#o to '%s'", rule->mode, udev->dev->kernel);
 			}
 			if (!udev->owner_final && rule->owner.operation != KEY_OP_UNSET) {
 				if (rule->owner.operation == KEY_OP_ASSIGN_FINAL)
 					udev->owner_final = 1;
 				strlcpy(udev->owner, key_val(rule, &rule->owner), sizeof(udev->owner));
 				udev_rules_apply_format(udev, udev->owner, sizeof(udev->owner));
-				dbg("applied owner='%s' to '%s'", udev->owner, udev->dev->kernel_name);
+				dbg("applied owner='%s' to '%s'", udev->owner, udev->dev->kernel);
 			}
 			if (!udev->group_final && rule->group.operation != KEY_OP_UNSET) {
 				if (rule->group.operation == KEY_OP_ASSIGN_FINAL)
 					udev->group_final = 1;
 				strlcpy(udev->group, key_val(rule, &rule->group), sizeof(udev->group));
 				udev_rules_apply_format(udev, udev->group, sizeof(udev->group));
-				dbg("applied group='%s' to '%s'", udev->group, udev->dev->kernel_name);
+				dbg("applied group='%s' to '%s'", udev->group, udev->dev->kernel);
 			}
 
 			/* collect symlinks */
@@ -1034,7 +939,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 				if (count)
 					info("%i untrusted character(s) replaced", count);
 
-				info("rule applied, '%s' becomes '%s'", udev->dev->kernel_name, udev->name);
+				info("rule applied, '%s' becomes '%s'", udev->dev->kernel, udev->name);
 				if (strcmp(udev->dev->subsystem, "net") != 0)
 					dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i",
 					    udev->name, udev->owner, udev->group, udev->mode, udev->partitions);
@@ -1064,7 +969,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 	}
 
 	if (!name_set) {
-		strlcpy(udev->name, udev->dev->kernel_name, sizeof(udev->name));
+		strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
 		info("no node name set, will use kernel name '%s'", udev->name);
 	}
 
@@ -1081,7 +986,7 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 {
 	struct udev_rule *rule;
 
-	dbg("udev->kernel_name='%s'", udev->dev->kernel_name);
+	dbg("udev->kernel='%s'", udev->dev->kernel);
 
 	/* look for a matching rule to apply */
 	udev_rules_iter_init(rules);
@@ -1099,7 +1004,7 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 
 		if (match_rule(udev, rule) == 0) {
 			if (rule->ignore_device) {
-				info("rule applied, '%s' is ignored", udev->dev->kernel_name);
+				info("rule applied, '%s' is ignored", udev->dev->kernel);
 				udev->ignore_device = 1;
 				return 0;
 			}