Skip to content

Change Get-ChildItem to treat trailing slash in path as indicating a directory when used with -Recurse #17704

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
iSazonov merged 3 commits into from
Jul 21, 2022
Merged

Change Get-ChildItem to treat trailing slash in path as indicating a directory when used with -Recurse #17704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9fe613
Change `Get-ChildItem` to treat trailing slash in path as indicating …
SteveL-MSFT Jul 18, 2022
dc853f6
Update src/System.Management.Automation/engine/SessionStateContainer.cs
SteveL-MSFT Jul 19, 2022
470cdb2
address Ilya's feedback removing 2 lines that don't work as expected
SteveL-MSFT Jul 20, 2022
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
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/SessionStateContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1324,8 +1324,8 @@ internal void GetChildItems(
try
{
// If we're recursing, do some path fixups to match user
// expectations:
if (recurse)
// expectations, but only if the last part is a file and not a directory:
if (recurse && !path.EndsWith(Path.DirectorySeparatorChar) && !path.EndsWith(Path.AltDirectorySeparatorChar))
{
string childName = GetChildName(path, context);

Expand Down
11 changes: 8 additions & 3 deletions src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,13 +1373,18 @@ private FileSystemInfo GetFileSystemItem(string path, ref bool isContainer, bool
path = NormalizePath(path);
FileInfo result = new FileInfo(path);

// FileInfo.Exists is always false for a directory path, so we check the attribute for existence.
var attributes = result.Attributes;
if ((int)attributes == -1) { /* Path doesn't exist. */ return null; }

bool hidden = attributes.HasFlag(FileAttributes.Hidden);
isContainer = attributes.HasFlag(FileAttributes.Directory);

// FileInfo allows for a file path to end in a trailing slash, but the resulting object
// is incomplete. A trailing slash should indicate a directory. So if the path ends in a
// trailing slash and is not a directory, return null
if (!isContainer && path.EndsWith(Path.DirectorySeparatorChar))
{
return null;
}

FlagsExpression<FileAttributes> evaluator = null;
FlagsExpression<FileAttributes> switchEvaluator = null;
GetChildDynamicParameters fspDynamicParam = DynamicParameters as GetChildDynamicParameters;
Expand Down
11 changes: 11 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,17 @@ Describe "Get-ChildItem" -Tags "CI" {
It "Should list the folder present when path length equal to MAX_PATH" {
(Get-ChildItem -Path TestDrive:\$item_I -Recurse -Force).Name.Length | Should -BeGreaterThan 0
}

It 'Trailing slash for -Path should treat it as a folder only when used with -recurse' {
$foo = New-Item -ItemType Directory -Path TestDrive:\foo
$foo2 = New-Item -ItemType Directory -Path TestDrive:\foo\foo
$bar = New-Item -ItemType File -Path TestDrive:\foo\bar
$bar2 = New-Item -ItemType File -Path TestDrive:\foo\foo\bar

{ Get-ChildItem -Path testdrive:/foo/bar/ -Recurse -ErrorAction Stop } | Should -Throw -ErrorId 'ItemNotFound,Microsoft.PowerShell.Commands.GetChildItemCommand'
$barFiles = Get-ChildItem -Path testdrive:/foo/bar -Recurse
$barFiles.Count | Should -Be 2
}
}

Context 'Env: Provider' {
Expand Down