From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sun, 10 Feb 2019 22:55:17 +0000 (+0100)
Subject: parse: handle \r
X-Git-Tag: lxc-3.2.0~157^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2839%2Fhead;p=thirdparty%2Flxc.git

parse: handle \r

Closes #2838.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/parse.c b/src/lxc/parse.c
index 5abada058..01068ccb3 100644
--- a/src/lxc/parse.c
+++ b/src/lxc/parse.c
@@ -131,7 +131,7 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
 	}
 
 	ret = 0;
-	lxc_iterate_parts(line, buf, "\n\0") {
+	lxc_iterate_parts(line, buf, "\r\n\0") {
 		ret = callback(line, data);
 		if (ret) {
 			/* Callback rv > 0 means stop here callback rv < 0 means