X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-remove.c;h=d9097134504a6a1cd2857b83305d683162b43c82;hp=93adcc7806fe0d1c2211838c4b259297960fa5d8;hb=e4c89108001a9af3b8c132111d63980e3a1dcaf4;hpb=9fe3f9a9389bb06cf645d33cbb2b45e1f63d737c

diff --git a/udev-remove.c b/udev-remove.c
index 93adcc780..d90971345 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
 #include "udev_dbus.h"
 #include "logging.h"
@@ -72,7 +73,8 @@ static int delete_node(struct udevice *dev)
 	char partitionname[NAME_SIZE];
 	int retval;
 	int i;
-	int pos, len;
+	char *pos;
+	int len;
 
 	strfieldcpy(filename, udev_root);
 	strfieldcat(filename, dev->name);
@@ -102,7 +104,7 @@ static int delete_node(struct udevice *dev)
 		delete_path(filename);
 
 	foreach_strpart(dev->symlink, " ", pos, len) {
-		strnfieldcpy(linkname, dev->symlink + pos, len+1);
+		strfieldcpymax(linkname, pos, len+1);
 		strfieldcpy(filename, udev_root);
 		strfieldcat(filename, linkname);