Browse Source

src: adapt to API change in uv_cwd

v0.11.12-release
Saúl Ibarra Corretgé 11 years ago
committed by Timothy J Fontaine
parent
commit
d2f2a32b89
  1. 14
      src/node.cc

14
src/node.cc

@ -1541,19 +1541,21 @@ static void Cwd(const FunctionCallbackInfo<Value>& args) {
HandleScope scope(env->isolate()); HandleScope scope(env->isolate());
#ifdef _WIN32 #ifdef _WIN32
/* MAX_PATH is in characters, not bytes. Make sure we have enough headroom. */ /* MAX_PATH is in characters, not bytes. Make sure we have enough headroom. */
char buf[MAX_PATH * 4 + 1]; char buf[MAX_PATH * 4];
#else #else
char buf[PATH_MAX + 1]; char buf[PATH_MAX];
#endif #endif
int err = uv_cwd(buf, ARRAY_SIZE(buf) - 1); size_t cwd_len = sizeof(buf);
int err = uv_cwd(buf, &cwd_len);
if (err) { if (err) {
return env->ThrowUVException(err, "uv_cwd"); return env->ThrowUVException(err, "uv_cwd");
} }
buf[ARRAY_SIZE(buf) - 1] = '\0'; Local<String> cwd = String::NewFromUtf8(env->isolate(),
Local<String> cwd = String::NewFromUtf8(env->isolate(), buf); buf,
String::kNormalString,
cwd_len);
args.GetReturnValue().Set(cwd); args.GetReturnValue().Set(cwd);
} }

Loading…
Cancel
Save