Mercurial > vim

diff src/filepath.c @ 19314:782f410c5df3 v8.2.0215

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0215: wrong file name shortening Commit: https://github.com/vim/vim/commit/a78e9c61a0ded9c5302bc77e889aa1b3d3467f61 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Feb 5 21:14:00 2020 +0100 patch 8.2.0215: wrong file name shortening Problem: Wrong file name shortening. (Ingo Karkat) Solution: Better check for path separator. (Yasuhiro Matsumoto, closes #5583, closes #5584)
author Bram Moolenaar <Bram@vim.org>
date Wed, 05 Feb 2020 21:15:04 +0100
parents 80baa37506d0
children 1697a25328fd
line wrap: on
line diff
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -448,14 +448,18 @@ repeat:
 		if (fnamencmp(p, dirname, namelen) == 0)
 		{
 		    p += namelen;
-		    while (*p && vim_ispathsep(*p))
-			++p;
-		    *fnamep = p;
-		    if (pbuf != NULL)
+		    if (vim_ispathsep(*p))
 		    {
-			vim_free(*bufp);   // free any allocated file name
-			*bufp = pbuf;
-			pbuf = NULL;
+			while (*p && vim_ispathsep(*p))
+			    ++p;
+			*fnamep = p;
+			if (pbuf != NULL)
+			{
+			    // free any allocated file name
+			    vim_free(*bufp);
+			    *bufp = pbuf;
+			    pbuf = NULL;
+			}
 		    }
 		}
 	    }