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

The is_delim function works on wchar_t characters not ints, update the
function to take a wchar_t as it's argument.

This fixes the build when wchar_t is not an int, i.e. ARM EABI.

Add 'w' flag to:

Use whitespace (spaces and tabs) as the delimiter.
Consecutive spaces and tabs count as one single field
separator.

Reviewed by: swildner@dragonflybsd.org
Approved by: cperciva
Obtained from: DragonFlyBSD
MFC after: 1 week

- Consistenly mention columns and fields
- Add -b to short error messages

Obtained from: NetBSD

Add missing static keywords to cut(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

When the last line of a file is missing a newline in -f mode, pass a
length argument to mbrtowc() that accounts for the terminating newline
character we add automatically. Failing to do this caused the loop to
unexpectedly run out of characters and incorrectly signal an "Illegal byte
sequence" error.

Move some variable declarations to the top of the file.

Silence a warning about an unused argument.

Handle multibyte characters when cutting out fields (-f and -d options.)

Update a comment that compared the parser with an obsolete draft of
IEEE Std 1003.2-1992. Most of the "extensions" here were actually
required by the final version of the standard.

Implement the -c option correctly in locales with multibyte characters
instead of treating it as a synonym for -b.

Make the handling of invalid multibyte sequences more robust by using
mbrlen() instead of mblen().

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().

Consistently use FBSDID

Don't split multibyte characters when the -n option is specified.

style(9): don't initialise variables in their declaration, remove space
after function name, use __unused on unused parameters instead of
initialising them to bogus values.

Initialise the `positions' array correctly before use.

When a file name of "-" is given, read from standard input (SUSv3)

Allow byte/character positions >_POSIX2_LINE_MAX to be specified by
dynamically growing the `positions' array.

If processing of one file fails, try to process the remaining files and
exit non-zero instead of immediately exiting. The traditional BSD
behaviour is explicitly forbidden by P1003.2.

Silence the remaining warnings and clamp down with WARNS=2.

Not objected to by: -audit

Teach cut(1) how to handle long lines: convert from fgets(3) to fgetln(3).

PR: 26810
Reviewed by: dwmalone

Remove duplicate FreeBSD Id
Remoce unused #include
Use imperative mode to start flag description

De-__P()-ify

Reviewed by: markm

BDECFLAGS: constify; use proper types. Add $FreeBSD$, clean up #ifndef lint.

Reviewed by: markm

Merge from NetBSD: cut.1 rev 1.6 to 1.8
cut.c rev 1.9 to 1.13
* Man page internal cleanups
* 8-bit characters cast to unsigned for is*()
* Misc cleanups for egcs -Wall compatibility

Bring in use of strsep() to handle bad input better, and clean up
some text.

Obtained from: Merge from OpenBSD
(cut.1 up to OpenBSD rev 1.3, cut.c up to OpenBSD rev 1.6)

Merge from NetBSD cut.1 rev 1.6 and cut.c rev 1.9, respectively. This
makes us conform to IEEE Std1003.2-1992 (``POSIX.2'').

Obtained from: NetBSD (but with slight modifications).

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

Use err(3) instead of local redefinition. Change argument name in man
page to sync with usage string.

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

Merge from Lite2

Fix wrong separator output
Submitted by: julian
Obtained from: newsgroup?

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