X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-add.c;h=8c63214a46794ebb233ed1e8cffc8c8875865697;hb=5c75a3ecd1852abaf4d9ee67a37ee56b0cf0a6d3;hp=85bcbf6c18212a901f336f58cc1f2708b54fefdc;hpb=29fd7e679beba83a9c79df82374b5e51453a3831;p=elogind.git

diff --git a/udev-add.c b/udev-add.c
index 85bcbf6c1..8c63214a4 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.
@@ -70,33 +69,37 @@ exit:
 /*
  * We also want to add some permissions here, and possibly some symlinks
  */
-static int create_node(char *name, char type, int major, int minor, mode_t mode)
+static int create_node(struct udevice *dev)
 {
 	char filename[255];
 	int retval = 0;
-	strncpy(filename, UDEV_ROOT, sizeof(filename));
-	strncat(filename, name, sizeof(filename));
-	switch (type) {
+
+	strncpy(filename, udev_root, sizeof(filename));
+	strncat(filename, dev->name, sizeof(filename));
+
+	switch (dev->type) {
 	case 'b':
-		mode |= S_IFBLK;
+		dev->mode |= S_IFBLK;
 		break;
 	case 'c':
 	case 'u':
-		mode |= S_IFCHR;
+		dev->mode |= S_IFCHR;
 		break;
 	case 'p':
-		mode |= S_IFIFO;
+		dev->mode |= S_IFIFO;
 		break;
 	default:
-		dbg("unknown node type %c\n", type);
+		dbg("unknown node type %c\n", dev->type);
 		return -EINVAL;
 	}
 
-	dbg("mknod(%s, %#o, %u, %u)", filename, mode, major, minor);
-	retval = mknod(filename, mode, makedev(major, minor));
+	dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
+	retval = mknod(filename, dev->mode, makedev(dev->major, dev->minor));
 	if (retval)
 		dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
-		    filename, mode, major, minor, strerror(errno));
+		    filename, dev->mode, dev->major, dev->minor, strerror(errno));
+
+	// FIXME set the ownership of the node
 	return retval;
 }
 
@@ -126,7 +129,7 @@ exit:
  * If it doesn't happen in about 10 seconds, give up.
  */
 #define SECONDS_TO_WAIT_FOR_DEV		10
-int sleep_for_dev(char *device)
+static int sleep_for_dev(char *path)
 {
 	char filename[SYSFS_PATH_MAX + 6];
 	struct stat buf;
@@ -134,7 +137,7 @@ int sleep_for_dev(char *device)
 	int retval = -ENODEV;
 
 	strcpy(filename, sysfs_path);
-	strcat(filename, device);
+	strcat(filename, path);
 	strcat(filename, "/dev");
 
 	while (loop < SECONDS_TO_WAIT_FOR_DEV) {
@@ -148,61 +151,57 @@ int sleep_for_dev(char *device)
 		/* sleep for a second or two to give the kernel a chance to
 		 * create the dev file */
 		sleep(1);
+		++loop;
 	}
 	retval = -ENODEV;
 exit:
 	return retval;
 }
 
-int udev_add_device(char *device, char *subsystem)
+int udev_add_device(char *path, char *subsystem)
 {
 	struct sysfs_class_device *class_dev;
-	struct device_attr attr;
-	int major;
-	int minor;
-	char type;
+	struct udevice dev;
 	int retval = -EINVAL;
 
 	/* for now, the block layer is the only place where block devices are */
 	if (strcmp(subsystem, "block") == 0)
-		type = 'b';
+		dev.type = 'b';
 	else
-		type = 'c';
+		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(device);
+	retval = sleep_for_dev(path);
 	if (retval)
 		goto exit;
 
-	class_dev = get_class_dev(device);
+	class_dev = get_class_dev(path);
 	if (class_dev == NULL)
 		goto exit;
 
-	retval = namedev_name_device(class_dev, &attr);
+	retval = namedev_name_device(class_dev, &dev);
 	if (retval)
 		return retval;
 
-	retval = get_major_minor(class_dev, &major, &minor);
+	retval = get_major_minor(class_dev, &dev.major, &dev.minor);
 	if (retval) {
 		dbg("get_major_minor failed");
 		goto exit;
 	}
 
-	retval = udevdb_add_device(device, class_dev, attr.name, type, major, minor, 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)
-		dbg("udevdb_add_device failed, but we are going to try to create the node anyway. "
+		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);
 
-	return create_node(attr.name, type, major, minor, attr.mode);
+	dbg("name = %s", dev.name);
+	retval = create_node(&dev);
 
 exit:
 	return retval;