RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 20:17:45 +00:00
Code Issues Activity

Merge pull request #3129 from jfinkels/dd-partial-records

Browse source 
dd: correctly account for partial record written
This commit is contained in:
Terts Diepraam 2022-02-13 12:52:09 +01:00 • committed by GitHub
commit 85c4fb3981
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/uu/dd/src/dd.rs
View file

@ -334,16 +334,13 @@ where
let mut bytes_total = 0; let mut bytes_total = 0;
for chunk in buf.chunks(self.obs) { for chunk in buf.chunks(self.obs) {
match self.write(chunk)? { let wlen = self.write(chunk)?;
wlen if wlen < chunk.len() => { if wlen < self.obs {
writes_partial += 1; writes_partial += 1;
bytes_total += wlen; } else {
} writes_complete += 1;
wlen => {
writes_complete += 1;
bytes_total += wlen;
}
} }
bytes_total += wlen;
} }
Ok(WriteStat { Ok(WriteStat {

10
tests/by-util/test_dd.rs
View file

@ -692,5 +692,15 @@ fn test_seek_do_not_overwrite() {
assert_eq!(at.read("outfile"), "a2"); assert_eq!(at.read("outfile"), "a2");
} }
#[test]
fn test_partial_records_out() {
new_ucmd!()
.args(&["bs=2", "status=noxfer"])
.pipe_in("abc")
.succeeds()
.stdout_is("abc")
.stderr_is("1+1 records in\n1+1 records out\n");
}
// conv=[ascii,ebcdic,ibm], conv=[ucase,lcase], conv=[block,unblock], conv=sync // conv=[ascii,ebcdic,ibm], conv=[ucase,lcase], conv=[block,unblock], conv=sync
// TODO: Move conv tests from unit test module // TODO: Move conv tests from unit test module