emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hexdump: fix dup block comparison

Browse Source 
function                                             old     new   delta
bb_dump_dump                                        1523    1520      -3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-10-20 19:26:52 +02:00
parent dac5b83142
commit 079487b487
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libbb/dump.c
View File

@ -432,7 +432,6 @@ static unsigned char *get(priv_dumper_t *dumper)
if (dumper->pub.dump_vflag != DUP) { if (dumper->pub.dump_vflag != DUP) {
puts("*"); puts("*");
} }
return NULL;
} }
memset(dumper->get__curp + nread, 0, need); memset(dumper->get__curp + nread, 0, need);
dumper->eaddress = dumper->address + nread; dumper->eaddress = dumper->address + nread;

19
testsuite/hexdump.tests
View File

@ -15,4 +15,23 @@ testing 'hexdump -C with four NULs' \
'' \ '' \
'\0\0\0\0' '\0\0\0\0'
testing "hexdump does not think last padded block matches any full block" \
"hexdump -e '1/1 \"%02x|\"1/1 \"%02x!\\n\"'" \
"\
00|00!
*
00| !
" \
'' \
'\0\0\0\0\0\0\0\0\0\0\0'
testing "hexdump thinks last full block can match" \
"hexdump -e '1/1 \"%02x|\"1/1 \"%02x!\\n\"'" \
"\
00|00!
*
" \
'' \
'\0\0\0\0\0\0\0\0\0\0\0\0'
exit $FAILCOUNT exit $FAILCOUNT