The UNIX CD Bookshelf

home *** CD-ROM | disk | FTP | other *** search
/ The UNIX CD Bookshelf / OREILLY_TUCB_UNIX_CD.iso / upt / examples / RS6000 / ARCHIVE / PATCH.Z / PATCH
Tape Archive | 1993-06-24 | 110.0 KB
open in:
MacOS 8.1 extracted |
Win98 extracted |
DOS extracted
browse contents |
view JSON data |
view as text

This file was processed as: Tape Archive (archive/tar).
Confidence	Program	Detection	Match Type	Support
`100%`	dexvert	Tape Archive `(archive/tar)`	magic	Supported
`20%`	dexvert	Extreme Tracker `(music/extremeTracker)`	fileSize	Supported
`100%`	file	POSIX tar archive (GNU)	default
`99%`	file	POSIX tar archive (GNU), directory ./, mode 240775 , uid 0 , gid 145 , size 0 , seconds 5412223663, user root, group softdev	default
`98%`	file	data	default
`41%`	TrID	Sybase iAnywhere database files	default (weak)
`36%`	TrID	TAR - Tape ARchive (GNU)	default
`21%`	TrID	TAR - Tape ARchive (directory)	default
`100%`	siegfried	x-fmt/265 Tape Archive Format	default
`100%`	lsar	Tar	default
`100%`	gt2	TAR Archiv gefunden (Auflistung ist deaktiviert)	default
`100%`	disktype	GNU tar archive	default
`100%`	detectItEasy	Archive: tar	default
`100%`	binwalkID	POSIX tar archive (GNU)	default
`100%`	xdgMime	application/x-tar	default
hex view
+--------+-------------------------+-------------------------+--------+--------+
|00000000| 2e 2f 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |./......|........|
|00000010| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000020| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000030| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000040| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000050| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000060| 00 00 00 00 32 34 30 37 | 37 35 20 00 20 20 20 20 |....2407|75 .    |
|00000070| 20 30 20 00 20 20 20 31 | 34 35 20 00 20 20 20 20 | 0 .   1|45 .    |
|00000080| 20 20 20 20 20 20 30 20 | 20 35 34 31 32 32 32 33 |      0 | 5412223|
|00000090| 36 36 33 20 20 20 37 37 | 36 35 00 20 35 00 00 00 |663   77|65. 5...|
|000000a0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000000b0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000000c0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000000d0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000000e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000000f0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000100| 00 75 73 74 61 72 20 20 | 00 72 6f 6f 74 00 00 00 |.ustar  |.root...|
|00000110| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000120| 00 00 00 00 00 00 00 00 | 00 73 6f 66 74 64 65 76 |........|.softdev|
|00000130| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000140| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000150| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000160| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000170| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000180| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000190| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000001a0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000001b0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000001c0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000001d0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000001e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000001f0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000200| 6d 61 6e 2f 00 00 00 00 | 00 00 00 00 00 00 00 00 |man/....|........|
|00000210| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000220| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000230| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000240| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000250| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000260| 00 00 00 00 32 34 30 37 | 37 35 20 00 20 20 20 33 |....2407|75 .   3|
|00000270| 31 30 20 00 20 20 20 31 | 34 35 20 00 20 20 20 20 |10 .   1|45 .    |
|00000280| 20 20 20 20 20 20 30 20 | 20 35 34 31 30 36 31 32 |      0 | 5410612|
|00000290| 33 34 32 20 20 31 30 33 | 37 30 00 20 35 00 00 00 |342  103|70. 5...|
|000002a0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000002b0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000002c0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000002d0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000002e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000002f0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000300| 00 75 73 74 61 72 20 20 | 00 6a 65 66 66 00 00 00 |.ustar  |.jeff...|
|00000310| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000320| 00 00 00 00 00 00 00 00 | 00 73 6f 66 74 64 65 76 |........|.softdev|
|00000330| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000340| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000350| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000360| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000370| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000380| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000390| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000003a0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000003b0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000003c0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000003d0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000003e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000003f0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000400| 6d 61 6e 2f 6d 61 6e 31 | 2f 00 00 00 00 00 00 00 |man/man1|/.......|
|00000410| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000420| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000430| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000440| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000450| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000460| 00 00 00 00 32 34 30 37 | 37 35 20 00 20 20 20 33 |....2407|75 .   3|
|00000470| 31 30 20 00 20 20 20 31 | 34 35 20 00 20 20 20 20 |10 .   1|45 .    |
|00000480| 20 20 20 20 20 20 30 20 | 20 35 34 31 32 32 32 34 |      0 | 5412224|
|00000490| 30 32 37 20 20 31 31 32 | 32 35 00 20 35 00 00 00 |027  112|25. 5...|
|000004a0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000004b0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000004c0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000004d0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000004e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000004f0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000500| 00 75 73 74 61 72 20 20 | 00 6a 65 66 66 00 00 00 |.ustar  |.jeff...|
|00000510| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000520| 00 00 00 00 00 00 00 00 | 00 73 6f 66 74 64 65 76 |........|.softdev|
|00000530| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000540| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000550| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000560| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000570| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000580| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000590| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000005a0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000005b0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000005c0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000005d0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000005e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000005f0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000600| 6d 61 6e 2f 6d 61 6e 31 | 2f 70 61 74 63 68 2e 31 |man/man1|/patch.1|
|00000610| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000620| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000630| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000640| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000650| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000660| 00 00 00 00 31 30 30 36 | 34 34 20 00 20 20 20 33 |....1006|44 .   3|
|00000670| 31 31 20 00 20 20 20 31 | 34 35 20 00 20 20 20 20 |11 .   1|45 .    |
|00000680| 20 20 34 32 34 31 34 20 | 20 35 34 31 32 32 32 34 |  42414 | 5412224|
|00000690| 30 33 30 20 20 31 32 33 | 34 31 00 20 30 00 00 00 |030  123|41. 0...|
|000006a0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000006b0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000006c0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000006d0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000006e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000006f0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000700| 00 75 73 74 61 72 20 20 | 00 74 65 64 00 00 00 00 |.ustar  |.ted....|
|00000710| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000720| 00 00 00 00 00 00 00 00 | 00 73 6f 66 74 64 65 76 |........|.softdev|
|00000730| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000740| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000750| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000760| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000770| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000780| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000790| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000007a0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000007b0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000007c0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000007d0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000007e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000007f0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000800| 2e 5c 22 20 2d 2a 2d 20 | 6e 72 6f 66 66 20 2d 2a |.\" -*- |nroff -*|
|00000810| 2d 0a 2e 72 6e 20 27 27 | 20 7d 60 0a 27 5c 22 20 |-..rn ''| }`.'\" |
|00000820| 24 48 65 61 64 65 72 3a | 20 70 61 74 63 68 2e 6d |$Header:| patch.m|
|00000830| 61 6e 2c 76 20 32 2e 30 | 2e 31 2e 32 20 38 38 2f |an,v 2.0|.1.2 88/|
|00000840| 30 36 2f 32 32 20 32 30 | 3a 34 37 3a 31 38 20 6c |06/22 20|:47:18 l|
|00000850| 77 61 6c 6c 20 4c 6f 63 | 6b 65 64 20 24 0a 27 5c |wall Loc|ked $.'\|
|00000860| 22 20 0a 27 5c 22 20 24 | 4c 6f 67 3a 09 70 61 74 |" .'\" $|Log:.pat|
|00000870| 63 68 2e 6d 61 6e 2c 76 | 20 24 0a 27 5c 22 20 52 |ch.man,v| $.'\" R|
|00000880| 65 76 69 73 69 6f 6e 20 | 32 2e 30 2e 31 2e 32 20 |evision |2.0.1.2 |
|00000890| 20 38 38 2f 30 36 2f 32 | 32 20 20 32 30 3a 34 37 | 88/06/2|2  20:47|
|000008a0| 3a 31 38 20 20 6c 77 61 | 6c 6c 0a 27 5c 22 20 70 |:18  lwa|ll.'\" p|
|000008b0| 61 74 63 68 31 32 3a 20 | 6e 6f 77 20 61 76 6f 69 |atch12: |now avoi|
|000008c0| 64 73 20 42 65 6c 6c 20 | 53 79 73 74 65 6d 20 4c |ds Bell |System L|
|000008d0| 6f 67 6f 0a 27 5c 22 20 | 0a 27 5c 22 20 52 65 76 |ogo.'\" |.'\" Rev|
|000008e0| 69 73 69 6f 6e 20 32 2e | 30 2e 31 2e 31 20 20 38 |ision 2.|0.1.1  8|
|000008f0| 38 2f 30 36 2f 30 33 20 | 20 31 35 3a 31 32 3a 35 |8/06/03 | 15:12:5|
|00000900| 31 20 20 6c 77 61 6c 6c | 0a 27 5c 22 20 70 61 74 |1  lwall|.'\" pat|
|00000910| 63 68 31 30 3a 20 2d 42 | 20 73 77 69 74 63 68 20 |ch10: -B| switch |
|00000920| 77 61 73 20 63 6f 6e 74 | 72 69 62 75 74 65 64 2e |was cont|ributed.|
|00000930| 0a 27 5c 22 20 0a 27 5c | 22 20 52 65 76 69 73 69 |.'\" .'\|" Revisi|
|00000940| 6f 6e 20 32 2e 30 20 20 | 38 36 2f 30 39 2f 31 37 |on 2.0  |86/09/17|
|00000950| 20 20 31 35 3a 33 39 3a | 30 39 20 20 6c 77 61 6c |  15:39:|09  lwal|
|00000960| 6c 0a 27 5c 22 20 42 61 | 73 65 6c 69 6e 65 20 66 |l.'\" Ba|seline f|
|00000970| 6f 72 20 6e 65 74 77 69 | 64 65 20 72 65 6c 65 61 |or netwi|de relea|
|00000980| 73 65 2e 0a 27 5c 22 20 | 0a 27 5c 22 20 52 65 76 |se..'\" |.'\" Rev|
|00000990| 69 73 69 6f 6e 20 31 2e | 34 20 20 38 36 2f 30 38 |ision 1.|4  86/08|
|000009a0| 2f 30 31 20 20 31 39 3a | 32 33 3a 32 32 20 20 6c |/01  19:|23:22  l|
|000009b0| 77 61 6c 6c 0a 27 5c 22 | 20 44 6f 63 75 6d 65 6e |wall.'\"| Documen|
|000009c0| 74 65 64 20 2d 76 2c 20 | 2d 70 2c 20 2d 46 2e 0a |ted -v, |-p, -F..|
|000009d0| 27 5c 22 20 41 64 64 65 | 64 20 6e 6f 74 65 73 20 |'\" Adde|d notes |
|000009e0| 74 6f 20 70 61 74 63 68 | 20 73 65 6e 64 65 72 73 |to patch| senders|
|000009f0| 2e 0a 27 5c 22 20 0a 27 | 5c 22 20 52 65 76 69 73 |..'\" .'|\" Revis|
|00000a00| 69 6f 6e 20 31 2e 33 20 | 20 38 35 2f 30 33 2f 32 |ion 1.3 | 85/03/2|
|00000a10| 36 20 20 31 35 3a 31 31 | 3a 30 36 20 20 6c 77 61 |6  15:11|:06  lwa|
|00000a20| 6c 6c 0a 27 5c 22 20 46 | 72 6f 7a 65 6e 2e 0a 27 |ll.'\" F|rozen..'|
|00000a30| 5c 22 20 0a 27 5c 22 20 | 52 65 76 69 73 69 6f 6e |\" .'\" |Revision|
|00000a40| 20 31 2e 32 2e 31 2e 34 | 20 20 38 35 2f 30 33 2f | 1.2.1.4|  85/03/|
|00000a50| 31 32 20 20 31 36 3a 31 | 34 3a 32 37 20 20 6c 77 |12  16:1|4:27  lw|
|00000a60| 61 6c 6c 0a 27 5c 22 20 | 44 6f 63 75 6d 65 6e 74 |all.'\" |Document|
|00000a70| 65 64 20 2d 70 2e 0a 27 | 5c 22 20 0a 27 5c 22 20 |ed -p..'|\" .'\" |
|00000a80| 52 65 76 69 73 69 6f 6e | 20 31 2e 32 2e 31 2e 33 |Revision| 1.2.1.3|
|00000a90| 20 20 38 35 2f 30 33 2f | 31 32 20 20 31 36 3a 30 |  85/03/|12  16:0|
|00000aa0| 39 3a 34 31 20 20 6c 77 | 61 6c 6c 0a 27 5c 22 20 |9:41  lw|all.'\" |
|00000ab0| 44 6f 63 75 6d 65 6e 74 | 65 64 20 2d 44 2e 0a 27 |Document|ed -D..'|
|00000ac0| 5c 22 20 0a 27 5c 22 20 | 52 65 76 69 73 69 6f 6e |\" .'\" |Revision|
|00000ad0| 20 31 2e 32 2e 31 2e 32 | 20 20 38 34 2f 31 32 2f | 1.2.1.2|  84/12/|
|00000ae0| 30 35 20 20 31 31 3a 30 | 36 3a 35 35 20 20 6c 77 |05  11:0|6:55  lw|
|00000af0| 61 6c 6c 0a 27 5c 22 20 | 41 64 64 65 64 20 2d 6c |all.'\" |Added -l|
|00000b00| 20 73 77 69 74 63 68 2c | 20 61 6e 64 20 6e 6f 74 | switch,| and not|
|00000b10| 65 64 20 62 69 73 74 61 | 62 69 6c 69 74 79 20 62 |ed bista|bility b|
|00000b20| 75 67 2e 0a 27 5c 22 20 | 0a 27 5c 22 20 52 65 76 |ug..'\" |.'\" Rev|
|00000b30| 69 73 69 6f 6e 20 31 2e | 32 2e 31 2e 31 20 20 38 |ision 1.|2.1.1  8|
|00000b40| 34 2f 31 32 2f 30 34 20 | 20 31 37 3a 32 33 3a 33 |4/12/04 | 17:23:3|
|00000b50| 39 20 20 6c 77 61 6c 6c | 0a 27 5c 22 20 42 72 61 |9  lwall|.'\" Bra|
|00000b60| 6e 63 68 20 66 6f 72 20 | 73 64 63 72 64 63 66 20 |nch for |sdcrdcf |
|00000b70| 63 68 61 6e 67 65 73 2e | 0a 27 5c 22 20 0a 27 5c |changes.|.'\" .'\|
|00000b80| 22 20 52 65 76 69 73 69 | 6f 6e 20 31 2e 32 20 20 |" Revisi|on 1.2  |
|00000b90| 38 34 2f 31 32 2f 30 34 | 20 20 31 37 3a 32 32 3a |84/12/04|  17:22:|
|00000ba0| 30 32 20 20 6c 77 61 6c | 6c 0a 27 5c 22 20 42 61 |02  lwal|l.'\" Ba|
|00000bb0| 73 65 6c 69 6e 65 20 76 | 65 72 73 69 6f 6e 2e 0a |seline v|ersion..|
|00000bc0| 27 5c 22 20 0a 2e 64 65 | 20 53 68 0a 2e 62 72 0a |'\" ..de| Sh..br.|
|00000bd0| 2e 6e 65 20 35 0a 2e 50 | 50 0a 5c 66 42 5c 5c 24 |.ne 5..P|P.\fB\\$|
|00000be0| 31 5c 66 52 0a 2e 50 50 | 0a 2e 2e 0a 2e 64 65 20 |1\fR..PP|.....de |
|00000bf0| 53 70 0a 2e 69 66 20 74 | 20 2e 73 70 20 2e 35 76 |Sp..if t| .sp .5v|
|00000c00| 0a 2e 69 66 20 6e 20 2e | 73 70 0a 2e 2e 0a 27 5c |..if n .|sp....'\|
|00000c10| 22 0a 27 5c 22 20 20 20 | 20 20 53 65 74 20 75 70 |".'\"   |  Set up|
|00000c20| 20 5c 2a 28 2d 2d 20 74 | 6f 20 67 69 76 65 20 61 | \*(-- t|o give a|
|00000c30| 6e 20 75 6e 62 72 65 61 | 6b 61 62 6c 65 20 64 61 |n unbrea|kable da|
|00000c40| 73 68 3b 0a 27 5c 22 20 | 20 20 20 20 73 74 72 69 |sh;.'\" |    stri|
|00000c50| 6e 67 20 54 72 20 68 6f | 6c 64 73 20 75 73 65 72 |ng Tr ho|lds user|
|00000c60| 20 64 65 66 69 6e 65 64 | 20 74 72 61 6e 73 6c 61 | defined| transla|
|00000c70| 74 69 6f 6e 20 73 74 72 | 69 6e 67 2e 0a 27 5c 22 |tion str|ing..'\"|
|00000c80| 20 20 20 20 20 42 65 6c | 6c 20 53 79 73 74 65 6d |     Bel|l System|
|00000c90| 20 4c 6f 67 6f 20 69 73 | 20 75 73 65 64 20 61 73 | Logo is| used as|
|00000ca0| 20 61 20 64 75 6d 6d 79 | 20 63 68 61 72 61 63 74 | a dummy| charact|
|00000cb0| 65 72 2e 0a 27 5c 22 0a | 2e 69 65 20 6e 20 5c 7b |er..'\".|.ie n \{|
|00000cc0| 5c 0a 2e 74 72 20 5c 28 | 2a 57 2d 5c 2a 28 54 72 |\..tr \(|*W-\*(Tr|
|00000cd0| 0a 2e 64 73 20 2d 2d 20 | 5c 28 2a 57 2d 0a 2e 69 |..ds -- |\(*W-..i|
|00000ce0| 66 20 28 5c 6e 28 2e 48 | 3d 34 75 29 26 28 31 6d |f (\n(.H|=4u)&(1m|
|00000cf0| 3d 32 34 75 29 20 2e 64 | 73 20 2d 2d 20 5c 28 2a |=24u) .d|s -- \(*|
|00000d00| 57 5c 68 27 2d 31 32 75 | 27 5c 28 2a 57 5c 68 27 |W\h'-12u|'\(*W\h'|
|00000d10| 2d 31 32 75 27 2d 5c 22 | 20 64 69 61 62 6c 6f 20 |-12u'-\"| diablo |
|00000d20| 31 30 20 70 69 74 63 68 | 0a 2e 69 66 20 28 5c 6e |10 pitch|..if (\n|
|00000d30| 28 2e 48 3d 34 75 29 26 | 28 31 6d 3d 32 30 75 29 |(.H=4u)&|(1m=20u)|
|00000d40| 20 2e 64 73 20 2d 2d 20 | 5c 28 2a 57 5c 68 27 2d | .ds -- |\(*W\h'-|
|00000d50| 31 32 75 27 5c 28 2a 57 | 5c 68 27 2d 38 75 27 2d |12u'\(*W|\h'-8u'-|
|00000d60| 5c 22 20 64 69 61 62 6c | 6f 20 31 32 20 70 69 74 |\" diabl|o 12 pit|
|00000d70| 63 68 0a 2e 64 73 20 4c | 22 20 22 22 0a 2e 64 73 |ch..ds L|" ""..ds|
|00000d80| 20 52 22 20 22 22 0a 2e | 64 73 20 4c 27 20 27 0a | R" ""..|ds L' '.|
|00000d90| 2e 64 73 20 52 27 20 27 | 0a 27 62 72 20 5c 7d 0a |.ds R' '|.'br \}.|
|00000da0| 2e 65 6c 20 5c 7b 5c 0a | 2e 64 73 20 2d 2d 20 5c |.el \{\.|.ds -- \|
|00000db0| 28 65 6d 5c 7c 0a 2e 74 | 72 20 5c 2a 28 54 72 0a |(em\|..t|r \*(Tr.|
|00000dc0| 2e 64 73 20 4c 22 20 60 | 60 0a 2e 64 73 20 52 22 |.ds L" `|`..ds R"|
|00000dd0| 20 27 27 0a 2e 64 73 20 | 4c 27 20 60 0a 2e 64 73 | ''..ds |L' `..ds|
|00000de0| 20 52 27 20 27 0a 27 62 | 72 5c 7d 0a 2e 54 48 20 | R' '.'b|r\}..TH |
|00000df0| 50 41 54 43 48 20 31 20 | 4c 4f 43 41 4c 0a 2e 53 |PATCH 1 |LOCAL..S|
|00000e00| 48 20 4e 41 4d 45 0a 70 | 61 74 63 68 20 2d 20 61 |H NAME.p|atch - a|
|00000e10| 70 70 6c 79 20 61 20 64 | 69 66 66 20 66 69 6c 65 |pply a d|iff file|
|00000e20| 20 74 6f 20 61 6e 20 6f | 72 69 67 69 6e 61 6c 0a | to an o|riginal.|
|00000e30| 2e 53 48 20 53 59 4e 4f | 50 53 49 53 0a 2e 42 20 |.SH SYNO|PSIS..B |
|00000e40| 70 61 74 63 68 0a 5b 6f | 70 74 69 6f 6e 73 5d 20 |patch.[o|ptions] |
|00000e50| 5b 6f 72 69 67 66 69 6c | 65 20 5b 70 61 74 63 68 |[origfil|e [patch|
|00000e60| 66 69 6c 65 5d 5d 20 5b | 2b 20 5b 6f 70 74 69 6f |file]] [|+ [optio|
|00000e70| 6e 73 5d 20 5b 6f 72 69 | 67 66 69 6c 65 5d 5d 2e |ns] [ori|gfile]].|
|00000e80| 2e 2e 0a 2e 73 70 0a 62 | 75 74 20 75 73 75 61 6c |....sp.b|ut usual|
|00000e90| 6c 79 20 6a 75 73 74 0a | 2e 73 70 0a 2e 42 20 70 |ly just.|.sp..B p|
|00000ea0| 61 74 63 68 0a 3c 70 61 | 74 63 68 66 69 6c 65 0a |atch.<pa|tchfile.|
|00000eb0| 2e 53 48 20 44 45 53 43 | 52 49 50 54 49 4f 4e 0a |.SH DESC|RIPTION.|
|00000ec0| 2e 49 20 50 61 74 63 68 | 0a 77 69 6c 6c 20 74 61 |.I Patch|.will ta|
|00000ed0| 6b 65 20 61 20 70 61 74 | 63 68 20 66 69 6c 65 20 |ke a pat|ch file |
|00000ee0| 63 6f 6e 74 61 69 6e 69 | 6e 67 20 61 6e 79 20 6f |containi|ng any o|
|00000ef0| 66 20 74 68 65 20 66 6f | 75 72 20 66 6f 72 6d 73 |f the fo|ur forms|
|00000f00| 20 6f 66 20 64 69 66 66 | 65 72 65 6e 63 65 0a 6c | of diff|erence.l|
|00000f10| 69 73 74 69 6e 67 20 70 | 72 6f 64 75 63 65 64 20 |isting p|roduced |
|00000f20| 62 79 20 74 68 65 0a 2e | 49 20 64 69 66 66 0a 70 |by the..|I diff.p|
|00000f30| 72 6f 67 72 61 6d 20 61 | 6e 64 20 61 70 70 6c 79 |rogram a|nd apply|
|00000f40| 20 74 68 6f 73 65 20 64 | 69 66 66 65 72 65 6e 63 | those d|ifferenc|
|00000f50| 65 73 20 74 6f 20 61 6e | 20 6f 72 69 67 69 6e 61 |es to an| origina|
|00000f60| 6c 20 66 69 6c 65 2c 20 | 70 72 6f 64 75 63 69 6e |l file, |producin|
|00000f70| 67 20 61 20 70 61 74 63 | 68 65 64 0a 76 65 72 73 |g a patc|hed.vers|
|00000f80| 69 6f 6e 2e 0a 42 79 20 | 64 65 66 61 75 6c 74 2c |ion..By |default,|
|00000f90| 20 74 68 65 20 70 61 74 | 63 68 65 64 20 76 65 72 | the pat|ched ver|
|00000fa0| 73 69 6f 6e 20 69 73 20 | 70 75 74 20 69 6e 20 70 |sion is |put in p|
|00000fb0| 6c 61 63 65 20 6f 66 20 | 74 68 65 20 6f 72 69 67 |lace of |the orig|
|00000fc0| 69 6e 61 6c 2c 20 77 69 | 74 68 0a 74 68 65 20 6f |inal, wi|th.the o|
|00000fd0| 72 69 67 69 6e 61 6c 20 | 66 69 6c 65 20 62 61 63 |riginal |file bac|
|00000fe0| 6b 65 64 20 75 70 20 74 | 6f 20 74 68 65 20 73 61 |ked up t|o the sa|
|00000ff0| 6d 65 20 6e 61 6d 65 20 | 77 69 74 68 20 74 68 65 |me name |with the|
|00001000| 0a 65 78 74 65 6e 73 69 | 6f 6e 20 5c 2a 28 4c 22 |.extensi|on \*(L"|
|00001010| 2e 6f 72 69 67 5c 2a 28 | 52 22 20 28 5c 2a 28 4c |.orig\*(|R" (\*(L|
|00001020| 22 7e 5c 2a 28 52 22 20 | 6f 6e 20 73 79 73 74 65 |"~\*(R" |on syste|
|00001030| 6d 73 20 74 68 61 74 20 | 64 6f 20 6e 6f 74 0a 73 |ms that |do not.s|
|00001040| 75 70 70 6f 72 74 20 6c | 6f 6e 67 20 66 69 6c 65 |upport l|ong file|
|00001050| 20 6e 61 6d 65 73 29 2c | 20 6f 72 20 61 73 20 73 | names),| or as s|
|00001060| 70 65 63 69 66 69 65 64 | 20 62 79 20 74 68 65 0a |pecified| by the.|
|00001070| 5c 66 42 5c 2d 62 5c 66 | 50 20 28 5c 66 42 5c 2d |\fB\-b\f|P (\fB\-|
|00001080| 5c 2d 73 75 66 66 69 78 | 5c 66 50 29 2c 0a 5c 66 |\-suffix|\fP),.\f|
|00001090| 42 5c 2d 42 5c 66 50 20 | 28 5c 66 42 5c 2d 5c 2d |B\-B\fP |(\fB\-\-|
|000010a0| 70 72 65 66 69 78 5c 66 | 50 29 2c 0a 6f 72 0a 5c |prefix\f|P),.or.\|
|000010b0| 66 42 5c 2d 56 5c 66 50 | 20 28 5c 66 42 5c 2d 5c |fB\-V\fP| (\fB\-\|
|000010c0| 2d 76 65 72 73 69 6f 6e | 5c 2d 63 6f 6e 74 72 6f |-version|\-contro|
|000010d0| 6c 5c 66 50 29 0a 6f 70 | 74 69 6f 6e 73 2e 0a 54 |l\fP).op|tions..T|
|000010e0| 68 65 20 65 78 74 65 6e | 73 69 6f 6e 20 75 73 65 |he exten|sion use|
|000010f0| 64 20 66 6f 72 20 6d 61 | 6b 69 6e 67 20 62 61 63 |d for ma|king bac|
|00001100| 6b 75 70 20 66 69 6c 65 | 73 20 6d 61 79 20 61 6c |kup file|s may al|
|00001110| 73 6f 20 62 65 20 73 70 | 65 63 69 66 69 65 64 20 |so be sp|ecified |
|00001120| 69 6e 20 74 68 65 0a 2e | 42 20 53 49 4d 50 4c 45 |in the..|B SIMPLE|
|00001130| 5f 42 41 43 4b 55 50 5f | 53 55 46 46 49 58 0a 65 |_BACKUP_|SUFFIX.e|
|00001140| 6e 76 69 72 6f 6e 6d 65 | 6e 74 20 76 61 72 69 61 |nvironme|nt varia|
|00001150| 62 6c 65 2c 20 77 68 69 | 63 68 20 69 73 20 6f 76 |ble, whi|ch is ov|
|00001160| 65 72 72 69 64 64 65 6e | 20 62 79 20 74 68 65 20 |erridden| by the |
|00001170| 61 62 6f 76 65 20 6f 70 | 74 69 6f 6e 73 2e 0a 2e |above op|tions...|
|00001180| 50 50 0a 49 66 20 74 68 | 65 20 62 61 63 6b 75 70 |PP.If th|e backup|
|00001190| 20 66 69 6c 65 20 61 6c | 72 65 61 64 79 20 65 78 | file al|ready ex|
|000011a0| 69 73 74 73 2c 0a 2e 42 | 20 70 61 74 63 68 0a 63 |ists,..B| patch.c|
|000011b0| 72 65 61 74 65 73 20 61 | 20 6e 65 77 20 62 61 63 |reates a| new bac|
|000011c0| 6b 75 70 20 66 69 6c 65 | 20 6e 61 6d 65 20 62 79 |kup file| name by|
|000011d0| 20 63 68 61 6e 67 69 6e | 67 20 74 68 65 20 66 69 | changin|g the fi|
|000011e0| 72 73 74 20 6c 6f 77 65 | 72 63 61 73 65 20 6c 65 |rst lowe|rcase le|
|000011f0| 74 74 65 72 0a 69 6e 20 | 74 68 65 20 6c 61 73 74 |tter.in |the last|
|00001200| 20 63 6f 6d 70 6f 6e 65 | 6e 74 20 6f 66 20 74 68 | compone|nt of th|
|00001210| 65 20 66 69 6c 65 27 73 | 20 6e 61 6d 65 20 69 6e |e file's| name in|
|00001220| 74 6f 20 75 70 70 65 72 | 63 61 73 65 2e 20 20 49 |to upper|case.  I|
|00001230| 66 20 74 68 65 72 65 20 | 61 72 65 0a 6e 6f 20 6d |f there |are.no m|
|00001240| 6f 72 65 20 6c 6f 77 65 | 72 63 61 73 65 20 6c 65 |ore lowe|rcase le|
|00001250| 74 74 65 72 73 20 69 6e | 20 74 68 65 20 6e 61 6d |tters in| the nam|
|00001260| 65 2c 20 69 74 20 72 65 | 6d 6f 76 65 73 20 74 68 |e, it re|moves th|
|00001270| 65 20 66 69 72 73 74 20 | 63 68 61 72 61 63 74 65 |e first |characte|
|00001280| 72 0a 66 72 6f 6d 20 74 | 68 65 20 6e 61 6d 65 2e |r.from t|he name.|
|00001290| 20 20 49 74 20 72 65 70 | 65 61 74 73 20 74 68 69 |  It rep|eats thi|
|000012a0| 73 20 70 72 6f 63 65 73 | 73 20 75 6e 74 69 6c 20 |s proces|s until |
|000012b0| 69 74 20 63 6f 6d 65 73 | 20 75 70 20 77 69 74 68 |it comes| up with|
|000012c0| 20 61 0a 62 61 63 6b 75 | 70 20 66 69 6c 65 20 74 | a.backu|p file t|
|000012d0| 68 61 74 20 64 6f 65 73 | 20 6e 6f 74 20 61 6c 72 |hat does| not alr|
|000012e0| 65 61 64 79 20 65 78 69 | 73 74 2e 0a 2e 50 50 0a |eady exi|st...PP.|
|000012f0| 59 6f 75 20 6d 61 79 20 | 61 6c 73 6f 20 73 70 65 |You may |also spe|
|00001300| 63 69 66 79 20 77 68 65 | 72 65 20 79 6f 75 20 77 |cify whe|re you w|
|00001310| 61 6e 74 20 74 68 65 20 | 6f 75 74 70 75 74 20 74 |ant the |output t|
|00001320| 6f 20 67 6f 20 77 69 74 | 68 20 61 0a 5c 66 42 5c |o go wit|h a.\fB\|
|00001330| 2d 6f 5c 66 50 20 28 5c | 66 42 5c 2d 5c 2d 6f 75 |-o\fP (\|fB\-\-ou|
|00001340| 74 70 75 74 5c 66 50 29 | 0a 6f 70 74 69 6f 6e 3b |tput\fP)|.option;|
|00001350| 20 69 66 20 74 68 61 74 | 20 66 69 6c 65 20 61 6c | if that| file al|
|00001360| 72 65 61 64 79 20 65 78 | 69 73 74 73 2c 20 69 74 |ready ex|ists, it|
|00001370| 20 69 73 20 62 61 63 6b | 65 64 20 75 70 20 66 69 | is back|ed up fi|
|00001380| 72 73 74 2e 0a 2e 50 50 | 0a 49 66 0a 2e 49 20 70 |rst...PP|.If..I p|
|00001390| 61 74 63 68 66 69 6c 65 | 0a 69 73 20 6f 6d 69 74 |atchfile|.is omit|
|000013a0| 74 65 64 2c 20 6f 72 20 | 69 73 20 61 20 68 79 70 |ted, or |is a hyp|
|000013b0| 68 65 6e 2c 20 74 68 65 | 20 70 61 74 63 68 20 77 |hen, the| patch w|
|000013c0| 69 6c 6c 20 62 65 20 72 | 65 61 64 20 66 72 6f 6d |ill be r|ead from|
|000013d0| 20 73 74 61 6e 64 61 72 | 64 20 69 6e 70 75 74 2e | standar|d input.|
|000013e0| 0a 2e 50 50 0a 55 70 6f | 6e 20 73 74 61 72 74 75 |..PP.Upo|n startu|
|000013f0| 70 2c 20 70 61 74 63 68 | 20 77 69 6c 6c 20 61 74 |p, patch| will at|
|00001400| 74 65 6d 70 74 20 74 6f | 20 64 65 74 65 72 6d 69 |tempt to| determi|
|00001410| 6e 65 20 74 68 65 20 74 | 79 70 65 20 6f 66 20 74 |ne the t|ype of t|
|00001420| 68 65 20 64 69 66 66 20 | 6c 69 73 74 69 6e 67 2c |he diff |listing,|
|00001430| 0a 75 6e 6c 65 73 73 20 | 6f 76 65 72 2d 72 75 6c |.unless |over-rul|
|00001440| 65 64 20 62 79 20 61 0a | 5c 66 42 5c 2d 63 5c 66 |ed by a.|\fB\-c\f|
|00001450| 50 20 28 5c 66 42 5c 2d | 5c 2d 63 6f 6e 74 65 78 |P (\fB\-|\-contex|
|00001460| 74 5c 66 50 29 2c 0a 5c | 66 42 5c 2d 65 5c 66 50 |t\fP),.\|fB\-e\fP|
|00001470| 20 28 5c 66 42 5c 2d 5c | 2d 65 64 5c 66 50 29 2c | (\fB\-\|-ed\fP),|
|00001480| 0a 5c 66 42 5c 2d 6e 5c | 66 50 20 28 5c 66 42 5c |.\fB\-n\|fP (\fB\|
|00001490| 2d 5c 2d 6e 6f 72 6d 61 | 6c 5c 66 50 29 2c 0a 6f |-\-norma|l\fP),.o|
|000014a0| 72 0a 5c 66 42 5c 2d 75 | 5c 66 50 20 28 5c 66 42 |r.\fB\-u|\fP (\fB|
|000014b0| 5c 2d 5c 2d 75 6e 69 66 | 69 65 64 5c 66 50 29 0a |\-\-unif|ied\fP).|
|000014c0| 6f 70 74 69 6f 6e 2e 0a | 43 6f 6e 74 65 78 74 20 |option..|Context |
|000014d0| 64 69 66 66 73 20 28 6f | 6c 64 2d 73 74 79 6c 65 |diffs (o|ld-style|
|000014e0| 2c 20 6e 65 77 2d 73 74 | 79 6c 65 2c 20 61 6e 64 |, new-st|yle, and|
|000014f0| 20 75 6e 69 66 69 65 64 | 29 20 61 6e 64 0a 6e 6f | unified|) and.no|
|00001500| 72 6d 61 6c 20 64 69 66 | 66 73 20 61 72 65 20 61 |rmal dif|fs are a|
|00001510| 70 70 6c 69 65 64 20 62 | 79 20 74 68 65 0a 2e 49 |pplied b|y the..I|
|00001520| 20 70 61 74 63 68 0a 70 | 72 6f 67 72 61 6d 20 69 | patch.p|rogram i|
|00001530| 74 73 65 6c 66 2c 20 77 | 68 69 6c 65 0a 2e 49 20 |tself, w|hile..I |
|00001540| 65 64 0a 64 69 66 66 73 | 20 61 72 65 20 73 69 6d |ed.diffs| are sim|
|00001550| 70 6c 79 20 66 65 64 20 | 74 6f 20 74 68 65 0a 2e |ply fed |to the..|
|00001560| 49 20 65 64 0a 65 64 69 | 74 6f 72 20 76 69 61 20 |I ed.edi|tor via |
|00001570| 61 20 70 69 70 65 2e 0a | 2e 50 50 0a 2e 49 20 50 |a pipe..|.PP..I P|
|00001580| 61 74 63 68 0a 77 69 6c | 6c 20 74 72 79 20 74 6f |atch.wil|l try to|
|00001590| 20 73 6b 69 70 20 61 6e | 79 20 6c 65 61 64 69 6e | skip an|y leadin|
|000015a0| 67 20 67 61 72 62 61 67 | 65 2c 20 61 70 70 6c 79 |g garbag|e, apply|
|000015b0| 20 74 68 65 20 64 69 66 | 66 2c 0a 61 6e 64 20 74 | the dif|f,.and t|
|000015c0| 68 65 6e 20 73 6b 69 70 | 20 61 6e 79 20 74 72 61 |hen skip| any tra|
|000015d0| 69 6c 69 6e 67 20 67 61 | 72 62 61 67 65 2e 0a 54 |iling ga|rbage..T|
|000015e0| 68 75 73 20 79 6f 75 20 | 63 6f 75 6c 64 20 66 65 |hus you |could fe|
|000015f0| 65 64 20 61 6e 20 61 72 | 74 69 63 6c 65 20 6f 72 |ed an ar|ticle or|
|00001600| 20 6d 65 73 73 61 67 65 | 20 63 6f 6e 74 61 69 6e | message| contain|
|00001610| 69 6e 67 20 61 0a 64 69 | 66 66 20 6c 69 73 74 69 |ing a.di|ff listi|
|00001620| 6e 67 20 74 6f 0a 2e 49 | 52 20 70 61 74 63 68 20 |ng to..I|R patch |
|00001630| 2c 0a 61 6e 64 20 69 74 | 20 73 68 6f 75 6c 64 20 |,.and it| should |
|00001640| 77 6f 72 6b 2e 0a 49 66 | 20 74 68 65 20 65 6e 74 |work..If| the ent|
|00001650| 69 72 65 20 64 69 66 66 | 20 69 73 20 69 6e 64 65 |ire diff| is inde|
|00001660| 6e 74 65 64 20 62 79 20 | 61 20 63 6f 6e 73 69 73 |nted by |a consis|
|00001670| 74 65 6e 74 20 61 6d 6f | 75 6e 74 2c 0a 74 68 69 |tent amo|unt,.thi|
|00001680| 73 20 77 69 6c 6c 20 62 | 65 20 74 61 6b 65 6e 20 |s will b|e taken |
|00001690| 69 6e 74 6f 20 61 63 63 | 6f 75 6e 74 2e 0a 2e 50 |into acc|ount...P|
|000016a0| 50 0a 57 69 74 68 20 63 | 6f 6e 74 65 78 74 20 64 |P.With c|ontext d|
|000016b0| 69 66 66 73 2c 20 61 6e | 64 20 74 6f 20 61 20 6c |iffs, an|d to a l|
|000016c0| 65 73 73 65 72 20 65 78 | 74 65 6e 74 20 77 69 74 |esser ex|tent wit|
|000016d0| 68 20 6e 6f 72 6d 61 6c | 20 64 69 66 66 73 2c 0a |h normal| diffs,.|
|000016e0| 2e 49 20 70 61 74 63 68 | 0a 63 61 6e 20 64 65 74 |.I patch|.can det|
|000016f0| 65 63 74 20 77 68 65 6e | 20 74 68 65 20 6c 69 6e |ect when| the lin|
|00001700| 65 20 6e 75 6d 62 65 72 | 73 20 6d 65 6e 74 69 6f |e number|s mentio|
|00001710| 6e 65 64 20 69 6e 20 74 | 68 65 20 70 61 74 63 68 |ned in t|he patch|
|00001720| 20 61 72 65 20 69 6e 63 | 6f 72 72 65 63 74 2c 0a | are inc|orrect,.|
|00001730| 61 6e 64 20 77 69 6c 6c | 20 61 74 74 65 6d 70 74 |and will| attempt|
|00001740| 20 74 6f 20 66 69 6e 64 | 20 74 68 65 20 63 6f 72 | to find| the cor|
|00001750| 72 65 63 74 20 70 6c 61 | 63 65 20 74 6f 20 61 70 |rect pla|ce to ap|
|00001760| 70 6c 79 20 65 61 63 68 | 20 68 75 6e 6b 20 6f 66 |ply each| hunk of|
|00001770| 20 74 68 65 20 70 61 74 | 63 68 2e 0a 41 73 20 61 | the pat|ch..As a|
|00001780| 20 66 69 72 73 74 20 67 | 75 65 73 73 2c 20 69 74 | first g|uess, it|
|00001790| 20 74 61 6b 65 73 20 74 | 68 65 20 6c 69 6e 65 20 | takes t|he line |
|000017a0| 6e 75 6d 62 65 72 20 6d | 65 6e 74 69 6f 6e 65 64 |number m|entioned|
|000017b0| 20 66 6f 72 20 74 68 65 | 20 68 75 6e 6b 2c 20 70 | for the| hunk, p|
|000017c0| 6c 75 73 20 6f 72 0a 6d | 69 6e 75 73 20 61 6e 79 |lus or.m|inus any|
|000017d0| 20 6f 66 66 73 65 74 20 | 75 73 65 64 20 69 6e 20 | offset |used in |
|000017e0| 61 70 70 6c 79 69 6e 67 | 20 74 68 65 20 70 72 65 |applying| the pre|
|000017f0| 76 69 6f 75 73 20 68 75 | 6e 6b 2e 0a 49 66 20 74 |vious hu|nk..If t|
|00001800| 68 61 74 20 69 73 20 6e | 6f 74 20 74 68 65 20 63 |hat is n|ot the c|
|00001810| 6f 72 72 65 63 74 20 70 | 6c 61 63 65 2c 0a 2e 49 |orrect p|lace,..I|
|00001820| 20 70 61 74 63 68 0a 77 | 69 6c 6c 20 73 63 61 6e | patch.w|ill scan|
|00001830| 20 62 6f 74 68 20 66 6f | 72 77 61 72 64 73 20 61 | both fo|rwards a|
|00001840| 6e 64 20 62 61 63 6b 77 | 61 72 64 73 20 66 6f 72 |nd backw|ards for|
|00001850| 20 61 20 73 65 74 20 6f | 66 20 6c 69 6e 65 73 20 | a set o|f lines |
|00001860| 6d 61 74 63 68 69 6e 67 | 20 74 68 65 20 63 6f 6e |matching| the con|
|00001870| 74 65 78 74 0a 67 69 76 | 65 6e 20 69 6e 20 74 68 |text.giv|en in th|
|00001880| 65 20 68 75 6e 6b 2e 0a | 46 69 72 73 74 0a 2e 49 |e hunk..|First..I|
|00001890| 20 70 61 74 63 68 0a 6c | 6f 6f 6b 73 20 66 6f 72 | patch.l|ooks for|
|000018a0| 20 61 20 70 6c 61 63 65 | 20 77 68 65 72 65 20 61 | a place| where a|
|000018b0| 6c 6c 20 6c 69 6e 65 73 | 20 6f 66 20 74 68 65 20 |ll lines| of the |
|000018c0| 63 6f 6e 74 65 78 74 20 | 6d 61 74 63 68 2e 0a 49 |context |match..I|
|000018d0| 66 20 6e 6f 20 73 75 63 | 68 20 70 6c 61 63 65 20 |f no suc|h place |
|000018e0| 69 73 20 66 6f 75 6e 64 | 2c 20 61 6e 64 20 69 74 |is found|, and it|
|000018f0| 27 73 20 61 20 63 6f 6e | 74 65 78 74 20 64 69 66 |'s a con|text dif|
|00001900| 66 2c 20 61 6e 64 20 74 | 68 65 20 6d 61 78 69 6d |f, and t|he maxim|
|00001910| 75 6d 20 66 75 7a 7a 20 | 66 61 63 74 6f 72 0a 69 |um fuzz |factor.i|
|00001920| 73 20 73 65 74 20 74 6f | 20 31 20 6f 72 20 6d 6f |s set to| 1 or mo|
|00001930| 72 65 2c 20 74 68 65 6e | 20 61 6e 6f 74 68 65 72 |re, then| another|
|00001940| 20 73 63 61 6e 20 74 61 | 6b 65 73 20 70 6c 61 63 | scan ta|kes plac|
|00001950| 65 20 69 67 6e 6f 72 69 | 6e 67 20 74 68 65 20 66 |e ignori|ng the f|
|00001960| 69 72 73 74 20 61 6e 64 | 20 6c 61 73 74 0a 6c 69 |irst and| last.li|
|00001970| 6e 65 20 6f 66 20 63 6f | 6e 74 65 78 74 2e 0a 49 |ne of co|ntext..I|
|00001980| 66 20 74 68 61 74 20 66 | 61 69 6c 73 2c 20 61 6e |f that f|ails, an|
|00001990| 64 20 74 68 65 20 6d 61 | 78 69 6d 75 6d 20 66 75 |d the ma|ximum fu|
|000019a0| 7a 7a 20 66 61 63 74 6f | 72 20 69 73 20 73 65 74 |zz facto|r is set|
|000019b0| 20 74 6f 20 32 20 6f 72 | 20 6d 6f 72 65 2c 0a 74 | to 2 or| more,.t|
|000019c0| 68 65 20 66 69 72 73 74 | 20 74 77 6f 20 61 6e 64 |he first| two and|
|000019d0| 20 6c 61 73 74 20 74 77 | 6f 20 6c 69 6e 65 73 20 | last tw|o lines |
|000019e0| 6f 66 20 63 6f 6e 74 65 | 78 74 20 61 72 65 20 69 |of conte|xt are i|
|000019f0| 67 6e 6f 72 65 64 2c 0a | 61 6e 64 20 61 6e 6f 74 |gnored,.|and anot|
|00001a00| 68 65 72 20 73 63 61 6e | 20 69 73 20 6d 61 64 65 |her scan| is made|
|00001a10| 2e 0a 28 54 68 65 20 64 | 65 66 61 75 6c 74 20 6d |..(The d|efault m|
|00001a20| 61 78 69 6d 75 6d 20 66 | 75 7a 7a 20 66 61 63 74 |aximum f|uzz fact|
|00001a30| 6f 72 20 69 73 20 32 2e | 29 0a 49 66 0a 2e 49 20 |or is 2.|).If..I |
|00001a40| 70 61 74 63 68 0a 63 61 | 6e 6e 6f 74 20 66 69 6e |patch.ca|nnot fin|
|00001a50| 64 20 61 20 70 6c 61 63 | 65 20 74 6f 20 69 6e 73 |d a plac|e to ins|
|00001a60| 74 61 6c 6c 20 74 68 61 | 74 20 68 75 6e 6b 20 6f |tall tha|t hunk o|
|00001a70| 66 20 74 68 65 20 70 61 | 74 63 68 2c 20 69 74 20 |f the pa|tch, it |
|00001a80| 77 69 6c 6c 20 70 75 74 | 20 74 68 65 0a 68 75 6e |will put| the.hun|
|00001a90| 6b 20 6f 75 74 20 74 6f | 20 61 20 72 65 6a 65 63 |k out to| a rejec|
|00001aa0| 74 20 66 69 6c 65 2c 20 | 77 68 69 63 68 20 6e 6f |t file, |which no|
|00001ab0| 72 6d 61 6c 6c 79 20 69 | 73 20 74 68 65 20 6e 61 |rmally i|s the na|
|00001ac0| 6d 65 20 6f 66 20 74 68 | 65 20 6f 75 74 70 75 74 |me of th|e output|
|00001ad0| 20 66 69 6c 65 0a 70 6c | 75 73 20 5c 2a 28 4c 22 | file.pl|us \*(L"|
|00001ae0| 2e 72 65 6a 5c 2a 28 52 | 22 20 28 5c 2a 28 4c 22 |.rej\*(R|" (\*(L"|
|00001af0| 23 5c 2a 28 52 22 20 6f | 6e 20 73 79 73 74 65 6d |#\*(R" o|n system|
|00001b00| 73 20 74 68 61 74 20 64 | 6f 20 6e 6f 74 20 73 75 |s that d|o not su|
|00001b10| 70 70 6f 72 74 0a 6c 6f | 6e 67 20 66 69 6c 65 20 |pport.lo|ng file |
|00001b20| 6e 61 6d 65 73 29 2e 0a | 28 4e 6f 74 65 20 74 68 |names)..|(Note th|
|00001b30| 61 74 20 74 68 65 20 72 | 65 6a 65 63 74 65 64 20 |at the r|ejected |
|00001b40| 68 75 6e 6b 20 77 69 6c | 6c 20 63 6f 6d 65 20 6f |hunk wil|l come o|
|00001b50| 75 74 20 69 6e 20 63 6f | 6e 74 65 78 74 20 64 69 |ut in co|ntext di|
|00001b60| 66 66 20 66 6f 72 6d 20 | 77 68 65 74 68 65 72 20 |ff form |whether |
|00001b70| 74 68 65 0a 69 6e 70 75 | 74 20 70 61 74 63 68 20 |the.inpu|t patch |
|00001b80| 77 61 73 20 61 20 63 6f | 6e 74 65 78 74 20 64 69 |was a co|ntext di|
|00001b90| 66 66 20 6f 72 20 61 20 | 6e 6f 72 6d 61 6c 20 64 |ff or a |normal d|
|00001ba0| 69 66 66 2e 0a 49 66 20 | 74 68 65 20 69 6e 70 75 |iff..If |the inpu|
|00001bb0| 74 20 77 61 73 20 61 20 | 6e 6f 72 6d 61 6c 20 64 |t was a |normal d|
|00001bc0| 69 66 66 2c 20 6d 61 6e | 79 20 6f 66 20 74 68 65 |iff, man|y of the|
|00001bd0| 20 63 6f 6e 74 65 78 74 | 73 20 77 69 6c 6c 20 73 | context|s will s|
|00001be0| 69 6d 70 6c 79 20 62 65 | 20 6e 75 6c 6c 2e 29 0a |imply be| null.).|
|00001bf0| 54 68 65 20 6c 69 6e 65 | 20 6e 75 6d 62 65 72 73 |The line| numbers|
|00001c00| 20 6f 6e 20 74 68 65 20 | 68 75 6e 6b 73 20 69 6e | on the |hunks in|
|00001c10| 20 74 68 65 20 72 65 6a | 65 63 74 20 66 69 6c 65 | the rej|ect file|
|00001c20| 20 6d 61 79 20 62 65 20 | 64 69 66 66 65 72 65 6e | may be |differen|
|00001c30| 74 20 74 68 61 6e 0a 69 | 6e 20 74 68 65 20 70 61 |t than.i|n the pa|
|00001c40| 74 63 68 20 66 69 6c 65 | 3a 20 74 68 65 79 20 72 |tch file|: they r|
|00001c50| 65 66 6c 65 63 74 20 74 | 68 65 20 61 70 70 72 6f |eflect t|he appro|
|00001c60| 78 69 6d 61 74 65 20 6c | 6f 63 61 74 69 6f 6e 20 |ximate l|ocation |
|00001c70| 70 61 74 63 68 20 74 68 | 69 6e 6b 73 20 74 68 65 |patch th|inks the|
|00001c80| 0a 66 61 69 6c 65 64 20 | 68 75 6e 6b 73 20 62 65 |.failed |hunks be|
|00001c90| 6c 6f 6e 67 20 69 6e 20 | 74 68 65 20 6e 65 77 20 |long in |the new |
|00001ca0| 66 69 6c 65 20 72 61 74 | 68 65 72 20 74 68 61 6e |file rat|her than|
|00001cb0| 20 74 68 65 20 6f 6c 64 | 20 6f 6e 65 2e 0a 2e 50 | the old| one...P|
|00001cc0| 50 0a 41 73 20 65 61 63 | 68 20 68 75 6e 6b 20 69 |P.As eac|h hunk i|
|00001cd0| 73 20 63 6f 6d 70 6c 65 | 74 65 64 2c 20 79 6f 75 |s comple|ted, you|
|00001ce0| 20 77 69 6c 6c 20 62 65 | 20 74 6f 6c 64 20 77 68 | will be| told wh|
|00001cf0| 65 74 68 65 72 20 74 68 | 65 20 68 75 6e 6b 20 73 |ether th|e hunk s|
|00001d00| 75 63 63 65 65 64 65 64 | 20 6f 72 0a 66 61 69 6c |ucceeded| or.fail|
|00001d10| 65 64 2c 20 61 6e 64 20 | 77 68 69 63 68 20 6c 69 |ed, and |which li|
|00001d20| 6e 65 20 28 69 6e 20 74 | 68 65 20 6e 65 77 20 66 |ne (in t|he new f|
|00001d30| 69 6c 65 29 0a 2e 49 20 | 70 61 74 63 68 0a 74 68 |ile)..I |patch.th|
|00001d40| 6f 75 67 68 74 20 74 68 | 65 20 68 75 6e 6b 20 73 |ought th|e hunk s|
|00001d50| 68 6f 75 6c 64 20 67 6f | 20 6f 6e 2e 0a 49 66 20 |hould go| on..If |
|00001d60| 74 68 69 73 20 69 73 20 | 64 69 66 66 65 72 65 6e |this is |differen|
|00001d70| 74 20 66 72 6f 6d 20 74 | 68 65 20 6c 69 6e 65 20 |t from t|he line |
|00001d80| 6e 75 6d 62 65 72 20 73 | 70 65 63 69 66 69 65 64 |number s|pecified|
|00001d90| 20 69 6e 20 74 68 65 20 | 64 69 66 66 20 79 6f 75 | in the |diff you|
|00001da0| 20 77 69 6c 6c 0a 62 65 | 20 74 6f 6c 64 20 74 68 | will.be| told th|
|00001db0| 65 20 6f 66 66 73 65 74 | 2e 0a 41 20 73 69 6e 67 |e offset|..A sing|
|00001dc0| 6c 65 20 6c 61 72 67 65 | 20 6f 66 66 73 65 74 20 |le large| offset |
|00001dd0| 4d 41 59 20 62 65 20 61 | 6e 20 69 6e 64 69 63 61 |MAY be a|n indica|
|00001de0| 74 69 6f 6e 20 74 68 61 | 74 20 61 20 68 75 6e 6b |tion tha|t a hunk|
|00001df0| 20 77 61 73 20 69 6e 73 | 74 61 6c 6c 65 64 20 69 | was ins|talled i|
|00001e00| 6e 20 74 68 65 0a 77 72 | 6f 6e 67 20 70 6c 61 63 |n the.wr|ong plac|
|00001e10| 65 2e 0a 59 6f 75 20 77 | 69 6c 6c 20 61 6c 73 6f |e..You w|ill also|
|00001e20| 20 62 65 20 74 6f 6c 64 | 20 69 66 20 61 20 66 75 | be told| if a fu|
|00001e30| 7a 7a 20 66 61 63 74 6f | 72 20 77 61 73 20 75 73 |zz facto|r was us|
|00001e40| 65 64 20 74 6f 20 6d 61 | 6b 65 20 74 68 65 20 6d |ed to ma|ke the m|
|00001e50| 61 74 63 68 2c 20 69 6e | 20 77 68 69 63 68 0a 63 |atch, in| which.c|
|00001e60| 61 73 65 20 79 6f 75 20 | 73 68 6f 75 6c 64 20 61 |ase you |should a|
|00001e70| 6c 73 6f 20 62 65 20 73 | 6c 69 67 68 74 6c 79 20 |lso be s|lightly |
|00001e80| 73 75 73 70 69 63 69 6f | 75 73 2e 0a 2e 50 50 0a |suspicio|us...PP.|
|00001e90| 49 66 20 6e 6f 20 6f 72 | 69 67 69 6e 61 6c 20 66 |If no or|iginal f|
|00001ea0| 69 6c 65 20 69 73 20 73 | 70 65 63 69 66 69 65 64 |ile is s|pecified|
|00001eb0| 20 6f 6e 20 74 68 65 20 | 63 6f 6d 6d 61 6e 64 20 | on the |command |
|00001ec0| 6c 69 6e 65 2c 0a 2e 49 | 20 70 61 74 63 68 0a 77 |line,..I| patch.w|
|00001ed0| 69 6c 6c 20 74 72 79 20 | 74 6f 20 66 69 67 75 72 |ill try |to figur|
|00001ee0| 65 20 6f 75 74 20 66 72 | 6f 6d 20 74 68 65 20 6c |e out fr|om the l|
|00001ef0| 65 61 64 69 6e 67 20 67 | 61 72 62 61 67 65 20 77 |eading g|arbage w|
|00001f00| 68 61 74 20 74 68 65 20 | 6e 61 6d 65 20 6f 66 20 |hat the |name of |
|00001f10| 74 68 65 20 66 69 6c 65 | 0a 74 6f 20 65 64 69 74 |the file|.to edit|
|00001f20| 20 69 73 2e 0a 49 6e 20 | 74 68 65 20 68 65 61 64 | is..In |the head|
|00001f30| 65 72 20 6f 66 20 61 20 | 63 6f 6e 74 65 78 74 20 |er of a |context |
|00001f40| 64 69 66 66 2c 20 74 68 | 65 20 66 69 6c 65 20 6e |diff, th|e file n|
|00001f50| 61 6d 65 20 69 73 20 66 | 6f 75 6e 64 20 66 72 6f |ame is f|ound fro|
|00001f60| 6d 20 6c 69 6e 65 73 20 | 62 65 67 69 6e 6e 69 6e |m lines |beginnin|
|00001f70| 67 0a 77 69 74 68 20 5c | 2a 28 4c 22 2a 2a 2a 5c |g.with \|*(L"***\|
|00001f80| 2a 28 52 22 20 6f 72 20 | 5c 2a 28 4c 22 2d 2d 2d |*(R" or |\*(L"---|
|00001f90| 5c 2a 28 52 22 2c 20 77 | 69 74 68 20 74 68 65 20 |\*(R", w|ith the |
|00001fa0| 73 68 6f 72 74 65 73 74 | 20 6e 61 6d 65 20 6f 66 |shortest| name of|
|00001fb0| 20 61 6e 20 65 78 69 73 | 74 69 6e 67 0a 66 69 6c | an exis|ting.fil|
|00001fc0| 65 20 77 69 6e 6e 69 6e | 67 2e 0a 4f 6e 6c 79 20 |e winnin|g..Only |
|00001fd0| 63 6f 6e 74 65 78 74 20 | 64 69 66 66 73 20 68 61 |context |diffs ha|
|00001fe0| 76 65 20 6c 69 6e 65 73 | 20 6c 69 6b 65 20 74 68 |ve lines| like th|
|00001ff0| 61 74 2c 20 62 75 74 20 | 69 66 20 74 68 65 72 65 |at, but |if there|
|00002000| 20 69 73 20 61 6e 20 5c | 2a 28 4c 22 49 6e 64 65 | is an \|*(L"Inde|
|00002010| 78 3a 5c 2a 28 52 22 0a | 6c 69 6e 65 20 69 6e 20 |x:\*(R".|line in |
|00002020| 74 68 65 20 6c 65 61 64 | 69 6e 67 20 67 61 72 62 |the lead|ing garb|
|00002030| 61 67 65 2c 0a 2e 49 20 | 70 61 74 63 68 0a 77 69 |age,..I |patch.wi|
|00002040| 6c 6c 20 74 72 79 20 74 | 6f 20 75 73 65 20 74 68 |ll try t|o use th|
|00002050| 65 20 66 69 6c 65 20 6e | 61 6d 65 20 66 72 6f 6d |e file n|ame from|
|00002060| 20 74 68 61 74 20 6c 69 | 6e 65 2e 0a 54 68 65 20 | that li|ne..The |
|00002070| 63 6f 6e 74 65 78 74 20 | 64 69 66 66 20 68 65 61 |context |diff hea|
|00002080| 64 65 72 20 74 61 6b 65 | 73 20 70 72 65 63 65 64 |der take|s preced|
|00002090| 65 6e 63 65 20 6f 76 65 | 72 20 61 6e 20 49 6e 64 |ence ove|r an Ind|
|000020a0| 65 78 20 6c 69 6e 65 2e | 0a 49 66 20 6e 6f 20 66 |ex line.|.If no f|
|000020b0| 69 6c 65 20 6e 61 6d 65 | 20 63 61 6e 20 62 65 20 |ile name| can be |
|000020c0| 69 6e 74 75 69 74 65 64 | 20 66 72 6f 6d 20 74 68 |intuited| from th|
|000020d0| 65 20 6c 65 61 64 69 6e | 67 20 67 61 72 62 61 67 |e leadin|g garbag|
|000020e0| 65 2c 20 79 6f 75 20 77 | 69 6c 6c 20 62 65 20 61 |e, you w|ill be a|
|000020f0| 73 6b 65 64 0a 66 6f 72 | 20 74 68 65 20 6e 61 6d |sked.for| the nam|
|00002100| 65 20 6f 66 20 74 68 65 | 20 66 69 6c 65 20 74 6f |e of the| file to|
|00002110| 20 70 61 74 63 68 2e 0a | 2e 50 50 0a 49 66 20 74 | patch..|.PP.If t|
|00002120| 68 65 20 6f 72 69 67 69 | 6e 61 6c 20 66 69 6c 65 |he origi|nal file|
|00002130| 20 63 61 6e 6e 6f 74 20 | 62 65 20 66 6f 75 6e 64 | cannot |be found|
|00002140| 20 6f 72 20 69 73 20 72 | 65 61 64 2d 6f 6e 6c 79 | or is r|ead-only|
|00002150| 2c 20 62 75 74 20 61 20 | 73 75 69 74 61 62 6c 65 |, but a |suitable|
|00002160| 0a 53 43 43 53 20 6f 72 | 20 52 43 53 20 66 69 6c |.SCCS or| RCS fil|
|00002170| 65 20 69 73 20 68 61 6e | 64 79 2c 0a 2e 49 20 70 |e is han|dy,..I p|
|00002180| 61 74 63 68 0a 77 69 6c | 6c 20 61 74 74 65 6d 70 |atch.wil|l attemp|
|00002190| 74 20 74 6f 20 67 65 74 | 20 6f 72 20 63 68 65 63 |t to get| or chec|
|000021a0| 6b 20 6f 75 74 20 74 68 | 65 20 66 69 6c 65 2e 0a |k out th|e file..|
|000021b0| 2e 50 50 0a 41 64 64 69 | 74 69 6f 6e 61 6c 6c 79 |.PP.Addi|tionally|
|000021c0| 2c 20 69 66 20 74 68 65 | 20 6c 65 61 64 69 6e 67 |, if the| leading|
|000021d0| 20 67 61 72 62 61 67 65 | 20 63 6f 6e 74 61 69 6e | garbage| contain|
|000021e0| 73 20 61 20 5c 2a 28 4c | 22 50 72 65 72 65 71 3a |s a \*(L|"Prereq:|
|000021f0| 20 5c 2a 28 52 22 20 6c | 69 6e 65 2c 0a 2e 49 20 | \*(R" l|ine,..I |
|00002200| 70 61 74 63 68 0a 77 69 | 6c 6c 20 74 61 6b 65 20 |patch.wi|ll take |
|00002210| 74 68 65 20 66 69 72 73 | 74 20 77 6f 72 64 20 66 |the firs|t word f|
|00002220| 72 6f 6d 20 74 68 65 20 | 70 72 65 72 65 71 75 69 |rom the |prerequi|
|00002230| 73 69 74 65 73 20 6c 69 | 6e 65 20 28 6e 6f 72 6d |sites li|ne (norm|
|00002240| 61 6c 6c 79 20 61 20 76 | 65 72 73 69 6f 6e 0a 6e |ally a v|ersion.n|
|00002250| 75 6d 62 65 72 29 20 61 | 6e 64 20 63 68 65 63 6b |umber) a|nd check|
|00002260| 20 74 68 65 20 69 6e 70 | 75 74 20 66 69 6c 65 20 | the inp|ut file |
|00002270| 74 6f 20 73 65 65 20 69 | 66 20 74 68 61 74 20 77 |to see i|f that w|
|00002280| 6f 72 64 20 63 61 6e 20 | 62 65 20 66 6f 75 6e 64 |ord can |be found|
|00002290| 2e 0a 49 66 20 6e 6f 74 | 2c 0a 2e 49 20 70 61 74 |..If not|,..I pat|
|000022a0| 63 68 0a 77 69 6c 6c 20 | 61 73 6b 20 66 6f 72 20 |ch.will |ask for |
|000022b0| 63 6f 6e 66 69 72 6d 61 | 74 69 6f 6e 20 62 65 66 |confirma|tion bef|
|000022c0| 6f 72 65 20 70 72 6f 63 | 65 65 64 69 6e 67 2e 0a |ore proc|eeding..|
|000022d0| 2e 50 50 0a 54 68 65 20 | 75 70 73 68 6f 74 20 6f |.PP.The |upshot o|
|000022e0| 66 20 61 6c 6c 20 74 68 | 69 73 20 69 73 20 74 68 |f all th|is is th|
|000022f0| 61 74 20 79 6f 75 20 73 | 68 6f 75 6c 64 20 62 65 |at you s|hould be|
|00002300| 20 61 62 6c 65 20 74 6f | 20 73 61 79 2c 20 77 68 | able to| say, wh|
|00002310| 69 6c 65 20 69 6e 20 61 | 20 6e 65 77 73 0a 69 6e |ile in a| news.in|
|00002320| 74 65 72 66 61 63 65 2c | 20 74 68 65 20 66 6f 6c |terface,| the fol|
|00002330| 6c 6f 77 69 6e 67 3a 0a | 2e 53 70 0a 09 7c 20 70 |lowing:.|.Sp..| p|
|00002340| 61 74 63 68 20 2d 64 20 | 2f 75 73 72 2f 73 72 63 |atch -d |/usr/src|
|00002350| 2f 6c 6f 63 61 6c 2f 62 | 6c 75 72 66 6c 0a 2e 53 |/local/b|lurfl..S|
|00002360| 70 0a 61 6e 64 20 70 61 | 74 63 68 20 61 20 66 69 |p.and pa|tch a fi|
|00002370| 6c 65 20 69 6e 20 74 68 | 65 20 62 6c 75 72 66 6c |le in th|e blurfl|
|00002380| 20 64 69 72 65 63 74 6f | 72 79 20 64 69 72 65 63 | directo|ry direc|
|00002390| 74 6c 79 20 66 72 6f 6d | 20 74 68 65 20 61 72 74 |tly from| the art|
|000023a0| 69 63 6c 65 20 63 6f 6e | 74 61 69 6e 69 6e 67 0a |icle con|taining.|
|000023b0| 74 68 65 20 70 61 74 63 | 68 2e 0a 2e 50 50 0a 49 |the patc|h...PP.I|
|000023c0| 66 20 74 68 65 20 70 61 | 74 63 68 20 66 69 6c 65 |f the pa|tch file|
|000023d0| 20 63 6f 6e 74 61 69 6e | 73 20 6d 6f 72 65 20 74 | contain|s more t|
|000023e0| 68 61 6e 20 6f 6e 65 20 | 70 61 74 63 68 2c 0a 2e |han one |patch,..|
|000023f0| 49 20 70 61 74 63 68 0a | 77 69 6c 6c 20 74 72 79 |I patch.|will try|
|00002400| 20 74 6f 20 61 70 70 6c | 79 20 65 61 63 68 20 6f | to appl|y each o|
|00002410| 66 20 74 68 65 6d 20 61 | 73 20 69 66 20 74 68 65 |f them a|s if the|
|00002420| 79 20 63 61 6d 65 20 66 | 72 6f 6d 20 73 65 70 61 |y came f|rom sepa|
|00002430| 72 61 74 65 20 70 61 74 | 63 68 20 66 69 6c 65 73 |rate pat|ch files|
|00002440| 2e 0a 54 68 69 73 20 6d | 65 61 6e 73 2c 20 61 6d |..This m|eans, am|
|00002450| 6f 6e 67 20 6f 74 68 65 | 72 20 74 68 69 6e 67 73 |ong othe|r things|
|00002460| 2c 20 74 68 61 74 20 69 | 74 20 69 73 20 61 73 73 |, that i|t is ass|
|00002470| 75 6d 65 64 20 74 68 61 | 74 20 74 68 65 20 6e 61 |umed tha|t the na|
|00002480| 6d 65 20 6f 66 20 74 68 | 65 20 66 69 6c 65 0a 74 |me of th|e file.t|
|00002490| 6f 20 70 61 74 63 68 20 | 6d 75 73 74 20 62 65 20 |o patch |must be |
|000024a0| 64 65 74 65 72 6d 69 6e | 65 64 20 66 6f 72 20 65 |determin|ed for e|
|000024b0| 61 63 68 20 64 69 66 66 | 20 6c 69 73 74 69 6e 67 |ach diff| listing|
|000024c0| 2c 0a 61 6e 64 20 74 68 | 61 74 20 74 68 65 20 67 |,.and th|at the g|
|000024d0| 61 72 62 61 67 65 20 62 | 65 66 6f 72 65 20 65 61 |arbage b|efore ea|
|000024e0| 63 68 20 64 69 66 66 20 | 6c 69 73 74 69 6e 67 20 |ch diff |listing |
|000024f0| 77 69 6c 6c 0a 62 65 20 | 65 78 61 6d 69 6e 65 64 |will.be |examined|
|00002500| 20 66 6f 72 20 69 6e 74 | 65 72 65 73 74 69 6e 67 | for int|eresting|
|00002510| 20 74 68 69 6e 67 73 20 | 73 75 63 68 20 61 73 20 | things |such as |
|00002520| 66 69 6c 65 20 6e 61 6d | 65 73 20 61 6e 64 20 72 |file nam|es and r|
|00002530| 65 76 69 73 69 6f 6e 20 | 6c 65 76 65 6c 2c 20 61 |evision |level, a|
|00002540| 73 0a 6d 65 6e 74 69 6f | 6e 65 64 20 70 72 65 76 |s.mentio|ned prev|
|00002550| 69 6f 75 73 6c 79 2e 0a | 59 6f 75 20 63 61 6e 20 |iously..|You can |
|00002560| 67 69 76 65 20 6f 70 74 | 69 6f 6e 73 20 28 61 6e |give opt|ions (an|
|00002570| 64 20 61 6e 6f 74 68 65 | 72 20 6f 72 69 67 69 6e |d anothe|r origin|
|00002580| 61 6c 20 66 69 6c 65 20 | 6e 61 6d 65 29 20 66 6f |al file |name) fo|
|00002590| 72 20 74 68 65 20 73 65 | 63 6f 6e 64 20 61 6e 64 |r the se|cond and|
|000025a0| 0a 73 75 62 73 65 71 75 | 65 6e 74 20 70 61 74 63 |.subsequ|ent patc|
|000025b0| 68 65 73 20 62 79 20 73 | 65 70 61 72 61 74 69 6e |hes by s|eparatin|
|000025c0| 67 20 74 68 65 20 63 6f | 72 72 65 73 70 6f 6e 64 |g the co|rrespond|
|000025d0| 69 6e 67 20 61 72 67 75 | 6d 65 6e 74 20 6c 69 73 |ing argu|ment lis|
|000025e0| 74 73 0a 62 79 20 61 20 | 5c 2a 28 4c 27 2b 5c 2a |ts.by a |\*(L'+\*|
|000025f0| 28 52 27 2e 0a 28 54 68 | 65 20 61 72 67 75 6d 65 |(R'..(Th|e argume|
|00002600| 6e 74 20 6c 69 73 74 20 | 66 6f 72 20 61 20 73 65 |nt list |for a se|
|00002610| 63 6f 6e 64 20 6f 72 20 | 73 75 62 73 65 71 75 65 |cond or |subseque|
|00002620| 6e 74 20 70 61 74 63 68 | 20 6d 61 79 20 6e 6f 74 |nt patch| may not|
|00002630| 20 73 70 65 63 69 66 79 | 20 61 20 6e 65 77 0a 70 | specify| a new.p|
|00002640| 61 74 63 68 20 66 69 6c | 65 2c 20 68 6f 77 65 76 |atch fil|e, howev|
|00002650| 65 72 2e 29 0a 2e 50 50 | 0a 2e 49 20 50 61 74 63 |er.)..PP|..I Patc|
|00002660| 68 0a 72 65 63 6f 67 6e | 69 7a 65 73 20 74 68 65 |h.recogn|izes the|
|00002670| 20 66 6f 6c 6c 6f 77 69 | 6e 67 20 6f 70 74 69 6f | followi|ng optio|
|00002680| 6e 73 3a 0a 2e 54 50 20 | 35 0a 2e 42 20 22 5c 2d |ns:..TP |5..B "\-|
|00002690| 62 20 73 75 66 66 2c 20 | 5c 2d 5c 2d 73 75 66 66 |b suff, |\-\-suff|
|000026a0| 69 78 3d 73 75 66 66 22 | 0a 63 61 75 73 65 73 0a |ix=suff"|.causes.|
|000026b0| 2e 42 20 73 75 66 66 0a | 74 6f 20 62 65 20 69 6e |.B suff.|to be in|
|000026c0| 74 65 72 70 72 65 74 65 | 64 20 61 73 20 74 68 65 |terprete|d as the|
|000026d0| 20 62 61 63 6b 75 70 20 | 65 78 74 65 6e 73 69 6f | backup |extensio|
|000026e0| 6e 2c 20 74 6f 20 62 65 | 0a 75 73 65 64 20 69 6e |n, to be|.used in|
|000026f0| 20 70 6c 61 63 65 20 6f | 66 20 5c 2a 28 4c 22 2e | place o|f \*(L".|
|00002700| 6f 72 69 67 5c 2a 28 52 | 22 20 6f 72 20 5c 2a 28 |orig\*(R|" or \*(|
|00002710| 4c 22 7e 5c 2a 28 52 22 | 2e 0a 2e 54 50 20 35 0a |L"~\*(R"|...TP 5.|
|00002720| 2e 42 20 22 5c 2d 42 20 | 70 72 65 66 2c 20 5c 2d |.B "\-B |pref, \-|
|00002730| 5c 2d 70 72 65 66 69 78 | 3d 70 72 65 66 22 0a 63 |\-prefix|=pref".c|
|00002740| 61 75 73 65 73 0a 2e 42 | 20 70 72 65 66 0a 74 6f |auses..B| pref.to|
|00002750| 20 62 65 20 69 6e 74 65 | 72 70 72 65 74 65 64 20 | be inte|rpreted |
|00002760| 61 73 20 61 20 70 72 65 | 66 69 78 20 74 6f 20 74 |as a pre|fix to t|
|00002770| 68 65 20 62 61 63 6b 75 | 70 20 66 69 6c 65 0a 6e |he backu|p file.n|
|00002780| 61 6d 65 2e 20 49 66 20 | 74 68 69 73 20 61 72 67 |ame. If |this arg|
|00002790| 75 6d 65 6e 74 20 69 73 | 20 73 70 65 63 69 66 69 |ument is| specifi|
|000027a0| 65 64 2c 20 61 6e 79 20 | 61 72 67 75 6d 65 6e 74 |ed, any |argument|
|000027b0| 20 66 72 6f 6d 0a 2e 42 | 20 5c 2d 62 0a 77 69 6c | from..B| \-b.wil|
|000027c0| 6c 20 62 65 20 69 67 6e | 6f 72 65 64 2e 0a 2e 54 |l be ign|ored...T|
|000027d0| 50 20 35 0a 2e 42 20 22 | 5c 2d 63 2c 20 5c 2d 5c |P 5..B "|\-c, \-\|
|000027e0| 2d 63 6f 6e 74 65 78 74 | 22 0a 66 6f 72 63 65 73 |-context|".forces|
|000027f0| 0a 2e 49 20 70 61 74 63 | 68 0a 74 6f 20 69 6e 74 |..I patc|h.to int|
|00002800| 65 72 70 72 65 74 20 74 | 68 65 20 70 61 74 63 68 |erpret t|he patch|
|00002810| 20 66 69 6c 65 20 61 73 | 20 61 20 63 6f 6e 74 65 | file as| a conte|
|00002820| 78 74 20 64 69 66 66 2e | 0a 2e 54 50 20 35 0a 2e |xt diff.|..TP 5..|
|00002830| 42 20 22 5c 2d 64 20 64 | 69 72 2c 20 5c 2d 5c 2d |B "\-d d|ir, \-\-|
|00002840| 64 69 72 65 63 74 6f 72 | 79 3d 64 69 72 22 0a 63 |director|y=dir".c|
|00002850| 61 75 73 65 73 0a 2e 49 | 20 70 61 74 63 68 0a 74 |auses..I| patch.t|
|00002860| 6f 20 69 6e 74 65 72 70 | 72 65 74 0a 2e 42 20 64 |o interp|ret..B d|
|00002870| 69 72 0a 61 73 20 61 20 | 64 69 72 65 63 74 6f 72 |ir.as a |director|
|00002880| 79 2c 20 61 6e 64 20 63 | 64 20 74 6f 20 69 74 20 |y, and c|d to it |
|00002890| 62 65 66 6f 72 65 20 64 | 6f 69 6e 67 0a 61 6e 79 |before d|oing.any|
|000028a0| 74 68 69 6e 67 20 65 6c | 73 65 2e 0a 2e 54 50 20 |thing el|se...TP |
|000028b0| 35 0a 2e 42 20 22 5c 2d | 44 20 73 79 6d 2c 20 5c |5..B "\-|D sym, \|
|000028c0| 2d 5c 2d 69 66 64 65 66 | 3d 73 79 6d 22 0a 63 61 |-\-ifdef|=sym".ca|
|000028d0| 75 73 65 73 0a 2e 49 20 | 70 61 74 63 68 0a 74 6f |uses..I |patch.to|
|000028e0| 20 75 73 65 20 74 68 65 | 20 22 23 69 66 64 65 66 | use the| "#ifdef|
|000028f0| 2e 2e 2e 23 65 6e 64 69 | 66 22 20 63 6f 6e 73 74 |...#endi|f" const|
|00002900| 72 75 63 74 20 74 6f 20 | 6d 61 72 6b 20 63 68 61 |ruct to |mark cha|
|00002910| 6e 67 65 73 2e 0a 2e 42 | 20 73 79 6d 0a 77 69 6c |nges...B| sym.wil|
|00002920| 6c 20 62 65 20 75 73 65 | 64 20 61 73 20 74 68 65 |l be use|d as the|
|00002930| 20 64 69 66 66 65 72 65 | 6e 74 69 61 74 69 6e 67 | differe|ntiating|
|00002940| 20 73 79 6d 62 6f 6c 2e | 0a 2e 54 50 20 35 0a 2e | symbol.|..TP 5..|
|00002950| 42 20 22 5c 2d 65 2c 20 | 5c 2d 5c 2d 65 64 22 0a |B "\-e, |\-\-ed".|
|00002960| 66 6f 72 63 65 73 0a 2e | 49 20 70 61 74 63 68 0a |forces..|I patch.|
|00002970| 74 6f 20 69 6e 74 65 72 | 70 72 65 74 20 74 68 65 |to inter|pret the|
|00002980| 20 70 61 74 63 68 20 66 | 69 6c 65 20 61 73 20 61 | patch f|ile as a|
|00002990| 6e 0a 2e 49 20 65 64 0a | 73 63 72 69 70 74 2e 0a |n..I ed.|script..|
|000029a0| 2e 54 50 20 35 0a 2e 42 | 20 22 5c 2d 45 2c 20 5c |.TP 5..B| "\-E, \|
|000029b0| 2d 5c 2d 72 65 6d 6f 76 | 65 5c 2d 65 6d 70 74 79 |-\-remov|e\-empty|
|000029c0| 5c 2d 66 69 6c 65 73 22 | 0a 63 61 75 73 65 73 0a |\-files"|.causes.|
|000029d0| 2e 49 20 70 61 74 63 68 | 0a 74 6f 20 72 65 6d 6f |.I patch|.to remo|
|000029e0| 76 65 20 6f 75 74 70 75 | 74 20 66 69 6c 65 73 20 |ve outpu|t files |
|000029f0| 74 68 61 74 20 61 72 65 | 20 65 6d 70 74 79 20 61 |that are| empty a|
|00002a00| 66 74 65 72 20 74 68 65 | 20 70 61 74 63 68 65 73 |fter the| patches|
|00002a10| 20 68 61 76 65 20 62 65 | 65 6e 20 61 70 70 6c 69 | have be|en appli|
|00002a20| 65 64 2e 0a 2e 54 50 20 | 35 0a 2e 42 20 22 5c 2d |ed...TP |5..B "\-|
|00002a30| 66 2c 20 5c 2d 5c 2d 66 | 6f 72 63 65 22 0a 66 6f |f, \-\-f|orce".fo|
|00002a40| 72 63 65 73 0a 2e 49 20 | 70 61 74 63 68 0a 74 6f |rces..I |patch.to|
|00002a50| 20 61 73 73 75 6d 65 20 | 74 68 61 74 20 74 68 65 | assume |that the|
|00002a60| 20 75 73 65 72 20 6b 6e | 6f 77 73 20 65 78 61 63 | user kn|ows exac|
|00002a70| 74 6c 79 20 77 68 61 74 | 20 68 65 20 6f 72 20 73 |tly what| he or s|
|00002a80| 68 65 20 69 73 20 64 6f | 69 6e 67 2c 20 61 6e 64 |he is do|ing, and|
|00002a90| 20 74 6f 20 6e 6f 74 0a | 61 73 6b 20 61 6e 79 20 | to not.|ask any |
|00002aa0| 71 75 65 73 74 69 6f 6e | 73 2e 20 20 49 74 20 61 |question|s.  It a|
|00002ab0| 73 73 75 6d 65 73 20 74 | 68 65 20 66 6f 6c 6c 6f |ssumes t|he follo|
|00002ac0| 77 69 6e 67 3a 20 73 6b | 69 70 20 70 61 74 63 68 |wing: sk|ip patch|
|00002ad0| 65 73 20 66 6f 72 20 77 | 68 69 63 68 20 61 0a 66 |es for w|hich a.f|
|00002ae0| 69 6c 65 20 74 6f 20 70 | 61 74 63 68 20 63 61 6e |ile to p|atch can|
|00002af0| 27 74 20 62 65 20 66 6f | 75 6e 64 3b 20 70 61 74 |'t be fo|und; pat|
|00002b00| 63 68 20 66 69 6c 65 73 | 20 65 76 65 6e 20 74 68 |ch files| even th|
|00002b10| 6f 75 67 68 20 74 68 65 | 79 20 68 61 76 65 20 74 |ough the|y have t|
|00002b20| 68 65 0a 77 72 6f 6e 67 | 20 76 65 72 73 69 6f 6e |he.wrong| version|
|00002b30| 20 66 6f 72 20 74 68 65 | 20 60 60 50 72 65 72 65 | for the| ``Prere|
|00002b40| 71 3a 27 27 20 6c 69 6e | 65 20 69 6e 20 74 68 65 |q:'' lin|e in the|
|00002b50| 20 70 61 74 63 68 3b 20 | 61 6e 64 20 61 73 73 75 | patch; |and assu|
|00002b60| 6d 65 20 74 68 61 74 0a | 70 61 74 63 68 65 73 20 |me that.|patches |
|00002b70| 61 72 65 20 6e 6f 74 20 | 72 65 76 65 72 73 65 64 |are not |reversed|
|00002b80| 20 65 76 65 6e 20 69 66 | 20 74 68 65 79 20 6c 6f | even if| they lo|
|00002b90| 6f 6b 20 6c 69 6b 65 20 | 74 68 65 79 20 61 72 65 |ok like |they are|
|00002ba0| 2e 0a 54 68 69 73 20 6f | 70 74 69 6f 6e 20 64 6f |..This o|ption do|
|00002bb0| 65 73 20 6e 6f 74 20 73 | 75 70 70 72 65 73 73 20 |es not s|uppress |
|00002bc0| 63 6f 6d 6d 65 6e 74 61 | 72 79 3b 20 75 73 65 0a |commenta|ry; use.|
|00002bd0| 2e 42 20 5c 2d 73 0a 66 | 6f 72 20 74 68 61 74 2e |.B \-s.f|or that.|
|00002be0| 0a 2e 54 50 20 35 0a 2e | 42 20 22 5c 2d 74 2c 20 |..TP 5..|B "\-t, |
|00002bf0| 5c 2d 5c 2d 62 61 74 63 | 68 22 0a 73 69 6d 69 6c |\-\-batc|h".simil|
|00002c00| 61 72 20 74 6f 0a 2e 42 | 52 20 5c 2d 66 20 2c 0a |ar to..B|R \-f ,.|
|00002c10| 69 6e 20 74 68 61 74 20 | 69 74 20 73 75 70 70 72 |in that |it suppr|
|00002c20| 65 73 73 65 73 20 71 75 | 65 73 74 69 6f 6e 73 2c |esses qu|estions,|
|00002c30| 20 62 75 74 20 6d 61 6b | 65 73 20 73 6f 6d 65 20 | but mak|es some |
|00002c40| 64 69 66 66 65 72 65 6e | 74 20 61 73 73 75 6d 70 |differen|t assump|
|00002c50| 74 69 6f 6e 73 3a 0a 73 | 6b 69 70 20 70 61 74 63 |tions:.s|kip patc|
|00002c60| 68 65 73 20 66 6f 72 20 | 77 68 69 63 68 20 61 20 |hes for |which a |
|00002c70| 66 69 6c 65 20 74 6f 20 | 70 61 74 63 68 20 63 61 |file to |patch ca|
|00002c80| 6e 27 74 20 62 65 20 66 | 6f 75 6e 64 20 28 74 68 |n't be f|ound (th|
|00002c90| 65 20 73 61 6d 65 20 61 | 73 20 5c 66 42 5c 2d 66 |e same a|s \fB\-f|
|00002ca0| 5c 66 50 29 3b 0a 73 6b | 69 70 20 70 61 74 63 68 |\fP);.sk|ip patch|
|00002cb0| 65 73 20 66 6f 72 20 77 | 68 69 63 68 20 74 68 65 |es for w|hich the|
|00002cc0| 20 66 69 6c 65 20 68 61 | 73 20 74 68 65 20 77 72 | file ha|s the wr|
|00002cd0| 6f 6e 67 20 76 65 72 73 | 69 6f 6e 20 66 6f 72 20 |ong vers|ion for |
|00002ce0| 74 68 65 20 60 60 50 72 | 65 72 65 71 3a 27 27 20 |the ``Pr|ereq:'' |
|00002cf0| 6c 69 6e 65 0a 69 6e 20 | 74 68 65 20 70 61 74 63 |line.in |the patc|
|00002d00| 68 3b 20 61 6e 64 20 61 | 73 73 75 6d 65 20 74 68 |h; and a|ssume th|
|00002d10| 61 74 20 70 61 74 63 68 | 65 73 20 61 72 65 20 72 |at patch|es are r|
|00002d20| 65 76 65 72 73 65 64 20 | 69 66 20 74 68 65 79 20 |eversed |if they |
|00002d30| 6c 6f 6f 6b 20 6c 69 6b | 65 0a 74 68 65 79 20 61 |look lik|e.they a|
|00002d40| 72 65 2e 0a 2e 54 50 20 | 35 0a 2e 42 20 22 5c 2d |re...TP |5..B "\-|
|00002d50| 46 20 6e 75 6d 62 65 72 | 2c 20 5c 2d 5c 2d 66 75 |F number|, \-\-fu|
|00002d60| 7a 7a 3d 6e 75 6d 62 65 | 72 22 0a 73 65 74 73 20 |zz=numbe|r".sets |
|00002d70| 74 68 65 20 6d 61 78 69 | 6d 75 6d 20 66 75 7a 7a |the maxi|mum fuzz|
|00002d80| 20 66 61 63 74 6f 72 2e | 0a 54 68 69 73 20 6f 70 | factor.|.This op|
|00002d90| 74 69 6f 6e 20 6f 6e 6c | 79 20 61 70 70 6c 69 65 |tion onl|y applie|
|00002da0| 73 20 74 6f 20 63 6f 6e | 74 65 78 74 20 64 69 66 |s to con|text dif|
|00002db0| 66 73 2c 20 61 6e 64 20 | 63 61 75 73 65 73 0a 2e |fs, and |causes..|
|00002dc0| 49 20 70 61 74 63 68 0a | 74 6f 20 69 67 6e 6f 72 |I patch.|to ignor|
|00002dd0| 65 20 75 70 20 74 6f 20 | 74 68 61 74 20 6d 61 6e |e up to |that man|
|00002de0| 79 20 6c 69 6e 65 73 20 | 69 6e 20 6c 6f 6f 6b 69 |y lines |in looki|
|00002df0| 6e 67 20 66 6f 72 20 70 | 6c 61 63 65 73 20 74 6f |ng for p|laces to|
|00002e00| 20 69 6e 73 74 61 6c 6c | 20 61 20 68 75 6e 6b 2e | install| a hunk.|
|00002e10| 0a 4e 6f 74 65 20 74 68 | 61 74 20 61 20 6c 61 72 |.Note th|at a lar|
|00002e20| 67 65 72 20 66 75 7a 7a | 20 66 61 63 74 6f 72 20 |ger fuzz| factor |
|00002e30| 69 6e 63 72 65 61 73 65 | 73 20 74 68 65 20 6f 64 |increase|s the od|
|00002e40| 64 73 20 6f 66 20 61 20 | 66 61 75 6c 74 79 20 70 |ds of a |faulty p|
|00002e50| 61 74 63 68 2e 0a 54 68 | 65 20 64 65 66 61 75 6c |atch..Th|e defaul|
|00002e60| 74 20 66 75 7a 7a 20 66 | 61 63 74 6f 72 20 69 73 |t fuzz f|actor is|
|00002e70| 20 32 2c 20 61 6e 64 20 | 69 74 20 6d 61 79 20 6e | 2, and |it may n|
|00002e80| 6f 74 20 62 65 20 73 65 | 74 20 74 6f 20 6d 6f 72 |ot be se|t to mor|
|00002e90| 65 20 74 68 61 6e 0a 74 | 68 65 20 6e 75 6d 62 65 |e than.t|he numbe|
|00002ea0| 72 20 6f 66 20 6c 69 6e | 65 73 20 6f 66 20 63 6f |r of lin|es of co|
|00002eb0| 6e 74 65 78 74 20 69 6e | 20 74 68 65 20 63 6f 6e |ntext in| the con|
|00002ec0| 74 65 78 74 20 64 69 66 | 66 2c 20 6f 72 64 69 6e |text dif|f, ordin|
|00002ed0| 61 72 69 6c 79 20 33 2e | 0a 2e 54 50 20 35 0a 2e |arily 3.|..TP 5..|
|00002ee0| 42 20 22 5c 2d 6c 2c 20 | 5c 2d 5c 2d 69 67 6e 6f |B "\-l, |\-\-igno|
|00002ef0| 72 65 5c 2d 77 68 69 74 | 65 73 70 61 63 65 22 0a |re\-whit|espace".|
|00002f00| 63 61 75 73 65 73 20 74 | 68 65 20 70 61 74 74 65 |causes t|he patte|
|00002f10| 72 6e 20 6d 61 74 63 68 | 69 6e 67 20 74 6f 20 62 |rn match|ing to b|
|00002f20| 65 20 64 6f 6e 65 20 6c | 6f 6f 73 65 6c 79 2c 20 |e done l|oosely, |
|00002f30| 69 6e 20 63 61 73 65 20 | 74 68 65 20 74 61 62 73 |in case |the tabs|
|00002f40| 20 61 6e 64 0a 73 70 61 | 63 65 73 20 68 61 76 65 | and.spa|ces have|
|00002f50| 20 62 65 65 6e 20 6d 75 | 6e 67 65 64 20 69 6e 20 | been mu|nged in |
|00002f60| 79 6f 75 72 20 69 6e 70 | 75 74 20 66 69 6c 65 2e |your inp|ut file.|
|00002f70| 0a 41 6e 79 20 73 65 71 | 75 65 6e 63 65 20 6f 66 |.Any seq|uence of|
|00002f80| 20 77 68 69 74 65 73 70 | 61 63 65 20 69 6e 20 74 | whitesp|ace in t|
|00002f90| 68 65 20 70 61 74 74 65 | 72 6e 20 6c 69 6e 65 20 |he patte|rn line |
|00002fa0| 77 69 6c 6c 20 6d 61 74 | 63 68 20 61 6e 79 20 73 |will mat|ch any s|
|00002fb0| 65 71 75 65 6e 63 65 0a | 69 6e 20 74 68 65 20 69 |equence.|in the i|
|00002fc0| 6e 70 75 74 20 66 69 6c | 65 2e 0a 4e 6f 72 6d 61 |nput fil|e..Norma|
|00002fd0| 6c 20 63 68 61 72 61 63 | 74 65 72 73 20 6d 75 73 |l charac|ters mus|
|00002fe0| 74 20 73 74 69 6c 6c 20 | 6d 61 74 63 68 20 65 78 |t still |match ex|
|00002ff0| 61 63 74 6c 79 2e 0a 45 | 61 63 68 20 6c 69 6e 65 |actly..E|ach line|
|00003000| 20 6f 66 20 74 68 65 20 | 63 6f 6e 74 65 78 74 20 | of the |context |
|00003010| 6d 75 73 74 20 73 74 69 | 6c 6c 20 6d 61 74 63 68 |must sti|ll match|
|00003020| 20 61 20 6c 69 6e 65 20 | 69 6e 20 74 68 65 20 69 | a line |in the i|
|00003030| 6e 70 75 74 20 66 69 6c | 65 2e 0a 2e 54 50 20 35 |nput fil|e...TP 5|
|00003040| 0a 2e 42 20 22 5c 2d 6e | 2c 20 5c 2d 5c 2d 6e 6f |..B "\-n|, \-\-no|
|00003050| 72 6d 61 6c 22 0a 66 6f | 72 63 65 73 0a 2e 49 20 |rmal".fo|rces..I |
|00003060| 70 61 74 63 68 0a 74 6f | 20 69 6e 74 65 72 70 72 |patch.to| interpr|
|00003070| 65 74 20 74 68 65 20 70 | 61 74 63 68 20 66 69 6c |et the p|atch fil|
|00003080| 65 20 61 73 20 61 20 6e | 6f 72 6d 61 6c 20 64 69 |e as a n|ormal di|
|00003090| 66 66 2e 0a 2e 54 50 20 | 35 0a 2e 42 20 22 5c 2d |ff...TP |5..B "\-|
|000030a0| 4e 2c 20 5c 2d 5c 2d 66 | 6f 72 77 61 72 64 22 0a |N, \-\-f|orward".|
|000030b0| 63 61 75 73 65 73 0a 2e | 49 20 70 61 74 63 68 0a |causes..|I patch.|
|000030c0| 74 6f 20 69 67 6e 6f 72 | 65 20 70 61 74 63 68 65 |to ignor|e patche|
|000030d0| 73 20 74 68 61 74 20 69 | 74 20 74 68 69 6e 6b 73 |s that i|t thinks|
|000030e0| 20 61 72 65 20 72 65 76 | 65 72 73 65 64 20 6f 72 | are rev|ersed or|
|000030f0| 20 61 6c 72 65 61 64 79 | 20 61 70 70 6c 69 65 64 | already| applied|
|00003100| 2e 0a 53 65 65 20 61 6c | 73 6f 0a 2e 42 20 5c 2d |..See al|so..B \-|
|00003110| 52 20 2e 0a 2e 54 50 20 | 35 0a 2e 42 20 22 5c 2d |R ...TP |5..B "\-|
|00003120| 6f 20 66 69 6c 65 2c 20 | 5c 2d 5c 2d 6f 75 74 70 |o file, |\-\-outp|
|00003130| 75 74 3d 66 69 6c 65 22 | 0a 63 61 75 73 65 73 0a |ut=file"|.causes.|
|00003140| 2e 42 20 66 69 6c 65 0a | 74 6f 20 62 65 20 69 6e |.B file.|to be in|
|00003150| 74 65 72 70 72 65 74 65 | 64 20 61 73 20 74 68 65 |terprete|d as the|
|00003160| 20 6f 75 74 70 75 74 20 | 66 69 6c 65 20 6e 61 6d | output |file nam|
|00003170| 65 2e 0a 2e 54 50 20 35 | 0a 2e 42 20 22 5c 2d 70 |e...TP 5|..B "\-p|
|00003180| 5b 6e 75 6d 62 65 72 5d | 2c 20 5c 2d 5c 2d 73 74 |[number]|, \-\-st|
|00003190| 72 69 70 5b 3d 6e 75 6d | 62 65 72 5d 22 0a 73 65 |rip[=num|ber]".se|
|000031a0| 74 73 20 74 68 65 20 70 | 61 74 68 6e 61 6d 65 20 |ts the p|athname |
|000031b0| 73 74 72 69 70 20 63 6f | 75 6e 74 2c 0a 77 68 69 |strip co|unt,.whi|
|000031c0| 63 68 20 63 6f 6e 74 72 | 6f 6c 73 20 68 6f 77 20 |ch contr|ols how |
|000031d0| 70 61 74 68 6e 61 6d 65 | 73 20 66 6f 75 6e 64 20 |pathname|s found |
|000031e0| 69 6e 20 74 68 65 20 70 | 61 74 63 68 20 66 69 6c |in the p|atch fil|
|000031f0| 65 20 61 72 65 20 74 72 | 65 61 74 65 64 2c 20 69 |e are tr|eated, i|
|00003200| 6e 20 63 61 73 65 0a 74 | 68 65 20 79 6f 75 20 6b |n case.t|he you k|
|00003210| 65 65 70 20 79 6f 75 72 | 20 66 69 6c 65 73 20 69 |eep your| files i|
|00003220| 6e 20 61 20 64 69 66 66 | 65 72 65 6e 74 20 64 69 |n a diff|erent di|
|00003230| 72 65 63 74 6f 72 79 20 | 74 68 61 6e 20 74 68 65 |rectory |than the|
|00003240| 20 70 65 72 73 6f 6e 20 | 77 68 6f 20 73 65 6e 74 | person |who sent|
|00003250| 0a 6f 75 74 20 74 68 65 | 20 70 61 74 63 68 2e 0a |.out the| patch..|
|00003260| 54 68 65 20 73 74 72 69 | 70 20 63 6f 75 6e 74 20 |The stri|p count |
|00003270| 73 70 65 63 69 66 69 65 | 73 20 68 6f 77 20 6d 61 |specifie|s how ma|
|00003280| 6e 79 20 73 6c 61 73 68 | 65 73 20 61 72 65 20 74 |ny slash|es are t|
|00003290| 6f 20 62 65 20 73 74 72 | 69 70 70 65 64 20 66 72 |o be str|ipped fr|
|000032a0| 6f 6d 0a 74 68 65 20 66 | 72 6f 6e 74 20 6f 66 20 |om.the f|ront of |
|000032b0| 74 68 65 20 70 61 74 68 | 6e 61 6d 65 2e 0a 28 41 |the path|name..(A|
|000032c0| 6e 79 20 69 6e 74 65 72 | 76 65 6e 69 6e 67 20 64 |ny inter|vening d|
|000032d0| 69 72 65 63 74 6f 72 79 | 20 6e 61 6d 65 73 20 61 |irectory| names a|
|000032e0| 6c 73 6f 20 67 6f 20 61 | 77 61 79 2e 29 0a 46 6f |lso go a|way.).Fo|
|000032f0| 72 20 65 78 61 6d 70 6c | 65 2c 20 73 75 70 70 6f |r exampl|e, suppo|
|00003300| 73 69 6e 67 20 74 68 65 | 20 66 69 6c 65 20 6e 61 |sing the| file na|
|00003310| 6d 65 20 69 6e 20 74 68 | 65 20 70 61 74 63 68 20 |me in th|e patch |
|00003320| 66 69 6c 65 20 77 61 73 | 0a 2e 73 70 0a 09 2f 75 |file was|..sp../u|
|00003330| 2f 68 6f 77 61 72 64 2f | 73 72 63 2f 62 6c 75 72 |/howard/|src/blur|
|00003340| 66 6c 2f 62 6c 75 72 66 | 6c 2e 63 0a 2e 73 70 0a |fl/blurf|l.c..sp.|
|00003350| 73 65 74 74 69 6e 67 0a | 2e 42 20 5c 2d 70 0a 6f |setting.|.B \-p.o|
|00003360| 72 0a 2e 42 20 5c 2d 70 | 30 0a 67 69 76 65 73 20 |r..B \-p|0.gives |
|00003370| 74 68 65 20 65 6e 74 69 | 72 65 20 70 61 74 68 6e |the enti|re pathn|
|00003380| 61 6d 65 20 75 6e 6d 6f | 64 69 66 69 65 64 2c 0a |ame unmo|dified,.|
|00003390| 2e 42 20 5c 2d 70 31 0a | 67 69 76 65 73 0a 2e 73 |.B \-p1.|gives..s|
|000033a0| 70 0a 09 75 2f 68 6f 77 | 61 72 64 2f 73 72 63 2f |p..u/how|ard/src/|
|000033b0| 62 6c 75 72 66 6c 2f 62 | 6c 75 72 66 6c 2e 63 0a |blurfl/b|lurfl.c.|
|000033c0| 2e 73 70 0a 77 69 74 68 | 6f 75 74 20 74 68 65 20 |.sp.with|out the |
|000033d0| 6c 65 61 64 69 6e 67 20 | 73 6c 61 73 68 2c 0a 2e |leading |slash,..|
|000033e0| 42 20 5c 2d 70 34 0a 67 | 69 76 65 73 0a 2e 73 70 |B \-p4.g|ives..sp|
|000033f0| 0a 09 62 6c 75 72 66 6c | 2f 62 6c 75 72 66 6c 2e |..blurfl|/blurfl.|
|00003400| 63 0a 2e 73 70 0a 61 6e | 64 20 6e 6f 74 20 73 70 |c..sp.an|d not sp|
|00003410| 65 63 69 66 79 69 6e 67 | 0a 2e 42 20 5c 2d 70 0a |ecifying|..B \-p.|
|00003420| 61 74 20 61 6c 6c 20 6a | 75 73 74 20 67 69 76 65 |at all j|ust give|
|00003430| 73 20 79 6f 75 20 22 62 | 6c 75 72 66 6c 2e 63 22 |s you "b|lurfl.c"|
|00003440| 2c 20 75 6e 6c 65 73 73 | 20 61 6c 6c 20 6f 66 20 |, unless| all of |
|00003450| 74 68 65 20 64 69 72 65 | 63 74 6f 72 69 65 73 20 |the dire|ctories |
|00003460| 69 6e 20 74 68 65 0a 6c | 65 61 64 69 6e 67 20 70 |in the.l|eading p|
|00003470| 61 74 68 20 28 75 2f 68 | 6f 77 61 72 64 2f 73 72 |ath (u/h|oward/sr|
|00003480| 63 2f 62 6c 75 72 66 6c | 29 20 65 78 69 73 74 20 |c/blurfl|) exist |
|00003490| 61 6e 64 20 74 68 61 74 | 20 70 61 74 68 20 69 73 |and that| path is|
|000034a0| 20 72 65 6c 61 74 69 76 | 65 2c 0a 69 6e 20 77 68 | relativ|e,.in wh|
|000034b0| 69 63 68 20 63 61 73 65 | 20 79 6f 75 20 67 65 74 |ich case| you get|
|000034c0| 20 74 68 65 20 65 6e 74 | 69 72 65 20 70 61 74 68 | the ent|ire path|
|000034d0| 6e 61 6d 65 20 75 6e 6d | 6f 64 69 66 69 65 64 2e |name unm|odified.|
|000034e0| 0a 57 68 61 74 65 76 65 | 72 20 79 6f 75 20 65 6e |.Whateve|r you en|
|000034f0| 64 20 75 70 20 77 69 74 | 68 20 69 73 20 6c 6f 6f |d up wit|h is loo|
|00003500| 6b 65 64 20 66 6f 72 20 | 65 69 74 68 65 72 20 69 |ked for |either i|
|00003510| 6e 20 74 68 65 20 63 75 | 72 72 65 6e 74 20 64 69 |n the cu|rrent di|
|00003520| 72 65 63 74 6f 72 79 2c | 0a 6f 72 20 74 68 65 20 |rectory,|.or the |
|00003530| 64 69 72 65 63 74 6f 72 | 79 20 73 70 65 63 69 66 |director|y specif|
|00003540| 69 65 64 20 62 79 20 74 | 68 65 0a 2e 42 20 5c 2d |ied by t|he..B \-|
|00003550| 64 0a 6f 70 74 69 6f 6e | 2e 0a 2e 54 50 20 35 0a |d.option|...TP 5.|
|00003560| 2e 42 20 22 5c 2d 72 20 | 66 69 6c 65 2c 20 5c 2d |.B "\-r |file, \-|
|00003570| 5c 2d 72 65 6a 65 63 74 | 5c 2d 66 69 6c 65 3d 66 |\-reject|\-file=f|
|00003580| 69 6c 65 22 0a 63 61 75 | 73 65 73 0a 2e 42 20 66 |ile".cau|ses..B f|
|00003590| 69 6c 65 0a 74 6f 20 62 | 65 20 69 6e 74 65 72 70 |ile.to b|e interp|
|000035a0| 72 65 74 65 64 20 61 73 | 20 74 68 65 20 72 65 6a |reted as| the rej|
|000035b0| 65 63 74 20 66 69 6c 65 | 20 6e 61 6d 65 2e 0a 2e |ect file| name...|
|000035c0| 54 50 20 35 0a 2e 42 20 | 22 5c 2d 52 2c 20 5c 2d |TP 5..B |"\-R, \-|
|000035d0| 5c 2d 72 65 76 65 72 73 | 65 22 0a 74 65 6c 6c 73 |\-revers|e".tells|
|000035e0| 0a 2e 49 20 70 61 74 63 | 68 0a 74 68 61 74 20 74 |..I patc|h.that t|
|000035f0| 68 69 73 20 70 61 74 63 | 68 20 77 61 73 20 63 72 |his patc|h was cr|
|00003600| 65 61 74 65 64 20 77 69 | 74 68 20 74 68 65 20 6f |eated wi|th the o|
|00003610| 6c 64 20 61 6e 64 20 6e | 65 77 20 66 69 6c 65 73 |ld and n|ew files|
|00003620| 20 73 77 61 70 70 65 64 | 2e 0a 28 59 65 73 2c 20 | swapped|..(Yes, |
|00003630| 49 27 6d 20 61 66 72 61 | 69 64 20 74 68 61 74 20 |I'm afra|id that |
|00003640| 64 6f 65 73 20 68 61 70 | 70 65 6e 20 6f 63 63 61 |does hap|pen occa|
|00003650| 73 69 6f 6e 61 6c 6c 79 | 2c 20 68 75 6d 61 6e 20 |sionally|, human |
|00003660| 6e 61 74 75 72 65 20 62 | 65 69 6e 67 20 77 68 61 |nature b|eing wha|
|00003670| 74 20 69 74 0a 69 73 2e | 29 0a 2e 49 20 50 61 74 |t it.is.|)..I Pat|
|00003680| 63 68 0a 77 69 6c 6c 20 | 61 74 74 65 6d 70 74 20 |ch.will |attempt |
|00003690| 74 6f 20 73 77 61 70 20 | 65 61 63 68 20 68 75 6e |to swap |each hun|
|000036a0| 6b 20 61 72 6f 75 6e 64 | 20 62 65 66 6f 72 65 20 |k around| before |
|000036b0| 61 70 70 6c 79 69 6e 67 | 20 69 74 2e 0a 52 65 6a |applying| it..Rej|
|000036c0| 65 63 74 73 20 77 69 6c | 6c 20 63 6f 6d 65 20 6f |ects wil|l come o|
|000036d0| 75 74 20 69 6e 20 74 68 | 65 20 73 77 61 70 70 65 |ut in th|e swappe|
|000036e0| 64 20 66 6f 72 6d 61 74 | 2e 0a 54 68 65 0a 2e 42 |d format|..The..B|
|000036f0| 20 5c 2d 52 0a 6f 70 74 | 69 6f 6e 20 77 69 6c 6c | \-R.opt|ion will|
|00003700| 20 6e 6f 74 20 77 6f 72 | 6b 20 77 69 74 68 0a 2e | not wor|k with..|
|00003710| 49 20 65 64 0a 64 69 66 | 66 20 73 63 72 69 70 74 |I ed.dif|f script|
|00003720| 73 20 62 65 63 61 75 73 | 65 20 74 68 65 72 65 20 |s becaus|e there |
|00003730| 69 73 20 74 6f 6f 20 6c | 69 74 74 6c 65 0a 69 6e |is too l|ittle.in|
|00003740| 66 6f 72 6d 61 74 69 6f | 6e 20 74 6f 20 72 65 63 |formatio|n to rec|
|00003750| 6f 6e 73 74 72 75 63 74 | 20 74 68 65 20 72 65 76 |onstruct| the rev|
|00003760| 65 72 73 65 20 6f 70 65 | 72 61 74 69 6f 6e 2e 0a |erse ope|ration..|
|00003770| 2e 53 70 0a 49 66 20 74 | 68 65 20 66 69 72 73 74 |.Sp.If t|he first|
|00003780| 20 68 75 6e 6b 20 6f 66 | 20 61 20 70 61 74 63 68 | hunk of| a patch|
|00003790| 20 66 61 69 6c 73 2c 0a | 2e 49 20 70 61 74 63 68 | fails,.|.I patch|
|000037a0| 0a 77 69 6c 6c 20 72 65 | 76 65 72 73 65 20 74 68 |.will re|verse th|
|000037b0| 65 20 68 75 6e 6b 20 74 | 6f 20 73 65 65 20 69 66 |e hunk t|o see if|
|000037c0| 20 69 74 20 63 61 6e 20 | 62 65 20 61 70 70 6c 69 | it can |be appli|
|000037d0| 65 64 20 74 68 61 74 20 | 77 61 79 2e 0a 49 66 20 |ed that |way..If |
|000037e0| 69 74 20 63 61 6e 2c 20 | 79 6f 75 20 77 69 6c 6c |it can, |you will|
|000037f0| 20 62 65 20 61 73 6b 65 | 64 20 69 66 20 79 6f 75 | be aske|d if you|
|00003800| 20 77 61 6e 74 20 74 6f | 20 68 61 76 65 20 74 68 | want to| have th|
|00003810| 65 0a 2e 42 20 5c 2d 52 | 0a 6f 70 74 69 6f 6e 20 |e..B \-R|.option |
|00003820| 73 65 74 2e 0a 49 66 20 | 69 74 20 63 61 6e 27 74 |set..If |it can't|
|00003830| 2c 20 74 68 65 20 70 61 | 74 63 68 20 77 69 6c 6c |, the pa|tch will|
|00003840| 20 63 6f 6e 74 69 6e 75 | 65 20 74 6f 20 62 65 20 | continu|e to be |
|00003850| 61 70 70 6c 69 65 64 20 | 6e 6f 72 6d 61 6c 6c 79 |applied |normally|
|00003860| 2e 0a 28 4e 6f 74 65 3a | 20 74 68 69 73 20 6d 65 |..(Note:| this me|
|00003870| 74 68 6f 64 20 63 61 6e | 6e 6f 74 20 64 65 74 65 |thod can|not dete|
|00003880| 63 74 20 61 20 72 65 76 | 65 72 73 65 64 20 70 61 |ct a rev|ersed pa|
|00003890| 74 63 68 20 69 66 20 69 | 74 20 69 73 20 61 20 6e |tch if i|t is a n|
|000038a0| 6f 72 6d 61 6c 20 64 69 | 66 66 0a 61 6e 64 20 69 |ormal di|ff.and i|
|000038b0| 66 20 74 68 65 20 66 69 | 72 73 74 20 63 6f 6d 6d |f the fi|rst comm|
|000038c0| 61 6e 64 20 69 73 20 61 | 6e 20 61 70 70 65 6e 64 |and is a|n append|
|000038d0| 20 28 69 2e 65 2e 20 69 | 74 20 73 68 6f 75 6c 64 | (i.e. i|t should|
|000038e0| 20 68 61 76 65 20 62 65 | 65 6e 20 61 20 64 65 6c | have be|en a del|
|000038f0| 65 74 65 29 0a 73 69 6e | 63 65 20 61 70 70 65 6e |ete).sin|ce appen|
|00003900| 64 73 20 61 6c 77 61 79 | 73 20 73 75 63 63 65 65 |ds alway|s succee|
|00003910| 64 2c 20 64 75 65 20 74 | 6f 20 74 68 65 20 66 61 |d, due t|o the fa|
|00003920| 63 74 20 74 68 61 74 20 | 61 20 6e 75 6c 6c 20 63 |ct that |a null c|
|00003930| 6f 6e 74 65 78 74 20 77 | 69 6c 6c 20 6d 61 74 63 |ontext w|ill matc|
|00003940| 68 0a 61 6e 79 77 68 65 | 72 65 2e 0a 4c 75 63 6b |h.anywhe|re..Luck|
|00003950| 69 6c 79 2c 20 6d 6f 73 | 74 20 70 61 74 63 68 65 |ily, mos|t patche|
|00003960| 73 20 61 64 64 20 6f 72 | 20 63 68 61 6e 67 65 20 |s add or| change |
|00003970| 6c 69 6e 65 73 20 72 61 | 74 68 65 72 20 74 68 61 |lines ra|ther tha|
|00003980| 6e 20 64 65 6c 65 74 65 | 20 74 68 65 6d 2c 20 73 |n delete| them, s|
|00003990| 6f 20 6d 6f 73 74 0a 72 | 65 76 65 72 73 65 64 20 |o most.r|eversed |
|000039a0| 6e 6f 72 6d 61 6c 20 64 | 69 66 66 73 20 77 69 6c |normal d|iffs wil|
|000039b0| 6c 20 62 65 67 69 6e 20 | 77 69 74 68 20 61 20 64 |l begin |with a d|
|000039c0| 65 6c 65 74 65 2c 20 77 | 68 69 63 68 20 77 69 6c |elete, w|hich wil|
|000039d0| 6c 20 66 61 69 6c 2c 20 | 74 72 69 67 67 65 72 69 |l fail, |triggeri|
|000039e0| 6e 67 0a 74 68 65 20 68 | 65 75 72 69 73 74 69 63 |ng.the h|euristic|
|000039f0| 2e 29 0a 2e 54 50 20 35 | 0a 2e 42 20 22 5c 2d 73 |.)..TP 5|..B "\-s|
|00003a00| 2c 20 5c 2d 5c 2d 73 69 | 6c 65 6e 74 2c 20 5c 2d |, \-\-si|lent, \-|
|00003a10| 5c 2d 71 75 69 65 74 22 | 0a 6d 61 6b 65 73 0a 2e |\-quiet"|.makes..|
|00003a20| 49 20 70 61 74 63 68 0a | 64 6f 20 69 74 73 20 77 |I patch.|do its w|
|00003a30| 6f 72 6b 20 73 69 6c 65 | 6e 74 6c 79 2c 20 75 6e |ork sile|ntly, un|
|00003a40| 6c 65 73 73 20 61 6e 20 | 65 72 72 6f 72 20 6f 63 |less an |error oc|
|00003a50| 63 75 72 73 2e 0a 2e 54 | 50 20 35 0a 2e 42 20 22 |curs...T|P 5..B "|
|00003a60| 5c 2d 53 2c 20 5c 2d 5c | 2d 73 6b 69 70 22 0a 63 |\-S, \-\|-skip".c|
|00003a70| 61 75 73 65 73 0a 2e 49 | 20 70 61 74 63 68 0a 74 |auses..I| patch.t|
|00003a80| 6f 20 69 67 6e 6f 72 65 | 20 74 68 69 73 20 70 61 |o ignore| this pa|
|00003a90| 74 63 68 20 66 72 6f 6d | 20 74 68 65 20 70 61 74 |tch from| the pat|
|00003aa0| 63 68 20 66 69 6c 65 2c | 20 62 75 74 20 63 6f 6e |ch file,| but con|
|00003ab0| 74 69 6e 75 65 20 6f 6e | 20 6c 6f 6f 6b 69 6e 67 |tinue on| looking|
|00003ac0| 0a 66 6f 72 20 74 68 65 | 20 6e 65 78 74 20 70 61 |.for the| next pa|
|00003ad0| 74 63 68 20 69 6e 20 74 | 68 65 20 66 69 6c 65 2e |tch in t|he file.|
|00003ae0| 0a 54 68 75 73 0a 2e 73 | 70 0a 09 70 61 74 63 68 |.Thus..s|p..patch|
|00003af0| 20 2d 53 20 2b 20 2d 53 | 20 2b 20 3c 70 61 74 63 | -S + -S| + <patc|
|00003b00| 68 66 69 6c 65 0a 2e 73 | 70 0a 77 69 6c 6c 20 69 |hfile..s|p.will i|
|00003b10| 67 6e 6f 72 65 20 74 68 | 65 20 66 69 72 73 74 20 |gnore th|e first |
|00003b20| 61 6e 64 20 73 65 63 6f | 6e 64 20 6f 66 20 74 68 |and seco|nd of th|
|00003b30| 72 65 65 20 70 61 74 63 | 68 65 73 2e 0a 2e 54 50 |ree patc|hes...TP|
|00003b40| 20 35 0a 2e 42 20 22 5c | 2d 75 2c 20 5c 2d 5c 2d | 5..B "\|-u, \-\-|
|00003b50| 75 6e 69 66 69 65 64 22 | 0a 66 6f 72 63 65 73 0a |unified"|.forces.|
|00003b60| 2e 49 20 70 61 74 63 68 | 0a 74 6f 20 69 6e 74 65 |.I patch|.to inte|
|00003b70| 72 70 72 65 74 20 74 68 | 65 20 70 61 74 63 68 20 |rpret th|e patch |
|00003b80| 66 69 6c 65 20 61 73 20 | 61 20 75 6e 69 66 69 65 |file as |a unifie|
|00003b90| 64 20 63 6f 6e 74 65 78 | 74 20 64 69 66 66 20 28 |d contex|t diff (|
|00003ba0| 61 20 75 6e 69 64 69 66 | 66 29 2e 0a 2e 54 50 20 |a unidif|f)...TP |
|00003bb0| 35 0a 2e 42 20 22 5c 2d | 76 2c 20 5c 2d 5c 2d 76 |5..B "\-|v, \-\-v|
|00003bc0| 65 72 73 69 6f 6e 22 0a | 63 61 75 73 65 73 0a 2e |ersion".|causes..|
|00003bd0| 49 20 70 61 74 63 68 0a | 74 6f 20 70 72 69 6e 74 |I patch.|to print|
|00003be0| 20 6f 75 74 20 69 74 73 | 20 72 65 76 69 73 69 6f | out its| revisio|
|00003bf0| 6e 20 68 65 61 64 65 72 | 20 61 6e 64 20 70 61 74 |n header| and pat|
|00003c00| 63 68 20 6c 65 76 65 6c | 2e 0a 2e 54 50 20 35 0a |ch level|...TP 5.|
|00003c10| 2e 42 20 22 5c 2d 56 20 | 6d 65 74 68 6f 64 2c 20 |.B "\-V |method, |
|00003c20| 5c 2d 5c 2d 76 65 72 73 | 69 6f 6e 5c 2d 5c 2d 63 |\-\-vers|ion\-\-c|
|00003c30| 6f 6e 74 72 6f 6c 3d 6d | 65 74 68 6f 64 22 0a 63 |ontrol=m|ethod".c|
|00003c40| 61 75 73 65 73 0a 2e 42 | 20 6d 65 74 68 6f 64 0a |auses..B| method.|
|00003c50| 74 6f 20 62 65 20 69 6e | 74 65 72 70 72 65 74 65 |to be in|terprete|
|00003c60| 64 20 61 73 20 61 20 6d | 65 74 68 6f 64 20 66 6f |d as a m|ethod fo|
|00003c70| 72 20 63 72 65 61 74 69 | 6e 67 0a 62 61 63 6b 75 |r creati|ng.backu|
|00003c80| 70 20 66 69 6c 65 20 6e | 61 6d 65 73 2e 20 20 54 |p file n|ames.  T|
|00003c90| 68 65 20 74 79 70 65 20 | 6f 66 20 62 61 63 6b 75 |he type |of backu|
|00003ca0| 70 73 20 6d 61 64 65 20 | 63 61 6e 20 61 6c 73 6f |ps made |can also|
|00003cb0| 20 62 65 20 67 69 76 65 | 6e 20 69 6e 20 74 68 65 | be give|n in the|
|00003cc0| 0a 2e 42 20 56 45 52 53 | 49 4f 4e 5f 43 4f 4e 54 |..B VERS|ION_CONT|
|00003cd0| 52 4f 4c 0a 65 6e 76 69 | 72 6f 6e 6d 65 6e 74 20 |ROL.envi|ronment |
|00003ce0| 76 61 72 69 61 62 6c 65 | 2c 20 77 68 69 63 68 20 |variable|, which |
|00003cf0| 69 73 20 6f 76 65 72 72 | 69 64 64 65 6e 20 62 79 |is overr|idden by|
|00003d00| 20 74 68 69 73 20 6f 70 | 74 69 6f 6e 2e 0a 54 68 | this op|tion..Th|
|00003d10| 65 0a 2e 42 20 2d 42 0a | 6f 70 74 69 6f 6e 20 6f |e..B -B.|option o|
|00003d20| 76 65 72 72 69 64 65 73 | 20 74 68 69 73 20 6f 70 |verrides| this op|
|00003d30| 74 69 6f 6e 2c 20 63 61 | 75 73 69 6e 67 20 74 68 |tion, ca|using th|
|00003d40| 65 20 70 72 65 66 69 78 | 20 74 6f 20 61 6c 77 61 |e prefix| to alwa|
|00003d50| 79 73 20 62 65 20 75 73 | 65 64 20 66 6f 72 0a 6d |ys be us|ed for.m|
|00003d60| 61 6b 69 6e 67 20 62 61 | 63 6b 75 70 20 66 69 6c |aking ba|ckup fil|
|00003d70| 65 20 6e 61 6d 65 73 2e | 0a 54 68 65 20 76 61 6c |e names.|.The val|
|00003d80| 75 65 20 6f 66 20 74 68 | 65 0a 2e 42 20 56 45 52 |ue of th|e..B VER|
|00003d90| 53 49 4f 4e 5f 43 4f 4e | 54 52 4f 4c 0a 65 6e 76 |SION_CON|TROL.env|
|00003da0| 69 72 6f 6e 6d 65 6e 74 | 20 76 61 72 69 61 62 6c |ironment| variabl|
|00003db0| 65 20 61 6e 64 20 74 68 | 65 20 61 72 67 75 6d 65 |e and th|e argume|
|00003dc0| 6e 74 20 74 6f 20 74 68 | 65 0a 2e 42 20 2d 56 0a |nt to th|e..B -V.|
|00003dd0| 6f 70 74 69 6f 6e 20 61 | 72 65 20 6c 69 6b 65 20 |option a|re like |
|00003de0| 74 68 65 20 47 4e 55 0a | 45 6d 61 63 73 20 60 76 |the GNU.|Emacs `v|
|00003df0| 65 72 73 69 6f 6e 2d 63 | 6f 6e 74 72 6f 6c 27 20 |ersion-c|ontrol' |
|00003e00| 76 61 72 69 61 62 6c 65 | 3b 20 74 68 65 79 20 61 |variable|; they a|
|00003e10| 6c 73 6f 20 72 65 63 6f | 67 6e 69 7a 65 20 73 79 |lso reco|gnize sy|
|00003e20| 6e 6f 6e 79 6d 73 20 74 | 68 61 74 0a 61 72 65 20 |nonyms t|hat.are |
|00003e30| 6d 6f 72 65 20 64 65 73 | 63 72 69 70 74 69 76 65 |more des|criptive|
|00003e40| 2e 20 20 54 68 65 20 76 | 61 6c 69 64 20 76 61 6c |.  The v|alid val|
|00003e50| 75 65 73 20 61 72 65 20 | 28 75 6e 69 71 75 65 20 |ues are |(unique |
|00003e60| 61 62 62 72 65 76 69 61 | 74 69 6f 6e 73 20 61 72 |abbrevia|tions ar|
|00003e70| 65 0a 61 63 63 65 70 74 | 65 64 29 3a 0a 2e 52 53 |e.accept|ed):..RS|
|00003e80| 0a 2e 54 50 0a 60 74 27 | 20 6f 72 20 60 6e 75 6d |..TP.`t'| or `num|
|00003e90| 62 65 72 65 64 27 0a 41 | 6c 77 61 79 73 20 6d 61 |bered'.A|lways ma|
|00003ea0| 6b 65 20 6e 75 6d 62 65 | 72 65 64 20 62 61 63 6b |ke numbe|red back|
|00003eb0| 75 70 73 2e 0a 2e 54 50 | 0a 60 6e 69 6c 27 20 6f |ups...TP|.`nil' o|
|00003ec0| 72 20 60 65 78 69 73 74 | 69 6e 67 27 0a 4d 61 6b |r `exist|ing'.Mak|
|00003ed0| 65 20 6e 75 6d 62 65 72 | 65 64 20 62 61 63 6b 75 |e number|ed backu|
|00003ee0| 70 73 20 6f 66 20 66 69 | 6c 65 73 20 74 68 61 74 |ps of fi|les that|
|00003ef0| 20 61 6c 72 65 61 64 79 | 0a 68 61 76 65 20 74 68 | already|.have th|
|00003f00| 65 6d 2c 20 73 69 6d 70 | 6c 65 20 62 61 63 6b 75 |em, simp|le backu|
|00003f10| 70 73 20 6f 66 20 74 68 | 65 20 6f 74 68 65 72 73 |ps of th|e others|
|00003f20| 2e 0a 54 68 69 73 20 69 | 73 20 74 68 65 20 64 65 |..This i|s the de|
|00003f30| 66 61 75 6c 74 2e 0a 2e | 54 50 0a 60 6e 65 76 65 |fault...|TP.`neve|
|00003f40| 72 27 20 6f 72 20 60 73 | 69 6d 70 6c 65 27 0a 41 |r' or `s|imple'.A|
|00003f50| 6c 77 61 79 73 20 6d 61 | 6b 65 20 73 69 6d 70 6c |lways ma|ke simpl|
|00003f60| 65 20 62 61 63 6b 75 70 | 73 2e 0a 2e 52 45 0a 2e |e backup|s...RE..|
|00003f70| 54 50 20 35 0a 2e 42 20 | 22 5c 2d 78 20 6e 75 6d |TP 5..B |"\-x num|
|00003f80| 62 65 72 2c 20 5c 2d 5c | 2d 64 65 62 75 67 3d 6e |ber, \-\|-debug=n|
|00003f90| 75 6d 62 65 72 22 0a 73 | 65 74 73 20 69 6e 74 65 |umber".s|ets inte|
|00003fa0| 72 6e 61 6c 20 64 65 62 | 75 67 67 69 6e 67 20 66 |rnal deb|ugging f|
|00003fb0| 6c 61 67 73 2c 20 61 6e | 64 20 69 73 20 6f 66 20 |lags, an|d is of |
|00003fc0| 69 6e 74 65 72 65 73 74 | 20 6f 6e 6c 79 20 74 6f |interest| only to|
|00003fd0| 0a 2e 49 20 70 61 74 63 | 68 0a 70 61 74 63 68 65 |..I patc|h.patche|
|00003fe0| 72 73 2e 0a 2e 53 48 20 | 41 55 54 48 4f 52 0a 4c |rs...SH |AUTHOR.L|
|00003ff0| 61 72 72 79 20 57 61 6c | 6c 20 3c 6c 77 61 6c 6c |arry Wal|l <lwall|
|00004000| 40 6e 65 74 6c 61 62 73 | 2e 63 6f 6d 3e 0a 2e 62 |@netlabs|.com>..b|
|00004010| 72 0a 77 69 74 68 20 6d | 61 6e 79 20 6f 74 68 65 |r.with m|any othe|
|00004020| 72 20 63 6f 6e 74 72 69 | 62 75 74 6f 72 73 2e 0a |r contri|butors..|
|00004030| 2e 53 48 20 45 4e 56 49 | 52 4f 4e 4d 45 4e 54 0a |.SH ENVI|RONMENT.|
|00004040| 2e 54 50 0a 2e 42 20 54 | 4d 50 44 49 52 0a 44 69 |.TP..B T|MPDIR.Di|
|00004050| 72 65 63 74 6f 72 79 20 | 74 6f 20 70 75 74 20 74 |rectory |to put t|
|00004060| 65 6d 70 6f 72 61 72 79 | 20 66 69 6c 65 73 20 69 |emporary| files i|
|00004070| 6e 3b 20 64 65 66 61 75 | 6c 74 20 69 73 20 2f 74 |n; defau|lt is /t|
|00004080| 6d 70 2e 0a 2e 54 50 0a | 2e 42 20 53 49 4d 50 4c |mp...TP.|.B SIMPL|
|00004090| 45 5f 42 41 43 4b 55 50 | 5f 53 55 46 46 49 58 0a |E_BACKUP|_SUFFIX.|
|000040a0| 45 78 74 65 6e 73 69 6f | 6e 20 74 6f 20 75 73 65 |Extensio|n to use|
|000040b0| 20 66 6f 72 20 62 61 63 | 6b 75 70 20 66 69 6c 65 | for bac|kup file|
|000040c0| 20 6e 61 6d 65 73 20 69 | 6e 73 74 65 61 64 20 6f | names i|nstead o|
|000040d0| 66 20 5c 2a 28 4c 22 2e | 6f 72 69 67 5c 2a 28 52 |f \*(L".|orig\*(R|
|000040e0| 22 20 6f 72 0a 5c 2a 28 | 4c 22 7e 5c 2a 28 52 22 |" or.\*(|L"~\*(R"|
|000040f0| 2e 0a 2e 54 50 0a 2e 42 | 20 56 45 52 53 49 4f 4e |...TP..B| VERSION|
|00004100| 5f 43 4f 4e 54 52 4f 4c | 0a 53 65 6c 65 63 74 73 |_CONTROL|.Selects|
|00004110| 20 77 68 65 6e 20 6e 75 | 6d 62 65 72 65 64 20 62 | when nu|mbered b|
|00004120| 61 63 6b 75 70 20 66 69 | 6c 65 73 20 61 72 65 20 |ackup fi|les are |
|00004130| 6d 61 64 65 2e 0a 2e 53 | 48 20 46 49 4c 45 53 0a |made...S|H FILES.|
|00004140| 24 54 4d 50 44 49 52 2f | 70 61 74 63 68 2a 0a 2e |$TMPDIR/|patch*..|
|00004150| 53 48 20 53 45 45 20 41 | 4c 53 4f 0a 64 69 66 66 |SH SEE A|LSO.diff|
|00004160| 28 31 29 0a 2e 53 48 20 | 4e 4f 54 45 53 20 46 4f |(1)..SH |NOTES FO|
|00004170| 52 20 50 41 54 43 48 20 | 53 45 4e 44 45 52 53 0a |R PATCH |SENDERS.|
|00004180| 54 68 65 72 65 20 61 72 | 65 20 73 65 76 65 72 61 |There ar|e severa|
|00004190| 6c 20 74 68 69 6e 67 73 | 20 79 6f 75 20 73 68 6f |l things| you sho|
|000041a0| 75 6c 64 20 62 65 61 72 | 20 69 6e 20 6d 69 6e 64 |uld bear| in mind|
|000041b0| 20 69 66 20 79 6f 75 20 | 61 72 65 20 67 6f 69 6e | if you |are goin|
|000041c0| 67 20 74 6f 0a 62 65 20 | 73 65 6e 64 69 6e 67 20 |g to.be |sending |
|000041d0| 6f 75 74 20 70 61 74 63 | 68 65 73 2e 0a 46 69 72 |out patc|hes..Fir|
|000041e0| 73 74 2c 20 79 6f 75 20 | 63 61 6e 20 73 61 76 65 |st, you |can save|
|000041f0| 20 70 65 6f 70 6c 65 20 | 61 20 6c 6f 74 20 6f 66 | people |a lot of|
|00004200| 20 67 72 69 65 66 20 62 | 79 20 6b 65 65 70 69 6e | grief b|y keepin|
|00004210| 67 20 61 20 70 61 74 63 | 68 6c 65 76 65 6c 2e 68 |g a patc|hlevel.h|
|00004220| 20 66 69 6c 65 0a 77 68 | 69 63 68 20 69 73 20 70 | file.wh|ich is p|
|00004230| 61 74 63 68 65 64 20 74 | 6f 20 69 6e 63 72 65 6d |atched t|o increm|
|00004240| 65 6e 74 20 74 68 65 20 | 70 61 74 63 68 20 6c 65 |ent the |patch le|
|00004250| 76 65 6c 20 61 73 20 74 | 68 65 20 66 69 72 73 74 |vel as t|he first|
|00004260| 20 64 69 66 66 20 69 6e | 20 74 68 65 0a 70 61 74 | diff in| the.pat|
|00004270| 63 68 20 66 69 6c 65 20 | 79 6f 75 20 73 65 6e 64 |ch file |you send|
|00004280| 20 6f 75 74 2e 0a 49 66 | 20 79 6f 75 20 70 75 74 | out..If| you put|
|00004290| 20 61 20 50 72 65 72 65 | 71 3a 20 6c 69 6e 65 20 | a Prere|q: line |
|000042a0| 69 6e 20 77 69 74 68 20 | 74 68 65 20 70 61 74 63 |in with |the patc|
|000042b0| 68 2c 20 69 74 20 77 6f | 6e 27 74 20 6c 65 74 20 |h, it wo|n't let |
|000042c0| 74 68 65 6d 20 61 70 70 | 6c 79 0a 70 61 74 63 68 |them app|ly.patch|
|000042d0| 65 73 20 6f 75 74 20 6f | 66 20 6f 72 64 65 72 20 |es out o|f order |
|000042e0| 77 69 74 68 6f 75 74 20 | 73 6f 6d 65 20 77 61 72 |without |some war|
|000042f0| 6e 69 6e 67 2e 0a 53 65 | 63 6f 6e 64 2c 20 6d 61 |ning..Se|cond, ma|
|00004300| 6b 65 20 73 75 72 65 20 | 79 6f 75 27 76 65 20 73 |ke sure |you've s|
|00004310| 70 65 63 69 66 69 65 64 | 20 74 68 65 20 66 69 6c |pecified| the fil|
|00004320| 65 20 6e 61 6d 65 73 20 | 72 69 67 68 74 2c 20 65 |e names |right, e|
|00004330| 69 74 68 65 72 20 69 6e | 20 61 0a 63 6f 6e 74 65 |ither in| a.conte|
|00004340| 78 74 20 64 69 66 66 20 | 68 65 61 64 65 72 2c 20 |xt diff |header, |
|00004350| 6f 72 20 77 69 74 68 20 | 61 6e 20 49 6e 64 65 78 |or with |an Index|
|00004360| 3a 20 6c 69 6e 65 2e 0a | 49 66 20 79 6f 75 20 61 |: line..|If you a|
|00004370| 72 65 20 70 61 74 63 68 | 69 6e 67 20 73 6f 6d 65 |re patch|ing some|
|00004380| 74 68 69 6e 67 20 69 6e | 20 61 20 73 75 62 64 69 |thing in| a subdi|
|00004390| 72 65 63 74 6f 72 79 2c | 20 62 65 20 73 75 72 65 |rectory,| be sure|
|000043a0| 20 74 6f 20 74 65 6c 6c | 20 74 68 65 20 70 61 74 | to tell| the pat|
|000043b0| 63 68 0a 75 73 65 72 20 | 74 6f 20 73 70 65 63 69 |ch.user |to speci|
|000043c0| 66 79 20 61 20 0a 2e 42 | 20 5c 2d 70 0a 6f 70 74 |fy a ..B| \-p.opt|
|000043d0| 69 6f 6e 20 61 73 20 6e | 65 65 64 65 64 2e 0a 54 |ion as n|eeded..T|
|000043e0| 68 69 72 64 2c 20 79 6f | 75 20 63 61 6e 20 63 72 |hird, yo|u can cr|
|000043f0| 65 61 74 65 20 61 20 66 | 69 6c 65 20 62 79 20 73 |eate a f|ile by s|
|00004400| 65 6e 64 69 6e 67 20 6f | 75 74 20 61 20 64 69 66 |ending o|ut a dif|
|00004410| 66 20 74 68 61 74 20 63 | 6f 6d 70 61 72 65 73 20 |f that c|ompares |
|00004420| 61 0a 6e 75 6c 6c 20 66 | 69 6c 65 20 74 6f 20 74 |a.null f|ile to t|
|00004430| 68 65 20 66 69 6c 65 20 | 79 6f 75 20 77 61 6e 74 |he file |you want|
|00004440| 20 74 6f 20 63 72 65 61 | 74 65 2e 0a 54 68 69 73 | to crea|te..This|
|00004450| 20 77 69 6c 6c 20 6f 6e | 6c 79 20 77 6f 72 6b 20 | will on|ly work |
|00004460| 69 66 20 74 68 65 20 66 | 69 6c 65 20 79 6f 75 20 |if the f|ile you |
|00004470| 77 61 6e 74 20 74 6f 20 | 63 72 65 61 74 65 20 64 |want to |create d|
|00004480| 6f 65 73 6e 27 74 20 65 | 78 69 73 74 20 61 6c 72 |oesn't e|xist alr|
|00004490| 65 61 64 79 20 69 6e 0a | 74 68 65 20 74 61 72 67 |eady in.|the targ|
|000044a0| 65 74 20 64 69 72 65 63 | 74 6f 72 79 2e 0a 46 6f |et direc|tory..Fo|
|000044b0| 75 72 74 68 2c 20 74 61 | 6b 65 20 63 61 72 65 20 |urth, ta|ke care |
|000044c0| 6e 6f 74 20 74 6f 20 73 | 65 6e 64 20 6f 75 74 20 |not to s|end out |
|000044d0| 72 65 76 65 72 73 65 64 | 20 70 61 74 63 68 65 73 |reversed| patches|
|000044e0| 2c 20 73 69 6e 63 65 20 | 69 74 20 6d 61 6b 65 73 |, since |it makes|
|000044f0| 20 70 65 6f 70 6c 65 20 | 77 6f 6e 64 65 72 0a 77 | people |wonder.w|
|00004500| 68 65 74 68 65 72 20 74 | 68 65 79 20 61 6c 72 65 |hether t|hey alre|
|00004510| 61 64 79 20 61 70 70 6c | 69 65 64 20 74 68 65 20 |ady appl|ied the |
|00004520| 70 61 74 63 68 2e 0a 46 | 69 66 74 68 2c 20 77 68 |patch..F|ifth, wh|
|00004530| 69 6c 65 20 79 6f 75 20 | 6d 61 79 20 62 65 20 61 |ile you |may be a|
|00004540| 62 6c 65 20 74 6f 20 67 | 65 74 20 61 77 61 79 20 |ble to g|et away |
|00004550| 77 69 74 68 20 70 75 74 | 74 69 6e 67 20 35 38 32 |with put|ting 582|
|00004560| 20 64 69 66 66 20 6c 69 | 73 74 69 6e 67 73 20 69 | diff li|stings i|
|00004570| 6e 74 6f 0a 6f 6e 65 20 | 66 69 6c 65 2c 20 69 74 |nto.one |file, it|
|00004580| 20 69 73 20 70 72 6f 62 | 61 62 6c 79 20 77 69 73 | is prob|ably wis|
|00004590| 65 72 20 74 6f 20 67 72 | 6f 75 70 20 72 65 6c 61 |er to gr|oup rela|
|000045a0| 74 65 64 20 70 61 74 63 | 68 65 73 20 69 6e 74 6f |ted patc|hes into|
|000045b0| 20 73 65 70 61 72 61 74 | 65 20 66 69 6c 65 73 20 | separat|e files |
|000045c0| 69 6e 0a 63 61 73 65 20 | 73 6f 6d 65 74 68 69 6e |in.case |somethin|
|000045d0| 67 20 67 6f 65 73 20 68 | 61 79 77 69 72 65 2e 0a |g goes h|aywire..|
|000045e0| 2e 53 48 20 44 49 41 47 | 4e 4f 53 54 49 43 53 0a |.SH DIAG|NOSTICS.|
|000045f0| 54 6f 6f 20 6d 61 6e 79 | 20 74 6f 20 6c 69 73 74 |Too many| to list|
|00004600| 20 68 65 72 65 2c 20 62 | 75 74 20 67 65 6e 65 72 | here, b|ut gener|
|00004610| 61 6c 6c 79 20 69 6e 64 | 69 63 61 74 69 76 65 20 |ally ind|icative |
|00004620| 74 68 61 74 0a 2e 49 20 | 70 61 74 63 68 0a 63 6f |that..I |patch.co|
|00004630| 75 6c 64 6e 27 74 20 70 | 61 72 73 65 20 79 6f 75 |uldn't p|arse you|
|00004640| 72 20 70 61 74 63 68 20 | 66 69 6c 65 2e 0a 2e 50 |r patch |file...P|
|00004650| 50 0a 54 68 65 20 6d 65 | 73 73 61 67 65 20 5c 2a |P.The me|ssage \*|
|00004660| 28 4c 22 48 6d 6d 2e 2e | 2e 5c 2a 28 52 22 20 69 |(L"Hmm..|.\*(R" i|
|00004670| 6e 64 69 63 61 74 65 73 | 20 74 68 61 74 20 74 68 |ndicates| that th|
|00004680| 65 72 65 20 69 73 20 75 | 6e 70 72 6f 63 65 73 73 |ere is u|nprocess|
|00004690| 65 64 20 74 65 78 74 20 | 69 6e 0a 74 68 65 20 70 |ed text |in.the p|
|000046a0| 61 74 63 68 20 66 69 6c | 65 20 61 6e 64 20 74 68 |atch fil|e and th|
|000046b0| 61 74 0a 2e 49 20 70 61 | 74 63 68 0a 69 73 20 61 |at..I pa|tch.is a|
|000046c0| 74 74 65 6d 70 74 69 6e | 67 20 74 6f 20 69 6e 74 |ttemptin|g to int|
|000046d0| 75 69 74 20 77 68 65 74 | 68 65 72 20 74 68 65 72 |uit whet|her ther|
|000046e0| 65 20 69 73 20 61 20 70 | 61 74 63 68 20 69 6e 20 |e is a p|atch in |
|000046f0| 74 68 61 74 20 74 65 78 | 74 20 61 6e 64 2c 20 69 |that tex|t and, i|
|00004700| 66 20 73 6f 2c 0a 77 68 | 61 74 20 6b 69 6e 64 20 |f so,.wh|at kind |
|00004710| 6f 66 20 70 61 74 63 68 | 20 69 74 20 69 73 2e 0a |of patch| it is..|
|00004720| 2e 50 50 0a 2e 49 20 50 | 61 74 63 68 0a 77 69 6c |.PP..I P|atch.wil|
|00004730| 6c 20 65 78 69 74 20 77 | 69 74 68 20 61 20 6e 6f |l exit w|ith a no|
|00004740| 6e 2d 7a 65 72 6f 20 73 | 74 61 74 75 73 20 69 66 |n-zero s|tatus if|
|00004750| 20 61 6e 79 20 72 65 6a | 65 63 74 20 66 69 6c 65 | any rej|ect file|
|00004760| 73 20 77 65 72 65 20 63 | 72 65 61 74 65 64 2e 0a |s were c|reated..|
|00004770| 57 68 65 6e 20 61 70 70 | 6c 79 69 6e 67 20 61 20 |When app|lying a |
|00004780| 73 65 74 20 6f 66 20 70 | 61 74 63 68 65 73 20 69 |set of p|atches i|
|00004790| 6e 20 61 20 6c 6f 6f 70 | 20 69 74 20 62 65 68 6f |n a loop| it beho|
|000047a0| 6f 76 65 73 20 79 6f 75 | 20 74 6f 20 63 68 65 63 |oves you| to chec|
|000047b0| 6b 20 74 68 69 73 0a 65 | 78 69 74 20 73 74 61 74 |k this.e|xit stat|
|000047c0| 75 73 20 73 6f 20 79 6f | 75 20 64 6f 6e 27 74 20 |us so yo|u don't |
|000047d0| 61 70 70 6c 79 20 61 20 | 6c 61 74 65 72 20 70 61 |apply a |later pa|
|000047e0| 74 63 68 20 74 6f 20 61 | 20 70 61 72 74 69 61 6c |tch to a| partial|
|000047f0| 6c 79 20 70 61 74 63 68 | 65 64 20 66 69 6c 65 2e |ly patch|ed file.|
|00004800| 0a 2e 53 48 20 43 41 56 | 45 41 54 53 0a 2e 49 20 |..SH CAV|EATS..I |
|00004810| 50 61 74 63 68 0a 63 61 | 6e 6e 6f 74 20 74 65 6c |Patch.ca|nnot tel|
|00004820| 6c 20 69 66 20 74 68 65 | 20 6c 69 6e 65 20 6e 75 |l if the| line nu|
|00004830| 6d 62 65 72 73 20 61 72 | 65 20 6f 66 66 20 69 6e |mbers ar|e off in|
|00004840| 20 61 6e 0a 2e 49 20 65 | 64 0a 73 63 72 69 70 74 | an..I e|d.script|
|00004850| 2c 20 61 6e 64 20 63 61 | 6e 20 6f 6e 6c 79 20 64 |, and ca|n only d|
|00004860| 65 74 65 63 74 0a 62 61 | 64 20 6c 69 6e 65 20 6e |etect.ba|d line n|
|00004870| 75 6d 62 65 72 73 20 69 | 6e 20 61 20 6e 6f 72 6d |umbers i|n a norm|
|00004880| 61 6c 20 64 69 66 66 20 | 77 68 65 6e 20 69 74 20 |al diff |when it |
|00004890| 66 69 6e 64 73 20 61 20 | 5c 2a 28 4c 22 63 68 61 |finds a |\*(L"cha|
|000048a0| 6e 67 65 5c 2a 28 52 22 | 20 6f 72 0a 61 20 5c 2a |nge\*(R"| or.a \*|
|000048b0| 28 4c 22 64 65 6c 65 74 | 65 5c 2a 28 52 22 20 63 |(L"delet|e\*(R" c|
|000048c0| 6f 6d 6d 61 6e 64 2e 0a | 41 20 63 6f 6e 74 65 78 |ommand..|A contex|
|000048d0| 74 20 64 69 66 66 20 75 | 73 69 6e 67 20 66 75 7a |t diff u|sing fuz|
|000048e0| 7a 20 66 61 63 74 6f 72 | 20 33 20 6d 61 79 20 68 |z factor| 3 may h|
|000048f0| 61 76 65 20 74 68 65 20 | 73 61 6d 65 20 70 72 6f |ave the |same pro|
|00004900| 62 6c 65 6d 2e 0a 55 6e | 74 69 6c 20 61 20 73 75 |blem..Un|til a su|
|00004910| 69 74 61 62 6c 65 20 69 | 6e 74 65 72 61 63 74 69 |itable i|nteracti|
|00004920| 76 65 20 69 6e 74 65 72 | 66 61 63 65 20 69 73 20 |ve inter|face is |
|00004930| 61 64 64 65 64 2c 20 79 | 6f 75 20 73 68 6f 75 6c |added, y|ou shoul|
|00004940| 64 20 70 72 6f 62 61 62 | 6c 79 20 64 6f 0a 61 20 |d probab|ly do.a |
|00004950| 63 6f 6e 74 65 78 74 20 | 64 69 66 66 20 69 6e 20 |context |diff in |
|00004960| 74 68 65 73 65 20 63 61 | 73 65 73 20 74 6f 20 73 |these ca|ses to s|
|00004970| 65 65 20 69 66 20 74 68 | 65 20 63 68 61 6e 67 65 |ee if th|e change|
|00004980| 73 20 6d 61 64 65 20 73 | 65 6e 73 65 2e 0a 4f 66 |s made s|ense..Of|
|00004990| 20 63 6f 75 72 73 65 2c | 20 63 6f 6d 70 69 6c 69 | course,| compili|
|000049a0| 6e 67 20 77 69 74 68 6f | 75 74 20 65 72 72 6f 72 |ng witho|ut error|
|000049b0| 73 20 69 73 20 61 20 70 | 72 65 74 74 79 20 67 6f |s is a p|retty go|
|000049c0| 6f 64 20 69 6e 64 69 63 | 61 74 69 6f 6e 20 74 68 |od indic|ation th|
|000049d0| 61 74 20 74 68 65 20 70 | 61 74 63 68 0a 77 6f 72 |at the p|atch.wor|
|000049e0| 6b 65 64 2c 20 62 75 74 | 20 6e 6f 74 20 61 6c 77 |ked, but| not alw|
|000049f0| 61 79 73 2e 0a 2e 50 50 | 0a 2e 49 20 50 61 74 63 |ays...PP|..I Patc|
|00004a00| 68 0a 75 73 75 61 6c 6c | 79 20 70 72 6f 64 75 63 |h.usuall|y produc|
|00004a10| 65 73 20 74 68 65 20 63 | 6f 72 72 65 63 74 20 72 |es the c|orrect r|
|00004a20| 65 73 75 6c 74 73 2c 20 | 65 76 65 6e 20 77 68 65 |esults, |even whe|
|00004a30| 6e 20 69 74 20 68 61 73 | 20 74 6f 20 64 6f 20 61 |n it has| to do a|
|00004a40| 20 6c 6f 74 20 6f 66 0a | 67 75 65 73 73 69 6e 67 | lot of.|guessing|
|00004a50| 2e 0a 48 6f 77 65 76 65 | 72 2c 20 74 68 65 20 72 |..Howeve|r, the r|
|00004a60| 65 73 75 6c 74 73 20 61 | 72 65 20 67 75 61 72 61 |esults a|re guara|
|00004a70| 6e 74 65 65 64 20 74 6f | 20 62 65 20 63 6f 72 72 |nteed to| be corr|
|00004a80| 65 63 74 20 6f 6e 6c 79 | 20 77 68 65 6e 20 74 68 |ect only| when th|
|00004a90| 65 20 70 61 74 63 68 20 | 69 73 0a 61 70 70 6c 69 |e patch |is.appli|
|00004aa0| 65 64 20 74 6f 20 65 78 | 61 63 74 6c 79 20 74 68 |ed to ex|actly th|
|00004ab0| 65 20 73 61 6d 65 20 76 | 65 72 73 69 6f 6e 20 6f |e same v|ersion o|
|00004ac0| 66 20 74 68 65 20 66 69 | 6c 65 20 74 68 61 74 20 |f the fi|le that |
|00004ad0| 74 68 65 20 70 61 74 63 | 68 20 77 61 73 0a 67 65 |the patc|h was.ge|
|00004ae0| 6e 65 72 61 74 65 64 20 | 66 72 6f 6d 2e 0a 2e 53 |nerated |from...S|
|00004af0| 48 20 42 55 47 53 0a 43 | 6f 75 6c 64 20 62 65 20 |H BUGS.C|ould be |
|00004b00| 73 6d 61 72 74 65 72 20 | 61 62 6f 75 74 20 70 61 |smarter |about pa|
|00004b10| 72 74 69 61 6c 20 6d 61 | 74 63 68 65 73 2c 20 65 |rtial ma|tches, e|
|00004b20| 78 63 65 73 73 69 76 65 | 6c 79 20 5c 26 64 65 76 |xcessive|ly \&dev|
|00004b30| 69 61 6e 74 20 6f 66 66 | 73 65 74 73 20 61 6e 64 |iant off|sets and|
|00004b40| 0a 73 77 61 70 70 65 64 | 20 63 6f 64 65 2c 20 62 |.swapped| code, b|
|00004b50| 75 74 20 74 68 61 74 20 | 77 6f 75 6c 64 20 74 61 |ut that |would ta|
|00004b60| 6b 65 20 61 6e 20 65 78 | 74 72 61 20 70 61 73 73 |ke an ex|tra pass|
|00004b70| 2e 0a 2e 50 50 0a 49 66 | 20 63 6f 64 65 20 68 61 |...PP.If| code ha|
|00004b80| 73 20 62 65 65 6e 20 64 | 75 70 6c 69 63 61 74 65 |s been d|uplicate|
|00004b90| 64 20 28 66 6f 72 20 69 | 6e 73 74 61 6e 63 65 20 |d (for i|nstance |
|00004ba0| 77 69 74 68 20 23 69 66 | 64 65 66 20 4f 4c 44 43 |with #if|def OLDC|
|00004bb0| 4f 44 45 20 2e 2e 2e 20 | 23 65 6c 73 65 20 2e 2e |ODE ... |#else ..|
|00004bc0| 2e 0a 23 65 6e 64 69 66 | 29 2c 0a 2e 49 20 70 61 |..#endif|),..I pa|
|00004bd0| 74 63 68 0a 69 73 20 69 | 6e 63 61 70 61 62 6c 65 |tch.is i|ncapable|
|00004be0| 20 6f 66 20 70 61 74 63 | 68 69 6e 67 20 62 6f 74 | of patc|hing bot|
|00004bf0| 68 20 76 65 72 73 69 6f | 6e 73 2c 20 61 6e 64 2c |h versio|ns, and,|
|00004c00| 20 69 66 20 69 74 20 77 | 6f 72 6b 73 20 61 74 20 | if it w|orks at |
|00004c10| 61 6c 6c 2c 20 77 69 6c | 6c 20 6c 69 6b 65 6c 79 |all, wil|l likely|
|00004c20| 0a 70 61 74 63 68 20 74 | 68 65 20 77 72 6f 6e 67 |.patch t|he wrong|
|00004c30| 20 6f 6e 65 2c 20 61 6e | 64 20 74 65 6c 6c 20 79 | one, an|d tell y|
|00004c40| 6f 75 20 74 68 61 74 20 | 69 74 20 73 75 63 63 65 |ou that |it succe|
|00004c50| 65 64 65 64 20 74 6f 20 | 62 6f 6f 74 2e 0a 2e 50 |eded to |boot...P|
|00004c60| 50 0a 49 66 20 79 6f 75 | 20 61 70 70 6c 79 20 61 |P.If you| apply a|
|00004c70| 20 70 61 74 63 68 20 79 | 6f 75 27 76 65 20 61 6c | patch y|ou've al|
|00004c80| 72 65 61 64 79 20 61 70 | 70 6c 69 65 64 2c 0a 2e |ready ap|plied,..|
|00004c90| 49 20 70 61 74 63 68 0a | 77 69 6c 6c 20 74 68 69 |I patch.|will thi|
|00004ca0| 6e 6b 20 69 74 20 69 73 | 20 61 20 72 65 76 65 72 |nk it is| a rever|
|00004cb0| 73 65 64 20 70 61 74 63 | 68 2c 20 61 6e 64 20 6f |sed patc|h, and o|
|00004cc0| 66 66 65 72 20 74 6f 20 | 75 6e 2d 61 70 70 6c 79 |ffer to |un-apply|
|00004cd0| 20 74 68 65 20 70 61 74 | 63 68 2e 0a 54 68 69 73 | the pat|ch..This|
|00004ce0| 20 63 6f 75 6c 64 20 62 | 65 20 63 6f 6e 73 74 72 | could b|e constr|
|00004cf0| 75 65 64 20 61 73 20 61 | 20 66 65 61 74 75 72 65 |ued as a| feature|
|00004d00| 2e 0a 2e 72 6e 20 7d 60 | 20 27 27 0a 00 00 00 00 |...rn }`| ''.....|
|00004d10| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004d20| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004d30| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004d40| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004d50| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004d60| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004d70| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004d80| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004d90| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004da0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004db0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004dc0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004dd0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004de0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004df0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004e00| 6d 61 6e 2f 63 61 74 31 | 2f 00 00 00 00 00 00 00 |man/cat1|/.......|
|00004e10| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004e20| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004e30| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004e40| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004e50| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004e60| 00 00 00 00 32 34 30 37 | 37 35 20 00 20 20 20 33 |....2407|75 .   3|
|00004e70| 31 30 20 00 20 20 20 31 | 34 35 20 00 20 20 20 20 |10 .   1|45 .    |
|00004e80| 20 20 20 20 20 20 30 20 | 20 35 34 31 32 32 32 34 |      0 | 5412224|
|00004e90| 30 34 31 20 20 31 31 32 | 31 35 00 20 35 00 00 00 |041  112|15. 5...|
|00004ea0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004eb0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004ec0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004ed0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004ee0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004ef0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004f00| 00 75 73 74 61 72 20 20 | 00 6a 65 66 66 00 00 00 |.ustar  |.jeff...|
|00004f10| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004f20| 00 00 00 00 00 00 00 00 | 00 73 6f 66 74 64 65 76 |........|.softdev|
|00004f30| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004f40| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004f50| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004f60| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004f70| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004f80| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004f90| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004fa0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004fb0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004fc0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004fd0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004fe0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00004ff0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005000| 6d 61 6e 2f 63 61 74 31 | 2f 70 61 74 63 68 2e 31 |man/cat1|/patch.1|
|00005010| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005020| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005030| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005040| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005050| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005060| 00 00 00 00 31 30 30 36 | 36 34 20 00 20 20 20 33 |....1006|64 .   3|
|00005070| 31 31 20 00 20 20 20 31 | 34 35 20 00 20 20 20 20 |11 .   1|45 .    |
|00005080| 20 20 34 36 32 33 37 20 | 20 35 34 31 32 32 32 34 |  46237 | 5412224|
|00005090| 30 36 30 20 20 31 32 33 | 35 31 00 20 30 00 00 00 |060  123|51. 0...|
|000050a0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000050b0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000050c0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000050d0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000050e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000050f0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005100| 00 75 73 74 61 72 20 20 | 00 74 65 64 00 00 00 00 |.ustar  |.ted....|
|00005110| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005120| 00 00 00 00 00 00 00 00 | 00 73 6f 66 74 64 65 76 |........|.softdev|
|00005130| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005140| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005150| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005160| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005170| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005180| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005190| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000051a0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000051b0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000051c0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000051d0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000051e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000051f0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00005200| 0a 0a 0a 50 41 54 43 48 | 28 31 29 20 20 20 20 20 |...PATCH|(1)     |
|00005210| 20 20 20 20 20 20 20 20 | 20 20 20 20 55 53 45 52 |        |    USER|
|00005220| 20 43 4f 4d 4d 41 4e 44 | 53 20 20 20 20 20 20 20 | COMMAND|S       |
|00005230| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 4c |        |       L|
|00005240| 4f 43 41 4c 0a 0a 0a 0a | 4e 41 4d 45 0a 20 20 20 |OCAL....|NAME.   |
|00005250| 20 20 70 61 74 63 68 20 | 2d 20 61 70 70 6c 79 20 |  patch |- apply |
|00005260| 61 20 64 69 66 66 20 66 | 69 6c 65 20 74 6f 20 61 |a diff f|ile to a|
|00005270| 6e 20 6f 72 69 67 69 6e | 61 6c 0a 0a 53 59 4e 4f |n origin|al..SYNO|
|00005280| 50 53 49 53 0a 20 20 20 | 20 20 70 61 74 63 68 20 |PSIS.   |  patch |
|00005290| 5b 6f 70 74 69 6f 6e 73 | 5d 20 5b 6f 72 69 67 66 |[options|] [origf|
|000052a0| 69 6c 65 20 5b 70 61 74 | 63 68 66 69 6c 65 5d 5d |ile [pat|chfile]]|
|000052b0| 20 5b 2b 20 20 5b 6f 70 | 74 69 6f 6e 73 5d 20 20 | [+  [op|tions]  |
|000052c0| 5b 6f 72 69 67 2d 0a 20 | 20 20 20 20 66 69 6c 65 |[orig-. |    file|
|000052d0| 5d 5d 2e 2e 2e 0a 0a 20 | 20 20 20 20 62 75 74 20 |]]..... |    but |
|000052e0| 75 73 75 61 6c 6c 79 20 | 6a 75 73 74 0a 0a 20 20 |usually |just..  |
|000052f0| 20 20 20 70 61 74 63 68 | 20 3c 70 61 74 63 68 66 |   patch| <patchf|
|00005300| 69 6c 65 0a 0a 44 45 53 | 43 52 49 50 54 49 4f 4e |ile..DES|CRIPTION|
|00005310| 0a 20 20 20 20 20 5f 08 | 50 5f 08 61 5f 08 74 5f |.     _.|P_.a_.t_|
|00005320| 08 63 5f 08 68 20 77 69 | 6c 6c 20 74 61 6b 65 20 |.c_.h wi|ll take |
|00005330| 61 20 70 61 74 63 68 20 | 66 69 6c 65 20 20 63 6f |a patch |file  co|
|00005340| 6e 74 61 69 6e 69 6e 67 | 20 20 61 6e 79 20 20 6f |ntaining|  any  o|
|00005350| 66 20 20 74 68 65 20 20 | 66 6f 75 72 0a 20 20 20 |f  the  |four.   |
|00005360| 20 20 66 6f 72 6d 73 20 | 6f 66 20 64 69 66 66 65 |  forms |of diffe|
|00005370| 72 65 6e 63 65 20 6c 69 | 73 74 69 6e 67 20 70 72 |rence li|sting pr|
|00005380| 6f 64 75 63 65 64 20 62 | 79 20 74 68 65 20 5f 08 |oduced b|y the _.|
|00005390| 64 5f 08 69 5f 08 66 5f | 08 66 20 70 72 6f 67 72 |d_.i_.f_|.f progr|
|000053a0| 61 6d 20 61 6e 64 0a 20 | 20 20 20 20 61 70 70 6c |am and. |    appl|
|000053b0| 79 20 74 68 6f 73 65 20 | 64 69 66 66 65 72 65 6e |y those |differen|
|000053c0| 63 65 73 20 74 6f 20 61 | 6e 20 20 6f 72 69 67 69 |ces to a|n  origi|
|000053d0| 6e 61 6c 20 20 66 69 6c | 65 2c 20 20 70 72 6f 64 |nal  fil|e,  prod|
|000053e0| 75 63 69 6e 67 20 20 61 | 0a 20 20 20 20 20 70 61 |ucing  a|.     pa|
|000053f0| 74 63 68 65 64 20 20 76 | 65 72 73 69 6f 6e 2e 20 |tched  v|ersion. |
|00005400| 20 42 79 20 64 65 66 61 | 75 6c 74 2c 20 74 68 65 | By defa|ult, the|
|00005410| 20 70 61 74 63 68 65 64 | 20 76 65 72 73 69 6f 6e | patched| version|
|00005420| 20 69 73 20 70 75 74 20 | 69 6e 0a 20 20 20 20 20 | is put |in.     |
|00005430| 70 6c 61 63 65 20 6f 66 | 20 74 68 65 20 6f 72 69 |place of| the ori|
|00005440| 67 69 6e 61 6c 2c 20 77 | 69 74 68 20 74 68 65 20 |ginal, w|ith the |
|00005450| 6f 72 69 67 69 6e 61 6c | 20 66 69 6c 65 20 62 61 |original| file ba|
|00005460| 63 6b 65 64 20 20 75 70 | 20 20 74 6f 0a 20 20 20 |cked  up|  to.   |
|00005470| 20 20 74 68 65 20 20 73 | 61 6d 65 20 20 6e 61 6d |  the  s|ame  nam|
|00005480| 65 20 20 77 69 74 68 20 | 20 74 68 65 20 65 78 74 |e  with | the ext|
|00005490| 65 6e 73 69 6f 6e 20 22 | 2e 6f 72 69 67 22 20 28 |ension "|.orig" (|
|000054a0| 22 7e 22 20 6f 6e 20 73 | 79 73 74 65 6d 73 0a 20 |"~" on s|ystems. |
|000054b0| 20 20 20 20 74 68 61 74 | 20 64 6f 20 6e 6f 74 20 |    that| do not |
|000054c0| 73 75 70 70 6f 72 74 20 | 6c 6f 6e 67 20 66 69 6c |support |long fil|
|000054d0| 65 20 6e 61 6d 65 73 29 | 2c 20 6f 72 20 61 73 20 |e names)|, or as |
|000054e0| 73 70 65 63 69 66 69 65 | 64 20 62 79 20 74 68 65 |specifie|d by the|
|000054f0| 0a 20 20 20 20 20 2d 62 | 20 20 28 2d 2d 73 75 66 |.     -b|  (--suf|
|00005500| 66 69 78 29 2c 20 20 2d | 42 20 20 28 2d 2d 70 72 |fix),  -|B  (--pr|
|00005510| 65 66 69 78 29 2c 20 20 | 6f 72 20 20 2d 56 20 28 |efix),  |or  -V (|
|00005520| 2d 2d 76 65 72 73 69 6f | 6e 2d 63 6f 6e 74 72 6f |--versio|n-contro|
|00005530| 6c 29 0a 20 20 20 20 20 | 6f 70 74 69 6f 6e 73 2e |l).     |options.|
|00005540| 20 20 54 68 65 20 65 78 | 74 65 6e 73 69 6f 6e 20 |  The ex|tension |
|00005550| 75 73 65 64 20 66 6f 72 | 20 20 6d 61 6b 69 6e 67 |used for|  making|
|00005560| 20 20 62 61 63 6b 75 70 | 20 20 66 69 6c 65 73 20 |  backup|  files |
|00005570| 20 6d 61 79 0a 20 20 20 | 20 20 61 6c 73 6f 20 20 | may.   |  also  |
|00005580| 62 65 20 20 73 70 65 63 | 69 66 69 65 64 20 20 69 |be  spec|ified  i|
|00005590| 6e 20 74 68 65 20 53 49 | 4d 50 4c 45 5f 42 41 43 |n the SI|MPLE_BAC|
|000055a0| 4b 55 50 5f 53 55 46 46 | 49 58 20 65 6e 76 69 72 |KUP_SUFF|IX envir|
|000055b0| 6f 6e 6d 65 6e 74 0a 20 | 20 20 20 20 76 61 72 69 |onment. |    vari|
|000055c0| 61 62 6c 65 2c 20 77 68 | 69 63 68 20 69 73 20 6f |able, wh|ich is o|
|000055d0| 76 65 72 72 69 64 64 65 | 6e 20 62 79 20 74 68 65 |verridde|n by the|
|000055e0| 20 61 62 6f 76 65 20 6f | 70 74 69 6f 6e 73 2e 0a | above o|ptions..|
|000055f0| 0a 20 20 20 20 20 49 66 | 20 74 68 65 20 62 61 63 |.     If| the bac|
|00005600| 6b 75 70 20 66 69 6c 65 | 20 20 61 6c 72 65 61 64 |kup file|  alread|
|00005610| 79 20 20 65 78 69 73 74 | 73 2c 20 20 70 61 74 63 |y  exist|s,  patc|
|00005620| 68 20 20 63 72 65 61 74 | 65 73 20 20 61 20 20 6e |h  creat|es  a  n|
|00005630| 65 77 0a 20 20 20 20 20 | 62 61 63 6b 75 70 20 20 |ew.     |backup  |
|00005640| 66 69 6c 65 20 20 6e 61 | 6d 65 20 62 79 20 63 68 |file  na|me by ch|
|00005650| 61 6e 67 69 6e 67 20 74 | 68 65 20 66 69 72 73 74 |anging t|he first|
|00005660| 20 6c 6f 77 65 72 63 61 | 73 65 20 6c 65 74 74 65 | lowerca|se lette|
|00005670| 72 20 69 6e 0a 20 20 20 | 20 20 74 68 65 20 6c 61 |r in.   |  the la|
|00005680| 73 74 20 63 6f 6d 70 6f | 6e 65 6e 74 20 6f 66 20 |st compo|nent of |
|00005690| 74 68 65 20 66 69 6c 65 | 27 73 20 6e 61 6d 65 20 |the file|'s name |
|000056a0| 20 69 6e 74 6f 20 20 75 | 70 70 65 72 63 61 73 65 | into  u|ppercase|
|000056b0| 2e 20 20 20 49 66 0a 20 | 20 20 20 20 74 68 65 72 |.   If. |    ther|
|000056c0| 65 20 20 61 72 65 20 6e | 6f 20 6d 6f 72 65 20 6c |e  are n|o more l|
|000056d0| 6f 77 65 72 63 61 73 65 | 20 6c 65 74 74 65 72 73 |owercase| letters|
|000056e0| 20 69 6e 20 74 68 65 20 | 6e 61 6d 65 2c 20 69 74 | in the |name, it|
|000056f0| 20 72 65 6d 6f 76 65 73 | 0a 20 20 20 20 20 74 68 | removes|.     th|
|00005700| 65 20 66 69 72 73 74 20 | 63 68 61 72 61 63 74 65 |e first |characte|
|00005710| 72 20 66 72 6f 6d 20 74 | 68 65 20 6e 61 6d 65 2e |r from t|he name.|
|00005720| 20 20 49 74 20 72 65 70 | 65 61 74 73 20 74 68 69 |  It rep|eats thi|
|00005730| 73 20 20 70 72 6f 63 65 | 73 73 0a 20 20 20 20 20 |s  proce|ss.     |
|00005740| 75 6e 74 69 6c 20 20 69 | 74 20 20 63 6f 6d 65 73 |until  i|t  comes|
|00005750| 20 75 70 20 77 69 74 68 | 20 61 20 62 61 63 6b 75 | up with| a backu|
|00005760| 70 20 66 69 6c 65 20 74 | 68 61 74 20 64 6f 65 73 |p file t|hat does|
|00005770| 20 6e 6f 74 20 61 6c 72 | 65 61 64 79 0a 20 20 20 | not alr|eady.   |
|00005780| 20 20 65 78 69 73 74 2e | 0a 0a 20 20 20 20 20 59 |  exist.|..     Y|
|00005790| 6f 75 20 6d 61 79 20 61 | 6c 73 6f 20 73 70 65 63 |ou may a|lso spec|
|000057a0| 69 66 79 20 77 68 65 72 | 65 20 79 6f 75 20 77 61 |ify wher|e you wa|
|000057b0| 6e 74 20 74 68 65 20 6f | 75 74 70 75 74 20 74 6f |nt the o|utput to|
|000057c0| 20 67 6f 20 77 69 74 68 | 20 20 61 0a 20 20 20 20 | go with|  a.    |
|000057d0| 20 2d 6f 20 20 28 2d 2d | 6f 75 74 70 75 74 29 20 | -o  (--|output) |
|000057e0| 20 6f 70 74 69 6f 6e 3b | 20 20 69 66 20 20 74 68 | option;|  if  th|
|000057f0| 61 74 20 66 69 6c 65 20 | 61 6c 72 65 61 64 79 20 |at file |already |
|00005800| 65 78 69 73 74 73 2c 20 | 69 74 20 69 73 0a 20 20 |exists, |it is.  |
|00005810| 20 20 20 62 61 63 6b 65 | 64 20 75 70 20 66 69 72 |   backe|d up fir|
|00005820| 73 74 2e 0a 0a 20 20 20 | 20 20 49 66 20 5f 08 70 |st...   |  If _.p|
|00005830| 5f 08 61 5f 08 74 5f 08 | 63 5f 08 68 5f 08 66 5f |_.a_.t_.|c_.h_.f_|
|00005840| 08 69 5f 08 6c 5f 08 65 | 20 69 73 20 6f 6d 69 74 |.i_.l_.e| is omit|
|00005850| 74 65 64 2c 20 6f 72 20 | 69 73 20 61 20 68 79 70 |ted, or |is a hyp|
|00005860| 68 65 6e 2c 20 74 68 65 | 20 70 61 74 63 68 20 20 |hen, the| patch  |
|00005870| 77 69 6c 6c 20 20 62 65 | 0a 20 20 20 20 20 72 65 |will  be|.     re|
|00005880| 61 64 20 66 72 6f 6d 20 | 73 74 61 6e 64 61 72 64 |ad from |standard|
|00005890| 20 69 6e 70 75 74 2e 0a | 0a 20 20 20 20 20 55 70 | input..|.     Up|
|000058a0| 6f 6e 20 73 74 61 72 74 | 75 70 2c 20 70 61 74 63 |on start|up, patc|
|000058b0| 68 20 77 69 6c 6c 20 61 | 74 74 65 6d 70 74 20 74 |h will a|ttempt t|
|000058c0| 6f 20 64 65 74 65 72 6d | 69 6e 65 20 20 74 68 65 |o determ|ine  the|
|000058d0| 20 20 74 79 70 65 20 20 | 6f 66 0a 20 20 20 20 20 |  type  |of.     |
|000058e0| 74 68 65 20 20 64 69 66 | 66 20 6c 69 73 74 69 6e |the  dif|f listin|
|000058f0| 67 2c 20 75 6e 6c 65 73 | 73 20 6f 76 65 72 2d 72 |g, unles|s over-r|
|00005900| 75 6c 65 64 20 62 79 20 | 61 20 2d 63 20 28 2d 2d |uled by |a -c (--|
|00005910| 63 6f 6e 74 65 78 74 29 | 2c 20 2d 65 0a 20 20 20 |context)|, -e.   |
|00005920| 20 20 28 2d 2d 65 64 29 | 2c 20 2d 6e 20 28 2d 2d |  (--ed)|, -n (--|
|00005930| 6e 6f 72 6d 61 6c 29 2c | 20 6f 72 20 2d 75 20 20 |normal),| or -u  |
|00005940| 28 2d 2d 75 6e 69 66 69 | 65 64 29 20 20 6f 70 74 |(--unifi|ed)  opt|
|00005950| 69 6f 6e 2e 20 20 20 43 | 6f 6e 74 65 78 74 0a 20 |ion.   C|ontext. |
|00005960| 20 20 20 20 64 69 66 66 | 73 20 20 28 6f 6c 64 2d |    diff|s  (old-|
|00005970| 73 74 79 6c 65 2c 20 20 | 6e 65 77 2d 73 74 79 6c |style,  |new-styl|
|00005980| 65 2c 20 61 6e 64 20 75 | 6e 69 66 69 65 64 29 20 |e, and u|nified) |
|00005990| 61 6e 64 20 6e 6f 72 6d | 61 6c 20 64 69 66 66 73 |and norm|al diffs|
|000059a0| 0a 20 20 20 20 20 61 72 | 65 20 61 70 70 6c 69 65 |.     ar|e applie|
|000059b0| 64 20 62 79 20 74 68 65 | 20 5f 08 70 5f 08 61 5f |d by the| _.p_.a_|
|000059c0| 08 74 5f 08 63 5f 08 68 | 20 70 72 6f 67 72 61 6d |.t_.c_.h| program|
|000059d0| 20 69 74 73 65 6c 66 2c | 20 77 68 69 6c 65 20 5f | itself,| while _|
|000059e0| 08 65 5f 08 64 20 64 69 | 66 66 73 20 20 61 72 65 |.e_.d di|ffs  are|
|000059f0| 0a 20 20 20 20 20 73 69 | 6d 70 6c 79 20 66 65 64 |.     si|mply fed|
|00005a00| 20 74 6f 20 74 68 65 20 | 5f 08 65 5f 08 64 20 65 | to the |_.e_.d e|
|00005a10| 64 69 74 6f 72 20 76 69 | 61 20 61 20 70 69 70 65 |ditor vi|a a pipe|
|00005a20| 2e 0a 0a 20 20 20 20 20 | 5f 08 50 5f 08 61 5f 08 |...     |_.P_.a_.|
|00005a30| 74 5f 08 63 5f 08 68 20 | 77 69 6c 6c 20 74 72 79 |t_.c_.h |will try|
|00005a40| 20 74 6f 20 73 6b 69 70 | 20 61 6e 79 20 6c 65 61 | to skip| any lea|
|00005a50| 64 69 6e 67 20 67 61 72 | 62 61 67 65 2c 20 61 70 |ding gar|bage, ap|
|00005a60| 70 6c 79 20 74 68 65 20 | 20 64 69 66 66 2c 0a 20 |ply the | diff,. |
|00005a70| 20 20 20 20 61 6e 64 20 | 20 74 68 65 6e 20 73 6b |    and | then sk|
|00005a80| 69 70 20 61 6e 79 20 74 | 72 61 69 6c 69 6e 67 20 |ip any t|railing |
|00005a90| 67 61 72 62 61 67 65 2e | 20 20 54 68 75 73 20 79 |garbage.|  Thus y|
|00005aa0| 6f 75 20 63 6f 75 6c 64 | 20 66 65 65 64 20 61 6e |ou could| feed an|
|00005ab0| 0a 20 20 20 20 20 61 72 | 74 69 63 6c 65 20 6f 72 |.     ar|ticle or|
|00005ac0| 20 6d 65 73 73 61 67 65 | 20 63 6f 6e 74 61 69 6e | message| contain|
|00005ad0| 69 6e 67 20 61 20 64 69 | 66 66 20 6c 69 73 74 69 |ing a di|ff listi|
|00005ae0| 6e 67 20 74 6f 20 20 5f | 08 70 5f 08 61 5f 08 74 |ng to  _|.p_.a_.t|
|00005af0| 5f 08 63 5f 08 68 2c 20 | 20 61 6e 64 0a 20 20 20 |_.c_.h, | and.   |
|00005b00| 20 20 69 74 20 20 73 68 | 6f 75 6c 64 20 20 77 6f |  it  sh|ould  wo|
|00005b10| 72 6b 2e 20 20 20 49 66 | 20 74 68 65 20 65 6e 74 |rk.   If| the ent|
|00005b20| 69 72 65 20 64 69 66 66 | 20 69 73 20 69 6e 64 65 |ire diff| is inde|
|00005b30| 6e 74 65 64 20 62 79 20 | 61 20 63 6f 6e 2d 0a 20 |nted by |a con-. |
|00005b40| 20 20 20 20 73 69 73 74 | 65 6e 74 20 61 6d 6f 75 |    sist|ent amou|
|00005b50| 6e 74 2c 20 74 68 69 73 | 20 77 69 6c 6c 20 62 65 |nt, this| will be|
|00005b60| 20 74 61 6b 65 6e 20 69 | 6e 74 6f 20 61 63 63 6f | taken i|nto acco|
|00005b70| 75 6e 74 2e 0a 0a 0a 0a | 0a 52 65 61 64 79 50 61 |unt.....|.ReadyPa|
|00005b80| 6b 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |k       |        |
|00005b90| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|00005ba0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|00005bb0| 20 20 20 20 20 20 20 20 | 20 31 0a 0a 0a 0a 0a 0a |        | 1......|
|00005bc0| 0a 50 41 54 43 48 28 31 | 29 20 20 20 20 20 20 20 |.PATCH(1|)       |
|00005bd0| 20 20 20 20 20 20 20 20 | 20 20 55 53 45 52 20 43 |        |  USER C|
|00005be0| 4f 4d 4d 41 4e 44 53 20 | 20 20 20 20 20 20 20 20 |OMMANDS |        |
|00005bf0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 4c 4f 43 |        |     LOC|
|00005c00| 41 4c 0a 0a 0a 0a 20 20 | 20 20 20 57 69 74 68 20 |AL....  |   With |
|00005c10| 63 6f 6e 74 65 78 74 20 | 64 69 66 66 73 2c 20 61 |context |diffs, a|
|00005c20| 6e 64 20 20 74 6f 20 20 | 61 20 20 6c 65 73 73 65 |nd  to  |a  lesse|
|00005c30| 72 20 20 65 78 74 65 6e | 74 20 20 77 69 74 68 20 |r  exten|t  with |
|00005c40| 20 6e 6f 72 6d 61 6c 0a | 20 20 20 20 20 64 69 66 | normal.|     dif|
|00005c50| 66 73 2c 20 20 5f 08 70 | 5f 08 61 5f 08 74 5f 08 |fs,  _.p|_.a_.t_.|
|00005c60| 63 5f 08 68 20 20 63 61 | 6e 20 64 65 74 65 63 74 |c_.h  ca|n detect|
|00005c70| 20 77 68 65 6e 20 74 68 | 65 20 6c 69 6e 65 20 6e | when th|e line n|
|00005c80| 75 6d 62 65 72 73 20 6d | 65 6e 74 69 6f 6e 65 64 |umbers m|entioned|
|00005c90| 20 69 6e 0a 20 20 20 20 | 20 74 68 65 20 70 61 74 | in.    | the pat|
|00005ca0| 63 68 20 61 72 65 20 20 | 69 6e 63 6f 72 72 65 63 |ch are  |incorrec|
|00005cb0| 74 2c 20 20 61 6e 64 20 | 20 77 69 6c 6c 20 20 61 |t,  and | will  a|
|00005cc0| 74 74 65 6d 70 74 20 20 | 74 6f 20 20 66 69 6e 64 |ttempt  |to  find|
|00005cd0| 20 20 74 68 65 0a 20 20 | 20 20 20 63 6f 72 72 65 |  the.  |   corre|
|00005ce0| 63 74 20 20 70 6c 61 63 | 65 20 20 74 6f 20 61 70 |ct  plac|e  to ap|
|00005cf0| 70 6c 79 20 65 61 63 68 | 20 68 75 6e 6b 20 6f 66 |ply each| hunk of|
|00005d00| 20 74 68 65 20 70 61 74 | 63 68 2e 20 20 41 73 20 | the pat|ch.  As |
|00005d10| 61 20 66 69 72 73 74 0a | 20 20 20 20 20 67 75 65 |a first.|     gue|
|00005d20| 73 73 2c 20 69 74 20 74 | 61 6b 65 73 20 74 68 65 |ss, it t|akes the|
|00005d30| 20 6c 69 6e 65 20 6e 75 | 6d 62 65 72 20 6d 65 6e | line nu|mber men|
|00005d40| 74 69 6f 6e 65 64 20 66 | 6f 72 20 74 68 65 20 68 |tioned f|or the h|
|00005d50| 75 6e 6b 2c 20 70 6c 75 | 73 0a 20 20 20 20 20 6f |unk, plu|s.     o|
|00005d60| 72 20 20 6d 69 6e 75 73 | 20 61 6e 79 20 6f 66 66 |r  minus| any off|
|00005d70| 73 65 74 20 75 73 65 64 | 20 69 6e 20 61 70 70 6c |set used| in appl|
|00005d80| 79 69 6e 67 20 74 68 65 | 20 70 72 65 76 69 6f 75 |ying the| previou|
|00005d90| 73 20 68 75 6e 6b 2e 20 | 20 49 66 0a 20 20 20 20 |s hunk. | If.    |
|00005da0| 20 74 68 61 74 20 69 73 | 20 6e 6f 74 20 74 68 65 | that is| not the|
|00005db0| 20 63 6f 72 72 65 63 74 | 20 70 6c 61 63 65 2c 20 | correct| place, |
|00005dc0| 5f 08 70 5f 08 61 5f 08 | 74 5f 08 63 5f 08 68 20 |_.p_.a_.|t_.c_.h |
|00005dd0| 77 69 6c 6c 20 73 63 61 | 6e 20 62 6f 74 68 20 66 |will sca|n both f|
|00005de0| 6f 72 77 61 72 64 73 0a | 20 20 20 20 20 61 6e 64 |orwards.|     and|
|00005df0| 20 20 62 61 63 6b 77 61 | 72 64 73 20 66 6f 72 20 |  backwa|rds for |
|00005e00| 61 20 73 65 74 20 6f 66 | 20 6c 69 6e 65 73 20 6d |a set of| lines m|
|00005e10| 61 74 63 68 69 6e 67 20 | 74 68 65 20 63 6f 6e 74 |atching |the cont|
|00005e20| 65 78 74 20 67 69 76 65 | 6e 0a 20 20 20 20 20 69 |ext give|n.     i|
|00005e30| 6e 20 74 68 65 20 68 75 | 6e 6b 2e 20 20 46 69 72 |n the hu|nk.  Fir|
|00005e40| 73 74 20 5f 08 70 5f 08 | 61 5f 08 74 5f 08 63 5f |st _.p_.|a_.t_.c_|
|00005e50| 08 68 20 6c 6f 6f 6b 73 | 20 66 6f 72 20 61 20 70 |.h looks| for a p|
|00005e60| 6c 61 63 65 20 77 68 65 | 72 65 20 61 6c 6c 20 20 |lace whe|re all  |
|00005e70| 6c 69 6e 65 73 0a 20 20 | 20 20 20 6f 66 20 74 68 |lines.  |   of th|
|00005e80| 65 20 63 6f 6e 74 65 78 | 74 20 6d 61 74 63 68 2e |e contex|t match.|
|00005e90| 20 20 49 66 20 6e 6f 20 | 73 75 63 68 20 70 6c 61 |  If no |such pla|
|00005ea0| 63 65 20 69 73 20 66 6f | 75 6e 64 2c 20 61 6e 64 |ce is fo|und, and|
|00005eb0| 20 69 74 27 73 20 61 0a | 20 20 20 20 20 63 6f 6e | it's a.|     con|
|00005ec0| 74 65 78 74 20 64 69 66 | 66 2c 20 61 6e 64 20 74 |text dif|f, and t|
|00005ed0| 68 65 20 6d 61 78 69 6d | 75 6d 20 66 75 7a 7a 20 |he maxim|um fuzz |
|00005ee0| 66 61 63 74 6f 72 20 69 | 73 20 20 73 65 74 20 20 |factor i|s  set  |
|00005ef0| 74 6f 20 20 31 20 20 6f | 72 0a 20 20 20 20 20 6d |to  1  o|r.     m|
|00005f00| 6f 72 65 2c 20 20 74 68 | 65 6e 20 20 61 6e 6f 74 |ore,  th|en  anot|
|00005f10| 68 65 72 20 73 63 61 6e | 20 74 61 6b 65 73 20 70 |her scan| takes p|
|00005f20| 6c 61 63 65 20 69 67 6e | 6f 72 69 6e 67 20 74 68 |lace ign|oring th|
|00005f30| 65 20 66 69 72 73 74 20 | 61 6e 64 0a 20 20 20 20 |e first |and.    |
|00005f40| 20 6c 61 73 74 20 6c 69 | 6e 65 20 6f 66 20 63 6f | last li|ne of co|
|00005f50| 6e 74 65 78 74 2e 20 20 | 49 66 20 74 68 61 74 20 |ntext.  |If that |
|00005f60| 66 61 69 6c 73 2c 20 61 | 6e 64 20 74 68 65 20 20 |fails, a|nd the  |
|00005f70| 6d 61 78 69 6d 75 6d 20 | 20 66 75 7a 7a 0a 20 20 |maximum | fuzz.  |
|00005f80| 20 20 20 66 61 63 74 6f | 72 20 69 73 20 73 65 74 |   facto|r is set|
|00005f90| 20 74 6f 20 32 20 6f 72 | 20 6d 6f 72 65 2c 20 74 | to 2 or| more, t|
|00005fa0| 68 65 20 66 69 72 73 74 | 20 74 77 6f 20 61 6e 64 |he first| two and|
|00005fb0| 20 6c 61 73 74 20 74 77 | 6f 20 6c 69 6e 65 73 0a | last tw|o lines.|
|00005fc0| 20 20 20 20 20 6f 66 20 | 63 6f 6e 74 65 78 74 20 |     of |context |
|00005fd0| 61 72 65 20 69 67 6e 6f | 72 65 64 2c 20 61 6e 64 |are igno|red, and|
|00005fe0| 20 20 61 6e 6f 74 68 65 | 72 20 20 73 63 61 6e 20 |  anothe|r  scan |
|00005ff0| 20 69 73 20 20 6d 61 64 | 65 2e 20 20 20 28 54 68 | is  mad|e.   (Th|
|00006000| 65 0a 20 20 20 20 20 64 | 65 66 61 75 6c 74 20 20 |e.     d|efault  |
|00006010| 6d 61 78 69 6d 75 6d 20 | 20 66 75 7a 7a 20 20 66 |maximum | fuzz  f|
|00006020| 61 63 74 6f 72 20 69 73 | 20 32 2e 29 20 49 66 20 |actor is| 2.) If |
|00006030| 5f 08 70 5f 08 61 5f 08 | 74 5f 08 63 5f 08 68 20 |_.p_.a_.|t_.c_.h |
|00006040| 63 61 6e 6e 6f 74 20 66 | 69 6e 64 20 61 0a 20 20 |cannot f|ind a.  |
|00006050| 20 20 20 70 6c 61 63 65 | 20 74 6f 20 69 6e 73 74 |   place| to inst|
|00006060| 61 6c 6c 20 74 68 61 74 | 20 68 75 6e 6b 20 6f 66 |all that| hunk of|
|00006070| 20 74 68 65 20 70 61 74 | 63 68 2c 20 20 69 74 20 | the pat|ch,  it |
|00006080| 20 77 69 6c 6c 20 20 70 | 75 74 20 20 74 68 65 0a | will  p|ut  the.|
|00006090| 20 20 20 20 20 68 75 6e | 6b 20 6f 75 74 20 74 6f |     hun|k out to|
|000060a0| 20 61 20 72 65 6a 65 63 | 74 20 66 69 6c 65 2c 20 | a rejec|t file, |
|000060b0| 77 68 69 63 68 20 6e 6f | 72 6d 61 6c 6c 79 20 69 |which no|rmally i|
|000060c0| 73 20 74 68 65 20 6e 61 | 6d 65 20 6f 66 20 74 68 |s the na|me of th|
|000060d0| 65 0a 20 20 20 20 20 6f | 75 74 70 75 74 20 66 69 |e.     o|utput fi|
|000060e0| 6c 65 20 70 6c 75 73 20 | 22 2e 72 65 6a 22 20 28 |le plus |".rej" (|
|000060f0| 22 23 22 20 6f 6e 20 73 | 79 73 74 65 6d 73 20 74 |"#" on s|ystems t|
|00006100| 68 61 74 20 64 6f 20 6e | 6f 74 20 20 73 75 70 70 |hat do n|ot  supp|
|00006110| 6f 72 74 0a 20 20 20 20 | 20 6c 6f 6e 67 20 20 66 |ort.    | long  f|
|00006120| 69 6c 65 20 20 6e 61 6d | 65 73 29 2e 20 20 20 28 |ile  nam|es).   (|
|00006130| 4e 6f 74 65 20 74 68 61 | 74 20 74 68 65 20 72 65 |Note tha|t the re|
|00006140| 6a 65 63 74 65 64 20 68 | 75 6e 6b 20 77 69 6c 6c |jected h|unk will|
|00006150| 20 63 6f 6d 65 0a 20 20 | 20 20 20 6f 75 74 20 69 | come.  |   out i|
|00006160| 6e 20 63 6f 6e 74 65 78 | 74 20 64 69 66 66 20 66 |n contex|t diff f|
|00006170| 6f 72 6d 20 77 68 65 74 | 68 65 72 20 74 68 65 20 |orm whet|her the |
|00006180| 69 6e 70 75 74 20 70 61 | 74 63 68 20 77 61 73 20 |input pa|tch was |
|00006190| 61 20 20 63 6f 6e 2d 0a | 20 20 20 20 20 74 65 78 |a  con-.|     tex|
|000061a0| 74 20 64 69 66 66 20 6f | 72 20 61 20 6e 6f 72 6d |t diff o|r a norm|
|000061b0| 61 6c 20 64 69 66 66 2e | 20 20 49 66 20 74 68 65 |al diff.|  If the|
|000061c0| 20 69 6e 70 75 74 20 77 | 61 73 20 61 20 6e 6f 72 | input w|as a nor|
|000061d0| 6d 61 6c 20 64 69 66 66 | 2c 0a 20 20 20 20 20 6d |mal diff|,.     m|
|000061e0| 61 6e 79 20 6f 66 20 74 | 68 65 20 63 6f 6e 74 65 |any of t|he conte|
|000061f0| 78 74 73 20 77 69 6c 6c | 20 73 69 6d 70 6c 79 20 |xts will| simply |
|00006200| 62 65 20 6e 75 6c 6c 2e | 29 20 54 68 65 20 6c 69 |be null.|) The li|
|00006210| 6e 65 20 20 6e 75 6d 62 | 65 72 73 0a 20 20 20 20 |ne  numb|ers.    |
|00006220| 20 6f 6e 20 74 68 65 20 | 68 75 6e 6b 73 20 69 6e | on the |hunks in|
|00006230| 20 74 68 65 20 72 65 6a | 65 63 74 20 66 69 6c 65 | the rej|ect file|
|00006240| 20 6d 61 79 20 62 65 20 | 64 69 66 66 65 72 65 6e | may be |differen|
|00006250| 74 20 74 68 61 6e 20 69 | 6e 20 74 68 65 0a 20 20 |t than i|n the.  |
|00006260| 20 20 20 70 61 74 63 68 | 20 66 69 6c 65 3a 20 74 |   patch| file: t|
|00006270| 68 65 79 20 20 72 65 66 | 6c 65 63 74 20 20 74 68 |hey  ref|lect  th|
|00006280| 65 20 20 61 70 70 72 6f | 78 69 6d 61 74 65 20 20 |e  appro|ximate  |
|00006290| 6c 6f 63 61 74 69 6f 6e | 20 20 70 61 74 63 68 0a |location|  patch.|
|000062a0| 20 20 20 20 20 74 68 69 | 6e 6b 73 20 20 74 68 65 |     thi|nks  the|
|000062b0| 20 20 66 61 69 6c 65 64 | 20 68 75 6e 6b 73 20 62 |  failed| hunks b|
|000062c0| 65 6c 6f 6e 67 20 69 6e | 20 74 68 65 20 6e 65 77 |elong in| the new|
|000062d0| 20 66 69 6c 65 20 72 61 | 74 68 65 72 20 74 68 61 | file ra|ther tha|
|000062e0| 6e 0a 20 20 20 20 20 74 | 68 65 20 6f 6c 64 20 6f |n.     t|he old o|
|000062f0| 6e 65 2e 0a 0a 20 20 20 | 20 20 41 73 20 65 61 63 |ne...   |  As eac|
|00006300| 68 20 68 75 6e 6b 20 69 | 73 20 63 6f 6d 70 6c 65 |h hunk i|s comple|
|00006310| 74 65 64 2c 20 79 6f 75 | 20 77 69 6c 6c 20 62 65 |ted, you| will be|
|00006320| 20 74 6f 6c 64 20 77 68 | 65 74 68 65 72 20 74 68 | told wh|ether th|
|00006330| 65 20 68 75 6e 6b 0a 20 | 20 20 20 20 73 75 63 63 |e hunk. |    succ|
|00006340| 65 65 64 65 64 20 20 6f | 72 20 66 61 69 6c 65 64 |eeded  o|r failed|
|00006350| 2c 20 61 6e 64 20 77 68 | 69 63 68 20 6c 69 6e 65 |, and wh|ich line|
|00006360| 20 28 69 6e 20 74 68 65 | 20 6e 65 77 20 66 69 6c | (in the| new fil|
|00006370| 65 29 20 5f 08 70 5f 08 | 61 5f 08 74 5f 08 63 5f |e) _.p_.|a_.t_.c_|
|00006380| 08 68 0a 20 20 20 20 20 | 74 68 6f 75 67 68 74 20 |.h.     |thought |
|00006390| 74 68 65 20 68 75 6e 6b | 20 73 68 6f 75 6c 64 20 |the hunk| should |
|000063a0| 67 6f 20 6f 6e 2e 20 20 | 49 66 20 74 68 69 73 20 |go on.  |If this |
|000063b0| 20 69 73 20 20 64 69 66 | 66 65 72 65 6e 74 20 20 | is  dif|ferent  |
|000063c0| 66 72 6f 6d 0a 20 20 20 | 20 20 74 68 65 20 20 6c |from.   |  the  l|
|000063d0| 69 6e 65 20 20 6e 75 6d | 62 65 72 20 73 70 65 63 |ine  num|ber spec|
|000063e0| 69 66 69 65 64 20 69 6e | 20 74 68 65 20 64 69 66 |ified in| the dif|
|000063f0| 66 20 79 6f 75 20 77 69 | 6c 6c 20 62 65 20 74 6f |f you wi|ll be to|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.