X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.c;h=979b81d821b570b05cbc7a9f1d830ddebb0d02e3;hp=fbcbbe008339bc5f95599aebfa484bc9b7be08b6;hb=c8ff4b3db440f1c3124b0e4e4efc68f1177c5964;hpb=f5f0c34f6dc32769fd788560ce0d0cac843872b2

diff --git a/udev_rules.c b/udev_rules.c
index fbcbbe008..979b81d82 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -2,17 +2,17 @@
  * udev_rules.c
  *
  * Copyright (C) 2003 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
  *	Free Software Foundation version 2 of the License.
- * 
+ *
  *	This program is distributed in the hope that it will be useful, but
  *	WITHOUT ANY WARRANTY; without even the implied warranty of
  *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *	General Public License for more details.
- * 
+ *
  *	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.
@@ -263,106 +263,40 @@ 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;
-
-	/* 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)
 {
-	char filename[PATH_SIZE];
+	char devicepath[PATH_SIZE];
+	char filepath[PATH_SIZE];
 	struct stat stats;
 	int loop = timeout * WAIT_LOOP_PER_SECOND;
 
-	snprintf(filename, sizeof(filename), "%s%s/%s", sysfs_path, udev->dev->devpath, file);
-	filename[sizeof(filename)-1] = '\0';
-	dbg("wait %i sec for '%s'", timeout, filename);
+	strlcpy(devicepath, sysfs_path, sizeof(devicepath));
+	strlcat(devicepath, udev->dev->devpath, sizeof(devicepath));
+	strlcpy(filepath, devicepath, sizeof(filepath));
+	strlcat(filepath, "/", sizeof(filepath));
+	strlcat(filepath, file, sizeof(filepath));
 
+	dbg("will wait %i sec for '%s'", timeout, filepath);
 	while (--loop) {
-		if (stat(filename, &stats) == 0) {
-			info("file '%s' appeared after %i loops", filename, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
+		/* lookup file */
+		if (stat(filepath, &stats) == 0) {
+			info("file '%s' appeared after %i loops", filepath, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
 			return 0;
 		}
-		info("wait for %i mseconds", 1000 / WAIT_LOOP_PER_SECOND);
+		/* make sure the device does not have disappeared in the meantime */
+		if (stat(devicepath, &stats) != 0) {
+			info("device disappeared while waiting for '%s'", filepath);
+			return -2;
+		}
+		info("wait for '%s' for %i mseconds", filepath, 1000 / WAIT_LOOP_PER_SECOND);
 		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
 	}
-	err("waiting for '%s' failed", filename);
+	err("waiting for '%s' failed", filepath);
 	return -1;
 }
 
-void apply_format(struct udevice *udev, char *string, size_t maxsize)
+void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 {
 	char temp[PATH_SIZE];
 	char temp2[PATH_SIZE];
@@ -370,7 +304,6 @@ void 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,
@@ -381,11 +314,9 @@ void apply_format(struct udevice *udev, char *string, size_t maxsize)
 		SUBST_MINOR,
 		SUBST_RESULT,
 		SUBST_SYSFS,
-		SUBST_ENUM,
 		SUBST_PARENT,
 		SUBST_TEMP_NODE,
 		SUBST_ROOT,
-		SUBST_MODALIAS,
 		SUBST_ENV,
 	};
 	static const struct subst_map {
@@ -401,11 +332,9 @@ void apply_format(struct udevice *udev, char *string, size_t maxsize)
 		{ .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 },
 		{ NULL, '\0', 0 }
 	};
@@ -435,8 +364,7 @@ void apply_format(struct udevice *udev, char *string, size_t maxsize)
 						goto found;
 					}
 				}
-			}
-			else if (head[0] == '%') {
+			} else if (head[0] == '%') {
 				/* substitute format char */
 				if (head[1] == '\0')
 					break;
@@ -559,13 +487,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;
@@ -594,7 +515,7 @@ found:
 				snprintf(udev->tmp_node, sizeof(udev->tmp_node), "%s/.tmp-%u-%u",
 					 udev_root, major(udev->devt), minor(udev->devt));
 				udev->tmp_node[sizeof(udev->tmp_node)-1] = '\0';
-				udev_make_node(udev, udev->tmp_node, udev->devt, 0600, 0, 0);
+				udev_node_mknod(udev, udev->tmp_node, udev->devt, 0600, 0, 0);
 			}
 			strlcat(string, udev->tmp_node, maxsize);
 			dbg("substitute temporary device node name '%s'", udev->tmp_node);
