[PATCH] clarify udevinfo text

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 74d4d7646751973d1145f92368f42cedb680a7f8..9182ed1fdc7b8c4e8cf322df315b919541a75bf0 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -214,13 +214,15 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                         struct sysfs_device *sysfs_device)
 {
        char temp[NAME_SIZE];
+       char temp2[NAME_SIZE];
        char *tail;
        char *pos;
        char *attr;
        int len;
        int i;
-       int spos, slen;
        char c;
+       char *spos;
+       int slen;
        struct sysfs_attribute *tmpattr;
 
        pos = string;
@@ -285,8 +287,9 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                                        dbg("requested part of result string not found");
                                        break;
                                }
-                               strnfieldcat(string, udev->program_result + spos, slen+1);
-                               dbg("substitute part of result string '%s'", pos);
+                               strnfieldcpy(temp2, spos, slen+1);
+                               strnfieldcat(string, temp2, maxsize);
+                               dbg("substitute part of result string '%s'", temp2);
                        } else {
                                strnfieldcat(string, udev->program_result, maxsize);
                                dbg("substitute result string '%s'", udev->program_result);