GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 09:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0566: Stop dir in findfile() doesn't work properly w/o trailing slash

Browse Source 
Problem:  Stop directory in findfile() doesn't work properly without a
          trailing slash.
Solution: Always use fnamencmp(), not fnamecmp().

related: vim/vim#15200
related: vim/vim#15202

e6ab23bd4a
(cherry picked from commit 091a130804)
This commit is contained in:
zeertzjq
2024-07-12 06:39:17 +08:00
committed by github-actions[bot]
parent 4ce293c2c3
commit c467bfeb93
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/file_search.c
View File

@ -880,11 +880,12 @@ char *vim_findfile(void *search_ctx_arg)
if (search_ctx->ffsc_start_dir if (search_ctx->ffsc_start_dir
&& search_ctx->ffsc_stopdirs_v != NULL && !got_int) { && search_ctx->ffsc_stopdirs_v != NULL && !got_int) {
ff_stack_T *sptr; ff_stack_T *sptr;
// path_end may point to the NUL or the previous path separator
ptrdiff_t plen = (path_end - search_ctx->ffsc_start_dir) + (*path_end != NUL);
// is the last starting directory in the stop list? // is the last starting directory in the stop list?
if (ff_path_in_stoplist(search_ctx->ffsc_start_dir, if (ff_path_in_stoplist(search_ctx->ffsc_start_dir,
(int)(path_end - search_ctx->ffsc_start_dir), (size_t)plen, search_ctx->ffsc_stopdirs_v)) {
search_ctx->ffsc_stopdirs_v)) {
break; break;
} }
@ -1219,7 +1220,7 @@ static void ff_clear(ff_search_ctx_T *search_ctx)
/// check if the given path is in the stopdirs /// check if the given path is in the stopdirs
/// ///
/// @return true if yes else false /// @return true if yes else false
static bool ff_path_in_stoplist(char *path, int path_len, char **stopdirs_v) static bool ff_path_in_stoplist(char *path, size_t path_len, char **stopdirs_v)
{ {
// eat up trailing path separators, except the first // eat up trailing path separators, except the first
while (path_len > 1 && vim_ispathsep(path[path_len - 1])) { while (path_len > 1 && vim_ispathsep(path[path_len - 1])) {
@ -1232,20 +1233,16 @@ static bool ff_path_in_stoplist(char *path, int path_len, char **stopdirs_v)
} }
for (int i = 0; stopdirs_v[i] != NULL; i++) { for (int i = 0; stopdirs_v[i] != NULL; i++) {
if ((int)strlen(stopdirs_v[i]) > path_len) {
// match for parent directory. So '/home' also matches // match for parent directory. So '/home' also matches
// '/home/rks'. Check for PATHSEP in stopdirs_v[i], else // '/home/rks'. Check for PATHSEP in stopdirs_v[i], else
// '/home/r' would also match '/home/rks' // '/home/r' would also match '/home/rks'
if (path_fnamencmp(stopdirs_v[i], path, (size_t)path_len) == 0 if (path_fnamencmp(stopdirs_v[i], path, path_len) == 0
&& vim_ispathsep(stopdirs_v[i][path_len])) { && (strlen(stopdirs_v[i]) <= path_len
return true; || vim_ispathsep(stopdirs_v[i][path_len]))) {
}
} else {
if (path_fnamecmp(stopdirs_v[i], path) == 0) {
return true; return true;
} }
} }
}
return false; return false;
} }

7
test/old/testdir/test_findfile.vim
View File

@ -101,11 +101,18 @@ func Test_findfile()
let l = findfile('bar', ';' . save_dir . '/Xfinddir1/Xdir2/', -1) let l = findfile('bar', ';' . save_dir . '/Xfinddir1/Xdir2/', -1)
call assert_equal(1, len(l)) call assert_equal(1, len(l))
call assert_match('.*/Xfinddir1/Xdir2/Xdir3/bar', l[0]) call assert_match('.*/Xfinddir1/Xdir2/Xdir3/bar', l[0])
let l = findfile('bar', ';' . save_dir . '/Xfinddir1/Xdir2', -1)
call assert_equal(1, len(l))
call assert_match('.*/Xfinddir1/Xdir2/Xdir3/bar', l[0])
let l = findfile('bar', ';' . save_dir . '/Xfinddir1/', -1) let l = findfile('bar', ';' . save_dir . '/Xfinddir1/', -1)
call assert_equal(2, len(l)) call assert_equal(2, len(l))
call assert_match('.*/Xfinddir1/Xdir2/Xdir3/bar', l[0]) call assert_match('.*/Xfinddir1/Xdir2/Xdir3/bar', l[0])
call assert_match('.*/Xfinddir1/bar', l[1]) call assert_match('.*/Xfinddir1/bar', l[1])
let l = findfile('bar', ';' . save_dir . '/Xfinddir1', -1)
call assert_equal(2, len(l))
call assert_match('.*/Xfinddir1/Xdir2/Xdir3/bar', l[0])
call assert_match('.*/Xfinddir1/bar', l[1])
" Test combined downwards and upwards search from Xdir2/. " Test combined downwards and upwards search from Xdir2/.
cd ../.. cd ../..