ntpd: default to FEATURE_NTP_AUTH=y

[oweals/busybox.git] / coreutils / cat.c

diff --git a/coreutils/cat.c b/coreutils/cat.c
index 3902545123b3c2fa970bf9400616d1894b36fcdd..fb735f994092d91961bd9dc2a388e8e40fa9fe83 100644 (file)
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -112,10 +112,10 @@ static int catv(unsigned opts, char **argv)
        int retval = EXIT_SUCCESS;
        int fd;
 #if ENABLE_FEATURE_CATN
-       unsigned lineno = 0;
-       unsigned eol_char = (opts & (CAT_OPT_n|CAT_OPT_b)) ? '\n' : 0x100;
+       bool eol_seen = (opts & (CAT_OPT_n|CAT_OPT_b));
+       unsigned eol_char = (eol_seen ? '\n' : 0x100);
        unsigned skip_num_on = (opts & CAT_OPT_b) ? '\n' : 0x100;
-       bool eol_seen = 1;
+       unsigned lineno = 0;
 #endif
 
        BUILD_BUG_ON(CAT_OPT_e != VISIBLE_ENDLINE);
@@ -168,11 +168,16 @@ static int catv(unsigned opts, char **argv)
 int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cat_main(int argc UNUSED_PARAM, char **argv)
 {
+#if ENABLE_FEATURE_CATV || ENABLE_FEATURE_CATN
        unsigned opts;
 
-       IF_FEATURE_CATV(opt_complementary = "Aetv"; /* -A == -vet */)
-       /* -u is ignored ("unbuffered") */
-       opts = getopt32(argv, IF_FEATURE_CATV("etvA") IF_FEATURE_CATN("nb") "u");
+       opts =
+#endif
+       getopt32(argv, IF_FEATURE_CATV("^")
+               /* -u is ignored ("unbuffered") */
+               IF_FEATURE_CATV("etvA")IF_FEATURE_CATN("nb")"u"
+               IF_FEATURE_CATV("\0" "Aetv" /* -A == -vet */)
+       );
        argv += optind;
 
        /* Read from stdin if there's nothing else to do. */