aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/patch
Commit message (Collapse)AuthorAgeFilesLines
* patch: Support long context lines.Dag-Erling Smørgrav2024-02-244-7/+26
| | | | | | | | | MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D43850 (cherry picked from commit 851a9da38f070675c42a6d69c41c47a5d29ee3d0)
* Remove $FreeBSD$: one-line nroff patternWarner Losh2023-08-161-1/+0
| | | | Remove /^\.\\"\s*\$FreeBSD\$$\n/
* Remove $FreeBSD$: one-line sh patternWarner Losh2023-08-164-4/+0
| | | | Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
* Remove $FreeBSD$: one-line .h patternWarner Losh2023-08-1612-12/+0
| | | | Remove /^\s*\*+\s*\$FreeBSD\$.*$\n/
* patch: don't run off the end of path if it ends in '/'.Pedro F. Giffuni2023-08-071-1/+2
| | | | | | Found by fuzzing (afl) in OpenBSD. Obtained from: OpenBSD (CVS 1.65)
* spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSDWarner Losh2023-05-121-1/+1
| | | | | | | | | The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch up to that fact and revert to their recommended match of BSD-2-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix
* Update/fix Makefile.depend for userlandSimon J. Gerraty2023-04-191-1/+0
|
* patch: omit filename if the prompt was ignoredKyle Evans2023-02-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | When a file is missing, patch(1) will prompt for a filename to try and patch it. If we're doing a dry-run, we'll output that the patch to the source file was either ignored/failed. If you ignore the prompt in a dry-run (i.e. just hit enter), we'll output: X out of X hunks ignored while patching (null) Let's improve the aesthetics a bit and just omit the last part if the prompt was ignored: X out of X hunks ignored Unfortunately we can't really test this without expect(1) because both force and batch mode will use the first best guess, which is wiped out by the "File to patch:" prompt. We could record the initially derived bestguess there and use *that*, but given that this is only possible in an interactive session I think it's fine to just omit the filename rather than adding a fair amount of complexity (which could also break other scenarios I haven't considered yet).. Reviewed by: des Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38179
* patch: cleanup variable initialization a bit.Pedro F. Giffuni2021-07-222-2/+4
| | | | | | musl libc fgetln is a bit more pickier. Hinted by: chimera-linux (git 31491e1de2e1241885984cd9e4b978965f14eda4)
* usr.bin/patch: remove unneeded header.Xin LI2021-05-021-1/+0
| | | | MFC after: 2 weeks
* patch(1): Fix a few mandoc related issuesGordon Bergling2020-12-191-6/+6
| | | | | | | | | - no blank before trailing delimiter MFC after: 1 week Notes: svn path=/head/; revision=368807
* Remove heuristic for dealing with trailing newlines being truncated by mailers.Warner Losh2020-08-161-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every version of patch since the first one posted to mod.sources in 1985 have included a heuristic for coping with the state of email messaging at the time. This heuristic would add up to 4 blank lines to a patch if it thought it needed it. The trouble is, though this causes at least one bug. The bug in my case is that if you have a context diff whose last hunk only deletes 3 or fewer lines, then if you try to reverse apply it with -R, it will fail. The reason for this is the heuristic builds an internal representation that includes those blank lines. However, it should really replicate the lines from the pattern lines line it would any other time, not assume they are blank lines. Removing this heuristic will prevent patch from misapplying the lines removed after applying a 'fuzz' factor to the previous blank line in the file. I believe this will only affect 'new-style' 4.3BSD context diffs and not the older-style 4.2BSD diffs and plain, non-context diffs. It won't affect any of the newer formats, since they don't use the 'omitted' construct in the same way. Since this heuristic was put into patch at a time when email / etc ate trailing white space on a regular basis, and since it's clear that this heuristic is the wrong thing to do at least some of the time, it's better to remove it entirely. It's not been needed for maybe 20 years since patch files are not usually corrupted. If there are a small number of patch files that would benefit from this corruption fixing, those already-currupt patches can be fixed by the addition of blank lines. I'd wager that no one will ever come to me with an example of a once-working patch file that breaks with this change. However, I have 2 patches from the first 195 patches to 2.11BSD that are affected by this bug, suggesting that the relative frequency of the issue has changed signficantly since the original heuristic was put into place. Reviewed by: phk@ Differential Revision: https://reviews.freebsd.org/D26081 Notes: svn path=/head/; revision=364291
* patch(1): give /dev/null patches special treatmentKyle Evans2019-11-046-16/+184
| | | | | | | | | | | | | | | | We have a bad habit of duplicating contents of files that are sourced from /dev/null and applied more than once... take the more sane (in most ways) GNU route and complain if the file exists and offer reversal options. This still falls short a little bit as selecting "don't reverse, apply anyway" will still give you duplicated file contents. There's probably other issues as well, but awareness is the first step to happiness. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D21535 Notes: svn path=/head/; revision=354328
* patch(1): fix the file removal test, strengthen it a bitKyle Evans2019-09-051-2/+13
| | | | | | | | | | | To remain compatible with GNU patch, we should ensure that once we're removing empty files after a reversed /dev/null patch we don't remove files that have been modified. GNU patch leaves these intact and just reverses the hunk that created the file, effectively implying --remove-empty-files for reversed /dev/null patches. Notes: svn path=/head/; revision=351866
* patch(1): add some basic testsKyle Evans2019-09-057-0/+183
| | | | | | | | | | | | | | | | | | | | Summary: - basic: test application of patches created by diff -u at the beginning/middle/end of file, which have differing amounts of context before and after chunks being added - limited_ctx: stems from PR 74127 in which a rogue line was getting added when the patch should have been rejected. Similar behavior was reproducible with larger contexts near the beginning/end of a file. See r326084 for details - file_creation: patch sourced from /dev/null should create the file - file_nodupe: said patch sourced from /dev/null shouldn't dupe the contents when re-applied (personal vendetta, WIP, see comment) - file_removal: this follows from nodupe; the reverse of a patch sourced from /dev/null is most naturally deleting the file, as is expected based on GNU patch behavior (WIP) Notes: svn path=/head/; revision=351836
* patch(1): Exit successfully if we're fed a 0-length patchKyle Evans2019-03-013-1/+6
| | | | | | | | | | | | | | | | This change is made in the name of GNU patch compatibility. If GNU patch is fed a zero-length patch, it will exit successfully with no output. This is used in at least one port to date (comms/wsjtx), and we break on this usage. It seems unlikely that anyone relies on patch(1) calling their completely empty patch garbage and failing, and GNU compatibility is a plus if it helps with porting, so make the switch. Reported by: db MFC after: 2 weeks Notes: svn path=/head/; revision=344677
* patch(1): Don't check for NUL bytes in Plan AKyle Evans2018-01-111-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Plan A mmap()'s the entire input file and operates on it in memory. The map(2) call succeeded, so we shouldn't need to bother checking for the NUL byte as long as we're within our buffer space. This was clearly intentional to match "the behavior of the original code", but it creates a discrepancy between Plan A and Plan B that doesn't seem sensible and it's not inherently wrong to allow a NUL byte. This change was motivated by the gemspec in net/rubygem-grpc failing to patch, despite the patch being generated with diff, because a NUL byte was used as a delimiter in the header briefly in an otherwise text file. An alternative was considered: to fallback to plan B if plan A won't process the entire file due to a NUL byte, but I deemed this to be the better option since plan A isn't failing due to memory limitations and will fail later on if it's really dealing with a file it shouldn't be. PR: 224842 (exp-run) Reported by: swills Reviewed by: emaste, pfg MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D13738 Notes: svn path=/head/; revision=327826
* patch: further cleanup to git-style diffs.Pedro F. Giffuni2017-12-211-2/+4
| | | | | | | | | | | Fix adding and removing files with git-style a/ b/ diffs: only skip six letters if they actually match "--- a/" and "+++ b/" instead of laxer checks. Obtained from: OpenBSD (CVS 1.59) Notes: svn path=/head/; revision=327064
* patch: rejname[] is also -r option buffer, and should be PATH_MAX.Pedro F. Giffuni2017-12-211-1/+1
| | | | | | | Obtained from: OpenBSD (CVS 1.64) Notes: svn path=/head/; revision=327063
* patch(1): don't assume a match if we run out of context to checkKyle Evans2017-11-221-0/+3
| | | | | | | | | | | | | | | | | | Patches with very little context (-U0 and -U1) could get misapplied if the file to be patched changes and a hunk is no longer applicable. Matching with fuzz would be attempted and default to a match when we unexpectedly ran out of context. This also affected patches with higher levels of context but had limited actual context due to the hunk being located near the beginning/end of file. PR: 74127, 223545 (exp-run) Reviewed by: emaste, pfg Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D12631 Notes: svn path=/head/; revision=326084
* General further adoption of SPDX licensing ID tags.Pedro F. Giffuni2017-11-201-0/+2
| | | | | | | | | | | | | | | | | Mainly focus on files that use BSD 3-Clause license. The Software Package Data Exchange (SPDX) group provides a specification to make it easier for automated tools to detect and summarize well known opensource licenses. We are gradually adopting the specification, noting that the tags are considered only advisory and do not, in any way, superceed or replace the license texts. Special thanks to Wind River for providing access to "The Duke of Highlander" tool: an older (2014) run over FreeBSD tree was useful as a starting point. Notes: svn path=/head/; revision=326025
* Revert r325365Kyle Evans2017-11-081-3/+0
| | | | | | | | | | | r325365 caused several ports to fail to patch correctly. Revert it for the time being until an exp-run can be completed. Requested by: antoine Approved by: emaste (implicit) Notes: svn path=/head/; revision=325564
* patch(1): don't assume a match if we run out of context to checkKyle Evans2017-11-031-0/+3
| | | | | | | | | | | | | | | Patches with very little context (-U0 and -U1) could get misapplied if the file to be patched changes and a hunk is no longer applicable. Matching with fuzz would be attempted and default to a match when we unexpectedly ran out of context. PR: 74127 Reviewed by: emaste, pfg Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D12631 Notes: svn path=/head/; revision=325365
* DIRDEPS_BUILD: Update dependencies.Bryan Drewery2017-10-311-1/+0
| | | | | | | Sponsored by: Dell EMC Isilon Notes: svn path=/head/; revision=325188
* patch(1): Don't overrun line buffer in some casesKyle Evans2017-10-091-1/+6
| | | | | | | | | | | | | | | | | Patches like file.txt attached to PR 190195 with a final line formed like ">(EOL)" could cause a copy past the end of the current line buffer. In the case of PR 191641, this caused a duplicate line to be copied into the resulting file. Instead of running past the end, treat it as if it were a blank line. PR: 191641 Reviewed by: cem, emaste, pfg Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D12609 Notes: svn path=/head/; revision=324431
* patch(1): add support for git generated diffs.Pedro F. Giffuni2017-07-021-5/+15
| | | | | | | | | | Sometimes patches coming from other places have extra a/ and b/ directories prepended to filenames. Obtained from: OpenBSD (CVS rev. 1.57, 1.58) Notes: svn path=/head/; revision=320579
* patch: if reading fails, do not go into infinite loop asking for a filename.Pedro F. Giffuni2017-06-081-2/+4
| | | | | | | | | | This can happen if no tty is available. Obtained from: OpenBSD (CVS rev 1.54) MFC after: 5 days Notes: svn path=/head/; revision=319676
* bc/dc/patch: make some use of reallocarray(3).Pedro F. Giffuni2017-03-051-2/+2
| | | | | | | | | | | reallocarray(3) is a non portable extension from OpenBSD. Given that it is already in FreeBSD, make easier future merges by adopting in some cases where the code has some shared heritage with OpenBSD. Obtained from: OpenBSD Notes: svn path=/head/; revision=314704
* patch(1): replace strnlen() with a simpler strlen().Pedro F. Giffuni2017-01-021-2/+2
| | | | | | | | | Small style fix with here. Pointed out by: kib Notes: svn path=/head/; revision=311110
* Revert r311106:Pedro F. Giffuni2017-01-023-12/+14
| | | | | | | | | | | patch(1): extend the maximum length of a line from USHRT_MAX to UINT_MAX. This doesn't really work for 32 bit platforms. Pointed out by: kib Notes: svn path=/head/; revision=311109
* patch(1): extend the maximum length of a line from USHRT_MAX to UINT_MAX.Pedro F. Giffuni2017-01-023-14/+12
| | | | | | | | | | We can handle such "big data" without much trouble. Try to do a better job at detecting the rejection cause while here. MFC after: 2 weeks Notes: svn path=/head/; revision=311106
* patch(1): make some macros look boolean.Pedro F. Giffuni2016-10-011-2/+1
| | | | | | | | | Similar to r306560, plus remove an unused macro. Suggested by: jmallett Notes: svn path=/head/; revision=306561
* patch(1): make some macros look boolean.Pedro F. Giffuni2016-10-011-2/+2
| | | | | | | | | | | | Minor cleanup inspired by a new patch(1) variant in schily tools. For reference: https://sourceforge.net/p/schillix-on/ MFC after: 1 week Notes: svn path=/head/; revision=306560
* Adjust a type from r267490.Pedro F. Giffuni2016-04-241-1/+1
| | | | | | | | Independent of the maximum length, the return type for strnlen(3) is always size_t. Notes: svn path=/head/; revision=298531
* patch(1): avoid signed integer overflow when debugging.Pedro F. Giffuni2016-04-241-2/+2
| | | | | | | | | | | Integer i is used to index p_end of type LINENUM (actually long). Match the types. MFC after: 5 days Notes: svn path=/head/; revision=298530
* META MODE: Update dependencies with 'the-lot' and add missing directories.Bryan Drewery2015-12-011-0/+18
| | | | | | | | | | | | | | | | | This is not properly respecting WITHOUT or ARCH dependencies in target/. Doing so requires a massive effort to rework targets/ to do so. A better approach will be to either include the SUBDIR Makefiles directly and map to DIRDEPS or just dynamically lookup the SUBDIR. These lose the benefit of having a userland/lib, userland/libexec, etc, though and results in a massive package. The current implementation of targets/ is very unmaintainable. Currently rescue/rescue and sys/modules are still not connected. Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=291563
* Fix a ton of speelling errorsEitan Adler2015-10-211-1/+1
| | | | | | | | | | arc lint is helpful Reviewed By: allanjude, wblock, #manpages, chris@bsdjunk.com Differential Revision: https://reviews.freebsd.org/D3337 Notes: svn path=/head/; revision=289677
* Remove automatic checkout feature.Xin LI2015-08-156-167/+19
| | | | | | | | | Obtained from: DragonFly via OpenBSD Relnotes: yes MFC: never Notes: svn path=/head/; revision=286795
* Use __DECONST instead of doing strdup/free.Xin LI2015-08-111-10/+5
| | | | | | | | Suggested by: ed MFC after: 2 weeks Notes: svn path=/head/; revision=286617
* use posix_spawn(3) instead of fork() and exec() manually as suggestedXin LI2015-08-101-41/+40
| | | | | | | | | | | by jmg@. Reviewed By: pfg MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D3353 Notes: svn path=/head/; revision=286601
* Fix shell injection vulnerability in patch(1) via ed(1) byXin LI2015-08-052-4/+16
| | | | | | | | | | | | | tightening sanity check of the input. [1] While I'm there also replace ed(1) with red(1) because we do not need the unrestricted functionality. [2] Obtained from: Bitrig [1], DragonFly [2] Security: CVE-2015-1418 [1] Notes: svn path=/head/; revision=286346
* Fix shell injection vulnerability in patch(1) and drop SCCSXin LI2015-07-282-41/+65
| | | | | | | | | | | | support by replacing system() with execve(). Future revisions may remove the functionality completely. Obtained from: Bitrig Security: CVE-2015-1416 Notes: svn path=/head/; revision=285974
* patch(1): Add -Vnone option to disable backup filesConrad Meyer2015-07-213-9/+14
| | | | | | | | | | | | Differential Revision: https://reviews.freebsd.org/D3146 Reviewed by: pfg Approved by: markj (mentor) MFC after: 1 week Relnotes: yes Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=285772
* patch(1): small include changes.Pedro F. Giffuni2015-04-203-4/+5
| | | | | | | | | Mostly to match OpenBSD, no functional change. Obtained from: OpenBSD Notes: svn path=/head/; revision=281800
* patch: Bring small updates from OpenBSDPedro F. Giffuni2015-04-071-19/+37
| | | | | | | | | | | | | | Prevent null pointer dereference on empty input files when diff requires a specific version. Fix division by zero for files with long lines (> 1024) in Plan B mode by supporting arbitrarily long lines. Obtained from: OpenBSD (CVS Rev 1.41, 1.42) MFC after: 1 week Notes: svn path=/head/; revision=281216
* Fixes to exit status.Pedro F. Giffuni2014-12-312-2/+2
| | | | | | | | | | | | | | Exit with EXIT_FAILURE for invalid arguments. Fixes NetBSD-PR 43517. Print version string to stdout instead of stderr; it is user-requested and not an error. Obtained from: NetBSD MFC after: 5 days Notes: svn path=/head/; revision=276472
* patch: Bring in xstrdup and use it when appropriate.Pedro F. Giffuni2014-12-254-18/+35
| | | | | | | | | | | | | | | The function savestr allows NULL return values during Plan A patching so in case of out of memory conditions, Plan B can step in. In many cases, NULL value is not properly handled, so use xstrdup here (it's outside Plan A/B patching, which means that even Plan B relies on successful operations). Clean up some whitespaces while here Obtained from: OpenBSD MFC after: 2 weeks Notes: svn path=/head/; revision=276218
* patch(1): avoid line number overflowsPedro F. Giffuni2014-12-082-34/+72
| | | | | | | | | | | | | | | | Introduce strtolinenum to properly check line numbers while parsing: no signs, no spaces, just digits, 0 <= x <= LONG_MAX Properly validate line ranges supplied in diff file to prevent overflows. Also fixes an out of boundary memory access because the resulting values are used as array indices. PR: 195436 Obtained from: OpenBSD (CVS pch.c rev 1.45, 1,46, common.h rev 1.28) MFC after: 1 week Notes: svn path=/head/; revision=275612
* Small space changesPedro F. Giffuni2014-12-071-8/+11
| | | | | | | | | | Mostly to keep in sync with OpenBSD and update the TAG. Obtained from: OpenBSD MFC after: 5 days Notes: svn path=/head/; revision=275582
* Prefer setvbuf() to setlinebuf().Pedro F. Giffuni2014-12-071-3/+3
| | | | | | | | | | On FreeBSD's libc setlinebuf is a wrapper to setvbuf anyways. Obtained from: OpenBSD MFC after: 5 days Notes: svn path=/head/; revision=275581
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-10 14:16:56 +0000