diff options
| author | erw7 <erw7.github@gmail.com> | 2019-07-16 00:39:34 +0900 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2019-07-15 17:39:34 +0200 |
| commit | 519382646be32735735842c5632b9361bf7864a4 (patch) | |
| tree | 9816ac70cb4c6dee5a062ea9a001b36fa812c8c4 | |
| parent | be949d6c9dd49f588e28cd5c1456bec44c22dbe7 (diff) | |
| download | rneovim-519382646be32735735842c5632b9361bf7864a4.tar.gz rneovim-519382646be32735735842c5632b9361bf7864a4.tar.bz2 rneovim-519382646be32735735842c5632b9361bf7864a4.zip | |
Fix is_executable_in_path() on Windows (#10468)
* Fix problem that 1byte extra memory was allocated in is_executable_in_path
* Revert "Revert "tests: executable_spec: enable pending test #10443" (#10454)"
This reverts commit 13fbeda0e56db36aeeb865bb5b33d13f69b2fdbc.
| -rw-r--r-- | src/nvim/os/fs.c | 2 | ||||
| -rw-r--r-- | test/functional/eval/executable_spec.lua | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 65362b545f..4a10b5199c 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -364,7 +364,7 @@ static bool is_executable_in_path(const char_u *name, char_u **abspath) #ifdef WIN32 // Prepend ".;" to $PATH. size_t pathlen = strlen(path_env); - char *path = memcpy(xmallocz(pathlen + 3), "." ENV_SEPSTR, 2); + char *path = memcpy(xmallocz(pathlen + 2), "." ENV_SEPSTR, 2); memcpy(path + 2, path_env, pathlen); #else char *path = xstrdup(path_env); diff --git a/test/functional/eval/executable_spec.lua b/test/functional/eval/executable_spec.lua index e346b786a6..1107fe6a0b 100644 --- a/test/functional/eval/executable_spec.lua +++ b/test/functional/eval/executable_spec.lua @@ -24,12 +24,7 @@ describe('executable()', function() eq('arg1=lemon;arg2=sky;arg3=tree;', call('system', sibling_exe..' lemon sky tree')) end - local is_executable = call('executable', sibling_exe) - if iswin() and is_executable ~= expected then - pending('XXX: sometimes fails on AppVeyor') - else - eq(expected, is_executable) - end + eq(expected, call('executable', sibling_exe)) end) describe('exec-bit', function() |