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 a9ae59850cb37ecd4cc735d754572f49000fe706..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>
@@ -32,23 +33,29 @@ namespace os {
 
 namespace {
 
-string stdoutdev_ = "/dev/stdout";
-string stderrdev_ = "/dev/stderr";
+int argc_ = 0;
+char ** argv_ = 0;
 
 } // namespace anon
 
-void init(int, char *[])
+void init(int argc, char * argv[])
 {
-       // Check whether /dev/stdout and /dev/stderr are available,
-       // otherwise default to /dev/tty.
-       if (access(stdoutdev_.c_str(), W_OK) != 0
-           || access(stderrdev_.c_str(), W_OK) != 0) {
-               stdoutdev_ = "/dev/tty";
-               stderrdev_ = "/dev/tty";
-       }
+       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)
+{}
+
+
 string current_root()
 {
        return "/";
@@ -70,8 +77,13 @@ docstring::size_type common_path(docstring const & p1, docstring const & p2)
        docstring::size_type i = 0;
        docstring::size_type const p1_len = p1.length();
        docstring::size_type const p2_len = p2.length();
+#ifdef __APPLE__
+       while (i < p1_len && i < p2_len && uppercase(p1[i]) == uppercase(p2[i]))
+               ++i;
+#else
        while (i < p1_len && i < p2_len && p1[i] == p2[i])
                ++i;
+#endif
        if ((i < p1_len && i < p2_len)
            || (i < p1_len && p1[i] != '/' && i == p2_len)
            || (i < p2_len && p2[i] != '/' && i == p1_len))
@@ -85,6 +97,49 @@ docstring::size_type common_path(docstring const & p1, docstring const & p2)
 }
 
 
+bool path_prefix_is(string const & path, string const & pre)
+{
+#ifdef __APPLE__
+       return path_prefix_is(const_cast<string &>(path), pre, CASE_UNCHANGED);
+#else
+       return prefixIs(path, pre);
+#endif
+}
+
+
+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 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 (common_len != p2_len)
+               return false;
+
+       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
+       // silence compiler warnings
+       (void)how;
+
+       return prefixIs(path, pre);
+#endif
+}
+
+
 string external_path(string const & p)
 {
        return p;
@@ -97,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;
@@ -145,24 +206,6 @@ string const & nulldev()
 }
 
 
-string const & stdoutdev()
-{
-       return stdoutdev_;
-}
-
-
-string const & stderrdev()
-{
-       return stderrdev_;
-}
-
-
-bool is_terminal(io_channel channel)
-{
-       return isatty(channel);
-}
-
-
 shell_type shell()
 {
        return UNIX;
@@ -254,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