summaryrefslogtreecommitdiff
path: root/src/node_file.cc
diff options
context:
space:
mode:
authorJoyee Cheung <joyeec9h3@gmail.com>2018-02-14 11:08:52 -0800
committerJoyee Cheung <joyeec9h3@gmail.com>2018-02-27 20:33:53 +0800
commitfea5dda1d1ee4ebc2883fc9b4019c254176cc2c6 (patch)
tree6b75a1bb29df23941a3e58fde3331ac9976874ef /src/node_file.cc
parentd2c4f5082f371bbbfc01972d177799dc42e255a9 (diff)
downloadandroid-node-v8-fea5dda1d1ee4ebc2883fc9b4019c254176cc2c6.tar.gz
android-node-v8-fea5dda1d1ee4ebc2883fc9b4019c254176cc2c6.tar.bz2
android-node-v8-fea5dda1d1ee4ebc2883fc9b4019c254176cc2c6.zip
fs: throw openSync errors in JS
PR-URL: https://github.com/nodejs/node/pull/18871 Refs: https://github.com/nodejs/node/issues/18106 Reviewed-By: Michaƫl Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'src/node_file.cc')
-rw-r--r--src/node_file.cc24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/node_file.cc b/src/node_file.cc
index 88662fad4e..8f9b71a238 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -1169,25 +1169,29 @@ static void ReadDir(const FunctionCallbackInfo<Value>& args) {
static void Open(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
- Local<Context> context = env->context();
- CHECK_GE(args.Length(), 3);
- CHECK(args[1]->IsInt32());
- CHECK(args[2]->IsInt32());
+ const int argc = args.Length();
+ CHECK_GE(argc, 3);
BufferValue path(env->isolate(), args[0]);
CHECK_NE(*path, nullptr);
- int flags = args[1]->Int32Value(context).ToChecked();
- int mode = args[2]->Int32Value(context).ToChecked();
+ CHECK(args[1]->IsInt32());
+ const int flags = args[1].As<Int32>()->Value();
+
+ CHECK(args[2]->IsInt32());
+ const int mode = args[2].As<Int32>()->Value();
FSReqBase* req_wrap = GetReqWrap(env, args[3]);
- if (req_wrap != nullptr) {
+ if (req_wrap != nullptr) { // open(path, flags, mode, req)
AsyncCall(env, req_wrap, args, "open", UTF8, AfterInteger,
uv_fs_open, *path, flags, mode);
- } else {
- SYNC_CALL(open, *path, *path, flags, mode)
- args.GetReturnValue().Set(SYNC_RESULT);
+ } else { // open(path, flags, mode, undefined, ctx)
+ CHECK_EQ(argc, 5);
+ fs_req_wrap req_wrap;
+ int result = SyncCall(env, args[4], &req_wrap, "open",
+ uv_fs_open, *path, flags, mode);
+ args.GetReturnValue().Set(result);
}
}