From 490b4ea692ef0683a7307c183ecbcc7d9b3ca159 Mon Sep 17 00:00:00 2001 From: devttys0 <heffnercj@gmail.com> Date: Sun, 22 Dec 2013 08:40:01 -0500 Subject: [PATCH] Fixed enable module bugs. --- src/binwalk/modules/binvis.py | 1 + src/binwalk/modules/extractor.py | 1 - src/binwalk/modules/hexdiff.py | 10 ++++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/binwalk/modules/binvis.py b/src/binwalk/modules/binvis.py index 6b6457c..594befe 100644 --- a/src/binwalk/modules/binvis.py +++ b/src/binwalk/modules/binvis.py @@ -38,6 +38,7 @@ class Plotter(Module): Kwarg(name='axis', default=3), Kwarg(name='max_points', default=0), Kwarg(name='show_grids', default=False), + Kwarg(name='enabled', default=False), ] # There isn't really any useful data to print to console. Disable header and result output. diff --git a/src/binwalk/modules/extractor.py b/src/binwalk/modules/extractor.py index 3f9b702..c65bbee 100644 --- a/src/binwalk/modules/extractor.py +++ b/src/binwalk/modules/extractor.py @@ -94,7 +94,6 @@ class Extractor(Module): except KeyboardInterrupt as e: pass except Exception as e: - print e return if not r.size: diff --git a/src/binwalk/modules/hexdiff.py b/src/binwalk/modules/hexdiff.py index 7989199..95ff300 100644 --- a/src/binwalk/modules/hexdiff.py +++ b/src/binwalk/modules/hexdiff.py @@ -52,6 +52,7 @@ class HexDiff(Module): Kwarg(name='show_blue', default=True), Kwarg(name='show_green', default=True), Kwarg(name='terse', default=False), + Kwarg(name='enabled', default=False), ] HEADER_FORMAT = "\n%s\n" @@ -154,10 +155,11 @@ class HexDiff(Module): if offset < 0: size = offset * -1 - if common.BlockFile.READ_BLOCK_SIZE < block: - read_block_size = block - else: - read_block_size = common.BlockFile.READ_BLOCK_SIZE + #if common.BlockFile.READ_BLOCK_SIZE < block: + # read_block_size = block + #else: + # read_block_size = common.BlockFile.READ_BLOCK_SIZE + read_block_size = common.BlockFile.DEFAULT_BLOCK_READ_SIZE # BlockFile handles calculation of negative offsets, if one was specified offset = self.config.target_files[0].offset -- libgit2 0.26.0