BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / cmp / cmp.1

diff --git a/usr/src/usr.bin/cmp/cmp.1 b/usr/src/usr.bin/cmp/cmp.1
index 8f37de2..ab003e1 100644 (file)
--- a/usr/src/usr.bin/cmp/cmp.1
+++ b/usr/src/usr.bin/cmp/cmp.1
@@ -1,25 +1,42 @@
 .\" Copyright (c) 1987, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" Copyright (c) 1987, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"

-.\" Redistribution and use in source and binary forms are permitted provided
-.\" that: (1) source distributions retain this entire copyright notice and
-.\" comment, and (2) distributions including binaries display the following
-.\" acknowledgement:  ``This product includes software developed by the
-.\" University of California, Berkeley and its contributors'' in the
-.\" documentation or other materials provided with the distribution and in
-.\" all advertising materials mentioning features or use of this software.
-.\" Neither the name of the University nor the names of its contributors may
-.\" be used to endorse or promote products derived from this software without
-.\" specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\" This code is derived from software contributed to Berkeley by
+.\" the Institute of Electrical and Electronics Engineers, Inc.

 .\"
 .\"

-.\"     @(#)cmp.1      6.4 (Berkeley) 7/24/90
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"    This product includes software developed by the University of
+.\"    California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.

 .\"
 .\"

-.Dd July 24, 1990
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)cmp.1      6.7 (Berkeley) 6/27/91
+.\"
+.Dd June 27, 1991

 .Dt CMP 1
 .Dt CMP 1

-.Os BSD 4.4
+.Os

 .Sh NAME
 .Nm cmp
 .Nd Compare two files.
 .Sh NAME
 .Nm cmp
 .Nd Compare two files.


@@ -30,45 +47,36 @@
 .Sh DESCRIPTION
 The cmp utility compares two files of any type and
 writes the results to the standard output.
 .Sh DESCRIPTION
 The cmp utility compares two files of any type and
 writes the results to the standard output.

-Under default options,
+By default,

 .Nm
 .Nm

-is silent
-if the files are the same; if they
-differ, the byte and line
-number at which the first difference occurred is reported.
-Bytes and
-lines are numbered beginning with one.
+is silent if the files are the same; if they differ, the byte
+and line number at which the first difference occurred is reported.
+.Pp
+Bytes and lines are numbered beginning with one.

 .Pp
 The following options are available:
 .Pp
 The following options are available:

-.Tw Ds
-.Tp Fl l
+.Bl -tag -width Ds
+.It Fl l

 Print the byte number (decimal) and the differing
 Print the byte number (decimal) and the differing

-byte values (octal) for each difference, respectively.
-.Tp Fl s
+byte values (octal) for each difference.
+.It Fl s

 Print nothing for differing files; return exit
 status only.
 Print nothing for differing files; return exit
 status only.

-.Tp
+.El

 .Pp
 .Pp

-The following operands are available:
-.Tw file1
-.Tp Ar file1
-A pathname of the first file to be compared.

 If
 .Ar file1
 If
 .Ar file1

-is
-.Sq Fl ,
-the standard input is used.
-.Tp Ar file2
-A pathname of the second file to be compared.
-.Tp
+or
+.Ar file2
+is ``-'', the the standard input is used.

 .Pp
 The
 .Nm cmp
 utility exits with one of the following values:
 .Pp
 The
 .Nm cmp
 utility exits with one of the following values:

-.Tw Ds
-.Tp 0
+.Bl -tag -width 4n
+.It 0

 The files are identical.
 The files are identical.

-.Tp 1
+.It 1

 The files are different; this includes the case
 where one file is identical to the first part of
 the other.
 The files are different; this includes the case
 where one file is identical to the first part of
 the other.


@@ -78,9 +86,9 @@ option has
 not been specified, cmp writes to standard error
 that EOF was reached in the shorter file (before
 any differences were found).
 not been specified, cmp writes to standard error
 that EOF was reached in the shorter file (before
 any differences were found).

-.Tp >1
+.It >1

 An error occurred.
 An error occurred.

-.Tp
+.El

 .Sh SEE ALSO
 .Xr diff 1 ,
 .Xr diff3 1
 .Sh SEE ALSO
 .Xr diff 1 ,
 .Xr diff3 1


@@ -88,4 +96,3 @@ An error occurred.
 The
 .Nm cmp
 function is expected to be POSIX 1003.2 compatible.
 The
 .Nm cmp
 function is expected to be POSIX 1003.2 compatible.

-This manual page is derived from the POSIX 1003.2 manual page.