Skip to content

Enable Get-ChildItem to produce Mode property even if cannot determine if hardlink #7355

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 2 commits into from
Jul 26, 2018
Merged

Enable Get-ChildItem to produce Mode property even if cannot determine if hardlink #7355

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
5943c51
IsHardLink() check fails on some files which causes the Mode property…
Jul 25, 2018
4e00644
address Ilya's feedback
Jul 25, 2018
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
14 changes: 1 addition & 13 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 @@ -8135,19 +8135,7 @@ internal static bool WinIsHardLink(ref IntPtr handle)
{
BY_HANDLE_FILE_INFORMATION handleInfo;
bool succeeded = InternalSymbolicLinkLinkCodeMethods.GetFileInformationByHandle(handle, out handleInfo);

if (!succeeded)
{
int lastError = Marshal.GetLastWin32Error();
throw new Win32Exception(lastError);
}

if (handleInfo.NumberOfLinks > 1)
{
return true;
}

return false;
return succeeded && (handleInfo.NumberOfLinks > 1);
}

private static string InternalGetTarget(SafeFileHandle handle)
Expand Down
16 changes: 10 additions & 6 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 @@ -76,14 +76,22 @@ Describe "Get-ChildItem" -Tags "CI" {
Pop-Location
}

It "Should have a the proper fields and be populated" {
It "Should have all the proper fields and be populated" {
$var = Get-Childitem .

$var.Name.Length | Should -BeGreaterThan 0
$var.Mode.Length | Should -BeGreaterThan 0
$var.LastWriteTime | Should -BeGreaterThan 0
$var.Length.Length | Should -BeGreaterThan 0
}

It "Should have mode property populated for protected files on Windows" -Skip:(!$IsWindows) {
$files = Get-Childitem -Force ~\NT*
$files.Count | Should -BeGreaterThan 0
foreach ($file in $files)
{
$file.Mode | Should -Not -BeNullOrEmpty
}
}

It "Should list files in sorted order" {
Expand Down Expand Up @@ -153,11 +161,7 @@ Describe "Get-ChildItem" -Tags "CI" {
(Get-ChildItem -Path $searchRoot -Directory -Recurse).Count | Should -Be 1
}

It "Should give .sys file if the fullpath is specified with hidden and force parameter" -Pending:$true {
# Enable the test after move to .Net Core 2.1.1
# The tracking issue https://github.com/dotnet/corefx/issues/29782
#
#It "Should give .sys file if the fullpath is specified with hidden and force parameter" -Skip:(!$IsWindows){
It "Should give .sys file if the fullpath is specified with hidden and force parameter" -Skip:(!$IsWindows) {
# Don't remove!!! It is special test for hidden and opened file with exclusive lock.
$file = Get-ChildItem -path "$env:SystemDrive\\pagefile.sys" -Hidden
$file | Should not be $null
Expand Down