src/usr.bin/patch/util.c, branch releng/12.2FreeBSD source treehttps://cgit-dev.freebsd.org/src/atom?h=releng%2F12.22019-12-03T18:55:09ZMFC r351836, r351866, r354328: patch(1) /dev/null testing+improvement2019-12-03T18:55:09ZKyle Evanskevans@FreeBSD.org2019-12-03T18:55:09Zurn:sha1:be3a0c5043ce6f6dd57ad55276e9b67447be6867
r351836: patch(1): add some basic tests
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)
r351866: patch(1): fix the file removal test, strengthen it a bit
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.
r354328: patch(1): give /dev/null patches special treatment
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.
Remove automatic checkout feature.2015-08-15T00:42:33ZXin LIdelphij@FreeBSD.org2015-08-15T00:42:33Zurn:sha1:e678759c309d8840ca620c77e6a6668b704c3220
Obtained from: DragonFly via OpenBSD
Relnotes: yes
MFC: never
patch(1): small include changes.2015-04-20T22:15:18ZPedro F. Giffunipfg@FreeBSD.org2015-04-20T22:15:18Zurn:sha1:df6e4074c09bdc4e6da079bf9f0a03dffd42b482
Mostly to match OpenBSD, no functional change.
Obtained from: OpenBSD
Fixes to exit status.2014-12-31T16:30:33ZPedro F. Giffunipfg@FreeBSD.org2014-12-31T16:30:33Zurn:sha1:f718bedc4f28c4407e9b873a356c4d2cffbdfe36
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
patch: Bring in xstrdup and use it when appropriate.2014-12-25T21:51:28ZPedro F. Giffunipfg@FreeBSD.org2014-12-25T21:51:28Zurn:sha1:547e0acbec32a6bb2dc1e75804460ed9fd201d27
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
Improve bsdpatch usability:2013-09-26T18:00:45ZXin LIdelphij@FreeBSD.org2013-09-26T18:00:45Zurn:sha1:e11cd3bc59ee77f33a2d253d462dac6b3891e6e4
- Ask only once for "Apply anyway". [1]
- Tell user what file have failed patch rather than just how
many hunks failed.
Reported by: jmg via pfg [1]
Tested by: pfg [1]
Approved by: re (gjb)
Fix file selection logic for the RCS/SCCS case, as was done for the simple2013-09-05T05:51:15ZStefan Eßerse@FreeBSD.org2013-09-05T05:51:15Zurn:sha1:79d8aaa992b25eaf08162efd7eef37bdf9581227
file case before. Bump version because of the changed behavior, which now
matches the documentation.
Reviewed by: pfg
Revert r250972 to fix build.2013-05-25T07:17:16ZGlen Barbergjb@FreeBSD.org2013-05-25T07:17:16Zurn:sha1:ffca5883e80e522b22c15948e6f7d8eade7c009eThe error handling for writes to the target file could lead to the final2013-05-24T18:54:52ZStefan Eßerse@FreeBSD.org2013-05-24T18:54:52Zurn:sha1:2360cb0eeab2eae6afc8db630b7b167d19b33d6e
fclose() being skipped. Fix this by using boolean "&" and "|" instead of
short-cut operators "&&" and "||".
While here, increment the last part of the version string. The reason is
the fixed output file selection logic in pch.c, which was committed as
r250943, yesterday.
Reviewed by: pfg
patch: Follow original versioning convention.2013-02-08T19:39:15ZPedro F. Giffunipfg@FreeBSD.org2013-02-08T19:39:15Zurn:sha1:23a368256d11f038954bd82f20232ce94b85681e
According to the README file [1] the 12u variant, unlike
the 12g variant, contains no copyleft code. It is therefore
convenient to keep using the original versioning scheme to
prevent confusions.
[1] http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/patch/README