src/usr.bin/diff/diff.c, branch releng/14.1 FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=releng%2F14.1 2024-03-11T12:19:06Z diff: Fix --expand-tabs and --side-by-side. 2024-03-11T12:19:06Z Dag-Erling Smørgrav des@FreeBSD.org 2024-02-26T18:08:06Z urn:sha1:da290528974846d3ed49138ca0f2de7fff02eaf6 * Overhaul column width and padding calculation. * Rewrite print_space() so it is now a) correct and b) understandable. * Rewrite tab expansion in fetch() for the same reason. This brings us in line with GNU diff for all cases I could think of. Sponsored by: Klara, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D44014 (cherry picked from commit 53de23f4d140becc3166e87665b0064f215a220e) diff: Bump manual page date. Sponsored by: Klara, Inc. (cherry picked from commit 312b1076c6b0aff9bbcaff058b93385eaf607685) Remove $FreeBSD$: one-line .c pattern 2023-08-16T17:54:42Z Warner Losh imp@FreeBSD.org 2023-08-16T17:54:42Z urn:sha1:1d386b48a555f61cb7325543adbbb5c3f3407a66 Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/ diff: Re-add void argument to usage 2022-03-10T16:24:02Z Tom Jones thj@FreeBSD.org 2022-03-10T16:24:02Z urn:sha1:93b7af1d854db2a92dc9fcca70e068a159385f4d Previous commit (8cf449db88b2c7a505bc241a78f9736b43f2ede5) unintentionally dropped the 'void' argument to usage, reinstate it. Sponsored by: Klara Inc. diff: add support for --help and --version 2022-03-10T16:17:37Z Tom Jones thj@FreeBSD.org 2022-03-10T16:15:39Z urn:sha1:8cf449db88b2c7a505bc241a78f9736b43f2ede5 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: set cflag when passed to diff 2022-03-09T09:32:14Z Tom Jones thj@FreeBSD.org 2022-03-08T16:58:25Z urn:sha1:7e64519a479abe1ff92a0985790f5c2b8a9d95df In b5541f456d641d23e0c46874daff0b62552bf3cb when flags were converted to be boolean, the setting of cflag as an integer was removed, but no boolean set was added. This effects the output format of dates, but the context type was set to D_CONTEXT so other functionality worked. Reviewed by: bapt Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D34481 diff: add --no-dereference flag 2022-02-18T15:17:13Z Tom Jones thj@FreeBSD.org 2022-02-18T15:13:13Z urn:sha1:f4be3645a14d4faa5a51846054318ccf77c9cd5e When diffing files and directories, don't follow symbolic links, instead compare where the links point to. Reviewed by: bapt Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D34203 diff: implement option -F (--show-function-line) 2021-09-15T23:46:44Z Piotr Pawel Stefaniak pstef@FreeBSD.org 2021-09-05T14:54:07Z urn:sha1:e51aabf8cbb9b412c725c4c9c727ca6faa0630c6 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:44Z Cameron Katri me@cameronkatri.com 2021-09-05T00:10:41Z urn:sha1:f38702e5a52e1350b9349bc297ccd0b50b1941c3 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: move functions around and reduce their visibility 2021-09-15T23:36:41Z Piotr Pawel Stefaniak pstef@FreeBSD.org 2021-09-04T23:50:58Z urn:sha1:e43df07e3725ef6d14a2ca635598c18295b1b481 Most of them become static. There will be more such functions added in upcoming commits, so they would be inconsistent with existing code. Improve the existing code instead of reinforcing the unwanted pattern. diff: convert boolean flag variables to bool 2021-09-15T23:36:41Z Piotr Pawel Stefaniak pstef@FreeBSD.org 2021-09-04T23:44:26Z urn:sha1:b5541f456d641d23e0c46874daff0b62552bf3cb There will be more boolean flags added in upcoming commits and they would have to be stored in ints in order to be consistent with existing code. Change the existing code to use the bool type.