X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev-enumerate.c;h=266164ae517ebfebe4da97cc34b9af44749b7728;hp=9bd910105260dc900b6bad87891e4975971f7c76;hb=438d4c3cd4b89381348f84ef9f8b8937814f8362;hpb=3eb46ec6ddeb31d9886ebb736d1d7b3534d2f354

diff --git a/udev/lib/libudev-enumerate.c b/udev/lib/libudev-enumerate.c
index 9bd910105..266164ae5 100644
--- a/udev/lib/libudev-enumerate.c
+++ b/udev/lib/libudev-enumerate.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -31,161 +29,276 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
+struct udev_enumerate {
+	struct udev *udev;
+	int refcount;
+	struct list_node devices_list;
+};
+
+struct udev_enumerate *udev_enumerate_ref(struct udev_enumerate *udev_enumerate)
+{
+	if (udev_enumerate == NULL)
+		return NULL;
+	udev_enumerate->refcount++;
+	return udev_enumerate;
+}
+
+void udev_enumerate_unref(struct udev_enumerate *udev_enumerate)
+{
+	if (udev_enumerate == NULL)
+		return;
+	udev_enumerate->refcount--;
+	if (udev_enumerate->refcount > 0)
+		return;
+	list_cleanup(udev_enumerate->udev, &udev_enumerate->devices_list);
+	free(udev_enumerate);
+}
+
+struct udev *udev_enumerate_get_udev(struct udev_enumerate *udev_enumerate)
+{
+	if (udev_enumerate == NULL)
+		return NULL;
+	return udev_enumerate->udev;
+}
+
+struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enumerate *udev_enumerate)
+{
+	if (udev_enumerate == NULL)
+		return NULL;
+	return list_get_entry(&udev_enumerate->devices_list);
+}
+
 static int devices_scan_subsystem(struct udev *udev,
 				  const char *basedir, const char *subsystem, const char *subdir,
-				  struct list_head *device_list)
+				  struct list_node *devices_list)
 {
 	char path[UTIL_PATH_SIZE];
 	DIR *dir;
 	struct dirent *dent;
-	size_t len;
 
-	len = util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
+	util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
 	util_strlcat(path, basedir, sizeof(path));
-	util_strlcat(path, "/", sizeof(path));
-	util_strlcat(path, subsystem, sizeof(path));
+	if (subsystem != NULL) {
+		util_strlcat(path, "/", sizeof(path));
+		util_strlcat(path, subsystem, sizeof(path));
+	}
 	if (subdir != NULL)
 		util_strlcat(path, subdir, sizeof(path));
 	dir = opendir(path);
 	if (dir == NULL)
 		return -1;
 	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-		char devpath[UTIL_PATH_SIZE];
+		char syspath[UTIL_PATH_SIZE];
+		char filename[UTIL_PATH_SIZE];
+		struct stat statbuf;
 
 		if (dent->d_name[0] == '.')
 			continue;
-		util_strlcpy(devpath, &path[len], sizeof(devpath));
-		util_strlcat(devpath, "/", sizeof(devpath));
-		util_strlcat(devpath, dent->d_name, sizeof(devpath));
-		util_resolve_sys_link(udev, devpath, sizeof(devpath));
-		util_name_list_add(udev, device_list, devpath, 1);
+		util_strlcpy(syspath, path, sizeof(syspath));
+		util_strlcat(syspath, "/", sizeof(syspath));
+		util_strlcat(syspath, dent->d_name, sizeof(syspath));
+		util_strlcpy(filename, syspath, sizeof(filename));
+		util_strlcat(filename, "/uevent", sizeof(filename));
+		if (stat(filename, &statbuf) != 0)
+			continue;
+		util_resolve_sys_link(udev, syspath, sizeof(syspath));
+		list_entry_add(udev, devices_list, syspath, NULL, 1, 1);
 	}
 	closedir(dir);
 	return 0;
 }
 
 static int devices_scan_subsystems(struct udev *udev,
-				   const char *basedir, const char *subsystem, const char *subdir,
-				   struct list_head *device_list)
+				   const char *basedir, const char *subdir,
+				   struct udev_list_entry *subsystem_include_list,
+				   struct udev_list_entry *subsystem_exclude_list,
+				   struct list_node *devices_list)
 {
-	char path[UTIL_PATH_SIZE];
-	DIR *dir;
-	struct dirent *dent;
+	if (subsystem_include_list != NULL) {
+		struct udev_list_entry *list_entry;
 
-	if (subsystem != NULL)
-		return devices_scan_subsystem(udev, basedir, subsystem, subdir, device_list);
+		/* if list of subsystems to scan is given, just use this list */
+		udev_list_entry_foreach(list_entry, subsystem_include_list) {
+			if (udev_list_entry_get_by_name(subsystem_exclude_list, udev_list_entry_get_name(list_entry)) != NULL)
+					continue;
+			devices_scan_subsystem(udev, basedir, udev_list_entry_get_name(list_entry), subdir, devices_list);
+		}
+	} else {
+		char path[UTIL_PATH_SIZE];
+		DIR *dir;
+		struct dirent *dent;
 
-	util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
-	util_strlcat(path, basedir, sizeof(path));
-	dir = opendir(path);
-	if (dir == NULL)
-		return -1;
-	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-		if (dent->d_name[0] == '.')
-			continue;
-		devices_scan_subsystem(udev, basedir, dent->d_name, subdir, device_list);
+		/* if no list of subsystems to scan is given, scan all, and possible exclude some subsystems */
+		util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
+		util_strlcat(path, basedir, sizeof(path));
+		dir = opendir(path);
+		if (dir == NULL)
+			return -1;
+		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+			if (dent->d_name[0] == '.')
+				continue;
+			if (udev_list_entry_get_by_name(subsystem_exclude_list, dent->d_name) != NULL)
+					continue;
+			devices_scan_subsystem(udev, basedir, dent->d_name, subdir, devices_list);
+		}
+		closedir(dir);
 	}
