@@ -266,27 +266,25 @@ function ReadFileContext(callback, encoding) {
266
266
}
267
267
268
268
ReadFileContext . prototype . read = function ( ) {
269
- var fd = this . fd ;
270
- var size = this . size ;
271
269
var buffer ;
272
270
var offset ;
273
271
var length ;
274
272
275
- if ( size === 0 ) {
273
+ if ( this . size === 0 ) {
276
274
buffer = this . buffer = new SlowBuffer ( kReadFileBufferLength ) ;
277
275
offset = 0 ;
278
276
length = kReadFileBufferLength ;
279
277
} else {
280
278
buffer = this . buffer ;
281
279
offset = this . pos ;
282
- length = size - this . pos ;
280
+ length = this . size - this . pos ;
283
281
}
284
282
285
283
var req = new FSReqWrap ( ) ;
286
284
req . oncomplete = readFileAfterRead ;
287
285
req . context = this ;
288
286
289
- binding . read ( fd , buffer , offset , length , - 1 , req ) ;
287
+ binding . read ( this . fd , buffer , offset , length , - 1 , req ) ;
290
288
} ;
291
289
292
290
ReadFileContext . prototype . close = function ( err ) {
@@ -301,8 +299,7 @@ function readFileAfterOpen(err, fd) {
301
299
var context = this . context ;
302
300
303
301
if ( err ) {
304
- var callback = context . callback ;
305
- callback ( err ) ;
302
+ context . callback ( err ) ;
306
303
return ;
307
304
}
308
305
@@ -416,7 +413,7 @@ fs.readFileSync = function(path, options) {
416
413
if ( size === 0 ) {
417
414
buffers = [ ] ;
418
415
} else {
419
- var threw = true ;
416
+ threw = true ;
420
417
try {
421
418
buffer = new Buffer ( size ) ;
422
419
threw = false ;
@@ -426,16 +423,18 @@ fs.readFileSync = function(path, options) {
426
423
}
427
424
428
425
var done = false ;
426
+ var bytesRead ;
427
+
429
428
while ( ! done ) {
430
- var threw = true ;
429
+ threw = true ;
431
430
try {
432
431
if ( size !== 0 ) {
433
- var bytesRead = fs . readSync ( fd , buffer , pos , size - pos ) ;
432
+ bytesRead = fs . readSync ( fd , buffer , pos , size - pos ) ;
434
433
} else {
435
434
// the kernel lies about many files.
436
435
// Go ahead and try to read some bytes.
437
436
buffer = new Buffer ( 8192 ) ;
438
- var bytesRead = fs . readSync ( fd , buffer , 0 , 8192 ) ;
437
+ bytesRead = fs . readSync ( fd , buffer , 0 , 8192 ) ;
439
438
if ( bytesRead ) {
440
439
buffers . push ( buffer . slice ( 0 , bytesRead ) ) ;
441
440
}
@@ -584,10 +583,12 @@ fs.read = function(fd, buffer, offset, length, position, callback) {
584
583
585
584
fs . readSync = function ( fd , buffer , offset , length , position ) {
586
585
var legacy = false ;
586
+ var encoding ;
587
+
587
588
if ( ! ( buffer instanceof Buffer ) ) {
588
589
// legacy string interface (fd, length, position, encoding, callback)
589
590
legacy = true ;
590
- var encoding = arguments [ 3 ] ;
591
+ encoding = arguments [ 3 ] ;
591
592
592
593
assertEncoding ( encoding ) ;
593
594
@@ -622,14 +623,14 @@ fs.write = function(fd, buffer, offset, length, position, callback) {
622
623
callback ( err , written || 0 , buffer ) ;
623
624
}
624
625
626
+ var req = new FSReqWrap ( ) ;
625
627
if ( buffer instanceof Buffer ) {
626
628
// if no position is passed then assume null
627
629
if ( typeof position === 'function' ) {
628
630
callback = position ;
629
631
position = null ;
630
632
}
631
633
callback = maybeCallback ( callback ) ;
632
- var req = new FSReqWrap ( ) ;
633
634
req . oncomplete = strWrapper ;
634
635
return binding . writeBuffer ( fd , buffer , offset , length , position , req ) ;
635
636
}
@@ -646,7 +647,6 @@ fs.write = function(fd, buffer, offset, length, position, callback) {
646
647
length = 'utf8' ;
647
648
}
648
649
callback = maybeCallback ( position ) ;
649
- var req = new FSReqWrap ( ) ;
650
650
req . oncomplete = bufWrapper ;
651
651
return binding . writeString ( fd , buffer , offset , length , req ) ;
652
652
} ;
@@ -720,8 +720,10 @@ fs.truncateSync = function(path, len) {
720
720
}
721
721
// allow error to be thrown, but still close fd.
722
722
var fd = fs . openSync ( path , 'r+' ) ;
723
+ var ret ;
724
+
723
725
try {
724
- var ret = fs . ftruncateSync ( fd , len ) ;
726
+ ret = fs . ftruncateSync ( fd , len ) ;
725
727
} finally {
726
728
fs . closeSync ( fd ) ;
727
729
}
@@ -876,7 +878,7 @@ function preprocessSymlinkDestination(path, type, linkPath) {
876
878
877
879
fs . symlink = function ( destination , path , type_ , callback ) {
878
880
var type = ( typeof type_ === 'string' ? type_ : null ) ;
879
- var callback = makeCallback ( arguments [ arguments . length - 1 ] ) ;
881
+ callback = makeCallback ( arguments [ arguments . length - 1 ] ) ;
880
882
881
883
if ( ! nullCheck ( destination , callback ) ) return ;
882
884
if ( ! nullCheck ( path , callback ) ) return ;
@@ -967,9 +969,9 @@ if (constants.hasOwnProperty('O_SYMLINK')) {
967
969
968
970
// prefer to return the chmod error, if one occurs,
969
971
// but still try to close, and report closing errors if they occur.
970
- var err , err2 ;
972
+ var err , err2 , ret ;
971
973
try {
972
- var ret = fs . fchmodSync ( fd , mode ) ;
974
+ ret = fs . fchmodSync ( fd , mode ) ;
973
975
} catch ( er ) {
974
976
err = er ;
975
977
}
@@ -1112,7 +1114,7 @@ function writeAll(fd, buffer, offset, length, position, callback) {
1112
1114
}
1113
1115
1114
1116
fs . writeFile = function ( path , data , options , callback ) {
1115
- var callback = maybeCallback ( arguments [ arguments . length - 1 ] ) ;
1117
+ callback = maybeCallback ( arguments [ arguments . length - 1 ] ) ;
1116
1118
1117
1119
if ( ! options || typeof options === 'function' ) {
1118
1120
options = { encoding : 'utf8' , mode : 0o666 , flag : 'w' } ;
@@ -1625,8 +1627,8 @@ function ReadStream(path, options) {
1625
1627
this . flags = options . flags === undefined ? 'r' : options . flags ;
1626
1628
this . mode = options . mode === undefined ? 0o666 : options . mode ;
1627
1629
1628
- this . start = options . start === undefined ? undefined : options . start ;
1629
- this . end = options . end === undefined ? undefined : options . end ;
1630
+ this . start = options . start ;
1631
+ this . end = options . end ;
1630
1632
this . autoClose = options . autoClose === undefined ? true : options . autoClose ;
1631
1633
this . pos = undefined ;
1632
1634
@@ -1788,7 +1790,7 @@ function WriteStream(path, options) {
1788
1790
this . flags = options . flags === undefined ? 'w' : options . flags ;
1789
1791
this . mode = options . mode === undefined ? 0o666 : options . mode ;
1790
1792
1791
- this . start = options . start === undefined ? undefined : options . start ;
1793
+ this . start = options . start ;
1792
1794
this . pos = undefined ;
1793
1795
this . bytesWritten = 0 ;
1794
1796
0 commit comments