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