X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.c;h=9cfc4283be12b8b4d57df85695ea308d1b1c2818;hb=4be25ce1d0e1cef62120a5605f8472761a26689e;hp=7045637e79e5f3423d6a4bd005dfd0b23ee513b9;hpb=3fd7a9bfc068a5598a97de5e4b4fff167917f362;p=elogind.git diff --git a/namedev.c b/namedev.c index 7045637e7..9cfc4283b 100644 --- a/namedev.c +++ b/namedev.c @@ -665,8 +665,7 @@ static int match_rule(struct udevice *udev, struct config_device *dev, /* check for matching result of external program */ if (dev->result[0] != '\0') { - dbg("check for " FIELD_RESULT - " dev->result='%s', udev->program_result='%s'", + dbg("check for " FIELD_RESULT " dev->result='%s', udev->program_result='%s'", dev->result, udev->program_result); if (strcmp_pattern(dev->result, udev->program_result) != 0) { dbg(FIELD_RESULT " is not matching"); @@ -777,7 +776,9 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d udev->partitions = dev->partitions; udev->mode = dev->mode; strfieldcpy(udev->owner, dev->owner); + apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device); strfieldcpy(udev->group, dev->group); + apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device); goto perms; }