From 5958354b013f5bef58909137a0911550c357dba2 Mon Sep 17 00:00:00 2001 From: Nick Herman Date: Sat, 26 Dec 2015 16:23:06 +0300 Subject: [PATCH] Fix busybox seq formatting test --- src/seq/seq.rs | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/seq/seq.rs b/src/seq/seq.rs index e1a731591..2b97b3d83 100644 --- a/src/seq/seq.rs +++ b/src/seq/seq.rs @@ -196,6 +196,9 @@ pub fn uumain(args: Vec) -> i32 { Err(s) => { show_error!("{}", s); return 1; } } }; + if largest_dec > 0 { + largest_dec -= 1; + } let separator = escape_sequences(&options.separator[..]); let terminator = match options.terminator { Some(term) => escape_sequences(&term[..]), @@ -219,7 +222,7 @@ fn print_seq(first: f64, step: f64, last: f64, largest_dec: usize, separator: St let mut i = 0isize; let mut value = first + i as f64 * step; while !done_printing(value, step, last) { - let istr = value.to_string(); + let istr = format!("{:.*}", largest_dec, value); let ilen = istr.len(); let before_dec = istr.find('.').unwrap_or(ilen); if pad && before_dec < padding { @@ -230,20 +233,6 @@ fn print_seq(first: f64, step: f64, last: f64, largest_dec: usize, separator: St } } pipe_print!("{}", istr); - let mut idec = ilen - before_dec; - if idec < largest_dec { - if idec == 0 { - if !pipe_print!(".") { - return; - } - idec += 1; - } - for _ in idec..largest_dec { - if !pipe_print!("0") { - return; - } - } - } i += 1; value = first + i as f64 * step; if !done_printing(value, step, last) {