Merge commit '1_23_0' into mergeTIG_1_23_0

Conflicts:
	libbb/lineedit.c

1 files changed, 7 insertions, 4 deletions

diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 29ff351a3..247fc72f4 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>
@@ -116,12 +118,13 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
         struct mtd_oob_buf oob;
         unsigned char *filebuf;
         const char *opt_s = "0", *opt_f = "-", *opt_l, *opt_bb;
-        static const char nanddump_longopts[] ALIGN1 =
-                "bb\0" Required_argument "\xff"; /* no short equivalent */
 
         if (IS_NANDDUMP) {
                 opt_complementary = "=1";
-                applet_long_options = nanddump_longopts;
+#if ENABLE_LONG_OPTS
+                applet_long_options =
+                        "bb\0" Required_argument "\xff"; /* no short equivalent */
+#endif
                 opts = getopt32(argv, "os:f:l:", &opt_s, &opt_f, &opt_l, &opt_bb);
         } else { /* nandwrite */
                 opt_complementary = "-1:?2";