add onoff support for "inset-modify changetype xxx" in include inset

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

diff --git a/src/support/os_unix.cpp b/src/support/os_unix.cpp
index 976fcf75e86a34c277a69e71abb682acd9211605..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;
 }
 
@@ -80,8 +78,7 @@ docstring::size_type common_path(docstring const & p1, docstring const & p2)
 bool path_prefix_is(string const & path, string const & pre)
 {
 #ifdef __APPLE__
-       string tmp = path;
-       return path_prefix_is(tmp, pre, CASE_UNCHANGED);
+       return path_prefix_is(const_cast<string &>(path), pre, CASE_UNCHANGED);
 #else
        return prefixIs(path, pre);
 #endif
@@ -93,13 +90,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 + 1 != p2.length())
+       if (common_len != p2_len)
                return false;
 
-       if (!prefixIs(path, pre) && how == CASE_ADJUSTED)
-               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