anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 22:41:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Account for the corner case p2.length() == 1.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29838 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2009-05-25 00:23:44 +00:00
parent e2c763d9f6
commit eb9151060d
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/support/os_cygwin.cpp
View File

@ -179,13 +179,19 @@ bool path_prefix_is(string & path, string const & pre, path_case how)
{
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 const common_len = common_path(p1, p2) + 1;
if (i == 0 || i + 1 != p2.length())
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)
return false;
if (how == CASE_ADJUSTED && !prefixIs(path, pre))
path = to_utf8(p2 + p1.substr(i + 1, p1.length() - i + 1));
path = to_utf8(p2 + p1.substr(common_len, p1_len - common_len));
return true;
}

12
src/support/os_unix.cpp
View File

@ -92,13 +92,19 @@ 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 const common_len = common_path(p1, p2) + 1;
if (i == 0 || i + 1 != p2.length())
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)
return false;
if (how == CASE_ADJUSTED && !prefixIs(path, pre))
path = to_utf8(p2 + p1.substr(i + 1, p1.length() - i + 1));
path = to_utf8(p2 + p1.substr(common_len, p1_len - common_len));
return true;
#else

12
src/support/os_win32.cpp
View File

@ -210,13 +210,19 @@ bool path_prefix_is(string & path, string const & pre, path_case how)
{
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 const common_len = common_path(p1, p2) + 1;
if (i == 0 || i + 1 != p2.length())
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)
return false;
if (how == CASE_ADJUSTED && !prefixIs(path, pre))
path = to_utf8(p2 + p1.substr(i + 1, p1.length() - i + 1));
path = to_utf8(p2 + p1.substr(common_len, p1_len - common_len));
return true;
}