RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

dd: use read statistics for termination condition

Browse source 
Correct the behavior of `dd` so that the termination condition of the
main loop uses the number of bytes read, not the number of bytes
written, when the `count` command-line option is given in bytes
instead of blocks.
This commit is contained in:
Jeffrey Finkelstein 2023-03-17 22:41:56 -04:00 • committed by jfinkels
parent b383e60998
commit f343b7e964
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -901,7 +901,7 @@ fn dd_copy(mut i: Input, mut o: Output) -> std::io::Result<()> {
// blocks to this output. Read/write statistics are updated on // blocks to this output. Read/write statistics are updated on
// each iteration and cumulative statistics are reported to // each iteration and cumulative statistics are reported to
// the progress reporting thread. // the progress reporting thread.
while below_count_limit(&i.settings.count, &rstat, &wstat) { while below_count_limit(&i.settings.count, &rstat) {
// Read a block from the input then write the block to the output. // Read a block from the input then write the block to the output.
// //
// As an optimization, make an educated guess about the // As an optimization, make an educated guess about the
@ -1108,16 +1108,10 @@ fn calc_loop_bsize(
// Decide if the current progress is below a count=N limit or return // Decide if the current progress is below a count=N limit or return
// true if no such limit is set. // true if no such limit is set.
fn below_count_limit(count: &Option<Num>, rstat: &ReadStat, wstat: &WriteStat) -> bool { fn below_count_limit(count: &Option<Num>, rstat: &ReadStat) -> bool {
match count { match count {
Some(Num::Blocks(n)) => { Some(Num::Blocks(n)) => rstat.reads_complete + rstat.reads_partial < *n,
let n = *n; Some(Num::Bytes(n)) => rstat.bytes_total < *n,
rstat.reads_complete + rstat.reads_partial <= n
}
Some(Num::Bytes(n)) => {
let n = (*n).try_into().unwrap();
wstat.bytes_total <= n
}
None => true, None => true,
} }
} }