diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 11:53:12 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 11:53:12 +0100 |
commit | 5b966c6180c139fba6846d632fd9bc0c34a8e1bc (patch) | |
tree | aee630dbc5b21f785be5563545c0e61595a7bacd | |
parent | dd898c9f3388fca1d7339a45150fbb7406de0971 (diff) | |
download | busybox-w32-5b966c6180c139fba6846d632fd9bc0c34a8e1bc.tar.gz busybox-w32-5b966c6180c139fba6846d632fd9bc0c34a8e1bc.tar.bz2 busybox-w32-5b966c6180c139fba6846d632fd9bc0c34a8e1bc.zip |
Make "hd" independently selectable
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | util-linux/hexdump.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c index 5e1ef6938..4a7f641db 100644 --- a/util-linux/hexdump.c +++ b/util-linux/hexdump.c | |||
@@ -28,7 +28,6 @@ | |||
28 | //config:config HD | 28 | //config:config HD |
29 | //config: bool "hd" | 29 | //config: bool "hd" |
30 | //config: default y | 30 | //config: default y |
31 | //config: depends on HEXDUMP | ||
32 | //config: help | 31 | //config: help |
33 | //config: hd is an alias to hexdump -C. | 32 | //config: hd is an alias to hexdump -C. |
34 | 33 | ||
@@ -106,7 +105,9 @@ int hexdump_main(int argc, char **argv) | |||
106 | smallint rdump = 0; | 105 | smallint rdump = 0; |
107 | #endif | 106 | #endif |
108 | 107 | ||
109 | if (ENABLE_HD && !applet_name[2]) { /* we are "hd" */ | 108 | if (ENABLE_HD |
109 | && (!ENABLE_HEXDUMP || !applet_name[2]) | ||
110 | ) { /* we are "hd" */ | ||
110 | ch = 'C'; | 111 | ch = 'C'; |
111 | goto hd_applet; | 112 | goto hd_applet; |
112 | } | 113 | } |