mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 20:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix os.getenv of lua on Windows

Browse Source 
Change to use os_getenv instead of getenv because environment variable
set by uv_os_setenv can not be get with getenv.
This commit is contained in:
erw7
2019-03-07 13:41:40 +09:00
parent 24a56cca30
commit c9264e6d52
3 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/nvim/lua/executor.c
View File

@@ -24,6 +24,10 @@
#include "nvim/undo.h"
#include "nvim/ascii.h"
#ifdef WIN32
#include "nvim/os/env.h"
#endif
#include "nvim/lua/executor.h"
#include "nvim/lua/converter.h"
@@ -118,6 +122,14 @@ static int nlua_state_init(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
lua_setfield(lstate, -2, "debug");
lua_pop(lstate, 1);
#ifdef WIN32
// os.getenv
lua_getglobal(lstate, "os");
lua_pushcfunction(lstate, &nlua_getenv);
lua_setfield(lstate, -2, "getenv");
lua_pop(lstate, 1);
#endif
// vim
if (luaL_dostring(lstate, (char *)&vim_module[0])) {
nlua_error(lstate, _("E5106: Error while creating vim module: %.*s"));
@@ -337,6 +349,19 @@ int nlua_debug(lua_State *lstate)
return 0;
}
#ifdef WIN32
/// os.getenv implementation: On Windows, uv_os_setenv does not update _environ,
/// so we need to use os_getenv instead of getenv. Therefore we will apply a
/// monkey patch here.
///
/// @param lstate Lua interpreter state.
static int nlua_getenv(lua_State *lstate)
{
lua_pushstring(lstate, os_getenv(luaL_checkstring(lstate, 1)));
return 1;
}
#endif
/// Evaluate lua string
///
/// Used for luaeval().