#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 subsystem_match_list;
struct list_node subsystem_nomatch_list;
struct list_node devices_list;
+ int devices_sorted;
};
/**
{
if (udev_enumerate == NULL)
return NULL;
+ if (!udev_enumerate->devices_sorted)
+ devices_sort(udev_enumerate);
return list_get_entry(&udev_enumerate->devices_list);
}
return 1;
}
-static int scan_dir_and_add_devices(struct udev_enumerate *udev_enumerate, const char *basedir, const char *subdir1, const char *subdir2)
+static int scan_dir_and_add_devices(struct udev_enumerate *udev_enumerate,
+ const char *basedir, const char *subdir1, const char *subdir2)
{
struct udev *udev = udev_enumerate_get_udev(udev_enumerate);
char path[UTIL_PATH_SIZE];
util_strlcpy(syspath, path, sizeof(syspath));
util_strlcat(syspath, "/", sizeof(syspath));
util_strlcat(syspath, dent->d_name, sizeof(syspath));
+ if (lstat(syspath, &statbuf) != 0)
+ continue;
+ if (S_ISREG(statbuf.st_mode))
+ continue;
+ if (S_ISLNK(statbuf.st_mode))
+ util_resolve_sys_link(udev, syspath, 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));
if (!match_attr(udev_enumerate, syspath))
continue;
list_entry_add(udev, &udev_enumerate->devices_list, syspath, NULL, 1, 1);
return 1;
}
-static int scan_dir(struct udev_enumerate *udev_enumerate, const char *basedir, const char *subdir, const char *match)
+static int scan_dir(struct udev_enumerate *udev_enumerate, const char *basedir, const char *subdir, const char *subsystem)
{
struct udev *udev = udev_enumerate_get_udev(udev_enumerate);
for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
if (dent->d_name[0] == '.')
continue;
- if (!match_subsystem(udev_enumerate, match != NULL ? match : dent->d_name))
+ if (!match_subsystem(udev_enumerate, subsystem != NULL ? subsystem : dent->d_name))
continue;
scan_dir_and_add_devices(udev_enumerate, basedir, dent->d_name, subdir);
}
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, list_get_entry(&udev_enumerate->devices_list)) {
+ if (devices_delay(udev_enumerate->udev, udev_list_entry_get_name(list_entry)))
+ 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,
+ /* resolve to real syspath */
+ udev_device = udev_device_new_from_syspath(udev_enumerate->udev, syspath);
+ if (udev_device == NULL)
+ return -EINVAL;
+ 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);
- }
+ udev_device_unref(udev_device);
return 0;
}
info(udev, "searching '%s/*' dir\n", subsysdir);
scan_dir_and_add_devices(udev_enumerate, subsysdir, NULL, NULL);
}
- info(udev, "searching '%s/*/drivers/*' dir\n", subsysdir);
- scan_dir(udev_enumerate, subsysdir, "drivers", "drivers");
+ if (match_subsystem(udev_enumerate, "drivers")) {
+ info(udev, "searching '%s/*/drivers/*' dir\n", subsysdir);
+ scan_dir(udev_enumerate, subsysdir, "drivers", "drivers");
+ }
return 0;
}