aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.0208: fnamemodify() does not apply ":~" when followed by ":."

Browse Source 
Problem:    Fnamemodify() does not apply ":~" when followed by ":.".
Solution:   Don't let a failing ":." cause the ":~" to be skipped. (Yasuhiro
            Matsumoto, closes #5577)
This commit is contained in:
Bram Moolenaar
2020-02-04 22:23:09 +01:00
parent bfe1204312
commit d816cd94d8
4 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/filepath.c
View File

@@ -301,6 +301,7 @@ modify_fname(
char_u dirname[MAXPATHL];
int c;
int has_fullname = 0;
int has_homerelative = 0;
#ifdef MSWIN
char_u *fname_start = *fnamep;
int has_shortname = 0;
@@ -412,7 +413,7 @@ repeat:
}
pbuf = NULL;
// Need full path first (use expand_env() to remove a "~/")
if (!has_fullname)
if (!has_fullname && !has_homerelative)
{
if (c == '.' && **fnamep == '~')
p = pbuf = expand_env_save(*fnamep);
@@ -428,11 +429,28 @@ repeat:
{
if (c == '.')
{
size_t namelen;
mch_dirname(dirname, MAXPATHL);
s = shorten_fname(p, dirname);
if (s != NULL)
if (has_homerelative)
{
*fnamep = s;
s = vim_strsave(dirname);
if (s != NULL)
{
home_replace(NULL, s, dirname, MAXPATHL, TRUE);
vim_free(s);
}
}
namelen = STRLEN(dirname);
// Do not call shorten_fname() here since it removes the prefix
// even though the path does not have a prefix.
if (fnamencmp(p, dirname, namelen) == 0)
{
p += namelen;
while (*p && vim_ispathsep(*p))
++p;
*fnamep = p;
if (pbuf != NULL)
{
vim_free(*bufp); // free any allocated file name
@@ -453,6 +471,7 @@ repeat:
*fnamep = s;
vim_free(*bufp);
*bufp = s;
has_homerelative = TRUE;
}
}
}
@@ -701,6 +720,7 @@ f_chdir(typval_T *argvars, typval_T *rettv)
rettv->vval.v_string = NULL;
if (argvars[0].v_type != VAR_STRING)
// Returning an empty string means it failed.
return;
// Return the current directory