[PATCH] set default owner/group in db.

[elogind.git] / udev-add.c

diff --git a/udev-add.c b/udev-add.c
index a71d435e327db824616935020e878faed987336f..9aa8bdb3e91bb113edda18917ceef50a624424d4 100644 (file)
--- a/udev-add.c
+++ b/udev-add.c
@@ -36,6 +36,8 @@
 
 #include "udev.h"
 #include "udev_version.h"
+#include "udev_dbus.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -53,18 +55,15 @@
 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);
 
        retval = 0;
@@ -72,17 +71,47 @@ 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));
@@ -109,32 +138,11 @@ 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 = '/';
-               }
-       }
+       /* create parent directories if needed */
+       if (strrchr(dev->name, '/'))
+               create_path(filename);
 
+       info("creating device node '%s'", filename);
        dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
        retval = mknod(filename, dev->mode, res);
        if (retval)
@@ -179,8 +187,59 @@ static int create_node(struct udevice *dev)
                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;
@@ -193,13 +252,12 @@ 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);
 
        /* 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);
@@ -278,6 +336,9 @@ int udev_add_device(char *path, char *subsystem)
        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);