X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-enumerate.c;h=b35a82d0ceda8819fece12360eaf4edb3bdf627e;hb=69239210bee89c1745f2dd5f1e7cff4efd07e429;hp=7d2d592c92d1b6345591938a25d3ea4ada31d99b;hpb=cabfd8d0b487b856a2a41b9595e310e63674b99f;p=elogind.git

diff --git a/udev/lib/libudev-enumerate.c b/udev/lib/libudev-enumerate.c
index 7d2d592c9..b35a82d0c 100644
--- a/udev/lib/libudev-enumerate.c
+++ b/udev/lib/libudev-enumerate.c
@@ -30,14 +30,17 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
+static int devices_sort(struct udev_enumerate *udev_enumerate);
+
 struct udev_enumerate {
 	struct udev *udev;
 	int refcount;
-	struct list_node attr_match_list;
-	struct list_node attr_nomatch_list;
-	struct list_node subsystem_match_list;
-	struct list_node subsystem_nomatch_list;
-	struct list_node devices_list;
+	struct udev_list_node sysattr_match_list;
+	struct udev_list_node sysattr_nomatch_list;
+	struct udev_list_node subsystem_match_list;
+	struct udev_list_node subsystem_nomatch_list;
+	struct udev_list_node devices_list;
+	int devices_sorted;
 };
 
 /**
@@ -56,11 +59,11 @@ struct udev_enumerate *udev_enumerate_new(struct udev *udev)
 	memset(udev_enumerate, 0x00, (sizeof(struct udev_enumerate)));
 	udev_enumerate->refcount = 1;
 	udev_enumerate->udev = udev;
-	list_init(&udev_enumerate->devices_list);
-	list_init(&udev_enumerate->attr_match_list);
-	list_init(&udev_enumerate->attr_nomatch_list);
-	list_init(&udev_enumerate->subsystem_match_list);
-	list_init(&udev_enumerate->subsystem_nomatch_list);
+	udev_list_init(&udev_enumerate->devices_list);
+	udev_list_init(&udev_enumerate->sysattr_match_list);
+	udev_list_init(&udev_enumerate->sysattr_nomatch_list);
+	udev_list_init(&udev_enumerate->subsystem_match_list);
+	udev_list_init(&udev_enumerate->subsystem_nomatch_list);
 	return udev_enumerate;
 }
 
@@ -79,11 +82,11 @@ void udev_enumerate_unref(struct udev_enumerate *udev_enumerate)
 	udev_enumerate->refcount--;
 	if (udev_enumerate->refcount > 0)
 		return;
-	list_cleanup(udev_enumerate->udev, &udev_enumerate->devices_list);
-	list_cleanup(udev_enumerate->udev, &udev_enumerate->attr_match_list);
-	list_cleanup(udev_enumerate->udev, &udev_enumerate->attr_nomatch_list);
-	list_cleanup(udev_enumerate->udev, &udev_enumerate->subsystem_match_list);
-	list_cleanup(udev_enumerate->udev, &udev_enumerate->subsystem_nomatch_list);
+	udev_list_cleanup_entries(udev_enumerate->udev, &udev_enumerate->devices_list);
+	udev_list_cleanup_entries(udev_enumerate->udev, &udev_enumerate->sysattr_match_list);
+	udev_list_cleanup_entries(udev_enumerate->udev, &udev_enumerate->sysattr_nomatch_list);
+	udev_list_cleanup_entries(udev_enumerate->udev, &udev_enumerate->subsystem_match_list);
+	udev_list_cleanup_entries(udev_enumerate->udev, &udev_enumerate->subsystem_nomatch_list);
 	free(udev_enumerate);
 }
 
@@ -98,7 +101,9 @@ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enumerate *ude
 {
 	if (udev_enumerate == NULL)
 		return NULL;
-	return list_get_entry(&udev_enumerate->devices_list);
+	if (!udev_enumerate->devices_sorted)
+		devices_sort(udev_enumerate);
+	return udev_list_get_entry(&udev_enumerate->devices_list);
 }
 
 int udev_enumerate_add_match_subsystem(struct udev_enumerate *udev_enumerate, const char *subsystem)
@@ -107,8 +112,8 @@ int udev_enumerate_add_match_subsystem(struct udev_enumerate *udev_enumerate, co
 		return -EINVAL;
 	if (subsystem == NULL)
 		return 0;
-	if (list_entry_add(udev_enumerate_get_udev(udev_enumerate),
-			   &udev_enumerate->subsystem_match_list, subsystem, NULL, 1, 0) == NULL)
+	if (udev_list_entry_add(udev_enumerate_get_udev(udev_enumerate),
+				&udev_enumerate->subsystem_match_list, subsystem, NULL, 1, 0) == NULL)
 		return -ENOMEM;
 	return 0;
 }
@@ -119,37 +124,37 @@ int udev_enumerate_add_nomatch_subsystem(struct udev_enumerate *udev_enumerate,
 		return -EINVAL;
 	if (subsystem == NULL)
 		return 0;
-	if (list_entry_add(udev_enumerate_get_udev(udev_enumerate),
-			   &udev_enumerate->subsystem_nomatch_list, subsystem, NULL, 1, 0) == NULL)
+	if (udev_list_entry_add(udev_enumerate_get_udev(udev_enumerate),
+				&udev_enumerate->subsystem_nomatch_list, subsystem, NULL, 1, 0) == NULL)
 		return -ENOMEM;
 	return 0;
 }
 
-int udev_enumerate_add_match_attr(struct udev_enumerate *udev_enumerate, const char *attr, const char *value)
+int udev_enumerate_add_match_sysattr(struct udev_enumerate *udev_enumerate, const char *sysattr, const char *value)
 {
 	if (udev_enumerate == NULL)
 		return -EINVAL;
-	if (attr == NULL)
+	if (sysattr == NULL)
 		return 0;
-	if (list_entry_add(udev_enumerate_get_udev(udev_enumerate),
-			   &udev_enumerate->attr_match_list, attr, value, 1, 0) == NULL)
+	if (udev_list_entry_add(udev_enumerate_get_udev(udev_enumerate),
+			   &udev_enumerate->sysattr_match_list, sysattr, value, 1, 0) == NULL)
 		return -ENOMEM;
 	return 0;
 }
 
-int udev_enumerate_add_nomatch_attr(struct udev_enumerate *udev_enumerate, const char *attr, const char *value)
+int udev_enumerate_add_nomatch_sysattr(struct udev_enumerate *udev_enumerate, const char *sysattr, const char *value)
 {
 	if (udev_enumerate == NULL)
 		return -EINVAL;
-	if (attr == NULL)
+	if (sysattr == NULL)
 		return 0;
-	if (list_entry_add(udev_enumerate_get_udev(udev_enumerate),
-			   &udev_enumerate->attr_nomatch_list, attr, value, 1, 0) == NULL)
+	if (udev_list_entry_add(udev_enumerate_get_udev(udev_enumerate),
+			   &udev_enumerate->sysattr_nomatch_list, sysattr, value, 1, 0) == NULL)
 		return -ENOMEM;
 	return 0;
 }
 
-static int match_attr_value(struct udev *udev, const char *syspath, const char *attr, const char *match_val)
+static int match_sysattr_value(struct udev *udev, const char *syspath, const char *sysattr, const char *match_val)
 {
 	struct udev_device *device;
 	const char *val = NULL;
@@ -158,7 +163,7 @@ static int match_attr_value(struct udev *udev, const char *syspath, const char *
 	device = udev_device_new_from_syspath(udev, syspath);
 	if (device == NULL)
 		return -EINVAL;
-	val = udev_device_get_attr_value(device, attr);
+	val = udev_device_get_sysattr_value(device, sysattr);
 	if (val == NULL)
 		goto exit;
 	if (match_val == NULL) {
@@ -174,23 +179,23 @@ exit:
 	return match;
 }
 
-static int match_attr(struct udev_enumerate *udev_enumerate, const char *syspath)
+static int match_sysattr(struct udev_enumerate *udev_enumerate, const char *syspath)
 {
 	struct udev *udev = udev_enumerate_get_udev(udev_enumerate);
 	struct udev_list_entry *list_entry;
 
 	/* skip list */
