backlight: replace udev_device by sd_device

1 files changed, 166 insertions, 150 deletions

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 2b1a1683e2..e574a4d56d 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -1,42 +1,45 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include "libudev.h"
+#include "sd-device.h"
 
 #include "alloc-util.h"
 #include "def.h"
+#include "device-enumerator-private.h"
 #include "escape.h"
 #include "fileio.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "proc-cmdline.h"
 #include "string-util.h"
-#include "udev-util.h"
+#include "strv.h"
 #include "util.h"
 
-static struct udev_device *find_pci_or_platform_parent(struct udev_device *device) {
-        struct udev_device *parent;
-        const char *subsystem, *sysname;
+static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) {
+        const char *subsystem, *sysname, *value;
+        sd_device *parent;
+        int r;
 
         assert(device);
+        assert(ret);
 
-        parent = udev_device_get_parent(device);
-        if (!parent)
-                return NULL;
+        r = sd_device_get_parent(device, &parent);
+        if (r < 0)
+                return r;
 
-        subsystem = udev_device_get_subsystem(parent);
-        if (!subsystem)
-                return NULL;
+        r = sd_device_get_subsystem(parent, &subsystem);
+        if (r < 0)
+                return r;
 
-        sysname = udev_device_get_sysname(parent);
-        if (!sysname)
-                return NULL;
+        r = sd_device_get_sysname(parent, &sysname);
+        if (r < 0)
+                return r;
 
         if (streq(subsystem, "drm")) {
                 const char *c;
 
                 c = startswith(sysname, "card");
                 if (!c)
-                        return NULL;
+                        return -ENODATA;
 
                 c += strspn(c, DIGITS);
                 if (*c == '-') {
@@ -44,54 +47,68 @@ static struct udev_device *find_pci_or_platform_parent(struct udev_device *devic
 
                         if (!startswith(c, "-LVDS-") &&
                             !startswith(c, "-Embedded DisplayPort-"))
-                                return NULL;
+                                return -EOPNOTSUPP;
                 }
 
-        } else if (streq(subsystem, "pci")) {
-                const char *value;
-
-                value = udev_device_get_sysattr_value(parent, "class");
-                if (value) {
-                        unsigned long class = 0;
+        } else if (streq(subsystem, "pci") &&
+                   sd_device_get_sysattr_value(parent, "class", &value) >= 0) {
+                unsigned long class = 0;
 
-                        if (safe_atolu(value, &class) < 0) {
-                                log_warning("Cannot parse PCI class %s of device %s:%s.",
-                                            value, subsystem, sysname);
-                                return NULL;
-                        }
+                r = safe_atolu(value, &class);
+                if (r < 0)
+                        return log_warning_errno(r, "Cannot parse PCI class '%s' of device %s:%s: %m",
+                                                 value, subsystem, sysname);
 
-                        /* Graphics card */
-                        if (class == 0x30000)
-                                return parent;
+                /* Graphics card */
+                if (class == 0x30000) {
+                        *ret = TAKE_PTR(parent);
+                        return 0;
                 }
 
-        } else if (streq(subsystem, "platform"))
-                return parent;
+        } else if (streq(subsystem, "platform")) {
+                *ret = TAKE_PTR(parent);
+                return 0;
+        }
 
-        return find_pci_or_platform_parent(parent);
+        return find_pci_or_platform_parent(parent, ret);
 }
 
-static bool same_device(struct udev_device *a, struct udev_device *b) {
+static int same_device(sd_device *a, sd_device *b) {
+        const char *a_val, *b_val;
+        int r;
+
         assert(a);
         assert(b);
 
-        if (!streq_ptr(udev_device_get_subsystem(a), udev_device_get_subsystem(b)))
-                return false;
+        r = sd_device_get_subsystem(a, &a_val);
+        if (r < 0)
+                return r;
+
+        r = sd_device_get_subsystem(b, &b_val);
+        if (r < 0)
+                return r;
 
-        if (!streq_ptr(udev_device_get_sysname(a), udev_device_get_sysname(b)))
+        if (!streq_ptr(a_val, b_val))
                 return false;
 
-        return true;
+        r = sd_device_get_sysname(a, &a_val);
+        if (r < 0)
+                return r;
+
+        r = sd_device_get_sysname(b, &b_val);
+        if (r < 0)
+                return r;
+
+        return streq_ptr(a_val, b_val);
 }
 
-static bool validate_device(struct udev *udev, struct udev_device *device) {
-        _cleanup_(udev_enumerate_unrefp) struct udev_enumerate *enumerate = NULL;
-        struct udev_list_entry *item = NULL, *first = NULL;
-        struct udev_device *parent;
+static int validate_device(sd_device *device) {
+        _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *enumerate = NULL;
+        _cleanup_(sd_device_unrefp) sd_device *parent = NULL;
         const char *v, *subsystem;
+        sd_device *other;
         int r;
 
-        assert(udev);
         assert(device);
 
         /* Verify whether we should actually care for a specific
@@ -108,76 +125,85 @@ static bool validate_device(struct udev *udev, struct udev_device *device) {
          * that we use "raw" only if no "firmware" or "platform"
          * device for the same device exists. */
 
-        subsystem = udev_device_get_subsystem(device);
-        if (!streq_ptr(subsystem, "backlight"))
+        r = sd_device_get_subsystem(device, &subsystem);
+        if (r < 0)
+                return r;
+        if (!streq(subsystem, "backlight"))
                 return true;
 
-        v = udev_device_get_sysattr_value(device, "type");
-        if (!streq_ptr(v, "raw"))
+        r = sd_device_get_sysattr_value(device, "type", &v);
+        if (r < 0)
+                return r;
+        if (!streq(v, "raw"))
                 return true;
 
-        parent = find_pci_or_platform_parent(device);
-        if (!parent)
-                return true;
+        r = find_pci_or_platform_parent(device, &parent);
+        if (r < 0)
+                return r;
 
-        subsystem = udev_device_get_subsystem(parent);
-        if (!subsystem)
-                return true;
+        r = sd_device_get_subsystem(parent, &subsystem);
+        if (r < 0)
+                return r;
 
-        enumerate = udev_enumerate_new(udev);
-        if (!enumerate)
-                return true;
+        r = sd_device_enumerator_new(&enumerate);
+        if (r < 0)
+                return r;
 
-        r = udev_enumerate_add_match_subsystem(enumerate, "backlight");
+        r = sd_device_enumerator_allow_uninitialized(enumerate);
         if (r < 0)
-                return true;
+                return r;
 
-        r = udev_enumerate_scan_devices(enumerate);
+        r = sd_device_enumerator_add_match_subsystem(enumerate, "backlight", true);
         if (r < 0)
-                return true;
+                return r;
 
-        first = udev_enumerate_get_list_entry(enumerate);
-        udev_list_entry_foreach(item, first) {
-                _cleanup_(udev_device_unrefp) struct udev_device *other;
-                struct udev_device *other_parent;
-                const char *other_subsystem;
+        r = device_enumerator_scan_devices(enumerate);
+        if (r < 0)
+                return r;
 
-                other = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
-                if (!other)
-                        return true;
+        FOREACH_DEVICE_AND_SUBSYSTEM(enumerate, other) {
+                _cleanup_(sd_device_unrefp) sd_device *other_parent = NULL;
+                const char *other_subsystem;
 
-                if (same_device(device, other))
+                if (same_device(device, other) > 0)
                         continue;
 
-                v = udev_device_get_sysattr_value(other, "type");
-                if (!STRPTR_IN_SET(v, "platform", "firmware"))
+                if (sd_device_get_sysattr_value(other, "type", &v) < 0 ||
+                    !STR_IN_SET(v, "platform", "firmware"))
                         continue;
 
                 /* OK, so there's another backlight device, and it's a
                  * platform or firmware device, so, let's see if we
-                 * can verify it belongs to the same device as
-                 * ours. */
-                other_parent = find_pci_or_platform_parent(other);
-                if (!other_parent)
+                 * can verify it belongs to the same device as ours. */
+                if (find_pci_or_platform_parent(other, &other_parent) < 0)
                         continue;
 
                 if (same_device(parent, other_parent)) {
-                        /* Both have the same PCI parent, that means
-                         * we are out. */
+                        const char *device_sysname = NULL, *other_sysname = NULL;
+
+                        /* Both have the same PCI parent, that means we are out. */
+
+                        (void) sd_device_get_sysname(device, &device_sysname);
+                        (void) sd_device_get_sysname(other, &other_sysname);
+
                         log_debug("Skipping backlight device %s, since device %s is on same PCI device and takes precedence.",
-                                  udev_device_get_sysname(device),
-                                  udev_device_get_sysname(other));
+                                  device_sysname, other_sysname);
                         return false;
                 }
 
-                other_subsystem = udev_device_get_subsystem(other_parent);
-                if (streq_ptr(other_subsystem, "platform") && streq_ptr(subsystem, "pci")) {
-                        /* The other is connected to the platform bus
-                         * and we are a PCI device, that also means we
-                         * are out. */
+                if (sd_device_get_subsystem(other_parent, &other_subsystem) < 0)
+                        continue;
+
+                if (streq(other_subsystem, "platform") && streq(subsystem, "pci")) {
+                        const char *device_sysname = NULL, *other_sysname = NULL;
+
+                        /* The other is connected to the platform bus and we are a PCI device, that also means we are out. */
+
+                        (void) sd_device_get_sysname(device, &device_sysname);
+                        (void) sd_device_get_sysname(other, &other_sysname);
+
                         log_debug("Skipping backlight device %s, since device %s is a platform device and takes precedence.",
-                                  udev_device_get_sysname(device),
-                                  udev_device_get_sysname(other));
+                                  device_sysname, other_sysname);
                         return false;
                 }
         }
@@ -185,29 +211,29 @@ static bool validate_device(struct udev *udev, struct udev_device *device) {
         return true;
 }
 
-static unsigned get_max_brightness(struct udev_device *device) {
-        int r;
+static int get_max_brightness(sd_device *device, unsigned *ret) {
         const char *max_brightness_str;
         unsigned max_brightness;
+        int r;
 
-        max_brightness_str = udev_device_get_sysattr_value(device, "max_brightness");
-        if (!max_brightness_str) {
-                log_warning("Failed to read 'max_brightness' attribute.");
-                return 0;
-        }
+        assert(device);
+        assert(ret);
+
+        r = sd_device_get_sysattr_value(device, "max_brightness", &max_brightness_str);
+        if (r < 0)
+                return log_warning_errno(r, "Failed to read 'max_brightness' attribute: %m");
 
         r = safe_atou(max_brightness_str, &max_brightness);
-        if (r < 0) {
-                log_warning_errno(r, "Failed to parse 'max_brightness' \"%s\": %m", max_brightness_str);
-                return 0;
-        }
+        if (r < 0)
+                return log_warning_errno(r, "Failed to parse 'max_brightness' \"%s\": %m", max_brightness_str);
 
         if (max_brightness <= 0) {
                 log_warning("Maximum brightness is 0, ignoring device.");
-                return 0;
+                return -EINVAL;
         }
 
-        return max_brightness;
+        *ret = max_brightness;
+        return 0;
 }
 
 /* Some systems turn the backlight all the way off at the lowest levels.
@@ -215,50 +241,54 @@ static unsigned get_max_brightness(struct udev_device *device) {
  * max_brightness in case of 'backlight' subsystem. This avoids preserving
  * an unreadably dim screen, which would otherwise force the user to
  * disable state restoration. */
-static void clamp_brightness(struct udev_device *device, char **value, unsigned max_brightness) {
+static int clamp_brightness(sd_device *device, char **value, unsigned max_brightness) {
         unsigned brightness, new_brightness, min_brightness;
         const char *subsystem;
         int r;
 
+        assert(value);
+        assert(*value);
+
         r = safe_atou(*value, &brightness);
-        if (r < 0) {
-                log_warning_errno(r, "Failed to parse brightness \"%s\": %m", *value);
-                return;
-        }
+        if (r < 0)
+                return log_warning_errno(r, "Failed to parse brightness \"%s\": %m", *value);
 
-        subsystem = udev_device_get_subsystem(device);
-        if (streq_ptr(subsystem, "backlight"))
+        r = sd_device_get_subsystem(device, &subsystem);
+        if (r < 0)
+                return log_warning_errno(r, "Failed to get device subsystem: %m");
+
+        if (streq(subsystem, "backlight"))
                 min_brightness = MAX(1U, max_brightness/20);
         else
                 min_brightness = 0;
 
         new_brightness = CLAMP(brightness, min_brightness, max_brightness);
         if (new_brightness != brightness) {
-                char *old_value = *value;
+                char *new_value;
 
-                r = asprintf(value, "%u", new_brightness);
-                if (r < 0) {
-                        log_oom();
-                        return;
-                }
+                r = asprintf(&new_value, "%u", new_brightness);
+                if (r < 0)
+                        return log_oom();
 
-                log_info("Saved brightness %s %s to %s.", old_value,
+                log_info("Saved brightness %s %s to %s.", *value,
                          new_brightness > brightness ?
                          "too low; increasing" : "too high; decreasing",
-                         *value);
+                         new_value);
 
-                free(old_value);
+                free_and_replace(*value, new_value);
         }
+
+        return 0;
 }
 
-static bool shall_clamp(struct udev_device *d) {
+static bool shall_clamp(sd_device *d) {
         const char *s;
         int r;
 
         assert(d);
 
-        s = udev_device_get_property_value(d, "ID_BACKLIGHT_CLAMP");
-        if (!s)
+        r = sd_device_get_property_value(d, "ID_BACKLIGHT_CLAMP", &s);
+        if (r < 0)
                 return true;
 
         r = parse_boolean(s);
@@ -271,8 +301,7 @@ static bool shall_clamp(struct udev_device *d) {
 }
 
 int main(int argc, char *argv[]) {
-        _cleanup_(udev_unrefp) struct udev *udev = NULL;
-        _cleanup_(udev_device_unrefp) struct udev_device *device = NULL;
+        _cleanup_(sd_device_unrefp) sd_device *device = NULL;
         _cleanup_free_ char *escaped_ss = NULL, *escaped_sysname = NULL, *escaped_path_id = NULL;
         const char *sysname, *path_id, *ss, *saved;
         unsigned max_brightness;
@@ -295,12 +324,6 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        udev = udev_new();
-        if (!udev) {
-                log_oom();
-                return EXIT_FAILURE;
-        }
-
         sysname = strchr(argv[2], ':');
         if (!sysname) {
                 log_error("Requires a subsystem and sysname pair specifying a backlight device.");
@@ -316,23 +339,17 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        errno = 0;
-        device = udev_device_new_from_subsystem_sysname(udev, ss, sysname);
-        if (!device) {
-                if (errno > 0)
-                        log_error_errno(errno, "Failed to get backlight or LED device '%s:%s': %m", ss, sysname);
-                else
-                        log_oom();
-
+        r = sd_device_new_from_subsystem_sysname(&device, ss, sysname);
+        if (r < 0) {
+                log_error_errno(r, "Failed to get backlight or LED device '%s:%s': %m", ss, sysname);
                 return EXIT_FAILURE;
         }
 
         /* If max_brightness is 0, then there is no actual backlight
          * device. This happens on desktops with Asus mainboards
-         * that load the eeepc-wmi module.
-         */
-        max_brightness = get_max_brightness(device);
-        if (max_brightness == 0)
+         * that load the eeepc-wmi module. */
+        r = get_max_brightness(device, &max_brightness);
+        if (r < 0)
                 return EXIT_SUCCESS;
 
         escaped_ss = cescape(ss);
@@ -347,8 +364,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        path_id = udev_device_get_property_value(device, "ID_PATH");
-        if (path_id) {
+        if (sd_device_get_property_value(device, "ID_PATH", &path_id) >= 0) {
                 escaped_path_id = cescape(path_id);
                 if (!escaped_path_id) {
                         log_oom();
@@ -375,7 +391,7 @@ int main(int argc, char *argv[]) {
                 if (shall_restore_state() == 0)
                         return EXIT_SUCCESS;
 
-                if (!validate_device(udev, device))
+                if (validate_device(device) == 0)
                         return EXIT_SUCCESS;
 
                 clamp = shall_clamp(device);
@@ -389,9 +405,9 @@ int main(int argc, char *argv[]) {
                         if (!clamp)
                                 return EXIT_SUCCESS;
 
-                        curval = udev_device_get_sysattr_value(device, "brightness");
-                        if (!curval) {
-                                log_warning("Failed to read 'brightness' attribute.");
+                        r = sd_device_get_sysattr_value(device, "brightness", &curval);
+                        if (r < 0) {
+                                log_warning_errno(r, "Failed to read 'brightness' attribute: %m");
                                 return EXIT_FAILURE;
                         }
 
@@ -406,9 +422,9 @@ int main(int argc, char *argv[]) {
                 }
 
                 if (clamp)
-                        clamp_brightness(device, &value, max_brightness);
+                        (void) clamp_brightness(device, &value, max_brightness);
 
-                r = udev_device_set_sysattr_value(device, "brightness", value);
+                r = sd_device_set_sysattr_value(device, "brightness", value);
                 if (r < 0) {
                         log_error_errno(r, "Failed to write system 'brightness' attribute: %m");
                         return EXIT_FAILURE;
@@ -417,14 +433,14 @@ int main(int argc, char *argv[]) {
         } else if (streq(argv[1], "save")) {
                 const char *value;
 
-                if (!validate_device(udev, device)) {
+                if (validate_device(device) == 0) {
                         unlink(saved);
                         return EXIT_SUCCESS;
                 }
 
-                value = udev_device_get_sysattr_value(device, "brightness");
-                if (!value) {
-                        log_error("Failed to read system 'brightness' attribute");
+                r = sd_device_get_sysattr_value(device, "brightness", &value);
+                if (r < 0) {
+                        log_error_errno(r, "Failed to read system 'brightness' attribute: %m");
                         return EXIT_FAILURE;
                 }