X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-add.c;h=068fd46f2746bb299b2d5739fc5144556861ff22;hb=74894b53f8f9f4de6f269a5c0c0f8ea03baa1587;hp=9c546024055208d646db49ec0e9cdc18a51b43a8;hpb=218eae87273e6b1d401ac67f94d648c9f39a30fa;p=elogind.git

diff --git a/udev-add.c b/udev-add.c
index 9c5460240..068fd46f2 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -28,12 +28,18 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <grp.h>
+#ifndef __KLIBC__
+#include <pwd.h>
+#endif
 
 #include "udev.h"
 #include "udev_version.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
+#include "klibc_fixups.h"
 
 /* 
  * Right now the major/minor of a device is stored in a file called
@@ -44,7 +50,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 +62,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 +80,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));
@@ -133,16 +141,24 @@ static int create_node(struct udevice *dev)
 		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;
 		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);
+		else {
+			struct passwd *pw = getpwnam(dev->owner);
+			if (!pw)
+				dbg("user unknown: %s", dev->owner);
+			else
+				uid = pw->pw_uid;
+		}
 	}
 
 	if (*dev->group) {
@@ -150,8 +166,13 @@ static int create_node(struct udevice *dev)
 		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);
+		else {
+			struct group *gr = getgrnam(dev->group);
+			if (!gr)
+				dbg("group unknown: %s", dev->group);
+			else
+				gid = gr->gr_gid;
+		}
 	}
 
 	if (uid || gid) {
@@ -220,10 +241,12 @@ 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;
 
+	memset(&dev, 0x00, sizeof(dev));
+
 	/* for now, the block layer is the only place where block devices are */
 	if (strcmp(subsystem, "block") == 0)
 		dev.type = 'b';
@@ -238,32 +261,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;
 }