mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-15 22:36:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

win: os_getenv(): use _wgetenv()

Browse Source
This commit is contained in:
Justin M. Keyes
2018-01-28 02:59:44 +01:00
parent 76562fa192
commit 865584dd0c
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,8 +36,25 @@
const char *os_getenv(const char *name) const char *os_getenv(const char *name)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
#if !defined(WIN32)
const char *e = getenv(name); const char *e = getenv(name);
return e == NULL || *e == NUL ? NULL : e; return e == NULL || *e == NUL ? NULL : e;
#else
wchar_t *wname;
utf8_to_utf16(name, &wname);
if (wname == NULL) {
xfree(wname);
return NULL;
}
wchar_t *wvalue = _wgetenv(wname);
char *value;
int rv = utf16_to_utf8(wvalue, &value);
if (rv != 0 || *value == NUL) {
xfree(value);
return NULL;
}
return value; // TODO(jmk): this was allocated, but callers don't free it ...
#endif
} }
/// Returns `true` if the environment variable, `name`, has been defined /// Returns `true` if the environment variable, `name`, has been defined