summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/eval.c3
-rw-r--r--src/version.c2
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,