X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=7906638a7f066670fbd2bea6d5a603d523fdb309;hp=10df31458d5cbebcffa93bf256d31777f905f18b;hb=d4e52dd0d95c21ccda50310404be4b5a540cc498;hpb=1331c889c33a91f098fa7257488046e81241225c

diff --git a/udev-add.c b/udev-add.c
index 10df31458..7906638a7 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -31,21 +31,19 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "namedev.h"
+#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.
  * The number is stored as:
- * 	MMmm
+ * 	MM:mm
  * 		MM is the major
  * 		mm is the minor
- * 		The value is in hex.
- * Yes, this will probably change when we go to a bigger major/minor
- * range, and will have to be changed at that time.
+ * 		The value is in decimal.
  */
 static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int *minor)
 {
@@ -72,39 +70,44 @@ 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, int 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) {
+	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;
 	}
 
-	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;
 }
 
-struct sysfs_class_device *get_class_dev(char *device_name)
+static struct sysfs_class_device *get_class_dev(char *device_name)
 {
 	char dev_path[SYSFS_PATH_MAX];
-	struct sysfs_class_device *class_dev;
+	struct sysfs_class_device *class_dev = NULL;
 
 	strcpy(dev_path, sysfs_path);
 	strcat(dev_path, device_name);
@@ -115,47 +118,71 @@ struct sysfs_class_device *get_class_dev(char *device_name)
 	class_dev = sysfs_open_class_device(dev_path);
 	if (class_dev == NULL) {
 		dbg ("sysfs_open_class_device failed");
-		return NULL;
+		goto exit;
 	}
 	dbg("class_dev->name = %s", class_dev->name);
 
+exit:
 	return class_dev;
 }
 
-static int udev_init(void)
+/* wait for the "dev" file to show up in the directory in sysfs.
+ * If it doesn't happen in about 10 seconds, give up.
+ */
+#define SECONDS_TO_WAIT_FOR_DEV		10
+int sleep_for_dev(char *path)
 {
-	int retval;
+	char filename[SYSFS_PATH_MAX + 6];
+	struct stat buf;
+	int loop = 0;
+	int retval = -ENODEV;
 
-	retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-	dbg("sysfs_path = %s", sysfs_path);
+	strcpy(filename, sysfs_path);
+	strcat(filename, path);
+	strcat(filename, "/dev");
+
+	while (loop < SECONDS_TO_WAIT_FOR_DEV) {
+		dbg("looking for %s", filename);
+		retval = stat(filename, &buf);
+		if (retval == 0) {
+			retval = 0;
+			goto exit;
+		}
+
+		/* sleep for a second or two to give the kernel a chance to
+		 * create the dev file */
+		sleep(1);
+	}
+	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 udevice dev;
 	struct device_attr attr;
-	//char *name;
-	int major;
-	int minor;
-	char type;
-	//int mode;
 	int retval = -EINVAL;
 
-	/* sleep for a second or two to give the kernel a chance to
-	 * create the dev file
-	 */
-	sleep(1);
-
-	udev_init();
-
 	/* 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(path);
+	if (retval)
+		goto exit;
 
-	class_dev = get_class_dev(device);
+	class_dev = get_class_dev(path);
 	if (class_dev == NULL)
 		goto exit;
 
@@ -163,15 +190,26 @@ int udev_add_device(char *device, char *subsystem)
 	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");
+		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 = 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);
 
-	return create_node(attr.name, type, major, minor, attr.mode);
+	dbg("name = %s", dev.name);
+	retval = create_node(&dev);
 
 exit:
 	return retval;