meta: merge node/master into node-chakracore/master

Merge f002c3d as of 2017-11-09
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Jack Horton <jahorto@microsoft.com>

Author: chakrabot

common.gypi

@@ -29,7 +29,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.8',
+    'v8_embedder_string': '-node.9',
 
     # Enable disassembler for `--print-code` v8 options
     'v8_enable_disassembler': 1,

deps/v8/src/inspector/inspector.gypi

@@ -31,8 +31,8 @@
     'inspector_all_sources': [
       '<@(inspector_generated_sources)',
       '<(inspector_generated_injected_script)',
-      '../../include/v8-inspector.h',
-      '../../include/v8-inspector-protocol.h',
+      '../include/v8-inspector.h',
+      '../include/v8-inspector-protocol.h',
       'inspector/injected-script.cc',
       'inspector/injected-script.h',
       'inspector/inspected-context.cc',

lib/fs.js

@@ -1722,6 +1722,14 @@ fs.realpathSync = function realpathSync(p, options) {
 };
 
 
+fs.realpathSync.native = function(path, options) {
+  options = getOptions(options, {});
+  handleError((path = getPathFromURL(path)));
+  nullCheck(path);
+  return binding.realpath(path, options.encoding);
+};
+
+
 fs.realpath = function realpath(p, options, callback) {
   callback = maybeCallback(typeof options === 'function' ? options : callback);
   if (!options)
@@ -1858,6 +1866,18 @@ fs.realpath = function realpath(p, options, callback) {
   }
 };
 
+
+fs.realpath.native = function(path, options, callback) {
+  callback = maybeCallback(callback || options);
+  options = getOptions(options, {});
+  if (handleError((path = getPathFromURL(path)), callback)) return;
+  if (!nullCheck(path, callback)) return;
+  const req = new FSReqWrap();
+  req.oncomplete = callback;
+  return binding.realpath(path, options.encoding, req);
+};
+
+
 fs.mkdtemp = function(prefix, options, callback) {
   callback = makeCallback(typeof options === 'function' ? options : callback);
   options = getOptions(options, {});

src/node_file.cc

@@ -539,12 +539,17 @@ static void InternalModuleReadFile(const FunctionCallbackInfo<Value>& args) {
     start = 3;  // Skip UTF-8 BOM.
   }
 
-  Local<String> chars_string =
-      String::NewFromUtf8(env->isolate(),
-                          &chars[start],
-                          String::kNormalString,
-                          offset - start);
-  args.GetReturnValue().Set(chars_string);
+  const size_t size = offset - start;
+  if (size == 0) {
+    args.GetReturnValue().SetEmptyString();
+  } else {
+    Local<String> chars_string =
+        String::NewFromUtf8(env->isolate(),
+                            &chars[start],
+                            String::kNormalString,
+                            size);
+    args.GetReturnValue().Set(chars_string);
+  }
 }
 
 // Used to speed up module loading.  Returns 0 if the path refers to
@@ -851,24 +856,15 @@ static void MKDir(const FunctionCallbackInfo<Value>& args) {
 }
 
 static void RealPath(const FunctionCallbackInfo<Value>& args) {
+  CHECK_GE(args.Length(), 2);
   Environment* env = Environment::GetCurrent(args);
-
-  const int argc = args.Length();
-
-  if (argc < 1)
-    return TYPE_ERROR("path required");
-
   BufferValue path(env->isolate(), args[0]);
   ASSERT_PATH(path)
 
   const enum encoding encoding = ParseEncoding(env->isolate(), args[1], UTF8);
 
-  Local<Value> callback = Null(env->isolate());
-  if (argc == 3)
-    callback = args[2];
-
-  if (callback->IsObject()) {
-    ASYNC_CALL(realpath, callback, encoding, *path);
+  if (args[2]->IsObject()) {
+    ASYNC_CALL(realpath, args[2], encoding, *path);
   } else {
     SYNC_CALL(realpath, *path, *path);
     const char* link_path = static_cast<const char*>(SYNC_REQ.ptr);

test/fixtures/empty-with-bom.txt

@@ -0,0 +1 @@
+

test/parallel/test-fs-realpath-native.js

@@ -0,0 +1,12 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const fs = require('fs');
+
+if (!common.isOSX) common.skip('MacOS-only test.');
+
+assert.strictEqual(fs.realpathSync.native('/users'), '/Users');
+fs.realpath.native('/users', common.mustCall((err, res) => {
+  assert.ifError(err);
+  assert.strictEqual(res, '/Users');
+}));