patch 8.2.0208: fnamemodify() does not apply ":~" when followed by ":."
Problem: Fnamemodify() does not apply ":~" when followed by ":.".
Solution: Don't let a failing ":." cause the ":~" to be skipped. (Yasuhiro
Matsumoto, closes #5577)
diff --git a/src/filepath.c b/src/filepath.c
index 04026a0..4517f41 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -301,6 +301,7 @@
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 @@
}
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 @@
{
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 @@
*fnamep = s;
vim_free(*bufp);
*bufp = s;
+ has_homerelative = TRUE;
}
}
}
@@ -701,6 +720,7 @@
rettv->vval.v_string = NULL;
if (argvars[0].v_type != VAR_STRING)
+ // Returning an empty string means it failed.
return;
// Return the current directory
diff --git a/src/testdir/test_fnamemodify.vim b/src/testdir/test_fnamemodify.vim
index a8324ab..7a21efe 100644
--- a/src/testdir/test_fnamemodify.vim
+++ b/src/testdir/test_fnamemodify.vim
@@ -3,8 +3,10 @@
func Test_fnamemodify()
let save_home = $HOME
let save_shell = &shell
+ let save_shellslash = &shellslash
let $HOME = fnamemodify('.', ':p:h:h')
set shell=sh
+ set shellslash
call assert_equal('/', fnamemodify('.', ':p')[-1:])
call assert_equal('r', fnamemodify('.', ':p:h')[-1:])
@@ -28,6 +30,15 @@
call assert_equal('fb2.tar.gz', fnamemodify('abc.fb2.tar.gz', ':e:e:e:e'))
call assert_equal('tar', fnamemodify('abc.fb2.tar.gz', ':e:e:r'))
+ let cwd = getcwd()
+ call mkdir($HOME . '/XXXXXXXX/a', 'p')
+ call mkdir($HOME . '/XXXXXXXX/b', 'p')
+ call chdir($HOME . '/XXXXXXXX/a/')
+ call assert_equal('foo', fnamemodify($HOME . '/XXXXXXXX/a/foo', ':p:~:.'))
+ call assert_equal('~/XXXXXXXX/b/foo', fnamemodify($HOME . '/XXXXXXXX/b/foo', ':p:~:.'))
+ call chdir(cwd)
+ call delete($HOME . '/XXXXXXXX', 'rf')
+
call assert_equal('''abc def''', fnamemodify('abc def', ':S'))
call assert_equal('''abc" "def''', fnamemodify('abc" "def', ':S'))
call assert_equal('''abc"%"def''', fnamemodify('abc"%"def', ':S'))
@@ -44,6 +55,7 @@
let $HOME = save_home
let &shell = save_shell
+ let &shellslash = save_shellslash
endfunc
func Test_fnamemodify_er()
diff --git a/src/version.c b/src/version.c
index be1bf33..6e598e5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 208,
+/**/
207,
/**/
206,