--i; // here was the last match
while (i && p1[i] != '/')
--i;
- } else
- --i;
-
+ }
return i;
}
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
#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