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 d167d6a94cb1a52ddd7b5401c6a2c17a513ee3f8..a05f9845544513b3ecb5781e890efe1dab1fbb2f 100644 (file)
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -46,6 +46,9 @@
 #ifdef HAVE_MAGIC_H
 #include <magic.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include <cerrno>
 #include <cstdlib>
@@ -236,6 +239,8 @@ string const quoteName(string const & name, quote_style style)
                // simple parser in Systemcall.cpp do the substitution.
                return '"' + subst(name, "\"", "\\\"") + '"';
 #endif
+       case quote_shell_filename:
+               return quoteName(os::external_path(name), quote_shell);
        case quote_python:
                return "\"" + subst(subst(name, "\\", "\\\\"), "\"", "\\\"")
                     + "\"";
@@ -286,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'
@@ -295,15 +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)
-               fullname = FileName(addExtension(fullname.absFileName(), ext));
-       if (fullname.isReadableFile() || mode == may_not_exist)
-               return fullname;
+       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));
+               }
+               if (fullname.isReadableFile() || mode == may_not_exist)
+                       return fullname;
+               if (addext)
+                       fullname.changeExtension("");
+               ext = token(exts, ',', ++n);
+       }
        return FileName();
 }
 
@@ -313,20 +332,21 @@ FileName const fileSearch(string const & path, string const & name,
 //   2) build_lyxdir (if not empty)
 //   3) system_lyxdir
 FileName const libFileSearch(string const & dir, string const & name,
-                          string const & ext)
+                          string const & ext, search_mode mode)
 {
        FileName fullname = fileSearch(addPath(package().user_support().absFileName(), dir),
-                                    name, ext);
+                                    name, ext, mode);
        if (!fullname.empty())
                return fullname;
 
        if (!package().build_support().empty())
                fullname = fileSearch(addPath(package().build_support().absFileName(), dir),
-                                     name, ext);
+                                     name, ext, mode);
        if (!fullname.empty())
                return fullname;
 
-       return fileSearch(addPath(package().system_support().absFileName(), dir), name, ext);
+       return fileSearch(addPath(package().system_support().absFileName(), dir),
+                                     name, ext, mode);
 }
 
 
@@ -381,17 +401,17 @@ FileName const i18nLibFileSearch(string const & dir, string const & name,
 
 
 FileName const imageLibFileSearch(string & dir, string const & name,
-                 string const & ext)
+                 string const & ext, search_mode mode)
 {
        if (!lyx::lyxrc.icon_set.empty()) {
                string const imagedir = addPath(dir, lyx::lyxrc.icon_set);
-               FileName const fn = libFileSearch(imagedir, name, ext);
+               FileName const fn = libFileSearch(imagedir, name, ext, mode);
                if (fn.exists()) {
                        dir = imagedir;
                        return fn;
                }
        }
-       return libFileSearch(dir, name, ext);
+       return libFileSearch(dir, name, ext, mode);
 }
 
 
@@ -490,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");
        }
 }
@@ -694,8 +714,11 @@ string latexEnvCmdPrefix(string const & path)
                return "env TEXINPUTS=\"." + sep + texinputs_prefix
                                          + sep + texinputs + "\" ";
        else
-               return "cmd /d /c set TEXINPUTS=." + sep + texinputs_prefix
-                                                  + sep + 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 + "\" & ";
 }
 
 
@@ -726,7 +749,7 @@ string const replaceCurdirPath(string const & path, string const & pathlist)
                }
                if (i != string::npos) {
                        newpathlist += sep;
-                       // Stop here if the last element is empty 
+                       // Stop here if the last element is empty
                        if (++i == oldpathlist.length())
                                break;
                }
@@ -853,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);
 }
 
@@ -1153,6 +1178,27 @@ bool prefs2prefs(FileName const & filename, FileName const & tempfile, bool lfun
        return true;
 }
 
+
+bool configFileNeedsUpdate(string const & file)
+{
+       // We cannot initialize configure_script directly because the package
+       // is not initialized yet when static objects are constructed.
+       static FileName configure_script;
+       static bool firstrun = true;
+       if (firstrun) {
+               configure_script =
+                       FileName(addName(package().system_support().absFileName(),
+                               "configure.py"));
+               firstrun = false;
+       }
+
+       FileName absfile =
+               FileName(addName(package().user_support().absFileName(), file));
+       return !absfile.exists()
+               || configure_script.lastModified() > absfile.lastModified();
+}
+
+
 int fileLock(const char * lock_file)
 {
        int fd = -1;