- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Add missing static keywords to cmp(1)

Eliminate unneeded headers.

Remove the advertising clause from UCB copyrighted files in usr.bin. This
is in accordance with the information provided at
ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change

Also add $FreeBSD$ to a few files to keep svn happy.

Discussed with: imp, rwatson

Revert most part of 200420 as requested, as more review and polish is
needed.

Remove unneeded header includes from usr.bin/ except contributed code.

Tested with: make universe

add __unused to succeed at WARNS=6

Refine markup and add the EXIT STATUS section where appropriate.

-mdoc sweep.

Add a -h option to tell cmp not to follow symbolic links.

MFC after: 3 weeks
Sponsored by: Sophos/ActiveState

phk added the -x option in May 2000, but only for regular files; for
special files it was treated like -l. This commit adds the -x option
in for special files as well.

PR: bin/46249
Submitted by: Colin Percival <cperciva@sfu.ca>

The cmp utility has the questionable feature of using mmap when
comparing regular files. Add a SIGSEGV handler to make its
behavior less surprising when a read error occurs. The handler
does not attempt to distinguish errors from file truncation, but
anyone actively modifying a file while trying to compare it
shouldn't even expect something sane to happen.

PR: 45391
Reviewed by: mike (mentor)

Fix typos, mostly s/ an / a / where appropriate and a few s/an/and/
Add FreeBSD Id tag where missing.

ANSIify function definitions to avoid a warning.

No need to check for "-" explicitly in getopt() loop.

Exit >1 when an error occurs, regardless of whether -s is specified (SUSv3)

remove __P

Remove leaf node WARNS?=2 (that mainly I added). This should
help the GCC3 transition and CURRENT in general.

Style improvements recommended by Bruce as a follow up to some
of the recent WARNS commits. The idea is:

1) FreeBSD id tags should follow vendor tags.
2) Vendor tags should not be compiled (though copyrights probably should).
3) There should be no blank line between including cdefs and __FBSDIF.

Cast off_t to long long before printing. Use %ll instead of %q incase
long long and quad_t are not the same.

Turn on WARNS=2.
Use __FBSDID().

Make filenames const to avoid a few warnings.
Add FreeBSD tags.

Reviewed by: cmp

Don't use gcc -Wall flag. Add FreeBSD: line.

Make cmp work by mmapping chunks of a file, rather than the whole
file at one time.

PR: 24732
Submitted by: Andrew L. Neporada <andr@dgap.mipt.ru>
MFC after: 2 weeks

Remove whitespace at EOL.

mdoc(7) police: use the new features of the Nm macro.

Fix a bug introduced in rev 1.8, where special files ended up
being treated like regular files because of missing braces.

PR: 20143

Add the -z flag to check file sizes first
Correct the cmp.1 usage message
Correct the -l/-s incompatibility message

Submitted by: Mark Knight <markk@knigma.org>

Make cmp -s work properly if skip values are given. Also, exit(1)
is now exit(DIFF_EXIT).

PR: 18597
Submitted by: Anatoly Vorobey <mellon@pobox.com>
Committed at: Usenix terminal room

Oops, byte offset was as off_t.

Let cmp(1) grow in -x option to print differences in contemporarry hex
format rather than the mixed decimal/octal format of -l.

$Id$ -> $FreeBSD$

Fix improper mmap length paramater which can result in improper behavior
or cmp crashing in specific cases.

More egcs warning fixes:
o main returns int not void
o use return 0 at end of main when needed
o use braces to avoid potentially ambiguous else
o don't default to type int
o #ifdef 0 -> #if 0

Reviewed by: obrien and chuckr

Tweaks to allow compiling -Wall (mostly adding "const" to char rcsid[]).

"EOF of file..." is written to stderr and not stdout.

PR: 6756

Permit hex/octal parameters to cmp, to match what the manual page says.

PR: 3850, 3855

Correct usage string. Program name converted to bold in man page.

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

Revert $FreeBSD$ to $Id$

Sweep through the tree fixing mmap() usage:

- Use MAP_FAILED instead of the constant -1 to indicate
failure (required by POSIX).
- Removed flag arguments of '0' (required by POSIX).
- Fixed code which expected an error return of 0.
- Fixed code which thought any address with the high bit set
was an error.
- Check for failure where no checks were present.

Discussed with: bde

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Our mmap(2) has a limitation where the `offset' parameter must be
page-aligned. cmp(1) should know about this flaw, and work around it.

While i was at it, fixed an uninitialized variable as reported by
-Wall.

When mmap is used, do an madvise(MADV_SEQUENTIAL) to make things
go much more quickly when file input is really done. Of course, the
fully cached case will make no difference.

[HISTORY] command appeared in Version 1 AT&T UNIX
Obtained from: A Quarter Century of UNIX, Peter H. Salus, page 41

I don't like what they did to cmp(1) in 4.4 Lite; now it whines all
the time, even with -s. Make cmp SHUT UP about non-existant files
when run with -s.
Submitted by: jkh

This commit was generated by cvs2svn to compensate for changes in r1590,
which included commits to RCS files with non-trunk default branches.