Skip to content

Commit 5dd54a6

Browse files
thefourtheyeitaloacasas
authored andcommitted
Revert "fs: ensure readFile[Sync] reads from the beginning"
This reverts commit 4444e73. PR-URL: nodejs#10809 Reviewed-By: Anna Henningsen <[email protected]>
1 parent a500d30 commit 5dd54a6

File tree

2 files changed

+5
-28
lines changed

2 files changed

+5
-28
lines changed

lib/fs.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ ReadFileContext.prototype.read = function() {
310310
req.oncomplete = readFileAfterRead;
311311
req.context = this;
312312

313-
binding.read(this.fd, buffer, offset, length, this.pos, req);
313+
binding.read(this.fd, buffer, offset, length, -1, req);
314314
};
315315

316316
ReadFileContext.prototype.close = function(err) {
@@ -447,11 +447,11 @@ function tryCreateBuffer(size, fd, isUserFd) {
447447
return buffer;
448448
}
449449

450-
function tryReadSync(fd, isUserFd, buffer, pos, len, offset) {
450+
function tryReadSync(fd, isUserFd, buffer, pos, len) {
451451
var threw = true;
452452
var bytesRead;
453453
try {
454-
bytesRead = fs.readSync(fd, buffer, pos, len, offset);
454+
bytesRead = fs.readSync(fd, buffer, pos, len);
455455
threw = false;
456456
} finally {
457457
if (threw && !isUserFd) fs.closeSync(fd);
@@ -480,15 +480,15 @@ fs.readFileSync = function(path, options) {
480480

481481
if (size !== 0) {
482482
do {
483-
bytesRead = tryReadSync(fd, isUserFd, buffer, pos, size - pos, pos);
483+
bytesRead = tryReadSync(fd, isUserFd, buffer, pos, size - pos);
484484
pos += bytesRead;
485485
} while (bytesRead !== 0 && pos < size);
486486
} else {
487487
do {
488488
// the kernel lies about many files.
489489
// Go ahead and try to read some bytes.
490490
buffer = Buffer.allocUnsafe(8192);
491-
bytesRead = tryReadSync(fd, isUserFd, buffer, 0, 8192, pos);
491+
bytesRead = tryReadSync(fd, isUserFd, buffer, 0, 8192);
492492
if (bytesRead !== 0) {
493493
buffers.push(buffer.slice(0, bytesRead));
494494
}

test/parallel/test-fs-readfile-fd-offset.js

-23
This file was deleted.

0 commit comments

Comments
 (0)