-	udev_list_entry_foreach(list_entry, list_get_entry(&udev_enumerate->attr_nomatch_list)) {
-		if (match_attr_value(udev, syspath,
+	udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_enumerate->sysattr_nomatch_list)) {
+		if (match_sysattr_value(udev, syspath,
 				     udev_list_entry_get_name(list_entry),
 				     udev_list_entry_get_value(list_entry)))
 			return 0;
 	}
 	/* include list */
-	if (list_get_entry(&udev_enumerate->attr_match_list) != NULL) {
-		udev_list_entry_foreach(list_entry, list_get_entry(&udev_enumerate->attr_match_list)) {
+	if (udev_list_get_entry(&udev_enumerate->sysattr_match_list) != NULL) {
+		udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_enumerate->sysattr_match_list)) {
 			/* anything that does not match, will make it FALSE */
-			if (!match_attr_value(udev, syspath,
+			if (!match_sysattr_value(udev, syspath,
 					      udev_list_entry_get_name(list_entry),
 					      udev_list_entry_get_value(list_entry)))
 				return 0;
@@ -242,9 +247,9 @@ static int scan_dir_and_add_devices(struct udev_enumerate *udev_enumerate,
 		util_strlcat(filename, "/uevent", sizeof(filename));
 		if (stat(filename, &statbuf) != 0)
 			continue;
-		if (!match_attr(udev_enumerate, syspath))
+		if (!match_sysattr(udev_enumerate, syspath))
 			continue;
-		list_entry_add(udev, &udev_enumerate->devices_list, syspath, NULL, 1, 1);
+		udev_list_entry_add(udev, &udev_enumerate->devices_list, syspath, NULL, 1, 1);
 	}
 	closedir(dir);
 	return 0;
@@ -254,12 +259,12 @@ static int match_subsystem(struct udev_enumerate *udev_enumerate, const char *su
 {
 	struct udev_list_entry *list_entry;
 
-	udev_list_entry_foreach(list_entry, list_get_entry(&udev_enumerate->subsystem_nomatch_list)) {
+	udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_enumerate->subsystem_nomatch_list)) {
 		if (fnmatch(udev_list_entry_get_name(list_entry), subsystem, 0) == 0)
 			return 0;
 	}
-	if (list_get_entry(&udev_enumerate->subsystem_match_list) != NULL) {
-		udev_list_entry_foreach(list_entry, list_get_entry(&udev_enumerate->subsystem_match_list)) {
+	if (udev_list_get_entry(&udev_enumerate->subsystem_match_list) != NULL) {
+		udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_enumerate->subsystem_match_list)) {
 			if (fnmatch(udev_list_entry_get_name(list_entry), subsystem, 0) == 0)
 				return 1;
 		}
@@ -313,23 +318,35 @@ static int devices_delay(struct udev *udev, const char *syspath)
 	return 0;
 }
 
-int udev_enumerate_add_device(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device)
+/* sort delayed devices to the end of the list */
+static int devices_sort(struct udev_enumerate *udev_enumerate)
 {
-	struct udev *udev = udev_enumerate_get_udev(udev_enumerate);
 	struct udev_list_entry *list_entry;
 
+	udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_enumerate->devices_list)) {
+		if (devices_delay(udev_enumerate->udev, udev_list_entry_get_name(list_entry)))
+			udev_list_entry_move_to_end(list_entry);
+	}
+	udev_enumerate->devices_sorted = 1;
+	return 0;
+}
+
+int udev_enumerate_add_syspath(struct udev_enumerate *udev_enumerate, const char *syspath)
+{
+	struct udev *udev = udev_enumerate_get_udev(udev_enumerate);
+	struct udev_device *udev_device;
+
 	if (udev_enumerate == NULL)
 		return -EINVAL;
-	if (udev_device == NULL)
+	if (syspath == NULL)
 		return 0;
-	list_entry_add(udev,
-		       &udev_enumerate->devices_list,
-		       udev_device_get_syspath(udev_device), NULL, 1, 1);
-	/* sort delayed devices to the end of the list */
-	udev_list_entry_foreach(list_entry, list_get_entry(&udev_enumerate->devices_list)) {
-		if (devices_delay(udev, udev_list_entry_get_name(list_entry)))
-			list_entry_move_to_end(list_entry);
-	}
+	/* resolve to real syspath */
+	udev_device = udev_device_new_from_syspath(udev_enumerate->udev, syspath);
+	if (udev_device == NULL)
+		return -EINVAL;
+	udev_list_entry_add(udev, &udev_enumerate->devices_list,
+			    udev_device_get_syspath(udev_device), NULL, 1, 1);
+	udev_device_unref(udev_device);
 	return 0;
 }
 
@@ -374,9 +391,9 @@ int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerate)
 		}
 	}
 	/* sort delayed devices to the end of the list */
-	udev_list_entry_foreach(list_entry, list_get_entry(&udev_enumerate->devices_list)) {
+	udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_enumerate->devices_list)) {
 		if (devices_delay(udev, udev_list_entry_get_name(list_entry)))
-			list_entry_move_to_end(list_entry);
+			udev_list_entry_move_to_end(list_entry);
 	}
 	return 0;
 }