X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_rules.c;h=8db7fd377ab83ec19cafa3a1385e08da4b597bc1;hb=314edf3ca44b268fa70a7a87a106322e2dd461af;hp=6c6aa0f09140c136a7c34f31e259ba674fd146fd;hpb=8f847bb8455f7db8f26893b167fbf8a09cf8f41b;p=elogind.git

diff --git a/udev_rules.c b/udev_rules.c
index 6c6aa0f09..8db7fd377 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -270,28 +270,31 @@ static int import_parent_into_env(struct udevice *udev, struct sysfs_class_devic
 /* 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)
+static int find_free_number(const char *name, const char *devpath)
 {
-	char devpath[PATH_SIZE];
+	char db_devpath[PATH_SIZE];
 	char filename[PATH_SIZE];
 	int num = 0;
 
 	strlcpy(filename, name, sizeof(filename));
 	while (1) {
 		dbg("look for existing node '%s'", filename);
-		if (udev_db_search_name(devpath, sizeof(devpath), filename) != 0) {
+		if (udev_db_search_name(filename, db_devpath, sizeof(db_devpath)) != 0) {
 			dbg("free num=%d", num);
-			return num;
+			break;
 		}
 
 		num++;
-		if (num > 1000) {
-			info("find_free_number gone crazy (num=%d), aborted", num);
-			return -1;
+		if (num > 100000) {
+			err("find_free_number aborted at num=%d", num);
+			num = -1;
+			break;
 		}
 		snprintf(filename, sizeof(filename), "%s%d", name, num);
 		filename[sizeof(filename)-1] = '\0';
 	}
+
+	return num;
 }
 
 static int find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device,
@@ -546,7 +549,7 @@ found:
 			dbg("substitute sysfs value '%s'", temp2);
 			break;
 		case SUBST_ENUM:
-			next_free_number = find_free_number(string);
+			next_free_number = find_free_number(string, udev->devpath);
 			if (next_free_number > 0) {
 				sprintf(temp2, "%d", next_free_number);
 				strlcat(string, temp2, maxsize);