From: Enrico Forestieri <forenr@lyx.org>
Date: Mon, 16 Mar 2015 09:50:02 +0000 (+0100)
Subject: Refine fix for #9453
X-Git-Tag: 2.2.0alpha1~1165
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1af2242c7e9c3dd4edd1ddba5f65e5de5c5e600a;p=features.git

Refine fix for #9453

It is better to introduce a dummy blank dir in TEXINPUTS rather than
appending a blank at the end. Even if I have checked that this is not
a problem with MikTeX, some other engine (maybe texlive, but I cannot
check) could not ignore this space and take it as the name of a dir.
In this case, TEXINPUTS would not end with an empty element and the
standard search path would not be inserted there.
---

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index 229dd2e1da..1f794f2c9c 100644
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -733,10 +733,11 @@ string latexEnvCmdPrefix(string const & path)
 		return "env TEXINPUTS=\"." + sep + texinputs_prefix
 					  + sep + texinputs + "\" ";
 	else
-		// NOTE: *any* space in the last string matters! (see bug 9453)
-		return "cmd /d /c set \"TEXINPUTS=."
+		// NOTE: the dummy blank dir is necessary to force the
+		//       QProcess parser to quote the argument (see bug 9453)
+		return "cmd /d /c set \"TEXINPUTS=." + sep + " "
 						+ sep + texinputs_prefix
-						+ sep + texinputs + " \" & ";
+						+ sep + texinputs + "\" & ";
 }