From ec947323528725fcf12b5b9ba32b02d36dbd9621 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 30 Jun 2022 21:09:39 +0100 Subject: [PATCH] dump: Visually separate columns 0-7 and 8-15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before: 0000090000: 68 65 72 65 20 77 65 20 61 72 65 00 68 65 72 65 │... 0000090010: 20 77 65 20 61 72 65 00 68 65 72 65 20 77 65 20 │... 0000090020: 61 72 65 00 68 65 72 65 20 77 65 20 61 72 65 00 │... After: 0000090000: 68 65 72 65 20 77 65 20 61 72 65 00 68 65 72 65 │... 0000090010: 20 77 65 20 61 72 65 00 68 65 72 65 20 77 65 20 │... 0000090020: 61 72 65 00 68 65 72 65 20 77 65 20 61 72 65 00 │... Updates: commit c4107b9a40d6451630dcccf1bf6596c8e56420be (cherry picked from commit 315a637d3eae003c1d84eb1b88a7b47b534f1e80) --- dump/dump-data.sh | 22 +++++++++++----------- dump/dump-empty-qcow2.sh | 4 ++-- dump/dump-pattern.sh | 38 +++++++++++++++++++------------------- dump/dump.c | 5 ++++- 4 files changed, 36 insertions(+), 33 deletions(-) diff --git a/dump/dump-data.sh b/dump/dump-data.sh index 23d09da..955cd3b 100755 --- a/dump/dump-data.sh +++ b/dump/dump-data.sh @@ -37,21 +37,21 @@ nbdkit -U - data data=' cat $output -if [ "$(cat $output)" != '0000000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +if [ "$(cat $output)" != '0000000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * -0000008000: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -0000008010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +0000008000: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +0000008010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * -000000fff0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 68 |...............h| -0000010000: 65 6c 6c 6f 2c 20 77 6f 72 6c 64 21 00 00 00 00 |ello, world!....| -0000010010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +000000fff0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 68 |...............h| +0000010000: 65 6c 6c 6f 2c 20 77 6f 72 6c 64 21 00 00 00 00 |ello, world!....| +0000010010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * -00010ffff0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 73 70 |..............sp| -0001100000: 61 6e 6e 69 6e 67 20 62 75 66 66 65 72 20 62 6f |anning buffer bo| -0001100010: 75 6e 64 61 72 79 00 00 00 00 00 00 00 00 00 00 |undary..........| -0001100020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +00010ffff0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 73 70 |..............sp| +0001100000: 61 6e 6e 69 6e 67 20 62 75 66 66 65 72 20 62 6f |anning buffer bo| +0001100010: 75 6e 64 61 72 79 00 00 00 00 00 00 00 00 00 00 |undary..........| +0001100020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * -0001312d00: 00 |. |' ]; then +0001312d00: 00 |. |' ]; then echo "$0: unexpected output from nbddump command" exit 1 fi diff --git a/dump/dump-empty-qcow2.sh b/dump/dump-empty-qcow2.sh index c9e583b..472b6eb 100755 --- a/dump/dump-empty-qcow2.sh +++ b/dump/dump-empty-qcow2.sh @@ -38,9 +38,9 @@ qemu-img create -f qcow2 $file $size nbddump -- [ $QEMU_NBD -r -f qcow2 $file ] > $output cat $output -if [ "$(cat $output)" != '0000000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +if [ "$(cat $output)" != '0000000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * -003ffffff0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|' ]; then +003ffffff0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|' ]; then echo "$0: unexpected output from nbddump command" exit 1 fi diff --git a/dump/dump-pattern.sh b/dump/dump-pattern.sh index e4016a8..d512b77 100755 --- a/dump/dump-pattern.sh +++ b/dump/dump-pattern.sh @@ -32,25 +32,25 @@ nbdkit -U - pattern size=299 --run 'nbddump "$uri"' > $output cat $output -if [ "$(cat $output)" != '0000000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 |................| -0000000010: 00 00 00 00 00 00 00 10 00 00 00 00 00 00 00 18 |................| -0000000020: 00 00 00 00 00 00 00 20 00 00 00 00 00 00 00 28 |....... .......(| -0000000030: 00 00 00 00 00 00 00 30 00 00 00 00 00 00 00 38 |.......0.......8| -0000000040: 00 00 00 00 00 00 00 40 00 00 00 00 00 00 00 48 |.......@.......H| -0000000050: 00 00 00 00 00 00 00 50 00 00 00 00 00 00 00 58 |.......P.......X| -0000000060: 00 00 00 00 00 00 00 60 00 00 00 00 00 00 00 68 |.......`.......h| -0000000070: 00 00 00 00 00 00 00 70 00 00 00 00 00 00 00 78 |.......p.......x| -0000000080: 00 00 00 00 00 00 00 80 00 00 00 00 00 00 00 88 |................| -0000000090: 00 00 00 00 00 00 00 90 00 00 00 00 00 00 00 98 |................| -00000000a0: 00 00 00 00 00 00 00 a0 00 00 00 00 00 00 00 a8 |................| -00000000b0: 00 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 b8 |................| -00000000c0: 00 00 00 00 00 00 00 c0 00 00 00 00 00 00 00 c8 |................| -00000000d0: 00 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 d8 |................| -00000000e0: 00 00 00 00 00 00 00 e0 00 00 00 00 00 00 00 e8 |................| -00000000f0: 00 00 00 00 00 00 00 f0 00 00 00 00 00 00 00 f8 |................| -0000000100: 00 00 00 00 00 00 01 00 00 00 00 00 00 00 01 08 |................| -0000000110: 00 00 00 00 00 00 01 10 00 00 00 00 00 00 01 18 |................| -0000000120: 00 00 00 00 00 00 01 20 00 00 00 |....... ... |' ]; then +if [ "$(cat $output)" != '0000000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 |................| +0000000010: 00 00 00 00 00 00 00 10 00 00 00 00 00 00 00 18 |................| +0000000020: 00 00 00 00 00 00 00 20 00 00 00 00 00 00 00 28 |....... .......(| +0000000030: 00 00 00 00 00 00 00 30 00 00 00 00 00 00 00 38 |.......0.......8| +0000000040: 00 00 00 00 00 00 00 40 00 00 00 00 00 00 00 48 |.......@.......H| +0000000050: 00 00 00 00 00 00 00 50 00 00 00 00 00 00 00 58 |.......P.......X| +0000000060: 00 00 00 00 00 00 00 60 00 00 00 00 00 00 00 68 |.......`.......h| +0000000070: 00 00 00 00 00 00 00 70 00 00 00 00 00 00 00 78 |.......p.......x| +0000000080: 00 00 00 00 00 00 00 80 00 00 00 00 00 00 00 88 |................| +0000000090: 00 00 00 00 00 00 00 90 00 00 00 00 00 00 00 98 |................| +00000000a0: 00 00 00 00 00 00 00 a0 00 00 00 00 00 00 00 a8 |................| +00000000b0: 00 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 b8 |................| +00000000c0: 00 00 00 00 00 00 00 c0 00 00 00 00 00 00 00 c8 |................| +00000000d0: 00 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 d8 |................| +00000000e0: 00 00 00 00 00 00 00 e0 00 00 00 00 00 00 00 e8 |................| +00000000f0: 00 00 00 00 00 00 00 f0 00 00 00 00 00 00 00 f8 |................| +0000000100: 00 00 00 00 00 00 01 00 00 00 00 00 00 00 01 08 |................| +0000000110: 00 00 00 00 00 00 01 10 00 00 00 00 00 00 01 18 |................| +0000000120: 00 00 00 00 00 00 01 20 00 00 00 |....... ... |' ]; then echo "$0: unexpected output from nbddump command" exit 1 fi diff --git a/dump/dump.c b/dump/dump.c index 76af04c..7818f1f 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -429,10 +429,13 @@ do_dump (void) else ansi_grey (); printf ("%02x ", buffer[j]); + if ((j - i) == 7) printf (" "); } ansi_grey (); - for (; j < i+16; ++j) + for (; j < i+16; ++j) { printf (" "); + if ((j - i) == 7) printf (" "); + } /* Print the ASCII codes. */ printf ("%s", pipe); -- 2.31.1