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

vim-patch:9.1.0161: expand() removes slash after env variable that ends with colon (#27791)

Browse Source 
Problem:  expand() removes a slash after an environment variable that
          ends with a colon on Windows.
Solution: Check the correct char for a colon (zeertzjq)

closes: vim/vim#14161

Note: Vim still removes the path-separator at the end, if another path separator
follows directly after it, e.g. on:

```
    echo $FOO='/usr/'
    echo expand('$FOO/bar') == '/usr/bar'
```

see:

,----[ misc1.c:1630 ]
|   // if var[] ends in a path separator and tail[] starts
|   // with it, skip a character
|   if (after_pathsep(dst, dst + c)
| #if defined(BACKSLASH_IN_FILENAME) || defined(AMIGA)
| 	  && (dst == save_dst || dst[-1] != ':')
| #endif
| 	  && vim_ispathsep(*tail))
|       ++tail;
`----

13a014452a

Cherry-pick test_expand.vim change from patch 9.0.1257.
This commit is contained in:
zeertzjq
2024-03-10 06:47:09 +08:00
committed by GitHub
parent b596732831
commit 241c161299
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/os/env.c
View File

@ -586,9 +586,6 @@ void expand_env_esc(char *restrict srcp, char *restrict dst, int dstlen, bool es
bool copy_char;
bool mustfree; // var was allocated, need to free it later
bool at_start = true; // at start of a name
#if defined(BACKSLASH_IN_FILENAME)
char *const save_dst = dst;
#endif
int prefix_len = (prefix == NULL) ? 0 : (int)strlen(prefix);
@ -729,7 +726,7 @@ void expand_env_esc(char *restrict srcp, char *restrict dst, int dstlen, bool es
// with it, skip a character
if (after_pathsep(dst, dst + c)
#if defined(BACKSLASH_IN_FILENAME)
&& (dst == save_dst || dst[-1] != ':')
&& dst[c - 1] != ':'
#endif
&& vim_ispathsep(*tail)) {
tail++;

17
test/old/testdir/test_expand.vim
View File

@ -45,12 +45,25 @@ endfunc
func Test_expand_tilde_filename()
split ~
call assert_equal('~', expand('%'))
call assert_equal('~', expand('%'))
call assert_notequal(expand('%:p'), expand('~/'))
call assert_match('\~', expand('%:p'))
call assert_match('\~', expand('%:p'))
bwipe!
endfunc
func Test_expand_env_pathsep()
let $FOO = './foo'
call assert_equal('./foo/bar', expand('$FOO/bar'))
let $FOO = './foo/'
call assert_equal('./foo/bar', expand('$FOO/bar'))
let $FOO = 'C:'
call assert_equal('C:/bar', expand('$FOO/bar'))
let $FOO = 'C:/'
call assert_equal('C:/bar', expand('$FOO/bar'))
unlet $FOO
endfunc
func Test_expandcmd()
let $FOO = 'Test'
call assert_equal('e x/Test/y', expandcmd('e x/$FOO/y'))