summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-05-21 16:47:51 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2011-05-21 16:47:51 (GMT)
commitd373355bf82d90b42f37bd25a3e0d73710138ee4 (patch)
tree5c76b9b88053bdec3df360e251835b1704ab305a
parent9d96e274ce1fac0e82d850075acc87cd5e97fc39 (diff)
downloadbusybox-d373355bf82d90b42f37bd25a3e0d73710138ee4.tar.gz
busybox-d373355bf82d90b42f37bd25a3e0d73710138ee4.tar.bz2
od: another fix for --strings
function old new delta od_main 2139 2147 +8 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/od_bloaty.c5
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;