X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-add.c;h=eb1c0fb6761b138f88149d5de5dc01a849473c85;hb=c19a6b304cd7a727da9758853134b557f5f40705;hp=3b0e4ddf0e495011b5900ce5926b6fbf55ece8eb;hpb=9d496c74f3a6b1963727b515126e87e64abe046c;p=elogind.git

diff --git a/udev-add.c b/udev-add.c
index 3b0e4ddf0..eb1c0fb67 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"
@@ -66,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));
 	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;
@@ -93,12 +102,40 @@ static int create_node(struct udevice *dev)
 	}
 
 	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;
 }
 
@@ -131,26 +168,24 @@ exit:
 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 */
 		sleep(1);
-		++loop;
 	}
 	retval = -ENODEV;
 exit: