summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/patch
AgeCommit message (Collapse)Author
2013-09-03Remove our hacked GNU patch.Pedro F. Giffuni
The old (2.1) GNU patch has outlived its days. The major local changes have been moved into the less restrictedly licensed patch(1) we adopted in usr.bin/ . A much newer version of GNU patch is available in the ports tree (devel/patch). Disconnect from the build and remove. Notes: svn path=/head/; revision=255191
2013-08-29Drop build option switch for the older GNU patch.Pedro F. Giffuni
As promised, drop the option to make the older GNU patch the default. GNU patch is still being built but something drastic may happen to it to it before Release. Notes: svn path=/head/; revision=255014
2013-07-26Make the BSD-licensed patch the default.Pedro F. Giffuni
The BSD-licensed patch(1) command has matured and it's behaviour can be considered equivalent to the older version of GNU patch in the tree. The switch has been extensively tested [1] and only two ports presented regressions, which have since been fixed. For convenience a new WITH_GNU_PATCH option is available, but it will likely be removed in the near future. PR: 176313 Approved by: portmgr Notes: svn path=/head/; revision=253689
2013-07-02Properly handle input lines containing NUL characters such that pgets()David E. O'Brien
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=252513
2013-07-02Make it so that 'patch < FUBAR' and 'patch -i FUBAR' operate the same.David E. O'Brien
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=252512
2013-01-29- Add a BSD-licensed patch, ported by Pedro F. Giffuni (pfg) fromGabor Kovesdan
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
2009-09-16The buffer returned by fgenln is not a "C" string and might not be NULStephane E. Potvin
terminated. Make sure that it is before using it. Reviewed by: marck@ MFC after: 3 days Notes: svn path=/head/; revision=197259
2009-08-23Add support for diffs generated by Perforce.Ed Schouten
It basically picks the filenames from the "====" line and strips off the # revision number. Notes: svn path=/head/; revision=196459
2009-05-08Change the internal buffer used to store input lines from a static bufferStephane E. Potvin
to a dynamically allocated one in order to support input lines of arbitrary length. Approved by: kan (mentor) MFC after: 1 month Notes: svn path=/head/; revision=191910
2004-03-18Get rid of a spurious "the".Daniel Harris
PR: 64081 Submitted by: Chris Pepper <pepper@reppep.com> MFC after: 1 day Notes: svn path=/head/; revision=127185
2004-02-17Remove getopt*.c, we already have compatible getopt_long() in libcAndrey A. Chernov
Notes: svn path=/head/; revision=125910
2003-10-26Since I'm having so much fun with const, beat my head against the wallPeter Wemm
some more. Make this compile cleanly. Notes: svn path=/head/; revision=121535
2003-07-29returned length can exceed the limits of type charJohn W. De Boskey
Submitted by: blc@bsdwins.com Approved by: gad MFC after: 1 week Notes: svn path=/head/; revision=118136
2002-10-13Prevent stack-smashing buffer overflows in -D and -r options by usingKris Kennaway
buffer-safe string functions. The rest of the code is still probably unsafe. MFC after: 1 week Notes: svn path=/head/; revision=105017
2002-05-21Change parts of the source code to make it closer to style(9), mainlyGarance A Drosehn
changing indentation and some comments. Main goal is not perfect style, but just to reduce differences with NetBSD. The object code is exactly the same after this change as before it (except for assert() statements which have moved). Reviewed by: /sbin/md5 on i386 Obtained from: NetBSD Notes: svn path=/head/; revision=97028
2002-04-28Add many prototypes and ANSI-ize 'patch. Not a complete job of it, but it getsGarance A Drosehn
our patch to look a little more like NetBSD's, and has the nice characteristic that the object code is exactly the same after the change as before it (even in patch.c and pch.c, which have pesky 'assert' statements in them). Reviewed by: /sbin/md5 on i386, alpha, sparc64 MFC after: 3 days Notes: svn path=/head/; revision=95601
2002-04-28Add FreeBSD id's to these files, in advance of a separate update.Garance A Drosehn
MFC after: 3 days Notes: svn path=/head/; revision=95600
2002-04-26Modify our 'patch' utility to recognize theGarance A Drosehn
\ No newline at end of file line that some versions of diff print out if the last line of the two files are different, and one of the two files does not have a newline character on that last line. This change is still somewhat under discussion in -arch and -standards, but I want to commit it to -current today so I'd have the chance to MFC it to -stable before the code freeze for 4.6-release (which would be May 1st). Note: the related change to 'diff' (so it might *generate* that line) is NOT expected to be included in 4.6-release. We can debate that change later. Obtained from: NetBSD (1.13 of basesrc/usr.bin/patch/pch.c, by kristerw) MFC after: 4 days Notes: svn path=/head/; revision=95514
2002-02-08Add -i option (SUSv3) to patch(1). This allows one to specify aMike Barcroft
patch file on command line instead of stdin. Submitted by: Joseph Mallett <jmallett@xMach.org> MFC after: 1 month Notes: svn path=/head/; revision=90379
2001-07-12Restore vendor CVS keywords; eliminate troff(1) warnings.Ruslan Ermilov
Notes: svn path=/head/; revision=79632
2001-03-27MAN[1-9] -> MAN.Ruslan Ermilov
Notes: svn path=/head/; revision=74861
2000-12-09Add `_PATH_DEVZERO'.David E. O'Brien
Use _PATH_* where where possible. Notes: svn path=/head/; revision=69793
2000-08-02Fix previous commit such that only -S/--skip ignores errors when applyingKelly Yancey
a patch, returning -f/--force and -t/--batch to their previous semantics. Pointed out by: asami Notes: svn path=/head/; revision=64156
2000-08-02Fix patch such that skipping files does not count as a failure.Kelly Yancey
Previously, using -S/--skip, -f/--force, or -t/--batch to skip a patch in a patchset still registers a failure which causes patch to return a non-zero exit code. This is particularly undesirable with regards to ports as there is no way to ignore the non-zero code. (Luckily, we don't currently have any ports that make use of any of these options.) The PR (yes, my own) is slightly incorrect: It states that -f does indeed properly skip patches. It does, but it still sets the failure flag causing patch to return non-zero. PR: 19638 Submitted by: kbyanc@posi.net Notes: svn path=/head/; revision=64120
1999-09-05Clean up some $Log$ debris, including some real messes.Peter Wemm
Notes: svn path=/head/; revision=50965
1999-08-28$Header$ -> $FreeBSD$Peter Wemm
Notes: svn path=/head/; revision=50488
1998-01-22Add PATCH_INDEX_FIRST environment variable to do the same as -I optionAndrey A. Chernov
Notes: svn path=/head/; revision=32698
1998-01-21Update usage line with new optionAndrey A. Chernov
Notes: svn path=/head/; revision=32674
1998-01-21Add -I or --index-first option to take Index: precedence over context diff,Andrey A. Chernov
as it was in hacked FreeBSD version Notes: svn path=/head/; revision=32673
1998-01-21Resurrect patch 2.1 without FreeBSD Index: hackAndrey A. Chernov
Notes: svn path=/head/; revision=32672
1998-01-04Upgrade to 2.5 (contrib version)Andrey A. Chernov
Notes: svn path=/head/; revision=32252
1998-01-03Back out Index over +++/--- precedence.Andrey A. Chernov
It maybe right, if patch was FreeBSD-own program, but it break compatibility with pre-existent patches in other systems. The example is big ncurses patch which don't apply on FreeBSD due to "fixed" precedence. Notes: svn path=/head/; revision=32224
1997-10-23Add (unsigned char) cast to ctype macrosAndrey A. Chernov
Notes: svn path=/head/; revision=30661
1997-03-17fix compilation warnings in patch... (with slight modification)John-Mark Gurney
also remove -Wall that I acidentally committed last time I was here... Submitted-by: Philippe Charnier Closes PR#2998 Notes: svn path=/head/; revision=23955
1997-02-13Fix a problem with patch in that is will always default, even when theJohn-Mark Gurney
controlling terminal is closed. Now the function ask() will return 1 when th input is known to come from a file or terminal, or it will return 0 when ther was a read error. Modified the question "Skip patch?" so that on an error from ask it will skip the patch instead of looping. Closes PR#777 2.2 candidate Notes: svn path=/head/; revision=22674
1996-04-12Attempt to break a $Log$ snafu where a *** /--- (minus space)Mark Murray
was fouling up a comment in the checked-out code. Notes: svn path=/head/; revision=15214
1996-04-11Priorities were broken. If there was an Index: line and ***/--- linesMark Murray
with valid names, the ***/---names were taken first. this broke eg: Index: foo/Makefile ========== RCS <blah> Retrieving <blah> diff <blah> *** Makefile <blah> --- Makefile <blah> By trying to patch the Makefile in the _curent_ directory, rather than the one in the foo/ directory. Notes: svn path=/head/; revision=15195
1996-02-07Update the manual page to reflect the fact that an "Index" lineJohn Polstra
now takes precedence over a context diff header for determining the name of the file to patch. Notes: svn path=/head/; revision=13960
1995-09-14Give "Index" specified filenames preference over other filenames specifiedJustin T. Gibbs
in the diff. This makes it so that diffs containing files in different subdirectories that have the same name not patch the same file. For example a diff with patches to Makefile, des/Makefile, usr.bin/Makefile would attempt to patch Makefile three times. Notes: svn path=/head/; revision=10723
1995-05-30Remove trailing whitespace.Rodney W. Grimes
Notes: svn path=/head/; revision=8858
1995-01-12Fix bug that created new files even when running in -C check mode.Jeffrey Hsu
Reviewed by: phk Notes: svn path=/head/; revision=5556
1994-02-25added the -C/-check again.Poul-Henning Kamp
Notes: svn path=/head/; revision=1212
1994-02-17Put this back - I was somehow under the erroneous impression that patch was inJordan K. Hubbard
ports, until I saw the the commit messages, that is! :-) All changed backed out. Notes: svn path=/head/; revision=1174
1994-02-17From Poul-Henning Kamp - Implement a -C option to verify the integrity ofJordan K. Hubbard
a patch before actually applying it. Notes: svn path=/head/; revision=1173
1993-09-22Increaed the fixed static buffer sizes and maximum hunk size thatRich Murphey
otherwise causes the XFree86 1.3 patch set to fail. Notes: svn path=/head/; revision=497
1993-06-19b-maked patch-2.10Paul Richards
Notes: svn path=/cvs2svn/branches/unlabeled-1.1.1/; revision=33
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-20 05:55:41 +0000