From: Tom Gundersen <teg@jklm.no>
Date: Fri, 28 Nov 2014 20:51:45 +0000 (+0100)
Subject: udev: rules - ignore the lack of trailing newline
X-Git-Tag: v218~214
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9f5ecdb0b11557be41c065f460bb22ab52bb0034;hp=6501b52d358aa2c7fe28e477f9d5acf0a2991d32

udev: rules - ignore the lack of trailing newline

Also accept '\r' as newline character.

This dropps warnings of the type:

  invalid key/value pair in file /usr/lib/udev/rules.d/40-usb-media-players.rules
  on line 26, starting at character 25 ('')
---

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 131abd69f..447a86864 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1067,7 +1067,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 
                         /* 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') {
+                        if (!strchr(NEWLINE "\0", *linepos)) {
                                 char buf[2] = {*linepos};
                                 _cleanup_free_ char *tmp;