X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.c;h=492a9b0dfc89e81bd6333d65a142256ca5cdabae;hp=c1482c34b50be4a126927760c693c652361be29b;hb=3e0f8812f8c824648db7cc6886265ed186685488;hpb=764ce7f2ab526c084f005186e0dcbabe59070247

diff --git a/udev_rules.c b/udev_rules.c
index c1482c34b..492a9b0df 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -39,7 +39,6 @@
 #include "udev_version.h"
 #include "logging.h"
 #include "udev_rules.h"
-#include "udev_db.h"
 
 
 /* extract possible {attr} and move str behind it */
@@ -208,7 +207,7 @@ static int import_file_into_env(struct udevice *udev, const char *filename)
 	size_t bufsize;
 
 	if (file_map(filename, &buf, &bufsize) != 0) {
-		err("can't open '%s'", filename);
+		err("can't open '%s': %s", filename, strerror(errno));
 		return -1;
 	}
 	import_keys_into_env(udev, buf, bufsize);
@@ -267,16 +266,58 @@ static int import_parent_into_env(struct udevice *udev, struct sysfs_class_devic
 	return rc;
 }
 
-/* finds the lowest positive N 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 *name, const char *devpath)
+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;
 
-	strlcpy(filename, name, sizeof(filename));
+	/* check if the device already owns a matching name */
+	udev_init_device(&udev_db, NULL, NULL, NULL);
+	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) {
@@ -290,10 +331,12 @@ static int find_free_number(const char *name, const char *devpath)
 			num = -1;
 			break;
 		}
-		snprintf(filename, sizeof(filename), "%s%d", name, num);
+		snprintf(filename, sizeof(filename), "%s%d", base, num);
 		filename[sizeof(filename)-1] = '\0';
 	}
 
+out:
+	udev_cleanup_device(&udev_db);
 	return num;
 }
 
@@ -326,13 +369,13 @@ static int find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sys
 
 attr_found:
 	strlcpy(value, tmpattr->value, len);
-	remove_trailing_char(value, '\n');
+	remove_trailing_chars(value, '\n');
 
 	dbg("found attribute '%s'", tmpattr->path);
 	return 0;
 }
 
-#define WAIT_LOOP_PER_SECOND			20
+#define WAIT_LOOP_PER_SECOND		50
 static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
 {
 	char filename[PATH_SIZE];
@@ -345,12 +388,13 @@ static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
 
 	while (--loop) {
 		if (stat(filename, &stats) == 0) {
-			dbg("file appeared after %i loops", (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
+			info("file appeared after %i loops", (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
 			return 0;
 		}
+		info("wait for %i mseconds", 1000 / WAIT_LOOP_PER_SECOND);
 		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
 	}
-	dbg("waiting for '%s' failed", filename);
+	err("waiting for '%s' failed", filename);
 	return -1;
 }
 
@@ -604,7 +648,7 @@ found:
 			}
 			pos = getenv(attr);
 			if (pos == NULL) {
-				dbg("env '%s' not avialable", attr);
+				dbg("env '%s' not available", attr);
 				break;
 			}
 			dbg("substitute env '%s=%s'", attr, pos);
@@ -669,6 +713,7 @@ static int match_key(const char *key_name, struct udev_rule *rule, struct key *k
 	return -1;
 }
 
+/* match a single rule against a given device and possibly its parent devices */
 static int match_rule(struct udevice *udev, struct udev_rule *rule,
 		      struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
@@ -818,7 +863,7 @@ try_parent:
 			int count;
 
 			dbg("PROGRAM matches");
-			remove_trailing_char(result, '\n');
+			remove_trailing_chars(result, '\n');
 			count = replace_untrusted_chars(result);
 			if (count)
 				info("%i untrusted character(s) replaced" , count);