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

Merge #9686 'win/Lua: monkey-patch os.getenv()'

Browse Source 
fixes #9681
This commit is contained in:
Justin M. Keyes
2019-03-16 20:28:52 +01:00
parent 8d00393d0c c9264e6d52
commit 11a481f711
4 changed files with 86 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,10 @@
#include "nvim/undo.h"
#include "nvim/ascii.h"
#ifdef WIN32
#include "nvim/os/os.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"));
@@ -297,7 +309,7 @@ nlua_print_error:
return 0;
}
/// debug.debug implementation: interaction with user while debugging
/// debug.debug: interaction with user while debugging.
///
/// @param lstate Lua interpreter state.
int nlua_debug(lua_State *lstate)
@@ -337,6 +349,19 @@ int nlua_debug(lua_State *lstate)
return 0;
}
#ifdef WIN32
/// os.getenv: override os.getenv to maintain coherency. #9681
///
/// uv_os_setenv uses SetEnvironmentVariableW which does not update _environ.
///
/// @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().

43
src/nvim/os/env.c
View File

@@ -151,25 +151,36 @@ int os_unsetenv(const char *name)
char *os_getenvname_at_index(size_t index)
{
#ifdef _WIN32
// Check if index is inside the environ array and is not the last element.
for (size_t i = 0; i <= index; i++) {
if (_wenviron[i] == NULL) {
return NULL;
}
}
wchar_t *utf16_str = _wenviron[index];
char *utf8_str;
int conversion_result = utf16_to_utf8(utf16_str, &utf8_str);
if (conversion_result != 0) {
EMSG2("utf16_to_utf8 failed: %d", conversion_result);
wchar_t *env = GetEnvironmentStringsW();
if (!env) {
return NULL;
}
size_t namesize = 0;
while (utf8_str[namesize] != '=' && utf8_str[namesize] != NUL) {
namesize++;
char *name = NULL;
size_t current_index = 0;
// GetEnvironmentStringsW() result has this format:
// var1=value1\0var2=value2\0...varN=valueN\0\0
for (wchar_t *it = env; *it != L'\0' || *(it + 1) != L'\0'; it++) {
if (index == current_index) {
char *utf8_str;
int conversion_result = utf16_to_utf8(it, &utf8_str);
if (conversion_result != 0) {
EMSG2("utf16_to_utf8 failed: %d", conversion_result);
break;
}
size_t namesize = 0;
while (utf8_str[namesize] != '=' && utf8_str[namesize] != NUL) {
namesize++;
}
name = (char *)vim_strnsave((char_u *)utf8_str, namesize);
xfree(utf8_str);
break;
}
if (*it == L'\0') {
current_index++;
}
}
char *name = (char *)vim_strnsave((char_u *)utf8_str, namesize);
xfree(utf8_str);
FreeEnvironmentStringsW(env);
return name;
#else
# if defined(HAVE__NSGETENVIRON)