[PATCH] bugfix for local user

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 581a7f2218ca08973d90bef696ba45d1132f2a36..ed8d6c1808bf3c747e4b0a14be5a49f99839a2cc 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -198,7 +198,7 @@ static int get_format_len(char **str)
 
        if (isdigit(*str[0])) {
                num = (int) strtoul(*str, &tail, 10);
-               if (tail != NULL) {
+               if (num > 0) {
                        *str = tail;
                        dbg("format length=%i", num);
                        return num;
@@ -220,7 +220,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
        char *pos2;
        char *pos3;
        char *attr;
-       int num;
+       int len;
        int i;
        char c;
        struct sysfs_attribute *tmpattr;
@@ -232,7 +232,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                if (pos != NULL) {
                        pos[0] = '\0';
                        tail = pos+1;
-                       num = get_format_len(&tail);
+                       len = get_format_len(&tail);
                        c = tail[0];
                        strfieldcpy(temp, tail+1);
                        tail = temp;
@@ -274,7 +274,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                        if (strlen(udev->program_result) == 0)
                                break;
                        /* get part part of the result string */
-                       i = num; /* num syntax is deprecated and will be removed  */
+                       i = 0;
                        if (attr != NULL)
                                i = atoi(attr);
                        if (i > 0) {
@@ -317,6 +317,10 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                        dbg("unknown substitution type '%%%c'", c);
                        break;
                }
+               /* truncate to specified length */
+               if (len > 0)
+                       pos[len] = '\0';
+
                strnfieldcat(string, tail, maxsize);
        }
 }
@@ -816,17 +820,31 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
        list_for_each_entry(dev, &config_device_list, node) {
                dbg("process rule");
                if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
-                       if (dev->name[0] == '\0') {
+                       if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
                                info("configured rule in '%s' at line %i applied, '%s' is ignored",
-                                    udev_rules_filename, dev->config_line, udev->kernel_name);
+                                    dev->config_file, dev->config_line, udev->kernel_name);
                                return -1;
                        }
 
-                       info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
-                            udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
-                       strfieldcpy(udev->name, dev->name);
-                       strfieldcpy(udev->symlink, dev->symlink);
-                       goto found;
+                       if (dev->symlink[0] != '\0') {
+                               char temp[NAME_MAX];
+
+                               info("configured rule in '%s' at line %i applied, added symlink '%s'",
+                                    dev->config_file, dev->config_line, dev->symlink);
+                               /* do not clobber dev */
+                               strfieldcpy(temp, dev->symlink);
+                               apply_format(udev, temp, sizeof(temp),
+                                            class_dev, sysfs_device);
+                               strfieldcat(udev->symlink, temp);
+                               strfieldcat(udev->symlink, " ");
+                       }
+
+                       if (dev->name[0] != '\0') {
+                               info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+                                    dev->config_file, dev->config_line, udev->kernel_name, dev->name);
+                               strfieldcpy(udev->name, dev->name);
+                               goto found;
+                       }
                }
        }
 
@@ -838,8 +856,6 @@ found:
        /* substitute placeholder */
        apply_format(udev, udev->name, sizeof(udev->name),
                     class_dev, sysfs_device);
-       apply_format(udev, udev->symlink, sizeof(udev->symlink),
-                    class_dev, sysfs_device);
        udev->partitions = dev->partitions;
 done:
        perm = find_perm(udev->name);