1 files changed, 11 insertions, 3 deletions

diff --git a/hexdump.py b/hexdump.py
index cbba3c9..984a19f 100644
--- a/hexdump.py
+++ b/hexdump.py
@@ -26,9 +26,17 @@ def aschr(b):
     return "."
 def asasc(line):
     return "".join(aschr(_) for _ in line)
-def hexdump(ofs, data):
-    for o in range(0, len(data), 16):
-        print("%08x: %-47s  %s" % (o+ofs, ashex(data[o:o+16]), asasc(data[o:o+16])))
+def hexdump(ofs, data, args):
+    w = args.width
+    if args.ascdump:
+        fmt = "%08x: %s"
+    else:
+        fmt = "%%08x: %%-%ds  %%s" % (3*w-1)
+    for o in range(0, len(data), w):
+        if args.ascdump:
+            print(fmt % (o+ofs, asasc(data[o:o+w])))
+        else:
+            print(fmt % (o+ofs, ashex(data[o:o+w]), asasc(data[o:o+w])))
 
 def tohex(data):
     return b2a_hex(data).decode('ascii')