X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-enumerate.c;h=a92bf0b6207c165f561ef39f50d1fc5a08e652fa;hb=4061ab9f4bb0bdad3858e8ef1738dc892afe9de4;hp=618ffbc3e9cd66c419cc0f63f2b27d26033d87c3;hpb=1e78dcbe51419124846e1f35e540cb0253362231;p=elogind.git

diff --git a/udev/lib/libudev-enumerate.c b/udev/lib/libudev-enumerate.c
index 618ffbc3e..a92bf0b62 100644
--- a/udev/lib/libudev-enumerate.c
+++ b/udev/lib/libudev-enumerate.c
@@ -3,18 +3,10 @@
  *
  * Copyright (C) 2008 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, either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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, see <http://www.gnu.org/licenses/>.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 #include <stdio.h>
@@ -39,6 +31,7 @@ struct udev_enumerate {
 	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 properties_match_list;
 	struct udev_list_node devices_list;
 	int devices_sorted;
 };
@@ -63,6 +56,7 @@ struct udev_enumerate *udev_enumerate_new(struct udev *udev)
 	udev_list_init(&udev_enumerate->sysattr_nomatch_list);
 	udev_list_init(&udev_enumerate->subsystem_match_list);
 	udev_list_init(&udev_enumerate->subsystem_nomatch_list);
+	udev_list_init(&udev_enumerate->properties_match_list);
 	return udev_enumerate;
 }
 
@@ -86,6 +80,7 @@ void udev_enumerate_unref(struct udev_enumerate *udev_enumerate)
 	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);
+	udev_list_cleanup_entries(udev_enumerate->udev, &udev_enumerate->properties_match_list);
 	free(udev_enumerate);
 }
 
@@ -178,6 +173,18 @@ exit:
 	return match;
 }
 
+int udev_enumerate_add_match_property(struct udev_enumerate *udev_enumerate, const char *property, const char *value)
+{
+	if (udev_enumerate == NULL)
+		return -EINVAL;
+	if (property == NULL)
+		return 0;
+	if (udev_list_entry_add(udev_enumerate_get_udev(udev_enumerate),
+				&udev_enumerate->properties_match_list, property, value, 1, 0) == NULL)
+		return -ENOMEM;
+	return 0;
+}
+
 static int match_sysattr(struct udev_enumerate *udev_enumerate, const char *syspath)
 {
 	struct udev *udev = udev_enumerate_get_udev(udev_enumerate);
@@ -204,6 +211,51 @@ static int match_sysattr(struct udev_enumerate *udev_enumerate, const char *sysp
 	return 1;
 }
 
+static int match_property(struct udev_enumerate *udev_enumerate, const char *syspath)
+{
+	struct udev_device *dev;
+	struct udev_list_entry *list_entry;
+	int match = 0;
+
+	/* no match always matches */
+	if (udev_list_get_entry(&udev_enumerate->properties_match_list) == NULL)
+		return 1;
+
+	/* no device does not match */
+	dev = udev_device_new_from_syspath(udev_enumerate->udev, syspath);
+	if (dev == NULL)
+		return 0;
+
+	/* loop over matches */
+	udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_enumerate->properties_match_list)) {
+		struct udev_list_entry *property_entry;
+
+		/* loop over device properties */
+		udev_list_entry_foreach(property_entry, udev_device_get_properties_list_entry(dev)) {
+			if (fnmatch(udev_list_entry_get_name(list_entry), udev_list_entry_get_name(property_entry), 0) == 0) {
+				const char *match_value;
+				const char *dev_value;
+
+				match_value = udev_list_entry_get_value(list_entry);
+				dev_value = udev_list_entry_get_value(property_entry);
+				if (match_value == NULL && dev_value == NULL) {
+					match = 1;
+					goto out;
+				}
+				if (match_value == NULL || dev_value == NULL)
+					continue;
+				if (fnmatch(match_value, dev_value, 0) == 0) {
+					match = 1;
+					goto out;
+				}
+			}
+		}
+	}
+out:
+	udev_device_unref(dev);
+	return match;
+}
+
 static int scan_dir_and_add_devices(struct udev_enumerate *udev_enumerate,
 				    const char *basedir, const char *subdir1, const char *subdir2)
 {
@@ -248,6 +300,8 @@ static int scan_dir_and_add_devices(struct udev_enumerate *udev_enumerate,
 			continue;
 		if (!match_sysattr(udev_enumerate, syspath))
 			continue;
+		if (!match_property(udev_enumerate, syspath))
+			continue;
 		udev_list_entry_add(udev, &udev_enumerate->devices_list, syspath, NULL, 1, 1);
 	}
 	closedir(dir);