add generic helper class for calling functions in gui thread

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

diff --git a/src/support/os_unix.cpp b/src/support/os_unix.cpp
index 2463111abc7c39f2af295aa8c483515b52c597a4..20a6316fde0519734ca5a15474722213445ca36a 100644 (file)
--- a/src/support/os_unix.cpp
+++ b/src/support/os_unix.cpp
@@ -16,6 +16,7 @@
 #include "support/docstring.h"
 #include "support/FileName.h"
 #include "support/lstrings.h"
+#include "support/lassert.h"
 
 #include <limits.h>
 #include <stdlib.h>
@@ -30,7 +31,28 @@ namespace lyx {
 namespace support {
 namespace os {
 
-void init(int, char *[])
+namespace {
+
+int argc_ = 0;
+char ** argv_ = 0;
+
+} // namespace anon
+
+void init(int argc, char * argv[])
+{
+       argc_ = argc;
+       argv_ = argv;
+}
+
+
+string utf8_argv(int i)
+{
+       LASSERT(i < argc_, /**/);
+       return to_utf8(from_local8bit(argv_[i]));
+}
+
+
+void remove_internal_args(int, int)
 {}
 
 
@@ -70,9 +92,7 @@ docstring::size_type common_path(docstring const & p1, docstring const & p2)
                        --i;     // here was the last match
                while (i && p1[i] != '/')
                        --i;
-       } else
-               --i;
-
+       }
        return i;
 }
 
@@ -92,13 +112,23 @@ bool path_prefix_is(string & path, string const & pre, path_case how)
 #ifdef __APPLE__
        docstring const p1 = from_utf8(path);
        docstring const p2 = from_utf8(pre);
-       docstring::size_type i = common_path(p1, p2);
+       docstring::size_type const p1_len = p1.length();
+       docstring::size_type const p2_len = p2.length();
+       docstring::size_type common_len = common_path(p1, p2);
+
+       if (p2[p2_len - 1] == '/' && p1_len != p2_len)
+               ++common_len;
 
-       if (i == 0 || i + 1 != p2.length())
+       if (common_len != p2_len)
                return false;
 
-       if (how == CASE_ADJUSTED && !prefixIs(path, pre))
-               path = to_utf8(p2 + p1.substr(i + 1, p1.length() - i + 1));
+       if (how == CASE_ADJUSTED && !prefixIs(path, pre)) {
+               if (p1_len < common_len)
+                       path = to_utf8(p2.substr(0, p1_len));
+               else
+                       path = to_utf8(p2 + p1.substr(common_len,
+                                                       p1_len - common_len));
+       }
 
        return true;
 #else
@@ -122,6 +152,12 @@ string internal_path(string const & p)
 }
 
 
+string safe_internal_path(string const & p, file_access)
+{
+       return p;
+}
+
+
 string external_path_list(string const & p)
 {
        return p;
@@ -170,12 +206,6 @@ string const & nulldev()
 }
 
 
-bool is_terminal(io_channel channel)
-{
-       return isatty(channel);
-}
-
-
 shell_type shell()
 {
        return UNIX;
@@ -267,9 +297,16 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode)
 
 string real_path(string const & path)
 {
+#ifdef HAVE_DEF_PATH_MAX
        char rpath[PATH_MAX + 1];
        char * result = realpath(path.c_str(), rpath);
-       return FileName::fromFilesystemEncoding(result ? rpath : path).absFilename();
+       return FileName::fromFilesystemEncoding(result ? rpath : path).absFileName();
+#else
+       char * result = realpath(path.c_str(), NULL);
+       string ret = FileName::fromFilesystemEncoding(result ? result : path).absFileName();
+       free(result);
+       return ret;
+#endif
 }
 
 } // namespace os