diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-05-19 14:59:10 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-05-19 14:59:10 +0200 |
| commit | 1385c3ee7f8715796c87d9bb020326ecc681e95d (patch) | |
| tree | b773bcfb2107c0ca149249c93b772116edfc7d19 | |
| parent | 9bd1a7ea28d102cca24901d6f16378441fa5245c (diff) | |
| download | vim-git-1385c3ee7f8715796c87d9bb020326ecc681e95d.tar.gz | |
updated for version 7.3.194v7.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)
| -rw-r--r-- | src/eval.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index db7b10638..64ed72ae0 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 1bd185844..b505c2946 100644 --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 194, +/**/ 193, /**/ 192, |