Bump to version 1.22.1

[platform/upstream/busybox.git] / editors / cmp.c

diff --git a/editors/cmp.c b/editors/cmp.c
index dbfa4be..a4af6f4 100644 (file)
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -4,12 +4,31 @@
  *
  * 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 */
 
+//config:config CMP
+//config:      bool "cmp"
+//config:      default y
+//config:      help
+//config:        cmp is used to compare two files and returns the result
+//config:        to standard output.
+
+//kbuild:lib-$(CONFIG_CMP) += cmp.o
+
+//applet:IF_CMP(APPLET(cmp, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//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"
 
 static const char fmt_eof[] ALIGN1 = "cmp: EOF on %s\n";
@@ -33,8 +52,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")
@@ -43,8 +60,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) {
@@ -55,6 +70,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.
@@ -63,6 +82,7 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
                 */
                return 0;
        }
+       logmode = LOGMODE_STDIO;
 
        if (opt & CMP_OPT_l)
                fmt = fmt_l_opt;