[git commit] Make "hd" independently selectable

Denys Vlasenko vda.linux at googlemail.com
Wed Nov 23 10:53:12 UTC 2016


commit: https://git.busybox.net/busybox/commit/?id=5b966c6180c139fba6846d632fd9bc0c34a8e1bc
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

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

diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 5e1ef69..4a7f641 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -28,7 +28,6 @@
 //config:config HD
 //config:	bool "hd"
 //config:	default y
-//config:	depends on HEXDUMP
 //config:	help
 //config:	  hd is an alias to hexdump -C.
 
@@ -106,7 +105,9 @@ int hexdump_main(int argc, char **argv)
 	smallint rdump = 0;
 #endif
 
-	if (ENABLE_HD && !applet_name[2]) { /* we are "hd" */
+	if (ENABLE_HD
+	 && (!ENABLE_HEXDUMP || !applet_name[2])
+	) { /* we are "hd" */
 		ch = 'C';
 		goto hd_applet;
 	}


More information about the busybox-cvs mailing list