X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.c;h=6444dd0feb957377cf3bd762a09a46c637da5a59;hb=7408a7fbb5885033d266b4b31c3abeb695820da3;hp=d76d03b490be1747283a0b4768dc7fb3891adcd0;hpb=20ff86bd7111221e8709c614c5e3969950293664;p=elogind.git

diff --git a/namedev.c b/namedev.c
index d76d03b49..6444dd0fe 100644
--- a/namedev.c
+++ b/namedev.c
@@ -601,10 +601,6 @@ label_found:
 			continue;
 
 		strcpy(udev->name, dev->name);
-		if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
-			temp = &class_dev->path[strlen(class_dev->path)-1];
-			strcat(udev->name, temp);
-		}
 		if (dev->mode != 0) {
 			udev->mode = dev->mode;
 			strcpy(udev->owner, dev->owner);
@@ -817,6 +813,39 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 	strcpy(udev->name, class_dev->name);
 
 done:
+	/* substitute placeholder in NAME  */
+	while (1) {
+		char *pos = strchr(udev->name, '%');
+		char *dig;
+		char name[NAME_SIZE];
+		if (pos) {
+			strcpy(name, pos+2);
+			*pos = 0x00;
+			switch (pos[1]) {
+			case 'n':
+				dig = class_dev->name + strlen(class_dev->name);
+				while (isdigit(*(dig-1)))
+					dig--;
+				strcat(udev->name, dig);
+				dbg_parse("kernel number appended: %s", dig);
+				break;
+			case 'm':
+				sprintf(pos, "%u", udev->minor);
+				dbg_parse("minor number appended: %u", udev->minor);
+				break;
+			case 'M':
+				sprintf(pos, "%u", udev->major);
+				dbg_parse("major number appended: %u", udev->major);
+				break;
+			default:
+				dbg_parse("unknown substitution type: %%%c", pos[1]);
+				break;
+			}
+			strcat(udev->name, name);
+		} else
+			break;
+	}
+
 	/* mode was never set above */
 	if (!udev->mode) {
 		udev->mode = get_default_mode(class_dev);