kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 13:15:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.835

Browse Source 
Problem:    Comparing utf-8 sequences does not handle different byte sizes
            correctly.
Solution:   Get the byte size of each character. (Dominique Pelle)

f6470c288c
This commit is contained in:
Jurica Bradaric 2016-02-09 20:25:08 +01:00
parent 84281bf675
commit e8dd996703
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/file_search.c
View File

@ -1057,7 +1057,7 @@ static ff_visited_list_hdr_T *ff_get_visited_list(char_u *filename, ff_visited_l
*/
static int ff_wc_equal(char_u *s1, char_u *s2)
{
int i;
int i, j;
int prev1 = NUL;
int prev2 = NUL;
@ -1067,18 +1067,19 @@ static int ff_wc_equal(char_u *s1, char_u *s2)
if (s1 == NULL || s2 == NULL)
return FALSE;
if (STRLEN(s1) != STRLEN(s2))
return FAIL;
for (i = 0; s1[i] != NUL && s2[i] != NUL; i += MB_PTR2LEN(s1 + i)) {
for (i = 0, j = 0; s1[i] != NUL;) {
int c1 = PTR2CHAR(s1 + i);
int c2 = PTR2CHAR(s2 + i);
int c2 = PTR2CHAR(s2 + j);
if ((p_fic ? vim_tolower(c1) != vim_tolower(c2) : c1 != c2)
&& (prev1 != '*' || prev2 != '*'))
&& (prev1 != '*' || prev2 != '*')) {
return FAIL;
}
prev2 = prev1;
prev1 = c1;
i += MB_PTR2LEN(s1 + i);
j += MB_PTR2LEN(s2 + j);
}
return TRUE;
}

13
src/nvim/path.c
View File

@ -1775,19 +1775,20 @@ bool same_directory(char_u *f1, char_u *f2)
*/
int pathcmp(const char *p, const char *q, int maxlen)
{
int i;
int i, j;
int c1, c2;
const char *s = NULL;
for (i = 0; maxlen < 0 || i < maxlen; i += MB_PTR2LEN((char_u *)p + i)) {
for (i = 0, j = 0; maxlen < 0 || (i < maxlen && j < maxlen);) {
c1 = PTR2CHAR((char_u *)p + i);
c2 = PTR2CHAR((char_u *)q + i);
c2 = PTR2CHAR((char_u *)q + j);
/* End of "p": check if "q" also ends or just has a slash. */
if (c1 == NUL) {
if (c2 == NUL) /* full match */
return 0;
s = q;
i = j;
break;
}
@ -1811,9 +1812,13 @@ int pathcmp(const char *p, const char *q, int maxlen)
return p_fic ? vim_toupper(c1) - vim_toupper(c2)
: c1 - c2; /* no match */
}
i += MB_PTR2LEN((char_u *)p + i);
j += MB_PTR2LEN((char_u *)q + j);
}
if (s == NULL) /* "i" ran into "maxlen" */
if (s == NULL) { // "i" or "j" ran into "maxlen"
return 0;
}
c1 = PTR2CHAR((char_u *)s + i);
c2 = PTR2CHAR((char_u *)s + i + MB_PTR2LEN((char_u *)s + i));

2
src/nvim/version.c
View File

@ -453,7 +453,7 @@ static int included_patches[] = {
// 838,
// 837 NA
836,
// 835,
835,
834,
// 833,
// 832,