lib,src: fix spawnSync ignoring its 'env' option

PR-URL: https://github.com/joyent/node/pull/8546
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

diff --git a/lib/child_process.js b/lib/child_process.js
index c4345f9..e18b654 100644 (file)
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -1262,6 +1262,7 @@ function spawnSync(/*file, args, options*/) {
 
   options.file = opts.file;
   options.args = opts.args;
+  options.envPairs = opts.envPairs;
 
   if (options.killSignal)
     options.killSignal = lookupSignal(options.killSignal);

diff --git a/src/spawn_sync.cc b/src/spawn_sync.cc
index 59de8d4..f13a9e9 100644 (file)
--- a/src/spawn_sync.cc
+++ b/src/spawn_sync.cc
@@ -737,9 +737,9 @@ int SyncProcessRunner::ParseOptions(Local<Value> js_value) {
     r = CopyJsStringArray(js_env_pairs, &env_buffer_);
     if (r < 0)
       return r;
-    uv_process_options_.args = reinterpret_cast<char**>(env_buffer_);
-  }
 
+    uv_process_options_.env = reinterpret_cast<char**>(env_buffer_);
+  }
   Local<Value> js_uid = js_options->Get(env()->uid_string());
   if (IsSet(js_uid)) {
     if (!CheckRange<uv_uid_t>(js_uid))