diff options
| -rw-r--r-- | cmake/FindLuaJit.cmake | 2 | ||||
| -rw-r--r-- | src/nvim/os/fs.c | 14 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | third-party/cmake/BuildLibtermkey.cmake | 1 |
4 files changed, 14 insertions, 6 deletions
diff --git a/cmake/FindLuaJit.cmake b/cmake/FindLuaJit.cmake index aad0ce7b85..d60b6f09be 100644 --- a/cmake/FindLuaJit.cmake +++ b/cmake/FindLuaJit.cmake @@ -13,7 +13,7 @@ set(LUAJIT_DEFINITIONS ${PC_LUAJIT_CFLAGS_OTHER}) find_path(LUAJIT_INCLUDE_DIR luajit.h PATHS ${PC_LUAJIT_INCLUDEDIR} ${PC_LUAJIT_INCLUDE_DIRS} - PATH_SUFFIXES luajit-2.0) + PATH_SUFFIXES luajit-2.0 luajit-2.1) # If we're asked to use static linkage, add libluajit-5.1.a as a preferred # library name. diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 1ecca87cde..65362b545f 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -24,6 +24,7 @@ #include "nvim/message.h" #include "nvim/assert.h" #include "nvim/misc1.h" +#include "nvim/option.h" #include "nvim/path.h" #include "nvim/strings.h" @@ -312,7 +313,8 @@ static bool is_executable_ext(char *name, char_u **abspath) if (!pathext) { pathext = ".com;.exe;.bat;.cmd"; } - for (const char *ext = pathext; *ext; ext++) { + const char *ext = pathext; + while (*ext) { // If $PATHEXT itself contains dot: if (ext[0] == '.' && (ext[1] == '\0' || ext[1] == ENV_SEPCHAR)) { if (is_executable(name, abspath)) { @@ -320,13 +322,17 @@ static bool is_executable_ext(char *name, char_u **abspath) } // Skip it. ext++; + if (*ext) { + ext++; + } continue; } - const char *ext_end = xstrchrnul(ext, ENV_SEPCHAR); - size_t ext_len = (size_t)(ext_end - ext); + const char *ext_end = ext; + size_t ext_len = + copy_option_part((char_u **)&ext_end, (char_u *)buf_end, + sizeof(os_buf) - (size_t)(buf_end - os_buf), ENV_SEPSTR); if (ext_len != 0) { - STRLCPY(buf_end, ext, ext_len + 1); bool in_pathext = nameext_len == ext_len && 0 == mb_strnicmp((char_u *)nameext, (char_u *)ext, ext_len); diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 5db8e10a33..b2b05e1175 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -191,6 +191,9 @@ endif() if(USE_BUNDLED_LIBTERMKEY) include(BuildLibtermkey) + if(USE_BUNDLED_UNIBILIUM) + add_dependencies(libtermkey unibilium) + endif() endif() if(USE_BUNDLED_LIBVTERM) diff --git a/third-party/cmake/BuildLibtermkey.cmake b/third-party/cmake/BuildLibtermkey.cmake index da65c87972..b2332ed65a 100644 --- a/third-party/cmake/BuildLibtermkey.cmake +++ b/third-party/cmake/BuildLibtermkey.cmake @@ -53,4 +53,3 @@ ExternalProject_Add(libtermkey endif() list(APPEND THIRD_PARTY_DEPS libtermkey) -add_dependencies(libtermkey unibilium) |