Fixed bug in zlib plugin; fixed bug in verbosity.

src/binwalk/core/module.py

@@ -3,6 +3,7 @@ import os
 import sys
 import inspect
 import argparse
+import traceback
 import binwalk.core.common
 import binwalk.core.config
 import binwalk.core.plugin
@@ -279,9 +280,12 @@ class Module(object):
 		self.errors.append(e)
 		
 		if e.exception:
-			sys.stderr.write(e.module.__class__.__name__ + " Exception: " + str(e.exception) + "\n")
+			sys.stderr.write("\n" + e.module.__class__.__name__ + " Exception: " + str(e.exception) + "\n")
+			sys.stderr.write("-" * self.config.display.HEADER_WIDTH + "\n")
+			traceback.print_exc(file=sys.stderr)
+			sys.stderr.write("-" * self.config.display.HEADER_WIDTH + "\n\n")
 		elif e.description:
-			sys.stderr.write(e.module.__class__.__name__ + " Error: " + e.description + "\n")
+			sys.stderr.write("\n" + e.module.__class__.__name__ + " Error: " + e.description + "\n\n")
 
 	def header(self):
 		self.config.display.format_strings(self.HEADER_FORMAT, self.RESULT_FORMAT)

src/binwalk/modules/configuration.py

@@ -54,9 +54,8 @@ class Configuration(Module):
 			   description='Supress output to stdout'),
 		Option(long='verbose',
 			   short='v',
-			   type=list,
-			   kwargs={'verbose' : True},
-			   description='Enable verbose output (specify twice for more verbosity)'),
+			   kwargs={'verbose' : 1},
+			   description='Enable verbose output'),
 		Option(short='h',
 			   long='help',
 			   kwargs={'show_help' : True},
@@ -76,7 +75,7 @@ class Configuration(Module):
 		Kwarg(name='csv', default=False),
 		Kwarg(name='format_to_terminal', default=False),
 		Kwarg(name='quiet', default=False),
-		Kwarg(name='verbose', default=[]),
+		Kwarg(name='verbose', default=0),
 		Kwarg(name='files', default=[]),
 		Kwarg(name='show_help', default=False),
 	]
@@ -84,8 +83,8 @@ class Configuration(Module):
 	def load(self):
 		self.target_files = []
 		
-		self._set_verbosity()
 		self._open_target_files()
+		self._set_verbosity()
 
 		self.settings = binwalk.core.config.Config()
 		self.display = binwalk.core.display.Display(log=self.log_file,
@@ -117,8 +116,6 @@ class Configuration(Module):
 		Sets the appropriate verbosity.
 		Must be called after self._test_target_files so that self.target_files is properly set.
 		'''
-		self.verbose = len(self.verbose)
-
 		# If more than one target file was specified, enable verbose mode; else, there is
 		# nothing in some outputs to indicate which scan corresponds to which file. 
 		if len(self.target_files) > 1 and self.verbose == 0:

src/binwalk/plugins/zlib.py → src/binwalk/plugins/zlibvalid.py

@@ -2,7 +2,7 @@ import ctypes
 import ctypes.util
 from binwalk.core.common import BlockFile
 
-class Plugin:
+class Plugin(object):
 	'''
 	Searches for and validates zlib compressed data.
 	'''