From 4b60fe6e83172413ef13a7fc6e20e417f73bc6ff Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 14 Oct 2018 01:12:22 +0900 Subject: [PATCH] udev: replace udev_device by sd_device in udev-builtin-uaccess.c --- src/udev/udev-builtin-uaccess.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c index 695a411..6806b9e 100644 --- a/src/udev/udev-builtin-uaccess.c +++ b/src/udev/udev-builtin-uaccess.c @@ -15,11 +15,12 @@ #include "log.h" #include "udev-builtin.h" -static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool test) { +static int builtin_uaccess(struct udev_device *_dev, int argc, char *argv[], bool test) { int r; const char *path = NULL, *seat; bool changed_acl = false; uid_t uid; + sd_device *dev = _dev->device; umask(0022); @@ -27,9 +28,11 @@ static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool if (!logind_running()) return 0; - path = udev_device_get_devnode(dev); - seat = udev_device_get_property_value(dev, "ID_SEAT"); - if (!seat) + r = sd_device_get_devname(dev, &path); + if (r < 0) + goto finish; + + if (sd_device_get_property_value(dev, "ID_SEAT", &seat) < 0) seat = "seat0"; r = sd_seat_get_active(seat, NULL, &uid); -- 2.7.4