b32aa0c27 — BusyBox

Subject

diff: support long options

No binary (build failed)

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

(log yok)

editors/Config.in+7 -0

@@ -35,6 +35,13 @@ config DIFF
	differences between them in a form that can be given to
	the patch command.

+	config FEATURE_DIFF_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on DIFF && LONG_OPTS
+	help
+	Enable use of long options.
+
	config FEATURE_DIFF_DIR
	bool "Enable directory support"
	default y

editors/diff.c+25 -0

@@ -876,6 +876,28 @@ static void diffdir(char p[2], const char s_start)
	}
	#endif

+	#if ENABLE_FEATURE_DIFF_LONG_OPTIONS
+	static const char diff_longopts[] ALIGN1 =
+	"ignore-case\0" No_argument "i"
+	"ignore-tab-expansion\0" No_argument "E"
+	"ignore-space-change\0" No_argument "b"
+	"ignore-all-space\0" No_argument "w"
+	"ignore-blank-lines\0" No_argument "B"
+	"text\0" No_argument "a"
+	"unified\0" Required_argument "U"
+	"label\0" Required_argument "L"
+	"show-c-function\0" No_argument "p"
+	"brief\0" No_argument "q"
+	"expand-tabs\0" No_argument "t"
+	"initial-tab\0" No_argument "T"
+	"recursive\0" No_argument "r"
+	"new-file\0" No_argument "N"
+	"report-identical-files\0" No_argument "s"
+	"starting-file\0" Required_argument "S"
+	"minimal\0" No_argument "d"
+	;
+	#endif
+
	int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
	int diff_main(int argc UNUSED_PARAM, char **argv)
	{
@@ -887,6 +909,9 @@ int diff_main(int argc UNUSED_PARAM, char **argv)

	/* exactly 2 params; collect multiple -L <label>; -U N */
	opt_complementary = "=2:L::U+";
+	#if ENABLE_FEATURE_DIFF_LONG_OPTIONS
+	applet_long_options = diff_longopts;
+	#endif
	getopt32(argv, "abdiL:NqrsS:tTU:wupBE",
	&L_arg, &s_start, &opt_U_context);
	argv += optind;