PawletOS/external_libudev-zero
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

udev_enumerate.c: support NULL value in match/nomatch

Browse Source 
Fixes: #45
This commit is contained in:
illiliti
2021-12-16 07:09:16 +03:00
parent 505c61819b
commit 4154cf252c
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
udev_enumerate.c
View File

@@ -193,20 +193,17 @@ static int filter_property(struct udev_enumerate *udev_enumerate, struct udev_de
static int filter_sysattr(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device)
{
const char *sysattr, *value, *value2;
struct udev_list_entry *list_entry;
const char *sysattr, *value;
list_entry = udev_list_entry_get_next(&udev_enumerate->sysattr_nomatch);
while (list_entry) {
sysattr = udev_list_entry_get_name(list_entry);
value2 = udev_list_entry_get_value(list_entry);
value = udev_device_get_sysattr_value(udev_device, sysattr);
if (!value) {
return 1;
}
if (fnmatch(udev_list_entry_get_value(list_entry), value, 0) == 0) {
if (value && value2 && fnmatch(value2, value, 0) == 0) {
return 0;
}
@@ -218,13 +215,10 @@ static int filter_sysattr(struct udev_enumerate *udev_enumerate, struct udev_dev
if (list_entry) {
while (list_entry) {
sysattr = udev_list_entry_get_name(list_entry);
value2 = udev_list_entry_get_value(list_entry);
value = udev_device_get_sysattr_value(udev_device, sysattr);
if (!value) {
return 0;
}
if (fnmatch(udev_list_entry_get_value(list_entry), value, 0) == 0) {
if (value && value2 && fnmatch(value2, value, 0) == 0) {
return 1;
}