udevadm: test - handling trailing '/' in devpath

[elogind.git] / udev / udevadm-test.c

diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c
index 9d505146cf851a5c5fd3dab942372ca90e0d2c34..c53c27329556e8a8e659262f6d9c36ab7979b183 100644 (file)
--- a/udev/udevadm-test.c
+++ b/udev/udevadm-test.c
@@ -64,7 +64,7 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
                case 'h':
                        printf("Usage: udevadm test OPTIONS <syspath>\n"
                               "  --action=<string>     set action string\n"
-                              "  --help                print this help text\n\n");
+                              "  --help\n\n");
                        exit(0);
                default:
                        exit(1);
@@ -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;
        }