patch 8.0.0405: v:progpath may become invalid after :cd
Problem: v:progpath may become invalid after ":cd".
Solution: Turn v:progpath into a full path if needed.
diff --git a/src/main.c b/src/main.c
index 387221c..1da2b84 100644
--- a/src/main.c
+++ b/src/main.c
@@ -57,6 +57,9 @@
# if defined(HAS_SWAP_EXISTS_ACTION)
static void check_swap_exists_action(void);
# endif
+# ifdef FEAT_EVAL
+static void set_progpath(char_u *argv0);
+# endif
# if defined(FEAT_CLIENTSERVER) || defined(PROTO)
static void exec_on_server(mparm_T *parmp);
static void prepare_server(mparm_T *parmp);
@@ -1694,7 +1697,7 @@
#ifdef FEAT_EVAL
set_vim_var_string(VV_PROGNAME, initstr, -1);
- set_vim_var_string(VV_PROGPATH, (char_u *)parmp->argv[0], -1);
+ set_progpath((char_u *)parmp->argv[0]);
#endif
if (TOLOWER_ASC(initstr[0]) == 'r')
@@ -3417,7 +3420,7 @@
}
#endif
-#endif
+#endif /* NO_VIM_MAIN */
#if defined(STARTUPTIME) || defined(PROTO)
static void time_diff(struct timeval *then, struct timeval *now);
@@ -3525,6 +3528,30 @@
#endif
+#ifndef NO_VIM_MAIN
+ static void
+set_progpath(char_u *argv0)
+{
+ char_u *val = argv0;
+ char_u buf[MAXPATHL];
+
+ /* A relative path containing a "/" will become invalid when using ":cd",
+ * turn it into a full path.
+ * On MS-Windows "vim.exe" is found in the current directory, thus also do
+ * it when there is no path and the file exists. */
+ if ( !mch_isFullName(argv0)
+# ifdef WIN32
+ && mch_can_exe(argv0, NULL, TRUE)
+# else
+ && gettail(argv0) != argv0
+# endif
+ && vim_FullName(argv0, buf, MAXPATHL, TRUE) != FAIL)
+ val = buf;
+ set_vim_var_string(VV_PROGPATH, val, -1);
+}
+
+#endif /* NO_VIM_MAIN */
+
#if (defined(FEAT_CLIENTSERVER) && !defined(NO_VIM_MAIN)) || defined(PROTO)
/*
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 8e3238c..9d59138 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -183,3 +183,17 @@
endif
call delete('Xtestout')
endfunc
+
+func Test_progpath()
+ " Tests normally run with "./vim" or "../vim", these must have been expanded
+ " to a full path.
+ if has('unix')
+ call assert_equal('/', v:progpath[0])
+ elseif has('win32')
+ call assert_equal(':', v:progpath[1])
+ call assert_match('[/\\]', v:progpath[2])
+ endif
+
+ " Only expect "vim" to appear in v:progname.
+ call assert_match('vim\c', v:progname)
+endfunc
diff --git a/src/version.c b/src/version.c
index 71d22de..c4ef6ac 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 405,
+/**/
404,
/**/
403,