#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;
};
/**
{
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;
- 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;
}
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);
}
{
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)
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;
}
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;
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) {
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;
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;
{
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;
}
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;
}
}
}
/* 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;
}