commit d08b8c4c04db9433340df38d21f0e26878f28421
author Bram Moolenaar <Bram@vim.org> Wed Jul 24 14:59:45 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Jul 24 14:59:45 2019 +0200
tree bed73fed41e1ce9dee8b6bb310f3d76feff5dce3
parent 06029a857a3d4d90b3162090506c1e00dc84c60b

patch 8.1.1740: exepath() doesn't work for "bin/cat"

Problem:    Exepath() doesn't work for "bin/cat".
Solution:   Check for any path separator. (Daniel Hahler, closes #4724,
            closes #4710)

src/evalfunc.c

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 3fbeec2..8b9fba0 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3058,8 +3058,7 @@
     char_u *name = tv_get_string(&argvars[0]);
 
     /* Check in $PATH and also check directly if there is a directory name. */
-    rettv->vval.v_number = mch_can_exe(name, NULL, TRUE)
-		 || (gettail(name) != name && mch_can_exe(name, NULL, FALSE));
+    rettv->vval.v_number = mch_can_exe(name, NULL, TRUE);
 }
 
 static garray_T	redir_execute_ga;

src/os_unix.c

diff --git a/src/os_unix.c b/src/os_unix.c
index a15d660..6387a77 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3103,12 +3103,11 @@
 
     /* When "use_path" is false and if it's an absolute or relative path don't
      * need to use $PATH. */
-    if (!use_path || mch_isFullName(name) || (name[0] == '.'
-		   && (name[1] == '/' || (name[1] == '.' && name[2] == '/'))))
+    if (!use_path || gettail(name) != name)
     {
 	/* There must be a path separator, files in the current directory
 	 * can't be executed. */
-	if (gettail(name) != name && executable_file(name))
+	if ((use_path || gettail(name) != name) && executable_file(name))
 	{
 	    if (path != NULL)
 	    {

src/testdir/test_functions.vim

diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 9199ba7..1833113 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -990,6 +990,14 @@
   elseif has('unix')
     call assert_equal(1, executable('cat'))
     call assert_equal(0, executable('nodogshere'))
+
+    " get "cat" path and remove the leading /
+    let catcmd = exepath('cat')[1:]
+    new
+    lcd /
+    call assert_equal(1, executable(catcmd))
+    call assert_equal('/' .. catcmd, exepath(catcmd))
+    bwipe
   endif
 endfunc
 

src/version.c

diff --git a/src/version.c b/src/version.c
index cc86468..e25be55 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1740,
+/**/
     1739,
 /**/
     1738,