From: Enrico Forestieri <forenr@lyx.org>
Date: Sun, 10 Jan 2016 22:17:59 +0000 (+0100)
Subject: Make sure the origin tag is properly terminated.
X-Git-Tag: 2.2.0beta1~227
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=71ff50b7536124eafda877514b608182767538bc;p=features.git

Make sure the origin tag is properly terminated.
---

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index fe47c05bf0..8024d4a5b1 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1015,11 +1015,11 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const
 	// The top of the file is written by the buffer.
 	// Prints out the buffer info into the .lyx file given by file
 
-	// the document directory
-	// use realPath() instead of absFileName() for comparing
-	// so we can catch also eventually used symbolic parts of the path.
-	string filepath = buf->fileName().onlyPath().realPath();
-	string const sysdir = package().system_support().realPath();
+	// the document directory (must end with a path separator)
+	// realPath() is used to resolve symlinks, while addPath(..., "")
+	// ensures a trailing path separator.
+	string filepath = addPath(buf->fileName().onlyPath().realPath(), "");
+	string const sysdir = addPath(package().system_support().realPath(), "");
 	string const relpath =
 		to_utf8(makeRelPath(from_utf8(filepath), from_utf8(sysdir)));
 	if (!prefixIs(relpath, "../") && !FileName::isAbsolute(relpath))