traceroute: fix help text to not show -6 when traceroute6 is off

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

diff --git a/editors/cmp.c b/editors/cmp.c
index b211adf9fe2766f7c88512556e1cba2d29c38a8b..384e57c22faa1b572658459f9240ebab3ed67f67 100644 (file)
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -33,11 +33,11 @@ static const char opt_chars[] ALIGN1 = "sl";
 #define CMP_OPT_l (1<<1)
 
 int cmp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int cmp_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int cmp_main(int argc UNUSED_PARAM, char **argv)
 {
        FILE *fp1, *fp2, *outfile = stdout;
        const char *filename1, *filename2 = "-";
-       USE_DESKTOP(off_t skip1 = 0, skip2 = 0;)
+       IF_DESKTOP(off_t skip1 = 0, skip2 = 0;)
        off_t char_pos = 0;
        int line_pos = 1; /* Hopefully won't overflow... */
        const char *fmt;
@@ -48,8 +48,8 @@ int cmp_main(int argc ATTRIBUTE_UNUSED, char **argv)
        xfunc_error_retval = 2; /* 1 is returned if files are different. */
 
        opt_complementary = "-1"
-                       USE_DESKTOP(":?4")
-                       SKIP_DESKTOP(":?2")
+                       IF_DESKTOP(":?4")
+                       IF_NOT_DESKTOP(":?2")
                        ":l--s:s--l";
        opt = getopt32(argv, opt_chars);
        argv += optind;
@@ -108,7 +108,7 @@ int cmp_main(int argc ATTRIBUTE_UNUSED, char **argv)
                                outfile = stderr;
                                /* There may have been output to stdout (option -l), so
                                 * make sure we fflush before writing to stderr. */
-                               xfflush_stdout();
+                               fflush_all();
                        }
                        if (!(opt & CMP_OPT_s)) {
                                if (opt & CMP_OPT_l) {