Skip to content

Revert "Fix #9584 - Using dirEntries and chdir() can have unwanted results (#10666)" #10718

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

Merged
merged 1 commit into from
Mar 27, 2025
Merged

Revert "Fix #9584 - Using dirEntries and chdir() can have unwanted results (#10666)" #10718

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 2 additions & 17 deletions std/file.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4695,7 +4695,6 @@ private struct DirIteratorImpl
bool toNext(bool fetch, scope WIN32_FIND_DATAW* findinfo) @trusted
{
import core.stdc.wchar_ : wcscmp;
import std.string : chompPrefix;

if (fetch)
{
Expand All @@ -4712,7 +4711,7 @@ private struct DirIteratorImpl
popDirStack();
return false;
}
_cur = DirEntry(_stack[$-1].dirpath.chompPrefix(_pathPrefix), findinfo);
_cur = DirEntry(_stack[$-1].dirpath, findinfo);
return true;
}

Expand Down Expand Up @@ -4757,8 +4756,6 @@ private struct DirIteratorImpl

bool next() @trusted
{
import std.string : chompPrefix;

if (_stack.length == 0)
return false;

Expand All @@ -4768,7 +4765,7 @@ private struct DirIteratorImpl
if (core.stdc.string.strcmp(&fdata.d_name[0], ".") &&
core.stdc.string.strcmp(&fdata.d_name[0], ".."))
{
_cur = DirEntry(_stack[$-1].dirpath.chompPrefix(_pathPrefix), fdata);
_cur = DirEntry(_stack[$-1].dirpath, fdata);
return true;
}
}
Expand Down Expand Up @@ -4798,21 +4795,9 @@ private struct DirIteratorImpl

this(string pathname, SpanMode mode, bool followSymlink)
{
import std.path : absolutePath, isAbsolute;

_mode = mode;
_followSymlink = followSymlink;

if (!pathname.isAbsolute)
{
const pathnameRel = pathname;
alias pathnameAbs = pathname;
pathname = pathname.absolutePath;

const offset = pathnameAbs.length - pathnameRel.length;
_pathPrefix = pathnameAbs[0 .. offset];
}

if (stepIn(pathname))
{
if (_mode == SpanMode.depth)
Expand Down
Loading