[PATCH] pre-libsysfs-0.4.0 patch

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 4e0476c6e3823335e60886c314205d815481c7d6..633a7bf0dad1f7b892aa68575f7c241a1c4911ab 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;
        }
 
@@ -222,7 +223,7 @@ static void apply_format(struct udevice *udev, unsigned char *string)
                                break;
                        case 'D':
                                if (strlen(udev->kernel_number) == 0) {
-                                       strcat(pos, "disk");
+                                       strcat(pos, "disc");
                                        break;
                                }
                                strcat(pos, "part");
@@ -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;
@@ -543,42 +552,34 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
        struct sysfs_device *sysfs_device = NULL;
        struct sysfs_class_device *class_dev_parent = NULL;
        int retval = 0;
-       char *temp = NULL;
        struct perm_device *perm;
 
        udev->mode = 0;
 
        /* find the sysfs_device for this class device */
        /* Wouldn't it really be nice if libsysfs could do this for us? */
-       if (class_dev->sysdevice) {
-               sysfs_device = class_dev->sysdevice;
-       } else {
+       sysfs_device = sysfs_get_classdev_device(class_dev);
+       if (sysfs_device == NULL) {
                /* bah, let's go backwards up a level to see if the device is there,
                 * as block partitions don't point to the physical device.  Need to fix that
                 * up in the kernel...
                 */
-               if (strstr(class_dev->path, "block")) {
+               if (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) {
                        dbg("looking at block device");
                        if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
-                               char path[SYSFS_PATH_MAX];
-
                                dbg("really is a partition");
-                               strfieldcpy(path, class_dev->path);
-                               temp = strrchr(path, '/');
-                               *temp = 0x00;
-                               dbg("looking for a class device at '%s'", path);
-                               class_dev_parent = sysfs_open_class_device(path);
+                               class_dev_parent = sysfs_get_classdev_parent
+                                                                  (class_dev);
                                if (class_dev_parent == NULL) {
-                                       dbg("sysfs_open_class_device at '%s' failed", path);
+                                       dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
                                } else {
                                        dbg("class_dev_parent->name='%s'", class_dev_parent->name);
-                                       if (class_dev_parent->sysdevice)
-                                               sysfs_device = class_dev_parent->sysdevice;
+                                       sysfs_device = sysfs_get_classdev_device(class_dev_parent);
                                }
                        }
                }
        }
-               
+
        if (sysfs_device) {
                dbg("sysfs_device->path='%s'", sysfs_device->path);
                dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
@@ -615,8 +616,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);
@@ -633,16 +635,13 @@ done:
        dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
            udev->name, udev->owner, udev->group, udev->mode);
 
-       if (class_dev_parent)
-               sysfs_close_class_device(class_dev_parent);
-
        return 0;
 }
 
 int namedev_init(void)
 {
        int retval;
-       
+
        retval = namedev_init_rules();
        if (retval)
                return retval;