X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-test.c;h=c53c27329556e8a8e659262f6d9c36ab7979b183;hb=498c2750bf31e5492d215a832487d6fd47c9e714;hp=664d72f6d3484e58758c410e33d3713576dcbea8;hpb=f1e7e360465acc7fb038e941c398216cdb569253;p=elogind.git

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;
 	}