libudev: enumerate - add lookup by property

[elogind.git] / udev / lib / libudev-enumerate.c

diff --git a/udev/lib/libudev-enumerate.c b/udev/lib/libudev-enumerate.c
index b35a82d0ceda8819fece12360eaf4edb3bdf627e..abc89d5cab98b3b8d6a05039d526ad112dd3e747 100644 (file)
--- a/udev/lib/libudev-enumerate.c
+++ b/udev/lib/libudev-enumerate.c
@@ -39,6 +39,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;
 };
@@ -53,10 +54,9 @@ struct udev_enumerate *udev_enumerate_new(struct udev *udev)
 {
        struct udev_enumerate *udev_enumerate;
 
-       udev_enumerate = malloc(sizeof(struct udev_enumerate));
+       udev_enumerate = calloc(1, 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;
        udev_list_init(&udev_enumerate->devices_list);
@@ -64,6 +64,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;
 }
 
@@ -87,6 +88,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);
 }
 
@@ -179,6 +181,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);
@@ -205,6 +219,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)
 {
@@ -249,6 +308,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);
@@ -311,7 +372,7 @@ static int devices_delay(struct udev *udev, const char *syspath)
        len = strlen(udev_get_sys_path(udev));
        for (i = 0; delay_device_list[i] != NULL; i++) {
                if (strstr(&syspath[len], delay_device_list[i]) != NULL) {
-                       info(udev, "delaying: %s\n", syspath);
+                       dbg(udev, "delaying: %s\n", syspath);
                        return 1;
                }
        }
@@ -321,11 +382,22 @@ static int devices_delay(struct udev *udev, const char *syspath)
 /* sort delayed devices to the end of the list */
 static int devices_sort(struct udev_enumerate *udev_enumerate)
 {
-       struct udev_list_entry *list_entry;
+       struct udev_list_entry *entry_loop;
+       struct udev_list_entry *entry_tmp;
+       struct udev_list_node devices_list;
 
-       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_list_init(&devices_list);
+       /* move delayed to delay list */
+       udev_list_entry_foreach_safe(entry_loop, entry_tmp, udev_list_get_entry(&udev_enumerate->devices_list)) {
+               if (devices_delay(udev_enumerate->udev, udev_list_entry_get_name(entry_loop))) {
+                       udev_list_entry_remove(entry_loop);
+                       udev_list_entry_append(entry_loop, &devices_list);
+               }
+       }
+       /* move delayed back to end of list */
+       udev_list_entry_foreach_safe(entry_loop, entry_tmp, udev_list_get_entry(&devices_list)) {
+               udev_list_entry_remove(entry_loop);
+               udev_list_entry_append(entry_loop, &udev_enumerate->devices_list);
        }
        udev_enumerate->devices_sorted = 1;
        return 0;
@@ -361,7 +433,6 @@ int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerate)
        struct udev *udev = udev_enumerate_get_udev(udev_enumerate);
        char base[UTIL_PATH_SIZE];
        struct stat statbuf;
-       struct udev_list_entry *list_entry;
 
        if (udev_enumerate == NULL)
                return -EINVAL;
@@ -369,32 +440,27 @@ int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerate)
        util_strlcat(base, "/subsystem", sizeof(base));
        if (stat(base, &statbuf) == 0) {
                /* we have /subsystem/, forget all the old stuff */
-               info(udev, "searching '/subsystem/*/devices/*' dir\n");
+               dbg(udev, "searching '/subsystem/*/devices/*' dir\n");
                scan_dir(udev_enumerate, "subsystem", "devices", NULL);
        } else {
-               info(udev, "searching '/bus/*/devices/*' dir\n");
+               dbg(udev, "searching '/bus/*/devices/*' dir\n");
                scan_dir(udev_enumerate, "bus", "devices", NULL);
-               info(udev, "searching '/class/*' dir\n");
+               dbg(udev, "searching '/class/*' dir\n");
                scan_dir(udev_enumerate, "class", NULL, NULL);
                /* 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) {
                        if (match_subsystem(udev_enumerate, "block")) {
-                               info(udev, "searching '/block/*' dir\n");
+                               dbg(udev, "searching '/block/*' dir\n");
                                /* scan disks */
                                scan_dir_and_add_devices(udev_enumerate, "block", NULL, NULL);
                                /* scan partitions */
-                               info(udev, "searching '/block/*/*' dir\n");
+                               dbg(udev, "searching '/block/*/*' dir\n");
                                scan_dir(udev_enumerate, "block", NULL, "block");
                        }
                }
        }
-       /* sort delayed devices to the end of the 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)))
-                       udev_list_entry_move_to_end(list_entry);
-       }
        return 0;
 }
 
@@ -420,11 +486,11 @@ int udev_enumerate_scan_subsystems(struct udev_enumerate *udev_enumerate)
        else
                subsysdir = "bus";
        if (match_subsystem(udev_enumerate, "subsystem")) {
-               info(udev, "searching '%s/*' dir\n", subsysdir);
+               dbg(udev, "searching '%s/*' dir\n", subsysdir);
                scan_dir_and_add_devices(udev_enumerate, subsysdir, NULL, NULL);
        }
        if (match_subsystem(udev_enumerate, "drivers")) {
-               info(udev, "searching '%s/*/drivers/*' dir\n", subsysdir);
+               dbg(udev, "searching '%s/*/drivers/*' dir\n", subsysdir);
                scan_dir(udev_enumerate, subsysdir, "drivers", "drivers");
        }
        return 0;