X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-add.c;h=d158c41b1d54adbc138a28d9ea098f1e855c9a95;hb=c2405f502cae4a634a25674306cffefb85df9ebb;hp=adbeb92425f5247a0497c61aac548f24c58f01e3;hpb=0abf54fc09030f404f5c7d724a0f30d3e875e980;p=elogind.git

diff --git a/udev-add.c b/udev-add.c
index adbeb9242..d158c41b1 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -31,11 +31,10 @@
 #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.
@@ -72,32 +71,50 @@ 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(char *name, char type, int major, int minor, mode_t mode)
 {
 	char filename[255];
 	int retval = 0;
 	strncpy(filename, UDEV_ROOT, sizeof(filename));
 	strncat(filename, name, sizeof(filename));
-	if (type == 'b') {
-	       mode |= S_IFBLK;
-    	} else if ((type == 'c') || (type == 'u')){
-	        mode |= S_IFCHR;
-    	} else if ( type == 'p') {
-       		 mode |= S_IFIFO;
-    	} else {
-       		dbg("unknown node type %c\n", type);
-       		return -1;
- 	}
-
-	retval = mknod(filename,mode,makedev(major,minor));
+	switch (type) {
+	case 'b':
+		mode |= S_IFBLK;
+		break;
+	case 'c':
+	case 'u':
+		mode |= S_IFCHR;
+		break;
+	case 'p':
+		mode |= S_IFIFO;
+		break;
+	default:
+		dbg("unknown node type %c\n", type);
+		return -EINVAL;
+	}
+
+	dbg("mknod(%s, %#o, %u, %u)", filename, mode, major, minor);
+	retval = mknod(filename, mode, makedev(major, minor));
+	if (retval)
+		dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
+		    filename, mode, major, minor, strerror(errno));
 	return retval;
-		
 }
 
-struct sysfs_class_device *get_class_dev(char *device_name)
+static struct sysfs_class_device *get_class_dev(char *device_name)
 {
+	char sysfs_path[SYSFS_PATH_MAX];
 	char dev_path[SYSFS_PATH_MAX];
-	struct sysfs_class_device *class_dev;
+	int retval;
+	struct sysfs_class_device *class_dev = NULL;
+
+
+	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;
+	}
 
 	strcpy(dev_path, sysfs_path);
 	strcat(dev_path, device_name);
@@ -108,46 +125,34 @@ 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)
-{
-	int retval;
-
-	retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-	dbg("sysfs_path = %s", sysfs_path);
-	return retval;
-}
-
 int udev_add_device(char *device, char *subsystem)
 {
 	struct sysfs_class_device *class_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';
 	else
 		type = 'c';
 
+	/* sleep for a second or two to give the kernel a chance to
+	 * create the dev file
+	 */
+	sleep(1);
+
 	class_dev = get_class_dev(device);
 	if (class_dev == NULL)
 		goto exit;
@@ -158,10 +163,16 @@ int udev_add_device(char *device, char *subsystem)
 
 	retval = get_major_minor(class_dev, &major, &minor);
 	if (retval) {
-		dbg ("get_major_minor failed");
+		dbg("get_major_minor failed");
 		goto exit;
 	}
 
+	retval = udevdb_add_device(device, class_dev, attr.name, type, major, minor, attr.mode);
+
+	if (retval != 0)
+		dbg("udevdb_add_device 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);