From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sat, 9 May 2009 17:06:54 +0000 (+0000)
Subject: Fix bug #4177: Lyx fails to open files with a $ character in their name.
X-Git-Tag: 2.0.0~6630
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b5fc687888d812b7846796776777ee5f358ad976;p=features.git

Fix bug #4177: Lyx fails to open files with a $ character in their name.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29587 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index cd09803174..69a6c4d7e5 100644
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -523,16 +523,23 @@ string const replaceEnvironmentPath(string const & path)
 	static boost::regex envvar_br_re("(.*)" + envvar_br + "(.*)");
 	static boost::regex envvar_re("(.*)" + envvar + "(.*)");
 	boost::smatch what;
-
-	string result = path;
+	string result;
+	string remaining = path;
 	while (1) {
-		regex_match(result, what, envvar_br_re);
+		regex_match(remaining, what, envvar_br_re);
 		if (!what[0].matched) {
-			regex_match(result, what, envvar_re);
-			if (!what[0].matched)
+			regex_match(remaining, what, envvar_re);
+			if (!what[0].matched) {
+				result += remaining;
 				break;
+			}
 		}
-		result = what.str(1) + getEnv(what.str(2)) + what.str(3);
+		string env_var = getEnv(what.str(2));
+		if (!env_var.empty())
+			result += what.str(1) + env_var;
+		else
+			result += what.str(1) + "$" + what.str(2);
+		remaining = what.str(3);
 	}
 	return result;
 }