X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-add.c;h=7ba873a8d47d7a37766d1ac30bd56f9dfeb1830d;hb=378fe59875327bc4f51e38724ab7406edd36aa16;hp=eb1c0fb6761b138f88149d5de5dc01a849473c85;hpb=c19a6b304cd7a727da9758853134b557f5f40705;p=elogind.git

diff --git a/udev-add.c b/udev-add.c
index eb1c0fb67..7ba873a8d 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -44,7 +44,7 @@
  * 		mm is the minor
  * 		The value is in decimal.
  */
-static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int *minor)
+static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
 	int retval = -ENODEV;
 
@@ -56,10 +56,10 @@ static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int
 
 	dbg("dev = %s", dev);
 
-	if (sscanf(dev, "%u:%u", major, minor) != 2)
+	if (sscanf(dev, "%u:%u", &udev->major, &udev->minor) != 2)
 		goto exit;
 
-	dbg("found major = %d, minor = %d", *major, *minor);
+	dbg("found major = %d, minor = %d", udev->major, udev->minor);
 
 	retval = 0;
 exit:
@@ -74,6 +74,8 @@ static int create_node(struct udevice *dev)
 {
 	char filename[255];
 	int retval = 0;
+	uid_t uid = 0;
+	gid_t gid = 0;
 	dev_t res;
 
 	strncpy(filename, udev_root, sizeof(filename));
@@ -101,14 +103,43 @@ static int create_node(struct udevice *dev)
 		return -EINVAL;
 	}
 
+	/* create subdirectories if requested */
+	if (strchr(dev->name, '/')) {
+		char path[255];
+		char *pos;
+		struct stat stats;
+
+		strncpy(path, filename, sizeof(path));
+		pos = strchr(path+1, '/');
+		while (1) {
+			pos = strchr(pos+1, '/');
+			if (pos == NULL)
+				break;
+			*pos = 0x00;
+			if (stat(path, &stats)) {
+				retval = mkdir(path, 0755);
+				if (retval) {
+					dbg("mkdir(%s) failed with error '%s'",
+					    path, strerror(errno));
+					return retval;
+				}
+				dbg("created %s", path);
+			}
+			*pos = '/';
+		}
+	}
+
 	dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
 	retval = mknod(filename, dev->mode, res);
 	if (retval)
 		dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
 		    filename, dev->mode, dev->major, dev->minor, strerror(errno));
 
-	uid_t uid = 0;
-	gid_t gid = 0;
+	dbg("chmod(%s, %#o)", filename, dev->mode);
+	retval = chmod(filename, dev->mode);
+	if (retval)
+		dbg("chmod(%s, %#o) failed with error '%s'",
+		    filename, dev->mode, strerror(errno));
 
 	if (*dev->owner) {
 		char *endptr;
@@ -194,7 +225,7 @@ exit:
 
 int udev_add_device(char *path, char *subsystem)
 {
-	struct sysfs_class_device *class_dev;
+	struct sysfs_class_device *class_dev = NULL;
 	struct udevice dev;
 	int retval = -EINVAL;
 
@@ -212,32 +243,28 @@ int udev_add_device(char *path, char *subsystem)
 	if (class_dev == NULL)
 		goto exit;
 
-	retval = namedev_name_device(class_dev, &dev);
-	if (retval)
-		return retval;
-
-	retval = get_major_minor(class_dev, &dev.major, &dev.minor);
+	retval = get_major_minor(class_dev, &dev);
 	if (retval) {
 		dbg("get_major_minor failed");
 		goto exit;
 	}
 
-//	strcpy(dev.name, attr.name);
-//	strcpy(dev.owner, attr.owner);
-//	strcpy(dev.group, attr.group);
-//	dev.mode = attr.mode;
-	
+	retval = namedev_name_device(class_dev, &dev);
+	if (retval)
+		goto exit;
+
 	retval = udevdb_add_dev(path, &dev);
 	if (retval != 0)
 		dbg("udevdb_add_dev failed, but we are going to try to create the node anyway. "
 		    "But remove might not work properly for this device.");
 
-	sysfs_close_class_device(class_dev);
-
 	dbg("name = %s", dev.name);
 	retval = create_node(&dev);
 
 exit:
+	if (class_dev)
+		sysfs_close_class_device(class_dev);
+
 	return retval;
 }