src/usr.bin/diff/diff.1, branch releng/14.0

Remove $FreeBSD$: one-line nroff pattern

2023-08-16T17:55:15+00:00

Remove /^\.\\"\s*\$FreeBSD\$$\n/

diff: add support for --help and --version

2022-03-10T16:17:37+00:00

Add support for --help and --version to be compatible with gnu diff.

gnu diff --help writes to stdout, do the same to be compatible

Reviewed by:	bapt, pstef, debrup, Pau Amma
Sponsored by:	Klara Inc.
Differential Revision:	https://reviews.freebsd.org/D34508

diff: Detect Objective-C methods

2022-02-18T15:09:57+00:00

When searching back for function definitions, consider lines starting
with '+' and '-', this allows us to pick up Objective-C methods as well
as C style function definitions.

Reviewed by:	bapt
Sponsored by:	Klara Inc.
Differential Revision:	https://reviews.freebsd.org/D34202

diff: implement option -F (--show-function-line)

2021-09-15T23:46:44+00:00

With unified and context diffs, show the last line that matches the
provided pattern before the context.

Reviewed by:	bapt
Differential Revision:	https://reviews.freebsd.org/D31714

diff(1): Add --color support

2021-09-15T23:46:44+00:00

Adds a --color flag to diff(1) that supports the same options as GNU's
diff(1). The colors are customizable with the env var DIFFCOLORS in
a format similar to grep(1)'s GREPCOLORS. An example would be 04;36:41
for additions to be underlined light blue, and deletions have a red
background.

Differential Revision:	https://reviews.freebsd.org/D30545

diff(1): Add EXAMPLES section

2020-06-19T06:48:16+00:00

Add examples for -r, -u, -N, -x, -q and -I

Approved by:	0mp@
Differential Revision:	https://reviews.freebsd.org/D25345

Document long version of -b option

2020-06-01T09:15:15+00:00

PR:		234195
Submitted by:	Fehmi Noyan Isi 
Reported by:	Andras Farkas 
MFC after:	3 days

diff: fix segfault with --tabsize and no/malformed argument

2020-02-13T20:23:55+00:00

--tabsize was previously listed as optional_argument, but didn't account for
the optionality of it in the argument handling. This is irrelevant -- the
manpage doesn't indicate that the argument is optional, and indeed there's
no clear interpretation of omitting the argument because there's no other
side effect of --tabsize.

The "malformed" argument part of the header on this message is simply
referring to usage like this:

% diff --tabsize 4 A B

With an optional_argument, the argument must be attached to the parameter
directly (e.g. --tabsize=4), so the argument is effectively NULL with the
above invocation as if no argument had been passed.

PR:		243974
Submitted by:	fehmi noyan isi  (diff.c portion)
MFC after:	3 days

diff.1: Fix style & document -y as extension to POSIX

2020-02-12T20:06:41+00:00

- Long options must be stylized with the Fl macro as well.

Reviewed by:	bapt
Approved by:	bcr (mentor)
Differential Revision:	https://reviews.freebsd.org/D23642

Fix most of the style warnings

2020-02-07T12:26:38+00:00