X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=b9c504430f311a7dfd5aced114fbda9ab2637d60;hp=36da2647165dc0b925c09993aa3ebc1a7916a860;hb=7e720bd4ad8257d81d273d98294ebbcc03ade9ba;hpb=9af5bb2f8fdbf54c064ddbd319d61092f28a4132;ds=sidebyside

diff --git a/udev_db.c b/udev_db.c
index 36da26471..b9c504430 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -79,6 +79,7 @@ int udev_db_add_device(struct udevice *udev)
 	fprintf(f, "P:%s\n", udev->devpath);
 	fprintf(f, "N:%s\n", udev->name);
 	fprintf(f, "S:%s\n", udev->symlink);
+	fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
 	fprintf(f, "A:%u\n", udev->partitions);
 	fprintf(f, "R:%u\n", udev->ignore_remove);
 
@@ -90,6 +91,8 @@ int udev_db_add_device(struct udevice *udev)
 static int parse_db_file(struct udevice *udev, const char *filename)
 {
 	char line[NAME_SIZE];
+	char temp[NAME_SIZE];
+	unsigned int major, minor;
 	char *bufline;
 	char *buf;
 	size_t bufsize;
@@ -120,6 +123,14 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 			strncpy(udev->name, &bufline[2], count-2);
 			udev->name[count-2] = '\0';
 			break;
+		case 'M':
+			if (count > NAME_SIZE)
+				count = NAME_SIZE-1;
+			strncpy(temp, &bufline[2], count-2);
+			temp[count-2] = '\0';
+			sscanf(temp, "%u:%u", &major, &minor);
+			udev->devt = makedev(major, minor);
+			break;
 		case 'S':
 			if (count > NAME_SIZE)
 				count = NAME_SIZE-1;
@@ -195,7 +206,7 @@ int udev_db_get_device_byname(struct udevice *udev, const char *name)
 		memset(&db_udev, 0x00, sizeof(struct udevice));
 		if (parse_db_file(&db_udev, filename) == 0) {
 			char *pos;
-			int len;
+			unsigned int len;
 
 			if (strncmp(name, db_udev.name, NAME_SIZE) == 0) {
 				goto found;