projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
POSIX 1003.2B/D9 symbolic links
[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
79fcde4
..
13016d0
100644
(file)
--- a/
usr/src/usr.bin/cmp/cmp.1
+++ b/
usr/src/usr.bin/cmp/cmp.1
@@
-1,12
+1,12
@@
-.\" Copyright (c) 1987, 1990
The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1987, 1990
, 1993
+.\"
The Regents of the University of California.
All rights reserved.
.\"
.\" This code is derived from software contributed to Berkeley by
.\" the Institute of Electrical and Electronics Engineers, Inc.
.\"
.\" %sccs.include.redist.man%
.\"
.\"
.\" This code is derived from software contributed to Berkeley by
.\" the Institute of Electrical and Electronics Engineers, Inc.
.\"
.\" %sccs.include.redist.man%
.\"
-.\" @(#)cmp.1
6.7
(Berkeley) %G%
+.\" @(#)cmp.1
8.1
(Berkeley) %G%
.\"
.Dd
.Dt CMP 1
.\"
.Dd
.Dt CMP 1
@@
-16,11
+16,12
@@
.Nd compare two files
.Sh SYNOPSIS
.Nm cmp
.Nd compare two files
.Sh SYNOPSIS
.Nm cmp
-.Op Fl l
Li \&
| Fl s
+.Op Fl l | Fl s
.Ar file1 file2
.Ar file1 file2
+.Op Ar skip1 Op Ar skip2
.Sh DESCRIPTION
.Sh DESCRIPTION
-The cmp utility compares two files of any type and
-
writes the results
to the standard output.
+The cmp utility compares two files of any type and
writes the results
+to the standard output.
By default,
.Nm
is silent if the files are the same; if they differ, the byte
By default,
.Nm
is silent if the files are the same; if they differ, the byte
@@
-29,7
+30,7
@@
and line number at which the first difference occurred is reported.
Bytes and lines are numbered beginning with one.
.Pp
The following options are available:
Bytes and lines are numbered beginning with one.
.Pp
The following options are available:
-.Bl -tag -width
Ds
+.Bl -tag -width
flag
.It Fl l
Print the byte number (decimal) and the differing
byte values (octal) for each difference.
.It Fl l
Print the byte number (decimal) and the differing
byte values (octal) for each difference.
@@
-38,11
+39,17
@@
Print nothing for differing files; return exit
status only.
.El
.Pp
status only.
.El
.Pp
-If
+The optional arguments
+.Ar skip1
+and
+.Ar skip2
+are the byte offsets from the beginning of
.Ar file1
.Ar file1
-or
-.Ar file2
-is ``-'', the the standard input is used.
+and
+.Ar file2 ,
+respectively, where the comparison will begin.
+The offset is decimal by default, but may be expressed as an hexadecimal
+or octal value by preceding it with a leading ``0x'' or ``0''.
.Pp
The
.Nm cmp
.Pp
The
.Nm cmp
@@
-56,10
+63,10
@@
where one file is identical to the first part of
the other.
In the latter case, if the
.Fl s
the other.
In the latter case, if the
.Fl s
-option has
-not been specified, cmp writes to standard error
-that EOF was reached in the shorter file (before
-any differences were found).
+option has
not been specified,
+.Nm cmp
+writes to standard output that EOF was reached in the shorter
+
file (before
any differences were found).
.It >1
An error occurred.
.El
.It >1
An error occurred.
.El
@@
-69,4
+76,6
@@
An error occurred.
.Sh STANDARDS
The
.Nm cmp
.Sh STANDARDS
The
.Nm cmp
-function is expected to be POSIX 1003.2 compatible.
+utility is expected to be
+.St -p1003.2
+compatible.