1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

child_process: simplify argument handling

Browse Source 
This commit simplifies the calling of normalizeSpawnArguments()
and normalizeExecArguments(). Specifically, this commit replaces
apply() and the use of arguments with a normal function call.

PR-URL: https://github.com/nodejs/node/pull/25194
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
cjihrig 2018-12-23 12:41:18 -05:00
parent 7a867b8140
commit acb49dc04d
No known key found for this signature in database
GPG Key ID: 7434390BDBE9B9C5
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/child_process.js
View File

@ -147,8 +147,8 @@ function normalizeExecArgs(command, options, callback) {
}
exports.exec = function exec(/* command , options, callback */) {
const opts = normalizeExecArgs.apply(null, arguments);
exports.exec = function exec(command, options, callback) {
const opts = normalizeExecArgs(command, options, callback);
return exports.execFile(opts.file,
opts.options,
opts.callback);
@ -537,11 +537,11 @@ function normalizeSpawnArguments(file, args, options) {
}
var spawn = exports.spawn = function spawn(/* file, args, options */) {
var opts = normalizeSpawnArguments.apply(null, arguments);
var options = opts.options;
var child = new ChildProcess();
var spawn = exports.spawn = function spawn(file, args, options) {
const opts = normalizeSpawnArguments(file, args, options);
const child = new ChildProcess();
options = opts.options;
debug('spawn', opts.args, options);
child.spawn({
@ -560,10 +560,10 @@ var spawn = exports.spawn = function spawn(/* file, args, options */) {
return child;
};
function spawnSync(/* file, args, options */) {
var opts = normalizeSpawnArguments.apply(null, arguments);
function spawnSync(file, args, options) {
const opts = normalizeSpawnArguments(file, args, options);
var options = opts.options;
options = opts.options;
debug('spawnSync', opts.args, options);
@ -631,8 +631,8 @@ function checkExecSyncError(ret, args, cmd) {
}
function execFileSync(/* command, args, options */) {
var opts = normalizeSpawnArguments.apply(null, arguments);
function execFileSync(command, args, options) {
var opts = normalizeSpawnArguments(command, args, options);
var inheritStderr = !opts.options.stdio;
var ret = spawnSync(opts.file, opts.args.slice(1), opts.options);
@ -650,8 +650,8 @@ function execFileSync(/* command, args, options */) {
exports.execFileSync = execFileSync;
function execSync(command /* , options */) {
var opts = normalizeExecArgs.apply(null, arguments);
function execSync(command, options) {
var opts = normalizeExecArgs(command, options, null);
var inheritStderr = !opts.options.stdio;
var ret = spawnSync(opts.file, opts.options);