From: Karel Zak <kzak@redhat.com>
Date: Tue, 15 May 2018 12:11:38 +0000 (+0200)
Subject: lib/path: fix read string to be backwardly compatible
X-Git-Tag: v2.33-rc1~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5878cabe6e9df5a9dacbbd637f53784d0b19928;p=thirdparty%2Futil-linux.git

lib/path: fix read string to be backwardly compatible

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/path.c b/lib/path.c
index 998dce5bb4..c665196a99 100644
--- a/lib/path.c
+++ b/lib/path.c
@@ -505,6 +505,10 @@ int ul_path_read_string(struct path_cxt *pc, char **str, const char *path)
 	if (rc < 0 || !str)
 		return rc;;
 
+	/* Remove tailing newline (usuall in sysfs) */
+	if (rc > 0 && *(buf + rc - 1) == '\n')
+		--rc;
+
 	buf[rc] = '\0';
 	*str = strdup(buf);
 	if (!*str)