libudev: udev_device - read "driver" value

[elogind.git] / udev / lib / libudev-utils.c

diff --git a/udev/lib/libudev-utils.c b/udev/lib/libudev-utils.c
index 8251b64da98b492dc63f2f7ec8cc5d52294bdad8..82acb1a4815705d5a36ee01cb1470d89e20a5e9c 100644 (file)
--- a/udev/lib/libudev-utils.c
+++ b/udev/lib/libudev-utils.c
@@ -32,7 +32,7 @@
 #include "libudev-private.h"
 #include "../udev.h"
 
-ssize_t util_get_sys_subsystem(struct udev *udev, const char *devpath, char *subsystem, size_t size)
+static ssize_t get_sys_link(struct udev *udev, const char *slink, const char *devpath, char *subsystem, size_t size)
 {
        char path[PATH_SIZE];
        ssize_t len;
@@ -40,7 +40,8 @@ ssize_t util_get_sys_subsystem(struct udev *udev, const char *devpath, char *sub
 
        strlcpy(path, udev_get_sys_path(udev), sizeof(path));
        strlcat(path, devpath, sizeof(path));
-       strlcat(path, "/subsystem", sizeof(path));
+       strlcat(path, "/", sizeof(path));
+       strlcat(path, slink, sizeof(path));
        len = readlink(path, path, sizeof(path));
        if (len < 0 || len >= (ssize_t) sizeof(path))
                return -1;
@@ -51,3 +52,14 @@ ssize_t util_get_sys_subsystem(struct udev *udev, const char *devpath, char *sub
        pos = &pos[1];
        return strlcpy(subsystem, pos, size);
 }
+
+ssize_t util_get_sys_subsystem(struct udev *udev, const char *devpath, char *subsystem, size_t size)
+{
+       return get_sys_link(udev, "subsystem", devpath, subsystem, size);
+}
+
+ssize_t util_get_sys_driver(struct udev *udev, const char *devpath, char *driver, size_t size)
+{
+       return get_sys_link(udev, "driver", devpath, driver, size);
+}
+