aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/patch/pch.c
Commit message (Collapse)AuthorAgeFilesLines
* 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-041-1/+26
| | | | | | | | | | | | | | | | 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): Exit successfully if we're fed a 0-length patchKyle Evans2019-03-011-0/+3
| | | | | | | | | | | | | | | | 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: 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(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
* Revert r311106:Pedro F. Giffuni2017-01-021-5/+5
| | | | | | | | | | | 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-021-5/+5
| | | | | | | | | | 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): 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
* 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-151-26/+9
| | | | | | | | | Obtained from: DragonFly via OpenBSD Relnotes: yes MFC: never Notes: svn path=/head/; revision=286795
* Fix shell injection vulnerability in patch(1) via ed(1) byXin LI2015-08-051-3/+15
| | | | | | | | | | | | | 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
* patch(1): small include changes.Pedro F. Giffuni2015-04-201-0/+1
| | | | | | | | | Mostly to match OpenBSD, no functional change. Obtained from: OpenBSD Notes: svn path=/head/; revision=281800
* patch: Bring in xstrdup and use it when appropriate.Pedro F. Giffuni2014-12-251-7/+7
| | | | | | | | | | | | | | | 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-081-34/+71
| | | | | | | | | | | | | | | | 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
* Merge fixes from OpenBSD.Pedro F. Giffuni2014-12-061-38/+40
| | | | | | | | | | | Check fstat return value. Also, use off_t for file size and offsets. Avoid iterating over end of string. Obtained from: OpenBSD (CVS rev. 1.41, 1.43) MFC after: 1 week Notes: svn path=/head/; revision=275553
* Update OpenBSD CVS revision for our r255232.Pedro F. Giffuni2014-12-051-1/+1
| | | | | | | | | This is a no-op to make it easier to track changes from OpenBSD MFC after: 3 days Notes: svn path=/head/; revision=275531
* patch: unsign the line length to avoid overflows.Pedro F. Giffuni2014-06-151-5/+5
| | | | | | | | | | | | | | | | | | Patch(1) uses a short int for the line length, which is usually sufficient for regular diffs, but makes no effort to signal when there is an overflow. Change the line length to an unsigned short int to better use the fact that a length is never negative. The change is loosely inspired on a related change in DragonFly, but we avoid spending more memory than necessary. While here adjust the messages to be clearer on what is happening. MFC after: 1 week Notes: svn path=/head/; revision=267490
* patch: cleanup some unnecessary cruft.Pedro F. Giffuni2014-06-141-16/+7
| | | | | | | | | | | - Drop some bogus casts to size_t. - The new_p_foo variables are not needed after r267426. Pointed out by: bde MFC after: 1 week Notes: svn path=/head/; revision=267464
* Avoid zeroing during allocation.Pedro F. Giffuni2014-06-121-14/+6
| | | | | | | | | | | | | | | | | This change reverts a change from OpenBSD which made use of calloc, and therefore wasted time initializing arrays that will later be realloc'ed. Consistently use FreeBSD's reallocf(). While here also merge the changes from OpenBSD's manpage patch.1 Rev 1.27: "patch was moved from user portability (UP) to base in issue 7 and is no longer optional" MFC after: 1 week Notes: svn path=/head/; revision=267426
* Fix file selection logic for the RCS/SCCS case, as was done for the simpleStefan Eßer2013-09-051-33/+26
| | | | | | | | | | file case before. Bump version because of the changed behavior, which now matches the documentation. Reviewed by: pfg Notes: svn path=/head/; revision=255232
* Merge r252513 from src/gnu/usr.bin/patch into src/usr.bin/patch:David E. O'Brien2013-07-031-1/+1
| | | | | | | | | | | Properly handle input lines containing NUL characters such that pgets() accurately fills the read buffer. Callers of pgets() still mis-process the buffer contents if the read line contains NUL characters, but this at least makes pgets() accurate. Notes: svn path=/head/; revision=252637
* Merge r252512 from src/gnu/usr.bin/patch into src/usr.bin/patch:David E. O'Brien2013-07-031-2/+6
| | | | | | | | | | | | Make it so that 'patch < FUBAR' and 'patch -i FUBAR' operate the same. The former makes a copy of stdin, but was not accurately putting the content of stdin into a temp file. This lead to the undercounting the number of lines in hunks containing NUL characters when reading from stdin. Thus resulting in "unexpected end of file in patch" errors. Notes: svn path=/head/; revision=252636
* Fix target selection logic, which did not comply with the man page.Stefan Eßer2013-05-231-2/+8
| | | | | | | | | | | | | | | | | | | Instead of using the file with the least order of path name components, shortest filename and finally the shortest basename (with the search stopping as soon as one of these conditions is true), the first filename checked was used as the reference, and another filename was only selected if all of the above comparisons are in favour of the latter file. This was wrong, because filenames with path less components were only considered, if both of the other conditions were true as well. In fact, the first filename to be checked had good chances to be selected in the end, since it only needed to be better with regard to any one of the three criteria ... Reviewed by: delphij@freebsd.org Notes: svn path=/head/; revision=250943
* - Refresh code with latest OpenBSD revisions.Xin LI2013-01-291-4/+3
| | | | | | | | | | | | - Remove $DragonFly$ tags as they are using git nowadays and VCS tags will not help merging. - Other changes to Copyright headers to make them consistent with other source code, we intend to fork from this point. Reviewed by: pfg Notes: svn path=/head/; revision=246091
* - Add a BSD-licensed patch, ported by Pedro F. Giffuni (pfg) fromGabor Kovesdan2013-01-291-0/+1594
| | | | | | | | | | | DragonflyBSD and install it as bsdpatch. WITH_BSD_PATCH makes it default and installs GNU patch as gnupatch. Submitted by: pfg Obtained from: The DragonflyBSD Project Notes: svn path=/head/; revision=246074
* kill the undeadPeter Wemm1997-07-131-1108/+0
| | | | Notes: svn path=/head/; revision=27369
* Finish importing Lite2's src/usr.bin, except for ex, diff, grep, mail,Bruce Evans1997-07-061-0/+1108
pascal and vmstat.sparc. All changed files on the vendor branch should already have been imported. Notes: svn path=/vendor/CSRG/dist/; revision=27241
generated by cgit v1.3 (git 2.53.0) at 2026-05-21 13:19:30 +0000