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

xxd: compat tweak for -i

Browse Source 
function                                             old     new   delta
xxd_main                                             888     893      +5
.rodata                                           103669  103674      +5
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 10/0)               Total: 10 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-06-25 00:16:04 +02:00
parent 2dade4f18a
commit 294d0c85ad
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
util-linux/hexdump_xxd.c
View File

@ -186,9 +186,11 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
} else {
if (cols == 0)
cols = (opt & OPT_i) ? 12 : 16;
if (opt & OPT_i)
bytes = 1; /* -i ignores -gN */
else
if (opt & OPT_i) {
bytes = 1; // -i ignores -gN
// output is " 0xXX, 0xXX, 0xXX...", add leading space
bb_dump_add(dumper, "\" \"");
} else
bb_dump_add(dumper, "\"%08.8_ax: \""); // "address: "
}
@ -197,14 +199,15 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
}
if (bytes < 1 || bytes >= cols) {
sprintf(buf, "%u/1 \"%%02x\"", cols); // cols * "xx"
sprintf(buf, "%u/1 \"%%02x\"", cols); // cols * "XX"
bb_dump_add(dumper, buf);
}
else if (bytes == 1) {
if (opt & OPT_i)
sprintf(buf, "%u/1 \" 0x%%02x,\"", cols); // cols * " 0xxx,"
sprintf(buf, "%u/1 \" 0x%%02x,\"", cols); // cols * " 0xXX,"
//TODO: compat: omit the last comma after the very last byte
else
sprintf(buf, "%u/1 \"%%02x \"", cols); // cols * "xx "
sprintf(buf, "%u/1 \"%%02x \"", cols); // cols * "XX "
bb_dump_add(dumper, buf);
}
else {