From: Dave Reisner <dreisner@archlinux.org>
Date: Mon, 16 Sep 2013 15:22:35 +0000 (-0400)
Subject: udev-rules: avoid erroring on trailing whitespace
X-Git-Tag: v208~126
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3cf0f8f7e0b950b5f6d678f3e8b7f0fc0f52d4bf;p=elogind.git

udev-rules: avoid erroring on trailing whitespace

https://bugs.archlinux.org/task/36950
---

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index f14158b50..6f8b12787 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1068,6 +1068,12 @@ static int add_rule(struct udev_rules *rules, char *line,
                 enum operation_type op;
 
                 if (get_key(rules->udev, &linepos, &key, &op, &value) != 0) {
+                        /* Avoid erroring on trailing whitespace. This is probably rare
+                         * so save the work for the error case instead of always trying
+                         * to strip the trailing whitespace with strstrip(). */
+                        while (isblank(*linepos))
+                                linepos++;
+
                         /* If we aren't at the end of the line, this is a parsing error.
                          * Make a best effort to describe where the problem is. */
                         if (*linepos != '\n') {