mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-28 06:00:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Co-authored-by: GallaFrancesco <francesco.galla3@gmail.com>
Co-authored-by: Elias Batek <15967408+0xEAB@users.noreply.github.com>
This commit is contained in:
Elias Batek 2025-03-12 09:14:48 +01:00 • committed by GitHub
parent a7e90e9bf3
commit 274109b3de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

41
std/file.d
View file

@ -4638,6 +4638,7 @@ private struct DirIteratorImpl
DirEntry _cur; DirEntry _cur;
DirHandle[] _stack; DirHandle[] _stack;
DirEntry[] _stashed; //used in depth first mode DirEntry[] _stashed; //used in depth first mode
string _pathPrefix = null;
//stack helpers //stack helpers
void pushExtra(DirEntry de) void pushExtra(DirEntry de)
@ -4695,6 +4696,7 @@ private struct DirIteratorImpl
bool toNext(bool fetch, scope WIN32_FIND_DATAW* findinfo) @trusted bool toNext(bool fetch, scope WIN32_FIND_DATAW* findinfo) @trusted
{ {
import core.stdc.wchar_ : wcscmp; import core.stdc.wchar_ : wcscmp;
import std.string : chompPrefix;
if (fetch) if (fetch)
{ {
@ -4711,7 +4713,7 @@ private struct DirIteratorImpl
popDirStack(); popDirStack();
return false; return false;
} }
_cur = DirEntry(_stack[$-1].dirpath, findinfo); _cur = DirEntry(_stack[$-1].dirpath.chompPrefix(_pathPrefix), findinfo);
return true; return true;
} }
@ -4756,6 +4758,8 @@ private struct DirIteratorImpl
bool next() @trusted bool next() @trusted
{ {
import std.string : chompPrefix;
if (_stack.length == 0) if (_stack.length == 0)
return false; return false;
@ -4765,7 +4769,7 @@ private struct DirIteratorImpl
if (core.stdc.string.strcmp(&fdata.d_name[0], ".") && if (core.stdc.string.strcmp(&fdata.d_name[0], ".") &&
core.stdc.string.strcmp(&fdata.d_name[0], "..")) core.stdc.string.strcmp(&fdata.d_name[0], ".."))
{ {
_cur = DirEntry(_stack[$-1].dirpath, fdata); _cur = DirEntry(_stack[$-1].dirpath.chompPrefix(_pathPrefix), fdata);
return true; return true;
} }
} }
@ -4800,12 +4804,30 @@ private struct DirIteratorImpl
_followSymlink = followSymlink; _followSymlink = followSymlink;
static if (isNarrowString!R && is(immutable ElementEncodingType!R == immutable char)) static if (isNarrowString!R && is(immutable ElementEncodingType!R == immutable char))
alias pathnameStr = pathname; {
import std.path : absolutePath, isAbsolute;
string pathnameStr;
if (pathname.isAbsolute)
pathnameStr = pathname;
else else
{ {
import std.array : array; pathnameStr = pathname.absolutePath;
string pathnameStr = pathname.array; const offset = (pathnameStr.length - pathname.length);
_pathPrefix = pathnameStr[0 .. offset];
} }
}
else
{
import std.algorithm.searching : count;
import std.array : array;
import std.path : asAbsolutePath;
import std.utf : byChar;
string pathnameStr = pathname.asAbsolutePath.array;
const pathnameCount = pathname.byChar.count;
const offset = (pathnameStr.length - pathnameCount);
_pathPrefix = pathnameStr[0 .. offset];
}
if (stepIn(pathnameStr)) if (stepIn(pathnameStr))
{ {
if (_mode == SpanMode.depth) if (_mode == SpanMode.depth)
@ -5105,6 +5127,15 @@ auto dirEntries(bool useDIP1000 = dip1000Enabled)
// https://issues.dlang.org/show_bug.cgi?id=15146 // https://issues.dlang.org/show_bug.cgi?id=15146
dirEntries("", SpanMode.shallow).walkLength(); dirEntries("", SpanMode.shallow).walkLength();
// https://github.com/dlang/phobos/issues/9584
string cwd = getcwd();
foreach (string entry; dirEntries(testdir, SpanMode.shallow))
{
if (entry.isDir)
chdir(entry);
}
chdir(cwd); // needed for the directories to be removed
} }
/// Ditto /// Ditto