Skip to content

Change Get-ChildItem to list the content of a link to a directory on Unix. (#1958) #3697

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
daxian-dbw merged 1 commit into from
May 5, 2017
Merged

Change Get-ChildItem to list the content of a link to a directory on Unix. (#1958) #3697

Show file tree
Hide file tree
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
8 changes: 0 additions & 8 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 @@ -1521,14 +1521,6 @@ private void GetPathItems(
if (isDirectory)
{
DirectoryInfo directory = new DirectoryInfo(path);

if (!Platform.IsWindows && Platform.NonWindowsIsSymLink(directory))
{
// For Linux, treat symlink to directories like a file
WriteItemObject(directory, path, false);
return;
}

// Enumerate the directory
Dir(directory, recurse, depth, nameOnly, returnContainers);
}
Expand Down
26 changes: 26 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,32 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
}
}

Context "Get-ChildItem and symbolic links" {
BeforeAll {
$subDir = Join-Path $TestDrive "bar"
$subLink = Join-Path $TestDrive "foo"
$subFile1 = Join-Path $subDir "File1.txt"
$subFile2 = Join-Path $subDir "File2.txt"

New-Item -ItemType Directory -Path $subDir
New-Item -ItemType File -Path $subFile1
New-Item -ItemType File -Path $subFile2

$filenamePattern = "File[12]\.txt"
}
AfterAll {
Remove-Item -Path $subLink -Force
}

It "Get-ChildItem gets content of linked-to directory" {
New-Item -ItemType SymbolicLink -Path $subLink -Value $subDir
$ci = Get-ChildItem $subLink
$ci.Count | Should BeExactly 2
$ci[0].Name | Should MatchExactly $filenamePattern
$ci[1].Name | Should MatchExactly $filenamePattern
}
}

Context "Remove-Item and hard/symbolic links" {
BeforeAll {
$testCases = @(
Expand Down