CMake: fix merged build, seems GCC could not handle the namespaces correctly

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

diff --git a/src/support/os_unix.cpp b/src/support/os_unix.cpp
index b7a5b10daa2a5332214dddf924ab4bdef1eb5d71..2e6f9ba309c84bc583b6b07ea1cf029f98034004 100644 (file)
--- a/src/support/os_unix.cpp
+++ b/src/support/os_unix.cpp
@@ -70,9 +70,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;
 }
 
@@ -94,17 +92,21 @@ bool path_prefix_is(string & path, string const & pre, path_case how)
        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 const common_len = common_path(p1, p2) + 1;
+       docstring::size_type common_len = common_path(p1, p2);
 
-       if (common_len == 1) {
-               if (p2_len != 1 || p1_len == 0 || p1[0] != p2[0]
-                   || (p1_len != 1 && p1[1] != '/'))
-                       return false;
-       } else if (common_len != p2_len)
+       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))
-               path = to_utf8(p2 + p1.substr(common_len, p1_len - common_len));
+       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