diff options
| -rw-r--r-- | src/nvim/os/env.c | 3 | ||||
| -rw-r--r-- | test/functional/eval/environ_spec.lua | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c index bef78d8cc8..0ee21480cb 100644 --- a/src/nvim/os/env.c +++ b/src/nvim/os/env.c @@ -102,6 +102,9 @@ bool os_env_exists(const char *name) assert(r != UV_EINVAL); if (r != 0 && r != UV_ENOENT && r != UV_ENOBUFS) { ELOG("uv_os_getenv(%s) failed: %d %s", name, r, uv_err_name(r)); +#ifdef WIN32 + return (r == UV_UNKNOWN); +#endif } return (r == 0 || r == UV_ENOBUFS); } diff --git a/test/functional/eval/environ_spec.lua b/test/functional/eval/environ_spec.lua index 84564d9f93..4c2adcf1bf 100644 --- a/test/functional/eval/environ_spec.lua +++ b/test/functional/eval/environ_spec.lua @@ -3,7 +3,6 @@ local clear = helpers.clear local eq = helpers.eq local environ = helpers.funcs.environ local exists = helpers.funcs.exists -local iswin = helpers.iswin describe('environment variables', function() it('environ() handles empty env variable', function() @@ -12,8 +11,8 @@ describe('environment variables', function() eq(nil, environ()['DOES_NOT_EXIST']) end) it('exists() handles empty env variable', function() - clear({env={EMPTY_VAR=""}}) -- Windows treats this as "undefined". - eq((iswin() and 0 or 1), exists('$EMPTY_VAR')) + clear({env={EMPTY_VAR=""}}) + eq(1, exists('$EMPTY_VAR')) eq(0, exists('$DOES_NOT_EXIST')) end) end) |