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

Denys Vlasenko vda.linux at googlemail.com
Thu Dec 18 10:57:07 UTC 2014


Applied, thanks!

On Wed, Dec 17, 2014 at 11:27 PM, Baruch Siach <baruch at tkos.co.il> wrote:
> 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>
> ---
>  miscutils/nandwrite.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
> index c825fc31519d..7b9c8daf541d 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>
> --
> 2.1.3
>
> _______________________________________________
> busybox mailing list
> busybox at busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox


More information about the busybox mailing list