From: greg@kroah.com <greg@kroah.com>
Date: Tue, 5 Aug 2003 04:20:19 +0000 (-0700)
Subject: [PATCH] handle new major:minor format of dev files that showed up in 2.6.0-test2... 
X-Git-Tag: 003~32
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea256f901e30927591874ee3eb5b92e1ce5a5db1;p=systemd

[PATCH] handle new major:minor format of dev files that showed up in 2.6.0-test2-bk3 or so.
---

diff --git a/udev-add.c b/udev-add.c
index 45ffbf81..54af7e4d 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -49,30 +49,23 @@ static char sysfs_path[SYSFS_PATH_MAX];
  */
 static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int *minor)
 {
-	char temp[3];
-	int retval = 0;
+	int retval = -ENODEV;
 
 	char *dev;
 
 	dev = sysfs_get_value_from_attributes(class_dev->directory->attributes, "dev");
 	if (dev == NULL)
-		return -ENODEV;
+		goto exit;
 
 	dbg("dev = %s", dev);
 
-	temp[0] = dev[0];
-	temp[1] = dev[1];
-	temp[2] = 0x00;
-	*major = (int)strtol(&temp[0], NULL, 16);
-
-	temp[0] = dev[2];
-	temp[1] = dev[3];
-	temp[2] = 0x00;
-	*minor = (int)strtol(&temp[0], NULL, 16);
+	if (sscanf(dev, "%u:%u", major, minor) != 2)
+		goto exit;
 
 	dbg("found major = %d, minor = %d", *major, *minor);
 
 	retval = 0;
+exit:
 	return retval;
 }