Permalink
Browse files

patch 8.0.0419: test for v:progpath fails on MS-Windows

Problem:    Test for v:progpath fails on MS-Windows.
Solution:   Expand to full path.  Also add ".exe" when the path is an absolute
            path.
  • Loading branch information...
brammool committed Mar 5, 2017
1 parent a382868 commit 066029ef92b45dc4bd21a353b1fac25841062c26
Showing with 21 additions and 15 deletions.
  1. +13 −14 src/main.c
  2. +6 −1 src/os_win32.c
  3. +2 −0 src/version.c
View
@@ -3533,31 +3533,30 @@ time_msg(
set_progpath(char_u *argv0)
{
char_u *val = argv0;
-#ifdef WIN32
- char_u *path = NULL;
-#else
- char_u buf[MAXPATHL];
-#endif
/* 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))
- {
+ * On MS-Windows "vim" should be expanded to "vim.exe", thus always do
+ * this. */
# ifdef WIN32
- if (mch_can_exe(argv0, &path, FALSE) && path != NULL)
- val = path;
+ char_u *path = NULL;
+
+ if (mch_can_exe(argv0, &path, FALSE) && path != NULL)
+ val = path;
# else
+ char_u buf[MAXPATHL];
+
+ if (!mch_isFullName(argv0))
+ {
if (gettail(argv0) != argv0
&& vim_FullName(argv0, buf, MAXPATHL, TRUE) != FAIL)
val = buf;
-# endif
}
+# endif
set_vim_var_string(VV_PROGPATH, val, -1);
-#ifdef WIN32
+# ifdef WIN32
vim_free(path);
-#endif
+# endif
}
#endif /* NO_VIM_MAIN */
View
@@ -1921,7 +1921,12 @@ executable_exists(char *name, char_u **path, int use_path)
if (mch_getperm(name) != -1 && !mch_isdir(name))
{
if (path != NULL)
- *path = vim_strsave((char_u *)name);
+ {
+ if (mch_isFullName(name))
+ *path = vim_strsave((char_u *)name);
+ else
+ *path = FullName_save((char_u *)name, FALSE);
+ }
return TRUE;
}
return FALSE;
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 419,
/**/
418,
/**/

0 comments on commit 066029e

Please sign in to comment.