From 1385c3ee7f8715796c87d9bb020326ecc681e95d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 19 May 2011 14:59:10 +0200 Subject: [PATCH] updated for version 7.3.194 Problem: When "b" is a symlink to directory "a", resolve("b/") doesn't result in "a/". (ZyX) Solution: Remove the trailing slash. (Jean-Rene David) --- src/eval.c | 3 +++ src/version.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/eval.c b/src/eval.c index db7b106380..64ed72ae0b 100644 --- a/src/eval.c +++ b/src/eval.c @@ -14980,7 +14980,10 @@ f_resolve(argvars, rettv) len = STRLEN(p); if (len > 0 && after_pathsep(p, p + len)) + { has_trailing_pathsep = TRUE; + p[len - 1] = NUL; /* the trailing slash breaks readlink() */ + } q = getnextcomp(p); if (*q != NUL) diff --git a/src/version.c b/src/version.c index 1bd1858448..b505c29466 100644 --- a/src/version.c +++ b/src/version.c @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 194, /**/ 193, /**/ -- 2.47.3