picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libudev: enumerate - do not ignore other matches when add_match_tag() is used

Browse source
This commit is contained in:
Kay Sievers 2011-05-26 02:15:43 +02:00
parent 7df0ed83c1
commit 19e47d9725
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libudev/libudev-enumerate.c
View file

@ -765,7 +765,18 @@ UDEV_EXPORT int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerat
dev = udev_device_new_from_id_filename(udev_enumerate->udev, dent->d_name);
if (dev == NULL)
continue;
if (!match_subsystem(udev_enumerate, udev_device_get_subsystem(dev)))
goto nomatch;
if (!match_sysname(udev_enumerate, udev_device_get_sysname(dev)))
goto nomatch;
if (!match_property(udev_enumerate, dev))
goto nomatch;
if (!match_sysattr(udev_enumerate, dev))
goto nomatch;
syspath_add(udev_enumerate, udev_device_get_syspath(dev));
nomatch:
udev_device_unref(dev);
}
closedir(dir);