src/usr.bin/diff/diffreg.c, branch release/13.1.0 FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=release%2F13.1.0 2021-09-25T08:34:39Z diff: read whole files to determine if they are ASCII text 2021-09-25T08:34:39Z Piotr Pawel Stefaniak pstef@FreeBSD.org 2021-08-22T19:57:13Z urn:sha1:bda949b6efdf099846775d3dc595c36561df1cca Before this change, only the first BUFSIZE bytes were checked. (cherry picked from commit 3cbf98e2bee91db9ed9118ff557e02cdd449f49a) diff: don't output carriage returns that were stripped on input 2021-09-25T08:34:38Z Piotr Pawel Stefaniak pstef@FreeBSD.org 2021-08-22T16:05:59Z urn:sha1:ece58f7ada409ac68e072cdddcc29e21127aafce --strip-trailing-cr worked as intended for comparison between files, but the characters were still present in final output. (cherry picked from commit af2f0164318455433db95adce07af829285b78ad) usr.bin/diff: fix UBSan error in readhash 2021-08-05T08:59:26Z Alex Richardson arichardson@FreeBSD.org 2021-07-06T11:16:40Z urn:sha1:7a7324d9cebee6f42d77a39f3a8c657e23676cc2 UBSan complains about the `sum = sum * 127 + chrtran(t);` line below since that can overflow an `int`. Use `unsigned int` instead to ensure that overflow is well-defined. Reviewed By: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D31075 (cherry picked from commit c78f449d85e0b292fe5d942cca99f11c1cd430fa) diff: eleminitate useless macros 2021-05-05T08:37:09Z Baptiste Daroussin bapt@FreeBSD.org 2021-01-27T10:47:17Z urn:sha1:7904a2e5a8c56853bd39f5fe22a14cf8b526cd3c The diff_output was not bringing any values but was obfuscating the code. (cherry picked from commit 7a57c9cb5a4dffb0483beeae6da7cf266ea634be) diff: simplify the hash functions 2021-05-05T08:37:09Z Baptiste Daroussin bapt@FreeBSD.org 2021-01-26T15:25:00Z urn:sha1:b6b26cecc0babc7834c026b43bb761cbd5147ed9 Instead of 3 different complex case they have all been folded into a simple on based on switch (cherry picked from commit e43239f5140e1b80de122458a2ac037172866058) diff: fix typo in a comment 2021-05-05T08:37:09Z Baptiste Daroussin bapt@FreeBSD.org 2021-01-26T14:20:44Z urn:sha1:ffbf0225b7d2fbee1acd430eaf714b29f378bebf (cherry picked from commit e52546a3a75f6e4b327178f4d50a98dd99101c64) diff: eliminate space at end of line 2021-05-05T08:37:08Z Baptiste Daroussin bapt@FreeBSD.org 2021-01-27T10:46:15Z urn:sha1:0ce985a23b505750faa446ebf7dae177bf3f88c4 No functionnal changes (cherry picked from commit 15abb23286541c17ff95bac056cd4979822c4288) diff: fix incorrectly displaying files as duplicates 2021-02-01T13:05:25Z Jamie Landeg-Jones jamie@catflap.org 2021-01-25T17:42:26Z urn:sha1:3728c4d3149553967532a97254737bdb2cd92417 When diff hits certain access errors, function diffreg() shows the error message, and then returns to the calling function, which calls print_status() with the return value. However, in these cases, the return value isn't changed from the initial default value of D_SAME. Normally, print_status() with a value of D_SAME does nothing, so this works out ok, however, if the "-s" flag is set, a message is displayed showing identicality: case D_SAME: if (sflag) printf("Files %s%s and %s%s are identical\n", path1, entry, path2, entry); break; This then produces such results as: % diff -s /COPYRIGHT /var/run/rpcbind.sock diff: /var/run/rpcbind.sock: Operation not supported Files /COPYRIGHT and /var/run/rpcbind.sock are identical % diff -s /COPYRIGHT /etc/master.passwd diff: /etc/master.passwd: Permission denied Files /COPYRIGHT and /etc/master.passwd are identical Create a D_ERROR status which is returned in such cases, and print_status() then deals with that status seperately from D_SAME PR: 252614 MFC after: 1 week (cherry picked from commit fefb3c46a80fdde6f307e73a2b5b5aed806df1ce) diff: honour flags with -q 2021-01-09T18:34:06Z Ed Maste emaste@FreeBSD.org 2021-01-09T16:22:28Z urn:sha1:12a8d3027d414abd15798de1b6d8b01151bdac50 Previously -q (just print a line when files differ) ignored flags like -w (ignore whitespace). Avoid the D_BRIEF short-circuit when flags are in effect. PR: 252515 Reported by: Scott Aitken Reviewed by: kevans MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D28064 diff: always properly kill pr(1) 2020-09-01T14:52:39Z Baptiste Daroussin bapt@FreeBSD.org 2020-09-01T14:52:39Z urn:sha1:fb0d1c6980b3f9f912c2582e4a9f343a3108c03b When diff is invoked with -l it will spawn the pr(1) program. In some circumpstances the pr(1) was not properly killed when diff program exits. Submitted by: Bret Ketchum MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D26232