Mercurial > vim
changeset 16831:f42aa3d90b12 v8.1.1417
patch 8.1.1417: MS-Windows: resolve() does not resolve all components of path
commit https://github.com/vim/vim/commit/1bbebab5255b5300d727c9b3f1b308205847dafd
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed May 29 20:36:54 2019 +0200
patch 8.1.1417: MS-Windows: resolve() does not resolve all components of path
Problem: MS-Windows: resolve() does not resolve all components of the path.
(David Briscoe)
Solution: Do not bail out for a reparse point. (Yasuhiro Matsumoto,
closes #4211, closes #4447)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 29 May 2019 20:45:05 +0200 |
| parents | 20191617fa3f |
| children | 74537e143a88 |
| files | src/os_mswin.c src/testdir/test_functions.vim src/version.c |
| diffstat | 3 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -1787,12 +1787,6 @@ resolve_reparse_point(char_u *fname) if (p == NULL) goto fail; - if ((GetFileAttributesW(p) & FILE_ATTRIBUTE_REPARSE_POINT) == 0) - { - vim_free(p); - goto fail; - } - h = CreateFileW(p, 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); vim_free(p);
--- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -238,7 +238,7 @@ endfunc func s:normalize_fname(fname) let ret = substitute(a:fname, '\', '/', 'g') let ret = substitute(ret, '//', '/', 'g') - let ret = tolower(ret) + return tolower(ret) endfunc func Test_resolve_win32() @@ -330,6 +330,19 @@ func Test_resolve_win32() echomsg 'skipped test for buffer name' endif call delete('Xfile') + + " test for reparse point + call mkdir('Xdir') + silent !mklink /D Xdirlink Xdir + if !v:shell_error + w Xdir/text.txt + call assert_equal(s:normalize_fname(getcwd() . '\Xdir\text.txt'), s:normalize_fname(resolve('Xdirlink\text.txt'))) + call assert_equal(s:normalize_fname(getcwd() . '\Xdir'), s:normalize_fname(resolve('Xdirlink'))) + else + echomsg 'skipped test for reparse point' + endif + + call delete('Xdir', 'rf') endfunc func Test_simplify()