Attachment 734741 Details for Bug 1051465

[patch] readd-format-lenght-parameter.patch

0001-udev-readd-format-lenght-parameter.patch (text/plain), 2.46 KB, created by Thomas Blume on 2017-08-01 10:18:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Blume

Created: 2017-08-01 10:18:01 UTC

Size: 2.46 KB

patch

obsolete

>From d1a7fb4434b5b54da9760c8332b5a6a14f62049b Mon Sep 17 00:00:00 2001
>From: Thomas Blume <Thomas.Blume@suse.com>
>Date: Tue, 1 Aug 2017 09:50:21 +0200
>Subject: [PATCH 1/2] udev: readd format lenght parameter
>
>---
> man/udev.xml          |  4 ++++
> src/udev/udev-event.c | 16 ++++++++++++++++
> 2 files changed, 20 insertions(+)
>
>diff --git a/man/udev.xml b/man/udev.xml
>index 3359fb086..c1dd77cd9 100644
>--- a/man/udev.xml
>+++ b/man/udev.xml
>@@ -736,6 +736,10 @@
>           </listitem>
>         </varlistentry>
>       </variablelist>
>+
>+      <para>The count of characters to be substituted may be limited by specifying
>+      the format length value. For example, <literal>%3s{file}</literal> will
>+      only insert the first three characters of the sysfs attribute.</para>
>   </refsect1>
> 
>   <refsect1>
>diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
>index 6ff2cecab..31d1a9845 100644
>--- a/src/udev/udev-event.c
>+++ b/src/udev/udev-event.c
>@@ -158,12 +158,28 @@ size_t udev_event_apply_format(struct udev_event *event,
>                         } else if (from[0] == '%') {
>                                 /* substitute format char */
>                                 unsigned int i;
>+                                unsigned int num = 0;
>+                                char from1 = from[1];
> 
>                                 if (from[1] == '%') {
>                                         from++;
>                                         goto copy;
>                                 }
> 
>+                                /* extract possible format length and move from behind it*/
>+                                if (isdigit(from1)) {
>+                                        char *tail;
>+
>+                                        from++;
>+                                        num = (int) strtoul(from, &tail, 10);
>+                                        if (num > 0) {
>+                                                log_debug("format length='%i'", num);
>+                                                from = strjoina("%", tail);
>+                                                l = num+1;
>+                                        } else
>+                                                log_error("format parsing error '%s'", from);
>+                                }
>+
>                                 for (i = 0; i < ELEMENTSOF(map); i++) {
>                                         if (from[1] == map[i].fmt) {
>                                                 type = map[i].type;
>-- 
>2.12.3
>

Actions: View | Diff

Attachments on bug 1051465: 734741 | 734743 | 734940 | 735115 | 735117 | 739738