diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-03-09 17:44:46 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-03-09 17:44:46 +0100 |
| commit | 13a014452a7a020a119ac555a690c65b41f3126d (patch) | |
| tree | e677812c09838cb1784d731ae834a6205a734504 /src/misc1.c | |
| parent | 62b26040eb4b6752be2c46852e8986083737a1bb (diff) | |
patch 9.1.0161: expand() removes slash after env variable that ends with colonv9.1.0161
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>
Diffstat (limited to 'src/misc1.c')
| -rw-r--r-- | src/misc1.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/misc1.c b/src/misc1.c index bf70e38478..3085fc77fb 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -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; |