find:: get rid of nested function (it's a gcc-ism)

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

diff --git a/editors/cmp.c b/editors/cmp.c
index e8294510a8428bae1a990ab166ae362db52a4173..fbe6b975387d7419c5e1614cc36c1dbbb3d8632c 100644 (file)
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -4,22 +4,19 @@
  *
  * Copyright (C) 2000,2001 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 (virtually) compliant -- uses nicer GNU format for -l. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cmp.html */
 
-/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
- *
- * Original version majorly reworked for SUSv3 compliance, bug fixes, and
- * size optimizations.  Changes include:
- * 1) Now correctly distinguishes between errors and actual file differences.
- * 2) Proper handling of '-' args.
- * 3) Actual error checking of i/o.
- * 4) Accept SUSv3 -l option.  Note that we use the slightly nicer gnu format
- *    in the '-l' case.
- */
+//usage:#define cmp_trivial_usage
+//usage:       "[-l] [-s] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
+//usage:#define cmp_full_usage "\n\n"
+//usage:       "Compare FILE1 with FILE2 (or stdin)\n"
+//usage:     "\n       -l      Write the byte numbers (decimal) and values (octal)"
+//usage:     "\n               for all differing bytes"
+//usage:     "\n       -s      Quiet"
 
 #include "libbb.h"
 
@@ -44,8 +41,6 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
        unsigned opt;
        int retval = 0;
 
-       xfunc_error_retval = 2; /* 1 is returned if files are different. */
-
        opt_complementary = "-1"
                        IF_DESKTOP(":?4")
                        IF_NOT_DESKTOP(":?2")
@@ -54,8 +49,6 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
        argv += optind;
 
        filename1 = *argv;
-       fp1 = xfopen_stdin(filename1);
-
        if (*++argv) {
                filename2 = *argv;
                if (ENABLE_DESKTOP && *++argv) {
@@ -66,6 +59,10 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
                }
        }
 
+       xfunc_error_retval = 2;  /* missing file results in exitcode 2 */
+       if (opt & CMP_OPT_s)
+               logmode = 0;  /* -s suppresses open error messages */
+       fp1 = xfopen_stdin(filename1);
        fp2 = xfopen_stdin(filename2);
        if (fp1 == fp2) {               /* Paranoia check... stdin == stdin? */
                /* Note that we don't bother reading stdin.  Neither does gnu wc.
@@ -74,6 +71,7 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
                 */
                return 0;
        }
+       logmode = LOGMODE_STDIO;
 
        if (opt & CMP_OPT_l)
                fmt = fmt_l_opt;