Revert r330897:

This was intended to be a non-functional change. It wasn't. The commit
message was thus wrong. In addition it broke arm, and merged crypto
related code.

Revert with prejudice.

This revert skips files touched in r316370 since that commit was since
MFCed. This revert also skips files that require $FreeBSD$ property
changes.

Thank you to those who helped me get out of this mess including but not
limited to gonzo, kevans, rgrimes.

Requested by: gjb (re)

Partial merge of the SPDX changes

These changes are incomplete but are making it difficult
to determine what other changes can/should be merged.

No objections from: pfg

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

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

For half and reverse line feeds, recognize both SUSv2-style escape-digit
and BSD-style escape-control-char sequences in the input stream.

Submitted by: schwarze at OpenBSD
Discussed with: schwarze at OpenBSD
Obtained from: OpenBSD

Fix about ten integer overflows and underflows and a handful of logic
errors in line number handling.

Submitted by: ingo at OpenBSD
Discussed with: ingo at OpenBSD
Obtained from: OpenBSD

Capsicumize col(1)

Use defines to improve clarity

MFC after: 2 weeks

col: fixing 25 year old bug

Makes col(1) respect POSIX again for escape sequences as decribed in its manpage
The bug was introduced in CSRG in 1990
This also reverts r280911

Differential Revision: https://reviews.freebsd.org/D2424
Reviewed by: jhb
MFC after: 2 weeks

Remove bogus cast.

Fix to col when printing half-line feeds w/ -f option...

Message-Id on openbsd-tech: 20141017195810.GJ132@iris.usta.de
Submitted by: Ingo Schwarze
Obtained from: OpenBSD
MFC after: 3 days

Add missing static keywords to col(1)

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

Remove more extraneous ;s.

The variables i and tot don't need to be static.

Avoid shadowing a local scratch variable,

Sort #include directives and remove one duplicate that crept in to the
previous commit.

Add support for multibyte characters, loosely based on Bruno Haible's
work in the util-linux package.

ANSIify function definitions.
Add some constness to avoid some warnings.
Remove use register keyword.
Deal with missing/unneeded extern/prototypes.
Some minor type changes/casts to avoid warnings.

Reviewed by: md5

Remove local prototypes for main().

remove __P

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.

Use __FBSDID().

Remove the misnamed `xmalloc' and replace its uses with the realloc (along
with error checking) that it actually was.

Add the -p flag to force unknown control sequences to be passed
through unchanged.

Reviewed by: silence on -audit
Obtained from: NetBSD
MFC after: 3 weeks

Use err(3) and style(9) cleanup.

MFC after: 2 weeks

Fix a trivial warning and clamp down with WARNS=2

MFC after: 1 week

Document the -h option.

Use errx(). .Nm fixes

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

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

Merge from Lite2

Add setlocale LC_CTYPE

Obtained from: looked at the fix in 1.1.5 and rewrote it

Fix entabbing.

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

BSD 4.4 Lite Usr.bin Sources