[PATCH] nandwrite: fix build when long options are disabled

Baruch Siach baruch at tkos.co.il
Thu Aug 7 17:09:57 UTC 2014


The Required_argument macro is only defined when long options are enabled.
Fixes the following build error:

miscutils/nandwrite.c: In function 'nandwrite_main':
miscutils/nandwrite.c:120:10: error: expected ',' or ';' before 'Required_argument'

Reported-by: Christian Kästner <kaestner at cs.cmu.edu>
Signed-off-by: Baruch Siach <baruch at tkos.co.il>
---
 miscutils/nandwrite.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 29ff351a3e7d..c825fc31519d 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -116,12 +116,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";
-- 
2.0.1



More information about the busybox mailing list