X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev-enumerate.c;h=618ffbc3e9cd66c419cc0f63f2b27d26033d87c3;hp=fab9c4d88df7259977d74fa17146cd5963c48918;hb=1e78dcbe51419124846e1f35e540cb0253362231;hpb=8cd2e972e537a351f0948e7762d2d2e51ad358ef diff --git a/udev/lib/libudev-enumerate.c b/udev/lib/libudev-enumerate.c index fab9c4d88..618ffbc3e 100644 --- a/udev/lib/libudev-enumerate.c +++ b/udev/lib/libudev-enumerate.c @@ -35,8 +35,8 @@ static int devices_sort(struct udev_enumerate *udev_enumerate); struct udev_enumerate { struct udev *udev; int refcount; - struct udev_list_node attr_match_list; - struct udev_list_node attr_nomatch_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; @@ -53,15 +53,14 @@ 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); - udev_list_init(&udev_enumerate->attr_match_list); - udev_list_init(&udev_enumerate->attr_nomatch_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; @@ -82,11 +81,11 @@ void udev_enumerate_unref(struct udev_enumerate *udev_enumerate) udev_enumerate->refcount--; if (udev_enumerate->refcount > 0) return; - udev_list_cleanup(udev_enumerate->udev, &udev_enumerate->devices_list); - udev_list_cleanup(udev_enumerate->udev, &udev_enumerate->attr_match_list); - udev_list_cleanup(udev_enumerate->udev, &udev_enumerate->attr_nomatch_list); - udev_list_cleanup(udev_enumerate->udev, &udev_enumerate->subsystem_match_list); - udev_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); } @@ -130,31 +129,31 @@ int udev_enumerate_add_nomatch_subsystem(struct udev_enumerate *udev_enumerate, 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 (udev_list_entry_add(udev_enumerate_get_udev(udev_enumerate), - &udev_enumerate->attr_match_list, attr, value, 1, 0) == NULL) + &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 (udev_list_entry_add(udev_enumerate_get_udev(udev_enumerate), - &udev_enumerate->attr_nomatch_list, attr, value, 1, 0) == NULL) + &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; @@ -163,7 +162,7 @@ static int match_attr_value(struct udev *udev, const char *syspath, const char * 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) { @@ -179,23 +178,23 @@ exit: 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, udev_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 (udev_list_get_entry(&udev_enumerate->attr_match_list) != NULL) { - udev_list_entry_foreach(list_entry, udev_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; @@ -247,7 +246,7 @@ static int scan_dir_and_add_devices(struct udev_enumerate *udev_enumerate, 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; udev_list_entry_add(udev, &udev_enumerate->devices_list, syspath, NULL, 1, 1); } @@ -311,7 +310,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 +320,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 +371,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 +378,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 +424,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;