Skip to content

Read all results for subdirectories in opendir #48829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Read all results for subdirectories in opendir #48829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bab5d8
fs: read all results for subdirectories in opendir
mdouglass Jul 18, 2023
860657d
update test to use artificially low bufferSize to demonstrate bug
mdouglass Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions lib/internal/fs/dir.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,18 +166,22 @@ class Dir {
pathModule.toNamespacedPath(dirent.path),
this[kDirOptions].encoding,
undefined,
ctx,
ctx
);
handleErrorFromBinding(ctx);
const result = handle.read(
this[kDirOptions].encoding,
this[kDirOptions].bufferSize,
undefined,
ctx,
);
while (true) {
const result = handle.read(
this[kDirOptions].encoding,
this[kDirOptions].bufferSize,
undefined,
ctx,
);

if (result) {
this.processReadResult(dirent.path, result);
if (result) {
this.processReadResult(dirent.path, result);
} else {
break;
}
}

handle.close(undefined, ctx);
Expand Down Expand Up @@ -206,7 +210,7 @@ class Dir {
this[kDirOptions].encoding,
this[kDirOptions].bufferSize,
undefined,
ctx,
ctx
);
handleErrorFromBinding(ctx);

Expand Down
2 changes: 1 addition & 1 deletion test/sequential/test-fs-opendir-recursive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ function processDirSync(dir) {
// Opendir read results sync

{
const dir = fs.opendirSync(testDir, { recursive: true });
const dir = fs.opendirSync(testDir, { recursive: true, bufferSize: 1 });
processDirSync(dir);
dir.closeSync();
}
Expand Down