[git commit] nanddump: don't show --bb in usage when disabled

Denys Vlasenko vda.linux at googlemail.com
Thu Dec 18 10:55:08 UTC 2014


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

The --bb options now depends on LONG_OPTS. Omit mentions of --bb from usage
text when LONG_OPTS is disabled.

Signed-off-by: Baruch Siach <baruch at tkos.co.il>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 miscutils/nandwrite.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index c825fc3..247fc72 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -36,16 +36,18 @@
 //usage:     "\n	-s ADDR	Start address"
 
 //usage:#define nanddump_trivial_usage
-//usage:	"[-o] [--bb=padbad|skipbad] [-s ADDR] [-l LEN] [-f FILE] MTD_DEVICE"
+//usage:	"[-o]" IF_LONG_OPTS(" [--bb=padbad|skipbad]") " [-s ADDR] [-l LEN] [-f FILE] MTD_DEVICE"
 //usage:#define nanddump_full_usage "\n\n"
 //usage:	"Dump MTD_DEVICE\n"
 //usage:     "\n	-o	Dump oob data"
 //usage:     "\n	-s ADDR	Start address"
 //usage:     "\n	-l LEN	Length"
 //usage:     "\n	-f FILE	Dump to file ('-' for stdout)"
+//usage:     IF_LONG_OPTS(
 //usage:     "\n	--bb=METHOD:"
 //usage:     "\n		skipbad: skip bad blocks"
 //usage:     "\n		padbad: substitute bad blocks by 0xff (default)"
+//usage:     )
 
 #include "libbb.h"
 #include <mtd/mtd-user.h>


More information about the busybox-cvs mailing list