X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=586815e2c794386b0c720528f3d94b6a92b775b6;hp=45ffbf81b5a0a685460552f3a6da830ada9aa363;hb=e09292061689b59da68f05eb7a74e353c283078f;hpb=ea733a2f00174c3a39c8eb783e330b6a69abd67c

diff --git a/udev-add.c b/udev-add.c
index 45ffbf81b..586815e2c 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -34,8 +34,6 @@
 #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.
@@ -49,30 +47,23 @@ static char sysfs_path[SYSFS_PATH_MAX];
  */
 static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int *minor)
 {
-	char temp[3];
-	int retval = 0;
+	int retval = -ENODEV;
 
 	char *dev;
 
 	dev = sysfs_get_value_from_attributes(class_dev->directory->attributes, "dev");
 	if (dev == NULL)
-		return -ENODEV;
+		goto exit;
 
 	dbg("dev = %s", dev);
 
-	temp[0] = dev[0];
-	temp[1] = dev[1];
-	temp[2] = 0x00;
-	*major = (int)strtol(&temp[0], NULL, 16);
-
-	temp[0] = dev[2];
-	temp[1] = dev[3];
-	temp[2] = 0x00;
-	*minor = (int)strtol(&temp[0], NULL, 16);
+	if (sscanf(dev, "%u:%u", major, minor) != 2)
+		goto exit;
 
 	dbg("found major = %d, minor = %d", *major, *minor);
 
 	retval = 0;
+exit:
 	return retval;
 }
 
@@ -81,51 +72,47 @@ static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int
  */
 static int create_node(char *name, char type, int major, int minor, int mode)
 {
-	char *argv[7];
-	char mode_string[100];
-	char type_string[3];
-	char major_string[20];
-	char minor_string[20];
 	char filename[255];
 	int retval = 0;
-
 	strncpy(filename, UDEV_ROOT, sizeof(filename));
 	strncat(filename, name, sizeof(filename));
-
-	snprintf(mode_string, sizeof(mode_string), "--mode=%#o", mode);
-	snprintf(type_string, sizeof(type_string), "%c", type);
-	snprintf(major_string, sizeof(major_string), "%d", major);
-	snprintf(minor_string, sizeof(minor_string), "%d", minor);
-	
-	argv[0] = MKNOD;
-	argv[1] = mode_string;
-	argv[2] = filename;
-	argv[3] = type_string;
-	argv[4] = major_string;
-	argv[5] = minor_string;
-	argv[6] = NULL;
-	dbg ("executing %s %s %s %s %s %s",
-		argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
-	switch (fork()) {
-		case 0:
-			/* we are the child, so lets run the program */
-			execv (MKNOD, argv);
-			exit(0);
-			break;
-		case (-1):
-			dbg ("fork failed.");
-			retval = -EFAULT;
-			break;
-		default:
-			break;
+	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;
 	}
+
+	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)
 {
+	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);
@@ -136,46 +123,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;