[PATCH] man-page mention multiple symlinks

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 4e0476c6e3823335e60886c314205d815481c7d6..fbdb125e4c39ec28a941b46bbd9fa57f9ee47061 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -121,6 +121,7 @@ int add_config_dev(struct config_device *new_dev)
                copy_string(dev, new_dev, place);
                copy_string(dev, new_dev, kernel_name);
                copy_string(dev, new_dev, exec_program);
+               copy_string(dev, new_dev, symlink);
                return 0;
        }
 
@@ -366,6 +367,7 @@ static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev
                if (strcmp_pattern(dev->id, udev->callout_value) != 0)
                        continue;
                strfieldcpy(udev->name, dev->name);
+               strfieldcpy(udev->symlink, dev->symlink);
                dbg("callout returned matching value '%s', '%s' becomes '%s'",
                    dev->id, class_dev->name, udev->name);
                return 0;
@@ -378,6 +380,7 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
        struct sysfs_attribute *tmpattr = NULL;
        struct config_device *dev;
        struct list_head *tmp;
+       char *c;
 
        list_for_each(tmp, &config_device_list) {
                dev = list_entry(tmp, struct config_device, node);
@@ -406,13 +409,16 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
                continue;
 
 label_found:
-               tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
+               c = tmpattr->value + strlen(tmpattr->value)-1;
+               if (*c == '\n')
+                       *c = 0x00;
                dbg("compare attribute '%s' value '%s' with '%s'",
                          dev->sysfs_file, tmpattr->value, dev->sysfs_value);
-               if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
+               if (strcmp_pattern(dev->sysfs_value, tmpattr->value) != 0)
                        continue;
 
                strfieldcpy(udev->name, dev->name);
+               strfieldcpy(udev->symlink, dev->symlink);
                dbg("found matching attribute '%s', '%s' becomes '%s' ",
                    dev->sysfs_file, class_dev->name, udev->name);
 
@@ -458,6 +464,7 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
                if (!found)
                        continue;
                strfieldcpy(udev->name, dev->name);
+               strfieldcpy(udev->symlink, dev->symlink);
                dbg("found matching id '%s', '%s' becomes '%s'",
                    dev->id, class_dev->name, udev->name);
                return 0;
@@ -503,6 +510,7 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
                        continue;
 
                strfieldcpy(udev->name, dev->name);
+               strfieldcpy(udev->symlink, dev->symlink);
                dbg("found matching place '%s', '%s' becomes '%s'",
                    dev->place, class_dev->name, udev->name);
                return 0;
@@ -525,6 +533,7 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
                        continue;
 
                strfieldcpy(udev->name, dev->name);
+               strfieldcpy(udev->symlink, dev->symlink);
                dbg("found name, '%s' becomes '%s'", dev->kernel_name, udev->name);
                
                return 0;
@@ -578,7 +587,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
                        }
                }
        }
-               
+
        if (sysfs_device) {
                dbg("sysfs_device->path='%s'", sysfs_device->path);
                dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
@@ -615,8 +624,9 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
        goto done;
 
 found:
-       /* substitute placeholder in NAME  */
+       /* substitute placeholder */
        apply_format(udev, udev->name);
+       apply_format(udev, udev->symlink);
 
 done:
        perm = find_perm(udev->name);
@@ -642,7 +652,7 @@ done:
 int namedev_init(void)
 {
        int retval;
-       
+
        retval = namedev_init_rules();
        if (retval)
                return retval;