[git commit] od: another fix for --strings

Denys Vlasenko vda.linux at googlemail.com
Sat May 21 16:47:51 UTC 2011


commit: http://git.busybox.net/busybox/commit/?id=d373355bf82d90b42f37bd25a3e0d73710138ee4
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
od_main                                             2139    2147      +8

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 coreutils/od_bloaty.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 8ed8f0b..bd6c753 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -1183,12 +1183,15 @@ int od_main(int argc UNUSED_PARAM, char **argv)
 		"read-bytes\0"        Required_argument "N"
 		"format\0"            Required_argument "t"
 		"output-duplicates\0" No_argument       "v"
+		/* Yes, it's true: -S NUM, but --strings[=NUM]!
+		 * that is, NUM is mandatory for -S but optional for --strings!
+		 */
 		"strings\0"           Optional_argument "S"
 		"width\0"             Optional_argument "w"
 		"traditional\0"       No_argument       "\xff"
 		;
 #endif
-	char *str_A, *str_N, *str_j, *str_S;
+	const char *str_A, *str_N, *str_j, *str_S = "3";
 	llist_t *lst_t = NULL;
 	unsigned opt;
 	int l_c_m;
-- 
1.7.3.4



More information about the busybox-cvs mailing list