#include <unistd.h>
#include <errno.h>
#include <sys/stat.h>
+#include <sys/types.h>
+#include <grp.h>
+#ifndef __KLIBC__
+#include <pwd.h>
+#endif
#include "udev.h"
#include "udev_version.h"
+#include "udev_dbus.h"
#include "namedev.h"
#include "udevdb.h"
#include "libsysfs/libsysfs.h"
+#include "klibc_fixups.h"
/*
* Right now the major/minor of a device is stored in a file called
static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
{
int retval = -ENODEV;
+ struct sysfs_attribute *attr = NULL;
- char *dev;
-
- dev = sysfs_get_value_from_attributes(class_dev->directory->attributes, "dev");
- if (dev == NULL)
+ attr = sysfs_get_classdev_attr(class_dev, "dev");
+ if (attr == NULL)
goto exit;
+ dbg("dev='%s'", attr->value);
- dbg("dev = %s", dev);
-
- if (sscanf(dev, "%u:%u", &udev->major, &udev->minor) != 2)
+ if (sscanf(attr->value, "%u:%u", &udev->major, &udev->minor) != 2)
goto exit;
-
- dbg("found major = %d, minor = %d", udev->major, udev->minor);
+ dbg("found major=%d, minor=%d", udev->major, udev->minor);
retval = 0;
exit:
return retval;
}
-/*
- * we possibly want to add some symlinks here
- * only numeric owner/group id's are supported
- */
+static int create_path(char *file)
+{
+ char p[NAME_SIZE];
+ char *pos;
+ int retval;
+ struct stat stats;
+
+ strncpy(p, file, sizeof(p));
+ pos = strchr(p+1, '/');
+ while (1) {
+ pos = strchr(pos+1, '/');
+ if (pos == NULL)
+ break;
+ *pos = 0x00;
+ if (stat(p, &stats)) {
+ retval = mkdir(p, 0755);
+ if (retval) {
+ dbg("mkdir(%s) failed with error '%s'",
+ p, strerror(errno));
+ return retval;
+ }
+ dbg("created '%s'", p);
+ }
+ *pos = '/';
+ }
+ return 0;
+}
+
static int create_node(struct udevice *dev)
{
+ struct stat stats;
char filename[255];
+ char linktarget[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));
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 = '/';
- }
- }
+ /* create parent directories if needed */
+ 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);
unsigned long id = strtoul(dev->owner, &endptr, 10);
if (*endptr == 0x00)
uid = (uid_t) id;
- else
- dbg("only numeric owner id supported: %s", dev->owner);
+ else {
+ struct passwd *pw = getpwnam(dev->owner);
+ if (!pw)
+ dbg("user unknown '%s'", dev->owner);
+ else
+ uid = pw->pw_uid;
+ }
}
if (*dev->group) {
unsigned long id = strtoul(dev->group, &endptr, 10);
if (*endptr == 0x00)
gid = (gid_t) id;
- else
- dbg("only numeric group id supported: %s", dev->group);
+ 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));
+ dbg("chown(%s, %u, %u) failed with error '%s'",
+ filename, uid, gid, strerror(errno));
+ }
+
+ /* create symlink if requested */
+ if (*dev->symlink) {
+ symlinks = dev->symlink;
+ while (1) {
+ linkname = strsep(&symlinks, " ");
+ 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);
+
+ /* optimize relative link */
+ linktarget[0] = '\0';
+ i = 0;
+ tail = 0;
+ while ((dev->name[i] == linkname[i]) && dev->name[i]) {
+ if (dev->name[i] == '/')
+ tail = i+1;
+ i++;
+ }
+ while (linkname[i]) {
+ if (linkname[i] == '/')
+ strcat(linktarget, "../");
+ i++;
+ }
+
+ if (*linktarget == '\0')
+ strcpy(linktarget, "./");
+ strcat(linktarget, &dev->name[tail]);
+
+ /* unlink existing non-directories to ensure that our symlink
+ * is created */
+ if (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));
+ }
}
return retval;
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);
+ 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);
+ dbg("class_dev->name='%s'", class_dev->name);
exit:
return class_dev;
while (loop--) {
struct stat buf;
- dbg("looking for %s", filename);
+ dbg("looking for '%s'", filename);
retval = stat(filename, &buf);
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;
struct udevice dev;
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';
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);
+ dbg("name='%s'", dev.name);
retval = create_node(&dev);
+ if (retval == 0)
+ sysbus_send_create(&dev, path);
+
exit:
if (class_dev)
sysfs_close_class_device(class_dev);
return retval;
}
-
~ianmdlvl / elogind.git / blobdiff