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

diff --git a/udev-add.c b/udev-add.c
index eb1c0fb67..8d45b2607 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -28,12 +28,19 @@
 #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 "udev_dbus.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 +51,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;
 
@@ -54,18 +61,46 @@ static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int
 	if (dev == NULL)
 		goto exit;
 
-	dbg("dev = %s", dev);
+	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:
 	return retval;
 }
 
+static int create_path(char *file)
+{
+	char p[NAME_SIZE];
+	char *pos;
+	int retval;
+	struct stat stats;
+	
+	strncpy(p, file, sizeof(p));
+	pos = strchr(p+1, '/');
+	while (1) {
+		pos = strchr(pos+1, '/');
+		if (pos == NULL)
+			break;
+		*pos = 0x00;
+		if (stat(p, &stats)) {
+			retval = mkdir(p, 0755);
+			if (retval) {
+				dbg("mkdir(%s) failed with error '%s'",
+				    p, strerror(errno));
+				return retval;
+			}
+			dbg("created '%s'", p);
+		}
+		*pos = '/';
+	}
+	return 0;
+}
+
 /*
  * we possibly want to add some symlinks here
  * only numeric owner/group id's are supported
@@ -73,8 +108,14 @@ exit:
 static int create_node(struct udevice *dev)
 {
 	char filename[255];
+	char linktarget[255];
 	int retval = 0;
+	uid_t uid = 0;
+	gid_t gid = 0;
 	dev_t res;
+	int i;
+	int tail;
+
 
 	strncpy(filename, udev_root, sizeof(filename));
 	strncat(filename, dev->name, sizeof(filename));
@@ -101,22 +142,34 @@ static int create_node(struct udevice *dev)
 		return -EINVAL;
 	}
 
+	/* create parent directories if needed */
+	if (strrchr(dev->name, '/'))
+		create_path(filename);
+
 	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;
 		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) {
@@ -124,16 +177,56 @@ 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) {
 		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));
+			dbg("chown(%s, %u, %u) failed with error '%s'",
+			    filename, uid, gid, strerror(errno));
+	}
+
+
+	/* create symlink if requested */
+	if (*dev->symlink) {
+		strncpy(filename, udev_root, sizeof(filename));
+		strncat(filename, dev->symlink, sizeof(filename));
+		dbg("symlink '%s' to node '%s' requested", filename, dev->name);
+		if (strrchr(dev->symlink, '/'))
+			create_path(filename);
+
+		/* optimize relative link */
+		linktarget[0] = '\0';
+		i = 0;
+		tail = 0;
+		while ((dev->name[i] == dev->symlink[i]) && dev->name[i]) {
+			if (dev->name[i] == '/')
+				tail = i+1;
+			i++;
+		}
+		while (dev->symlink[i]) {
+			if (dev->symlink[i] == '/')
+				strcat(linktarget, "../");
+			i++;
+		}
+
+		if (*linktarget == '\0')
+			strcpy(linktarget, "./");
+		strcat(linktarget, &dev->name[tail]);
+
+		dbg("symlink(%s, %s)", linktarget, filename);
+		retval = symlink(linktarget, filename);
+		if (retval)
+			dbg("symlink(%s, %s) failed with error '%s'",
+			    linktarget, filename, strerror(errno));
 	}
 
 	return retval;
@@ -147,7 +240,7 @@ static struct sysfs_class_device *get_class_dev(char *device_name)
 	strcpy(dev_path, sysfs_path);
 	strcat(dev_path, device_name);
 
-	dbg("looking at %s", dev_path);
+	dbg("looking at '%s'", dev_path);
 
 	/* open up the sysfs class device for this thing... */
 	class_dev = sysfs_open_class_device(dev_path);
@@ -155,7 +248,7 @@ static struct sysfs_class_device *get_class_dev(char *device_name)
 		dbg ("sysfs_open_class_device failed");
 		goto exit;
 	}
-	dbg("class_dev->name = %s", class_dev->name);
+	dbg("class_dev->name='%s'", class_dev->name);
 
 exit:
 	return class_dev;
@@ -178,13 +271,12 @@ static int sleep_for_dev(char *path)
 	while (loop--) {
 		struct stat buf;
 
-		dbg("looking for %s", filename);
+		dbg("looking for '%s'", filename);
 		retval = stat(filename, &buf);
 		if (!retval)
 			goto exit;
 
-		/* sleep for a second or two to give the kernel a chance to
-		 * create the dev file */
+		/* sleep to give the kernel a chance to create the dev file */
 		sleep(1);
 	}
 	retval = -ENODEV;
@@ -194,10 +286,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';
@@ -212,32 +306,30 @@ 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);
+	dbg("name='%s'", dev.name);
 	retval = create_node(&dev);
 
+	if (retval == 0)
+		sysbus_send_create(&dev, path);
+
 exit:
+	if (class_dev)
+		sysfs_close_class_device(class_dev);
+
 	return retval;
 }
-