X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=namedev.c;h=74d4d7646751973d1145f92368f42cedb680a7f8;hb=e4f9c4a46de499841939c51da1a1cf6fd5321bb1;hp=7c07e3b10423f9185cea3f1af40c23f9800d23f8;hpb=dde05ccb8d423fbc5c29f54b0c1b545938c8f151;p=elogind.git

diff --git a/namedev.c b/namedev.c
index 7c07e3b10..74d4d7646 100644
--- a/namedev.c
+++ b/namedev.c
@@ -198,7 +198,7 @@ static int get_format_len(char **str)
 
 	if (isdigit(*str[0])) {
 		num = (int) strtoul(*str, &tail, 10);
-		if (tail != NULL) {
+		if (num > 0) {
 			*str = tail;
 			dbg("format length=%i", num);
 			return num;
@@ -214,14 +214,12 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 			 struct sysfs_device *sysfs_device)
 {
 	char temp[NAME_SIZE];
-	char temp1[NAME_SIZE];
 	char *tail;
 	char *pos;
-	char *pos2;
-	char *pos3;
 	char *attr;
-	int num;
+	int len;
 	int i;
+	int spos, slen;
 	char c;
 	struct sysfs_attribute *tmpattr;
 
@@ -232,7 +230,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 		if (pos != NULL) {
 			pos[0] = '\0';
 			tail = pos+1;
-			num = get_format_len(&tail);
+			len = get_format_len(&tail);
 			c = tail[0];
 			strfieldcpy(temp, tail+1);
 			tail = temp;
@@ -263,35 +261,32 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 			dbg("substitute kernel number '%s'", udev->kernel_number);
 				break;
 		case 'm':
-			sprintf(pos, "%u", udev->minor);
+			strnintcat(string, udev->minor, maxsize);
 			dbg("substitute minor number '%u'", udev->minor);
 			break;
-			case 'M':
-			sprintf(pos, "%u", udev->major);
+		case 'M':
+			strnintcat(string, udev->major, maxsize);
 			dbg("substitute major number '%u'", udev->major);
 			break;
 		case 'c':
 			if (strlen(udev->program_result) == 0)
 				break;
 			/* get part part of the result string */
-			i = num; /* num syntax is deprecated and will be removed  */
+			i = 0;
 			if (attr != NULL)
 				i = atoi(attr);
 			if (i > 0) {
-				strfieldcpy(temp1, udev->program_result);
-				pos2 = temp1;
-				while (i) {
+				foreach_strpart(udev->program_result, " \n\r", spos, slen) {
 					i--;
-					pos3 = strsep(&pos2, " ");
-					if (pos3 == NULL) {
-						dbg("requested part of result string not found");
+					if (i == 0)
 						break;
-					}
 				}
-				if (pos3) {
-					strnfieldcat(string, pos3, maxsize);
-					dbg("substitute part of result string '%s'", pos3);
+				if (i > 0) {
+					dbg("requested part of result string not found");
+					break;
 				}
+				strnfieldcat(string, udev->program_result + spos, slen+1);
+				dbg("substitute part of result string '%s'", pos);
 			} else {
 				strnfieldcat(string, udev->program_result, maxsize);
 				dbg("substitute result string '%s'", udev->program_result);
@@ -317,6 +312,10 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 			dbg("unknown substitution type '%%%c'", c);
 			break;
 		}
+		/* truncate to specified length */
+		if (len > 0)
+			pos[len] = '\0';
+
 		strnfieldcat(string, tail, maxsize);
 	}
 }
@@ -816,17 +815,31 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 	list_for_each_entry(dev, &config_device_list, node) {
 		dbg("process rule");
 		if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
-			if (dev->name[0] == '\0') {
+			if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
 				info("configured rule in '%s' at line %i applied, '%s' is ignored",
-				     udev_rules_filename, dev->config_line, udev->kernel_name);
+				     dev->config_file, dev->config_line, udev->kernel_name);
 				return -1;
 			}
 
-			info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
-			     udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
-			strfieldcpy(udev->name, dev->name);
-			strfieldcpy(udev->symlink, dev->symlink);
-			goto found;
+			if (dev->symlink[0] != '\0') {
+				char temp[NAME_MAX];
+
+				info("configured rule in '%s' at line %i applied, added symlink '%s'",
+				     dev->config_file, dev->config_line, dev->symlink);
+				/* do not clobber dev */
+				strfieldcpy(temp, dev->symlink);
+				apply_format(udev, temp, sizeof(temp),
+					     class_dev, sysfs_device);
+				strfieldcat(udev->symlink, temp);
+				strfieldcat(udev->symlink, " ");
+			}
+
+			if (dev->name[0] != '\0') {
+				info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+				     dev->config_file, dev->config_line, udev->kernel_name, dev->name);
+				strfieldcpy(udev->name, dev->name);
+				goto found;
+			}
 		}
 	}
 
@@ -838,8 +851,6 @@ found:
 	/* substitute placeholder */
 	apply_format(udev, udev->name, sizeof(udev->name),
 		     class_dev, sysfs_device);
-	apply_format(udev, udev->symlink, sizeof(udev->symlink),
-		     class_dev, sysfs_device);
 	udev->partitions = dev->partitions;
 done:
 	perm = find_perm(udev->name);