ntpd: default to FEATURE_NTP_AUTH=y

[oweals/busybox.git] / editors / diff.c

diff --git a/editors/diff.c b/editors/diff.c
index d90ac8f941449feafd350835decee018cc8ab5a4..1462a9b18656372cd102882641a93a6666273e57 100644 (file)
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -12,7 +12,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 /*
  * The following code uses an algorithm due to Harold Stone,
  * which finds a pair of longest identical subsequences in
@@ -75,7 +74,6 @@
  * 3*(number of k-candidates installed), typically about
  * 6n words for files of length n.
  */
-
 //config:config DIFF
 //config:      bool "diff (13 kb)"
 //config:      default y
@@ -97,10 +95,10 @@
 //config:      This option enables support for directory and subdirectory
 //config:      comparison.
 
-//kbuild:lib-$(CONFIG_DIFF) += diff.o
-
 //applet:IF_DIFF(APPLET(diff, BB_DIR_USR_BIN, BB_SUID_DROP))
 
+//kbuild:lib-$(CONFIG_DIFF) += diff.o
+
 //usage:#define diff_trivial_usage
 //usage:       "[-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
 //usage:#define diff_full_usage "\n\n"
@@ -984,8 +982,8 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
        INIT_G();
 
        /* exactly 2 params; collect multiple -L <label>; -U N */
-       opt_complementary = "=2";
-       GETOPT32(argv, "abdiL:*NqrsS:tTU:+wupBE" LONGOPTS,
+       GETOPT32(argv, "^" "abdiL:*NqrsS:tTU:+wupBE" "\0" "=2"
+                       LONGOPTS,
                        &L_arg, &s_start, &opt_U_context);
        argv += optind;
        while (L_arg)