X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_add.c;h=aa19d874c3b31fd85760f42761287e7879ae6f58;hp=eeab1ca174e2102bc419ebb77daf171502bc5092;hb=5f335ca4afaa189799225f856f3af8b3d9fd2e1c;hpb=7eb92135c61af77fff62eec5f396b9633a54b245;ds=sidebyside

diff --git a/udev_add.c b/udev_add.c
index eeab1ca17..aa19d874c 100644
--- a/udev_add.c
+++ b/udev_add.c
@@ -113,12 +113,11 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 {
 	char filename[NAME_SIZE];
 	char partitionname[NAME_SIZE];
+	struct name_entry *name_loop;
 	uid_t uid = 0;
 	gid_t gid = 0;
 	int tail;
-	char *pos;
-	int len;
-		int i;
+	int i;
 
 	snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
 	filename[NAME_SIZE-1] = '\0';
@@ -186,8 +185,8 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 			for (i = 1; i <= udev->partitions; i++) {
 				dev_t part_devt;
 
-				strfieldcpy(partitionname, filename);
-				strintcat(partitionname, i);
+				snprintf(partitionname, NAME_SIZE, "%s%d", filename, i);
+				partitionname[NAME_SIZE-1] = '\0';
 				part_devt = makedev(major(udev->devt), minor(udev->devt)+1);
 				udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
 			}
@@ -195,30 +194,28 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 	}
 
 	/* create symlink(s) if requested */
-	foreach_strpart(udev->symlink, " ", pos, len) {
-		char linkname[NAME_SIZE];
+	list_for_each_entry(name_loop, &udev->symlink_list, node) {
 		char linktarget[NAME_SIZE];
 
-		strfieldcpymax(linkname, pos, len+1);
-		snprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname);
+		snprintf(filename, NAME_SIZE, "%s/%s", udev_root, name_loop->name);
 		filename[NAME_SIZE-1] = '\0';
 
 		dbg("symlink '%s' to node '%s' requested", filename, udev->name);
 		if (!udev->test_run)
-			if (strrchr(linkname, '/'))
+			if (strchr(filename, '/'))
 				create_path(filename);
 
 		/* optimize relative link */
 		linktarget[0] = '\0';
 		i = 0;
 		tail = 0;
-		while ((udev->name[i] == linkname[i]) && udev->name[i]) {
+		while (udev->name[i] && (udev->name[i] == name_loop->name[i])) {
 			if (udev->name[i] == '/')
 				tail = i+1;
 			i++;
 		}
-		while (linkname[i] != '\0') {
-			if (linkname[i] == '/')
+		while (name_loop->name[i] != '\0') {
+			if (name_loop->name[i] == '/')
 				strfieldcat(linktarget, "../");
 			i++;
 		}