X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtrigger.c;h=3b5be2006e5de952bd2343e5489b8b22fa6bdae6;hp=c809d2d47bda67cd696e8bcb53d6620155840402;hb=92b229c727e34164a88f59142054d4cdee510f4c;hpb=5ac285437500a857f69d8b883d5aac3692662d0f

diff --git a/udevtrigger.c b/udevtrigger.c
index c809d2d47..3b5be2006 100644
--- a/udevtrigger.c
+++ b/udevtrigger.c
@@ -118,12 +118,12 @@ static void trigger_uevent(const char *devpath)
 
 	fd = open(filename, O_WRONLY);
 	if (fd < 0) {
-		dbg("error on opening %s: %s\n", filename, strerror(errno));
+		dbg("error on opening %s: %s", filename, strerror(errno));
 		return;
 	}
 
 	if (write(fd, "add", 3) < 0)
-		info("error on triggering %s: %s\n", filename, strerror(errno));
+		info("error on triggering %s: %s", filename, strerror(errno));
 
 	close(fd);
 }
@@ -407,22 +407,14 @@ static void scan_failed(void)
 	if (dir != NULL) {
 		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
 			char device[PATH_SIZE];
-			size_t start, end, i;
+			size_t start;
 
 			if (dent->d_name[0] == '.')
 				continue;
 
-			strlcpy(device, sysfs_path, sizeof(device));
-			start = strlcat(device, "/", sizeof(device));
-			end = strlcat(device, dent->d_name, sizeof(device));
-			if (end > sizeof(device))
-				end = sizeof(device);
-
-			/* replace PATH_TO_NAME_CHAR with '/' */
-			for (i = start; i < end; i++)
-				if (device[i] == PATH_TO_NAME_CHAR)
-					device[i] = '/';
-
+			start = strlcpy(device, sysfs_path, sizeof(device));
+			strlcat(device, dent->d_name, sizeof(device));
+			path_decode(&device[start]);
 			device_list_insert(device);
 		}
 		closedir(dir);