[PATCH] allow unlimitied count of symlinks

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 0463d4df0b6625dc03b4570eae8c1e71fbe96070..91841571c170130d5303bb88f1c92c5ed41e3a09 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -144,15 +144,14 @@ static int get_format_len(char **str)
  */
 static int find_free_number(struct udevice *udev, const char *name)
 {
+       char devpath[NAME_SIZE];
        char filename[NAME_SIZE];
        int num = 0;
-       struct udevice db_udev;
 
        strfieldcpy(filename, name);
        while (1) {
                dbg("look for existing node '%s'", filename);
-               memset(&db_udev, 0x00, sizeof(struct udevice));
-               if (udev_db_get_device_byname(&db_udev, filename) != 0) {
+               if (udev_db_search_name(devpath, DEVPATH_SIZE, filename) != 0) {
                        dbg("free num=%d", num);
                        return num;
                }
@@ -168,8 +167,7 @@ static int find_free_number(struct udevice *udev, const char *name)
 }
 
 static void apply_format(struct udevice *udev, char *string, size_t maxsize,
-                        struct sysfs_class_device *class_dev,
-                        struct sysfs_device *sysfs_device)
+                        struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
        char temp[NAME_SIZE];
        char temp2[NAME_SIZE];
@@ -201,29 +199,20 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                dbg("format=%c, string='%s', tail='%s'",c , string, tail);
                attr = get_format_attribute(&tail);
 
-
                switch (c) {
                case 'p':
-                       if (strlen(udev->devpath) == 0)
-                               break;
                        strfieldcatmax(string, udev->devpath, maxsize);
                        dbg("substitute kernel name '%s'", udev->kernel_name);
                        break;
                case 'b':
-                       if (strlen(udev->bus_id) == 0)
-                               break;
                        strfieldcatmax(string, udev->bus_id, maxsize);
                        dbg("substitute bus_id '%s'", udev->bus_id);
                        break;
                case 'k':
-                       if (strlen(udev->kernel_name) == 0)
-                               break;
                        strfieldcatmax(string, udev->kernel_name, maxsize);
                        dbg("substitute kernel name '%s'", udev->kernel_name);
                        break;
                case 'n':
-                       if (strlen(udev->kernel_number) == 0)
-                               break;
                        strfieldcatmax(string, udev->kernel_number, maxsize);
                        dbg("substitute kernel number '%s'", udev->kernel_number);
                                break;
@@ -236,7 +225,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                        dbg("substitute major number '%u'", major(udev->devt));
                        break;
                case 'c':
-                       if (strlen(udev->program_result) == 0)
+                       if (udev->program_result[0] == '\0')
                                break;
                        /* get part part of the result string */
                        i = 0;
@@ -308,13 +297,14 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                                struct udevice udev_parent;
 
                                dbg("found parent '%s', get the node name", class_dev_parent->path);
-                               memset(&udev_parent, 0x00, sizeof(struct udevice));
+                               udev_init_device(&udev_parent, NULL, NULL);
                                /* lookup the name in the udev_db with the DEVPATH of the parent */
-                               if (udev_db_get_device_by_devpath(&udev_parent, &class_dev_parent->path[strlen(sysfs_path)]) == 0) {
+                               if (udev_db_get_device(&udev_parent, &class_dev_parent->path[strlen(sysfs_path)]) == 0) {
                                        strfieldcatmax(string, udev_parent.name, maxsize);
                                        dbg("substitute parent node name'%s'", udev_parent.name);
                                } else
                                        dbg("parent not found in database");
+                               udev_cleanup_device(&udev_parent);
                        }
                        break;
                case 'N':
@@ -731,7 +721,7 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                                return -1;
                        }
                        if (dev->ignore_remove) {
-                               udev->ignore_remove = dev->ignore_remove;
+                               udev->ignore_remove = 1;
                                dbg_parse("remove event should be ignored");
                        }
                        /* apply all_partitions option only at a main block device */
@@ -759,14 +749,25 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                        /* collect symlinks */
                        if (dev->symlink[0] != '\0') {
                                char temp[NAME_SIZE];
+                               char *pos, *next;
 
                                info("configured rule in '%s[%i]' applied, added symlink '%s'",
                                     dev->config_file, dev->config_line, dev->symlink);
                                strfieldcpy(temp, dev->symlink);
                                apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
-                               if (udev->symlink[0] != '\0')
-                                       strfieldcat(udev->symlink, " ");
-                               strfieldcat(udev->symlink, temp);
+
+                               /* add multiple symlinks separated by spaces */
+                               pos = temp;
+                               next = strchr(temp, ' ');
+                               while (next) {
+                                       next[0] = '\0';
+                                       dbg("add symlink '%s'", pos);
+                                       name_list_add(&udev->symlink_list, pos, 0);
+                                       pos = &next[1];
+                                       next = strchr(pos, ' ');
+                               }
+                               dbg("add symlink '%s'", pos);
+                               name_list_add(&udev->symlink_list, pos, 0);
                        }
 
                        /* rule matches */
@@ -783,16 +784,17 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                                        dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i",
                                            udev->name, udev->owner, udev->group, udev->mode, udev->partitions);
 
-                               goto exit;
+                               break;
                        }
                }
        }
 
-       /* no rule matched, so we use the kernel name */
-       strfieldcpy(udev->name, udev->kernel_name);
-       dbg("no rule found, use kernel name '%s'", udev->name);
+       if (udev->name[0] == '\0') {
+               /* no rule matched, so we use the kernel name */
+               strfieldcpy(udev->name, udev->kernel_name);
+               dbg("no rule found, use kernel name '%s'", udev->name);
+       }
 
-exit:
        if (udev->tmp_node[0] != '\0') {
                dbg("removing temporary device node");
                unlink_secure(udev->tmp_node);