mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 19:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3388: fnamemodify('path/..', ':p') differs from using 'path/../' (#29667)

Browse Source 
Problem:    fnamemodify('path/..', ':p') differs from using 'path/../'.
Solution:   Include the "/.." in the directory name. (closes vim/vim#8808)

4eaef9979f

Co-authored-by: Bram Moolenaar <Bram@vim.org>
(cherry picked from commit 31d53cbb0f)
This commit is contained in:
zeertzjq
2024-07-12 06:33:54 +08:00
committed by github-actions[bot]
parent 113e5a91de
commit 7c055bd74b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/path.c
View File

@@ -2385,10 +2385,14 @@ static int path_to_absolute(const char *fname, char *buf, size_t len, int force)
} }
#endif #endif
if (p != NULL) { if (p != NULL) {
if (strcmp(p + 1, "..") == 0) {
// for "/path/dir/.." include the "/.."
p += 3;
}
assert(p >= fname); assert(p >= fname);
memcpy(relative_directory, fname, (size_t)(p - fname + 1)); memcpy(relative_directory, fname, (size_t)(p - fname + 1));
relative_directory[p - fname + 1] = NUL; relative_directory[p - fname + 1] = NUL;
end_of_path = p + 1; end_of_path = (vim_ispathsep_nocolon(*p) ? p + 1 : p);
} else { } else {
relative_directory[0] = NUL; relative_directory[0] = NUL;
} }

2
test/old/testdir/test_fnamemodify.vim
View File

@@ -12,6 +12,8 @@ func Test_fnamemodify()
call assert_equal('r', fnamemodify('.', ':p:h')[-1:]) call assert_equal('r', fnamemodify('.', ':p:h')[-1:])
call assert_equal('t', fnamemodify('test.out', ':p')[-1:]) call assert_equal('t', fnamemodify('test.out', ':p')[-1:])
call assert_equal($HOME .. "/foo" , fnamemodify('~/foo', ':p')) call assert_equal($HOME .. "/foo" , fnamemodify('~/foo', ':p'))
call assert_equal(fnamemodify('.', ':p:h:h:h') .. '/', fnamemodify($HOME .. '/../', ':p'))
call assert_equal(fnamemodify('.', ':p:h:h:h') .. '/', fnamemodify($HOME .. '/..', ':p'))
call assert_equal('test.out', fnamemodify('test.out', ':.')) call assert_equal('test.out', fnamemodify('test.out', ':.'))
call assert_equal('a', fnamemodify('../testdir/a', ':.')) call assert_equal('a', fnamemodify('../testdir/a', ':.'))
call assert_equal('~/testdir/test.out', fnamemodify('test.out', ':~')) call assert_equal('~/testdir/test.out', fnamemodify('test.out', ':~'))