Fix build with GNU libstdc++ C++11 ABI

[lyx.git] / src / support / filetools.cpp

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index 7691fe3b321cb1e3bf32b7516bc97f02584662aa..a05f9845544513b3ecb5781e890efe1dab1fbb2f 100644 (file)
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -291,7 +291,7 @@ FileName const fileOpenSearch(string const & path, string const & name,
 // Returns the real name of file name in directory path, with optional
 // extension ext.
 FileName const fileSearch(string const & path, string const & name,
-                         string const & ext, search_mode mode)
+                         string const & exts, search_mode mode)
 {
        // if `name' is an absolute path, we ignore the setting of `path'
        // Expand Environmentvariables in 'name'
@@ -300,21 +300,29 @@ FileName const fileSearch(string const & path, string const & name,
        // search first without extension, then with it.
        if (fullname.isReadableFile())
                return fullname;
-       if (ext.empty())
+       if (exts.empty())
                // We are done.
                return mode == may_not_exist ? fullname : FileName();
-       // Only add the extension if it is not already the extension of
-       // fullname.
-       if (getExtension(fullname.absFileName()) != ext) {
-               if (mode == check_hidpi) {
-                       FileName fullname2x = FileName(addExtension(fullname.absFileName() + "@2x", ext));
-                       if (fullname2x.isReadableFile())
-                               return fullname2x;
+       int n = 0;
+       string ext = token(exts, ',', n);
+       while (!ext.empty()) {
+               // Only add the extension if it is not already the extension of
+               // fullname.
+               bool addext = getExtension(fullname.absFileName()) != ext;
+               if (addext) {
+                       if (mode == check_hidpi) {
+                               FileName fullname2x = FileName(addExtension(fullname.absFileName() + "@2x", ext));
+                               if (fullname2x.isReadableFile())
+                                       return fullname2x;
+                       }
+                       fullname = FileName(addExtension(fullname.absFileName(), ext));
                }
-               fullname = FileName(addExtension(fullname.absFileName(), ext));
+               if (fullname.isReadableFile() || mode == may_not_exist)
+                       return fullname;
+               if (addext)
+                       fullname.changeExtension("");
+               ext = token(exts, ',', ++n);
        }
-       if (fullname.isReadableFile() || mode == may_not_exist)
-               return fullname;
        return FileName();
 }
 
@@ -502,7 +510,7 @@ FileName const createLyXTmpDir(FileName const & deflt)
                // dir inside deflt.
                return createTmpDir(deflt, "lyx_tmpdir");
        } else {
-               // some other error occured.
+               // some other error occurred.
                return createTmpDir(package().system_temp_dir(), "lyx_tmpdir");
        }
 }
@@ -706,15 +714,11 @@ string latexEnvCmdPrefix(string const & path)
                return "env TEXINPUTS=\"." + sep + texinputs_prefix
                                          + sep + texinputs + "\" ";
        else
-#ifndef USE_QPROCESS
-               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 + "\"&";
-#else
-               return "cmd /d /c set \"\"\"TEXINPUTS=."
-                                               + sep + texinputs_prefix
-                                               + sep + texinputs + "\"\"\"&";
-#endif
+                                               + sep + texinputs + "\" & ";
 }
 
 
@@ -872,6 +876,8 @@ 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());
+       else if (ext == "svgz")
+               return changeExtension(zipped_file, "svg");
        return onlyPath(zipped_file) + "unzipped_" + onlyFileName(zipped_file);
 }