RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-03 22:47:46 +00:00
Code Issues Activity

Fix busybox seq formatting test

Browse source
This commit is contained in:
Nick Herman 2015-12-26 16:23:06 +03:00
parent c7c7d36802
commit 5958354b01
1 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/seq/seq.rs
View file

@ -196,6 +196,9 @@ pub fn uumain(args: Vec<String>) -> i32 {
Err(s) => { show_error!("{}", s); return 1; } Err(s) => { show_error!("{}", s); return 1; }
} }
}; };
if largest_dec > 0 {
largest_dec -= 1;
}
let separator = escape_sequences(&options.separator[..]); let separator = escape_sequences(&options.separator[..]);
let terminator = match options.terminator { let terminator = match options.terminator {
Some(term) => escape_sequences(&term[..]), 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 i = 0isize;
let mut value = first + i as f64 * step; let mut value = first + i as f64 * step;
while !done_printing(value, step, last) { while !done_printing(value, step, last) {
let istr = value.to_string(); let istr = format!("{:.*}", largest_dec, value);
let ilen = istr.len(); let ilen = istr.len();
let before_dec = istr.find('.').unwrap_or(ilen); let before_dec = istr.find('.').unwrap_or(ilen);
if pad && before_dec < padding { 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); 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; i += 1;
value = first + i as f64 * step; value = first + i as f64 * step;
if !done_printing(value, step, last) { if !done_printing(value, step, last) {