udevadm: test - handling trailing '/' in devpath

On Wed, Mar 18, 2009 at 16:00, Matthias Schwarzott <zzam@gentoo.org> wrote:
found out how the error occurs:
It is a difference between
A. udevadm test /sys/class/mem/null/
and
B. udevadm test /sys/class/mem/null

Case A was the case that showed the error behaviour. It seems udevadm is
confused by the trailing slash. This behaviour seems to be there since ages.

diff --git a/configure.ac b/configure.ac
index 5e6213f951d2f5fb4eba44d6e6d1458586c084c8..001f338d140c0ef3d7cd846fe7e04b5c93ef2961 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ test "$prefix" = NONE && test "$exec_prefix" = NONE && exec_prefix=
 
 dnl /* libudev version */
 LIBUDEV_LT_CURRENT=1
-LIBUDEV_LT_REVISION=0
+LIBUDEV_LT_REVISION=1
 LIBUDEV_LT_AGE=1
 AC_SUBST(LIBUDEV_LT_CURRENT)
 AC_SUBST(LIBUDEV_LT_REVISION)

diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index 1a9d0a1e69aa9fd4a8454a9b31076366e31f47d5..e13cbe554bcf1a87415644f68b790cd6f1588a8f 100644 (file)
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -303,7 +303,7 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
        /* path is not a root directory */
        subdir = &syspath[len+1];
        pos = strrchr(subdir, '/');
-       if (pos == NULL || pos < &subdir[2]) {
+       if (pos == NULL || pos[1] == '\0' || pos < &subdir[2]) {
                dbg(udev, "not a subdir :%s\n", syspath);
                return NULL;
        }

diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c
index 664d72f6d3484e58758c410e33d3713576dcbea8..c53c27329556e8a8e659262f6d9c36ab7979b183 100644 (file)
--- a/udev/udevadm-test.c
+++ b/udev/udevadm-test.c
@@ -94,12 +94,14 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
        if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) {
                util_strlcpy(filename, udev_get_sys_path(udev), sizeof(filename));
                util_strlcat(filename, syspath, sizeof(filename));
-               syspath = filename;
+       } else {
+               util_strlcpy(filename, syspath, sizeof(filename));
        }
+       util_remove_trailing_chars(filename, '/');
 
-       dev = udev_device_new_from_syspath(udev, syspath);
+       dev = udev_device_new_from_syspath(udev, filename);
        if (dev == NULL) {
-               fprintf(stderr, "unable to open device '%s'\n", syspath);
+               fprintf(stderr, "unable to open device '%s'\n", filename);
                rc = 2;
                goto exit;
        }