From b7925465a811c27c49335f71074f6648f0de44ad Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 5 Dec 2022 22:49:48 +0100 Subject: [PATCH] factor: trim the input to fix some busybox results --- src/uu/factor/src/cli.rs | 16 ++++++++++------ tests/by-util/test_factor.rs | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/uu/factor/src/cli.rs b/src/uu/factor/src/cli.rs index 51e52fac8..0b50599ae 100644 --- a/src/uu/factor/src/cli.rs +++ b/src/uu/factor/src/cli.rs @@ -35,12 +35,16 @@ fn print_factors_str( w: &mut io::BufWriter, factors_buffer: &mut String, ) -> Result<(), Box> { - num_str.parse::().map_err(|e| e.into()).and_then(|x| { - factors_buffer.clear(); - writeln!(factors_buffer, "{}:{}", x, factor(x))?; - w.write_all(factors_buffer.as_bytes())?; - Ok(()) - }) + num_str + .trim() + .parse::() + .map_err(|e| e.into()) + .and_then(|x| { + factors_buffer.clear(); + writeln!(factors_buffer, "{}:{}", x, factor(x))?; + w.write_all(factors_buffer.as_bytes())?; + Ok(()) + }) } #[uucore::main] diff --git a/tests/by-util/test_factor.rs b/tests/by-util/test_factor.rs index a4f38dbac..f84a86aa9 100644 --- a/tests/by-util/test_factor.rs +++ b/tests/by-util/test_factor.rs @@ -108,10 +108,10 @@ fn test_cli_args() { new_ucmd!().args(&["3"]).succeeds().stdout_contains("3: 3"); new_ucmd!() - .args(&["3", "6"]) + .args(&["3", "6", " +9"]) .succeeds() .stdout_contains("3: 3") - .stdout_contains("6: 2 3"); + .stdout_contains("9: 3 3"); } #[test]