From f454f6708a1ca439dbe9abd6b9fb660423a71d14 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 18 Mar 2009 18:42:16 +0100 Subject: [PATCH 1/1] udevadm: test - handling trailing '/' in devpath On Wed, Mar 18, 2009 at 16:00, Matthias Schwarzott 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. --- configure.ac | 2 +- udev/lib/libudev-device.c | 2 +- udev/udevadm-test.c | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 5e6213f95..001f338d1 100644 --- 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 1a9d0a1e6..e13cbe554 100644 --- 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 664d72f6d..c53c27329 100644 --- 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; } -- 2.30.2