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

fix gcc 10

Browse Source
This commit is contained in:
illiliti
2020-07-26 12:34:43 +03:00
parent b9ab0e2fe9
commit a5d5e4dd2b
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
udev.c
View File

@@ -11,6 +11,12 @@ struct udev *udev_new(void)
struct udev *udev;
udev = calloc(1, sizeof(struct udev));
if (!udev) {
return NULL;
}
udev->refcount = 1;
return udev;
}

21
udev_device.c
View File

@@ -298,7 +298,7 @@ int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *s
return 0;
}
static const char *udev_device_read_symlink(struct udev_device *udev_device, const char *name)
static char *udev_device_read_symlink(struct udev_device *udev_device, const char *name)
{
char link[PATH_MAX], path[PATH_MAX];
ssize_t len;
@@ -312,7 +312,7 @@ static const char *udev_device_read_symlink(struct udev_device *udev_device, con
}
link[len] = '\0';
return strrchr(link, '/') + 1;
return strdup(strrchr(link, '/') + 1);
}
static void udev_device_set_properties_from_uevent(struct udev_device *udev_device)
@@ -424,6 +424,7 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
{
char path[PATH_MAX], file[PATH_MAX + 7];
struct udev_device *udev_device;
char *subsystem, *driver;
struct stat st;
if (!udev || !syspath) {
@@ -459,8 +460,20 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
udev_list_entry_add(&udev_device->properties, "SYSPATH", path);
udev_list_entry_add(&udev_device->properties, "DEVPATH", path + 4);
udev_list_entry_add(&udev_device->properties, "DRIVER", udev_device_read_symlink(udev_device, "driver"));
udev_list_entry_add(&udev_device->properties, "SUBSYSTEM", udev_device_read_symlink(udev_device, "subsystem"));
subsystem = udev_device_read_symlink(udev_device, "subsystem");
if (subsystem) {
udev_list_entry_add(&udev_device->properties, "SUBSYSTEM", subsystem);
free(subsystem);
}
driver = udev_device_read_symlink(udev_device, "driver");
if (driver) {
udev_list_entry_add(&udev_device->properties, "DRIVER", driver);
free(driver);
}
udev_device_set_properties_from_uevent(udev_device);
udev_device_set_properties_from_ioctl(udev_device);