X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=a71d435e327db824616935020e878faed987336f;hp=7906638a7f066670fbd2bea6d5a603d523fdb309;hb=f7b4eca455c7dbf850d984892756f22dbd9ddc3d;hpb=5840bc63e2029d22682d8de77dc8fcc4da1b436c diff --git a/udev-add.c b/udev-add.c index 7906638a7..a71d435e3 100644 --- a/udev-add.c +++ b/udev-add.c @@ -27,14 +27,19 @@ #include #include #include +#include +#include +#include +#ifndef __KLIBC__ +#include +#endif #include "udev.h" #include "udev_version.h" #include "namedev.h" #include "udevdb.h" #include "libsysfs/libsysfs.h" - -static char sysfs_path[SYSFS_PATH_MAX]; +#include "klibc_fixups.h" /* * Right now the major/minor of a device is stored in a file called @@ -45,7 +50,7 @@ static char sysfs_path[SYSFS_PATH_MAX]; * mm is the minor * The value is in decimal. */ -static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int *minor) +static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev) { int retval = -ENODEV; @@ -55,12 +60,12 @@ static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int if (dev == NULL) goto exit; - dbg("dev = %s", dev); + dbg("dev='%s'", dev); - if (sscanf(dev, "%u:%u", major, minor) != 2) + if (sscanf(dev, "%u:%u", &udev->major, &udev->minor) != 2) goto exit; - dbg("found major = %d, minor = %d", *major, *minor); + dbg("found major=%d, minor=%d", udev->major, udev->minor); retval = 0; exit: @@ -68,16 +73,26 @@ exit: } /* - * We also want to add some permissions here, and possibly some symlinks + * we possibly want to add some symlinks here + * only numeric owner/group id's are supported */ static int create_node(struct udevice *dev) { char filename[255]; int retval = 0; + uid_t uid = 0; + gid_t gid = 0; + dev_t res; - strncpy(filename, UDEV_ROOT, sizeof(filename)); + strncpy(filename, udev_root, sizeof(filename)); strncat(filename, dev->name, sizeof(filename)); +#ifdef __KLIBC__ + res = (dev->major << 8) | (dev->minor); +#else + res = makedev(dev->major, dev->minor); +#endif + switch (dev->type) { case 'b': dev->mode |= S_IFBLK; @@ -94,13 +109,80 @@ static int create_node(struct udevice *dev) return -EINVAL; } + /* create subdirectories if requested */ + if (strchr(dev->name, '/')) { + char path[255]; + char *pos; + struct stat stats; + + strncpy(path, filename, sizeof(path)); + pos = strchr(path+1, '/'); + while (1) { + pos = strchr(pos+1, '/'); + if (pos == NULL) + break; + *pos = 0x00; + if (stat(path, &stats)) { + retval = mkdir(path, 0755); + if (retval) { + dbg("mkdir(%s) failed with error '%s'", + path, strerror(errno)); + return retval; + } + dbg("created '%s'", path); + } + *pos = '/'; + } + } + dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor); - retval = mknod(filename, dev->mode, makedev(dev->major, dev->minor)); + retval = mknod(filename, dev->mode, res); 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 + dbg("chmod(%s, %#o)", filename, dev->mode); + retval = chmod(filename, dev->mode); + if (retval) + dbg("chmod(%s, %#o) failed with error '%s'", + filename, dev->mode, strerror(errno)); + + if (*dev->owner) { + char *endptr; + unsigned long id = strtoul(dev->owner, &endptr, 10); + if (*endptr == 0x00) + uid = (uid_t) id; + else { + struct passwd *pw = getpwnam(dev->owner); + if (!pw) + dbg("user unknown '%s'", dev->owner); + else + uid = pw->pw_uid; + } + } + + if (*dev->group) { + char *endptr; + unsigned long id = strtoul(dev->group, &endptr, 10); + if (*endptr == 0x00) + gid = (gid_t) id; + else { + struct group *gr = getgrnam(dev->group); + if (!gr) + dbg("group unknown '%s'", dev->group); + else + gid = gr->gr_gid; + } + } + + if (uid || gid) { + dbg("chown(%s, %u, %u)", filename, uid, gid); + retval = chown(filename, uid, gid); + if (retval) + dbg("chown(%s, %u, %u) failed with error '%s'", filename, + uid, gid, strerror(errno)); + } + return retval; } @@ -112,7 +194,7 @@ static struct sysfs_class_device *get_class_dev(char *device_name) strcpy(dev_path, sysfs_path); strcat(dev_path, device_name); - dbg("looking at %s", dev_path); + dbg("looking at '%s'", dev_path); /* open up the sysfs class device for this thing... */ class_dev = sysfs_open_class_device(dev_path); @@ -120,7 +202,7 @@ static struct sysfs_class_device *get_class_dev(char *device_name) dbg ("sysfs_open_class_device failed"); goto exit; } - dbg("class_dev->name = %s", class_dev->name); + dbg("class_dev->name='%s'", class_dev->name); exit: return class_dev; @@ -130,27 +212,25 @@ exit: * If it doesn't happen in about 10 seconds, give up. */ #define SECONDS_TO_WAIT_FOR_DEV 10 -int sleep_for_dev(char *path) +static int sleep_for_dev(char *path) { char filename[SYSFS_PATH_MAX + 6]; - struct stat buf; - int loop = 0; - int retval = -ENODEV; + int loop = SECONDS_TO_WAIT_FOR_DEV; + int retval; strcpy(filename, sysfs_path); strcat(filename, path); strcat(filename, "/dev"); - while (loop < SECONDS_TO_WAIT_FOR_DEV) { - dbg("looking for %s", filename); + while (loop--) { + struct stat buf; + + dbg("looking for '%s'", filename); retval = stat(filename, &buf); - if (retval == 0) { - retval = 0; + if (!retval) goto exit; - } - /* sleep for a second or two to give the kernel a chance to - * create the dev file */ + /* sleep to give the kernel a chance to create the dev file */ sleep(1); } retval = -ENODEV; @@ -160,24 +240,18 @@ exit: int udev_add_device(char *path, char *subsystem) { - struct sysfs_class_device *class_dev; + struct sysfs_class_device *class_dev = NULL; struct udevice dev; - struct device_attr attr; int retval = -EINVAL; + memset(&dev, 0x00, sizeof(dev)); + /* for now, the block layer is the only place where block devices are */ if (strcmp(subsystem, "block") == 0) dev.type = 'b'; else 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; @@ -186,32 +260,27 @@ int udev_add_device(char *path, char *subsystem) if (class_dev == NULL) goto exit; - retval = namedev_name_device(class_dev, &attr); - if (retval) - return retval; - - retval = get_major_minor(class_dev, &dev.major, &dev.minor); + retval = get_major_minor(class_dev, &dev); if (retval) { 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 = namedev_name_device(class_dev, &dev); + if (retval) + goto exit; + 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); - - dbg("name = %s", dev.name); + dbg("name='%s'", dev.name); retval = create_node(&dev); exit: + if (class_dev) + sysfs_close_class_device(class_dev); + return retval; } -