aboutsummaryrefslogtreecommitdiff
path: root/gnu/usr.bin/patch
Commit message (Collapse)AuthorAgeFilesLines
* MFC 1.14: Remove extra "the".Daniel Harris2004-03-191-1/+1
| | | | Notes: svn path=/stable/4/; revision=127201
* MFC: 1.7John W. De Boskey2003-08-231-1/+1
| | | | Notes: svn path=/stable/4/; revision=119365
* MFC: Prevent stack-smashing buffer overflows in -D and -r options by usingKris Kennaway2003-02-152-6/+10
| | | | | | | | buffer-safe string functions. The rest of the code is still probably unsafe. Notes: svn path=/stable/4/; revision=110901
* MFC 1.12: Restore vendor CVS keywords; eliminate troff(1) warnings.Garance A Drosehn2002-04-301-1/+3
| | | | | | | [done in current by ru in July 2001] Notes: svn path=/stable/4/; revision=95822
* MFC *: Add many prototypes and ANSI-ize 'patch. Not a complete job of it, butGarance A Drosehn2002-04-3014-263/+221
| | | | | | | | | | | | | it gets our patch to look a little more like NetBSD's, and it is nice in that the object code remains exactly the same (even though this does result in two compile-time warnings that didn't happen before). [* = 1.6 backupfile.c, 1.5 backupfile.h, 1.8 common.h, 1.6 getopt.c, 1.5 getopt.h, 1.11 inp.c, 1.7 inp.h, 1.20 patch.c, 1.19 pch.c, 1.7 pch.h, 1.9 util.c, 1.8 util.h, 1.7 version.c, 1.7 version.h] Notes: svn path=/stable/4/; revision=95820
* MFC *: Add FreeBSD id's to these files, in advance of a separate update.Garance A Drosehn2002-04-304-3/+18
| | | | | | | [* = 1.5 backupfile.c, 1.4 backupfile.h, 1.5 getopt.c, 1.4 getopt.h] Notes: svn path=/stable/4/; revision=95819
* MFC 1.18: Modify our 'patch' utility to recognize theGarance A Drosehn2002-04-301-0/+64
| | | | | | | | | | | | \ 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. Obtained from: NetBSD Notes: svn path=/stable/4/; revision=95818
* MFC:Juli Mallett2002-04-092-3/+17
| | | | | | | | | | Add -i option (SUSv3) to patch(1). This allows one to specify a patch file on command line instead of stdin. Requested by: mike Notes: svn path=/stable/4/; revision=94268
* MFC: MAN[1-9] -> MAN.Ruslan Ermilov2001-04-251-3/+5
| | | | Notes: svn path=/stable/4/; revision=75959
* MFC: add /dev/zero and use PATH_* where possible.David E. O'Brien2000-12-111-2/+6
| | | | Notes: svn path=/stable/4/; revision=69839
* MFC: Fix patch such that skipping files does not count as a failure.Kelly Yancey2000-08-142-2/+8
| | | | Notes: svn path=/stable/4/; revision=64635
* Clean up some $Log$ debris, including some real messes.Peter Wemm1999-09-0512-322/+0
| | | | Notes: svn path=/head/; revision=50965
* $Header$ -> $FreeBSD$Peter Wemm1999-08-2812-12/+53
| | | | Notes: svn path=/head/; revision=50488
* Add PATCH_INDEX_FIRST environment variable to do the same as -I optionAndrey A. Chernov1998-01-222-4/+17
| | | | Notes: svn path=/head/; revision=32698
* Update usage line with new optionAndrey A. Chernov1998-01-211-2/+6
| | | | Notes: svn path=/head/; revision=32674
* Add -I or --index-first option to take Index: precedence over context diff,Andrey A. Chernov1998-01-213-5/+32
| | | | | | | as it was in hacked FreeBSD version Notes: svn path=/head/; revision=32673
* Resurrect patch 2.1 without FreeBSD Index: hackAndrey A. Chernov1998-01-2121-121/+5867
| | | | Notes: svn path=/head/; revision=32672
* Upgrade to 2.5 (contrib version)Andrey A. Chernov1998-01-0421-5804/+121
| | | | Notes: svn path=/head/; revision=32252
* Back out Index over +++/--- precedence.Andrey A. Chernov1998-01-031-5/+10
| | | | | | | | | | 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
* Add (unsigned char) cast to ctype macrosAndrey A. Chernov1997-10-234-38/+82
| | | | Notes: svn path=/head/; revision=30661
* fix compilation warnings in patch... (with slight modification)John-Mark Gurney1997-03-175-6/+34
| | | | | | | | | | | 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
* Fix a problem with patch in that is will always default, even when theJohn-Mark Gurney1997-02-136-16/+37
| | | | | | | | | | | | | | | | 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
* Attempt to break a $Log$ snafu where a *** /--- (minus space)Mark Murray1996-04-121-1/+16
| | | | | | | was fouling up a comment in the checked-out code. Notes: svn path=/head/; revision=15214
* Priorities were broken. If there was an Index: line and ***/--- linesMark Murray1996-04-111-4/+11
| | | | | | | | | | | | | | | | | | 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
* Update the manual page to reflect the fact that an "Index" lineJohn Polstra1996-02-071-2/+5
| | | | | | | | now takes precedence over a context diff header for determining the name of the file to patch. Notes: svn path=/head/; revision=13960
* Give "Index" specified filenames preference over other filenames specifiedJustin T. Gibbs1995-09-141-3/+6
| | | | | | | | | | 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
* Remove trailing whitespace.Rodney W. Grimes1995-05-3015-97/+133
| | | | Notes: svn path=/head/; revision=8858
* Fix bug that created new files even when running in -C check mode.Jeffrey Hsu1995-01-122-4/+16
| | | | | | | Reviewed by: phk Notes: svn path=/head/; revision=5556
* added the -C/-check again.Poul-Henning Kamp1994-02-253-8/+35
| | | | Notes: svn path=/head/; revision=1212
* Put this back - I was somehow under the erroneous impression that patch was inJordan K. Hubbard1994-02-173-23/+20
| | | | | | | ports, until I saw the the commit messages, that is! :-) All changed backed out. Notes: svn path=/head/; revision=1174
* From Poul-Henning Kamp - Implement a -C option to verify the integrity ofJordan K. Hubbard1994-02-173-11/+35
| | | | | | | a patch before actually applying it. Notes: svn path=/head/; revision=1173
* Increaed the fixed static buffer sizes and maximum hunk size thatRich Murphey1993-09-221-5/+8
| | | | | | | otherwise causes the XFree86 1.3 patch set to fail. Notes: svn path=/head/; revision=497
* b-maked patch-2.10Paul Richards1993-06-1921-0/+5600
Notes: svn path=/cvs2svn/branches/unlabeled-1.1.1/; revision=33