[git commit] xxd: make -p output lines actually end with a newline

Denys Vlasenko vda.linux at googlemail.com
Wed Jan 25 16:00:38 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=7dd906a3884a31458d30fc43eb9885c5adf4bbea
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 util-linux/hexdump_xxd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/util-linux/hexdump_xxd.c b/util-linux/hexdump_xxd.c
index cc34ea6..be4b4f3 100644
--- a/util-linux/hexdump_xxd.c
+++ b/util-linux/hexdump_xxd.c
@@ -129,7 +129,7 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
 		}
 		// for -g3, this results in B B BS B B BS... B = "xxxxxx xxxxxx .....xx"
 		// todo: can be more clever and use
-		// one "cols-1/B" format instead of many "B B B..." formats
+		// one 'bytes-1/1 "%02x"' format instead of many "B B B..." formats
 		//bb_error_msg("ADDED:'%s'", bigbuf);
 		bb_dump_add(dumper, bigbuf);
 		free(bigbuf);
@@ -138,6 +138,8 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
 	if (!(opt & OPT_p)) {
 		sprintf(buf, "\"  \"%u/1 \"%%_p\"\"\n\"", cols); // "  ASCII\n"
 		bb_dump_add(dumper, buf);
+	} else {
+		bb_dump_add(dumper, "\"\n\"");
 	}
 
 	return bb_dump_dump(dumper, argv);


More information about the busybox-cvs mailing list