Revert "child_process: measure buffer length in bytes"

This reverts commit c9a5990.
PR-URL: #7391
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Jackson Tian <shyvo1987@gmail.com>

Author: Trott

lib/child_process.js

@@ -146,13 +146,15 @@ exports.execFile = function(file /*, args, options, callback*/) {
 });
 
 varencoding;
-varstdoutState;
-varstderrState;
-var_stdout=[];
-var_stderr=[];
+var_stdout;
+var_stderr;
 if(options.encoding!=='buffer'&&Buffer.isEncoding(options.encoding)){
 encoding=options.encoding;
+_stdout='';
+_stderr='';
 }else{
+_stdout=[];
+_stderr=[];
 encoding=null;
 }
 varstdoutLen=0;
@@ -174,23 +176,16 @@ exports.execFile = function(file /*, args, options, callback*/) {
 
 if(!callback)return;
 
-varstdout=Buffer.concat(_stdout,stdoutLen);
-varstderr=Buffer.concat(_stderr,stderrLen);
-
-varstdoutEncoding=encoding;
-varstderrEncoding=encoding;
-
-if(stdoutState&&stdoutState.decoder)
-stdoutEncoding=stdoutState.decoder.encoding;
-
-if(stderrState&&stderrState.decoder)
-stderrEncoding=stderrState.decoder.encoding;
-
-if(stdoutEncoding)
-stdout=stdout.toString(stdoutEncoding);
-
-if(stderrEncoding)
-stderr=stderr.toString(stderrEncoding);
+// merge chunks
+varstdout;
+varstderr;
+if(!encoding){
+stdout=Buffer.concat(_stdout);
+stderr=Buffer.concat(_stderr);
+}else{
+stdout=_stdout;
+stderr=_stderr;
+}
 
 if(ex){
 // Will be handled later
@@ -250,45 +245,39 @@ exports.execFile = function(file /*, args, options, callback*/) {
 }
 
 if(child.stdout){
-stdoutState=child.stdout._readableState;
+if(encoding)
+child.stdout.setEncoding(encoding);
 
 child.stdout.addListener('data',function(chunk){
-// If `child.stdout.setEncoding()` happened in userland, convert string to
-// Buffer.
-if(stdoutState.decoder){
-chunk=Buffer.from(chunk,stdoutState.decoder.encoding);
-}
-
-stdoutLen+=chunk.byteLength;
+stdoutLen+=chunk.length;
 
 if(stdoutLen>options.maxBuffer){
 ex=newError('stdout maxBuffer exceeded');
-stdoutLen-=chunk.byteLength;
 kill();
 }else{
-_stdout.push(chunk);
+if(!encoding)
+_stdout.push(chunk);
+else
+_stdout+=chunk;
 }
 });
 }
 
 if(child.stderr){
-stderrState=child.stderr._readableState;
+if(encoding)
+child.stderr.setEncoding(encoding);
 
 child.stderr.addListener('data',function(chunk){
-// If `child.stderr.setEncoding()` happened in userland, convert string to
-// Buffer.
-if(stderrState.decoder){
-chunk=Buffer.from(chunk,stderrState.decoder.encoding);
-}
-
-stderrLen+=chunk.byteLength;
+stderrLen+=chunk.length;
 
 if(stderrLen>options.maxBuffer){
 ex=newError('stderr maxBuffer exceeded');
-stderrLen-=chunk.byteLength;
 kill();
 }else{
-_stderr.push(chunk);
+if(!encoding)
+_stderr.push(chunk);
+else
+_stderr+=chunk;
 }
 });
 }

…l/test-child-process-maxBuffer-stdout.js …_issues/test-child-process-max-buffer.jstest/parallel/test-child-process-maxBuffer-stdout.js renamed to test/known_issues/test-child-process-max-buffer.js test/parallel/test-child-process-maxBuffer-stdout.js renamed to test/known_issues/test-child-process-max-buffer.js

@@ -1,4 +1,5 @@
 'use strict';
+// Refs: https://github.com/nodejs/node/issues/1901
 constcommon=require('../common');
 constassert=require('assert');
 constcp=require('child_process');
@@ -9,7 +10,7 @@ if (process.argv[2] === 'child') {
 }else{
 constcmd=`${process.execPath}${__filename} child`;
 
-cp.exec(cmd,{maxBuffer: 10},common.mustCall((err,stdout,stderr)=>{
+cp.exec(cmd,{maxBuffer: 10},common.mustCall((err,stdout,stderr)=>{
 assert.strictEqual(err.message,'stdout maxBuffer exceeded');
 }));
 }

…child-process-exec-stdout-data-string.js …child-process-exec-stdout-data-string.jstest/known_issues/test-child-process-exec-stdout-data-string.js renamed to test/parallel/test-child-process-exec-stdout-data-string.js test/known_issues/test-child-process-exec-stdout-data-string.js renamed to test/parallel/test-child-process-exec-stdout-data-string.js

@@ -14,3 +14,4 @@ const command = common.isWindows ? 'dir' : 'ls';
 exec(command).stdout.on('data',cb);
 
 exec('fhqwhgads').stderr.on('data',cb);
+