From f3489239348641895709655563b776aec67ce20b Mon Sep 17 00:00:00 2001 From: Magnus Kokk Date: Sun, 22 Nov 2020 13:38:16 +0200 Subject: Fix undeclared identifier when HAVE_READLINK is not defined --- src/nvim/eval/funcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index b08ee3794d..78c5b61ba0 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -7044,7 +7044,7 @@ static void f_resolve(typval_T *argvars, typval_T *rettv, FunPtr fptr) xfree(buf); } # else - rettv->vval.v_string = (char_u *)xstrdup(p); + rettv->vval.v_string = (char_u *)xstrdup(fname); # endif #endif -- cgit From 21c6b40a5958fe0bbf59b9bf622b94141bbf47c3 Mon Sep 17 00:00:00 2001 From: Magnus Kokk Date: Mon, 30 Nov 2020 19:27:34 +0200 Subject: fall back to os_realpath --- src/nvim/eval/funcs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 78c5b61ba0..4df935469a 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -7044,7 +7044,8 @@ static void f_resolve(typval_T *argvars, typval_T *rettv, FunPtr fptr) xfree(buf); } # else - rettv->vval.v_string = (char_u *)xstrdup(fname); + char *v = os_realpath(fname, NULL); + rettv->vval.v_string = (char_u *)(v == NULL ? xstrdup(fname) : v); # endif #endif -- cgit