X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=9c546024055208d646db49ec0e9cdc18a51b43a8;hp=7906638a7f066670fbd2bea6d5a603d523fdb309;hb=218eae87273e6b1d401ac67f94d648c9f39a30fa;hpb=5840bc63e2029d22682d8de77dc8fcc4da1b436c

diff --git a/udev-add.c b/udev-add.c
index 7906638a7..9c5460240 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
+#include <sys/stat.h>
 
 #include "udev.h"
 #include "udev_version.h"
@@ -34,8 +35,6 @@
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
 
-static char sysfs_path[SYSFS_PATH_MAX];
-
 /* 
  * Right now the major/minor of a device is stored in a file called
  * "dev" in sysfs.
@@ -68,16 +67,24 @@ exit:
 }
 
 /*
- * We also want to add some permissions here, and possibly some symlinks
+ * we possibly want to add some symlinks here
+ * only numeric owner/group id's are supported
  */
 static int create_node(struct udevice *dev)
 {
 	char filename[255];
 	int retval = 0;
+	dev_t res;
 
-	strncpy(filename, UDEV_ROOT, sizeof(filename));
+	strncpy(filename, udev_root, sizeof(filename));
 	strncat(filename, dev->name, sizeof(filename));
 
+#ifdef __KLIBC__
+	res = (dev->major << 8) | (dev->minor);
+#else
+	res = makedev(dev->major, dev->minor);
+#endif
+
 	switch (dev->type) {
 	case 'b':
 		dev->mode |= S_IFBLK;
@@ -94,13 +101,67 @@ 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, makedev(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));
 
-	// FIXME set the ownership of the node
+	uid_t uid = 0;
+	gid_t gid = 0;
+
+	if (*dev->owner) {
+		char *endptr;
+		unsigned long id = strtoul(dev->owner, &endptr, 10);
+		if (*endptr == 0x00)
+			uid = (uid_t) id;
+		else
+			dbg("only numeric owner id supported: %s", dev->owner);
+	}
+
+	if (*dev->group) {
+		char *endptr;
+		unsigned long id = strtoul(dev->group, &endptr, 10);
+		if (*endptr == 0x00)
+			gid = (gid_t) id;
+		else
+			dbg("only numeric group id supported: %s", dev->group);
+	}
+
+	if (uid || gid) {
+		dbg("chown(%s, %u, %u)", filename, uid, gid);
+		retval = chown(filename, uid, gid);
+		if (retval)
+			dbg("chown(%s, %u, %u) failed with error '%s'", filename,
+			    uid, gid, strerror(errno));
+	}
+
 	return retval;
 }
 
@@ -130,24 +191,23 @@ exit:
  * If it doesn't happen in about 10 seconds, give up.
  */
 #define SECONDS_TO_WAIT_FOR_DEV		10
-int sleep_for_dev(char *path)
+static int sleep_for_dev(char *path)
 {
 	char filename[SYSFS_PATH_MAX + 6];
-	struct stat buf;
-	int loop = 0;
-	int retval = -ENODEV;
+	int loop = SECONDS_TO_WAIT_FOR_DEV;
+	int retval;
 
 	strcpy(filename, sysfs_path);
 	strcat(filename, path);
 	strcat(filename, "/dev");
 
-	while (loop < SECONDS_TO_WAIT_FOR_DEV) {
+	while (loop--) {
+		struct stat buf;
+
 		dbg("looking for %s", filename);
 		retval = stat(filename, &buf);
-		if (retval == 0) {
-			retval = 0;
+		if (!retval)
 			goto exit;
-		}
 
 		/* sleep for a second or two to give the kernel a chance to
 		 * create the dev file */
@@ -162,7 +222,6 @@ int udev_add_device(char *path, char *subsystem)
 {
 	struct sysfs_class_device *class_dev;
 	struct udevice dev;
-	struct device_attr attr;
 	int retval = -EINVAL;
 
 	/* for now, the block layer is the only place where block devices are */
@@ -171,13 +230,6 @@ int udev_add_device(char *path, char *subsystem)
 	else
 		dev.type = 'c';
 
-	retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-	dbg("sysfs_path = %s", sysfs_path);
-	if (retval) {
-		dbg("sysfs_get_mnt_path failed");
-		goto exit;
-	}
-
 	retval = sleep_for_dev(path);
 	if (retval)
 		goto exit;
@@ -186,7 +238,7 @@ int udev_add_device(char *path, char *subsystem)
 	if (class_dev == NULL)
 		goto exit;
 
-	retval = namedev_name_device(class_dev, &attr);
+	retval = namedev_name_device(class_dev, &dev);
 	if (retval)
 		return retval;
 
@@ -196,10 +248,10 @@ int udev_add_device(char *path, char *subsystem)
 		goto exit;
 	}
 
-	strcpy(dev.name, attr.name);
-	strcpy(dev.owner, attr.owner);
-	strcpy(dev.group, attr.group);
-	dev.mode = attr.mode;
+//	strcpy(dev.name, attr.name);
+//	strcpy(dev.owner, attr.owner);
+//	strcpy(dev.group, attr.group);
+//	dev.mode = attr.mode;
 	
 	retval = udevdb_add_dev(path, &dev);
 	if (retval != 0)