tiger support on mac snow leopard, include Qt4 frameworks, smart build script with...

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

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index f1f8429f7f29cafe2df42711291d082de86e39f7..7f00ebfb8cb1fbae95a0ee1b6d55feb5f7463d95 100644 (file)
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -23,7 +23,6 @@
 
 #include "support/filetools.h"
 
-#include "support/convert.h"
 #include "support/debug.h"
 #include "support/environment.h"
 #include "support/gettext.h"
@@ -51,6 +50,8 @@
 
 using namespace std;
 
+#define USE_QPROCESS
+
 namespace lyx {
 namespace support {
 
@@ -129,16 +130,27 @@ string const quoteName(string const & name, quote_style style)
 {
        switch(style) {
        case quote_shell:
-               // This does not work for filenames containing " (windows)
-               // or ' (all other OSes). This can't be changed easily, since
-               // we would need to adapt the command line parser in
-               // Forkedcall::generateChild. Therefore we don't pass user
-               // filenames to child processes if possible. We store them in
-               // a python script instead, where we don't have these
-               // limitations.
+               // This does not work on native Windows for filenames
+               // containing the following characters < > : " / \ | ? *
+               // Moreover, it can't be made to work, as, according to
+               // http://msdn.microsoft.com/en-us/library/aa365247(VS.85).aspx
+               // those are reserved characters, and thus are forbidden.
+               // Please, also note that the command-line parser in
+               // ForkedCall::generateChild cannot deal with filenames
+               // containing " or ', therefore we don't pass user filenames
+               // to child processes if possible. We store them in a python
+               // script instead, where we don't have these limitations.
+#ifndef USE_QPROCESS
                return (os::shell() == os::UNIX) ?
-                       '\'' + name + '\'':
+                       '\'' + subst(name, "'", "\'\\\'\'") + '\'' :
                        '"' + name + '"';
+#else
+               // According to the QProcess parser, a single double
+               // quote is represented by three consecutive ones.
+               // Here we simply escape the double quote and let our
+               // simple parser in Systemcall.cpp do the substitution.
+               return '"' + subst(name, "\"", "\\\"") + '"';
+#endif
        case quote_python:
                return "\"" + subst(subst(name, "\\", "\\\\"), "\"", "\\\"")
                     + "\"";
@@ -375,10 +387,9 @@ string const onlyPath(string const & filename)
 // FIXME It might be nice if the code didn't simply assume that.
 FileName const makeAbsPath(string const & relPath, string const & basePath)
 {
-       FileName relative_path(relPath);
        // checks for already absolute path
-       if (relative_path.isAbsolute())
-               return relative_path;
+       if (FileName::isAbsolute(relPath))
+               return FileName(relPath);
 
        // Copies given paths
        string tempRel = os::internal_path(relPath);
@@ -387,8 +398,7 @@ FileName const makeAbsPath(string const & relPath, string const & basePath)
 
        string tempBase;
 
-       FileName base_path(basePath);
-       if (base_path.isAbsolute())
+       if (FileName::isAbsolute(basePath))
                tempBase = basePath;
        else
                tempBase = addPath(FileName::getcwd().absFilename(), basePath);
@@ -488,8 +498,7 @@ string const expandPath(string const & path)
 {
        // checks for already absolute path
        string rTemp = replaceEnvironmentPath(path);
-       FileName abs_path(rTemp);
-       if (abs_path.isAbsolute())
+       if (FileName::isAbsolute(rTemp))
                return rTemp;
 
        string temp;
@@ -526,16 +535,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;
 }
@@ -723,8 +739,7 @@ docstring const makeDisplayPath(string const & path, unsigned int threshold)
 bool readLink(FileName const & file, FileName & link)
 {
 #ifdef HAVE_READLINK
-       char linkbuffer[512];
-       // Should be PATH_MAX but that needs autconf support
+       char linkbuffer[PATH_MAX + 1];
        string const encoded = file.toFilesystemEncoding();
        int const nRead = ::readlink(encoded.c_str(),
                                     linkbuffer, sizeof(linkbuffer) - 1);
@@ -837,18 +852,6 @@ FileName const findtexfile(string const & fil, string const & /*format*/)
 }
 
 
-void removeAutosaveFile(string const & filename)
-{
-       string a = onlyPath(filename);
-       a += '#';
-       a += onlyFilename(filename);
-       a += '#';
-       FileName const autosave(a);
-       if (autosave.exists())
-               autosave.removeFile();
-}
-
-
 void readBB_lyxerrMessage(FileName const & file, bool & zipped,
        string const & message)
 {