Mercurial > vim
changeset 32922:397ff3169248 v9.0.1769
patch 9.0.1769: executable() ignoring symlinks on Windows
Commit: https://github.com/vim/vim/commit/f5d0f54790fa86dfe73b428a087c8d8e6f391857
Author: AmberArr <me@frost.moe>
Date: Sun Aug 20 20:03:45 2023 +0200
patch 9.0.1769: executable() ignoring symlinks on Windows
Problem: executable() ignoring symlinks on Windows
Solution: resolve reparse points
closes: #12562
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: AmberArr <me@frost.moe>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 20 Aug 2023 20:15:04 +0200 |
| parents | 0305a7f2b874 |
| children | 3723f59e9d76 |
| files | src/os_mswin.c src/os_win32.c src/proto/os_mswin.pro src/testdir/test_functions.vim src/version.c |
| diffstat | 5 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -1775,7 +1775,11 @@ is_reparse_point_included(LPCWSTR fname) return FALSE; } - static char_u * +/* + * Return the resolved file path, NULL if "fname" is an AppExecLink reparse + * point, already fully resolved, or it doesn't exists. + */ + char_u * resolve_reparse_point(char_u *fname) { HANDLE h = INVALID_HANDLE_VALUE;
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -2721,6 +2721,8 @@ executable_file(char *name, char_u **pat { char_u *res = resolve_appexeclink((char_u *)name); if (res == NULL) + res = resolve_reparse_point((char_u *)name); + if (res == NULL) return FALSE; // The path is already absolute. if (path != NULL)
--- a/src/proto/os_mswin.pro +++ b/src/proto/os_mswin.pro @@ -37,6 +37,7 @@ int mch_print_text_out(char_u *p, int le void mch_print_set_font(int iBold, int iItalic, int iUnderline); void mch_print_set_bg(long_u bgcol); void mch_print_set_fg(long_u fgcol); +char_u *resolve_reparse_point(char_u *fname); char_u *mch_resolve_path(char_u *fname, int reparse_point); void win32_set_foreground(void); void serverInitMessaging(void);
--- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1818,6 +1818,10 @@ func Test_Executable() let [pathext, $PATHEXT] = [$PATHEXT, '.com;.exe;.bat;.cmd'] call assert_equal(notepadbat, exepath('notepad')) let $PATHEXT = pathext + " check for symbolic link + execute 'silent !mklink np.bat "' .. notepadbat .. '"' + call assert_equal(1, executable('./np.bat')) + call assert_equal(1, executable('./np')) bwipe eval 'Xnotedir'->delete('rf') elseif has('unix')