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

Add extra spaces to output to match formating of origial od

Browse source
This commit is contained in:
modelorganism 2016-04-25 21:47:24 -05:00
parent e0c55b65a8
commit 1fbda9663d
1 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/od/od.rs
View file

@ -61,6 +61,9 @@ pub fn uumain(args: Vec<String>) -> i32 {
0 0
} }
const LINEBYTES:usize = 16;
const WORDBYTES:usize = 2;
fn odfunc(input_offset_base: &Radix, fname: &str) { fn odfunc(input_offset_base: &Radix, fname: &str) {
let mut f = match File::open(Path::new(fname)) { let mut f = match File::open(Path::new(fname)) {
Ok(f) => f, Ok(f) => f,
@ -68,29 +71,37 @@ fn odfunc(input_offset_base: &Radix, fname: &str) {
}; };
let mut addr = 0; let mut addr = 0;
let bytes = &mut [b'\x00'; 16]; let bytes = &mut [b'\x00'; LINEBYTES];
loop { loop { // print each line
print_with_radix(input_offset_base, addr); // print offset
match f.read(bytes) { match f.read(bytes) {
Ok(0) => { Ok(0) => {
print_with_radix(input_offset_base, addr);
print!("\n"); print!("\n");
break; break;
} }
Ok(n) => { Ok(n) => {
print_with_radix(input_offset_base, addr); print!(" "); // 4 spaces after offset - we print 2 more before each word
for b in 0 .. n / mem::size_of::<u16>() { for b in 0 .. n / mem::size_of::<u16>() {
let bs = &bytes[(2 * b) .. (2 * b + 2)]; let bs = &bytes[(2 * b) .. (2 * b + 2)];
let p: u16 = (bs[1] as u16) << 8 | bs[0] as u16; let p: u16 = (bs[1] as u16) << 8 | bs[0] as u16;
print!(" {:06o}", p); print!(" {:06o}", p);
} }
if n % mem::size_of::<u16>() == 1 { if n % mem::size_of::<u16>() == 1 {
print!(" {:06o}", bytes[n - 1]); print!(" {:06o}", bytes[n - 1]);
} }
// Add extra spaces to pad out the short, presumably last, line.
if n<LINEBYTES {
// calc # of items we did not print, must be short at least WORDBYTES to be missing any.
let words_short = (LINEBYTES-n)/WORDBYTES;
print!("{:>width$}", "", width=(words_short)*(6+2));
}
print!("\n"); print!("\n");
addr += n; addr += n;
}, },
Err(_) => { Err(_) => {
print_with_radix(input_offset_base, addr);
break; break;
} }
}; };
@ -118,7 +129,7 @@ fn parse_radix(radix_str: Option<String>) -> Result<Radix, &'static str> {
} }
} }
} }
fn print_with_radix(r: &Radix, x: usize) { fn print_with_radix(r: &Radix, x: usize) {
// TODO(keunwoo): field widths should be based on sizeof(x), or chosen dynamically based on the // TODO(keunwoo): field widths should be based on sizeof(x), or chosen dynamically based on the
// expected range of address values. Binary in particular is not great here. // expected range of address values. Binary in particular is not great here.
@ -128,4 +139,4 @@ fn print_with_radix(r: &Radix, x: usize) {
Radix::Octal => print!("{:07o}", x), Radix::Octal => print!("{:07o}", x),
Radix::Binary => print!("{:07b}", x) Radix::Binary => print!("{:07b}", x)
} }
} }