@@ -603,17 +524,6 @@ found:
 			strlcat(string, udev_root, maxsize);
 			dbg("substitute udev_root '%s'", udev_root);
 			break;
-		case SUBST_MODALIAS:
-			{
-				const char *value;
-
-				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");
@@ -657,7 +567,8 @@ static int match_key(const char *key_name, struct udev_rule *rule, struct key *k
 	char *key_value;
 	char *pos;
 
-	if (key->operation == KEY_OP_UNSET)
+	if (key->operation != KEY_OP_MATCH &&
+	    key->operation != KEY_OP_NOMATCH)
 		return 0;
 
 	strlcpy(value, rule->buf + key->val_off, sizeof(value));
@@ -703,23 +614,16 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 	if (match_key("DEVPATH", rule, &rule->devpath, udev->dev->devpath))
 		goto nomatch;
 
-	if (rule->modalias.operation != KEY_OP_UNSET) {
-		const char *value;
-
-		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;
-	}
+	/* compare NAME against a previously assigned value */
+	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];
 
 		/* we only check for matches, assignments will be handled later */
-		if (pair->key.operation != KEY_OP_ASSIGN) {
+		if (pair->key.operation == KEY_OP_MATCH ||
+		    pair->key.operation == KEY_OP_NOMATCH) {
 			const char *key_name = key_pair_name(rule, pair);
 			const char *value = getenv(key_name);
 
@@ -733,41 +637,29 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 	}
 
 	if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
-		int match;
+		int found;
 
-		match = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
-		if (match && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH)) {
-			dbg("WAIT_FOR_SYSFS is true (matching value)");
-			return 0;
-		}
-		if (!match && (rule->wait_for_sysfs.operation == KEY_OP_NOMATCH)) {
-			dbg("WAIT_FOR_SYSFS is true, (non matching value)");
-			return 0;
+		found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
+		if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH)) {
+			dbg("WAIT_FOR_SYSFS failed");
+			goto nomatch;
 		}
