src/usr.bin/patch, branch main

Revert "patch: fix pch_context() for unified diffs with no leading context"

2025-08-30T22:02:35Z

This reverts commit f97b6a8f84b3ed209c2aea0958a7b889d0bf27ed, as it turns out our fuzz implementation is just too naive. We can have more leading context than trailing context and vice-versa, so we can't really assume they're the same. Restore the previous bug and we can work on it post-branch. Reported by: cy

patch: test for unified diffs with spaces in filenames

2025-08-29T19:24:35Z

The older GNU patch that we had in base did not properly handle spaces in filenames in unified diffs, but bsdpatch seems to have handled this fine at least since the version we imported into base initially. Add a test with spaces in the filename specifically to be sure. PR: 181272

patch: fix pch_context() for unified diffs with no leading context

2025-08-29T19:24:35Z

When the first line of a file is a removal, we may not have any leading context. Only adjusting p_context if context > 0 means that we incorrectly believe that we have 100 lines of context when the reality is that we have none. This fixes a bug with fuzz-checking, which ends up fuzzing away the line we're trying to replace if it's the first line in the file. We use pch_context() to determine a reasonable max-fuzz. PR: 250511 Reviewed by: pfg Differential Revision: https://reviews.freebsd.org/D51837

Update Makefile.depend files

2024-10-14T17:26:17Z

After building packages we have a number of new and updated Makefile.depend files Reviewed by: stevek

Remove residual blank line at start of Makefile

2024-07-15T22:43:39Z

This is a residual of the $FreeBSD$ removal. MFC After: 3 days (though I'll just run the command on the branches) Sponsored by: Netflix

patch: use getline() instead of fgetln()

2024-04-19T21:52:22Z

This replaces fgetln() with getline(). The main reason for this is portability, making things easier for people who want to compile these tools on non-FreeBSD systems. I appreciate that's probably not the top concern for FreeBSD base tools, but fgetln() is impossible to port to most platforms, as concurrent access is essentially impossible to implement fully correct without the line buffer on the FILE struct. Other than this, many generic FreeBSD tools compile fairly cleanly on Linux with a few small changes. Most uses of fgetln() pre-date getline() support (added in 2009 with 69099ba2ec8b), and there's been some previous patches (ee3ca711a898 8c98e6b1a7f3 1a2a4fc8ce1b) for other tools. Obtained from: https://github.com/dcantrell/bsdutils and https://github.com/chimera-linux/chimerautils Signed-off-by: Martin Tournoij Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/893

patch: Support long context lines.

2024-02-12T18:26:13Z

MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D43850

patch: fix locate_hunk in empty files

2023-12-03T17:33:03Z

if `first_guess' is zero then main() assumes that locate_hunk has failed and aborts the patch operation. Instead, make sure to return 1 (the line number) so that the patch operation can continue. Issue originally found by Neels Hofmeyr in the regress suite of the diff implementation for got, where the tests assume that applying a diff with `patch' and then again with `patch -R' yields back the original file. Obtained from: OpenBSD (CVS patch.c,v 1.71)

Remove $FreeBSD$: one-line nroff pattern

2023-08-16T17:55:15Z

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

Remove $FreeBSD$: one-line sh pattern

2023-08-16T17:55:03Z

Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/