X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-remove.c;h=8794429635bd0caec5f53b294dcd713464f720b2;hp=c20c651dc53687056d701c0a8714a7f5d39f3b9b;hb=c472e3c89b9aaad90ad6398c0d2ff5dcf5a9d238;hpb=167a27e70f4010fdce561cff2ea1a07730aae28a

diff --git a/udev-remove.c b/udev-remove.c
index c20c651dc..879442963 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -72,8 +72,8 @@ static int delete_node(struct udevice *dev)
 	int retval;
 	int i;
 
-	strncpy(filename, udev_root, sizeof(filename));
-	strncat(filename, dev->name, sizeof(filename));
+	strfieldcpy(filename, udev_root);
+	strfieldcat(filename, dev->name);
 
 	info("removing device node '%s'", filename);
 	retval = unlink(filename);
@@ -103,8 +103,8 @@ static int delete_node(struct udevice *dev)
 			if (linkname == NULL)
 				break;
 
-			strncpy(filename, udev_root, sizeof(filename));
-			strncat(filename, linkname, sizeof(filename));
+			strfieldcpy(filename, udev_root);
+			strfieldcat(filename, linkname);
 
 			dbg("unlinking symlink '%s'", filename);
 			retval = unlink(filename);
@@ -141,7 +141,7 @@ int udev_remove_device(char *path, char *subsystem)
 		temp = strrchr(path, '/');
 		if (temp == NULL)
 			return -ENODEV;
-		strncpy(dev.name, &temp[1], sizeof(dev.name));
+		strfieldcpy(dev.name, &temp[1]);
 	}
 
 	dbg("name is '%s'", dev.name);