X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-add.c;h=7d0bdadcb75fe3821bdfe1dff57f6a7fce6027db;hb=116176b0bde45832d212b60e8d7bcb5d87f5ce46;hp=54af7e4d77bd0494dbbbf671a8495664ae354975;hpb=ea256f901e30927591874ee3eb5b92e1ce5a5db1;p=elogind.git diff --git a/udev-add.c b/udev-add.c index 54af7e4d7..7d0bdadcb 100644 --- a/udev-add.c +++ b/udev-add.c @@ -31,21 +31,17 @@ #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,53 +68,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 *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; + strncpy(filename, udev_root, sizeof(filename)); + strncat(filename, dev->name, sizeof(filename)); + + switch (dev->type) { + case 'b': + dev->mode |= S_IFBLK; + break; + case 'c': + case 'u': + dev->mode |= S_IFCHR; + break; + case 'p': + dev->mode |= S_IFIFO; + break; + default: + dbg("unknown node type %c\n", dev->type); + return -EINVAL; } + + 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, 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); @@ -129,47 +116,65 @@ 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 +static 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); + ++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 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'; - class_dev = get_class_dev(device); + retval = sleep_for_dev(path); + if (retval) + goto exit; + + class_dev = get_class_dev(path); if (class_dev == NULL) goto exit; @@ -177,15 +182,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;