Revert "win/os_env_exists(): workaround libuv bug neovim#10734"

This reverts commit 278c5d4.
blueyed · Sep 11, 2019 · 13d763e · 13d763e
1 parent ab3ba72
commit 13d763e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
@@ -102,9 +102,6 @@ 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
@@ -3,6 +3,7 @@ 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()
@@ -11,8 +12,8 @@ describe('environment variables', function()
     eq(nil, environ()['DOES_NOT_EXIST'])
   end)
   it('exists() handles empty env variable', function()
-    clear({env={EMPTY_VAR=""}})
-    eq(1, exists('$EMPTY_VAR'))
+    clear({env={EMPTY_VAR=""}})  -- Windows treats this as "undefined".
+    eq((iswin() and 0 or 1), exists('$EMPTY_VAR'))
     eq(0, exists('$DOES_NOT_EXIST'))
   end)
 end)