Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 17:58:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3128 from jfinkels/dd-zero-multiplier-regression

Browse source 
dd: remove spurious zero multiplier warning
This commit is contained in:
Terts Diepraam 2022-02-19 01:37:33 +01:00 committed by GitHub
commit 4719717e33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/uu/dd/src/parseargs.rs
View file

@ -325,6 +325,14 @@ impl std::str::FromStr for StatusLevel {
} }
} }
fn show_zero_multiplier_warning() {
show_warning!(
"{} is a zero multiplier; use {} if that is intended",
"0x".quote(),
"00x".quote()
);
}
/// Parse bytes using str::parse, then map error if needed. /// Parse bytes using str::parse, then map error if needed.
fn parse_bytes_only(s: &str) -> Result<usize, ParseError> { fn parse_bytes_only(s: &str) -> Result<usize, ParseError> {
s.parse() s.parse()
@ -357,13 +365,6 @@ fn parse_bytes_only(s: &str) -> Result<usize, ParseError> {
/// assert_eq!(parse_bytes_no_x("2k").unwrap(), 2 * 1024); /// assert_eq!(parse_bytes_no_x("2k").unwrap(), 2 * 1024);
/// ``` /// ```
fn parse_bytes_no_x(s: &str) -> Result<usize, ParseError> { fn parse_bytes_no_x(s: &str) -> Result<usize, ParseError> {
if s == "0" {
show_warning!(
"{} is a zero multiplier; use {} if that is intended",
"0x".quote(),
"00x".quote()
);
}
let (num, multiplier) = match (s.find('c'), s.rfind('w'), s.rfind('b')) { let (num, multiplier) = match (s.find('c'), s.rfind('w'), s.rfind('b')) {
(None, None, None) => match uucore::parse_size::parse_size(s) { (None, None, None) => match uucore::parse_size::parse_size(s) {
Ok(n) => (n, 1), Ok(n) => (n, 1),
@ -401,13 +402,20 @@ fn parse_bytes_with_opt_multiplier(s: &str) -> Result<usize, ParseError> {
// Split on the 'x' characters. Each component will be parsed // Split on the 'x' characters. Each component will be parsed
// individually, then multiplied together. // individually, then multiplied together.
let mut total = 1; let parts: Vec<&str> = s.split('x').collect();
for part in s.split('x') { if parts.len() == 1 {
let num = parse_bytes_no_x(part).map_err(|e| e.with_arg(s.to_string()))?; parse_bytes_no_x(parts[0]).map_err(|e| e.with_arg(s.to_string()))
total *= num; } else {
let mut total = 1;
for part in parts {
if part == "0" {
show_zero_multiplier_warning();
}
let num = parse_bytes_no_x(part).map_err(|e| e.with_arg(s.to_string()))?;
total *= num;
}
Ok(total)
} }
Ok(total)
} }
pub fn parse_ibs(matches: &Matches) -> Result<usize, ParseError> { pub fn parse_ibs(matches: &Matches) -> Result<usize, ParseError> {

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

@ -201,6 +201,13 @@ fn test_x_multiplier() {
#[test] #[test]
fn test_zero_multiplier_warning() { fn test_zero_multiplier_warning() {
for arg in ["count", "seek", "skip"] { for arg in ["count", "seek", "skip"] {
new_ucmd!()
.args(&[format!("{}=0", arg).as_str(), "status=none"])
.pipe_in("")
.succeeds()
.no_stdout()
.no_stderr();
new_ucmd!() new_ucmd!()
.args(&[format!("{}=00x1", arg).as_str(), "status=none"]) .args(&[format!("{}=00x1", arg).as_str(), "status=none"])
.pipe_in("") .pipe_in("")
@ -1063,3 +1070,12 @@ fn test_all_valid_ascii_ebcdic_ascii_roundtrip_conv_test() {
.succeeds() .succeeds()
.stdout_is_fixture_bytes("all-valid-ascii-chars-37eff01866ba3f538421b30b7cbefcac.test"); .stdout_is_fixture_bytes("all-valid-ascii-chars-37eff01866ba3f538421b30b7cbefcac.test");
} }
#[test]
fn test_skip_zero() {
new_ucmd!()
.args(&["skip=0", "status=noxfer"])
.succeeds()
.no_stdout()
.stderr_is("0+0 records in\n0+0 records out\n");
}