mirror of
https://github.com/vim/vim.git
synced 2025-07-24 10:45:12 -04:00
patch 9.1.0161: expand() removes slash after env variable that ends with colon
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: #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; `---- Signed-off-by: zeertzjq <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
parent
62b26040eb
commit
13a014452a
@ -1404,9 +1404,6 @@ expand_env_esc(
|
||||
int mustfree; // var was allocated, need to free it later
|
||||
int at_start = TRUE; // at start of a name
|
||||
int startstr_len = 0;
|
||||
#if defined(BACKSLASH_IN_FILENAME) || defined(AMIGA)
|
||||
char_u *save_dst = dst;
|
||||
#endif
|
||||
|
||||
if (startstr != NULL)
|
||||
startstr_len = (int)STRLEN(startstr);
|
||||
@ -1631,7 +1628,7 @@ expand_env_esc(
|
||||
// with it, skip a character
|
||||
if (after_pathsep(dst, dst + c)
|
||||
#if defined(BACKSLASH_IN_FILENAME) || defined(AMIGA)
|
||||
&& (dst == save_dst || dst[-1] != ':')
|
||||
&& dst[c - 1] != ':'
|
||||
#endif
|
||||
&& vim_ispathsep(*tail))
|
||||
++tail;
|
||||
|
@ -51,6 +51,19 @@ func Test_expand_tilde_filename()
|
||||
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'))
|
||||
|
@ -704,6 +704,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
161,
|
||||
/**/
|
||||
160,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user