-		dbg("WAIT_FOR_SYSFS is false");
-		return -1;
 	}
 
 	/* walk up the chain of parent devices and find a match */
 	udev->dev_parent = udev->dev;
 	while (1) {
 		/* check for matching driver */
-		if (rule->driver.operation != KEY_OP_UNSET) {
-			if (match_key("DRIVER", rule, &rule->driver, udev->dev_parent->driver))
-				goto try_parent;
-		}
+		if (match_key("DRIVER", rule, &rule->driver, udev->dev_parent->driver))
+			goto try_parent;
 
 		/* check for matching subsystem/bus value */
-		if (rule->bus.operation != KEY_OP_UNSET) {
-			if (match_key("BUS", rule, &rule->bus, udev->dev_parent->subsystem))
-				goto try_parent;
-		}
+		if (match_key("BUS", rule, &rule->bus, udev->dev_parent->subsystem))
+			goto try_parent;
 
 		/* check for matching bus id (device name) */
-		if (rule->id.operation != KEY_OP_UNSET) {
-			if (match_key("ID", rule, &rule->id, udev->dev_parent->kernel_name))
-				goto try_parent;
-		}
+		if (match_key("ID", rule, &rule->id, udev->dev_parent->kernel_name))
+			goto try_parent;
 
 		/* check for matching sysfs pairs */
 		if (rule->sysfs.count) {
@@ -781,6 +673,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 				size_t len;
 
 				value = sysfs_attr_get_value(udev->dev_parent->devpath, key_name);
+				if (value == NULL)
+					value = sysfs_attr_get_value(udev->dev->devpath, key_name);
 				if (value == NULL)
 					goto try_parent;
 				strlcpy(val, value, sizeof(val));
@@ -818,7 +712,7 @@ try_parent:
 		char result[PATH_SIZE];
 
 		strlcpy(program, key_val(rule, &rule->program), sizeof(program));
-		apply_format(udev, program, sizeof(program));
+		udev_rules_apply_format(udev, program, sizeof(program));
 		if (run_program(program, udev->dev->subsystem, result, sizeof(result), NULL, (udev_log_priority >= LOG_INFO)) != 0) {
 			dbg("PROGRAM is false");
 			udev->program_result[0] = '\0';
@@ -851,7 +745,7 @@ try_parent:
 		int rc = -1;
 
 		strlcpy(import, key_val(rule, &rule->import), sizeof(import));
-		apply_format(udev, import, sizeof(import));
+		udev_rules_apply_format(udev, import, sizeof(import));
 		dbg("check for IMPORT import='%s'", import);
 		if (rule->import_type == IMPORT_PROGRAM) {
 			rc = import_program_into_env(udev, import);
@@ -878,10 +772,13 @@ try_parent:
 		if (pair->key.operation == KEY_OP_ASSIGN) {
 			const char *key_name = key_pair_name(rule, pair);
 			const char *value = key_val(rule, &pair->key);
+			char *key_value = name_list_key_add(&udev->env_list, key_name, value);
+			if (key_value == NULL)
+				break;
 
-			name_list_key_add(&udev->env_list, key_name, value);
-			setenv(key_name, value, 1);
-			dbg("export ENV '%s=%s'", key_name, value);
+			udev_rules_apply_format(udev, key_value, NAME_SIZE);
+			putenv(key_value);
+			dbg("export ENV '%s'", key_value);
 		}
 	}
 
@@ -906,7 +803,10 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 		if (rule == NULL)
 			break;
 
-		if (name_set && rule->name.operation != KEY_OP_UNSET) {
+		if (name_set &&
+		    (rule->name.operation == KEY_OP_ASSIGN ||
+		     rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+		     rule->name.operation == KEY_OP_ADD)) {
 			dbg("node name already set, rule ignored");
 			continue;
 		}
@@ -941,14 +841,14 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 				if (rule->owner.operation == KEY_OP_ASSIGN_FINAL)
 					udev->owner_final = 1;
 				strlcpy(udev->owner, key_val(rule, &rule->owner), sizeof(udev->owner));
-				apply_format(udev, udev->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);
 			}
 			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));
-				apply_format(udev, udev->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);
 			}
 
@@ -965,7 +865,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 					name_list_cleanup(&udev->symlink_list);
 				}
 				strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp));
-				apply_format(udev, temp, sizeof(temp));
+				udev_rules_apply_format(udev, temp, sizeof(temp));
 				count = replace_untrusted_chars(temp);
 				if (count)
 					info("%i untrusted character(s) replaced" , count);
@@ -992,11 +892,14 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 			}
 
 			/* set name, later rules with name set will be ignored */
-			if (rule->name.operation != KEY_OP_UNSET) {
+			if (rule->name.operation == KEY_OP_ASSIGN ||
+			    rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+			    rule->name.operation == KEY_OP_ADD) {
 				int count;
+
 				name_set = 1;
 				strlcpy(udev->name, key_val(rule, &rule->name), sizeof(udev->name));
-				apply_format(udev, udev->name, sizeof(udev->name));
+				udev_rules_apply_format(udev, udev->name, sizeof(udev->name));
 				count = replace_untrusted_chars(udev->name);
 				if (count)
 					info("%i untrusted character(s) replaced", count);
@@ -1008,17 +911,14 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 			}
 
 			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
-				char program[PATH_SIZE];
-
 				if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
 					udev->run_final = 1;
 				if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
 					info("reset run list");
 					name_list_cleanup(&udev->run_list);
 				}
-				strlcpy(program, key_val(rule, &rule->run), sizeof(program));
-				dbg("add run '%s'", program);
-				name_list_add(&udev->run_list, program, 0);
+				dbg("add run '%s'", key_val(rule, &rule->run));
+				name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
 			}
 
 			if (rule->last_rule) {
@@ -1075,16 +975,12 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 			}
 
 			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
-				char program[PATH_SIZE];
-
 				if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
 					info("reset run list");
 					name_list_cleanup(&udev->run_list);
 				}
-				strlcpy(program, key_val(rule, &rule->run), sizeof(program));
-				apply_format(udev, program, sizeof(program));
-				dbg("add run '%s'", program);
-				name_list_add(&udev->run_list, program, 0);
+				dbg("add run '%s'", key_val(rule, &rule->run));
+				name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
 				if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
 					break;
 			}