summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/patch/pch.c
Commit message (Collapse)AuthorAgeFilesLines
* This commit was manufactured by cvs2svn to create tagrelease/5.1.0_cvscvs2svn2003-06-041-1/+1
| | | | | | | 'RELENG_5_1_0_RELEASE'. This commit was manufactured to restore the state of the 5.1-RELEASE image. Releases prior to 5.3-RELEASE are omitting the secure/ and crypto/ subdirs.
* Change parts of the source code to make it closer to style(9), mainlyGarance A Drosehn2002-05-211-457/+480
| | | | | | | | | | | | | 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
* Add many prototypes and ANSI-ize 'patch. Not a complete job of it, but it getsGarance A Drosehn2002-04-281-69/+77
| | | | | | | | | | | | 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
* Modify our 'patch' utility to recognize theGarance A Drosehn2002-04-261-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. 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
* Fix patch such that skipping files does not count as a failure.Kelly Yancey2000-08-021-1/+1
| | | | | | | | | | | | | | | | | | 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
* Clean up some $Log$ debris, including some real messes.Peter Wemm1999-09-051-109/+0
| | | | Notes: svn path=/head/; revision=50965
* $Header$ -> $FreeBSD$Peter Wemm1999-08-281-1/+9
| | | | Notes: svn path=/head/; revision=50488
* Add -I or --index-first option to take Index: precedence over context diff,Andrey A. Chernov1998-01-211-2/+11
| | | | | | | as it was in hacked FreeBSD version Notes: svn path=/head/; revision=32673
* Resurrect patch 2.1 without FreeBSD Index: hackAndrey A. Chernov1998-01-211-0/+1401
| | | | Notes: svn path=/head/; revision=32672
* Upgrade to 2.5 (contrib version)Andrey A. Chernov1998-01-041-1381/+0
| | | | 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-231-24/+50
| | | | Notes: svn path=/head/; revision=30661
* Fix a problem with patch in that is will always default, even when theJohn-Mark Gurney1997-02-131-5/+10
| | | | | | | | | | | | | | | | 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
* 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-301-18/+21
| | | | Notes: svn path=/head/; revision=8858
* added the -C/-check again.Poul-Henning Kamp1994-02-251-1/+6
| | | | Notes: svn path=/head/; revision=1212
* Put this back - I was somehow under the erroneous impression that patch was inJordan K. Hubbard1994-02-171-2/+5
| | | | | | | 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-171-2/+6
| | | | | | | a patch before actually applying it. Notes: svn path=/head/; revision=1173
* b-maked patch-2.10Paul Richards1993-06-191-0/+1305
Notes: svn path=/cvs2svn/branches/unlabeled-1.1.1/; revision=33
generated by cgit v1.3 (git 2.53.0) at 2026-05-30 07:18:52 +0000