X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=87cf57c3b662a5a786a1d8c8542552da24d58f21;hp=33ee633fd8765a5fdf0d87a5b87bbb5dfa12c102;hb=2b7289ae887af8ed6bbdf060f618a1cc560caffb;hpb=5d4754f19521568b775ba7a31465d3af192ce382 diff --git a/udev-add.c b/udev-add.c index 33ee633fd..87cf57c3b 100644 --- a/udev-add.c +++ b/udev-add.c @@ -33,13 +33,14 @@ #ifndef __KLIBC__ #include #endif +#include #include "udev.h" #include "udev_version.h" #include "udev_dbus.h" +#include "logging.h" #include "namedev.h" #include "udevdb.h" -#include "libsysfs/libsysfs.h" #include "klibc_fixups.h" /* @@ -86,7 +87,7 @@ static int create_path(char *file) *pos = 0x00; if (stat(p, &stats)) { retval = mkdir(p, 0755); - if (retval) { + if (retval != 0) { dbg("mkdir(%s) failed with error '%s'", p, strerror(errno)); return retval; @@ -98,28 +99,55 @@ static int create_path(char *file) return 0; } -static int create_node(struct udevice *dev) +static int make_node(char *filename, int major, int minor, unsigned int mode, uid_t uid, gid_t gid) { + int retval; + + retval = mknod(filename, mode, makedev(major, minor)); + if (retval != 0) { + dbg("mknod(%s, %#o, %u, %u) failed with error '%s'", + filename, mode, major, minor, strerror(errno)); + return retval; + } + + dbg("chmod(%s, %#o)", filename, mode); + retval = chmod(filename, mode); + if (retval != 0) { + dbg("chmod(%s, %#o) failed with error '%s'", + filename, mode, strerror(errno)); + return retval; + } + + if (uid != 0 || gid != 0) { + dbg("chown(%s, %u, %u)", filename, uid, gid); + retval = chown(filename, uid, gid); + if (retval != 0) { + dbg("chown(%s, %u, %u) failed with error '%s'", + filename, uid, gid, strerror(errno)); + return retval; + } + } + + return 0; +} + +static int create_node(struct udevice *dev, int fake) +{ + struct stat stats; char filename[255]; char linktarget[255]; + char partitionname[255]; char *linkname; char *symlinks; int retval = 0; uid_t uid = 0; gid_t gid = 0; - dev_t res; int i; int tail; 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; @@ -140,67 +168,69 @@ static int create_node(struct udevice *dev) if (strrchr(dev->name, '/')) create_path(filename); - dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, 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)); - - 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) { + if (dev->owner[0] != '\0') { char *endptr; unsigned long id = strtoul(dev->owner, &endptr, 10); - if (*endptr == 0x00) + if (endptr[0] == '\0') uid = (uid_t) id; else { struct passwd *pw = getpwnam(dev->owner); - if (!pw) - dbg("user unknown '%s'", dev->owner); + if (pw == NULL) + dbg("specified user unknown '%s'", dev->owner); else uid = pw->pw_uid; } } - if (*dev->group) { + if (dev->group[0] != '\0') { char *endptr; unsigned long id = strtoul(dev->group, &endptr, 10); - if (*endptr == 0x00) + if (endptr[0] == '\0') gid = (gid_t) id; else { struct group *gr = getgrnam(dev->group); - if (!gr) - dbg("group unknown '%s'", dev->group); + if (gr == NULL) + dbg("specified 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)); + if (!fake) { + info("creating device node '%s'", filename); + make_node(filename, dev->major, dev->minor, dev->mode, uid, gid); + } else { + info("creating device node '%s', major = '%d', minor = '%d', " + "mode = '%#o', uid = '%d', gid = '%d'", filename, + dev->major, dev->minor, (mode_t)dev->mode, uid, gid); + } + + /* create partitions if requested */ + if (dev->partitions > 0) { + info("creating device partition nodes '%s[1-%i]'", filename, dev->partitions); + if (!fake) { + for (i = 1; i <= dev->partitions; i++) { + sprintf(partitionname, "%s%i", filename, i); + make_node(partitionname, dev->major, + dev->minor + i, dev->mode, uid, gid); + } + } } /* create symlink if requested */ - if (*dev->symlink) { + if (dev->symlink[0] != '\0') { symlinks = dev->symlink; while (1) { linkname = strsep(&symlinks, " "); - if (linkname == NULL) + if (linkname == NULL || linkname[0] == '\0') break; strncpy(filename, udev_root, sizeof(filename)); strncat(filename, linkname, sizeof(filename)); dbg("symlink '%s' to node '%s' requested", filename, dev->name); - if (strrchr(linkname, '/')) - create_path(filename); + if (!fake) + if (strrchr(linkname, '/')) + create_path(filename); /* optimize relative link */ linktarget[0] = '\0'; @@ -211,21 +241,32 @@ static int create_node(struct udevice *dev) tail = i+1; i++; } - while (linkname[i]) { + while (linkname[i] != '\0') { if (linkname[i] == '/') strcat(linktarget, "../"); i++; } - if (*linktarget == '\0') + if (linktarget[0] == '\0') strcpy(linktarget, "./"); strcat(linktarget, &dev->name[tail]); + /* unlink existing files to ensure that our symlink is created */ + if (!fake && (lstat(filename, &stats) == 0)) { + if ((stats.st_mode & S_IFMT) != S_IFDIR) { + if (unlink(filename)) + dbg("unlink(%s) failed with error '%s'", + filename, strerror(errno)); + } + } + dbg("symlink(%s, %s)", linktarget, filename); - retval = symlink(linktarget, filename); - if (retval) - dbg("symlink(%s, %s) failed with error '%s'", - linktarget, filename, strerror(errno)); + if (!fake) { + retval = symlink(linktarget, filename); + if (retval != 0) + dbg("symlink(%s, %s) failed with error '%s'", + linktarget, filename, strerror(errno)); + } } } @@ -242,9 +283,9 @@ static struct sysfs_class_device *get_class_dev(char *device_name) dbg("looking at '%s'", dev_path); /* open up the sysfs class device for this thing... */ - class_dev = sysfs_open_class_device(dev_path); + class_dev = sysfs_open_class_device_path(dev_path); if (class_dev == NULL) { - dbg ("sysfs_open_class_device failed"); + dbg ("sysfs_open_class_device_path failed"); goto exit; } dbg("class_dev->name='%s'", class_dev->name); @@ -272,7 +313,7 @@ static int sleep_for_dev(char *path) dbg("looking for '%s'", filename); retval = stat(filename, &buf); - if (!retval) + if (retval == 0) goto exit; /* sleep to give the kernel a chance to create the dev file */ @@ -283,7 +324,7 @@ exit: return retval; } -int udev_add_device(char *path, char *subsystem) +int udev_add_device(char *path, char *subsystem, int fake) { struct sysfs_class_device *class_dev = NULL; struct udevice dev; @@ -298,7 +339,7 @@ int udev_add_device(char *path, char *subsystem) dev.type = 'c'; retval = sleep_for_dev(path); - if (retval) + if (retval != 0) goto exit; class_dev = get_class_dev(path); @@ -306,24 +347,27 @@ int udev_add_device(char *path, char *subsystem) goto exit; retval = get_major_minor(class_dev, &dev); - if (retval) { + if (retval != 0) { dbg("get_major_minor failed"); goto exit; } retval = namedev_name_device(class_dev, &dev); - if (retval) + if (retval != 0) 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."); + if (!fake) { + 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."); + } dbg("name='%s'", dev.name); - retval = create_node(&dev); + retval = create_node(&dev, fake); - if (retval == 0) + if ((retval == 0) && (!fake)) sysbus_send_create(&dev, path); exit: