[PATCH] allow multiple symlinks

[elogind.git] / udev-add.c

diff --git a/udev-add.c b/udev-add.c
index ddf432bbc7229312a7522372207898f0709786a1..e64a845c7e3a4f8149cf3c17db39191f06283241 100644 (file)
--- a/udev-add.c
+++ b/udev-add.c
@@ -36,6 +36,7 @@
 
 #include "udev.h"
 #include "udev_version.h"
+#include "udev_dbus.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -53,18 +54,15 @@
 static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
        int retval = -ENODEV;
-
        char *dev;
 
        dev = sysfs_get_value_from_attributes(class_dev->directory->attributes, "dev");
        if (dev == NULL)
                goto exit;
-
        dbg("dev='%s'", dev);
 
        if (sscanf(dev, "%u:%u", &udev->major, &udev->minor) != 2)
                goto exit;
-
        dbg("found major=%d, minor=%d", udev->major, udev->minor);
 
        retval = 0;
@@ -100,14 +98,12 @@ static int create_path(char *file)
        return 0;
 }
 
-/*
- * 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];
        char linktarget[255];
+       char *linkname;
+       char *symlinks;
        int retval = 0;
        uid_t uid = 0;
        gid_t gid = 0;
@@ -115,7 +111,6 @@ static int create_node(struct udevice *dev)
        int i;
        int tail;
 
-
        strncpy(filename, udev_root, sizeof(filename));
        strncat(filename, dev->name, sizeof(filename));
 
@@ -193,39 +188,45 @@ static int create_node(struct udevice *dev)
                            filename, uid, gid, strerror(errno));
        }
 
-
        /* create symlink if requested */
        if (*dev->symlink) {
-               strncpy(filename, udev_root, sizeof(filename));
-               strncat(filename, dev->symlink, sizeof(filename));
-               dbg("symlink '%s' to node '%s' requested", filename, dev->name);
-               if (strrchr(dev->symlink, '/'))
-                       create_path(filename);
-
-               /* optimize relative link */
-               linktarget[0] = '\0';
-               i = 0;
-               tail = 0;
-               while ((dev->name[i] == dev->symlink[i]) && dev->name[i]) {
-                       if (dev->name[i] == '/')
-                               tail = i+1;
-                       i++;
-               }
-               while (dev->symlink[i]) {
-                       if (dev->symlink[i] == '/')
-                               strcat(linktarget, "../");
-                       i++;
-               }
+               symlinks = dev->symlink;
+               while (1) {
+                       linkname = strsep(&symlinks, " ");
+                       if (linkname == NULL)
+                               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]);
+                       if (*linktarget == '\0')
+                               strcpy(linktarget, "./");
+                       strcat(linktarget, &dev->name[tail]);
 
-               dbg("symlink(%s, %s)", linktarget, filename);
-               retval = symlink(linktarget, filename);
-               if (retval)
-                       dbg("symlink(%s, %s) failed with error '%s'",
-                           linktarget, 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;
@@ -238,7 +239,6 @@ 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... */
@@ -323,6 +323,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);