Commit a2accbb7 by devttys0

Minor code formatting and comments

parent 9aae0758
...@@ -22,7 +22,10 @@ def display_status(m): ...@@ -22,7 +22,10 @@ def display_status(m):
while True: while True:
try: try:
user_input() user_input()
sys.stderr.write("Progress: %.2f%% (%d / %d)\n\n" % (((float(m.status.completed) / float(m.status.total)) * 100), m.status.completed, m.status.total)) percentage = ((float(m.status.completed) / float(m.status.total)) * 100)
sys.stderr.write("Progress: %.2f%% (%d / %d)\n\n" % (percentage,
m.status.completed,
m.status.total))
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception: except Exception:
...@@ -43,6 +46,8 @@ def main(): ...@@ -43,6 +46,8 @@ def main():
try: try:
if len(sys.argv) == 1: if len(sys.argv) == 1:
usage(modules) usage(modules)
# If no explicit module was enabled in the command line arguments,
# run again with the default signature scan explicitly enabled.
elif not modules.execute(): elif not modules.execute():
modules.execute(*sys.argv[1:], signature=True) modules.execute(*sys.argv[1:], signature=True)
except binwalk.ModuleException as e: except binwalk.ModuleException as e:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment