Skip to content

Fix for Get-Content -ReadCount 0 behavior when -TotalCount is set #10749

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
adityapatwardhan merged 2 commits into from
Oct 15, 2019
Merged

Fix for Get-Content -ReadCount 0 behavior when -TotalCount is set #10749

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
e6b22b1
Fix `-ReadCount 0` behavior
eugenesmlv Oct 9, 2019
31e5318
Change test name
eugenesmlv Oct 10, 2019
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
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ protected override void ProcessRecord()
// I am using TotalCount - countToRead so that I don't
// have to worry about overflow

if ((TotalCount > 0) && (TotalCount - countToRead < countRead))
if ((TotalCount > 0) && (countToRead == 0 || (TotalCount - countToRead < countRead)))
{
countToRead = TotalCount - countRead;
}
Expand Down
6 changes: 6 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,12 @@ baz
$expected[1] = $thirdLine
Compare-Object -ReferenceObject $expected -DifferenceObject $result | Should -BeNullOrEmpty
}
It "Should return the same number of first lines as set in -TotalCount at one time for -ReadCount 0" {
$result = Get-Content -Path $testPath -TotalCount 3 -ReadCount 0
$result.Length | Should -Be 3
$expected = $firstLine,$secondLine,$thirdLine
Compare-Object -ReferenceObject $expected -DifferenceObject $result | Should -BeNullOrEmpty
}
It "A warning should be emitted if both -AsByteStream and -Encoding are used together" {
[byte[]][char[]]"test" | Set-Content -Encoding Unicode -AsByteStream "${TESTDRIVE}\bfile.txt" -WarningVariable contentWarning *> $null
$contentWarning.Message | Should -Match "-AsByteStream"
Expand Down