printer now prints sections as well

Author: noobexon1

src/error.rs

@@ -2,7 +2,7 @@
 use thiserror::Error;
 use std::io;
 
-// TODO: improve this. I need backtrace as well...
+// TODO: Make sure all is covered. backtrace required as well...
 #[derive(Error, Debug)]
 pub enum AppError {
     #[error("IO Error")]

src/main.rs

@@ -14,8 +14,6 @@ mod parser;
 mod printer;
 mod error;
 
-// TODO: add another command to print only brief of the file data (like in the beginning oof binja)
-
 /// A command-line tool written in Rust to view and explore mach-o files.
 #[derive(Parser)]
 #[command(name = "Mach_O_Rust")]

src/parser.rs

@@ -65,13 +65,12 @@ fn parse_load_commands<R: Read + Seek, E: ByteOrder>(file: &mut R, header: &Mach
         sections.push(load_command_sections);
         load_commands_strings.push(load_command_string);
 
-        // TODO: this one could be removed after we finish the parsing inline logic.
         advance_to_next_load_command(file, offset, load_command_prefix.cmdsize as u64)?;
     }
     Ok((load_commands, sections, load_commands_strings))
 }
 
-// TODO: Handle all of the warnings emitted from building. I need to sub-parse some commands...
+// TODO: Sub-parse remaining commands as seen on warning after build...
 fn parse_command<R: Read, E: ByteOrder>(file: &mut R, load_command_prefix: &LoadCommandPrefix) ->Result<LoadCommand, AppError> {
     match load_command_prefix.cmd {
         LC_SYMTAB => SymtabCommand::from_file::<R, E>(file, load_command_prefix),
@@ -108,8 +107,6 @@ fn parse_command<R: Read, E: ByteOrder>(file: &mut R, load_command_prefix: &Load
     }
 }
 
-
-// TODO: make sure this works as intentional by printing it in printer.rs or by debug...
 fn parse_sections_for_segment<R: Read + Seek, E: ByteOrder>(file: &mut R, load_command: &LoadCommand) -> Result<Vec<Section>, AppError> {
     let mut load_command_sections = Vec::new();
     match load_command {

src/printer.rs

@@ -352,7 +352,7 @@ pub fn print_load_commands(load_commands: &(Vec<LoadCommand>, Vec<Vec<Section>>,
 
 fn print_segment_command32(command: &SegmentCommand32, table: &mut Table) {
     print_lc_cmd_and_cmdsize(command.cmd, command.cmdsize, table);
-    print_segname_bytes_array(&command.segname, table);
+    print_segname_or_sectname_bytes_array(&command.segname, table);
     table.add_row(row![ Fcc->"vmaddr", Fyc->format!("0x{:x}", command.vmaddr),  c->"-"]);
     table.add_row(row![ Fcc->"vmsize", Fyc->format!("0x{:x}", command.vmsize),  c->"-"]);
     table.add_row(row![ Fcc->"fileoff", Fyc->format!("0x{:x}", command.fileoff),  c->"-"]);
@@ -365,7 +365,7 @@ fn print_segment_command32(command: &SegmentCommand32, table: &mut Table) {
 
 fn print_segment_command64(command: &SegmentCommand64, table: &mut Table) {
     print_lc_cmd_and_cmdsize(command.cmd, command.cmdsize, table);
-    print_segname_bytes_array(&command.segname, table);
+    print_segname_or_sectname_bytes_array(&command.segname, table);
     table.add_row(row![ Fcc->"vmaddr", Fyc->format!("0x{:x}", command.vmaddr),  c->"-"]);
     table.add_row(row![ Fcc->"vmsize", Fyc->format!("0x{:x}", command.vmsize),  c->"-"]);
     table.add_row(row![ Fcc->"fileoff", Fyc->format!("0x{:x}", command.fileoff),  c->"-"]);
@@ -376,7 +376,7 @@ fn print_segment_command64(command: &SegmentCommand64, table: &mut Table) {
     print_segment_flags(command.flags, table);
 }
 
-fn print_segname_bytes_array(bytes: &[u8], table: &mut Table) {
+fn print_segname_or_sectname_bytes_array(bytes: &[u8], table: &mut Table) {
     let mut result = String::from("[");
     for (index, &byte) in bytes.iter().enumerate() {
         if index % 4 == 0 && index != 0 {
@@ -455,8 +455,8 @@ fn print_sections_for_segment(sections: &Vec<Section>, table: &mut Table) {
 }
 
 fn print_section32(section: &Section32, table: &mut Table) {
-    print_segname_bytes_array(&section.sectname, table);
-    print_segname_bytes_array(&section.segname, table);
+    print_segname_or_sectname_bytes_array(&section.sectname, table);
+    print_segname_or_sectname_bytes_array(&section.segname, table);
     table.add_row(row![ Fcc->"addr", Fyc->format!("0x{:x}", section.addr),  c->"-"]);
     table.add_row(row![ Fcc->"size", Fyc->format!("0x{:x}", section.size),  c->"-"]);
     table.add_row(row![ Fcc->"offset", Fyc->format!("0x{:x}", section.offset),  c->"-"]);
@@ -469,8 +469,8 @@ fn print_section32(section: &Section32, table: &mut Table) {
 }
 
 fn print_section64(section: &Section64, table: &mut Table) {
-    print_segname_bytes_array(&section.sectname, table);
-    print_segname_bytes_array(&section.segname, table);
+    print_segname_or_sectname_bytes_array(&section.sectname, table);
+    print_segname_or_sectname_bytes_array(&section.segname, table);
     table.add_row(row![ Fcc->"addr", Fyc->format!("0x{:x}", section.addr),  c->"-"]);
     table.add_row(row![ Fcc->"size", Fyc->format!("0x{:x}", section.size),  c->"-"]);
     table.add_row(row![ Fcc->"offset", Fyc->format!("0x{:x}", section.offset),  c->"-"]);