X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=ce723e45cc74d8e2ce9266e1d7b53efbe51204c7;hp=9562cb5dbbc5de2ab956fc0352e2f1915b81b5a8;hb=17794d77b97fcb8af263bcecbe03dad5d0e9a89a;hpb=5895eb31fe86619a9d9070e12bc0c970da9daf6b

diff --git a/udev-add.c b/udev-add.c
index 9562cb5db..ce723e45c 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -141,7 +141,7 @@ static void set_to_local_user(char *user)
 	struct utmp *u;
 	time_t recent = 0;
 
-	strnfieldcpy(user, default_owner_str, OWNER_SIZE);
+	strfieldcpymax(user, default_owner_str, OWNER_SIZE);
 	setutent();
 	while (1) {
 		u = getutent();
@@ -158,7 +158,7 @@ static void set_to_local_user(char *user)
 
 		if (u->ut_time > recent) {
 			recent = u->ut_time;
-			strnfieldcpy(user, u->ut_user, OWNER_SIZE);
+			strfieldcpymax(user, u->ut_user, OWNER_SIZE);
 			dbg("local user is '%s'", user);
 			break;
 		}
@@ -195,7 +195,8 @@ static int create_node(struct udevice *dev, int fake)
 	gid_t gid = 0;
 	int i;
 	int tail;
-	int pos, len;
+	char *pos;
+	int len;
 
 	strfieldcpy(filename, udev_root);
 	strfieldcat(filename, dev->name);
@@ -281,7 +282,7 @@ static int create_node(struct udevice *dev, int fake)
 
 	/* create symlink if requested */
 	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);
 		dbg("symlink '%s' to node '%s' requested", filename, dev->name);