-	closedir(dir);
 	return 0;
 }
 
-static int devices_delay(struct udev *udev, const char *devpath)
+static int devices_delay(struct udev *udev, const char *syspath)
 {
 	static const char *delay_device_list[] = {
 		"/block/md",
 		"/block/dm-",
 		NULL
 	};
+	size_t len;
 	int i;
 
+	len = strlen(udev_get_sys_path(udev));
+
 	for (i = 0; delay_device_list[i] != NULL; i++) {
-		if (strstr(devpath, delay_device_list[i]) != NULL) {
-			info(udev, "delaying: %s\n", devpath);
+		if (strstr(&syspath[len], delay_device_list[i]) != NULL) {
+			info(udev, "delaying: %s\n", syspath);
 			return 1;
 		}
 	}
 	return 0;
 }
 
-static int devices_call(struct udev *udev, const char *devpath,
-			int (*cb)(struct udev *udev,
-				  const char *devpath, const char *subsystem, const char *name,
-				  void *data),
-			void *data,
-			int *cb_rc)
+/**
+ * udev_enumerate_new:
+ * @udev: udev library context
+ *
+ * Returns: an enumeration context
+ **/
+struct udev_enumerate *udev_enumerate_new(struct udev *udev)
 {
-	char subsystem[UTIL_PATH_SIZE];
-	const char *name;
-
-	name = strrchr(devpath, '/');
-	if (name == NULL)
-		return -1;
-	name++;
+	struct udev_enumerate *udev_enumerate;
 
-	if (util_get_sys_subsystem(udev, devpath, subsystem, sizeof(subsystem)) < 2)
-		return -1;
-	*cb_rc = cb(udev, devpath, subsystem, name, data);
-	return 0;
+	udev_enumerate = malloc(sizeof(struct udev_enumerate));
+	if (udev_enumerate == NULL)
+		return NULL;
+	memset(udev_enumerate, 0x00, (sizeof(struct udev_enumerate)));
+	udev_enumerate->refcount = 1;
+	udev_enumerate->udev = udev;
+	list_init(&udev_enumerate->devices_list);
+	return udev_enumerate;
 }
 
 /**
- * udev_enumerate_devices:
- * @udev_device: udev device
- * @cb: function to be called for every property found
- * @data: data to be passed to the function
- *
- * Retrieve the property key/value pairs belonging to the
- * udev device. For every key/value pair, the passed function will be
- * called. If the function returns 1, remaning properties will be
- * ignored.
+ * udev_enumerate_scan_devices:
+ * @udev_enumerate: udev enumeration context
+ * @subsystem: the list of names of subsystems to look for devices
  *
- * Returns: the number of properties passed to the caller, or a negative value on error
+ * Returns: 0 on success.
  **/
-int udev_enumerate_devices(struct udev *udev, const char *subsystem,
-			   int (*cb)(struct udev *udev,
-				     const char *devpath, const char *subsystem, const char *name, void *data),
-			   void *data)
+int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerate, const char *subsystem, ...)
 {
+	struct udev *udev = udev_enumerate_get_udev(udev_enumerate);
+	va_list vargs;
+	const char *arg;
 	char base[UTIL_PATH_SIZE];
 	struct stat statbuf;
-	struct list_head device_list;
-	struct util_name_entry *loop_device;
-	struct util_name_entry *tmp_device;
-	int cb_rc = 0;
-	int count = 0;
+	struct list_node subsystem_include_list;
+	struct list_node subsystem_exclude_list;
+	struct udev_list_entry *list_entry;
 
-	INIT_LIST_HEAD(&device_list);
+	if (udev_enumerate == NULL)
+		return -EINVAL;
+
+	va_start(vargs, subsystem);
+	list_init(&subsystem_include_list);
+	list_init(&subsystem_exclude_list);
+	for (arg = subsystem; arg != NULL; arg = va_arg(vargs, const char *)) {
+		if (arg[0] != '!')
+			list_entry_add(udev, &subsystem_include_list, arg, NULL, 1, 0);
+		else
+			list_entry_add(udev, &subsystem_exclude_list, &arg[1], NULL, 1, 0);
+	}
+	va_end(vargs);
 
-	/* if we have /sys/subsystem/, forget all the old stuff */
 	util_strlcpy(base, udev_get_sys_path(udev), sizeof(base));
 	util_strlcat(base, "/subsystem", sizeof(base));
 	if (stat(base, &statbuf) == 0) {
-		devices_scan_subsystems(udev, "/subsystem", subsystem, "/devices", &device_list);
+		/* we have /subsystem/, forget all the old stuff */
+		info(udev, "searching '/subsystem/*/devices/*' dir\n");
+		devices_scan_subsystems(udev, "/subsystem", "/devices",
+					list_get_entry(&subsystem_include_list),
+					list_get_entry(&subsystem_exclude_list),
+					&udev_enumerate->devices_list);
 	} else {
-		devices_scan_subsystems(udev, "/bus", subsystem, "/devices", &device_list);
-		devices_scan_subsystems(udev, "/class", subsystem, NULL, &device_list);
-	}
+		info(udev, "searching '/bus/*/devices/*' dir\n");
+		devices_scan_subsystems(udev, "/bus", "/devices",
+					list_get_entry(&subsystem_include_list),
+					list_get_entry(&subsystem_exclude_list),
+					&udev_enumerate->devices_list);
+		info(udev, "searching '/class/*' dir\n");
+		devices_scan_subsystems(udev, "/class", NULL,
+					list_get_entry(&subsystem_include_list),
+					list_get_entry(&subsystem_exclude_list),
+					&udev_enumerate->devices_list);
+		/* if block isn't a class, scan /block/ */
+		util_strlcpy(base, udev_get_sys_path(udev), sizeof(base));
+		util_strlcat(base, "/class/block", sizeof(base));
+		if (stat(base, &statbuf) != 0) {
+			struct udev_list_entry *include_list = list_get_entry(&subsystem_include_list);
+			struct udev_list_entry *exclude_list = list_get_entry(&subsystem_exclude_list);
+			int include_block = (include_list == NULL || udev_list_entry_get_by_name(include_list, "block") != NULL);
+			int exclude_block = (udev_list_entry_get_by_name(exclude_list, "block") != NULL);
 
-	list_for_each_entry_safe(loop_device, tmp_device, &device_list, node) {
-		if (devices_delay(udev, loop_device->name))
-			continue;
-		if (cb_rc == 0)
-			if (devices_call(udev, loop_device->name, cb, data, &cb_rc) == 0)
-				count++;
-		list_del(&loop_device->node);
-		free(loop_device->name);
-		free(loop_device);
+			if (include_block && !exclude_block) {
+				info(udev, "searching '/block/*' dir\n");
+				/* scan disks */
+				devices_scan_subsystem(udev, "/block", NULL, NULL, &udev_enumerate->devices_list);
+				/* scan partitions */
+				info(udev, "searching '/block/*/*' dir\n");
+				devices_scan_subsystems(udev, "/block", NULL,
+							NULL, NULL,
+							&udev_enumerate->devices_list);
+			}
+		}
 	}
 
-	/* handle remaining delayed devices */
-	list_for_each_entry_safe(loop_device, tmp_device, &device_list, node) {
-		if (cb_rc == 0)
-			if (devices_call(udev, loop_device->name, cb, data, &cb_rc) == 0)
-				count++;
-		list_del(&loop_device->node);
-		free(loop_device->name);
-		free(loop_device);
+	list_cleanup(udev, &subsystem_include_list);
+	list_cleanup(udev, &subsystem_exclude_list);
+
+	/* 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);
 	}
+	return 0;
+}
 
-	return count;
+/**
+ * udev_enumerate_scan_subsystems:
+ * @udev_enumerate: udev enumeration context
+ *
+ * Returns: 0 on success.
+ **/
+int udev_enumerate_scan_subsystems(struct udev_enumerate *udev_enumerate)
+{
+	struct udev *udev = udev_enumerate_get_udev(udev_enumerate);
+	char base[UTIL_PATH_SIZE];
+	struct stat statbuf;
+	const char *subsysdir;
+
+	if (udev_enumerate == NULL)
+		return -EINVAL;
+
+	util_strlcpy(base, udev_get_sys_path(udev), sizeof(base));
+	util_strlcat(base, "/subsystem", sizeof(base));
+	if (stat(base, &statbuf) == 0)
+		subsysdir = "/subsystem";
+	else
+		subsysdir = "/bus";
+	info(udev, "searching '%s/*' dir\n", subsysdir);
+	devices_scan_subsystem(udev, subsysdir, NULL, NULL, &udev_enumerate->devices_list);
+	info(udev, "searching '%s/*/drivers/*' dir\n", subsysdir);
+	devices_scan_subsystems(udev, subsysdir, "/drivers",
+				NULL, NULL,
+				&udev_enumerate->devices_list);
+	return 0;
 }