From 42f2d4fcbc806a2d96bd078a3c4762c2e534d1a2 Mon Sep 17 00:00:00 2001 From: jpk Date: Thu, 15 Dec 2022 12:55:41 +0100 Subject: [PATCH] Remove tobin from master until finished --- src/main.rs | 20 +++++--------------- src/tobin.rs | 23 ----------------------- 2 files changed, 5 insertions(+), 38 deletions(-) delete mode 100644 src/tobin.rs diff --git a/src/main.rs b/src/main.rs index 4cfc483..2ad8b44 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,17 +6,12 @@ mod colormap; mod tohex; use tohex::hexdump; -mod tobin; -use tobin::bindump; use clap::Parser; #[derive(Parser)] #[command(version, about = "A simple hexdump tool")] struct Arguments { - /// Revert a hexdump to binary - #[arg(short, long)] - revert: bool, /// Stop after octets #[arg(short, long)] length: Option, @@ -35,15 +30,10 @@ fn main() { Box::new(File::open(filename).expect("Could not open file.")) }; - if !args.revert { - let length = if args.length.is_some() { - args.length.unwrap() - } else { - MAX - }; - hexdump(reader, length); + let length = if args.length.is_some() { + args.length.unwrap() } else { - let writer: Box = Box::new(io::stdout()); - bindump(reader, writer); - } + MAX + }; + hexdump(reader, length); } diff --git a/src/tobin.rs b/src/tobin.rs deleted file mode 100644 index f264175..0000000 --- a/src/tobin.rs +++ /dev/null @@ -1,23 +0,0 @@ -use std::{io, str::Lines}; - -fn parse_lines(lines: Lines) { - for line in lines { - let address_delimeter = line.find(": ").unwrap(); - let printable_delimeter = line.find(" ").unwrap(); - - let bytes = line.as_bytes(); - let hexdata = &bytes[(address_delimeter+2)..printable_delimeter]; - } -} - -pub fn bindump(mut reader: Box, mut writer: Box) { - let mut buffer = String::new(); - match reader.read_to_string(&mut buffer) { - Ok(_) => { - parse_lines(buffer.lines()); - } - Err(e) => { - eprintln!("revert: {}", e); - } - } -}