lib: don't use global Buffer

Port of nodejs/node-v0.x-archive#8603

The race condition present in the original PR didn't occur, so no
workaround was needed.

PR-URL: #1794
Reviewed-By: Trevor Norris <[email protected]>

lib/_debugger.js

@@ -9,6 +9,7 @@ const repl = Module.requireRepl();
 const inherits = util.inherits;
 const assert = require('assert');
 const spawn = require('child_process').spawn;
+const Buffer = require('buffer').Buffer;
 
 exports.start = function(argv, stdin, stdout) {
   argv || (argv = process.argv.slice(2));

lib/_http_client.js

@@ -13,6 +13,7 @@ const freeParser = common.freeParser;
 const debug = common.debug;
 const OutgoingMessage = require('_http_outgoing').OutgoingMessage;
 const Agent = require('_http_agent');
+const Buffer = require('buffer').Buffer;
 
 
 function ClientRequest(options, cb) {

lib/_http_outgoing.js

@@ -4,6 +4,7 @@ const assert = require('assert').ok;
 const Stream = require('stream');
 const timers = require('timers');
 const util = require('util');
+const Buffer = require('buffer').Buffer;
 const common = require('_http_common');
 
 const CRLF = common.CRLF;

lib/_stream_readable.js

@@ -5,6 +5,7 @@ Readable.ReadableState = ReadableState;
 
 const EE = require('events').EventEmitter;
 const Stream = require('stream');
+const Buffer = require('buffer').Buffer;
 const util = require('util');
 const debug = util.debuglog('stream');
 var StringDecoder;

lib/_stream_writable.js

@@ -9,6 +9,7 @@ Writable.WritableState = WritableState;
 
 const util = require('util');
 const Stream = require('stream');
+const Buffer = require('buffer').Buffer;
 
 util.inherits(Writable, Stream);
 

lib/_tls_legacy.js

@@ -7,6 +7,7 @@ const tls = require('tls');
 const util = require('util');
 const common = require('_tls_common');
 const debug = util.debuglog('tls-legacy');
+const Buffer = require('buffer').Buffer;
 const Timer = process.binding('timer_wrap').Timer;
 var Connection = null;
 try {

lib/_tls_wrap.js

@@ -8,6 +8,7 @@ const util = require('util');
 const listenerCount = require('events').listenerCount;
 const common = require('_tls_common');
 const StreamWrap = require('_stream_wrap').StreamWrap;
+const Buffer = require('buffer').Buffer;
 const Duplex = require('stream').Duplex;
 const debug = util.debuglog('tls');
 const Timer = process.binding('timer_wrap').Timer;

lib/assert.js

@@ -27,6 +27,7 @@
 // UTILITY
 const compare = process.binding('buffer').compare;
 const util = require('util');
+const Buffer = require('buffer').Buffer;
 const pSlice = Array.prototype.slice;
 
 // 1. The assert module provides functions that throw

lib/child_process.js

@@ -6,6 +6,7 @@ const constants = require('constants');
 
 const uv = process.binding('uv');
 const spawn_sync = process.binding('spawn_sync');
+const Buffer = require('buffer').Buffer;
 const Pipe = process.binding('pipe_wrap').Pipe;
 const child_process = require('internal/child_process');
 

lib/crypto.js

@@ -15,6 +15,7 @@ try {
   throw new Error('node.js not compiled with openssl crypto support.');
 }
 
+const Buffer = require('buffer').Buffer;
 const constants = require('constants');
 const stream = require('stream');
 const util = require('util');

lib/dgram.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const assert = require('assert');
+const Buffer = require('buffer').Buffer;
 const util = require('util');
 const events = require('events');
 const constants = require('constants');

lib/fs.js

@@ -10,6 +10,7 @@ const pathModule = require('path');
 const binding = process.binding('fs');
 const constants = require('constants');
 const fs = exports;
+const Buffer = require('buffer').Buffer;
 const Stream = require('stream').Stream;
 const EventEmitter = require('events').EventEmitter;
 const FSReqWrap = binding.FSReqWrap;

lib/internal/child_process.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const StringDecoder = require('string_decoder').StringDecoder;
+const Buffer = require('buffer').Buffer;
 const EventEmitter = require('events').EventEmitter;
 const net = require('net');
 const dgram = require('dgram');

lib/internal/smalloc.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const smalloc = process.binding('smalloc');
+const Buffer = require('buffer').Buffer;
 const kMaxLength = smalloc.kMaxLength;
 const kMinType = smalloc.kMinType;
 const kMaxType = smalloc.kMaxType;

lib/net.js

@@ -8,6 +8,7 @@ const assert = require('assert');
 const cares = process.binding('cares_wrap');
 const uv = process.binding('uv');
 
+const Buffer = require('buffer').Buffer;
 const TTYWrap = process.binding('tty_wrap');
 const TCP = process.binding('tcp_wrap').TCP;
 const Pipe = process.binding('pipe_wrap').Pipe;

lib/querystring.js

@@ -3,6 +3,7 @@
 'use strict';
 
 const QueryString = exports;
+const Buffer = require('buffer').Buffer;
 
 
 function charCode(c) {

lib/readline.js

@@ -10,6 +10,7 @@ const kHistorySize = 30;
 
 const util = require('util');
 const inherits = util.inherits;
+const Buffer = require('buffer').Buffer;
 const EventEmitter = require('events').EventEmitter;
 
 

lib/string_decoder.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const Buffer = require('buffer').Buffer;
+
 function assertEncoding(encoding) {
   // Do not cache `Buffer.isEncoding`, some modules monkey-patch it to support
   // additional encodings

lib/tls.js

@@ -4,6 +4,7 @@ const net = require('net');
 const url = require('url');
 const util = require('util');
 const binding = process.binding('crypto');
+const Buffer = require('buffer').Buffer;
 
 // Allow {CLIENT_RENEG_LIMIT} client-initiated session renegotiations
 // every {CLIENT_RENEG_WINDOW} seconds. An error event is emitted if more

lib/util.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const uv = process.binding('uv');
+const Buffer = require('buffer').Buffer;
 const Debug = require('vm').runInDebugContext('Debug');
 const internalUtil = require('internal/util');
 

lib/zlib.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const Buffer = require('buffer').Buffer;
 const Transform = require('_stream_transform');
 const binding = process.binding('zlib');
 const util = require('util');