1.\" $OpenBSD: patch.1,v 1.36 2022/03/31 17:27:26 naddy Exp $ 2.\" Copyright 1986, Larry Wall 3.\" 4.\" Redistribution and use in source and binary forms, with or without 5.\" modification, are permitted provided that the following condition 6.\" is met: 7.\" 1. Redistributions of source code must retain the above copyright 8.\" notice, this condition and the following disclaimer. 9.\" 10.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND 11.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 12.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 13.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 14.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 15.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 16.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 17.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 18.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 19.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 20.\" SUCH DAMAGE. 21.\" 22.Dd $Mdocdate: March 31 2022 $ 23.Dt PATCH 1 24.Os 25.Sh NAME 26.Nm patch 27.Nd apply a diff file to an original 28.Sh SYNOPSIS 29.Nm patch 30.Bk -words 31.Op Fl bCcEeflNnRstuv 32.Op Fl B Ar backup-prefix 33.Op Fl D Ar symbol 34.Op Fl d Ar directory 35.Op Fl F Ar max-fuzz 36.Op Fl i Ar patchfile 37.Op Fl o Ar out-file 38.Op Fl p Ar strip-count 39.Op Fl r Ar rej-name 40.Op Fl V Cm t | nil | never 41.Op Fl x Ar number 42.Op Fl z Ar backup-ext 43.Op Fl Fl posix 44.Op Ar origfile Op Ar patchfile 45.Ek 46.Nm patch 47.Pf \*(Lt Ar patchfile 48.Sh DESCRIPTION 49.Nm 50takes the text file 51.Ar patchfile 52containing any of the four forms of difference 53listing produced by the 54.Xr diff 1 55program and applies those differences to an original text file, 56producing a patched version. 57If 58.Ar patchfile 59is omitted, or is a hyphen, the patch will be read from the standard input. 60.Pp 61.Nm 62will attempt to determine the type of the diff listing, unless overruled by a 63.Fl c , 64.Fl e , 65.Fl n , 66or 67.Fl u 68option. 69.Pp 70If the 71.Ar patchfile 72contains more than one patch, 73.Nm 74will try to apply each of them as if they came from separate patch files. 75This means, among other things, that it is assumed that the name of the file 76to patch must be determined for each diff listing, and that the garbage before 77each diff listing will be examined for interesting things such as file names 78and revision level (see the section on 79.Sx Filename Determination 80below). 81.Pp 82The options are as follows: 83.Bl -tag -width Ds 84.It Xo 85.Fl B Ar backup-prefix , 86.Fl Fl prefix Ar backup-prefix 87.Xc 88Causes the next argument to be interpreted as a prefix to the backup file 89name. 90If this argument is specified, any argument to 91.Fl z 92will be ignored. 93.It Fl b , Fl Fl backup 94Save a backup copy of the file before it is modified. 95By default the original file is saved with a backup extension of 96.Qq .orig 97unless the file already has a numbered backup, in which case a numbered 98backup is made. 99This is equivalent to specifying 100.Qo Fl V Cm existing Qc . 101This option is currently the default, unless 102.Fl -posix 103is specified. 104.It Fl C , Fl Fl check , Fl Fl dry-run 105Checks that the patch would apply cleanly, but does not modify anything. 106.It Fl c , Fl Fl context 107Forces 108.Nm 109to interpret the patch file as a context diff. 110.It Xo 111.Fl D Ar symbol , 112.Fl Fl ifdef Ar symbol 113.Xc 114Causes 115.Nm 116to use the 117.Qq #ifdef...#endif 118construct to mark changes. 119The argument following will be used as the differentiating symbol. 120Note that, unlike the C compiler, there must be a space between the 121.Fl D 122and the argument. 123.It Xo 124.Fl d Ar directory , 125.Fl Fl directory Ar directory 126.Xc 127Causes 128.Nm 129to interpret the next argument as a directory, 130and change working directory to it before doing anything else. 131.It Fl E , Fl Fl remove-empty-files 132Causes 133.Nm 134to remove output files that are empty after the patches have been applied. 135This option is useful when applying patches that create or remove files. 136.It Fl e , Fl Fl ed 137Forces 138.Nm 139to interpret the patch file as an 140.Xr ed 1 141script. 142.It Xo 143.Fl F Ar max-fuzz , 144.Fl Fl fuzz Ar max-fuzz 145.Xc 146Sets the maximum fuzz factor. 147This option only applies to context diffs, and causes 148.Nm 149to ignore up to that many lines in looking for places to install a hunk. 150Note that a larger fuzz factor increases the odds of a faulty patch. 151The default fuzz factor is 2, and it may not be set to more than 152the number of lines of context in the context diff, ordinarily 3. 153.It Fl f , Fl Fl force 154Forces 155.Nm 156to assume that the user knows exactly what they are doing, and to not 157ask any questions. 158It assumes the following: 159skip patches for which a file to patch can't be found; 160patch files even though they have the wrong version for the 161.Qq Prereq: 162line in the patch; 163and assume that patches are not reversed even if they look like they are. 164This option does not suppress commentary; use 165.Fl s 166for that. 167.It Xo 168.Fl i Ar patchfile , 169.Fl Fl input Ar patchfile 170.Xc 171Causes the next argument to be interpreted as the input file name 172(i.e. a patchfile). 173.It Fl l , Fl Fl ignore-whitespace 174Causes the pattern matching to be done loosely, in case the tabs and 175spaces have been munged in your input file. 176Any sequence of whitespace in the pattern line will match any sequence 177in the input file. 178Normal characters must still match exactly. 179Each line of the context must still match a line in the input file. 180.It Fl N , Fl Fl forward 181Causes 182.Nm 183to ignore patches that it thinks are reversed or already applied. 184See also 185.Fl R . 186.It Fl n , Fl Fl normal 187Forces 188.Nm 189to interpret the patch file as a normal diff. 190.It Xo 191.Fl o Ar out-file , 192.Fl Fl output Ar out-file 193.Xc 194Causes the next argument to be interpreted as the output file name. 195.It Xo 196.Fl p Ar strip-count , 197.Fl Fl strip Ar strip-count 198.Xc 199Sets the pathname strip count, 200which controls how pathnames found in the patch file are treated, 201in case you keep your files in a different directory than the person who sent 202out the patch. 203The strip count specifies how many slashes are to be stripped from 204the front of the pathname. 205(Any intervening directory names also go away.) 206For example, supposing the file name in the patch file was 207.Pa /u/howard/src/blurfl/blurfl.c : 208.Pp 209Setting 210.Fl p Ns Ar 0 211gives the entire pathname unmodified. 212.Pp 213.Fl p Ns Ar 1 214gives 215.Pp 216.D1 Pa u/howard/src/blurfl/blurfl.c 217.Pp 218without the leading slash. 219.Pp 220.Fl p Ns Ar 4 221gives 222.Pp 223.D1 Pa blurfl/blurfl.c 224.Pp 225Not specifying 226.Fl p 227at all just gives you 228.Pa blurfl.c , 229unless all of the directories in the leading path 230.Pq Pa u/howard/src/blurfl 231exist and that path is relative, 232in which case you get the entire pathname unmodified. 233Whatever you end up with is looked for either in the current directory, 234or the directory specified by the 235.Fl d 236option. 237.It Fl R , Fl Fl reverse 238Tells 239.Nm 240that this patch was created with the old and new files swapped. 241(Yes, I'm afraid that does happen occasionally, human nature being what it 242is.) 243.Nm 244will attempt to swap each hunk around before applying it. 245Rejects will come out in the swapped format. 246The 247.Fl R 248option will not work with ed diff scripts because there is too little 249information to reconstruct the reverse operation. 250.Pp 251If the first hunk of a patch fails, 252.Nm 253will reverse the hunk to see if it can be applied that way. 254If it can, you will be asked if you want to have the 255.Fl R 256option set. 257If it can't, the patch will continue to be applied normally. 258(Note: this method cannot detect a reversed patch if it is a normal diff 259and if the first command is an append (i.e. it should have been a delete) 260since appends always succeed, due to the fact that a null context will match 261anywhere. 262Luckily, most patches add or change lines rather than delete them, so most 263reversed normal diffs will begin with a delete, which will fail, triggering 264the heuristic.) 265.It Xo 266.Fl r Ar rej-name , 267.Fl Fl reject-file Ar rej-name 268.Xc 269Causes the next argument to be interpreted as the reject file name. 270.It Xo 271.Fl s , Fl Fl quiet , 272.Fl Fl silent 273.Xc 274Makes 275.Nm 276do its work silently, unless an error occurs. 277.It Fl t , Fl Fl batch 278Similar to 279.Fl f , 280in that it suppresses questions, but makes some different assumptions: 281skip patches for which a file to patch can't be found (the same as 282.Fl f ) ; 283skip patches for which the file has the wrong version for the 284.Qq Prereq: 285line in the patch; 286and assume that patches are reversed if they look like they are. 287.It Fl u , Fl Fl unified 288Forces 289.Nm 290to interpret the patch file as a unified context diff (a unidiff). 291.It Xo 292.Fl V Cm t | nil | never , 293.Fl Fl version-control Cm t | nil | never 294.Xc 295Causes the next argument to be interpreted as a method for creating 296backup file names. 297The type of backups made can also be given in the 298.Ev PATCH_VERSION_CONTROL 299or 300.Ev VERSION_CONTROL 301environment variables, which are overridden by this option. 302The 303.Fl B 304option overrides this option, causing the prefix to always be used for 305making backup file names. 306The values of the 307.Ev PATCH_VERSION_CONTROL 308and 309.Ev VERSION_CONTROL 310environment variables and the argument to the 311.Fl V 312option are like the GNU Emacs 313.Dq version-control 314variable; they also recognize synonyms that are more descriptive. 315The valid values are (unique abbreviations are accepted): 316.Bl -tag -width Ds -offset indent 317.It Cm t , numbered 318Always make numbered backups. 319.It Cm nil , existing 320Make numbered backups of files that already have them, 321simple backups of the others. 322.It Cm never , simple 323Always make simple backups. 324.El 325.It Fl v , Fl Fl version 326Causes 327.Nm 328to print out its revision header and patch level. 329.It Xo 330.Fl x Ar number , 331.Fl Fl debug Ar number 332.Xc 333Sets internal debugging flags, and is of interest only to 334.Nm 335patchers. 336.It Xo 337.Fl z Ar backup-ext , 338.Fl Fl suffix Ar backup-ext 339.Xc 340Causes the next argument to be interpreted as the backup extension, to be 341used in place of 342.Qq .orig . 343.It Fl Fl posix 344Enables strict 345.St -p1003.1-2008 346conformance, specifically: 347.Bl -enum 348.It 349Backup files are not created unless the 350.Fl b 351option is specified. 352.It 353If unspecified, the file name used is the first of the old, new and 354index files that exists. 355.El 356.El 357.Ss Patch Application 358.Nm 359will try to skip any leading garbage, apply the diff, 360and then skip any trailing garbage. 361Thus you could feed an article or message containing a 362diff listing to 363.Nm patch , 364and it should work. 365If the entire diff is indented by a consistent amount, 366this will be taken into account. 367.Pp 368With context diffs, and to a lesser extent with normal diffs, 369.Nm 370can detect when the line numbers mentioned in the patch are incorrect, 371and will attempt to find the correct place to apply each hunk of the patch. 372As a first guess, it takes the line number mentioned for the hunk, plus or 373minus any offset used in applying the previous hunk. 374If that is not the correct place, 375.Nm 376will scan both forwards and backwards for a set of lines matching the context 377given in the hunk. 378First 379.Nm 380looks for a place where all lines of the context match. 381If no such place is found, and it's a context diff, and the maximum fuzz factor 382is set to 1 or more, then another scan takes place ignoring the first and last 383line of context. 384If that fails, and the maximum fuzz factor is set to 2 or more, 385the first two and last two lines of context are ignored, 386and another scan is made. 387.Pq The default maximum fuzz factor is 2. 388.Pp 389If 390.Nm 391cannot find a place to install that hunk of the patch, it will put the hunk 392out to a reject file, which normally is the name of the output file plus 393.Qq .rej . 394(Note that the rejected hunk will come out in context diff form whether the 395input patch was a context diff or a normal diff. 396If the input was a normal diff, many of the contexts will simply be null.) 397The line numbers on the hunks in the reject file may be different than 398in the patch file: they reflect the approximate location patch thinks the 399failed hunks belong in the new file rather than the old one. 400.Pp 401As each hunk is completed, you will be told whether the hunk succeeded or 402failed, and which line (in the new file) 403.Nm 404thought the hunk should go on. 405If this is different from the line number specified in the diff, 406you will be told the offset. 407A single large offset MAY be an indication that a hunk was installed in the 408wrong place. 409You will also be told if a fuzz factor was used to make the match, in which 410case you should also be slightly suspicious. 411.Ss Filename Determination 412If no original file is specified on the command line, 413.Nm 414will try to figure out from the leading garbage what the name of the file 415to edit is. 416When checking a prospective file name, pathname components are stripped 417as specified by the 418.Fl p 419option and the file's existence and writability are checked relative 420to the current working directory (or the directory specified by the 421.Fl d 422option). 423.Pp 424If the diff is a context or unified diff, 425.Nm 426is able to determine the old and new file names from the diff header. 427For context diffs, the 428.Dq old 429file is specified in the line beginning with 430.Qq *** 431and the 432.Dq new 433file is specified in the line beginning with 434.Qq --- . 435For a unified diff, the 436.Dq old 437file is specified in the line beginning with 438.Qq --- 439and the 440.Dq new 441file is specified in the line beginning with 442.Qq +++ . 443If there is an 444.Qq Index: 445line in the leading garbage (regardless of the diff type), 446.Nm 447will use the file name from that line as the 448.Dq index 449file. 450.Pp 451.Nm 452will choose the file name by performing the following steps, with the first 453match used: 454.Bl -enum 455.It 456If 457.Nm 458is operating in strict 459.St -p1003.1-2008 460mode, the first of the 461.Dq old , 462.Dq new 463and 464.Dq index 465file names that exist is used. 466Otherwise, 467.Nm 468will examine either the 469.Dq old 470and 471.Dq new 472file names or, for a non-context diff, the 473.Dq index 474file name, and choose the file name with the fewest path components, 475the shortest basename, and the shortest total file name length (in that order). 476.It 477If no suitable file was found to patch, the patch file is a context or 478unified diff, and the old file was zero length, the new file name is 479created and used. 480.It 481If the file name still cannot be determined, 482.Nm 483will prompt the user for the file name to use. 484.El 485.Pp 486Additionally, if the leading garbage contains a 487.Qq Prereq:\ \& 488line, 489.Nm 490will take the first word from the prerequisites line (normally a version 491number) and check the input file to see if that word can be found. 492If not, 493.Nm 494will ask for confirmation before proceeding. 495.Pp 496The upshot of all this is that you should be able to say, while in a news 497interface, the following: 498.Pp 499.Dl | patch -d /usr/src/local/blurfl 500.Pp 501and patch a file in the blurfl directory directly from the article containing 502the patch. 503.Ss Backup Files 504By default, the patched version is put in place of the original, with 505the original file backed up to the same name with the extension 506.Qq .orig , 507or as specified by the 508.Fl B , 509.Fl V , 510or 511.Fl z 512options. 513The extension used for making backup files may also be specified in the 514.Ev SIMPLE_BACKUP_SUFFIX 515environment variable, which is overridden by the options above. 516.Pp 517If the backup file is a symbolic or hard link to the original file, 518.Nm 519creates a new backup file name by changing the first lowercase letter 520in the last component of the file's name into uppercase. 521If there are no more lowercase letters in the name, 522it removes the first character from the name. 523It repeats this process until it comes up with a 524backup file that does not already exist or is not linked to the original file. 525.Pp 526You may also specify where you want the output to go with the 527.Fl o 528option; if that file already exists, it is backed up first. 529.Ss Notes For Patch Senders 530There are several things you should bear in mind if you are going to 531be sending out patches: 532.Pp 533First, you can save people a lot of grief by keeping a 534.Pa patchlevel.h 535file which is patched to increment the patch level as the first diff in the 536patch file you send out. 537If you put a 538.Qq Prereq: 539line in with the patch, it won't let them apply 540patches out of order without some warning. 541.Pp 542Second, make sure you've specified the file names right, either in a 543context diff header, or with an 544.Qq Index: 545line. 546If you are patching something in a subdirectory, be sure to tell the patch 547user to specify a 548.Fl p 549option as needed. 550.Pp 551Third, you can create a file by sending out a diff that compares a 552null file to the file you want to create. 553This will only work if the file you want to create doesn't exist already in 554the target directory. 555.Pp 556Fourth, take care not to send out reversed patches, since it makes people wonder 557whether they already applied the patch. 558.Pp 559Fifth, while you may be able to get away with putting 582 diff listings into 560one file, it is probably wiser to group related patches into separate files in 561case something goes haywire. 562.Sh ENVIRONMENT 563.Bl -tag -width "PATCH_VERSION_CONTROL" -compact 564.It Ev POSIXLY_CORRECT 565When set, 566.Nm 567behaves as if the 568.Fl Fl posix 569option has been specified. 570.It Ev SIMPLE_BACKUP_SUFFIX 571Extension to use for backup file names instead of 572.Qq .orig . 573.It Ev TMPDIR 574Directory to put temporary files in; default is 575.Pa /tmp . 576.It Ev PATCH_VERSION_CONTROL 577Selects when numbered backup files are made. 578.It Ev VERSION_CONTROL 579Same as 580.Ev PATCH_VERSION_CONTROL . 581.El 582.Sh FILES 583.Bl -tag -width "$TMPDIR/patch*" -compact 584.It Pa $TMPDIR/patch* 585.Nm 586temporary files 587.It Pa /dev/tty 588used to read input when 589.Nm 590prompts the user 591.El 592.Sh EXIT STATUS 593The 594.Nm 595utility exits with one of the following values: 596.Pp 597.Bl -tag -width Ds -offset indent -compact 598.It 0 599Successful completion. 600.It 1 601One or more lines were written to a reject file. 602.It \*(Gt1 603An error occurred. 604.El 605.Pp 606When applying a set of patches in a loop, it behooves you to check this 607exit status so you don't apply a later patch to a partially patched file. 608.Sh DIAGNOSTICS 609Too many to list here, but generally indicative that 610.Nm 611couldn't parse your patch file. 612.Pp 613The message 614.Qq Hmm... 615indicates that there is unprocessed text in the patch file and that 616.Nm 617is attempting to intuit whether there is a patch in that text and, if so, 618what kind of patch it is. 619.Sh SEE ALSO 620.Xr diff 1 621.Sh STANDARDS 622The 623.Nm 624utility is compliant with the 625.St -p1003.1-2008 626specification, 627except as detailed above for the 628.Fl -posix 629option. 630.Pp 631The flags 632.Op Fl BCEFfstVvxz 633and 634.Op Fl -posix 635are extensions to that specification. 636.Sh AUTHORS 637.An Larry Wall 638with many other contributors. 639.Sh CAVEATS 640.Nm 641cannot tell if the line numbers are off in an ed script, and can only detect 642bad line numbers in a normal diff when it finds a 643.Qq change 644or a 645.Qq delete 646command. 647A context diff using fuzz factor 3 may have the same problem. 648Until a suitable interactive interface is added, you should probably do 649a context diff in these cases to see if the changes made sense. 650Of course, compiling without errors is a pretty good indication that the patch 651worked, but not always. 652.Pp 653.Nm 654usually produces the correct results, even when it has to do a lot of 655guessing. 656However, the results are guaranteed to be correct only when the patch is 657applied to exactly the same version of the file that the patch was 658generated from. 659.Sh BUGS 660Could be smarter about partial matches, excessively deviant offsets and 661swapped code, but that would take an extra pass. 662.Pp 663Check patch mode 664.Pq Fl C 665will fail if you try to check several patches in succession that build on 666each other. 667The entire 668.Nm 669code would have to be restructured to keep temporary files around so that it 670can handle this situation. 671.Pp 672If code has been duplicated (for instance with #ifdef OLDCODE ... #else ... 673#endif), 674.Nm 675is incapable of patching both versions and, if it works at all, will likely 676patch the wrong one, and tell you that it succeeded to boot. 677.Pp 678If you apply a patch you've already applied, 679.Nm 680will think it is a reversed patch, and offer to un-apply the patch. 681This could be construed as a feature. 682