X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Ffiletools.cpp;h=68c92d8daaa65fd5562c2db283c4c7ade4dcb45e;hb=de6ff1fec2b918a0bd09f48b17a2770bfc15aef7;hp=02b71ab1a04cb02fecc7f603795feab3a371782b;hpb=62ca7f3ae55ad2e0c395cb554d71afab87de1ee3;p=lyx.git

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index 02b71ab1a0..68c92d8daa 100644
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include "LyXRC.h"
+
 #include "support/filetools.h"
 
 #include "support/debug.h"
@@ -28,6 +30,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
+#include "support/Messages.h"
 #include "support/Package.h"
 #include "support/Path.h"
 #include "support/Systemcall.h"
@@ -36,7 +39,7 @@
 #include <QDir>
 
 #include "support/lassert.h"
-#include <boost/regex.hpp>
+#include "support/regex.h"
 
 #include <fcntl.h>
 
@@ -47,6 +50,12 @@
 #include <utility>
 #include <fstream>
 #include <sstream>
+#include <vector>
+
+#if defined (_WIN32)
+#include <io.h>
+#include <windows.h>
+#endif
 
 using namespace std;
 
@@ -55,21 +64,28 @@ using namespace std;
 namespace lyx {
 namespace support {
 
-bool isLyXFilename(string const & filename)
+bool isLyXFileName(string const & filename)
 {
 	return suffixIs(ascii_lowercase(filename), ".lyx");
 }
 
 
-bool isSGMLFilename(string const & filename)
+bool isSGMLFileName(string const & filename)
 {
 	return suffixIs(ascii_lowercase(filename), ".sgml");
 }
 
 
-bool isValidLaTeXFilename(string const & filename)
+bool isValidLaTeXFileName(string const & filename)
 {
-	string const invalid_chars("#$%{}()[]\"^");
+	string const invalid_chars("#%\"");
+	return filename.find_first_of(invalid_chars) == string::npos;
+}
+
+
+bool isValidDVIFileName(string const & filename)
+{
+	string const invalid_chars("${}()[]^");
 	return filename.find_first_of(invalid_chars) == string::npos;
 }
 
@@ -85,13 +101,13 @@ string const latex_path(string const & original_path,
 		// We can't use '"' because " is sometimes active (e.g. if
 		// babel is loaded with the "german" option)
 		if (extension == EXCLUDE_EXTENSION) {
-			// ChangeExtension calls os::internal_path internally
+			// changeExtension calls os::internal_path internally
 			// so don't use it to remove the extension.
 			string const ext = getExtension(path);
 			string const base = ext.empty() ?
 				path :
 				path.substr(0, path.length() - ext.length() - 1);
-			// ChangeExtension calls os::internal_path internally
+			// changeExtension calls os::internal_path internally
 			// so don't use it to re-add the extension.
 			path = "\\string\"" + base + "\\string\"." + ext;
 		} else {
@@ -99,7 +115,18 @@ string const latex_path(string const & original_path,
 		}
 	}
 
-	return dots == ESCAPE_DOTS ? subst(path, ".", "\\lyxdot ") : path;
+	if (dots != ESCAPE_DOTS)
+		return path;
+
+	// Replace dots with the lyxdot macro, but only in the file name,
+	// not the directory part.
+	// addName etc call os::internal_path internally
+	// so don't use them for path manipulation
+	// The directory separator is always '/' for LaTeX.
+	string::size_type pos = path.rfind('/');
+	if (pos == string::npos)
+		return subst(path, ".", "\\lyxdot ");
+	return path.substr(0, pos) + subst(path.substr(pos), ".", "\\lyxdot ");
 }
 
 
@@ -256,7 +283,7 @@ FileName const i18nLibFileSearch(string const & dir, string const & name,
 	   each po file is able to tell us its name. (JMarc)
 	*/
 
-	string lang = to_ascii(_("[[Replace with the code of your language]]"));
+	string lang = getGuiMessages().language();
 	string const language = getEnv("LANGUAGE");
 	if (!lang.empty() && !language.empty())
 		lang = language;
@@ -295,6 +322,21 @@ FileName const i18nLibFileSearch(string const & dir, string const & name,
 }
 
 
+FileName const imageLibFileSearch(string & dir, string const & name,
+		  string const & ext)
+{
+	if (!lyx::lyxrc.icon_set.empty()) {
+		string const imagedir = addPath(dir, lyx::lyxrc.icon_set);
+		FileName const fn = libFileSearch(imagedir, name, ext);
+		if (fn.exists()) {
+			dir = imagedir;
+			return fn;
+		}
+	}
+	return libFileSearch(dir, name, ext);
+}
+
+
 string const libScriptSearch(string const & command_in, quote_style style)
 {
 	static string const token_scriptpath = "$$s/";
@@ -350,7 +392,7 @@ FileName const createLyXTmpDir(FileName const & deflt)
 	if (deflt.empty() || deflt == package().system_temp_dir())
 		return createTmpDir(package().system_temp_dir(), "lyx_tmpdir");
 
-	if (deflt.createDirectory(0777)) 
+	if (deflt.createDirectory(0777))
 		return deflt;
 
 	if (deflt.isDirWritable()) {
@@ -415,7 +457,7 @@ FileName const makeAbsPath(string const & relPath, string const & basePath)
 	// Split by first /
 	rTemp = split(rTemp, temp, '/');
 	if (temp == "~") {
-		tempBase = package().home_dir().absFileName();
+		tempBase = Package::get_home_dir().absFileName();
 		tempRel = rTemp;
 	}
 
@@ -464,7 +506,7 @@ FileName const makeAbsPath(string const & relPath, string const & basePath)
 // Chops any path of filename.
 string const addName(string const & path, string const & fname)
 {
-	string const basename = onlyFilename(fname);
+	string const basename = onlyFileName(fname);
 	string buf;
 
 	if (path != "." && path != "./" && !path.empty()) {
@@ -478,7 +520,7 @@ string const addName(string const & path, string const & fname)
 
 
 // Strips path from filename
-string const onlyFilename(string const & fname)
+string const onlyFileName(string const & fname)
 {
 	if (fname.empty())
 		return fname;
@@ -511,7 +553,7 @@ string const expandPath(string const & path)
 		return FileName::getcwd().absFileName() + '/' + rTemp;
 
 	if (temp == "~")
-		return package().home_dir().absFileName() + '/' + rTemp;
+		return Package::get_home_dir().absFileName() + '/' + rTemp;
 
 	if (temp == "..")
 		return makeAbsPath(copy).absFileName();
@@ -529,34 +571,81 @@ string const replaceEnvironmentPath(string const & path)
 	static string const envvar_br = "[$]\\{([A-Za-z_][A-Za-z_0-9]*)\\}";
 
 	// $VAR is defined as:
-	// $\{[A-Za-z_][A-Za-z_0-9]*\}
+	// $[A-Za-z_][A-Za-z_0-9]*
 	static string const envvar = "[$]([A-Za-z_][A-Za-z_0-9]*)";
 
-	static boost::regex envvar_br_re("(.*)" + envvar_br + "(.*)");
-	static boost::regex envvar_re("(.*)" + envvar + "(.*)");
-	boost::smatch what;
-	string result;
-	string remaining = path;
+	static regex envvar_br_re("(.*)" + envvar_br + "(.*)");
+	static regex envvar_re("(.*)" + envvar + "(.*)");
+	string result = path;
 	while (1) {
-		regex_match(remaining, what, envvar_br_re);
-		if (!what[0].matched) {
-			regex_match(remaining, what, envvar_re);
-			if (!what[0].matched) {
-				result += remaining;
+		smatch what;
+		if (!regex_match(result, what, envvar_br_re)) {
+			if (!regex_match(result, what, envvar_re))
 				break;
-			}
 		}
 		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);
+		result = what.str(1) + env_var + what.str(3);
 	}
 	return result;
 }
 
 
+// Return a command prefix for setting the environment of the TeX engine.
+string latexEnvCmdPrefix(string const & path)
+{
+	if (path.empty() || lyxrc.texinputs_prefix.empty())
+		return string();
+
+	string const texinputs_prefix = os::latex_path_list(
+			replaceCurdirPath(path, lyxrc.texinputs_prefix));
+	string const sep = string(1, os::path_separator(os::TEXENGINE));
+	string const texinputs = getEnv("TEXINPUTS");
+
+	if (os::shell() == os::UNIX)
+		return "env TEXINPUTS=\"." + sep + texinputs_prefix
+					  + sep + texinputs + "\" ";
+	else
+		return "cmd /d /c set TEXINPUTS=." + sep + texinputs_prefix
+						   + sep + texinputs + "&";
+}
+
+
+// Replace current directory in all elements of a path list with a given path.
+string const replaceCurdirPath(string const & path, string const & pathlist)
+{
+	string const oldpathlist = replaceEnvironmentPath(pathlist);
+	char const sep = os::path_separator();
+	string newpathlist;
+
+	for (size_t i = 0, k = 0; i != string::npos; k = i) {
+		i = oldpathlist.find(sep, i);
+		string p = oldpathlist.substr(k, i - k);
+		if (FileName::isAbsolute(p)) {
+			newpathlist += p;
+		} else if (i > k) {
+			size_t offset = 0;
+			if (p == ".") {
+				offset = 1;
+			} else if (prefixIs(p, "./")) {
+				offset = 2;
+				while (p[offset] == '/')
+					++offset;
+			}
+			newpathlist += addPath(path, p.substr(offset));
+			if (suffixIs(p, "//"))
+				newpathlist += '/';
+		}
+		if (i != string::npos) {
+			newpathlist += sep;
+			// Stop here if the last element is empty 
+			if (++i == oldpathlist.length())
+				break;
+		}
+	}
+	return newpathlist;
+}
+
+
 // Make relative path out of two absolute paths
 docstring const makeRelPath(docstring const & abspath, docstring const & basepath)
 // Makes relative path out of absolute path. If it is deeper than basepath,
@@ -675,7 +764,7 @@ string const unzippedFileName(string const & zipped_file)
 	string const ext = getExtension(zipped_file);
 	if (ext == "gz" || ext == "z" || ext == "Z")
 		return changeExtension(zipped_file, string());
-	return onlyPath(zipped_file) + "unzipped_" + onlyFilename(zipped_file);
+	return onlyPath(zipped_file) + "unzipped_" + onlyFileName(zipped_file);
 }
 
 
@@ -706,7 +795,7 @@ docstring const makeDisplayPath(string const & path, unsigned int threshold)
 		return from_utf8("[" + str.erase(0, system.length()) + "]");
 
 	// replace /home/blah with ~/
-	string const home = package().home_dir().absFileName();
+	string const home = Package::get_home_dir().absFileName();
 	if (!home.empty() && prefixIs(str, home))
 		str = subst(str, home, "~");
 
@@ -714,44 +803,66 @@ docstring const makeDisplayPath(string const & path, unsigned int threshold)
 		return from_utf8(os::external_path(str));
 
 	string const prefix = ".../";
-	string temp;
+	docstring dstr = from_utf8(str);
+	docstring temp;
 
-	while (str.length() > threshold)
-		str = split(str, temp, '/');
+	while (dstr.length() > threshold)
+		dstr = split(dstr, temp, '/');
 
 	// Did we shorten everything away?
-	if (str.empty()) {
+	if (dstr.empty()) {
 		// Yes, filename itself is too long.
 		// Pick the start and the end of the filename.
-		str = onlyFilename(path);
-		string const head = str.substr(0, threshold / 2 - 3);
+		dstr = from_utf8(onlyFileName(path));
+		docstring const head = dstr.substr(0, threshold / 2 - 3);
 
-		string::size_type len = str.length();
-		string const tail =
-			str.substr(len - threshold / 2 - 2, len - 1);
-		str = head + "..." + tail;
+		docstring::size_type len = dstr.length();
+		docstring const tail =
+			dstr.substr(len - threshold / 2 - 2, len - 1);
+		dstr = head + from_ascii("...") + tail;
 	}
 
-	return from_utf8(os::external_path(prefix + str));
+	return from_utf8(os::external_path(prefix + to_utf8(dstr)));
 }
 
 
+#ifdef HAVE_READLINK
 bool readLink(FileName const & file, FileName & link)
 {
-#ifdef HAVE_READLINK
-	char linkbuffer[PATH_MAX + 1];
 	string const encoded = file.toFilesystemEncoding();
+#ifdef HAVE_DEF_PATH_MAX
+	char linkbuffer[PATH_MAX + 1];
 	int const nRead = ::readlink(encoded.c_str(),
 				     linkbuffer, sizeof(linkbuffer) - 1);
 	if (nRead <= 0)
 		return false;
 	linkbuffer[nRead] = '\0'; // terminator
+#else
+	vector<char> buf(1024);
+	int nRead = -1;
+
+	while (true) {
+		nRead = ::readlink(encoded.c_str(), &buf[0], buf.size() - 1);
+		if (nRead < 0) {
+			return false;
+		}
+		if (nRead < buf.size() - 1) {
+			break;
+		}
+		buf.resize(buf.size() * 2);
+	}
+	buf[nRead] = '\0'; // terminator
+	const char * linkbuffer = &buf[0];
+#endif
 	link = makeAbsPath(linkbuffer, onlyPath(file.absFileName()));
 	return true;
+}
 #else
+bool readLink(FileName const &, FileName &)
+{
 	return false;
-#endif
 }
+#endif
 
 
 cmd_ret const runCommand(string const & cmd)
@@ -766,7 +877,55 @@ cmd_ret const runCommand(string const & cmd)
 	// pstream (process stream), with the
 	// variants ipstream, opstream
 
-#if defined (HAVE_POPEN)
+#if defined (_WIN32)
+	int fno;
+	STARTUPINFO startup;
+	PROCESS_INFORMATION process;
+	SECURITY_ATTRIBUTES security;
+	HANDLE in, out;
+	FILE * inf = 0;
+	bool err2out = false;
+	string command;
+	string const infile = trim(split(cmd, command, '<'), " \"");
+	command = rtrim(command);
+	if (suffixIs(command, "2>&1")) {
+		command = rtrim(command, "2>&1");
+		err2out = true;
+	}
+	string const cmdarg = "/d /c " + command;
+	string const comspec = getEnv("COMSPEC");
+
+	security.nLength = sizeof(SECURITY_ATTRIBUTES);
+	security.bInheritHandle = TRUE;
+	security.lpSecurityDescriptor = NULL;
+
+	if (CreatePipe(&in, &out, &security, 0)) {
+		memset(&startup, 0, sizeof(STARTUPINFO));
+		memset(&process, 0, sizeof(PROCESS_INFORMATION));
+
+		startup.cb = sizeof(STARTUPINFO);
+		startup.dwFlags = STARTF_USESTDHANDLES;
+
+		startup.hStdError = err2out ? out : GetStdHandle(STD_ERROR_HANDLE);
+		startup.hStdInput = infile.empty()
+			? GetStdHandle(STD_INPUT_HANDLE)
+			: CreateFile(infile.c_str(), GENERIC_READ,
+				FILE_SHARE_READ, &security, OPEN_EXISTING,
+				FILE_ATTRIBUTE_NORMAL, NULL);
+		startup.hStdOutput = out;
+
+		if (startup.hStdInput != INVALID_HANDLE_VALUE &&
+			CreateProcess(comspec.c_str(), (LPTSTR)cmdarg.c_str(),
+				&security, &security, TRUE, CREATE_NO_WINDOW,
+				0, 0, &startup, &process)) {
+
+			CloseHandle(process.hThread);
+			fno = _open_osfhandle((long)in, _O_RDONLY);
+			CloseHandle(out);
+			inf = _fdopen(fno, "r");
+		}
+	}
+#elif defined (HAVE_POPEN)
 	FILE * inf = ::popen(cmd.c_str(), os::popen_read_mode());
 #elif defined (HAVE__POPEN)
 	FILE * inf = ::_popen(cmd.c_str(), os::popen_read_mode());
@@ -774,7 +933,7 @@ cmd_ret const runCommand(string const & cmd)
 #error No popen() function.
 #endif
 
-	// (Claus Hentschel) Check if popen was succesful ;-)
+	// (Claus Hentschel) Check if popen was successful ;-)
 	if (!inf) {
 		lyxerr << "RunCommand:: could not start child process" << endl;
 		return make_pair(-1, string());
@@ -787,7 +946,13 @@ cmd_ret const runCommand(string const & cmd)
 		c = fgetc(inf);
 	}
 
-#if defined (HAVE_PCLOSE)
+#if defined (_WIN32)
+	WaitForSingleObject(process.hProcess, INFINITE);
+	if (!infile.empty())
+		CloseHandle(startup.hStdInput);
+	CloseHandle(process.hProcess);
+	int const pret = fclose(inf);
+#elif defined (HAVE_PCLOSE)
 	int const pret = pclose(inf);
 #elif defined (HAVE__PCLOSE)
 	int const pret = _pclose(inf);
@@ -852,59 +1017,6 @@ FileName const findtexfile(string const & fil, string const & /*format*/)
 }
 
 
-void readBB_lyxerrMessage(FileName const & file, bool & zipped,
-	string const & message)
-{
-	LYXERR(Debug::GRAPHICS, "[readBB_from_PSFile] " << message);
-	// FIXME: Why is this func deleting a file? (Lgb)
-	if (zipped)
-		file.removeFile();
-}
-
-
-string const readBB_from_PSFile(FileName const & file)
-{
-	// in a (e)ps-file it's an entry like %%BoundingBox:23 45 321 345
-	// It seems that every command in the header has an own line,
-	// getline() should work for all files.
-	// On the other hand some plot programs write the bb at the
-	// end of the file. Than we have in the header:
-	// %%BoundingBox: (atend)
-	// In this case we must check the end.
-	bool zipped = file.isZippedFile();
-	FileName const file_ = zipped ? unzipFile(file) : file;
-	string const format = file_.guessFormatFromContents();
-
-	if (format != "eps" && format != "ps") {
-		readBB_lyxerrMessage(file_, zipped,"no(e)ps-format");
-		return string();
-	}
-
-	static boost::regex bbox_re(
-		"^%%BoundingBox:\\s*([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)");
-	ifstream is(file_.toFilesystemEncoding().c_str());
-	while (is) {
-		string s;
-		getline(is,s);
-		boost::smatch what;
-		if (regex_match(s, what, bbox_re)) {
-			// Our callers expect the tokens in the string
-			// separated by single spaces.
-			// FIXME: change return type from string to something
-			// sensible
-			ostringstream os;
-			os << what.str(1) << ' ' << what.str(2) << ' '
-			   << what.str(3) << ' ' << what.str(4);
-			string const bb = os.str();
-			readBB_lyxerrMessage(file_, zipped, bb);
-			return bb;
-		}
-	}
-	readBB_lyxerrMessage(file_, zipped, "no bb found");
-	return string();
-}
-
-
 int compare_timestamps(FileName const & file1, FileName const & file2)
 {
 	// If the original is newer than the copy, then copy the original
@@ -926,5 +1038,32 @@ int compare_timestamps(FileName const & file1, FileName const & file2)
 }
 
 
+bool prefs2prefs(FileName const & filename, FileName const & tempfile, bool lfuns)
+{
+	FileName const script = libFileSearch("scripts", "prefs2prefs.py");
+	if (script.empty()) {
+		LYXERR0("Could not find bind file conversion "
+				"script prefs2prefs.py.");
+		return false;
+	}
+
+	ostringstream command;
+	command << os::python() << ' ' << quoteName(script.toFilesystemEncoding())
+	  << ' ' << (lfuns ? "-l" : "-p") << ' '
+		<< quoteName(filename.toFilesystemEncoding())
+		<< ' ' << quoteName(tempfile.toFilesystemEncoding());
+	string const command_str = command.str();
+
+	LYXERR(Debug::FILES, "Running `" << command_str << '\'');
+
+	cmd_ret const ret = runCommand(command_str);
+	if (ret.first != 0) {
+		LYXERR0("Could not run file conversion script prefs2prefs.py.");
+		return false;
+	}
+	return true;
+}
+
+
 } //namespace support
 } // namespace lyx