delete dasd_id, it moved to s390-tools

[elogind.git] / udev_rules.c

diff --git a/udev_rules.c b/udev_rules.c
index edaaa71d12c7793c9716cb332ce5edaed41a2598..200b4e70242b9b1a6c94879d9d54d5c3a24a615b 100644 (file)
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -364,6 +364,8 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
                                                goto found;
                                        }
                                }
+                               head[0] = '$';
+                               err("unknown format variable '%s'", head);
                        } else if (head[0] == '%') {
                                /* substitute format char */
                                if (head[1] == '\0')
@@ -385,6 +387,8 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
                                                goto found;
                                        }
                                }
+                               head[0] = '%';
+                               err("unknown format char '%c'", tail[0]);
                        }
                        head++;
                }
@@ -554,7 +558,7 @@ found:
                        break;
                }
                /* possibly truncate to format-char specified length */
-               if (len != -1) {
+               if (len >= 0 && len < (int)strlen(head)) {
                        head[len] = '\0';
                        dbg("truncate to %i chars, subtitution string becomes '%s'", len, head);
                }
@@ -838,18 +842,20 @@ try_parent:
 
                if (pair->key.operation == KEY_OP_ASSIGN) {
                        const char *key_name = key_pair_name(rule, pair);
-                       const char *key_value = key_val(rule, &pair->key);
                        char attr[PATH_SIZE];
+                       char value[NAME_SIZE];
                        FILE *f;
 
                        strlcpy(attr, sysfs_path, sizeof(attr));
                        strlcat(attr, udev->dev->devpath, sizeof(attr));
                        strlcat(attr, "/", sizeof(attr));
                        strlcat(attr, key_name, sizeof(attr));
-                       dbg("write '%s' to '%s'", key_value, attr);
+                       strlcpy(value, key_val(rule, &pair->key), sizeof(value));
+                       udev_rules_apply_format(udev, value, sizeof(value));
+                       info("writing '%s' to sysfs file '%s'", value, attr);
                        f = fopen(attr, "w");
                        if (f != NULL) {
-                               if (fprintf(f, "%s\n", key_value) <= 0)
+                               if (fprintf(f, "%s", value) <= 0)
                                        err("error writing ATTR{%s}: %s", attr, strerror(errno));
                                fclose(f);
                        } else