home *** CD-ROM | disk | FTP | other *** search
open in: 
MacOS 8.1
|
Win98
|
DOS
browse contents |
view JSON data
|
view as text
This file was processed as: SHell self-extracting ARchive
(archive/shar).
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 100%
| dexvert
| Newsgroup Content (archive/news)
| magic
| Supported |
| 100%
| dexvert
| SHell self-extracting ARchive (archive/shar)
| magic
| Supported |
| 100%
| dexvert
| Internet Message Format (text/imf)
| magic
| Supported |
| 1%
| dexvert
| Text File (text/txt)
| fallback
| Supported |
| 100%
| file
| news or mail, ASCII text
| default
| |
| 100%
| perlTextCheck
| Likely Text (Perl)
| default
| |
| 100%
| siegfried
| fmt/329 Shell Archive Format
| default
| |
| 100%
| detectItEasy
| Format: plain text[LF]
| default (weak)
| |
| 100%
| xdgMime
| message/rfc822
| default
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 53 75 62 6a 65 63 74 3a | 20 20 76 32 34 69 30 32 |Subject:| v24i02|
|00000010| 33 3a 20 20 47 4e 55 20 | 44 69 66 66 2c 20 76 65 |3: GNU |Diff, ve|
|00000020| 72 73 69 6f 6e 20 31 2e | 31 35 2c 20 50 61 72 74 |rsion 1.|15, Part|
|00000030| 30 38 2f 30 38 0a 4e 65 | 77 73 67 72 6f 75 70 73 |08/08.Ne|wsgroups|
|00000040| 3a 20 63 6f 6d 70 2e 73 | 6f 75 72 63 65 73 2e 75 |: comp.s|ources.u|
|00000050| 6e 69 78 0a 41 70 70 72 | 6f 76 65 64 3a 20 72 73 |nix.Appr|oved: rs|
|00000060| 61 6c 7a 40 75 75 6e 65 | 74 2e 55 55 2e 4e 45 54 |alz@uune|t.UU.NET|
|00000070| 0a 58 2d 43 68 65 63 6b | 73 75 6d 2d 53 6e 65 66 |.X-Check|sum-Snef|
|00000080| 72 75 3a 20 66 65 36 34 | 38 33 31 63 20 37 65 62 |ru: fe64|831c 7eb|
|00000090| 61 34 31 37 37 20 31 32 | 66 65 32 38 36 65 20 63 |a4177 12|fe286e c|
|000000a0| 64 62 30 66 66 66 32 0a | 0a 53 75 62 6d 69 74 74 |db0fff2.|.Submitt|
|000000b0| 65 64 2d 62 79 3a 20 50 | 61 75 6c 20 45 67 67 65 |ed-by: P|aul Egge|
|000000c0| 72 74 20 3c 65 67 67 65 | 72 74 40 74 77 69 6e 73 |rt <egge|rt@twins|
|000000d0| 75 6e 2e 63 6f 6d 3e 0a | 50 6f 73 74 69 6e 67 2d |un.com>.|Posting-|
|000000e0| 6e 75 6d 62 65 72 3a 20 | 56 6f 6c 75 6d 65 20 32 |number: |Volume 2|
|000000f0| 34 2c 20 49 73 73 75 65 | 20 32 33 0a 41 72 63 68 |4, Issue| 23.Arch|
|00000100| 69 76 65 2d 6e 61 6d 65 | 3a 20 67 6e 75 64 69 66 |ive-name|: gnudif|
|00000110| 66 31 2e 31 35 2f 70 61 | 72 74 30 38 0a 0a 23 21 |f1.15/pa|rt08..#!|
|00000120| 20 2f 62 69 6e 2f 73 68 | 0a 23 20 54 68 69 73 20 | /bin/sh|.# This |
|00000130| 69 73 20 61 20 73 68 65 | 6c 6c 20 61 72 63 68 69 |is a she|ll archi|
|00000140| 76 65 2e 20 20 52 65 6d | 6f 76 65 20 61 6e 79 74 |ve. Rem|ove anyt|
|00000150| 68 69 6e 67 20 62 65 66 | 6f 72 65 20 74 68 69 73 |hing bef|ore this|
|00000160| 20 6c 69 6e 65 2c 20 74 | 68 65 6e 20 75 6e 70 61 | line, t|hen unpa|
|00000170| 63 6b 0a 23 20 69 74 20 | 62 79 20 73 61 76 69 6e |ck.# it |by savin|
|00000180| 67 20 69 74 20 69 6e 74 | 6f 20 61 20 66 69 6c 65 |g it int|o a file|
|00000190| 20 61 6e 64 20 74 79 70 | 69 6e 67 20 22 73 68 20 | and typ|ing "sh |
|000001a0| 66 69 6c 65 22 2e 20 20 | 54 6f 20 6f 76 65 72 77 |file". |To overw|
|000001b0| 72 69 74 65 20 65 78 69 | 73 74 69 6e 67 0a 23 20 |rite exi|sting.# |
|000001c0| 66 69 6c 65 73 2c 20 74 | 79 70 65 20 22 73 68 20 |files, t|ype "sh |
|000001d0| 66 69 6c 65 20 2d 63 22 | 2e 20 20 59 6f 75 20 63 |file -c"|. You c|
|000001e0| 61 6e 20 61 6c 73 6f 20 | 66 65 65 64 20 74 68 69 |an also |feed thi|
|000001f0| 73 20 61 73 20 73 74 61 | 6e 64 61 72 64 20 69 6e |s as sta|ndard in|
|00000200| 70 75 74 20 76 69 61 0a | 23 20 75 6e 73 68 61 72 |put via.|# unshar|
|00000210| 2c 20 6f 72 20 62 79 20 | 74 79 70 69 6e 67 20 22 |, or by |typing "|
|00000220| 73 68 20 3c 66 69 6c 65 | 22 2c 20 65 2e 67 2e 2e |sh <file|", e.g..|
|00000230| 20 20 49 66 20 74 68 69 | 73 20 61 72 63 68 69 76 | If thi|s archiv|
|00000240| 65 20 69 73 20 63 6f 6d | 70 6c 65 74 65 2c 20 79 |e is com|plete, y|
|00000250| 6f 75 0a 23 20 77 69 6c | 6c 20 73 65 65 20 74 68 |ou.# wil|l see th|
|00000260| 65 20 66 6f 6c 6c 6f 77 | 69 6e 67 20 6d 65 73 73 |e follow|ing mess|
|00000270| 61 67 65 20 61 74 20 74 | 68 65 20 65 6e 64 3a 0a |age at t|he end:.|
|00000280| 23 09 09 22 45 6e 64 20 | 6f 66 20 61 72 63 68 69 |#.."End |of archi|
|00000290| 76 65 20 38 20 28 6f 66 | 20 38 29 2e 22 0a 23 20 |ve 8 (of| 8).".# |
|000002a0| 43 6f 6e 74 65 6e 74 73 | 3a 20 20 64 69 66 66 33 |Contents|: diff3|
|000002b0| 2e 63 0a 23 20 57 72 61 | 70 70 65 64 20 62 79 20 |.c.# Wra|pped by |
|000002c0| 65 67 67 65 72 74 40 61 | 74 61 20 6f 6e 20 4d 6f |eggert@a|ta on Mo|
|000002d0| 6e 20 4a 61 6e 20 20 37 | 20 31 31 3a 32 35 3a 33 |n Jan 7| 11:25:3|
|000002e0| 32 20 31 39 39 31 0a 50 | 41 54 48 3d 2f 62 69 6e |2 1991.P|ATH=/bin|
|000002f0| 3a 2f 75 73 72 2f 62 69 | 6e 3a 2f 75 73 72 2f 75 |:/usr/bi|n:/usr/u|
|00000300| 63 62 20 3b 20 65 78 70 | 6f 72 74 20 50 41 54 48 |cb ; exp|ort PATH|
|00000310| 0a 69 66 20 74 65 73 74 | 20 2d 66 20 27 64 69 66 |.if test| -f 'dif|
|00000320| 66 33 2e 63 27 20 2d 61 | 20 22 24 7b 31 7d 22 20 |f3.c' -a| "${1}" |
|00000330| 21 3d 20 22 2d 63 22 20 | 3b 20 74 68 65 6e 20 0a |!= "-c" |; then .|
|00000340| 20 20 65 63 68 6f 20 73 | 68 61 72 3a 20 57 69 6c | echo s|har: Wil|
|00000350| 6c 20 6e 6f 74 20 63 6c | 6f 62 62 65 72 20 65 78 |l not cl|obber ex|
|00000360| 69 73 74 69 6e 67 20 66 | 69 6c 65 20 5c 22 27 64 |isting f|ile \"'d|
|00000370| 69 66 66 33 2e 63 27 5c | 22 0a 65 6c 73 65 0a 65 |iff3.c'\|".else.e|
|00000380| 63 68 6f 20 73 68 61 72 | 3a 20 45 78 74 72 61 63 |cho shar|: Extrac|
|00000390| 74 69 6e 67 20 5c 22 27 | 64 69 66 66 33 2e 63 27 |ting \"'|diff3.c'|
|000003a0| 5c 22 20 5c 28 34 36 36 | 34 32 20 63 68 61 72 61 |\" \(466|42 chara|
|000003b0| 63 74 65 72 73 5c 29 0a | 73 65 64 20 22 73 2f 5e |cters\).|sed "s/^|
|000003c0| 58 2f 2f 22 20 3e 27 64 | 69 66 66 33 2e 63 27 20 |X//" >'d|iff3.c' |
|000003d0| 3c 3c 27 45 4e 44 5f 4f | 46 5f 46 49 4c 45 27 0a |<<'END_O|F_FILE'.|
|000003e0| 58 2f 2a 20 54 68 72 65 | 65 2d 77 61 79 20 66 69 |X/* Thre|e-way fi|
|000003f0| 6c 65 20 63 6f 6d 70 61 | 72 69 73 6f 6e 20 70 72 |le compa|rison pr|
|00000400| 6f 67 72 61 6d 20 28 64 | 69 66 66 33 29 20 66 6f |ogram (d|iff3) fo|
|00000410| 72 20 50 72 6f 6a 65 63 | 74 20 47 4e 55 0a 58 20 |r Projec|t GNU.X |
|00000420| 20 20 43 6f 70 79 72 69 | 67 68 74 20 28 43 29 20 | Copyri|ght (C) |
|00000430| 31 39 38 38 2c 20 31 39 | 38 39 20 46 72 65 65 20 |1988, 19|89 Free |
|00000440| 53 6f 66 74 77 61 72 65 | 20 46 6f 75 6e 64 61 74 |Software| Foundat|
|00000450| 69 6f 6e 2c 20 49 6e 63 | 2e 0a 58 0a 58 20 20 20 |ion, Inc|..X.X |
|00000460| 54 68 69 73 20 70 72 6f | 67 72 61 6d 20 69 73 20 |This pro|gram is |
|00000470| 66 72 65 65 20 73 6f 66 | 74 77 61 72 65 3b 20 79 |free sof|tware; y|
|00000480| 6f 75 20 63 61 6e 20 72 | 65 64 69 73 74 72 69 62 |ou can r|edistrib|
|00000490| 75 74 65 20 69 74 20 61 | 6e 64 2f 6f 72 20 6d 6f |ute it a|nd/or mo|
|000004a0| 64 69 66 79 0a 58 20 20 | 20 69 74 20 75 6e 64 65 |dify.X | it unde|
|000004b0| 72 20 74 68 65 20 74 65 | 72 6d 73 20 6f 66 20 74 |r the te|rms of t|
|000004c0| 68 65 20 47 4e 55 20 47 | 65 6e 65 72 61 6c 20 50 |he GNU G|eneral P|
|000004d0| 75 62 6c 69 63 20 4c 69 | 63 65 6e 73 65 20 61 73 |ublic Li|cense as|
|000004e0| 20 70 75 62 6c 69 73 68 | 65 64 20 62 79 0a 58 20 | publish|ed by.X |
|000004f0| 20 20 74 68 65 20 46 72 | 65 65 20 53 6f 66 74 77 | the Fr|ee Softw|
|00000500| 61 72 65 20 46 6f 75 6e | 64 61 74 69 6f 6e 3b 20 |are Foun|dation; |
|00000510| 65 69 74 68 65 72 20 76 | 65 72 73 69 6f 6e 20 31 |either v|ersion 1|
|00000520| 2c 20 6f 72 20 28 61 74 | 20 79 6f 75 72 20 6f 70 |, or (at| your op|
|00000530| 74 69 6f 6e 29 0a 58 20 | 20 20 61 6e 79 20 6c 61 |tion).X | any la|
|00000540| 74 65 72 20 76 65 72 73 | 69 6f 6e 2e 0a 58 0a 58 |ter vers|ion..X.X|
|00000550| 20 20 20 54 68 69 73 20 | 70 72 6f 67 72 61 6d 20 | This |program |
|00000560| 69 73 20 64 69 73 74 72 | 69 62 75 74 65 64 20 69 |is distr|ibuted i|
|00000570| 6e 20 74 68 65 20 68 6f | 70 65 20 74 68 61 74 20 |n the ho|pe that |
|00000580| 69 74 20 77 69 6c 6c 20 | 62 65 20 75 73 65 66 75 |it will |be usefu|
|00000590| 6c 2c 0a 58 20 20 20 62 | 75 74 20 57 49 54 48 4f |l,.X b|ut WITHO|
|000005a0| 55 54 20 41 4e 59 20 57 | 41 52 52 41 4e 54 59 3b |UT ANY W|ARRANTY;|
|000005b0| 20 77 69 74 68 6f 75 74 | 20 65 76 65 6e 20 74 68 | without| even th|
|000005c0| 65 20 69 6d 70 6c 69 65 | 64 20 77 61 72 72 61 6e |e implie|d warran|
|000005d0| 74 79 20 6f 66 0a 58 20 | 20 20 4d 45 52 43 48 41 |ty of.X | MERCHA|
|000005e0| 4e 54 41 42 49 4c 49 54 | 59 20 6f 72 20 46 49 54 |NTABILIT|Y or FIT|
|000005f0| 4e 45 53 53 20 46 4f 52 | 20 41 20 50 41 52 54 49 |NESS FOR| A PARTI|
|00000600| 43 55 4c 41 52 20 50 55 | 52 50 4f 53 45 2e 20 20 |CULAR PU|RPOSE. |
|00000610| 53 65 65 20 74 68 65 0a | 58 20 20 20 47 4e 55 20 |See the.|X GNU |
|00000620| 47 65 6e 65 72 61 6c 20 | 50 75 62 6c 69 63 20 4c |General |Public L|
|00000630| 69 63 65 6e 73 65 20 66 | 6f 72 20 6d 6f 72 65 20 |icense f|or more |
|00000640| 64 65 74 61 69 6c 73 2e | 0a 58 0a 58 20 20 20 59 |details.|.X.X Y|
|00000650| 6f 75 20 73 68 6f 75 6c | 64 20 68 61 76 65 20 72 |ou shoul|d have r|
|00000660| 65 63 65 69 76 65 64 20 | 61 20 63 6f 70 79 20 6f |eceived |a copy o|
|00000670| 66 20 74 68 65 20 47 4e | 55 20 47 65 6e 65 72 61 |f the GN|U Genera|
|00000680| 6c 20 50 75 62 6c 69 63 | 20 4c 69 63 65 6e 73 65 |l Public| License|
|00000690| 0a 58 20 20 20 61 6c 6f | 6e 67 20 77 69 74 68 20 |.X alo|ng with |
|000006a0| 74 68 69 73 20 70 72 6f | 67 72 61 6d 3b 20 69 66 |this pro|gram; if|
|000006b0| 20 6e 6f 74 2c 20 77 72 | 69 74 65 20 74 6f 20 74 | not, wr|ite to t|
|000006c0| 68 65 20 46 72 65 65 20 | 53 6f 66 74 77 61 72 65 |he Free |Software|
|000006d0| 0a 58 20 20 20 46 6f 75 | 6e 64 61 74 69 6f 6e 2c |.X Fou|ndation,|
|000006e0| 20 49 6e 63 2e 2c 20 36 | 37 35 20 4d 61 73 73 20 | Inc., 6|75 Mass |
|000006f0| 41 76 65 2c 20 43 61 6d | 62 72 69 64 67 65 2c 20 |Ave, Cam|bridge, |
|00000700| 4d 41 20 30 32 31 33 39 | 2c 20 55 53 41 2e 20 20 |MA 02139|, USA. |
|00000710| 2a 2f 0a 58 0a 58 0c 0a | 58 2f 2a 20 57 72 69 74 |*/.X.X..|X/* Writ|
|00000720| 74 65 6e 20 62 79 20 52 | 61 6e 64 79 20 53 6d 69 |ten by R|andy Smi|
|00000730| 74 68 20 2a 2f 0a 58 0a | 58 23 69 66 64 65 66 20 |th */.X.|X#ifdef |
|00000740| 5f 5f 53 54 44 43 5f 5f | 0a 58 23 64 65 66 69 6e |__STDC__|.X#defin|
|00000750| 65 20 56 4f 49 44 20 76 | 6f 69 64 0a 58 23 65 6c |e VOID v|oid.X#el|
|00000760| 73 65 0a 58 23 64 65 66 | 69 6e 65 20 56 4f 49 44 |se.X#def|ine VOID|
|00000770| 20 63 68 61 72 0a 58 23 | 65 6e 64 69 66 0a 58 0a | char.X#|endif.X.|
|00000780| 58 2f 2a 20 0a 58 20 2a | 20 49 6e 63 6c 75 64 65 |X/* .X *| Include|
|00000790| 20 66 69 6c 65 73 2e 0a | 58 20 2a 2f 0a 58 23 69 | files..|X */.X#i|
|000007a0| 6e 63 6c 75 64 65 20 3c | 73 74 64 69 6f 2e 68 3e |nclude <|stdio.h>|
|000007b0| 0a 58 23 69 6e 63 6c 75 | 64 65 20 3c 63 74 79 70 |.X#inclu|de <ctyp|
|000007c0| 65 2e 68 3e 0a 58 23 69 | 6e 63 6c 75 64 65 20 3c |e.h>.X#i|nclude <|
|000007d0| 73 79 73 2f 74 79 70 65 | 73 2e 68 3e 0a 58 23 69 |sys/type|s.h>.X#i|
|000007e0| 6e 63 6c 75 64 65 20 3c | 73 79 73 2f 73 74 61 74 |nclude <|sys/stat|
|000007f0| 2e 68 3e 0a 58 0a 58 23 | 69 66 64 65 66 20 55 53 |.h>.X.X#|ifdef US|
|00000800| 47 0a 58 23 69 6e 63 6c | 75 64 65 20 3c 66 63 6e |G.X#incl|ude <fcn|
|00000810| 74 6c 2e 68 3e 0a 58 0a | 58 2f 2a 20 44 65 66 69 |tl.h>.X.|X/* Defi|
|00000820| 6e 65 20 6e 65 65 64 65 | 64 20 42 53 44 20 66 75 |ne neede|d BSD fu|
|00000830| 6e 63 74 69 6f 6e 73 20 | 69 6e 20 74 65 72 6d 73 |nctions |in terms|
|00000840| 20 6f 66 20 73 79 73 56 | 20 6c 69 62 72 61 72 79 | of sysV| library|
|00000850| 2e 20 20 2a 2f 0a 58 0a | 58 23 64 65 66 69 6e 65 |. */.X.|X#define|
|00000860| 20 62 63 6d 70 28 73 31 | 2c 73 32 2c 6e 29 09 6d | bcmp(s1|,s2,n).m|
|00000870| 65 6d 63 6d 70 28 28 73 | 31 29 2c 28 73 32 29 2c |emcmp((s|1),(s2),|
|00000880| 28 6e 29 29 0a 58 23 64 | 65 66 69 6e 65 20 62 7a |(n)).X#d|efine bz|
|00000890| 65 72 6f 28 73 2c 6e 29 | 09 6d 65 6d 73 65 74 28 |ero(s,n)|.memset(|
|000008a0| 28 73 29 2c 30 2c 28 6e | 29 29 0a 58 0a 58 23 69 |(s),0,(n|)).X.X#i|
|000008b0| 66 6e 64 65 66 20 58 45 | 4e 49 58 0a 58 23 64 65 |fndef XE|NIX.X#de|
|000008c0| 66 69 6e 65 20 64 75 70 | 32 28 66 2c 74 29 09 28 |fine dup|2(f,t).(|
|000008d0| 63 6c 6f 73 65 28 74 29 | 2c 66 63 6e 74 6c 28 28 |close(t)|,fcntl((|
|000008e0| 66 29 2c 46 5f 44 55 50 | 46 44 2c 28 74 29 29 29 |f),F_DUP|FD,(t)))|
|000008f0| 0a 58 23 65 6e 64 69 66 | 0a 58 0a 58 23 64 65 66 |.X#endif|.X.X#def|
|00000900| 69 6e 65 20 76 66 6f 72 | 6b 09 66 6f 72 6b 0a 58 |ine vfor|k.fork.X|
|00000910| 0a 58 23 65 6c 73 65 20 | 2f 2a 20 6e 6f 74 20 55 |.X#else |/* not U|
|00000920| 53 47 20 2a 2f 0a 58 23 | 69 6e 63 6c 75 64 65 20 |SG */.X#|include |
|00000930| 3c 73 79 73 2f 77 61 69 | 74 2e 68 3e 0a 58 23 65 |<sys/wai|t.h>.X#e|
|00000940| 6e 64 69 66 20 2f 2a 20 | 6e 6f 74 20 55 53 47 20 |ndif /* |not USG |
|00000950| 2a 2f 0a 58 0a 58 23 69 | 66 6e 64 65 66 20 57 45 |*/.X.X#i|fndef WE|
|00000960| 58 49 54 53 54 41 54 55 | 53 0a 58 23 64 65 66 69 |XITSTATU|S.X#defi|
|00000970| 6e 65 20 57 45 58 49 54 | 53 54 41 54 55 53 28 73 |ne WEXIT|STATUS(s|
|00000980| 74 61 74 5f 76 61 6c 29 | 20 28 28 75 6e 73 69 67 |tat_val)| ((unsig|
|00000990| 6e 65 64 29 28 73 74 61 | 74 5f 76 61 6c 29 20 3e |ned)(sta|t_val) >|
|000009a0| 3e 20 38 29 0a 58 23 75 | 6e 64 65 66 20 57 49 46 |> 8).X#u|ndef WIF|
|000009b0| 45 58 49 54 45 44 20 2f | 2a 20 41 76 6f 69 64 20 |EXITED /|* Avoid |
|000009c0| 34 2e 33 42 53 44 20 69 | 6e 63 6f 6d 70 61 74 69 |4.3BSD i|ncompati|
|000009d0| 62 69 6c 69 74 79 20 77 | 69 74 68 20 50 6f 73 69 |bility w|ith Posi|
|000009e0| 78 2e 20 20 2a 2f 0a 58 | 23 65 6e 64 69 66 0a 58 |x. */.X|#endif.X|
|000009f0| 23 69 66 6e 64 65 66 20 | 57 49 46 45 58 49 54 45 |#ifndef |WIFEXITE|
|00000a00| 44 0a 58 23 64 65 66 69 | 6e 65 20 57 49 46 45 58 |D.X#defi|ne WIFEX|
|00000a10| 49 54 45 44 28 73 74 61 | 74 5f 76 61 6c 29 20 28 |ITED(sta|t_val) (|
|00000a20| 28 28 73 74 61 74 5f 76 | 61 6c 29 20 26 20 32 35 |((stat_v|al) & 25|
|00000a30| 35 29 20 3d 3d 20 30 29 | 0a 58 23 65 6e 64 69 66 |5) == 0)|.X#endif|
|00000a40| 0a 58 0a 58 23 69 66 64 | 65 66 20 73 70 61 72 63 |.X.X#ifd|ef sparc|
|00000a50| 0a 58 2f 2a 20 76 66 6f | 72 6b 20 63 6c 6f 62 62 |.X/* vfo|rk clobb|
|00000a60| 65 72 73 20 72 65 67 69 | 73 74 65 72 73 20 6f 6e |ers regi|sters on|
|00000a70| 20 74 68 65 20 53 70 61 | 72 63 2c 20 73 6f 20 64 | the Spa|rc, so d|
|00000a80| 6f 6e 27 74 20 75 73 65 | 20 69 74 2e 20 20 2a 2f |on't use| it. */|
|00000a90| 0a 58 23 64 65 66 69 6e | 65 20 76 66 6f 72 6b 20 |.X#defin|e vfork |
|00000aa0| 66 6f 72 6b 0a 58 23 65 | 6e 64 69 66 0a 58 0a 58 |fork.X#e|ndif.X.X|
|00000ab0| 2f 2a 0a 58 20 2a 20 49 | 6e 74 65 72 6e 61 6c 20 |/*.X * I|nternal |
|00000ac0| 64 61 74 61 20 73 74 72 | 75 63 74 75 72 65 73 20 |data str|uctures |
|00000ad0| 61 6e 64 20 6d 61 63 72 | 6f 73 20 66 6f 72 20 74 |and macr|os for t|
|00000ae0| 68 65 20 64 69 66 66 33 | 20 70 72 6f 67 72 61 6d |he diff3| program|
|00000af0| 3b 20 69 6e 63 6c 75 64 | 65 73 0a 58 20 2a 20 64 |; includ|es.X * d|
|00000b00| 61 74 61 20 73 74 72 75 | 63 74 75 72 65 73 20 66 |ata stru|ctures f|
|00000b10| 6f 72 20 62 6f 74 68 20 | 64 69 66 66 33 20 64 69 |or both |diff3 di|
|00000b20| 66 66 73 20 61 6e 64 20 | 6e 6f 72 6d 61 6c 20 64 |ffs and |normal d|
|00000b30| 69 66 66 73 2e 0a 58 20 | 2a 2f 0a 58 0a 58 2f 2a |iffs..X |*/.X.X/*|
|00000b40| 0a 58 20 2a 20 44 69 66 | 66 65 72 65 6e 74 20 66 |.X * Dif|ferent f|
|00000b50| 69 6c 65 73 20 77 69 74 | 68 69 6e 20 61 20 64 69 |iles wit|hin a di|
|00000b60| 66 66 0a 58 20 2a 2f 0a | 58 23 64 65 66 69 6e 65 |ff.X */.|X#define|
|00000b70| 09 46 49 4c 45 30 09 30 | 0a 58 23 64 65 66 69 6e |.FILE0.0|.X#defin|
|00000b80| 65 09 46 49 4c 45 31 09 | 31 0a 58 23 64 65 66 69 |e.FILE1.|1.X#defi|
|00000b90| 6e 65 09 46 49 4c 45 32 | 09 32 0a 58 0a 58 2f 2a |ne.FILE2|.2.X.X/*|
|00000ba0| 0a 58 20 2a 20 54 68 72 | 65 65 20 77 61 79 20 64 |.X * Thr|ee way d|
|00000bb0| 69 66 66 73 20 61 72 65 | 20 62 75 69 6c 64 20 6f |iffs are| build o|
|00000bc0| 75 74 20 6f 66 20 74 77 | 6f 20 74 77 6f 2d 77 61 |ut of tw|o two-wa|
|00000bd0| 79 20 64 69 66 66 73 3b | 20 74 68 65 20 66 69 6c |y diffs;| the fil|
|00000be0| 65 20 77 68 69 63 68 0a | 58 20 2a 20 74 68 65 20 |e which.|X * the |
|00000bf0| 74 77 6f 20 74 77 6f 2d | 77 61 79 20 64 69 66 66 |two two-|way diff|
|00000c00| 73 20 73 68 61 72 65 20 | 69 73 3a 0a 58 20 2a 2f |s share |is:.X */|
|00000c10| 0a 58 23 64 65 66 69 6e | 65 09 46 49 4c 45 43 09 |.X#defin|e.FILEC.|
|00000c20| 46 49 4c 45 30 0a 58 0a | 58 2f 2a 20 54 68 65 20 |FILE0.X.|X/* The |
|00000c30| 72 61 6e 67 65 73 20 61 | 72 65 20 69 6e 64 65 78 |ranges a|re index|
|00000c40| 65 64 20 62 79 20 2a 2f | 0a 58 23 64 65 66 69 6e |ed by */|.X#defin|
|00000c50| 65 09 53 54 41 52 54 09 | 30 0a 58 23 64 65 66 69 |e.START.|0.X#defi|
|00000c60| 6e 65 09 45 4e 44 09 31 | 0a 58 0a 58 65 6e 75 6d |ne.END.1|.X.Xenum|
|00000c70| 20 64 69 66 66 5f 74 79 | 70 65 20 7b 0a 58 20 20 | diff_ty|pe {.X |
|00000c80| 45 52 52 4f 52 2c 09 09 | 09 2f 2a 20 53 68 6f 75 |ERROR,..|./* Shou|
|00000c90| 6c 64 20 6e 6f 74 20 62 | 65 20 75 73 65 64 20 2a |ld not b|e used *|
|00000ca0| 2f 0a 58 20 20 41 44 44 | 2c 09 09 09 09 2f 2a 20 |/.X ADD|,..../* |
|00000cb0| 54 77 6f 20 77 61 79 20 | 64 69 66 66 20 61 64 64 |Two way |diff add|
|00000cc0| 20 2a 2f 0a 58 20 20 43 | 48 41 4e 47 45 2c 09 09 | */.X C|HANGE,..|
|00000cd0| 09 2f 2a 20 54 77 6f 20 | 77 61 79 20 64 69 66 66 |./* Two |way diff|
|00000ce0| 20 63 68 61 6e 67 65 20 | 2a 2f 0a 58 20 20 44 45 | change |*/.X DE|
|00000cf0| 4c 45 54 45 2c 09 09 09 | 2f 2a 20 54 77 6f 20 77 |LETE,...|/* Two w|
|00000d00| 61 79 20 64 69 66 66 20 | 64 65 6c 65 74 65 20 2a |ay diff |delete *|
|00000d10| 2f 0a 58 20 20 44 49 46 | 46 5f 41 4c 4c 2c 09 09 |/.X DIF|F_ALL,..|
|00000d20| 09 2f 2a 20 41 6c 6c 20 | 74 68 72 65 65 20 61 72 |./* All |three ar|
|00000d30| 65 20 64 69 66 66 65 72 | 65 6e 74 20 2a 2f 0a 58 |e differ|ent */.X|
|00000d40| 20 20 44 49 46 46 5f 31 | 53 54 2c 09 09 09 2f 2a | DIFF_1|ST,.../*|
|00000d50| 20 4f 6e 6c 79 20 74 68 | 65 20 66 69 72 73 74 20 | Only th|e first |
|00000d60| 69 73 20 64 69 66 66 65 | 72 65 6e 74 20 2a 2f 0a |is diffe|rent */.|
|00000d70| 58 20 20 44 49 46 46 5f | 32 4e 44 2c 09 09 09 2f |X DIFF_|2ND,.../|
|00000d80| 2a 20 4f 6e 6c 79 20 74 | 68 65 20 73 65 63 6f 6e |* Only t|he secon|
|00000d90| 64 20 2a 2f 0a 58 20 20 | 44 49 46 46 5f 33 52 44 |d */.X |DIFF_3RD|
|00000da0| 09 09 09 2f 2a 20 4f 6e | 6c 79 20 74 68 65 20 74 |.../* On|ly the t|
|00000db0| 68 69 72 64 20 2a 2f 0a | 58 7d 3b 0a 58 0a 58 2f |hird */.|X};.X.X/|
|00000dc0| 2a 20 54 77 6f 2d 77 61 | 79 20 64 69 66 66 20 2a |* Two-wa|y diff *|
|00000dd0| 2f 0a 58 73 74 72 75 63 | 74 20 64 69 66 66 5f 62 |/.Xstruc|t diff_b|
|00000de0| 6c 6f 63 6b 20 7b 0a 58 | 20 20 69 6e 74 20 72 61 |lock {.X| int ra|
|00000df0| 6e 67 65 73 5b 32 5d 5b | 32 5d 3b 09 20 20 20 20 |nges[2][|2];. |
|00000e00| 09 2f 2a 20 52 61 6e 67 | 65 73 20 61 72 65 20 69 |./* Rang|es are i|
|00000e10| 6e 63 6c 75 73 69 76 65 | 20 2a 2f 0a 58 20 20 63 |nclusive| */.X c|
|00000e20| 68 61 72 20 2a 2a 6c 69 | 6e 65 73 5b 32 5d 3b 09 |har **li|nes[2];.|
|00000e30| 09 2f 2a 20 54 68 65 20 | 61 63 74 75 61 6c 20 6c |./* The |actual l|
|00000e40| 69 6e 65 73 20 28 6d 61 | 79 20 63 6f 6e 74 61 69 |ines (ma|y contai|
|00000e50| 6e 20 6e 75 6c 6c 73 29 | 20 2a 2f 0a 58 20 20 69 |n nulls)| */.X i|
|00000e60| 6e 74 20 2a 6c 65 6e 67 | 74 68 73 5b 32 5d 3b 09 |nt *leng|ths[2];.|
|00000e70| 09 2f 2a 20 4c 69 6e 65 | 20 6c 65 6e 67 74 68 73 |./* Line| lengths|
|00000e80| 20 28 69 6e 63 6c 75 64 | 69 6e 67 20 6e 65 77 6c | (includ|ing newl|
|00000e90| 69 6e 65 73 2c 20 69 66 | 20 61 6e 79 29 20 2a 2f |ines, if| any) */|
|00000ea0| 0a 58 20 20 73 74 72 75 | 63 74 20 64 69 66 66 5f |.X stru|ct diff_|
|00000eb0| 62 6c 6f 63 6b 20 2a 6e | 65 78 74 3b 0a 58 7d 3b |block *n|ext;.X};|
|00000ec0| 0a 58 0a 58 2f 2a 20 54 | 68 72 65 65 2d 77 61 79 |.X.X/* T|hree-way|
|00000ed0| 20 64 69 66 66 20 2a 2f | 0a 58 0a 58 73 74 72 75 | diff */|.X.Xstru|
|00000ee0| 63 74 20 64 69 66 66 33 | 5f 62 6c 6f 63 6b 20 7b |ct diff3|_block {|
|00000ef0| 0a 58 20 20 65 6e 75 6d | 20 64 69 66 66 5f 74 79 |.X enum| diff_ty|
|00000f00| 70 65 20 63 6f 72 72 65 | 73 70 6f 6e 64 3b 09 2f |pe corre|spond;./|
|00000f10| 2a 20 54 79 70 65 20 6f | 66 20 64 69 66 66 20 2a |* Type o|f diff *|
|00000f20| 2f 0a 58 20 20 69 6e 74 | 20 72 61 6e 67 65 73 5b |/.X int| ranges[|
|00000f30| 33 5d 5b 32 5d 3b 09 20 | 20 20 20 09 2f 2a 20 52 |3][2];. | ./* R|
|00000f40| 61 6e 67 65 73 20 61 72 | 65 20 69 6e 63 6c 75 73 |anges ar|e inclus|
|00000f50| 69 76 65 20 2a 2f 0a 58 | 20 20 63 68 61 72 20 2a |ive */.X| char *|
|00000f60| 2a 6c 69 6e 65 73 5b 33 | 5d 3b 09 09 2f 2a 20 54 |*lines[3|];../* T|
|00000f70| 68 65 20 61 63 74 75 61 | 6c 20 6c 69 6e 65 73 20 |he actua|l lines |
|00000f80| 28 6d 61 79 20 63 6f 6e | 74 61 69 6e 20 6e 75 6c |(may con|tain nul|
|00000f90| 6c 73 29 20 2a 2f 0a 58 | 20 20 69 6e 74 20 2a 6c |ls) */.X| int *l|
|00000fa0| 65 6e 67 74 68 73 5b 33 | 5d 3b 09 09 2f 2a 20 4c |engths[3|];../* L|
|00000fb0| 69 6e 65 20 6c 65 6e 67 | 74 68 73 20 28 69 6e 63 |ine leng|ths (inc|
|00000fc0| 6c 75 64 69 6e 67 20 6e | 65 77 6c 69 6e 65 73 2c |luding n|ewlines,|
|00000fd0| 20 69 66 20 61 6e 79 29 | 20 2a 2f 0a 58 20 20 73 | if any)| */.X s|
|00000fe0| 74 72 75 63 74 20 64 69 | 66 66 33 5f 62 6c 6f 63 |truct di|ff3_bloc|
|00000ff0| 6b 20 2a 6e 65 78 74 3b | 0a 58 7d 3b 0a 58 0a 58 |k *next;|.X};.X.X|
|00001000| 2f 2a 0a 58 20 2a 20 41 | 63 63 65 73 73 20 74 68 |/*.X * A|ccess th|
|00001010| 65 20 72 61 6e 67 65 73 | 20 6f 6e 20 61 20 64 69 |e ranges| on a di|
|00001020| 66 66 20 62 6c 6f 63 6b | 2e 0a 58 20 2a 2f 0a 58 |ff block|..X */.X|
|00001030| 23 64 65 66 69 6e 65 09 | 44 5f 4c 4f 57 4c 49 4e |#define.|D_LOWLIN|
|00001040| 45 28 64 69 66 66 2c 20 | 66 69 6c 65 6e 75 6d 29 |E(diff, |filenum)|
|00001050| 09 5c 0a 58 20 20 28 28 | 64 69 66 66 29 2d 3e 72 |.\.X ((|diff)->r|
|00001060| 61 6e 67 65 73 5b 66 69 | 6c 65 6e 75 6d 5d 5b 53 |anges[fi|lenum][S|
|00001070| 54 41 52 54 5d 29 0a 58 | 23 64 65 66 69 6e 65 09 |TART]).X|#define.|
|00001080| 44 5f 48 49 47 48 4c 49 | 4e 45 28 64 69 66 66 2c |D_HIGHLI|NE(diff,|
|00001090| 20 66 69 6c 65 6e 75 6d | 29 09 5c 0a 58 20 20 28 | filenum|).\.X (|
|000010a0| 28 64 69 66 66 29 2d 3e | 72 61 6e 67 65 73 5b 66 |(diff)->|ranges[f|
|000010b0| 69 6c 65 6e 75 6d 5d 5b | 45 4e 44 5d 29 0a 58 23 |ilenum][|END]).X#|
|000010c0| 64 65 66 69 6e 65 09 44 | 5f 4e 55 4d 4c 49 4e 45 |define.D|_NUMLINE|
|000010d0| 53 28 64 69 66 66 2c 20 | 66 69 6c 65 6e 75 6d 29 |S(diff, |filenum)|
|000010e0| 09 5c 0a 58 20 20 28 44 | 5f 48 49 47 48 4c 49 4e |.\.X (D|_HIGHLIN|
|000010f0| 45 28 28 64 69 66 66 29 | 2c 20 28 66 69 6c 65 6e |E((diff)|, (filen|
|00001100| 75 6d 29 29 20 2d 20 44 | 5f 4c 4f 57 4c 49 4e 45 |um)) - D|_LOWLINE|
|00001110| 28 28 64 69 66 66 29 2c | 20 28 66 69 6c 65 6e 75 |((diff),| (filenu|
|00001120| 6d 29 29 20 2b 20 31 29 | 0a 58 0a 58 2f 2a 0a 58 |m)) + 1)|.X.X/*.X|
|00001130| 20 2a 20 41 63 63 65 73 | 73 20 74 68 65 20 6c 69 | * Acces|s the li|
|00001140| 6e 65 20 6e 75 6d 62 65 | 72 73 20 69 6e 20 61 20 |ne numbe|rs in a |
|00001150| 66 69 6c 65 20 69 6e 20 | 61 20 64 69 66 66 20 62 |file in |a diff b|
|00001160| 79 20 72 65 6c 61 74 69 | 76 65 20 6c 69 6e 65 0a |y relati|ve line.|
|00001170| 58 20 2a 20 6e 75 6d 62 | 65 72 73 20 28 69 2e 65 |X * numb|ers (i.e|
|00001180| 2e 20 6c 69 6e 65 20 6e | 75 6d 62 65 72 20 77 69 |. line n|umber wi|
|00001190| 74 68 69 6e 20 74 68 65 | 20 64 69 66 66 20 69 74 |thin the| diff it|
|000011a0| 73 65 6c 66 29 2e 20 20 | 4e 6f 74 65 20 74 68 61 |self). |Note tha|
|000011b0| 74 20 74 68 65 73 65 0a | 58 20 2a 20 61 72 65 20 |t these.|X * are |
|000011c0| 6c 76 61 6c 75 65 73 20 | 61 6e 64 20 63 61 6e 20 |lvalues |and can |
|000011d0| 62 65 20 75 73 65 64 20 | 66 6f 72 20 61 73 73 69 |be used |for assi|
|000011e0| 67 6e 6d 65 6e 74 2e 0a | 58 20 2a 2f 0a 58 23 64 |gnment..|X */.X#d|
|000011f0| 65 66 69 6e 65 09 44 5f | 52 45 4c 4e 55 4d 28 64 |efine.D_|RELNUM(d|
|00001200| 69 66 66 2c 20 66 69 6c | 65 6e 75 6d 2c 20 6c 69 |iff, fil|enum, li|
|00001210| 6e 65 6e 75 6d 29 09 5c | 0a 58 20 20 28 2a 28 28 |nenum).\|.X (*((|
|00001220| 64 69 66 66 29 2d 3e 6c | 69 6e 65 73 5b 66 69 6c |diff)->l|ines[fil|
|00001230| 65 6e 75 6d 5d 20 2b 20 | 6c 69 6e 65 6e 75 6d 29 |enum] + |linenum)|
|00001240| 29 0a 58 23 64 65 66 69 | 6e 65 09 44 5f 52 45 4c |).X#defi|ne.D_REL|
|00001250| 4c 45 4e 28 64 69 66 66 | 2c 20 66 69 6c 65 6e 75 |LEN(diff|, filenu|
|00001260| 6d 2c 20 6c 69 6e 65 6e | 75 6d 29 09 5c 0a 58 20 |m, linen|um).\.X |
|00001270| 20 28 2a 28 28 64 69 66 | 66 29 2d 3e 6c 65 6e 67 | (*((dif|f)->leng|
|00001280| 74 68 73 5b 66 69 6c 65 | 6e 75 6d 5d 20 2b 20 6c |ths[file|num] + l|
|00001290| 69 6e 65 6e 75 6d 29 29 | 0a 58 0a 58 2f 2a 0a 58 |inenum))|.X.X/*.X|
|000012a0| 20 2a 20 41 6e 64 20 67 | 65 74 20 61 74 20 74 68 | * And g|et at th|
|000012b0| 65 6d 20 64 69 72 65 63 | 74 6c 79 2c 20 77 68 65 |em direc|tly, whe|
|000012c0| 6e 20 74 68 61 74 20 73 | 68 6f 75 6c 64 20 62 65 |n that s|hould be|
|000012d0| 20 6e 65 63 65 73 73 61 | 72 79 2e 0a 58 20 2a 2f | necessa|ry..X */|
|000012e0| 0a 58 23 64 65 66 69 6e | 65 09 44 5f 4c 49 4e 45 |.X#defin|e.D_LINE|
|000012f0| 41 52 52 41 59 28 64 69 | 66 66 2c 20 66 69 6c 65 |ARRAY(di|ff, file|
|00001300| 6e 75 6d 29 09 5c 0a 58 | 20 20 28 28 64 69 66 66 |num).\.X| ((diff|
|00001310| 29 2d 3e 6c 69 6e 65 73 | 5b 66 69 6c 65 6e 75 6d |)->lines|[filenum|
|00001320| 5d 29 0a 58 23 64 65 66 | 69 6e 65 09 44 5f 4c 45 |]).X#def|ine.D_LE|
|00001330| 4e 41 52 52 41 59 28 64 | 69 66 66 2c 20 66 69 6c |NARRAY(d|iff, fil|
|00001340| 65 6e 75 6d 29 09 5c 0a | 58 20 20 28 28 64 69 66 |enum).\.|X ((dif|
|00001350| 66 29 2d 3e 6c 65 6e 67 | 74 68 73 5b 66 69 6c 65 |f)->leng|ths[file|
|00001360| 6e 75 6d 5d 29 0a 58 0a | 58 2f 2a 0a 58 20 2a 20 |num]).X.|X/*.X * |
|00001370| 4e 65 78 74 20 62 6c 6f | 63 6b 2e 0a 58 20 2a 2f |Next blo|ck..X */|
|00001380| 0a 58 23 64 65 66 69 6e | 65 09 44 5f 4e 45 58 54 |.X#defin|e.D_NEXT|
|00001390| 28 64 69 66 66 29 09 28 | 28 64 69 66 66 29 2d 3e |(diff).(|(diff)->|
|000013a0| 6e 65 78 74 29 0a 58 0a | 58 2f 2a 0a 58 20 2a 20 |next).X.|X/*.X * |
|000013b0| 41 63 63 65 73 73 20 74 | 68 65 20 74 79 70 65 20 |Access t|he type |
|000013c0| 6f 66 20 61 20 64 69 66 | 66 33 20 62 6c 6f 63 6b |of a dif|f3 block|
|000013d0| 2e 0a 58 20 2a 2f 0a 58 | 23 64 65 66 69 6e 65 09 |..X */.X|#define.|
|000013e0| 44 33 5f 54 59 50 45 28 | 64 69 66 66 29 09 28 28 |D3_TYPE(|diff).((|
|000013f0| 64 69 66 66 29 2d 3e 63 | 6f 72 72 65 73 70 6f 6e |diff)->c|orrespon|
|00001400| 64 29 0a 58 0a 58 2f 2a | 0a 58 20 2a 20 4c 69 6e |d).X.X/*|.X * Lin|
|00001410| 65 20 6d 61 70 70 69 6e | 67 73 20 62 61 73 65 64 |e mappin|gs based|
|00001420| 20 6f 6e 20 64 69 66 66 | 73 2e 20 20 54 68 65 20 | on diff|s. The |
|00001430| 66 69 72 73 74 20 6d 61 | 70 73 20 6f 66 66 20 74 |first ma|ps off t|
|00001440| 68 65 20 74 6f 70 20 6f | 66 20 74 68 65 0a 58 20 |he top o|f the.X |
|00001450| 2a 20 64 69 66 66 2c 20 | 74 68 65 20 73 65 63 6f |* diff, |the seco|
|00001460| 6e 64 20 6f 66 66 20 6f | 66 20 74 68 65 20 62 6f |nd off o|f the bo|
|00001470| 74 74 6f 6d 2e 0a 58 20 | 2a 2f 0a 58 23 64 65 66 |ttom..X |*/.X#def|
|00001480| 69 6e 65 09 44 5f 48 49 | 47 48 5f 4d 41 50 4c 49 |ine.D_HI|GH_MAPLI|
|00001490| 4e 45 28 64 69 66 66 2c | 20 66 72 6f 6d 66 69 6c |NE(diff,| fromfil|
|000014a0| 65 2c 20 74 6f 66 69 6c | 65 2c 20 6c 69 6e 65 6e |e, tofil|e, linen|
|000014b0| 6f 29 09 5c 0a 58 20 20 | 28 28 6c 69 6e 65 6e 6f |o).\.X |((lineno|
|000014c0| 29 09 09 09 09 09 09 5c | 0a 58 20 20 20 2d 20 44 |)......\|.X - D|
|000014d0| 5f 48 49 47 48 4c 49 4e | 45 20 28 28 64 69 66 66 |_HIGHLIN|E ((diff|
|000014e0| 29 2c 20 28 66 72 6f 6d | 66 69 6c 65 29 29 09 09 |), (from|file))..|
|000014f0| 09 5c 0a 58 20 20 20 2b | 20 44 5f 48 49 47 48 4c |.\.X +| D_HIGHL|
|00001500| 49 4e 45 20 28 28 64 69 | 66 66 29 2c 20 28 74 6f |INE ((di|ff), (to|
|00001510| 66 69 6c 65 29 29 29 0a | 58 0a 58 23 64 65 66 69 |file))).|X.X#defi|
|00001520| 6e 65 09 44 5f 4c 4f 57 | 5f 4d 41 50 4c 49 4e 45 |ne.D_LOW|_MAPLINE|
|00001530| 28 64 69 66 66 2c 20 66 | 72 6f 6d 66 69 6c 65 2c |(diff, f|romfile,|
|00001540| 20 74 6f 66 69 6c 65 2c | 20 6c 69 6e 65 6e 6f 29 | tofile,| lineno)|
|00001550| 09 5c 0a 58 20 20 28 28 | 6c 69 6e 65 6e 6f 29 09 |.\.X ((|lineno).|
|00001560| 09 09 09 09 09 5c 0a 58 | 20 20 20 2d 20 44 5f 4c |.....\.X| - D_L|
|00001570| 4f 57 4c 49 4e 45 20 28 | 28 64 69 66 66 29 2c 20 |OWLINE (|(diff), |
|00001580| 28 66 72 6f 6d 66 69 6c | 65 29 29 09 09 09 5c 0a |(fromfil|e))...\.|
|00001590| 58 20 20 20 2b 20 44 5f | 4c 4f 57 4c 49 4e 45 20 |X + D_|LOWLINE |
|000015a0| 28 28 64 69 66 66 29 2c | 20 28 74 6f 66 69 6c 65 |((diff),| (tofile|
|000015b0| 29 29 29 0a 58 0a 58 2f | 2a 0a 58 20 2a 20 47 65 |))).X.X/|*.X * Ge|
|000015c0| 6e 65 72 61 6c 20 6d 65 | 6d 6f 72 79 20 61 6c 6c |neral me|mory all|
|000015d0| 6f 63 61 74 69 6f 6e 20 | 66 75 6e 63 74 69 6f 6e |ocation |function|
|000015e0| 2e 0a 58 20 2a 2f 0a 58 | 23 64 65 66 69 6e 65 09 |..X */.X|#define.|
|000015f0| 41 4c 4c 4f 43 41 54 45 | 28 6e 75 6d 62 65 72 2c |ALLOCATE|(number,|
|00001600| 20 74 79 70 65 29 09 5c | 0a 58 20 20 28 74 79 70 | type).\|.X (typ|
|00001610| 65 20 2a 29 20 78 6d 61 | 6c 6c 6f 63 20 28 28 6e |e *) xma|lloc ((n|
|00001620| 75 6d 62 65 72 29 20 2a | 20 73 69 7a 65 6f 66 20 |umber) *| sizeof |
|00001630| 28 74 79 70 65 29 29 0a | 58 0c 0a 58 2f 2a 0a 58 |(type)).|X..X/*.X|
|00001640| 20 2a 20 4f 70 74 69 6f | 6e 73 20 76 61 72 69 61 | * Optio|ns varia|
|00001650| 62 6c 65 73 20 66 6f 72 | 20 66 6c 61 67 73 20 73 |bles for| flags s|
|00001660| 65 74 20 6f 6e 20 63 6f | 6d 6d 61 6e 64 20 6c 69 |et on co|mmand li|
|00001670| 6e 65 2e 0a 58 20 2a 0a | 58 20 2a 20 41 4c 57 41 |ne..X *.|X * ALWA|
|00001680| 59 53 5f 54 45 58 54 3a | 20 54 72 65 61 74 20 61 |YS_TEXT:| Treat a|
|00001690| 6c 6c 20 66 69 6c 65 73 | 20 61 73 20 74 65 78 74 |ll files| as text|
|000016a0| 20 66 69 6c 65 73 3b 20 | 6e 65 76 65 72 20 74 72 | files; |never tr|
|000016b0| 65 61 74 20 61 73 20 62 | 69 6e 61 72 79 2e 0a 58 |eat as b|inary..X|
|000016c0| 20 2a 0a 58 20 2a 20 45 | 44 53 43 52 49 50 54 3a | *.X * E|DSCRIPT:|
|000016d0| 20 57 72 69 74 65 20 6f | 75 74 20 61 6e 20 65 64 | Write o|ut an ed|
|000016e0| 20 73 63 72 69 70 74 20 | 69 6e 73 74 65 61 64 20 | script |instead |
|000016f0| 6f 66 20 74 68 65 20 73 | 74 61 6e 64 61 72 64 20 |of the s|tandard |
|00001700| 64 69 66 66 33 20 66 6f | 72 6d 61 74 2e 0a 58 20 |diff3 fo|rmat..X |
|00001710| 2a 0a 58 20 2a 20 46 4c | 41 47 47 49 4e 47 3a 20 |*.X * FL|AGGING: |
|00001720| 49 6e 64 69 63 61 74 65 | 73 20 74 68 61 74 20 69 |Indicate|s that i|
|00001730| 6e 20 74 68 65 20 63 61 | 73 65 20 6f 66 20 6f 76 |n the ca|se of ov|
|00001740| 65 72 6c 61 70 70 69 6e | 67 20 64 69 66 66 73 20 |erlappin|g diffs |
|00001750| 28 74 79 70 65 0a 58 20 | 2a 20 44 49 46 46 5f 41 |(type.X |* DIFF_A|
|00001760| 4c 4c 29 2c 20 74 68 65 | 20 6c 69 6e 65 73 20 77 |LL), the| lines w|
|00001770| 68 69 63 68 20 77 6f 75 | 6c 64 20 6e 6f 72 6d 61 |hich wou|ld norma|
|00001780| 6c 6c 79 20 62 65 20 64 | 65 6c 65 74 65 64 20 66 |lly be d|eleted f|
|00001790| 72 6f 6d 20 66 69 6c 65 | 20 31 0a 58 20 2a 20 73 |rom file| 1.X * s|
|000017a0| 68 6f 75 6c 64 20 62 65 | 20 70 72 65 73 65 72 76 |hould be| preserv|
|000017b0| 65 64 20 77 69 74 68 20 | 61 20 73 70 65 63 69 61 |ed with |a specia|
|000017c0| 6c 20 66 6c 61 67 67 69 | 6e 67 20 6d 65 63 68 61 |l flaggi|ng mecha|
|000017d0| 6e 69 73 6d 2e 0a 58 20 | 2a 0a 58 20 2a 20 44 4f |nism..X |*.X * DO|
|000017e0| 4e 54 5f 57 52 49 54 45 | 5f 4f 56 45 52 4c 41 50 |NT_WRITE|_OVERLAP|
|000017f0| 3a 20 31 20 69 66 20 69 | 6e 66 6f 72 6d 61 74 69 |: 1 if i|nformati|
|00001800| 6f 6e 20 66 6f 72 20 6f | 76 65 72 6c 61 70 70 69 |on for o|verlappi|
|00001810| 6e 67 20 64 69 66 66 73 | 20 73 68 6f 75 6c 64 0a |ng diffs| should.|
|00001820| 58 20 2a 20 6e 6f 74 20 | 62 65 20 6f 75 74 70 75 |X * not |be outpu|
|00001830| 74 2e 0a 58 20 2a 0a 58 | 20 2a 20 44 4f 4e 54 5f |t..X *.X| * DONT_|
|00001840| 57 52 49 54 45 5f 53 49 | 4d 50 4c 45 3a 20 31 20 |WRITE_SI|MPLE: 1 |
|00001850| 69 66 20 69 6e 66 6f 72 | 6d 61 74 69 6f 6e 20 66 |if infor|mation f|
|00001860| 6f 72 20 6e 6f 6e 2d 6f | 76 65 72 6c 61 70 70 69 |or non-o|verlappi|
|00001870| 6e 67 20 64 69 66 66 73 | 0a 58 20 2a 20 73 68 6f |ng diffs|.X * sho|
|00001880| 75 6c 64 20 6e 6f 74 20 | 62 65 20 6f 75 74 70 75 |uld not |be outpu|
|00001890| 74 2e 20 0a 58 20 2a 0a | 58 20 2a 20 46 49 4e 41 |t. .X *.|X * FINA|
|000018a0| 4c 57 52 49 54 45 3a 20 | 31 20 69 66 20 61 20 3a |LWRITE: |1 if a :|
|000018b0| 77 71 20 73 68 6f 75 6c | 64 20 62 65 20 69 6e 63 |wq shoul|d be inc|
|000018c0| 6c 75 64 65 64 20 61 74 | 20 74 68 65 20 65 6e 64 |luded at| the end|
|000018d0| 20 6f 66 20 74 68 65 20 | 73 63 72 69 70 74 0a 58 | of the |script.X|
|000018e0| 20 2a 20 74 6f 20 77 72 | 69 74 65 20 6f 75 74 20 | * to wr|ite out |
|000018f0| 74 68 65 20 66 69 6c 65 | 20 62 65 69 6e 67 20 65 |the file| being e|
|00001900| 64 69 74 65 64 2e 0a 58 | 20 2a 0a 58 20 2a 20 4d |dited..X| *.X * M|
|00001910| 45 52 47 45 3a 20 6f 75 | 74 70 75 74 20 61 20 6d |ERGE: ou|tput a m|
|00001920| 65 72 67 65 64 20 66 69 | 6c 65 2e 0a 58 20 2a 2f |erged fi|le..X */|
|00001930| 0a 58 69 6e 74 20 61 6c | 77 61 79 73 5f 74 65 78 |.Xint al|ways_tex|
|00001940| 74 3b 0a 58 69 6e 74 20 | 65 64 73 63 72 69 70 74 |t;.Xint |edscript|
|00001950| 3b 0a 58 69 6e 74 20 66 | 6c 61 67 67 69 6e 67 3b |;.Xint f|lagging;|
|00001960| 0a 58 69 6e 74 20 64 6f | 6e 74 5f 77 72 69 74 65 |.Xint do|nt_write|
|00001970| 5f 6f 76 65 72 6c 61 70 | 3b 0a 58 69 6e 74 20 64 |_overlap|;.Xint d|
|00001980| 6f 6e 74 5f 77 72 69 74 | 65 5f 73 69 6d 70 6c 65 |ont_writ|e_simple|
|00001990| 3b 0a 58 69 6e 74 20 66 | 69 6e 61 6c 77 72 69 74 |;.Xint f|inalwrit|
|000019a0| 65 3b 0a 58 69 6e 74 20 | 6d 65 72 67 65 3b 0a 58 |e;.Xint |merge;.X|
|000019b0| 0a 58 65 78 74 65 72 6e | 20 69 6e 74 20 6f 70 74 |.Xextern| int opt|
|000019c0| 69 6e 64 3b 0a 58 0a 58 | 63 68 61 72 20 2a 61 72 |ind;.X.X|char *ar|
|000019d0| 67 76 30 3b 0a 58 0a 58 | 2f 2a 0a 58 20 2a 20 46 |gv0;.X.X|/*.X * F|
|000019e0| 6f 72 77 61 72 64 20 66 | 75 6e 63 74 69 6f 6e 20 |orward f|unction |
|000019f0| 64 65 63 6c 61 72 61 74 | 69 6f 6e 73 2e 0a 58 20 |declarat|ions..X |
|00001a00| 2a 2f 0a 58 73 74 72 75 | 63 74 20 64 69 66 66 5f |*/.Xstru|ct diff_|
|00001a10| 62 6c 6f 63 6b 20 2a 70 | 72 6f 63 65 73 73 5f 64 |block *p|rocess_d|
|00001a20| 69 66 66 20 28 29 3b 0a | 58 73 74 72 75 63 74 20 |iff ();.|Xstruct |
|00001a30| 64 69 66 66 33 5f 62 6c | 6f 63 6b 20 2a 6d 61 6b |diff3_bl|ock *mak|
|00001a40| 65 5f 33 77 61 79 5f 64 | 69 66 66 20 28 29 3b 0a |e_3way_d|iff ();.|
|00001a50| 58 76 6f 69 64 20 6f 75 | 74 70 75 74 5f 64 69 66 |Xvoid ou|tput_dif|
|00001a60| 66 33 20 28 29 3b 0a 58 | 69 6e 74 20 6f 75 74 70 |f3 ();.X|int outp|
|00001a70| 75 74 5f 64 69 66 66 33 | 5f 65 64 73 63 72 69 70 |ut_diff3|_edscrip|
|00001a80| 74 20 28 29 3b 0a 58 69 | 6e 74 20 6f 75 74 70 75 |t ();.Xi|nt outpu|
|00001a90| 74 5f 64 69 66 66 33 5f | 6d 65 72 67 65 20 28 29 |t_diff3_|merge ()|
|00001aa0| 3b 0a 58 76 6f 69 64 20 | 75 73 61 67 65 20 28 29 |;.Xvoid |usage ()|
|00001ab0| 3b 0a 58 0a 58 73 74 72 | 75 63 74 20 64 69 66 66 |;.X.Xstr|uct diff|
|00001ac0| 33 5f 62 6c 6f 63 6b 20 | 2a 75 73 69 6e 67 5f 74 |3_block |*using_t|
|00001ad0| 6f 5f 64 69 66 66 33 5f | 62 6c 6f 63 6b 20 28 29 |o_diff3_|block ()|
|00001ae0| 3b 0a 58 69 6e 74 20 63 | 6f 70 79 5f 73 74 72 69 |;.Xint c|opy_stri|
|00001af0| 6e 67 6c 69 73 74 20 28 | 29 3b 0a 58 73 74 72 75 |nglist (|);.Xstru|
|00001b00| 63 74 20 64 69 66 66 33 | 5f 62 6c 6f 63 6b 20 2a |ct diff3|_block *|
|00001b10| 63 72 65 61 74 65 5f 64 | 69 66 66 33 5f 62 6c 6f |create_d|iff3_blo|
|00001b20| 63 6b 20 28 29 3b 0a 58 | 69 6e 74 20 63 6f 6d 70 |ck ();.X|int comp|
|00001b30| 61 72 65 5f 6c 69 6e 65 | 5f 6c 69 73 74 20 28 29 |are_line|_list ()|
|00001b40| 3b 0a 58 0a 58 63 68 61 | 72 20 2a 72 65 61 64 5f |;.X.Xcha|r *read_|
|00001b50| 64 69 66 66 20 28 29 3b | 0a 58 65 6e 75 6d 20 64 |diff ();|.Xenum d|
|00001b60| 69 66 66 5f 74 79 70 65 | 20 70 72 6f 63 65 73 73 |iff_type| process|
|00001b70| 5f 64 69 66 66 5f 63 6f | 6e 74 72 6f 6c 20 28 29 |_diff_co|ntrol ()|
|00001b80| 3b 0a 58 63 68 61 72 20 | 2a 73 63 61 6e 5f 64 69 |;.Xchar |*scan_di|
|00001b90| 66 66 5f 6c 69 6e 65 20 | 28 29 3b 0a 58 0a 58 73 |ff_line |();.X.Xs|
|00001ba0| 74 72 75 63 74 20 64 69 | 66 66 33 5f 62 6c 6f 63 |truct di|ff3_bloc|
|00001bb0| 6b 20 2a 72 65 76 65 72 | 73 65 5f 64 69 66 66 33 |k *rever|se_diff3|
|00001bc0| 5f 62 6c 6f 63 6b 6c 69 | 73 74 20 28 29 3b 0a 58 |_blockli|st ();.X|
|00001bd0| 0a 58 56 4f 49 44 20 2a | 78 6d 61 6c 6c 6f 63 20 |.XVOID *|xmalloc |
|00001be0| 28 29 3b 0a 58 56 4f 49 | 44 20 2a 78 72 65 61 6c |();.XVOI|D *xreal|
|00001bf0| 6c 6f 63 20 28 29 3b 0a | 58 0a 58 63 68 61 72 20 |loc ();.|X.Xchar |
|00001c00| 64 69 66 66 5f 70 72 6f | 67 72 61 6d 5b 5d 20 3d |diff_pro|gram[] =|
|00001c10| 20 44 49 46 46 5f 50 52 | 4f 47 52 41 4d 3b 0a 58 | DIFF_PR|OGRAM;.X|
|00001c20| 0a 58 2f 2a 0a 58 20 2a | 20 4d 61 69 6e 20 70 72 |.X/*.X *| Main pr|
|00001c30| 6f 67 72 61 6d 2e 20 20 | 43 61 6c 6c 73 20 64 69 |ogram. |Calls di|
|00001c40| 66 66 20 74 77 69 63 65 | 20 6f 6e 20 74 77 6f 20 |ff twice| on two |
|00001c50| 70 61 69 72 73 20 6f 66 | 20 69 6e 70 75 74 20 66 |pairs of| input f|
|00001c60| 69 6c 65 73 2c 0a 58 20 | 2a 20 63 6f 6d 62 69 6e |iles,.X |* combin|
|00001c70| 65 73 20 74 68 65 20 74 | 77 6f 20 64 69 66 66 73 |es the t|wo diffs|
|00001c80| 2c 20 61 6e 64 20 6f 75 | 74 70 75 74 73 20 74 68 |, and ou|tputs th|
|00001c90| 65 6d 2e 0a 58 20 2a 2f | 0a 58 6d 61 69 6e 20 28 |em..X */|.Xmain (|
|00001ca0| 61 72 67 63 2c 20 61 72 | 67 76 29 0a 58 20 20 20 |argc, ar|gv).X |
|00001cb0| 20 20 69 6e 74 20 61 72 | 67 63 3b 0a 58 20 20 20 | int ar|gc;.X |
|00001cc0| 20 20 63 68 61 72 20 2a | 2a 61 72 67 76 3b 0a 58 | char *|*argv;.X|
|00001cd0| 7b 0a 58 20 20 69 6e 74 | 20 63 2c 20 69 3b 0a 58 |{.X int| c, i;.X|
|00001ce0| 20 20 69 6e 74 20 6d 61 | 70 70 69 6e 67 5b 33 5d | int ma|pping[3]|
|00001cf0| 3b 0a 58 20 20 69 6e 74 | 20 72 65 76 5f 6d 61 70 |;.X int| rev_map|
|00001d00| 70 69 6e 67 5b 33 5d 3b | 0a 58 20 20 69 6e 74 20 |ping[3];|.X int |
|00001d10| 69 6e 63 6f 6d 70 61 74 | 3b 0a 58 20 20 69 6e 74 |incompat|;.X int|
|00001d20| 20 6f 76 65 72 6c 61 70 | 73 5f 66 6f 75 6e 64 3b | overlap|s_found;|
|00001d30| 0a 58 20 20 73 74 72 75 | 63 74 20 64 69 66 66 5f |.X stru|ct diff_|
|00001d40| 62 6c 6f 63 6b 20 2a 74 | 68 72 65 61 64 31 2c 20 |block *t|hread1, |
|00001d50| 2a 74 68 72 65 61 64 32 | 3b 0a 58 20 20 73 74 72 |*thread2|;.X str|
|00001d60| 75 63 74 20 64 69 66 66 | 33 5f 62 6c 6f 63 6b 20 |uct diff|3_block |
|00001d70| 2a 64 69 66 66 3b 0a 58 | 20 20 69 6e 74 20 74 61 |*diff;.X| int ta|
|00001d80| 67 5f 63 6f 75 6e 74 20 | 3d 20 30 3b 0a 58 20 20 |g_count |= 0;.X |
|00001d90| 2f 2a 20 45 6c 65 6d 65 | 6e 74 20 30 20 69 73 20 |/* Eleme|nt 0 is |
|00001da0| 66 6f 72 20 66 69 6c 65 | 20 30 2c 20 65 6c 65 6d |for file| 0, elem|
|00001db0| 65 6e 74 20 31 20 69 73 | 20 66 6f 72 20 66 69 6c |ent 1 is| for fil|
|00001dc0| 65 20 32 2e 20 20 2a 2f | 0a 58 20 20 63 68 61 72 |e 2. */|.X char|
|00001dd0| 20 2a 74 61 67 5f 73 74 | 72 69 6e 67 73 5b 32 5d | *tag_st|rings[2]|
|00001de0| 3b 0a 58 20 20 65 78 74 | 65 72 6e 20 63 68 61 72 |;.X ext|ern char|
|00001df0| 20 2a 6f 70 74 61 72 67 | 3b 0a 58 20 20 63 68 61 | *optarg|;.X cha|
|00001e00| 72 20 2a 63 6f 6d 6d 6f | 6e 6e 61 6d 65 3b 0a 58 |r *commo|nname;.X|
|00001e10| 20 20 73 74 72 75 63 74 | 20 73 74 61 74 20 73 74 | struct| stat st|
|00001e20| 61 74 62 3b 0a 58 0a 58 | 20 20 69 6e 63 6f 6d 70 |atb;.X.X| incomp|
|00001e30| 61 74 20 3d 20 30 3b 0a | 58 20 20 74 61 67 5f 73 |at = 0;.|X tag_s|
|00001e40| 74 72 69 6e 67 73 5b 30 | 5d 20 3d 20 74 61 67 5f |trings[0|] = tag_|
|00001e50| 73 74 72 69 6e 67 73 5b | 31 5d 20 3d 20 30 3b 0a |strings[|1] = 0;.|
|00001e60| 58 0a 58 20 20 61 72 67 | 76 30 20 3d 20 61 72 67 |X.X arg|v0 = arg|
|00001e70| 76 5b 30 5d 3b 0a 58 20 | 20 0a 58 20 20 77 68 69 |v[0];.X | .X whi|
|00001e80| 6c 65 20 28 28 63 20 3d | 20 67 65 74 6f 70 74 20 |le ((c =| getopt |
|00001e90| 28 61 72 67 63 2c 20 61 | 72 67 76 2c 20 22 61 65 |(argc, a|rgv, "ae|
|00001ea0| 69 6d 78 33 45 58 4c 3a | 22 29 29 20 21 3d 20 45 |imx3EXL:|")) != E|
|00001eb0| 4f 46 29 0a 58 20 20 20 | 20 7b 0a 58 20 20 20 20 |OF).X | {.X |
|00001ec0| 20 20 73 77 69 74 63 68 | 20 28 63 29 0a 58 09 7b | switch| (c).X.{|
|00001ed0| 0a 58 09 63 61 73 65 20 | 27 61 27 3a 0a 58 09 20 |.X.case |'a':.X. |
|00001ee0| 20 61 6c 77 61 79 73 5f | 74 65 78 74 20 3d 20 31 | always_|text = 1|
|00001ef0| 3b 0a 58 09 20 20 62 72 | 65 61 6b 3b 0a 58 09 63 |;.X. br|eak;.X.c|
|00001f00| 61 73 65 20 27 78 27 3a | 0a 58 09 20 20 64 6f 6e |ase 'x':|.X. don|
|00001f10| 74 5f 77 72 69 74 65 5f | 73 69 6d 70 6c 65 20 3d |t_write_|simple =|
|00001f20| 20 31 3b 0a 58 09 20 20 | 69 6e 63 6f 6d 70 61 74 | 1;.X. |incompat|
|00001f30| 2b 2b 3b 0a 58 09 20 20 | 62 72 65 61 6b 3b 0a 58 |++;.X. |break;.X|
|00001f40| 09 63 61 73 65 20 27 33 | 27 3a 0a 58 09 20 20 64 |.case '3|':.X. d|
|00001f50| 6f 6e 74 5f 77 72 69 74 | 65 5f 6f 76 65 72 6c 61 |ont_writ|e_overla|
|00001f60| 70 20 3d 20 31 3b 0a 58 | 09 20 20 69 6e 63 6f 6d |p = 1;.X|. incom|
|00001f70| 70 61 74 2b 2b 3b 0a 58 | 09 20 20 62 72 65 61 6b |pat++;.X|. break|
|00001f80| 3b 0a 58 09 63 61 73 65 | 20 27 69 27 3a 0a 58 09 |;.X.case| 'i':.X.|
|00001f90| 20 20 66 69 6e 61 6c 77 | 72 69 74 65 20 3d 20 31 | finalw|rite = 1|
|00001fa0| 3b 0a 58 09 20 20 62 72 | 65 61 6b 3b 0a 58 09 63 |;.X. br|eak;.X.c|
|00001fb0| 61 73 65 20 27 6d 27 3a | 0a 58 09 20 20 6d 65 72 |ase 'm':|.X. mer|
|00001fc0| 67 65 20 3d 20 31 3b 0a | 58 09 20 20 62 72 65 61 |ge = 1;.|X. brea|
|00001fd0| 6b 3b 0a 58 09 63 61 73 | 65 20 27 58 27 3a 0a 58 |k;.X.cas|e 'X':.X|
|00001fe0| 09 20 20 64 6f 6e 74 5f | 77 72 69 74 65 5f 73 69 |. dont_|write_si|
|00001ff0| 6d 70 6c 65 20 3d 20 31 | 3b 0a 58 09 20 20 2f 2a |mple = 1|;.X. /*|
|00002000| 20 46 61 6c 6c 73 20 74 | 68 72 6f 75 67 68 20 2a | Falls t|hrough *|
|00002010| 2f 0a 58 09 63 61 73 65 | 20 27 45 27 3a 0a 58 09 |/.X.case| 'E':.X.|
|00002020| 20 20 66 6c 61 67 67 69 | 6e 67 20 3d 20 31 3b 0a | flaggi|ng = 1;.|
|00002030| 58 09 20 20 2f 2a 20 46 | 61 6c 6c 73 20 74 68 72 |X. /* F|alls thr|
|00002040| 6f 75 67 68 20 2a 2f 0a | 58 09 63 61 73 65 20 27 |ough */.|X.case '|
|00002050| 65 27 3a 0a 58 09 20 20 | 69 6e 63 6f 6d 70 61 74 |e':.X. |incompat|
|00002060| 2b 2b 3b 0a 58 09 20 20 | 62 72 65 61 6b 3b 0a 58 |++;.X. |break;.X|
|00002070| 09 63 61 73 65 20 27 4c | 27 3a 0a 58 09 20 20 2f |.case 'L|':.X. /|
|00002080| 2a 20 48 61 6e 64 6c 65 | 20 6f 6e 65 20 6f 72 20 |* Handle| one or |
|00002090| 74 77 6f 20 2d 4c 20 61 | 72 67 75 6d 65 6e 74 73 |two -L a|rguments|
|000020a0| 2e 20 20 2a 2f 0a 58 09 | 20 20 69 66 20 28 74 61 |. */.X.| if (ta|
|000020b0| 67 5f 63 6f 75 6e 74 20 | 3c 20 32 29 0a 58 09 20 |g_count |< 2).X. |
|000020c0| 20 20 20 7b 0a 58 09 20 | 20 20 20 20 20 74 61 67 | {.X. | tag|
|000020d0| 5f 73 74 72 69 6e 67 73 | 5b 74 61 67 5f 63 6f 75 |_strings|[tag_cou|
|000020e0| 6e 74 2b 2b 5d 20 3d 20 | 6f 70 74 61 72 67 3b 0a |nt++] = |optarg;.|
|000020f0| 58 09 20 20 20 20 20 20 | 62 72 65 61 6b 3b 0a 58 |X. |break;.X|
|00002100| 09 20 20 20 20 7d 0a 58 | 09 20 20 2f 2a 20 46 61 |. }.X|. /* Fa|
|00002110| 6c 6c 73 20 74 68 72 6f | 75 67 68 20 2a 2f 0a 58 |lls thro|ugh */.X|
|00002120| 09 63 61 73 65 20 27 3f | 27 3a 0a 58 09 64 65 66 |.case '?|':.X.def|
|00002130| 61 75 6c 74 3a 0a 58 09 | 20 20 75 73 61 67 65 20 |ault:.X.| usage |
|00002140| 28 29 3b 0a 58 09 20 20 | 2f 2a 20 4e 4f 54 52 45 |();.X. |/* NOTRE|
|00002150| 41 43 48 45 44 20 2a 2f | 0a 58 09 7d 0a 58 20 20 |ACHED */|.X.}.X |
|00002160| 20 20 7d 0a 58 0a 58 20 | 20 65 64 73 63 72 69 70 | }.X.X | edscrip|
|00002170| 74 20 3d 20 69 6e 63 6f | 6d 70 61 74 20 26 20 7e |t = inco|mpat & ~|
|00002180| 6d 65 72 67 65 3b 20 20 | 2f 2a 20 2d 65 45 78 58 |merge; |/* -eExX|
|00002190| 33 20 77 69 74 68 6f 75 | 74 20 2d 6d 20 69 6d 70 |3 withou|t -m imp|
|000021a0| 6c 69 65 73 20 65 64 20 | 73 63 72 69 70 74 2e 20 |lies ed |script. |
|000021b0| 20 2a 2f 0a 58 20 20 66 | 6c 61 67 67 69 6e 67 20 | */.X f|lagging |
|000021c0| 7c 3d 20 7e 69 6e 63 6f | 6d 70 61 74 20 26 20 6d ||= ~inco|mpat & m|
|000021d0| 65 72 67 65 3b 20 20 2f | 2a 20 2d 6d 20 77 69 74 |erge; /|* -m wit|
|000021e0| 68 6f 75 74 20 2d 65 45 | 78 58 33 20 69 6d 70 6c |hout -eE|xX3 impl|
|000021f0| 69 65 73 20 2d 45 2e 20 | 20 2a 2f 0a 58 0a 58 20 |ies -E. | */.X.X |
|00002200| 20 69 66 20 28 69 6e 63 | 6f 6d 70 61 74 20 3e 20 | if (inc|ompat > |
|00002210| 31 20 20 2f 2a 20 45 6e | 73 75 72 65 20 61 74 20 |1 /* En|sure at |
|00002220| 6d 6f 73 74 20 6f 6e 65 | 20 6f 66 20 2d 65 45 78 |most one| of -eEx|
|00002230| 58 33 2e 20 20 2a 2f 0a | 58 20 20 20 20 20 20 7c |X3. */.|X ||
|00002240| 7c 20 66 69 6e 61 6c 77 | 72 69 74 65 20 26 20 28 || finalw|rite & (|
|00002250| 7e 69 6e 63 6f 6d 70 61 | 74 20 7c 20 6d 65 72 67 |~incompa|t | merg|
|00002260| 65 29 0a 58 09 20 20 20 | 20 2f 2a 20 2d 69 20 6e |e).X. | /* -i n|
|00002270| 65 65 64 73 20 6f 6e 65 | 20 6f 66 20 2d 65 45 78 |eeds one| of -eEx|
|00002280| 58 33 3b 20 2d 69 20 2d | 6d 20 77 6f 75 6c 64 20 |X3; -i -|m would |
|00002290| 72 65 77 72 69 74 65 20 | 69 6e 70 75 74 20 66 69 |rewrite |input fi|
|000022a0| 6c 65 2e 20 20 2a 2f 0a | 58 20 20 20 20 20 20 7c |le. */.|X ||
|000022b0| 7c 20 74 61 67 5f 63 6f | 75 6e 74 20 26 26 20 21 || tag_co|unt && !|
|000022c0| 20 66 6c 61 67 67 69 6e | 67 20 2f 2a 20 2d 4c 20 | flaggin|g /* -L |
|000022d0| 72 65 71 75 69 72 65 73 | 20 6f 6e 65 20 6f 66 20 |requires| one of |
|000022e0| 2d 45 58 2e 20 20 2a 2f | 0a 58 20 20 20 20 20 20 |-EX. */|.X |
|000022f0| 7c 7c 20 61 72 67 63 20 | 2d 20 6f 70 74 69 6e 64 ||| argc |- optind|
|00002300| 20 21 3d 20 33 29 0a 58 | 20 20 20 20 75 73 61 67 | != 3).X| usag|
|00002310| 65 20 28 29 3b 0a 58 0a | 58 20 20 69 66 20 28 74 |e ();.X.|X if (t|
|00002320| 61 67 5f 73 74 72 69 6e | 67 73 5b 30 5d 20 3d 3d |ag_strin|gs[0] ==|
|00002330| 20 30 29 0a 58 20 20 20 | 20 74 61 67 5f 73 74 72 | 0).X | tag_str|
|00002340| 69 6e 67 73 5b 30 5d 20 | 3d 20 61 72 67 76 5b 6f |ings[0] |= argv[o|
|00002350| 70 74 69 6e 64 5d 3b 0a | 58 20 20 69 66 20 28 74 |ptind];.|X if (t|
|00002360| 61 67 5f 73 74 72 69 6e | 67 73 5b 31 5d 20 3d 3d |ag_strin|gs[1] ==|
|00002370| 20 30 29 0a 58 20 20 20 | 20 74 61 67 5f 73 74 72 | 0).X | tag_str|
|00002380| 69 6e 67 73 5b 31 5d 20 | 3d 20 61 72 67 76 5b 6f |ings[1] |= argv[o|
|00002390| 70 74 69 6e 64 20 2b 20 | 32 5d 3b 0a 58 0a 58 20 |ptind + |2];.X.X |
|000023a0| 20 69 66 20 28 2a 61 72 | 67 76 5b 6f 70 74 69 6e | if (*ar|gv[optin|
|000023b0| 64 5d 20 3d 3d 20 27 2d | 27 20 26 26 20 2a 28 61 |d] == '-|' && *(a|
|000023c0| 72 67 76 5b 6f 70 74 69 | 6e 64 5d 20 2b 20 31 29 |rgv[opti|nd] + 1)|
|000023d0| 20 3d 3d 20 27 5c 30 27 | 29 0a 58 20 20 20 20 7b | == '\0'|).X {|
|000023e0| 0a 58 20 20 20 20 20 20 | 2f 2a 20 53 69 67 68 2e |.X |/* Sigh.|
|000023f0| 20 20 57 65 27 76 65 20 | 67 6f 74 20 73 74 61 6e | We've |got stan|
|00002400| 64 61 72 64 20 69 6e 70 | 75 74 20 61 73 20 74 68 |dard inp|ut as th|
|00002410| 65 20 66 69 72 73 74 20 | 61 72 67 2e 20 57 65 20 |e first |arg. We |
|00002420| 63 61 6e 27 74 20 2a 2f | 0a 58 20 20 20 20 20 20 |can't */|.X |
|00002430| 2f 2a 20 63 61 6c 6c 20 | 64 69 66 66 20 74 77 69 |/* call |diff twi|
|00002440| 63 65 20 6f 6e 20 73 74 | 64 69 6e 20 2a 2f 0a 58 |ce on st|din */.X|
|00002450| 20 20 20 20 20 20 69 66 | 20 28 21 20 73 74 72 63 | if| (! strc|
|00002460| 6d 70 20 28 61 72 67 76 | 5b 6f 70 74 69 6e 64 20 |mp (argv|[optind |
|00002470| 2b 20 31 5d 2c 20 22 2d | 22 29 20 7c 7c 20 21 20 |+ 1], "-|") || ! |
|00002480| 73 74 72 63 6d 70 20 28 | 61 72 67 76 5b 6f 70 74 |strcmp (|argv[opt|
|00002490| 69 6e 64 20 2b 20 32 5d | 2c 20 22 2d 22 29 29 0a |ind + 2]|, "-")).|
|000024a0| 58 09 66 61 74 61 6c 20 | 28 22 60 2d 27 20 73 70 |X.fatal |("`-' sp|
|000024b0| 65 63 69 66 69 65 64 20 | 66 6f 72 20 6d 6f 72 65 |ecified |for more|
|000024c0| 20 74 68 61 6e 20 6f 6e | 65 20 69 6e 70 75 74 20 | than on|e input |
|000024d0| 66 69 6c 65 22 29 3b 0a | 58 20 20 20 20 20 20 6d |file");.|X m|
|000024e0| 61 70 70 69 6e 67 5b 30 | 5d 20 3d 20 31 3b 0a 58 |apping[0|] = 1;.X|
|000024f0| 20 20 20 20 20 20 6d 61 | 70 70 69 6e 67 5b 31 5d | ma|pping[1]|
|00002500| 20 3d 20 32 3b 0a 58 20 | 20 20 20 20 20 6d 61 70 | = 2;.X | map|
|00002510| 70 69 6e 67 5b 32 5d 20 | 3d 20 30 3b 0a 58 20 20 |ping[2] |= 0;.X |
|00002520| 20 20 20 20 72 65 76 5f | 6d 61 70 70 69 6e 67 5b | rev_|mapping[|
|00002530| 31 5d 20 3d 20 30 3b 0a | 58 20 20 20 20 20 20 72 |1] = 0;.|X r|
|00002540| 65 76 5f 6d 61 70 70 69 | 6e 67 5b 32 5d 20 3d 20 |ev_mappi|ng[2] = |
|00002550| 31 3b 0a 58 20 20 20 20 | 20 20 72 65 76 5f 6d 61 |1;.X | rev_ma|
|00002560| 70 70 69 6e 67 5b 30 5d | 20 3d 20 32 3b 0a 58 20 |pping[0]| = 2;.X |
|00002570| 20 20 20 7d 0a 58 20 20 | 65 6c 73 65 0a 58 20 20 | }.X |else.X |
|00002580| 20 20 7b 0a 58 20 20 20 | 20 20 20 2f 2a 20 4e 6f | {.X | /* No|
|00002590| 72 6d 61 6c 2c 20 77 68 | 61 74 20 79 6f 75 27 64 |rmal, wh|at you'd|
|000025a0| 20 65 78 70 65 63 74 20 | 2a 2f 0a 58 20 20 20 20 | expect |*/.X |
|000025b0| 20 20 6d 61 70 70 69 6e | 67 5b 30 5d 20 3d 20 30 | mappin|g[0] = 0|
|000025c0| 3b 0a 58 20 20 20 20 20 | 20 6d 61 70 70 69 6e 67 |;.X | mapping|
|000025d0| 5b 31 5d 20 3d 20 31 3b | 0a 58 20 20 20 20 20 20 |[1] = 1;|.X |
|000025e0| 6d 61 70 70 69 6e 67 5b | 32 5d 20 3d 20 32 3b 0a |mapping[|2] = 2;.|
|000025f0| 58 20 20 20 20 20 20 72 | 65 76 5f 6d 61 70 70 69 |X r|ev_mappi|
|00002600| 6e 67 5b 30 5d 20 3d 20 | 30 3b 0a 58 20 20 20 20 |ng[0] = |0;.X |
|00002610| 20 20 72 65 76 5f 6d 61 | 70 70 69 6e 67 5b 31 5d | rev_ma|pping[1]|
|00002620| 20 3d 20 31 3b 0a 58 20 | 20 20 20 20 20 72 65 76 | = 1;.X | rev|
|00002630| 5f 6d 61 70 70 69 6e 67 | 5b 32 5d 20 3d 20 32 3b |_mapping|[2] = 2;|
|00002640| 0a 58 20 20 20 20 7d 0a | 58 0a 58 20 20 66 6f 72 |.X }.|X.X for|
|00002650| 20 28 69 20 3d 20 30 3b | 20 69 20 3c 20 33 3b 20 | (i = 0;| i < 3; |
|00002660| 69 2b 2b 29 0a 58 20 20 | 20 20 69 66 20 28 61 72 |i++).X | if (ar|
|00002670| 67 76 5b 6f 70 74 69 6e | 64 20 2b 20 69 5d 5b 30 |gv[optin|d + i][0|
|00002680| 5d 20 21 3d 20 27 2d 27 | 20 7c 7c 20 61 72 67 76 |] != '-'| || argv|
|00002690| 5b 6f 70 74 69 6e 64 20 | 2b 20 69 5d 5b 31 5d 20 |[optind |+ i][1] |
|000026a0| 21 3d 20 27 5c 30 27 29 | 0a 58 20 20 20 20 20 20 |!= '\0')|.X |
|000026b0| 69 66 20 28 73 74 61 74 | 20 28 61 72 67 76 5b 6f |if (stat| (argv[o|
|000026c0| 70 74 69 6e 64 20 2b 20 | 69 5d 2c 20 26 73 74 61 |ptind + |i], &sta|
|000026d0| 74 62 29 20 3c 20 30 29 | 0a 58 09 70 65 72 72 6f |tb) < 0)|.X.perro|
|000026e0| 72 5f 77 69 74 68 5f 65 | 78 69 74 20 28 61 72 67 |r_with_e|xit (arg|
|000026f0| 76 5b 6f 70 74 69 6e 64 | 20 2b 20 69 5d 29 3b 0a |v[optind| + i]);.|
|00002700| 58 20 20 20 20 20 20 65 | 6c 73 65 20 69 66 20 28 |X e|lse if (|
|00002710| 28 73 74 61 74 62 2e 73 | 74 5f 6d 6f 64 65 20 26 |(statb.s|t_mode &|
|00002720| 20 53 5f 49 46 4d 54 29 | 20 3d 3d 20 53 5f 49 46 | S_IFMT)| == S_IF|
|00002730| 44 49 52 29 0a 58 09 7b | 0a 58 09 20 20 66 70 72 |DIR).X.{|.X. fpr|
|00002740| 69 6e 74 66 20 28 73 74 | 64 65 72 72 2c 20 22 25 |intf (st|derr, "%|
|00002750| 73 3a 20 25 73 3a 20 49 | 73 20 61 20 64 69 72 65 |s: %s: I|s a dire|
|00002760| 63 74 6f 72 79 5c 6e 22 | 2c 20 61 72 67 76 30 2c |ctory\n"|, argv0,|
|00002770| 0a 58 09 09 20 20 20 61 | 72 67 76 5b 6f 70 74 69 |.X.. a|rgv[opti|
|00002780| 6e 64 20 2b 20 69 5d 29 | 3b 0a 58 09 20 20 65 78 |nd + i])|;.X. ex|
|00002790| 69 74 20 28 32 29 3b 0a | 58 09 7d 0a 58 20 20 0a |it (2);.|X.}.X .|
|000027a0| 58 0a 58 20 20 63 6f 6d | 6d 6f 6e 6e 61 6d 65 20 |X.X com|monname |
|000027b0| 3d 20 61 72 67 76 5b 6f | 70 74 69 6e 64 20 2b 20 |= argv[o|ptind + |
|000027c0| 72 65 76 5f 6d 61 70 70 | 69 6e 67 5b 30 5d 5d 3b |rev_mapp|ing[0]];|
|000027d0| 0a 58 20 20 74 68 72 65 | 61 64 31 20 3d 20 70 72 |.X thre|ad1 = pr|
|000027e0| 6f 63 65 73 73 5f 64 69 | 66 66 20 28 63 6f 6d 6d |ocess_di|ff (comm|
|000027f0| 6f 6e 6e 61 6d 65 2c 20 | 61 72 67 76 5b 6f 70 74 |onname, |argv[opt|
|00002800| 69 6e 64 20 2b 20 72 65 | 76 5f 6d 61 70 70 69 6e |ind + re|v_mappin|
|00002810| 67 5b 31 5d 5d 29 3b 0a | 58 20 20 74 68 72 65 61 |g[1]]);.|X threa|
|00002820| 64 32 20 3d 20 70 72 6f | 63 65 73 73 5f 64 69 66 |d2 = pro|cess_dif|
|00002830| 66 20 28 63 6f 6d 6d 6f | 6e 6e 61 6d 65 2c 20 61 |f (commo|nname, a|
|00002840| 72 67 76 5b 6f 70 74 69 | 6e 64 20 2b 20 72 65 76 |rgv[opti|nd + rev|
|00002850| 5f 6d 61 70 70 69 6e 67 | 5b 32 5d 5d 29 3b 0a 58 |_mapping|[2]]);.X|
|00002860| 20 20 64 69 66 66 20 3d | 20 6d 61 6b 65 5f 33 77 | diff =| make_3w|
|00002870| 61 79 5f 64 69 66 66 20 | 28 74 68 72 65 61 64 31 |ay_diff |(thread1|
|00002880| 2c 20 74 68 72 65 61 64 | 32 29 3b 0a 58 20 20 69 |, thread|2);.X i|
|00002890| 66 20 28 65 64 73 63 72 | 69 70 74 29 0a 58 20 20 |f (edscr|ipt).X |
|000028a0| 20 20 6f 76 65 72 6c 61 | 70 73 5f 66 6f 75 6e 64 | overla|ps_found|
|000028b0| 0a 58 20 20 20 20 20 20 | 3d 20 6f 75 74 70 75 74 |.X |= output|
|000028c0| 5f 64 69 66 66 33 5f 65 | 64 73 63 72 69 70 74 20 |_diff3_e|dscript |
|000028d0| 28 73 74 64 6f 75 74 2c | 20 64 69 66 66 2c 20 6d |(stdout,| diff, m|
|000028e0| 61 70 70 69 6e 67 2c 20 | 72 65 76 5f 6d 61 70 70 |apping, |rev_mapp|
|000028f0| 69 6e 67 2c 0a 58 09 09 | 09 20 20 20 20 20 20 20 |ing,.X..|. |
|00002900| 74 61 67 5f 73 74 72 69 | 6e 67 73 5b 30 5d 2c 20 |tag_stri|ngs[0], |
|00002910| 61 72 67 76 5b 6f 70 74 | 69 6e 64 2b 31 5d 2c 20 |argv[opt|ind+1], |
|00002920| 74 61 67 5f 73 74 72 69 | 6e 67 73 5b 31 5d 29 3b |tag_stri|ngs[1]);|
|00002930| 0a 58 20 20 65 6c 73 65 | 20 69 66 20 28 6d 65 72 |.X else| if (mer|
|00002940| 67 65 29 0a 58 20 20 20 | 20 7b 0a 58 20 20 20 20 |ge).X | {.X |
|00002950| 20 20 69 66 20 28 21 20 | 66 72 65 6f 70 65 6e 20 | if (! |freopen |
|00002960| 28 63 6f 6d 6d 6f 6e 6e | 61 6d 65 2c 20 22 72 22 |(commonn|ame, "r"|
|00002970| 2c 20 73 74 64 69 6e 29 | 29 0a 58 09 70 65 72 72 |, stdin)|).X.perr|
|00002980| 6f 72 5f 77 69 74 68 5f | 65 78 69 74 20 28 63 6f |or_with_|exit (co|
|00002990| 6d 6d 6f 6e 6e 61 6d 65 | 29 3b 0a 58 20 20 20 20 |mmonname|);.X |
|000029a0| 20 20 6f 76 65 72 6c 61 | 70 73 5f 66 6f 75 6e 64 | overla|ps_found|
|000029b0| 0a 58 09 3d 20 6f 75 74 | 70 75 74 5f 64 69 66 66 |.X.= out|put_diff|
|000029c0| 33 5f 6d 65 72 67 65 20 | 28 73 74 64 69 6e 2c 20 |3_merge |(stdin, |
|000029d0| 73 74 64 6f 75 74 2c 20 | 64 69 66 66 2c 20 6d 61 |stdout, |diff, ma|
|000029e0| 70 70 69 6e 67 2c 20 72 | 65 76 5f 6d 61 70 70 69 |pping, r|ev_mappi|
|000029f0| 6e 67 2c 0a 58 09 09 09 | 20 20 20 20 20 20 74 61 |ng,.X...| ta|
|00002a00| 67 5f 73 74 72 69 6e 67 | 73 5b 30 5d 2c 20 61 72 |g_string|s[0], ar|
|00002a10| 67 76 5b 6f 70 74 69 6e | 64 2b 31 5d 2c 20 74 61 |gv[optin|d+1], ta|
|00002a20| 67 5f 73 74 72 69 6e 67 | 73 5b 31 5d 29 3b 0a 58 |g_string|s[1]);.X|
|00002a30| 20 20 20 20 20 20 69 66 | 20 28 66 65 72 72 6f 72 | if| (ferror|
|00002a40| 20 28 73 74 64 69 6e 29 | 29 0a 58 09 66 61 74 61 | (stdin)|).X.fata|
|00002a50| 6c 20 28 22 72 65 61 64 | 20 65 72 72 6f 72 22 29 |l ("read| error")|
|00002a60| 3b 0a 58 20 20 20 20 7d | 0a 58 20 20 65 6c 73 65 |;.X }|.X else|
|00002a70| 0a 58 20 20 20 20 7b 0a | 58 20 20 20 20 20 20 6f |.X {.|X o|
|00002a80| 75 74 70 75 74 5f 64 69 | 66 66 33 20 28 73 74 64 |utput_di|ff3 (std|
|00002a90| 6f 75 74 2c 20 64 69 66 | 66 2c 20 6d 61 70 70 69 |out, dif|f, mappi|
|00002aa0| 6e 67 2c 20 72 65 76 5f | 6d 61 70 70 69 6e 67 29 |ng, rev_|mapping)|
|00002ab0| 3b 0a 58 20 20 20 20 20 | 20 6f 76 65 72 6c 61 70 |;.X | overlap|
|00002ac0| 73 5f 66 6f 75 6e 64 20 | 3d 20 30 3b 0a 58 20 20 |s_found |= 0;.X |
|00002ad0| 20 20 7d 0a 58 0a 58 20 | 20 69 66 20 28 66 65 72 | }.X.X | if (fer|
|00002ae0| 72 6f 72 20 28 73 74 64 | 6f 75 74 29 20 7c 7c 20 |ror (std|out) || |
|00002af0| 66 66 6c 75 73 68 20 28 | 73 74 64 6f 75 74 29 20 |fflush (|stdout) |
|00002b00| 21 3d 20 30 29 0a 58 20 | 20 20 20 66 61 74 61 6c |!= 0).X | fatal|
|00002b10| 20 28 22 77 72 69 74 65 | 20 65 72 72 6f 72 22 29 | ("write| error")|
|00002b20| 3b 0a 58 20 20 65 78 69 | 74 20 28 6f 76 65 72 6c |;.X exi|t (overl|
|00002b30| 61 70 73 5f 66 6f 75 6e | 64 29 3b 0a 58 7d 0a 58 |aps_foun|d);.X}.X|
|00002b40| 20 20 20 20 20 20 0a 58 | 2f 2a 0a 58 20 2a 20 45 | .X|/*.X * E|
|00002b50| 78 70 6c 61 69 6e 2c 20 | 70 61 74 69 65 6e 74 6c |xplain, |patientl|
|00002b60| 79 20 61 6e 64 20 6b 69 | 6e 64 6c 79 2c 20 68 6f |y and ki|ndly, ho|
|00002b70| 77 20 74 6f 20 75 73 65 | 20 74 68 69 73 20 70 72 |w to use| this pr|
|00002b80| 6f 67 72 61 6d 2e 20 20 | 54 68 65 6e 20 65 78 69 |ogram. |Then exi|
|00002b90| 74 2e 0a 58 20 2a 2f 0a | 58 76 6f 69 64 0a 58 75 |t..X */.|Xvoid.Xu|
|00002ba0| 73 61 67 65 20 28 29 0a | 58 7b 0a 58 20 20 66 70 |sage ().|X{.X fp|
|00002bb0| 72 69 6e 74 66 20 28 73 | 74 64 65 72 72 2c 20 22 |rintf (s|tderr, "|
|00002bc0| 55 73 61 67 65 3a 5c 74 | 25 73 20 5b 2d 65 78 45 |Usage:\t|%s [-exE|
|00002bd0| 58 33 20 5b 2d 69 20 7c | 20 2d 6d 5d 20 5b 2d 4c |X3 [-i || -m] [-L|
|00002be0| 20 6c 61 62 65 6c 31 20 | 2d 4c 20 6c 61 62 65 6c | label1 |-L label|
|00002bf0| 33 5d 5d 20 66 69 6c 65 | 31 20 66 69 6c 65 32 20 |3]] file|1 file2 |
|00002c00| 66 69 6c 65 33 5c 6e 22 | 2c 0a 58 09 20 20 20 61 |file3\n"|,.X. a|
|00002c10| 72 67 76 30 29 3b 0a 58 | 20 20 66 70 72 69 6e 74 |rgv0);.X| fprint|
|00002c20| 66 20 28 73 74 64 65 72 | 72 2c 20 22 5c 74 4f 6e |f (stder|r, "\tOn|
|00002c30| 6c 79 20 6f 6e 65 20 6f | 66 20 5b 65 78 45 58 33 |ly one o|f [exEX3|
|00002c40| 5d 20 61 6c 6c 6f 77 65 | 64 5c 6e 22 29 3b 0a 58 |] allowe|d\n");.X|
|00002c50| 20 20 65 78 69 74 20 28 | 32 29 3b 0a 58 7d 0a 58 | exit (|2);.X}.X|
|00002c60| 0c 0a 58 2f 2a 0a 58 20 | 2a 20 52 6f 75 74 69 6e |..X/*.X |* Routin|
|00002c70| 65 73 20 74 68 61 74 20 | 63 6f 6d 62 69 6e 65 20 |es that |combine |
|00002c80| 74 68 65 20 74 77 6f 20 | 64 69 66 66 73 20 74 6f |the two |diffs to|
|00002c90| 67 65 74 68 65 72 20 69 | 6e 74 6f 20 6f 6e 65 2e |gether i|nto one.|
|00002ca0| 20 20 54 68 65 0a 58 20 | 2a 20 61 6c 67 6f 72 69 | The.X |* algori|
|00002cb0| 74 68 6d 20 75 73 65 64 | 20 66 6f 6c 6c 6f 77 73 |thm used| follows|
|00002cc0| 3a 0a 58 20 2a 0a 58 20 | 2a 20 20 20 46 69 6c 65 |:.X *.X |* File|
|00002cd0| 30 20 69 73 20 73 68 61 | 72 65 64 20 69 6e 20 63 |0 is sha|red in c|
|00002ce0| 6f 6d 6d 6f 6e 20 62 65 | 74 77 65 65 6e 20 74 68 |ommon be|tween th|
|00002cf0| 65 20 74 77 6f 20 64 69 | 66 66 73 2e 0a 58 20 2a |e two di|ffs..X *|
|00002d00| 20 20 20 44 69 66 66 30 | 31 20 69 73 20 74 68 65 | Diff0|1 is the|
|00002d10| 20 64 69 66 66 20 62 65 | 74 77 65 65 6e 20 30 20 | diff be|tween 0 |
|00002d20| 61 6e 64 20 31 2e 0a 58 | 20 2a 20 20 20 44 69 66 |and 1..X| * Dif|
|00002d30| 66 30 32 20 69 73 20 74 | 68 65 20 64 69 66 66 20 |f02 is t|he diff |
|00002d40| 62 65 74 77 65 65 6e 20 | 30 20 61 6e 64 20 32 2e |between |0 and 2.|
|00002d50| 0a 58 20 2a 0a 58 20 2a | 20 09 31 29 20 46 69 6e |.X *.X *| .1) Fin|
|00002d60| 64 20 74 68 65 20 72 61 | 6e 67 65 20 66 6f 72 20 |d the ra|nge for |
|00002d70| 74 68 65 20 66 69 72 73 | 74 20 62 6c 6f 63 6b 20 |the firs|t block |
|00002d80| 69 6e 20 46 69 6c 65 30 | 2e 0a 58 20 2a 20 20 09 |in File0|..X * .|
|00002d90| 20 20 20 20 61 29 20 54 | 61 6b 65 20 74 68 65 20 | a) T|ake the |
|00002da0| 6c 6f 77 65 73 74 20 6f | 66 20 74 68 65 20 74 77 |lowest o|f the tw|
|00002db0| 6f 20 72 61 6e 67 65 73 | 20 28 69 6e 20 46 69 6c |o ranges| (in Fil|
|00002dc0| 65 30 29 20 69 6e 20 74 | 68 65 20 74 77 6f 0a 58 |e0) in t|he two.X|
|00002dd0| 20 2a 20 20 09 20 20 20 | 20 20 20 20 63 75 72 72 | * . | curr|
|00002de0| 65 6e 74 20 62 6c 6f 63 | 6b 73 20 28 6f 6e 65 20 |ent bloc|ks (one |
|00002df0| 66 72 6f 6d 20 65 61 63 | 68 20 64 69 66 66 29 20 |from eac|h diff) |
|00002e00| 61 73 20 62 65 69 6e 67 | 20 74 68 65 20 6c 6f 77 |as being| the low|
|00002e10| 0a 58 20 2a 20 20 09 20 | 20 20 20 20 20 20 77 61 |.X * . | wa|
|00002e20| 74 65 72 20 6d 61 72 6b | 2e 20 20 41 73 73 69 67 |ter mark|. Assig|
|00002e30| 6e 20 74 68 65 20 75 70 | 70 65 72 20 65 6e 64 20 |n the up|per end |
|00002e40| 6f 66 20 74 68 69 73 20 | 62 6c 6f 63 6b 20 61 73 |of this |block as|
|00002e50| 0a 58 20 2a 20 20 09 20 | 20 20 20 20 20 20 62 65 |.X * . | be|
|00002e60| 69 6e 67 20 74 68 65 20 | 68 69 67 68 20 77 61 74 |ing the |high wat|
|00002e70| 65 72 20 6d 61 72 6b 20 | 61 6e 64 20 6d 6f 76 65 |er mark |and move|
|00002e80| 20 74 68 65 20 63 75 72 | 72 65 6e 74 20 62 6c 6f | the cur|rent blo|
|00002e90| 63 6b 20 75 70 0a 58 20 | 2a 20 20 09 20 20 20 20 |ck up.X |* . |
|00002ea0| 20 20 20 6f 6e 65 2e 20 | 20 4d 61 72 6b 20 74 68 | one. | Mark th|
|00002eb0| 65 20 62 6c 6f 63 6b 20 | 6a 75 73 74 20 6d 6f 76 |e block |just mov|
|00002ec0| 65 64 20 6f 76 65 72 20 | 61 73 20 74 6f 20 62 65 |ed over |as to be|
|00002ed0| 20 75 73 65 64 2e 0a 58 | 20 2a 09 20 20 20 20 62 | used..X| *. b|
|00002ee0| 29 20 43 68 65 63 6b 20 | 74 68 65 20 6e 65 78 74 |) Check |the next|
|00002ef0| 20 62 6c 6f 63 6b 20 69 | 6e 20 74 68 65 20 64 69 | block i|n the di|
|00002f00| 66 66 20 74 68 61 74 20 | 74 68 65 20 68 69 67 68 |ff that |the high|
|00002f10| 20 77 61 74 65 72 0a 58 | 20 2a 20 20 09 20 20 20 | water.X| * . |
|00002f20| 20 20 20 20 6d 61 72 6b | 20 69 73 20 2a 6e 6f 74 | mark| is *not|
|00002f30| 2a 20 66 72 6f 6d 2e 20 | 20 0a 58 20 2a 09 20 20 |* from. | .X *. |
|00002f40| 20 20 20 20 20 0a 58 20 | 2a 09 20 20 20 20 20 20 | .X |*. |
|00002f50| 20 2a 49 66 2a 20 74 68 | 65 20 68 69 67 68 20 77 | *If* th|e high w|
|00002f60| 61 74 65 72 20 6d 61 72 | 6b 20 69 73 20 61 62 6f |ater mar|k is abo|
|00002f70| 76 65 0a 58 20 2a 20 20 | 09 20 20 20 20 20 20 20 |ve.X * |. |
|00002f80| 74 68 65 20 6c 6f 77 20 | 65 6e 64 20 6f 66 20 74 |the low |end of t|
|00002f90| 68 65 20 72 61 6e 67 65 | 20 69 6e 20 74 68 61 74 |he range| in that|
|00002fa0| 20 62 6c 6f 63 6b 2c 20 | 0a 58 20 2a 20 0a 58 20 | block, |.X * .X |
|00002fb0| 2a 09 20 20 20 20 20 20 | 20 20 20 20 20 6d 61 72 |*. | mar|
|00002fc0| 6b 20 74 68 61 74 20 62 | 6c 6f 63 6b 20 61 73 20 |k that b|lock as |
|00002fd0| 74 6f 20 62 65 20 75 73 | 65 64 20 61 6e 64 20 6d |to be us|ed and m|
|00002fe0| 6f 76 65 20 74 68 65 20 | 63 75 72 72 65 6e 74 0a |ove the |current.|
|00002ff0| 58 20 2a 20 20 09 20 20 | 20 20 20 20 20 20 20 20 |X * . | |
|00003000| 20 62 6c 6f 63 6b 20 75 | 70 2e 20 20 53 65 74 20 | block u|p. Set |
|00003010| 74 68 65 20 68 69 67 68 | 20 77 61 74 65 72 20 6d |the high| water m|
|00003020| 61 72 6b 20 74 6f 20 74 | 68 65 20 6d 61 78 20 6f |ark to t|he max o|
|00003030| 66 0a 58 20 2a 20 20 09 | 20 20 20 20 20 20 20 20 |f.X * .| |
|00003040| 20 20 20 74 68 65 20 68 | 69 67 68 20 65 6e 64 20 | the h|igh end |
|00003050| 6f 66 20 74 68 69 73 20 | 62 6c 6f 63 6b 20 61 6e |of this |block an|
|00003060| 64 20 74 68 65 20 63 75 | 72 72 65 6e 74 2e 20 20 |d the cu|rrent. |
|00003070| 52 65 70 65 61 74 20 62 | 2e 0a 58 20 2a 20 0a 58 |Repeat b|..X * .X|
|00003080| 20 2a 20 20 09 20 32 29 | 20 46 69 6e 64 20 74 68 | * . 2)| Find th|
|00003090| 65 20 63 6f 72 72 65 73 | 70 6f 6e 64 69 6e 67 20 |e corres|ponding |
|000030a0| 72 61 6e 67 65 73 20 69 | 6e 20 46 69 6c 65 73 31 |ranges i|n Files1|
|000030b0| 20 28 66 72 6f 6d 20 74 | 68 65 20 62 6c 6f 63 6b | (from t|he block|
|000030c0| 73 0a 58 20 2a 20 20 09 | 20 20 20 20 69 6e 20 64 |s.X * .| in d|
|000030d0| 69 66 66 30 31 3b 20 6c | 69 6e 65 20 70 65 72 20 |iff01; l|ine per |
|000030e0| 6c 69 6e 65 20 6f 75 74 | 73 69 64 65 20 6f 66 20 |line out|side of |
|000030f0| 64 69 66 66 73 29 20 61 | 6e 64 20 69 6e 20 46 69 |diffs) a|nd in Fi|
|00003100| 6c 65 32 2e 0a 58 20 2a | 20 20 09 20 20 20 20 43 |le2..X *| . C|
|00003110| 72 65 61 74 65 20 61 20 | 64 69 66 66 33 5f 62 6c |reate a |diff3_bl|
|00003120| 6f 63 6b 2c 20 72 65 73 | 65 72 76 69 6e 67 20 73 |ock, res|erving s|
|00003130| 70 61 63 65 20 61 73 20 | 69 6e 64 69 63 61 74 65 |pace as |indicate|
|00003140| 64 20 62 79 20 74 68 65 | 20 72 61 6e 67 65 73 2e |d by the| ranges.|
|00003150| 0a 58 20 2a 09 20 20 20 | 20 0a 58 20 2a 09 20 33 |.X *. | .X *. 3|
|00003160| 29 20 43 6f 70 79 20 61 | 6c 6c 20 6f 66 20 74 68 |) Copy a|ll of th|
|00003170| 65 20 70 6f 69 6e 74 65 | 72 73 20 66 6f 72 20 66 |e pointe|rs for f|
|00003180| 69 6c 65 30 20 69 6e 2e | 20 20 41 74 20 6c 65 61 |ile0 in.| At lea|
|00003190| 73 74 20 66 6f 72 20 6e | 6f 77 2c 0a 58 20 2a 20 |st for n|ow,.X * |
|000031a0| 20 09 20 20 20 20 64 6f | 20 62 63 6d 70 27 73 20 | . do| bcmp's |
|000031b0| 62 65 74 77 65 65 6e 20 | 63 6f 72 72 65 73 70 6f |between |correspo|
|000031c0| 6e 64 69 6e 67 20 73 74 | 72 69 6e 67 73 20 69 6e |nding st|rings in|
|000031d0| 20 74 68 65 20 74 77 6f | 20 64 69 66 66 73 2e 0a | the two| diffs..|
|000031e0| 58 20 2a 09 20 20 20 20 | 0a 58 20 2a 09 20 34 29 |X *. |.X *. 4)|
|000031f0| 20 43 6f 70 79 20 61 6c | 6c 20 6f 66 20 74 68 65 | Copy al|l of the|
|00003200| 20 70 6f 69 6e 74 65 72 | 73 20 66 6f 72 20 66 69 | pointer|s for fi|
|00003210| 6c 65 31 20 61 6e 64 20 | 32 20 69 6e 2e 20 20 47 |le1 and |2 in. G|
|00003220| 65 74 20 77 68 61 74 20 | 79 6f 75 0a 58 20 2a 20 |et what |you.X * |
|00003230| 20 09 20 20 20 20 6e 65 | 65 64 20 66 72 6f 6d 20 | . ne|ed from |
|00003240| 66 69 6c 65 30 20 28 77 | 68 65 6e 20 74 68 65 72 |file0 (w|hen ther|
|00003250| 65 20 69 73 6e 27 74 20 | 61 20 64 69 66 66 20 62 |e isn't |a diff b|
|00003260| 6c 6f 63 6b 2c 20 69 74 | 27 73 0a 58 20 2a 20 20 |lock, it|'s.X * |
|00003270| 09 20 20 20 20 69 64 65 | 6e 74 69 63 61 6c 20 74 |. ide|ntical t|
|00003280| 6f 20 66 69 6c 65 30 20 | 77 69 74 68 69 6e 20 74 |o file0 |within t|
|00003290| 68 65 20 72 61 6e 67 65 | 20 62 65 74 77 65 65 6e |he range| between|
|000032a0| 20 64 69 66 66 20 62 6c | 6f 63 6b 73 29 2e 0a 58 | diff bl|ocks)..X|
|000032b0| 20 2a 09 20 20 20 20 0a | 58 20 2a 09 20 35 29 20 | *. .|X *. 5) |
|000032c0| 49 66 20 74 68 65 20 64 | 69 66 66 20 62 6c 6f 63 |If the d|iff bloc|
|000032d0| 6b 73 20 79 6f 75 20 75 | 73 65 64 20 63 61 6d 65 |ks you u|sed came|
|000032e0| 20 66 72 6f 6d 20 6f 6e | 6c 79 20 6f 6e 65 20 6f | from on|ly one o|
|000032f0| 66 20 74 68 65 20 74 77 | 6f 0a 58 20 2a 20 09 20 |f the tw|o.X * . |
|00003300| 20 20 20 73 74 72 69 6e | 67 73 20 6f 66 20 64 69 | strin|gs of di|
|00003310| 66 66 73 2c 20 74 68 65 | 6e 20 74 68 61 74 20 66 |ffs, the|n that f|
|00003320| 69 6c 65 20 28 69 2e 65 | 2e 20 74 68 65 20 6f 6e |ile (i.e|. the on|
|00003330| 65 20 6f 74 68 65 72 20 | 74 68 61 6e 0a 58 20 2a |e other |than.X *|
|00003340| 20 09 20 20 20 20 66 69 | 6c 65 20 30 20 69 6e 20 | . fi|le 0 in |
|00003350| 74 68 61 74 20 64 69 66 | 66 29 20 69 73 20 74 68 |that dif|f) is th|
|00003360| 65 20 6f 64 64 20 70 65 | 72 73 6f 6e 20 6f 75 74 |e odd pe|rson out|
|00003370| 2e 20 20 49 66 20 79 6f | 75 20 75 73 65 64 0a 58 |. If yo|u used.X|
|00003380| 20 2a 20 09 20 20 20 20 | 64 69 66 66 20 62 6c 6f | * . |diff blo|
|00003390| 63 6b 73 20 66 72 6f 6d | 20 62 6f 74 68 20 73 65 |cks from| both se|
|000033a0| 74 73 2c 20 63 68 65 63 | 6b 20 74 6f 20 73 65 65 |ts, chec|k to see|
|000033b0| 20 69 66 20 66 69 6c 65 | 73 20 31 20 61 6e 64 20 | if file|s 1 and |
|000033c0| 32 20 6d 61 74 63 68 3a | 0a 58 20 2a 09 20 20 20 |2 match:|.X *. |
|000033d0| 20 0a 58 20 2a 09 20 20 | 20 20 20 20 20 20 53 61 | .X *. | Sa|
|000033e0| 6d 65 20 6e 75 6d 62 65 | 72 20 6f 66 20 6c 69 6e |me numbe|r of lin|
|000033f0| 65 73 3f 20 20 49 66 20 | 73 6f 2c 20 64 6f 20 61 |es? If |so, do a|
|00003400| 20 73 65 74 20 6f 66 20 | 62 63 6d 70 27 73 20 28 | set of |bcmp's (|
|00003410| 69 66 20 61 0a 58 20 2a | 20 20 09 20 20 20 20 62 |if a.X *| . b|
|00003420| 63 6d 70 20 6d 61 74 63 | 68 65 73 3b 20 63 6f 70 |cmp matc|hes; cop|
|00003430| 79 20 74 68 65 20 70 6f | 69 6e 74 65 72 20 6f 76 |y the po|inter ov|
|00003440| 65 72 3b 20 69 74 27 6c | 6c 20 62 65 20 65 61 73 |er; it'l|l be eas|
|00003450| 69 65 72 20 6c 61 74 65 | 72 0a 58 20 2a 20 20 09 |ier late|r.X * .|
|00003460| 20 20 20 20 69 66 20 79 | 6f 75 20 68 61 76 65 20 | if y|ou have |
|00003470| 74 6f 20 64 6f 20 61 6e | 79 20 63 6f 6d 70 61 72 |to do an|y compar|
|00003480| 65 73 29 2e 20 20 49 66 | 20 74 68 65 79 20 6d 61 |es). If| they ma|
|00003490| 74 63 68 2c 20 31 20 26 | 20 32 20 61 72 65 0a 58 |tch, 1 &| 2 are.X|
|000034a0| 20 2a 20 20 09 20 20 20 | 20 74 68 65 20 73 61 6d | * . | the sam|
|000034b0| 65 2e 20 20 49 66 20 6e | 6f 74 2c 20 61 6c 6c 20 |e. If n|ot, all |
|000034c0| 74 68 72 65 65 20 64 69 | 66 66 65 72 65 6e 74 2e |three di|fferent.|
|000034d0| 0a 58 20 2a 20 0a 58 20 | 2a 20 20 20 54 68 65 6e |.X * .X |* Then|
|000034e0| 20 79 6f 75 20 64 6f 20 | 69 74 20 61 67 61 69 6e | you do |it again|
|000034f0| 2c 20 75 6e 74 69 6c 20 | 79 6f 75 20 72 75 6e 20 |, until |you run |
|00003500| 6f 75 74 20 6f 66 20 62 | 6c 6f 63 6b 73 2e 20 0a |out of b|locks. .|
|00003510| 58 20 2a 20 0a 58 20 2a | 2f 0a 58 0a 58 2f 2a 20 |X * .X *|/.X.X/* |
|00003520| 0a 58 20 2a 20 54 68 69 | 73 20 72 6f 75 74 69 6e |.X * Thi|s routin|
|00003530| 65 20 6d 61 6b 65 73 20 | 61 20 74 68 72 65 65 20 |e makes |a three |
|00003540| 77 61 79 20 64 69 66 66 | 20 28 63 68 61 69 6e 20 |way diff| (chain |
|00003550| 6f 66 20 64 69 66 66 33 | 5f 62 6c 6f 63 6b 27 73 |of diff3|_block's|
|00003560| 29 20 66 72 6f 6d 20 74 | 77 6f 0a 58 20 2a 20 74 |) from t|wo.X * t|
|00003570| 77 6f 20 77 61 79 20 64 | 69 66 66 73 20 28 63 68 |wo way d|iffs (ch|
|00003580| 61 69 6e 73 20 6f 66 20 | 64 69 66 66 5f 62 6c 6f |ains of |diff_blo|
|00003590| 63 6b 27 73 29 2e 20 20 | 49 74 20 69 73 20 61 73 |ck's). |It is as|
|000035a0| 73 75 6d 65 64 20 74 68 | 61 74 20 65 61 63 68 20 |sumed th|at each |
|000035b0| 6f 66 0a 58 20 2a 20 74 | 68 65 20 74 77 6f 20 64 |of.X * t|he two d|
|000035c0| 69 66 66 73 20 70 61 73 | 73 65 64 20 61 72 65 20 |iffs pas|sed are |
|000035d0| 6f 66 66 20 6f 66 20 74 | 68 65 20 73 61 6d 65 20 |off of t|he same |
|000035e0| 66 69 6c 65 20 28 69 2e | 65 2e 20 74 68 61 74 20 |file (i.|e. that |
|000035f0| 65 61 63 68 20 6f 66 20 | 74 68 65 0a 58 20 2a 20 |each of |the.X * |
|00003600| 64 69 66 66 73 20 77 65 | 72 65 20 6d 61 64 65 20 |diffs we|re made |
|00003610| 22 66 72 6f 6d 22 20 74 | 68 65 20 73 61 6d 65 20 |"from" t|he same |
|00003620| 66 69 6c 65 29 2e 20 20 | 54 68 65 20 74 68 72 65 |file). |The thre|
|00003630| 65 20 77 61 79 20 64 69 | 66 66 20 70 6f 69 6e 74 |e way di|ff point|
|00003640| 65 72 0a 58 20 2a 20 72 | 65 74 75 72 6e 65 64 20 |er.X * r|eturned |
|00003650| 77 69 6c 6c 20 68 61 76 | 65 20 6e 75 6d 62 65 72 |will hav|e number|
|00003660| 69 6e 67 20 30 2d 2d 74 | 68 65 20 63 6f 6d 6d 6f |ing 0--t|he commo|
|00003670| 6e 20 66 69 6c 65 2c 20 | 31 2d 2d 74 68 65 20 6f |n file, |1--the o|
|00003680| 74 68 65 72 20 66 69 6c | 65 0a 58 20 2a 20 69 6e |ther fil|e.X * in|
|00003690| 20 64 69 66 66 31 2c 20 | 61 6e 64 20 32 2d 2d 74 | diff1, |and 2--t|
|000036a0| 68 65 20 6f 74 68 65 72 | 20 66 69 6c 65 20 69 6e |he other| file in|
|000036b0| 20 64 69 66 66 32 2e 0a | 58 20 2a 2f 0a 58 73 74 | diff2..|X */.Xst|
|000036c0| 72 75 63 74 20 64 69 66 | 66 33 5f 62 6c 6f 63 6b |ruct dif|f3_block|
|000036d0| 20 2a 0a 58 6d 61 6b 65 | 5f 33 77 61 79 5f 64 69 | *.Xmake|_3way_di|
|000036e0| 66 66 20 28 74 68 72 65 | 61 64 31 2c 20 74 68 72 |ff (thre|ad1, thr|
|000036f0| 65 61 64 32 29 0a 58 20 | 20 20 20 20 73 74 72 75 |ead2).X | stru|
|00003700| 63 74 20 64 69 66 66 5f | 62 6c 6f 63 6b 20 2a 74 |ct diff_|block *t|
|00003710| 68 72 65 61 64 31 2c 20 | 2a 74 68 72 65 61 64 32 |hread1, |*thread2|
|00003720| 3b 0a 58 7b 0a 58 2f 2a | 0a 58 20 2a 20 54 68 69 |;.X{.X/*|.X * Thi|
|00003730| 73 20 72 6f 75 74 69 6e | 65 20 77 6f 72 6b 73 20 |s routin|e works |
|00003740| 6f 6e 20 74 68 65 20 74 | 77 6f 20 64 69 66 66 73 |on the t|wo diffs|
|00003750| 20 70 61 73 73 65 64 20 | 74 6f 20 69 74 20 61 73 | passed |to it as|
|00003760| 20 74 68 72 65 61 64 73 | 2e 0a 58 20 2a 20 54 68 | threads|..X * Th|
|00003770| 72 65 61 64 20 6e 75 6d | 62 65 72 20 30 20 69 73 |read num|ber 0 is|
|00003780| 20 64 69 66 66 31 2c 20 | 74 68 72 65 61 64 20 6e | diff1, |thread n|
|00003790| 75 6d 62 65 72 20 31 20 | 69 73 20 64 69 66 66 32 |umber 1 |is diff2|
|000037a0| 2e 20 20 54 68 65 20 55 | 53 49 4e 47 0a 58 20 2a |. The U|SING.X *|
|000037b0| 20 61 72 72 61 79 20 69 | 73 20 73 65 74 20 74 6f | array i|s set to|
|000037c0| 20 74 68 65 20 62 61 73 | 65 20 6f 66 20 74 68 65 | the bas|e of the|
|000037d0| 20 6c 69 73 74 20 6f 66 | 20 62 6c 6f 63 6b 73 20 | list of| blocks |
|000037e0| 74 6f 20 62 65 20 75 73 | 65 64 20 74 6f 0a 58 20 |to be us|ed to.X |
|000037f0| 2a 20 63 6f 6e 73 74 72 | 75 63 74 20 65 61 63 68 |* constr|uct each|
|00003800| 20 62 6c 6f 63 6b 20 6f | 66 20 74 68 65 20 74 68 | block o|f the th|
|00003810| 72 65 65 20 77 61 79 20 | 64 69 66 66 3b 20 69 66 |ree way |diff; if|
|00003820| 20 6e 6f 20 62 6c 6f 63 | 6b 73 20 66 72 6f 6d 20 | no bloc|ks from |
|00003830| 61 0a 58 20 2a 20 70 61 | 72 74 69 63 75 6c 61 72 |a.X * pa|rticular|
|00003840| 20 74 68 72 65 61 64 20 | 61 72 65 20 74 6f 20 62 | thread |are to b|
|00003850| 65 20 75 73 65 64 2c 20 | 74 68 61 74 20 65 6c 65 |e used, |that ele|
|00003860| 6d 65 6e 74 20 6f 66 20 | 74 68 65 20 75 73 69 6e |ment of |the usin|
|00003870| 67 20 61 72 72 61 79 0a | 58 20 2a 20 69 73 20 73 |g array.|X * is s|
|00003880| 65 74 20 74 6f 20 30 2e | 20 20 54 68 65 20 65 6c |et to 0.| The el|
|00003890| 65 6d 65 6e 74 73 20 4c | 41 53 54 5f 55 53 49 4e |ements L|AST_USIN|
|000038a0| 47 20 61 72 72 61 79 20 | 61 72 65 20 73 65 74 20 |G array |are set |
|000038b0| 74 6f 20 74 68 65 20 6c | 61 73 74 0a 58 20 2a 20 |to the l|ast.X * |
|000038c0| 65 6c 65 6d 65 6e 74 73 | 20 6f 6e 20 65 61 63 68 |elements| on each|
|000038d0| 20 6f 66 20 74 68 65 20 | 75 73 69 6e 67 20 6c 69 | of the |using li|
|000038e0| 73 74 73 2e 0a 58 20 2a | 0a 58 20 2a 20 54 68 65 |sts..X *|.X * The|
|000038f0| 20 48 49 47 48 5f 57 41 | 54 45 52 5f 4d 41 52 4b | HIGH_WA|TER_MARK|
|00003900| 20 69 73 20 73 65 74 20 | 74 6f 20 74 68 65 20 68 | is set |to the h|
|00003910| 69 67 68 65 73 74 20 6c | 69 6e 65 20 6e 75 6d 62 |ighest l|ine numb|
|00003920| 65 72 20 69 6e 20 46 69 | 6c 65 20 30 0a 58 20 2a |er in Fi|le 0.X *|
|00003930| 20 64 65 73 63 72 69 62 | 65 64 20 69 6e 20 61 6e | describ|ed in an|
|00003940| 79 20 6f 66 20 74 68 65 | 20 64 69 66 66 73 20 69 |y of the| diffs i|
|00003950| 6e 20 65 69 74 68 65 72 | 20 6f 66 20 74 68 65 20 |n either| of the |
|00003960| 55 53 49 4e 47 20 6c 69 | 73 74 73 2e 20 20 54 68 |USING li|sts. Th|
|00003970| 65 0a 58 20 2a 20 48 49 | 47 48 5f 57 41 54 45 52 |e.X * HI|GH_WATER|
|00003980| 5f 54 48 52 45 41 44 20 | 6e 61 6d 65 73 20 74 68 |_THREAD |names th|
|00003990| 65 20 74 68 72 65 61 64 | 2e 20 20 53 69 6d 69 6c |e thread|. Simil|
|000039a0| 61 72 6c 79 20 74 68 65 | 20 42 41 53 45 5f 57 41 |arly the| BASE_WA|
|000039b0| 54 45 52 5f 4d 41 52 4b | 0a 58 20 2a 20 61 6e 64 |TER_MARK|.X * and|
|000039c0| 20 42 41 53 45 5f 57 41 | 54 45 52 5f 54 48 52 45 | BASE_WA|TER_THRE|
|000039d0| 41 44 20 64 65 73 63 72 | 69 62 65 20 74 68 65 20 |AD descr|ibe the |
|000039e0| 6c 6f 77 65 73 74 20 6c | 69 6e 65 20 6e 75 6d 62 |lowest l|ine numb|
|000039f0| 65 72 20 69 6e 20 46 69 | 6c 65 20 30 0a 58 20 2a |er in Fi|le 0.X *|
|00003a00| 20 64 65 73 63 72 69 62 | 65 64 20 69 6e 20 61 6e | describ|ed in an|
|00003a10| 79 20 6f 66 20 74 68 65 | 20 64 69 66 66 73 20 69 |y of the| diffs i|
|00003a20| 6e 20 65 69 74 68 65 72 | 20 6f 66 20 74 68 65 20 |n either| of the |
|00003a30| 55 53 49 4e 47 20 6c 69 | 73 74 73 2e 20 20 54 68 |USING li|sts. Th|
|00003a40| 65 0a 58 20 2a 20 48 49 | 47 48 5f 57 41 54 45 52 |e.X * HI|GH_WATER|
|00003a50| 5f 44 49 46 46 20 69 73 | 20 74 68 65 20 64 69 66 |_DIFF is| the dif|
|00003a60| 66 20 66 72 6f 6d 20 77 | 68 69 63 68 20 74 68 65 |f from w|hich the|
|00003a70| 20 48 49 47 48 5f 57 41 | 54 45 52 5f 4d 41 52 4b | HIGH_WA|TER_MARK|
|00003a80| 20 77 61 73 0a 58 20 2a | 20 74 61 6b 65 6e 2e 20 | was.X *| taken. |
|00003a90| 0a 58 20 2a 0a 58 20 2a | 20 54 68 65 20 48 49 47 |.X *.X *| The HIG|
|00003aa0| 48 5f 57 41 54 45 52 5f | 44 49 46 46 20 73 68 6f |H_WATER_|DIFF sho|
|00003ab0| 75 6c 64 20 61 6c 77 61 | 79 73 20 62 65 20 65 71 |uld alwa|ys be eq|
|00003ac0| 75 61 6c 20 74 6f 20 4c | 41 53 54 5f 55 53 49 4e |ual to L|AST_USIN|
|00003ad0| 47 0a 58 20 2a 20 5b 48 | 49 47 48 5f 57 41 54 45 |G.X * [H|IGH_WATE|
|00003ae0| 52 5f 54 48 52 45 41 44 | 5d 2e 20 20 54 68 65 20 |R_THREAD|]. The |
|00003af0| 4f 54 48 45 52 5f 44 49 | 46 46 20 69 73 20 74 68 |OTHER_DI|FF is th|
|00003b00| 65 20 6e 65 78 74 20 64 | 69 66 66 20 74 6f 20 63 |e next d|iff to c|
|00003b10| 68 65 63 6b 20 66 6f 72 | 0a 58 20 2a 20 68 69 67 |heck for|.X * hig|
|00003b20| 68 65 72 20 77 61 74 65 | 72 2c 20 61 6e 64 20 73 |her wate|r, and s|
|00003b30| 68 6f 75 6c 64 20 61 6c | 77 61 79 73 20 62 65 20 |hould al|ways be |
|00003b40| 65 71 75 61 6c 20 74 6f | 0a 58 20 2a 20 43 55 52 |equal to|.X * CUR|
|00003b50| 52 45 4e 54 5b 48 49 47 | 48 5f 57 41 54 45 52 5f |RENT[HIG|H_WATER_|
|00003b60| 54 48 52 45 41 44 20 5e | 20 30 78 31 5d 2e 20 20 |THREAD ^| 0x1]. |
|00003b70| 54 68 65 20 4f 54 48 45 | 52 5f 54 48 52 45 41 44 |The OTHE|R_THREAD|
|00003b80| 20 69 73 20 74 68 65 20 | 74 68 72 65 61 64 0a 58 | is the |thread.X|
|00003b90| 20 2a 20 69 6e 20 77 68 | 69 63 68 20 74 68 65 20 | * in wh|ich the |
|00003ba0| 4f 54 48 45 52 5f 44 49 | 46 46 20 69 73 2c 20 61 |OTHER_DI|FF is, a|
|00003bb0| 6e 64 20 68 65 6e 63 65 | 20 73 68 6f 75 6c 64 20 |nd hence| should |
|00003bc0| 61 6c 77 61 79 73 20 62 | 65 20 65 71 75 61 6c 20 |always b|e equal |
|00003bd0| 74 6f 0a 58 20 2a 20 48 | 49 47 48 5f 57 41 54 45 |to.X * H|IGH_WATE|
|00003be0| 52 5f 54 48 52 45 41 44 | 20 5e 20 30 78 31 2e 0a |R_THREAD| ^ 0x1..|
|00003bf0| 58 20 2a 0a 58 20 2a 20 | 54 68 65 20 76 61 72 69 |X *.X * |The vari|
|00003c00| 61 62 6c 65 20 4c 41 53 | 54 5f 44 49 46 46 20 69 |able LAS|T_DIFF i|
|00003c10| 73 20 6b 65 70 74 20 73 | 65 74 20 74 6f 20 74 68 |s kept s|et to th|
|00003c20| 65 20 6c 61 73 74 20 64 | 69 66 66 20 62 6c 6f 63 |e last d|iff bloc|
|00003c30| 6b 20 70 72 6f 64 75 63 | 65 64 0a 58 20 2a 20 62 |k produc|ed.X * b|
|00003c40| 79 20 74 68 69 73 20 72 | 6f 75 74 69 6e 65 2c 20 |y this r|outine, |
|00003c50| 66 6f 72 20 6c 69 6e 65 | 20 63 6f 72 72 65 73 70 |for line| corresp|
|00003c60| 6f 6e 64 65 6e 63 65 20 | 70 75 72 70 6f 73 65 73 |ondence |purposes|
|00003c70| 20 62 65 74 77 65 65 6e | 20 74 68 61 74 20 64 69 | between| that di|
|00003c80| 66 66 0a 58 20 2a 20 61 | 6e 64 20 74 68 65 20 6f |ff.X * a|nd the o|
|00003c90| 6e 65 20 63 75 72 72 65 | 6e 74 6c 79 20 62 65 69 |ne curre|ntly bei|
|00003ca0| 6e 67 20 77 6f 72 6b 65 | 64 20 6f 6e 2e 20 20 49 |ng worke|d on. I|
|00003cb0| 74 20 69 73 20 69 6e 69 | 74 69 61 6c 69 7a 65 64 |t is ini|tialized|
|00003cc0| 20 74 6f 0a 58 20 2a 20 | 5a 45 52 4f 5f 44 49 46 | to.X * |ZERO_DIF|
|00003cd0| 46 20 62 65 66 6f 72 65 | 20 61 6e 79 20 62 6c 6f |F before| any blo|
|00003ce0| 63 6b 73 20 68 61 76 65 | 20 62 65 65 6e 20 63 72 |cks have| been cr|
|00003cf0| 65 61 74 65 64 2e 0a 58 | 20 2a 2f 0a 58 0a 58 20 |eated..X| */.X.X |
|00003d00| 20 73 74 72 75 63 74 20 | 64 69 66 66 5f 62 6c 6f | struct |diff_blo|
|00003d10| 63 6b 0a 58 20 20 20 20 | 2a 75 73 69 6e 67 5b 32 |ck.X |*using[2|
|00003d20| 5d 2c 0a 58 20 20 20 20 | 2a 6c 61 73 74 5f 75 73 |],.X |*last_us|
|00003d30| 69 6e 67 5b 32 5d 2c 0a | 58 20 20 20 20 2a 63 75 |ing[2],.|X *cu|
|00003d40| 72 72 65 6e 74 5b 32 5d | 3b 0a 58 0a 58 20 20 69 |rrent[2]|;.X.X i|
|00003d50| 6e 74 0a 58 20 20 20 20 | 68 69 67 68 5f 77 61 74 |nt.X |high_wat|
|00003d60| 65 72 5f 6d 61 72 6b 3b | 0a 58 0a 58 20 20 69 6e |er_mark;|.X.X in|
|00003d70| 74 0a 58 20 20 20 20 68 | 69 67 68 5f 77 61 74 65 |t.X h|igh_wate|
|00003d80| 72 5f 74 68 72 65 61 64 | 2c 0a 58 20 20 20 20 62 |r_thread|,.X b|
|00003d90| 61 73 65 5f 77 61 74 65 | 72 5f 74 68 72 65 61 64 |ase_wate|r_thread|
|00003da0| 2c 0a 58 20 20 20 20 6f | 74 68 65 72 5f 74 68 72 |,.X o|ther_thr|
|00003db0| 65 61 64 3b 0a 58 0a 58 | 20 20 73 74 72 75 63 74 |ead;.X.X| struct|
|00003dc0| 20 64 69 66 66 5f 62 6c | 6f 63 6b 0a 58 20 20 20 | diff_bl|ock.X |
|00003dd0| 20 2a 68 69 67 68 5f 77 | 61 74 65 72 5f 64 69 66 | *high_w|ater_dif|
|00003de0| 66 2c 0a 58 20 20 20 20 | 2a 6f 74 68 65 72 5f 64 |f,.X |*other_d|
|00003df0| 69 66 66 3b 0a 58 0a 58 | 20 20 73 74 72 75 63 74 |iff;.X.X| struct|
|00003e00| 20 64 69 66 66 33 5f 62 | 6c 6f 63 6b 0a 58 20 20 | diff3_b|lock.X |
|00003e10| 20 20 2a 72 65 73 75 6c | 74 2c 0a 58 20 20 20 20 | *resul|t,.X |
|00003e20| 2a 74 6d 70 62 6c 6f 63 | 6b 2c 0a 58 20 20 20 20 |*tmpbloc|k,.X |
|00003e30| 2a 72 65 73 75 6c 74 5f | 6c 61 73 74 2c 0a 58 20 |*result_|last,.X |
|00003e40| 20 20 20 2a 6c 61 73 74 | 5f 64 69 66 66 3b 0a 58 | *last|_diff;.X|
|00003e50| 0a 58 20 20 73 74 61 74 | 69 63 20 73 74 72 75 63 |.X stat|ic struc|
|00003e60| 74 20 64 69 66 66 33 5f | 62 6c 6f 63 6b 20 7a 65 |t diff3_|block ze|
|00003e70| 72 6f 5f 64 69 66 66 20 | 3d 20 7b 0a 58 20 20 20 |ro_diff |= {.X |
|00003e80| 20 20 20 45 52 52 4f 52 | 2c 0a 58 20 20 20 20 20 | ERROR|,.X |
|00003e90| 20 7b 20 7b 30 2c 20 30 | 7d 2c 20 7b 30 2c 20 30 | { {0, 0|}, {0, 0|
|00003ea0| 7d 2c 20 7b 30 2c 20 30 | 7d 20 7d 2c 0a 58 20 20 |}, {0, 0|} },.X |
|00003eb0| 20 20 20 20 7b 20 28 63 | 68 61 72 20 2a 2a 29 20 | { (c|har **) |
|00003ec0| 30 2c 20 28 63 68 61 72 | 20 2a 2a 29 20 30 2c 20 |0, (char| **) 0, |
|00003ed0| 28 63 68 61 72 20 2a 2a | 29 20 30 20 7d 2c 0a 58 |(char **|) 0 },.X|
|00003ee0| 20 20 20 20 20 20 7b 20 | 28 69 6e 74 20 2a 29 20 | { |(int *) |
|00003ef0| 30 2c 20 28 69 6e 74 20 | 2a 29 20 30 2c 20 28 69 |0, (int |*) 0, (i|
|00003f00| 6e 74 20 2a 29 20 30 20 | 7d 2c 0a 58 20 20 20 20 |nt *) 0 |},.X |
|00003f10| 20 20 28 73 74 72 75 63 | 74 20 64 69 66 66 33 5f | (struc|t diff3_|
|00003f20| 62 6c 6f 63 6b 20 2a 29 | 20 30 0a 58 20 20 20 20 |block *)| 0.X |
|00003f30| 20 20 7d 3b 0a 58 0a 58 | 20 20 2f 2a 20 49 6e 69 | };.X.X| /* Ini|
|00003f40| 74 69 61 6c 69 7a 61 74 | 69 6f 6e 20 2a 2f 0a 58 |tializat|ion */.X|
|00003f50| 20 20 72 65 73 75 6c 74 | 20 3d 20 72 65 73 75 6c | result| = resul|
|00003f60| 74 5f 6c 61 73 74 20 3d | 20 28 73 74 72 75 63 74 |t_last =| (struct|
|00003f70| 20 64 69 66 66 33 5f 62 | 6c 6f 63 6b 20 2a 29 20 | diff3_b|lock *) |
|00003f80| 30 3b 0a 58 20 20 63 75 | 72 72 65 6e 74 5b 30 5d |0;.X cu|rrent[0]|
|00003f90| 20 3d 20 74 68 72 65 61 | 64 31 3b 20 63 75 72 72 | = threa|d1; curr|
|00003fa0| 65 6e 74 5b 31 5d 20 3d | 20 74 68 72 65 61 64 32 |ent[1] =| thread2|
|00003fb0| 3b 0a 58 20 20 6c 61 73 | 74 5f 64 69 66 66 20 3d |;.X las|t_diff =|
|00003fc0| 20 26 7a 65 72 6f 5f 64 | 69 66 66 3b 0a 58 0a 58 | &zero_d|iff;.X.X|
|00003fd0| 20 20 2f 2a 20 53 6e 69 | 66 66 20 75 70 20 74 68 | /* Sni|ff up th|
|00003fe0| 65 20 74 68 72 65 61 64 | 73 20 75 6e 74 69 6c 20 |e thread|s until |
|00003ff0| 77 65 20 72 65 61 63 68 | 20 74 68 65 20 65 6e 64 |we reach| the end|
|00004000| 20 2a 2f 0a 58 0a 58 20 | 20 77 68 69 6c 65 20 28 | */.X.X | while (|
|00004010| 63 75 72 72 65 6e 74 5b | 30 5d 20 7c 7c 20 63 75 |current[|0] || cu|
|00004020| 72 72 65 6e 74 5b 31 5d | 29 0a 58 20 20 20 20 7b |rrent[1]|).X {|
|00004030| 0a 58 20 20 20 20 20 20 | 75 73 69 6e 67 5b 30 5d |.X |using[0]|
|00004040| 20 3d 20 75 73 69 6e 67 | 5b 31 5d 20 3d 20 6c 61 | = using|[1] = la|
|00004050| 73 74 5f 75 73 69 6e 67 | 5b 30 5d 20 3d 20 6c 61 |st_using|[0] = la|
|00004060| 73 74 5f 75 73 69 6e 67 | 5b 31 5d 20 3d 0a 58 09 |st_using|[1] =.X.|
|00004070| 28 73 74 72 75 63 74 20 | 64 69 66 66 5f 62 6c 6f |(struct |diff_blo|
|00004080| 63 6b 20 2a 29 20 30 3b | 0a 58 0a 58 20 20 20 20 |ck *) 0;|.X.X |
|00004090| 20 20 2f 2a 20 53 65 74 | 75 70 20 6c 6f 77 20 61 | /* Set|up low a|
|000040a0| 6e 64 20 68 69 67 68 20 | 77 61 74 65 72 20 74 68 |nd high |water th|
|000040b0| 72 65 61 64 73 2c 20 64 | 69 66 66 73 2c 20 61 6e |reads, d|iffs, an|
|000040c0| 64 20 6d 61 72 6b 73 2e | 20 20 2a 2f 0a 58 20 20 |d marks.| */.X |
|000040d0| 20 20 20 20 69 66 20 28 | 21 63 75 72 72 65 6e 74 | if (|!current|
|000040e0| 5b 30 5d 29 0a 58 09 62 | 61 73 65 5f 77 61 74 65 |[0]).X.b|ase_wate|
|000040f0| 72 5f 74 68 72 65 61 64 | 20 3d 20 31 3b 0a 58 20 |r_thread| = 1;.X |
|00004100| 20 20 20 20 20 65 6c 73 | 65 20 69 66 20 28 21 63 | els|e if (!c|
|00004110| 75 72 72 65 6e 74 5b 31 | 5d 29 0a 58 09 62 61 73 |urrent[1|]).X.bas|
|00004120| 65 5f 77 61 74 65 72 5f | 74 68 72 65 61 64 20 3d |e_water_|thread =|
|00004130| 20 30 3b 0a 58 20 20 20 | 20 20 20 65 6c 73 65 0a | 0;.X | else.|
|00004140| 58 09 62 61 73 65 5f 77 | 61 74 65 72 5f 74 68 72 |X.base_w|ater_thr|
|00004150| 65 61 64 20 3d 0a 58 09 | 20 20 28 44 5f 4c 4f 57 |ead =.X.| (D_LOW|
|00004160| 4c 49 4e 45 20 28 63 75 | 72 72 65 6e 74 5b 30 5d |LINE (cu|rrent[0]|
|00004170| 2c 20 46 49 4c 45 30 29 | 20 3e 20 44 5f 4c 4f 57 |, FILE0)| > D_LOW|
|00004180| 4c 49 4e 45 20 28 63 75 | 72 72 65 6e 74 5b 31 5d |LINE (cu|rrent[1]|
|00004190| 2c 20 46 49 4c 45 30 29 | 29 3b 0a 58 0a 58 20 20 |, FILE0)|);.X.X |
|000041a0| 20 20 20 20 68 69 67 68 | 5f 77 61 74 65 72 5f 74 | high|_water_t|
|000041b0| 68 72 65 61 64 20 3d 20 | 62 61 73 65 5f 77 61 74 |hread = |base_wat|
|000041c0| 65 72 5f 74 68 72 65 61 | 64 3b 0a 58 20 20 20 20 |er_threa|d;.X |
|000041d0| 20 20 0a 58 20 20 20 20 | 20 20 68 69 67 68 5f 77 | .X | high_w|
|000041e0| 61 74 65 72 5f 64 69 66 | 66 20 3d 20 63 75 72 72 |ater_dif|f = curr|
|000041f0| 65 6e 74 5b 68 69 67 68 | 5f 77 61 74 65 72 5f 74 |ent[high|_water_t|
|00004200| 68 72 65 61 64 5d 3b 0a | 58 09 0a 58 23 69 66 20 |hread];.|X..X#if |
|00004210| 30 0a 58 20 20 20 20 20 | 20 2f 2a 20 6c 6f 77 20 |0.X | /* low |
|00004220| 61 6e 64 20 68 69 67 68 | 20 77 61 74 65 72 73 20 |and high| waters |
|00004230| 73 74 61 72 74 20 6f 66 | 66 20 73 61 6d 65 20 64 |start of|f same d|
|00004240| 69 66 66 20 2a 2f 0a 58 | 20 20 20 20 20 20 62 61 |iff */.X| ba|
|00004250| 73 65 5f 77 61 74 65 72 | 5f 6d 61 72 6b 20 3d 20 |se_water|_mark = |
|00004260| 44 5f 4c 4f 57 4c 49 4e | 45 20 28 68 69 67 68 5f |D_LOWLIN|E (high_|
|00004270| 77 61 74 65 72 5f 64 69 | 66 66 2c 20 46 49 4c 45 |water_di|ff, FILE|
|00004280| 30 29 3b 0a 58 23 65 6e | 64 69 66 0a 58 0a 58 20 |0);.X#en|dif.X.X |
|00004290| 20 20 20 20 20 68 69 67 | 68 5f 77 61 74 65 72 5f | hig|h_water_|
|000042a0| 6d 61 72 6b 20 3d 20 44 | 5f 48 49 47 48 4c 49 4e |mark = D|_HIGHLIN|
|000042b0| 45 20 28 68 69 67 68 5f | 77 61 74 65 72 5f 64 69 |E (high_|water_di|
|000042c0| 66 66 2c 20 46 49 4c 45 | 30 29 3b 0a 58 0a 58 20 |ff, FILE|0);.X.X |
|000042d0| 20 20 20 20 20 2f 2a 20 | 4d 61 6b 65 20 74 68 65 | /* |Make the|
|000042e0| 20 64 69 66 66 20 79 6f | 75 20 6a 75 73 74 20 67 | diff yo|u just g|
|000042f0| 6f 74 20 69 6e 66 6f 20 | 66 72 6f 6d 20 69 6e 74 |ot info |from int|
|00004300| 6f 20 74 68 65 20 75 73 | 69 6e 67 20 63 6c 61 73 |o the us|ing clas|
|00004310| 73 20 2a 2f 0a 58 20 20 | 20 20 20 20 75 73 69 6e |s */.X | usin|
|00004320| 67 5b 68 69 67 68 5f 77 | 61 74 65 72 5f 74 68 72 |g[high_w|ater_thr|
|00004330| 65 61 64 5d 0a 58 09 3d | 20 6c 61 73 74 5f 75 73 |ead].X.=| last_us|
|00004340| 69 6e 67 5b 68 69 67 68 | 5f 77 61 74 65 72 5f 74 |ing[high|_water_t|
|00004350| 68 72 65 61 64 5d 0a 58 | 09 3d 20 68 69 67 68 5f |hread].X|.= high_|
|00004360| 77 61 74 65 72 5f 64 69 | 66 66 3b 0a 58 20 20 20 |water_di|ff;.X |
|00004370| 20 20 20 63 75 72 72 65 | 6e 74 5b 68 69 67 68 5f | curre|nt[high_|
|00004380| 77 61 74 65 72 5f 74 68 | 72 65 61 64 5d 20 3d 20 |water_th|read] = |
|00004390| 68 69 67 68 5f 77 61 74 | 65 72 5f 64 69 66 66 2d |high_wat|er_diff-|
|000043a0| 3e 6e 65 78 74 3b 0a 58 | 20 20 20 20 20 20 6c 61 |>next;.X| la|
|000043b0| 73 74 5f 75 73 69 6e 67 | 5b 68 69 67 68 5f 77 61 |st_using|[high_wa|
|000043c0| 74 65 72 5f 74 68 72 65 | 61 64 5d 2d 3e 6e 65 78 |ter_thre|ad]->nex|
|000043d0| 74 0a 58 09 3d 20 28 73 | 74 72 75 63 74 20 64 69 |t.X.= (s|truct di|
|000043e0| 66 66 5f 62 6c 6f 63 6b | 20 2a 29 20 30 3b 0a 58 |ff_block| *) 0;.X|
|000043f0| 0a 58 20 20 20 20 20 20 | 2f 2a 20 41 6e 64 20 6d |.X |/* And m|
|00004400| 61 72 6b 20 74 68 65 20 | 6f 74 68 65 72 20 64 69 |ark the |other di|
|00004410| 66 66 20 2a 2f 0a 58 20 | 20 20 20 20 20 6f 74 68 |ff */.X | oth|
|00004420| 65 72 5f 74 68 72 65 61 | 64 20 3d 20 68 69 67 68 |er_threa|d = high|
|00004430| 5f 77 61 74 65 72 5f 74 | 68 72 65 61 64 20 5e 20 |_water_t|hread ^ |
|00004440| 30 78 31 3b 0a 58 20 20 | 20 20 20 20 6f 74 68 65 |0x1;.X | othe|
|00004450| 72 5f 64 69 66 66 20 3d | 20 63 75 72 72 65 6e 74 |r_diff =| current|
|00004460| 5b 6f 74 68 65 72 5f 74 | 68 72 65 61 64 5d 3b 0a |[other_t|hread];.|
|00004470| 58 0a 58 20 20 20 20 20 | 20 2f 2a 20 53 68 75 66 |X.X | /* Shuf|
|00004480| 66 6c 65 20 75 70 20 74 | 68 65 20 6c 61 64 64 65 |fle up t|he ladde|
|00004490| 72 2c 20 63 68 65 63 6b | 69 6e 67 20 74 68 65 20 |r, check|ing the |
|000044a0| 6f 74 68 65 72 20 64 69 | 66 66 20 74 6f 20 73 65 |other di|ff to se|
|000044b0| 65 20 69 66 20 69 74 0a | 58 20 20 20 20 20 20 20 |e if it.|X |
|000044c0| 20 20 6e 65 65 64 73 20 | 74 6f 20 62 65 20 69 6e | needs |to be in|
|000044d0| 63 6f 72 70 6f 72 61 74 | 65 64 20 2a 2f 0a 58 20 |corporat|ed */.X |
|000044e0| 20 20 20 20 20 77 68 69 | 6c 65 20 28 6f 74 68 65 | whi|le (othe|
|000044f0| 72 5f 64 69 66 66 0a 58 | 09 20 20 20 20 20 26 26 |r_diff.X|. &&|
|00004500| 20 44 5f 4c 4f 57 4c 49 | 4e 45 20 28 6f 74 68 65 | D_LOWLI|NE (othe|
|00004510| 72 5f 64 69 66 66 2c 20 | 46 49 4c 45 30 29 20 3c |r_diff, |FILE0) <|
|00004520| 3d 20 68 69 67 68 5f 77 | 61 74 65 72 5f 6d 61 72 |= high_w|ater_mar|
|00004530| 6b 20 2b 20 31 29 0a 58 | 09 7b 0a 58 0a 58 09 20 |k + 1).X|.{.X.X. |
|00004540| 20 2f 2a 20 49 6e 63 6f | 72 70 6f 72 61 74 65 20 | /* Inco|rporate |
|00004550| 74 68 69 73 20 64 69 66 | 66 20 69 6e 74 6f 20 74 |this dif|f into t|
|00004560| 68 65 20 75 73 69 6e 67 | 20 6c 69 73 74 2e 20 20 |he using| list. |
|00004570| 4e 6f 74 65 20 74 68 61 | 74 0a 58 09 20 20 20 20 |Note tha|t.X. |
|00004580| 20 74 68 69 73 20 64 6f | 65 73 6e 27 74 20 74 61 | this do|esn't ta|
|00004590| 6b 65 20 69 74 20 6f 66 | 66 20 74 68 65 20 63 75 |ke it of|f the cu|
|000045a0| 72 72 65 6e 74 20 6c 69 | 73 74 20 2a 2f 0a 58 09 |rrent li|st */.X.|
|000045b0| 20 20 69 66 20 28 75 73 | 69 6e 67 5b 6f 74 68 65 | if (us|ing[othe|
|000045c0| 72 5f 74 68 72 65 61 64 | 5d 29 0a 58 09 20 20 20 |r_thread|]).X. |
|000045d0| 20 6c 61 73 74 5f 75 73 | 69 6e 67 5b 6f 74 68 65 | last_us|ing[othe|
|000045e0| 72 5f 74 68 72 65 61 64 | 5d 2d 3e 6e 65 78 74 20 |r_thread|]->next |
|000045f0| 3d 20 6f 74 68 65 72 5f | 64 69 66 66 3b 0a 58 09 |= other_|diff;.X.|
|00004600| 20 20 65 6c 73 65 0a 58 | 09 20 20 20 20 75 73 69 | else.X|. usi|
|00004610| 6e 67 5b 6f 74 68 65 72 | 5f 74 68 72 65 61 64 5d |ng[other|_thread]|
|00004620| 20 3d 20 6f 74 68 65 72 | 5f 64 69 66 66 3b 0a 58 | = other|_diff;.X|
|00004630| 09 20 20 6c 61 73 74 5f | 75 73 69 6e 67 5b 6f 74 |. last_|using[ot|
|00004640| 68 65 72 5f 74 68 72 65 | 61 64 5d 20 3d 20 6f 74 |her_thre|ad] = ot|
|00004650| 68 65 72 5f 64 69 66 66 | 3b 0a 58 0a 58 09 20 20 |her_diff|;.X.X. |
|00004660| 2f 2a 20 54 61 6b 65 20 | 69 74 20 6f 66 66 20 74 |/* Take |it off t|
|00004670| 68 65 20 63 75 72 72 65 | 6e 74 20 6c 69 73 74 2e |he curre|nt list.|
|00004680| 20 20 4e 6f 74 65 20 74 | 68 61 74 20 74 68 69 73 | Note t|hat this|
|00004690| 20 66 6f 6c 6c 6f 77 69 | 6e 67 0a 58 09 20 20 20 | followi|ng.X. |
|000046a0| 20 20 63 6f 64 65 20 61 | 73 73 75 6d 65 73 20 74 | code a|ssumes t|
|000046b0| 68 61 74 20 6f 74 68 65 | 72 5f 64 69 66 66 20 65 |hat othe|r_diff e|
|000046c0| 6e 74 65 72 73 20 69 74 | 20 65 71 75 61 6c 20 74 |nters it| equal t|
|000046d0| 6f 0a 58 09 20 20 20 20 | 20 63 75 72 72 65 6e 74 |o.X. | current|
|000046e0| 5b 68 69 67 68 5f 77 61 | 74 65 72 5f 74 68 72 65 |[high_wa|ter_thre|
|000046f0| 61 64 20 5e 20 30 78 31 | 5d 20 2a 2f 0a 58 09 20 |ad ^ 0x1|] */.X. |
|00004700| 20 63 75 72 72 65 6e 74 | 5b 6f 74 68 65 72 5f 74 | current|[other_t|
|00004710| 68 72 65 61 64 5d 0a 58 | 09 20 20 20 20 3d 20 63 |hread].X|. = c|
|00004720| 75 72 72 65 6e 74 5b 6f | 74 68 65 72 5f 74 68 72 |urrent[o|ther_thr|
|00004730| 65 61 64 5d 2d 3e 6e 65 | 78 74 3b 0a 58 09 20 20 |ead]->ne|xt;.X. |
|00004740| 6f 74 68 65 72 5f 64 69 | 66 66 2d 3e 6e 65 78 74 |other_di|ff->next|
|00004750| 0a 58 09 20 20 20 20 3d | 20 28 73 74 72 75 63 74 |.X. =| (struct|
|00004760| 20 64 69 66 66 5f 62 6c | 6f 63 6b 20 2a 29 20 30 | diff_bl|ock *) 0|
|00004770| 3b 0a 58 0a 58 09 20 20 | 2f 2a 20 53 65 74 20 74 |;.X.X. |/* Set t|
|00004780| 68 65 20 68 69 67 68 5f | 77 61 74 65 72 20 73 74 |he high_|water st|
|00004790| 75 66 66 0a 58 09 20 20 | 20 20 20 49 66 20 74 68 |uff.X. | If th|
|000047a0| 69 73 20 63 6f 6d 70 61 | 72 69 73 6f 6e 20 69 73 |is compa|rison is|
|000047b0| 20 65 71 75 61 6c 2c 20 | 74 68 65 6e 20 74 68 69 | equal, |then thi|
|000047c0| 73 20 69 73 20 74 68 65 | 20 6c 61 73 74 20 70 61 |s is the| last pa|
|000047d0| 73 73 0a 58 09 20 20 20 | 20 20 74 68 72 6f 75 67 |ss.X. | throug|
|000047e0| 68 20 74 68 69 73 20 6c | 6f 6f 70 3b 20 73 69 6e |h this l|oop; sin|
|000047f0| 63 65 20 64 69 66 66 20 | 62 6c 6f 63 6b 73 20 77 |ce diff |blocks w|
|00004800| 69 74 68 69 6e 20 61 20 | 67 69 76 65 6e 0a 58 09 |ithin a |given.X.|
|00004810| 20 20 20 20 20 74 68 72 | 65 61 64 20 63 61 6e 6e | thr|ead cann|
|00004820| 6f 74 20 6f 76 65 72 6c | 61 70 2c 20 74 68 65 20 |ot overl|ap, the |
|00004830| 68 69 67 68 5f 77 61 74 | 65 72 5f 6d 61 72 6b 20 |high_wat|er_mark |
|00004840| 77 69 6c 6c 20 62 65 0a | 58 09 20 20 20 20 20 2a |will be.|X. *|
|00004850| 62 65 6c 6f 77 2a 20 74 | 68 65 20 72 61 6e 67 65 |below* t|he range|
|00004860| 5f 73 74 61 72 74 20 6f | 66 20 65 69 74 68 65 72 |_start o|f either|
|00004870| 20 6f 66 20 74 68 65 20 | 6e 65 78 74 20 64 69 66 | of the |next dif|
|00004880| 66 73 2e 20 2a 2f 0a 58 | 0a 58 09 20 20 69 66 20 |fs. */.X|.X. if |
|00004890| 28 68 69 67 68 5f 77 61 | 74 65 72 5f 6d 61 72 6b |(high_wa|ter_mark|
|000048a0| 20 3c 20 44 5f 48 49 47 | 48 4c 49 4e 45 20 28 6f | < D_HIG|HLINE (o|
|000048b0| 74 68 65 72 5f 64 69 66 | 66 2c 20 46 49 4c 45 30 |ther_dif|f, FILE0|
|000048c0| 29 29 0a 58 09 20 20 20 | 20 7b 0a 58 09 20 20 20 |)).X. | {.X. |
|000048d0| 20 20 20 68 69 67 68 5f | 77 61 74 65 72 5f 74 68 | high_|water_th|
|000048e0| 72 65 61 64 20 5e 3d 20 | 31 3b 0a 58 09 20 20 20 |read ^= |1;.X. |
|000048f0| 20 20 20 68 69 67 68 5f | 77 61 74 65 72 5f 64 69 | high_|water_di|
|00004900| 66 66 20 3d 20 6f 74 68 | 65 72 5f 64 69 66 66 3b |ff = oth|er_diff;|
|00004910| 0a 58 09 20 20 20 20 20 | 20 68 69 67 68 5f 77 61 |.X. | high_wa|
|00004920| 74 65 72 5f 6d 61 72 6b | 20 3d 20 44 5f 48 49 47 |ter_mark| = D_HIG|
|00004930| 48 4c 49 4e 45 20 28 6f | 74 68 65 72 5f 64 69 66 |HLINE (o|ther_dif|
|00004940| 66 2c 20 46 49 4c 45 30 | 29 3b 0a 58 09 20 20 20 |f, FILE0|);.X. |
|00004950| 20 7d 0a 58 0a 58 09 20 | 20 2f 2a 20 53 65 74 20 | }.X.X. | /* Set |
|00004960| 74 68 65 20 6f 74 68 65 | 72 20 64 69 66 66 20 2a |the othe|r diff *|
|00004970| 2f 0a 58 09 20 20 6f 74 | 68 65 72 5f 74 68 72 65 |/.X. ot|her_thre|
|00004980| 61 64 20 3d 20 68 69 67 | 68 5f 77 61 74 65 72 5f |ad = hig|h_water_|
|00004990| 74 68 72 65 61 64 20 5e | 20 30 78 31 3b 0a 58 09 |thread ^| 0x1;.X.|
|000049a0| 20 20 6f 74 68 65 72 5f | 64 69 66 66 20 3d 20 63 | other_|diff = c|
|000049b0| 75 72 72 65 6e 74 5b 6f | 74 68 65 72 5f 74 68 72 |urrent[o|ther_thr|
|000049c0| 65 61 64 5d 3b 0a 58 09 | 7d 0a 58 0a 58 20 20 20 |ead];.X.|}.X.X |
|000049d0| 20 20 20 2f 2a 20 54 68 | 65 20 75 73 69 6e 67 20 | /* Th|e using |
|000049e0| 6c 69 73 74 73 20 63 6f | 6e 74 61 69 6e 20 61 20 |lists co|ntain a |
|000049f0| 6c 69 73 74 20 6f 66 20 | 61 6c 6c 20 6f 66 20 74 |list of |all of t|
|00004a00| 68 65 20 62 6c 6f 63 6b | 73 20 74 6f 20 62 65 0a |he block|s to be.|
|00004a10| 58 20 20 20 20 20 20 20 | 20 20 69 6e 63 6c 75 64 |X | includ|
|00004a20| 65 64 20 69 6e 20 74 68 | 69 73 20 64 69 66 66 33 |ed in th|is diff3|
|00004a30| 5f 62 6c 6f 63 6b 2e 20 | 20 43 72 65 61 74 65 20 |_block. | Create |
|00004a40| 69 74 2e 20 20 2a 2f 0a | 58 0a 58 20 20 20 20 20 |it. */.|X.X |
|00004a50| 20 74 6d 70 62 6c 6f 63 | 6b 20 3d 20 75 73 69 6e | tmpbloc|k = usin|
|00004a60| 67 5f 74 6f 5f 64 69 66 | 66 33 5f 62 6c 6f 63 6b |g_to_dif|f3_block|
|00004a70| 20 28 75 73 69 6e 67 2c | 20 6c 61 73 74 5f 75 73 | (using,| last_us|
|00004a80| 69 6e 67 2c 0a 58 09 09 | 09 09 20 20 20 20 20 20 |ing,.X..|.. |
|00004a90| 20 62 61 73 65 5f 77 61 | 74 65 72 5f 74 68 72 65 | base_wa|ter_thre|
|00004aa0| 61 64 2c 20 68 69 67 68 | 5f 77 61 74 65 72 5f 74 |ad, high|_water_t|
|00004ab0| 68 72 65 61 64 2c 0a 58 | 09 09 09 09 20 20 20 20 |hread,.X|.... |
|00004ac0| 20 20 20 6c 61 73 74 5f | 64 69 66 66 29 3b 0a 58 | last_|diff);.X|
|00004ad0| 0a 58 20 20 20 20 20 20 | 69 66 20 28 21 74 6d 70 |.X |if (!tmp|
|00004ae0| 62 6c 6f 63 6b 29 0a 58 | 09 66 61 74 61 6c 20 28 |block).X|.fatal (|
|00004af0| 22 69 6e 74 65 72 6e 61 | 6c 3a 20 73 63 72 65 77 |"interna|l: screw|
|00004b00| 75 70 20 69 6e 20 66 6f | 72 6d 61 74 20 6f 66 20 |up in fo|rmat of |
|00004b10| 64 69 66 66 20 62 6c 6f | 63 6b 73 22 29 3b 0a 58 |diff blo|cks");.X|
|00004b20| 0a 58 20 20 20 20 20 20 | 2f 2a 20 50 75 74 20 69 |.X |/* Put i|
|00004b30| 74 20 6f 6e 20 74 68 65 | 20 6c 69 73 74 20 2a 2f |t on the| list */|
|00004b40| 0a 58 20 20 20 20 20 20 | 69 66 20 28 72 65 73 75 |.X |if (resu|
|00004b50| 6c 74 29 0a 58 09 72 65 | 73 75 6c 74 5f 6c 61 73 |lt).X.re|sult_las|
|00004b60| 74 2d 3e 6e 65 78 74 20 | 3d 20 74 6d 70 62 6c 6f |t->next |= tmpblo|
|00004b70| 63 6b 3b 0a 58 20 20 20 | 20 20 20 65 6c 73 65 0a |ck;.X | else.|
|00004b80| 58 09 72 65 73 75 6c 74 | 20 3d 20 74 6d 70 62 6c |X.result| = tmpbl|
|00004b90| 6f 63 6b 3b 0a 58 20 20 | 20 20 20 20 72 65 73 75 |ock;.X | resu|
|00004ba0| 6c 74 5f 6c 61 73 74 20 | 3d 20 74 6d 70 62 6c 6f |lt_last |= tmpblo|
|00004bb0| 63 6b 3b 0a 58 0a 58 20 | 20 20 20 20 20 2f 2a 20 |ck;.X.X | /* |
|00004bc0| 53 65 74 75 70 20 63 6f | 72 72 65 73 70 6f 6e 64 |Setup co|rrespond|
|00004bd0| 69 6e 67 20 6c 69 6e 65 | 73 20 63 6f 72 72 65 63 |ing line|s correc|
|00004be0| 74 6c 79 20 2a 2f 0a 58 | 20 20 20 20 20 20 6c 61 |tly */.X| la|
|00004bf0| 73 74 5f 64 69 66 66 20 | 3d 20 74 6d 70 62 6c 6f |st_diff |= tmpblo|
|00004c00| 63 6b 3b 0a 58 20 20 20 | 20 7d 0a 58 20 20 72 65 |ck;.X | }.X re|
|00004c10| 74 75 72 6e 20 72 65 73 | 75 6c 74 3b 0a 58 7d 0a |turn res|ult;.X}.|
|00004c20| 58 0a 58 2f 2a 0a 58 20 | 2a 20 75 73 69 6e 67 5f |X.X/*.X |* using_|
|00004c30| 74 6f 5f 64 69 66 66 33 | 5f 62 6c 6f 63 6b 3a 0a |to_diff3|_block:.|
|00004c40| 58 20 2a 20 20 20 54 68 | 69 73 20 72 6f 75 74 69 |X * Th|is routi|
|00004c50| 6e 65 20 74 61 6b 65 73 | 20 74 77 6f 20 6c 69 73 |ne takes| two lis|
|00004c60| 74 73 20 6f 66 20 62 6c | 6f 63 6b 73 20 28 66 72 |ts of bl|ocks (fr|
|00004c70| 6f 6d 20 74 77 6f 20 73 | 65 70 61 72 61 74 65 20 |om two s|eparate |
|00004c80| 64 69 66 66 0a 58 20 2a | 20 74 68 72 65 61 64 73 |diff.X *| threads|
|00004c90| 29 20 61 6e 64 20 70 75 | 74 73 20 74 68 65 6d 20 |) and pu|ts them |
|00004ca0| 74 6f 67 65 74 68 65 72 | 20 69 6e 74 6f 20 6f 6e |together| into on|
|00004cb0| 65 20 64 69 66 66 33 20 | 62 6c 6f 63 6b 2e 0a 58 |e diff3 |block..X|
|00004cc0| 20 2a 20 49 74 20 74 68 | 65 6e 20 72 65 74 75 72 | * It th|en retur|
|00004cd0| 6e 73 20 61 20 70 6f 69 | 6e 74 65 72 20 74 6f 20 |ns a poi|nter to |
|00004ce0| 74 68 69 73 20 64 69 66 | 66 33 20 62 6c 6f 63 6b |this dif|f3 block|
|00004cf0| 20 6f 72 20 30 20 66 6f | 72 20 66 61 69 6c 75 72 | or 0 fo|r failur|
|00004d00| 65 2e 0a 58 20 2a 0a 58 | 20 2a 20 41 6c 6c 20 61 |e..X *.X| * All a|
|00004d10| 72 67 75 6d 65 6e 74 73 | 20 62 65 73 69 64 65 73 |rguments| besides|
|00004d20| 20 75 73 69 6e 67 20 61 | 72 65 20 66 6f 72 20 74 | using a|re for t|
|00004d30| 68 65 20 63 6f 6e 76 65 | 6e 69 65 6e 63 65 20 6f |he conve|nience o|
|00004d40| 66 20 74 68 65 20 72 6f | 75 74 69 6e 65 3b 0a 58 |f the ro|utine;.X|
|00004d50| 20 2a 20 74 68 65 79 20 | 63 6f 75 6c 64 20 62 65 | * they |could be|
|00004d60| 20 64 65 72 69 76 65 64 | 20 66 72 6f 6d 20 74 68 | derived| from th|
|00004d70| 65 20 75 73 69 6e 67 20 | 61 72 72 61 79 2e 0a 58 |e using |array..X|
|00004d80| 20 2a 20 4c 41 53 54 5f | 55 53 49 4e 47 20 69 73 | * LAST_|USING is|
|00004d90| 20 61 20 70 61 69 72 20 | 6f 66 20 70 6f 69 6e 74 | a pair |of point|
|00004da0| 65 72 73 20 74 6f 20 74 | 68 65 20 6c 61 73 74 20 |ers to t|he last |
|00004db0| 62 6c 6f 63 6b 73 20 69 | 6e 20 74 68 65 20 75 73 |blocks i|n the us|
|00004dc0| 69 6e 67 0a 58 20 2a 20 | 73 74 72 75 63 74 75 72 |ing.X * |structur|
|00004dd0| 65 2e 0a 58 20 2a 20 4c | 4f 57 5f 54 48 52 45 41 |e..X * L|OW_THREA|
|00004de0| 44 20 61 6e 64 20 48 49 | 47 48 5f 54 48 52 45 41 |D and HI|GH_THREA|
|00004df0| 44 20 74 65 6c 6c 20 77 | 68 69 63 68 20 74 68 72 |D tell w|hich thr|
|00004e00| 65 61 64 73 20 63 6f 6e | 74 61 69 6e 20 74 68 65 |eads con|tain the|
|00004e10| 20 6c 6f 77 65 73 74 0a | 58 20 2a 20 61 6e 64 20 | lowest.|X * and |
|00004e20| 68 69 67 68 65 73 74 20 | 6c 69 6e 65 20 6e 75 6d |highest |line num|
|00004e30| 62 65 72 73 20 66 6f 72 | 20 46 69 6c 65 30 2e 0a |bers for| File0..|
|00004e40| 58 20 2a 20 6c 61 73 74 | 5f 64 69 66 66 20 63 6f |X * last|_diff co|
|00004e50| 6e 74 61 69 6e 73 20 74 | 68 65 20 6c 61 73 74 20 |ntains t|he last |
|00004e60| 64 69 66 66 20 70 72 6f | 64 75 63 65 64 20 69 6e |diff pro|duced in|
|00004e70| 20 74 68 65 20 63 61 6c | 6c 69 6e 67 20 72 6f 75 | the cal|ling rou|
|00004e80| 74 69 6e 65 2e 0a 58 20 | 2a 20 54 68 69 73 20 69 |tine..X |* This i|
|00004e90| 73 20 75 73 65 64 20 66 | 6f 72 20 6c 69 6e 65 73 |s used f|or lines|
|00004ea0| 20 6d 61 70 70 69 6e 67 | 73 20 77 68 69 63 68 20 | mapping|s which |
|00004eb0| 77 6f 75 6c 64 20 73 74 | 69 6c 6c 20 62 65 20 69 |would st|ill be i|
|00004ec0| 64 65 6e 74 69 63 61 6c | 20 74 6f 0a 58 20 2a 20 |dentical| to.X * |
|00004ed0| 74 68 65 20 73 74 61 74 | 65 20 74 68 61 74 20 64 |the stat|e that d|
|00004ee0| 69 66 66 20 65 6e 64 65 | 64 20 69 6e 2e 0a 58 20 |iff ende|d in..X |
|00004ef0| 2a 0a 58 20 2a 20 41 20 | 64 69 73 74 69 6e 63 74 |*.X * A |distinct|
|00004f00| 69 6f 6e 20 73 68 6f 75 | 6c 64 20 62 65 20 6d 61 |ion shou|ld be ma|
|00004f10| 64 65 20 69 6e 20 74 68 | 69 73 20 72 6f 75 74 69 |de in th|is routi|
|00004f20| 6e 65 20 62 65 74 77 65 | 65 6e 20 74 68 65 20 74 |ne betwe|en the t|
|00004f30| 77 6f 20 64 69 66 66 73 | 0a 58 20 2a 20 74 68 61 |wo diffs|.X * tha|
|00004f40| 74 20 61 72 65 20 70 61 | 72 74 20 6f 66 20 61 20 |t are pa|rt of a |
|00004f50| 6e 6f 72 6d 61 6c 20 74 | 77 6f 20 64 69 66 66 20 |normal t|wo diff |
|00004f60| 62 6c 6f 63 6b 2c 20 61 | 6e 64 20 74 68 65 20 74 |block, a|nd the t|
|00004f70| 68 72 65 65 20 64 69 66 | 66 73 20 74 68 61 74 0a |hree dif|fs that.|
|00004f80| 58 20 2a 20 61 72 65 20 | 70 61 72 74 20 6f 66 20 |X * are |part of |
|00004f90| 61 20 64 69 66 66 33 5f | 62 6c 6f 63 6b 2e 0a 58 |a diff3_|block..X|
|00004fa0| 20 2a 2f 0a 58 73 74 72 | 75 63 74 20 64 69 66 66 | */.Xstr|uct diff|
|00004fb0| 33 5f 62 6c 6f 63 6b 20 | 2a 0a 58 75 73 69 6e 67 |3_block |*.Xusing|
|00004fc0| 5f 74 6f 5f 64 69 66 66 | 33 5f 62 6c 6f 63 6b 20 |_to_diff|3_block |
|00004fd0| 28 75 73 69 6e 67 2c 20 | 6c 61 73 74 5f 75 73 69 |(using, |last_usi|
|00004fe0| 6e 67 2c 20 6c 6f 77 5f | 74 68 72 65 61 64 2c 20 |ng, low_|thread, |
|00004ff0| 68 69 67 68 5f 74 68 72 | 65 61 64 2c 20 6c 61 73 |high_thr|ead, las|
|00005000| 74 5f 64 69 66 66 29 0a | 58 20 20 20 20 20 73 74 |t_diff).|X st|
|00005010| 72 75 63 74 20 64 69 66 | 66 5f 62 6c 6f 63 6b 0a |ruct dif|f_block.|
|00005020| 58 20 20 20 20 20 20 20 | 2a 75 73 69 6e 67 5b 32 |X |*using[2|
|00005030| 5d 2c 0a 58 20 20 20 20 | 20 20 20 2a 6c 61 73 74 |],.X | *last|
|00005040| 5f 75 73 69 6e 67 5b 32 | 5d 3b 0a 58 20 20 20 20 |_using[2|];.X |
|00005050| 20 69 6e 74 20 6c 6f 77 | 5f 74 68 72 65 61 64 2c | int low|_thread,|
|00005060| 20 68 69 67 68 5f 74 68 | 72 65 61 64 3b 0a 58 20 | high_th|read;.X |
|00005070| 20 20 20 20 73 74 72 75 | 63 74 20 64 69 66 66 33 | stru|ct diff3|
|00005080| 5f 62 6c 6f 63 6b 20 2a | 6c 61 73 74 5f 64 69 66 |_block *|last_dif|
|00005090| 66 3b 0a 58 7b 0a 58 20 | 20 69 6e 74 20 6c 6f 77 |f;.X{.X | int low|
|000050a0| 63 2c 20 68 69 67 68 63 | 2c 20 6c 6f 77 31 2c 20 |c, highc|, low1, |
|000050b0| 68 69 67 68 31 2c 20 6c | 6f 77 32 2c 20 68 69 67 |high1, l|ow2, hig|
|000050c0| 68 32 3b 0a 58 20 20 73 | 74 72 75 63 74 20 64 69 |h2;.X s|truct di|
|000050d0| 66 66 33 5f 62 6c 6f 63 | 6b 20 2a 72 65 73 75 6c |ff3_bloc|k *resul|
|000050e0| 74 3b 0a 58 20 20 73 74 | 72 75 63 74 20 64 69 66 |t;.X st|ruct dif|
|000050f0| 66 5f 62 6c 6f 63 6b 20 | 2a 70 74 72 3b 0a 58 20 |f_block |*ptr;.X |
|00005100| 20 69 6e 74 20 69 3b 0a | 58 20 20 69 6e 74 20 63 | int i;.|X int c|
|00005110| 75 72 72 65 6e 74 30 6c | 69 6e 65 3b 0a 58 20 20 |urrent0l|ine;.X |
|00005120| 0a 58 20 20 2f 2a 20 46 | 69 6e 64 20 74 68 65 20 |.X /* F|ind the |
|00005130| 72 61 6e 67 65 20 69 6e | 20 66 69 6c 65 30 20 2a |range in| file0 *|
|00005140| 2f 0a 58 20 20 6c 6f 77 | 63 20 3d 20 75 73 69 6e |/.X low|c = usin|
|00005150| 67 5b 6c 6f 77 5f 74 68 | 72 65 61 64 5d 2d 3e 72 |g[low_th|read]->r|
|00005160| 61 6e 67 65 73 5b 30 5d | 5b 53 54 41 52 54 5d 3b |anges[0]|[START];|
|00005170| 0a 58 20 20 68 69 67 68 | 63 20 3d 20 6c 61 73 74 |.X high|c = last|
|00005180| 5f 75 73 69 6e 67 5b 68 | 69 67 68 5f 74 68 72 65 |_using[h|igh_thre|
|00005190| 61 64 5d 2d 3e 72 61 6e | 67 65 73 5b 30 5d 5b 45 |ad]->ran|ges[0][E|
|000051a0| 4e 44 5d 3b 0a 58 0a 58 | 20 20 2f 2a 20 46 69 6e |ND];.X.X| /* Fin|
|000051b0| 64 20 74 68 65 20 72 61 | 6e 67 65 73 20 69 6e 20 |d the ra|nges in |
|000051c0| 74 68 65 20 6f 74 68 65 | 72 20 66 69 6c 65 73 2e |the othe|r files.|
|000051d0| 0a 58 20 20 20 20 20 49 | 66 20 75 73 69 6e 67 5b |.X I|f using[|
|000051e0| 78 5d 20 69 73 20 6e 75 | 6c 6c 2c 20 74 68 61 74 |x] is nu|ll, that|
|000051f0| 20 6d 65 61 6e 73 20 74 | 68 61 74 20 74 68 65 20 | means t|hat the |
|00005200| 66 69 6c 65 20 74 6f 20 | 77 68 69 63 68 20 74 68 |file to |which th|
|00005210| 61 74 20 64 69 66 66 0a | 58 20 20 20 20 20 72 65 |at diff.|X re|
|00005220| 66 65 72 73 20 69 73 20 | 65 71 75 69 76 61 6c 65 |fers is |equivale|
|00005230| 6e 74 20 74 6f 20 66 69 | 6c 65 20 30 20 6f 76 65 |nt to fi|le 0 ove|
|00005240| 72 20 74 68 69 73 20 72 | 61 6e 67 65 20 2a 2f 0a |r this r|ange */.|
|00005250| 58 20 20 0a 58 20 20 69 | 66 20 28 75 73 69 6e 67 |X .X i|f (using|
|00005260| 5b 30 5d 29 0a 58 20 20 | 20 20 7b 0a 58 20 20 20 |[0]).X | {.X |
|00005270| 20 20 20 6c 6f 77 31 20 | 3d 20 44 5f 4c 4f 57 5f | low1 |= D_LOW_|
|00005280| 4d 41 50 4c 49 4e 45 20 | 28 75 73 69 6e 67 5b 30 |MAPLINE |(using[0|
|00005290| 5d 2c 20 46 49 4c 45 30 | 2c 20 46 49 4c 45 31 2c |], FILE0|, FILE1,|
|000052a0| 20 6c 6f 77 63 29 3b 0a | 58 20 20 20 20 20 20 68 | lowc);.|X h|
|000052b0| 69 67 68 31 20 3d 20 44 | 5f 48 49 47 48 5f 4d 41 |igh1 = D|_HIGH_MA|
|000052c0| 50 4c 49 4e 45 20 28 6c | 61 73 74 5f 75 73 69 6e |PLINE (l|ast_usin|
|000052d0| 67 5b 30 5d 2c 20 46 49 | 4c 45 30 2c 20 46 49 4c |g[0], FI|LE0, FIL|
|000052e0| 45 31 2c 20 68 69 67 68 | 63 29 3b 20 0a 58 20 20 |E1, high|c); .X |
|000052f0| 20 20 7d 0a 58 20 20 65 | 6c 73 65 0a 58 20 20 20 | }.X e|lse.X |
|00005300| 20 7b 0a 58 20 20 20 20 | 20 20 6c 6f 77 31 20 3d | {.X | low1 =|
|00005310| 20 44 5f 48 49 47 48 5f | 4d 41 50 4c 49 4e 45 20 | D_HIGH_|MAPLINE |
|00005320| 28 6c 61 73 74 5f 64 69 | 66 66 2c 20 46 49 4c 45 |(last_di|ff, FILE|
|00005330| 43 2c 20 46 49 4c 45 31 | 2c 20 6c 6f 77 63 29 3b |C, FILE1|, lowc);|
|00005340| 0a 58 20 20 20 20 20 20 | 68 69 67 68 31 20 3d 20 |.X |high1 = |
|00005350| 44 5f 48 49 47 48 5f 4d | 41 50 4c 49 4e 45 20 28 |D_HIGH_M|APLINE (|
|00005360| 6c 61 73 74 5f 64 69 66 | 66 2c 20 46 49 4c 45 43 |last_dif|f, FILEC|
|00005370| 2c 20 46 49 4c 45 31 2c | 20 68 69 67 68 63 29 3b |, FILE1,| highc);|
|00005380| 0a 58 20 20 20 20 7d 0a | 58 0a 58 20 20 2f 2a 0a |.X }.|X.X /*.|
|00005390| 58 20 20 20 2a 20 4e 6f | 74 65 20 74 68 61 74 20 |X * No|te that |
|000053a0| 69 6e 20 74 68 65 20 66 | 6f 6c 6c 6f 77 69 6e 67 |in the f|ollowing|
|000053b0| 2c 20 77 65 20 75 73 65 | 20 66 69 6c 65 20 31 20 |, we use| file 1 |
|000053c0| 72 65 6c 61 74 69 76 65 | 20 74 6f 20 74 68 65 20 |relative| to the |
|000053d0| 64 69 66 66 2c 0a 58 20 | 20 20 2a 20 61 6e 64 20 |diff,.X | * and |
|000053e0| 66 69 6c 65 20 32 20 72 | 65 6c 61 74 69 76 65 20 |file 2 r|elative |
|000053f0| 74 6f 20 74 68 65 20 63 | 6f 72 72 65 73 70 6f 6e |to the c|orrespon|
|00005400| 64 69 6e 67 20 6c 69 6e | 65 73 20 73 74 72 75 63 |ding lin|es struc|
|00005410| 74 2e 0a 58 20 20 20 2a | 2f 0a 58 20 20 69 66 20 |t..X *|/.X if |
|00005420| 28 75 73 69 6e 67 5b 31 | 5d 29 0a 58 20 20 20 20 |(using[1|]).X |
|00005430| 7b 0a 58 20 20 20 20 20 | 20 6c 6f 77 32 20 3d 20 |{.X | low2 = |
|00005440| 44 5f 4c 4f 57 5f 4d 41 | 50 4c 49 4e 45 20 28 75 |D_LOW_MA|PLINE (u|
|00005450| 73 69 6e 67 5b 31 5d 2c | 20 46 49 4c 45 30 2c 20 |sing[1],| FILE0, |
|00005460| 46 49 4c 45 31 2c 20 6c | 6f 77 63 29 3b 0a 58 20 |FILE1, l|owc);.X |
|00005470| 20 20 20 20 20 68 69 67 | 68 32 20 3d 20 44 5f 48 | hig|h2 = D_H|
|00005480| 49 47 48 5f 4d 41 50 4c | 49 4e 45 20 28 6c 61 73 |IGH_MAPL|INE (las|
|00005490| 74 5f 75 73 69 6e 67 5b | 31 5d 2c 20 46 49 4c 45 |t_using[|1], FILE|
|000054a0| 30 2c 20 46 49 4c 45 31 | 2c 20 68 69 67 68 63 29 |0, FILE1|, highc)|
|000054b0| 3b 20 0a 58 20 20 20 20 | 7d 0a 58 20 20 65 6c 73 |; .X |}.X els|
|000054c0| 65 0a 58 20 20 20 20 7b | 0a 58 20 20 20 20 20 20 |e.X {|.X |
|000054d0| 6c 6f 77 32 20 3d 20 44 | 5f 48 49 47 48 5f 4d 41 |low2 = D|_HIGH_MA|
|000054e0| 50 4c 49 4e 45 20 28 6c | 61 73 74 5f 64 69 66 66 |PLINE (l|ast_diff|
|000054f0| 2c 20 46 49 4c 45 43 2c | 20 46 49 4c 45 32 2c 20 |, FILEC,| FILE2, |
|00005500| 6c 6f 77 63 29 3b 0a 58 | 20 20 20 20 20 20 68 69 |lowc);.X| hi|
|00005510| 67 68 32 20 3d 20 44 5f | 48 49 47 48 5f 4d 41 50 |gh2 = D_|HIGH_MAP|
|00005520| 4c 49 4e 45 20 28 6c 61 | 73 74 5f 64 69 66 66 2c |LINE (la|st_diff,|
|00005530| 20 46 49 4c 45 43 2c 20 | 46 49 4c 45 32 2c 20 68 | FILEC, |FILE2, h|
|00005540| 69 67 68 63 29 3b 0a 58 | 20 20 20 20 7d 0a 58 0a |ighc);.X| }.X.|
|00005550| 58 20 20 2f 2a 20 43 72 | 65 61 74 65 20 61 20 62 |X /* Cr|eate a b|
|00005560| 6c 6f 63 6b 20 77 69 74 | 68 20 74 68 65 20 61 70 |lock wit|h the ap|
|00005570| 70 72 6f 70 72 69 61 74 | 65 20 73 69 7a 65 73 20 |propriat|e sizes |
|00005580| 2a 2f 0a 58 20 20 72 65 | 73 75 6c 74 20 3d 20 63 |*/.X re|sult = c|
|00005590| 72 65 61 74 65 5f 64 69 | 66 66 33 5f 62 6c 6f 63 |reate_di|ff3_bloc|
|000055a0| 6b 20 28 6c 6f 77 63 2c | 20 68 69 67 68 63 2c 20 |k (lowc,| highc, |
|000055b0| 6c 6f 77 31 2c 20 68 69 | 67 68 31 2c 20 6c 6f 77 |low1, hi|gh1, low|
|000055c0| 32 2c 20 68 69 67 68 32 | 29 3b 0a 58 0a 58 20 20 |2, high2|);.X.X |
|000055d0| 2f 2a 20 43 6f 70 79 20 | 6f 76 65 72 20 61 6c 6c |/* Copy |over all|
|000055e0| 20 6f 66 20 74 68 65 20 | 69 6e 66 6f 72 6d 61 74 | of the |informat|
|000055f0| 69 6f 6e 20 66 6f 72 20 | 46 69 6c 65 20 30 2e 20 |ion for |File 0. |
|00005600| 20 52 65 74 75 72 6e 20 | 77 69 74 68 20 61 20 7a | Return |with a z|
|00005610| 65 72 6f 0a 58 20 20 20 | 20 20 69 66 20 61 6e 79 |ero.X | if any|
|00005620| 20 6f 66 20 74 68 65 20 | 63 6f 6d 70 61 72 65 73 | of the |compares|
|00005630| 20 66 61 69 6c 65 64 2e | 20 2a 2f 0a 58 20 20 66 | failed.| */.X f|
|00005640| 6f 72 20 28 70 74 72 20 | 3d 20 75 73 69 6e 67 5b |or (ptr |= using[|
|00005650| 30 5d 3b 20 70 74 72 3b | 20 70 74 72 20 3d 20 44 |0]; ptr;| ptr = D|
|00005660| 5f 4e 45 58 54 20 28 70 | 74 72 29 29 0a 58 20 20 |_NEXT (p|tr)).X |
|00005670| 20 20 7b 0a 58 20 20 20 | 20 20 20 69 6e 74 20 72 | {.X | int r|
|00005680| 65 73 75 6c 74 5f 6f 66 | 66 73 65 74 20 3d 20 44 |esult_of|fset = D|
|00005690| 5f 4c 4f 57 4c 49 4e 45 | 20 28 70 74 72 2c 20 46 |_LOWLINE| (ptr, F|
|000056a0| 49 4c 45 30 29 20 2d 20 | 6c 6f 77 63 3b 0a 58 20 |ILE0) - |lowc;.X |
|000056b0| 20 20 20 20 20 69 6e 74 | 20 63 6f 70 79 5f 73 69 | int| copy_si|
|000056c0| 7a 65 0a 58 09 3d 20 44 | 5f 48 49 47 48 4c 49 4e |ze.X.= D|_HIGHLIN|
|000056d0| 45 20 28 70 74 72 2c 20 | 46 49 4c 45 30 29 20 2d |E (ptr, |FILE0) -|
|000056e0| 20 44 5f 4c 4f 57 4c 49 | 4e 45 20 28 70 74 72 2c | D_LOWLI|NE (ptr,|
|000056f0| 20 46 49 4c 45 30 29 20 | 2b 20 31 3b 0a 58 20 20 | FILE0) |+ 1;.X |
|00005700| 20 20 20 20 0a 58 20 20 | 20 20 20 20 69 66 20 28 | .X | if (|
|00005710| 21 63 6f 70 79 5f 73 74 | 72 69 6e 67 6c 69 73 74 |!copy_st|ringlist|
|00005720| 20 28 44 5f 4c 49 4e 45 | 41 52 52 41 59 20 28 70 | (D_LINE|ARRAY (p|
|00005730| 74 72 2c 20 46 49 4c 45 | 30 29 2c 0a 58 09 09 09 |tr, FILE|0),.X...|
|00005740| 20 20 20 20 44 5f 4c 45 | 4e 41 52 52 41 59 20 28 | D_LE|NARRAY (|
|00005750| 70 74 72 2c 20 46 49 4c | 45 30 29 2c 0a 58 09 09 |ptr, FIL|E0),.X..|
|00005760| 09 20 20 20 20 44 5f 4c | 49 4e 45 41 52 52 41 59 |. D_L|INEARRAY|
|00005770| 20 28 72 65 73 75 6c 74 | 2c 20 46 49 4c 45 43 29 | (result|, FILEC)|
|00005780| 20 2b 20 72 65 73 75 6c | 74 5f 6f 66 66 73 65 74 | + resul|t_offset|
|00005790| 2c 0a 58 09 09 09 20 20 | 20 20 44 5f 4c 45 4e 41 |,.X... | D_LENA|
|000057a0| 52 52 41 59 20 28 72 65 | 73 75 6c 74 2c 20 46 49 |RRAY (re|sult, FI|
|000057b0| 4c 45 43 29 20 2b 20 72 | 65 73 75 6c 74 5f 6f 66 |LEC) + r|esult_of|
|000057c0| 66 73 65 74 2c 0a 58 09 | 09 09 20 20 20 20 63 6f |fset,.X.|.. co|
|000057d0| 70 79 5f 73 69 7a 65 29 | 29 0a 58 09 72 65 74 75 |py_size)|).X.retu|
|000057e0| 72 6e 20 30 3b 0a 58 20 | 20 20 20 7d 0a 58 0a 58 |rn 0;.X | }.X.X|
|000057f0| 20 20 66 6f 72 20 28 70 | 74 72 20 3d 20 75 73 69 | for (p|tr = usi|
|00005800| 6e 67 5b 31 5d 3b 20 70 | 74 72 3b 20 70 74 72 20 |ng[1]; p|tr; ptr |
|00005810| 3d 20 44 5f 4e 45 58 54 | 20 28 70 74 72 29 29 0a |= D_NEXT| (ptr)).|
|00005820| 58 20 20 20 20 7b 0a 58 | 20 20 20 20 20 20 69 6e |X {.X| in|
|00005830| 74 20 72 65 73 75 6c 74 | 5f 6f 66 66 73 65 74 20 |t result|_offset |
|00005840| 3d 20 44 5f 4c 4f 57 4c | 49 4e 45 20 28 70 74 72 |= D_LOWL|INE (ptr|
|00005850| 2c 20 46 49 4c 45 43 29 | 20 2d 20 6c 6f 77 63 3b |, FILEC)| - lowc;|
|00005860| 0a 58 20 20 20 20 20 20 | 69 6e 74 20 63 6f 70 79 |.X |int copy|
|00005870| 5f 73 69 7a 65 0a 58 09 | 3d 20 44 5f 48 49 47 48 |_size.X.|= D_HIGH|
|00005880| 4c 49 4e 45 20 28 70 74 | 72 2c 20 46 49 4c 45 43 |LINE (pt|r, FILEC|
|00005890| 29 20 2d 20 44 5f 4c 4f | 57 4c 49 4e 45 20 28 70 |) - D_LO|WLINE (p|
|000058a0| 74 72 2c 20 46 49 4c 45 | 43 29 20 2b 20 31 3b 0a |tr, FILE|C) + 1;.|
|000058b0| 58 20 20 20 20 20 20 0a | 58 20 20 20 20 20 20 69 |X .|X i|
|000058c0| 66 20 28 21 63 6f 70 79 | 5f 73 74 72 69 6e 67 6c |f (!copy|_stringl|
|000058d0| 69 73 74 20 28 44 5f 4c | 49 4e 45 41 52 52 41 59 |ist (D_L|INEARRAY|
|000058e0| 20 28 70 74 72 2c 20 46 | 49 4c 45 30 29 2c 0a 58 | (ptr, F|ILE0),.X|
|000058f0| 09 09 09 20 20 20 20 44 | 5f 4c 45 4e 41 52 52 41 |... D|_LENARRA|
|00005900| 59 20 28 70 74 72 2c 20 | 46 49 4c 45 30 29 2c 0a |Y (ptr, |FILE0),.|
|00005910| 58 09 09 09 20 20 20 20 | 44 5f 4c 49 4e 45 41 52 |X... |D_LINEAR|
|00005920| 52 41 59 20 28 72 65 73 | 75 6c 74 2c 20 46 49 4c |RAY (res|ult, FIL|
|00005930| 45 43 29 20 2b 20 72 65 | 73 75 6c 74 5f 6f 66 66 |EC) + re|sult_off|
|00005940| 73 65 74 2c 0a 58 09 09 | 09 20 20 20 20 44 5f 4c |set,.X..|. D_L|
|00005950| 45 4e 41 52 52 41 59 20 | 28 72 65 73 75 6c 74 2c |ENARRAY |(result,|
|00005960| 20 46 49 4c 45 43 29 20 | 2b 20 72 65 73 75 6c 74 | FILEC) |+ result|
|00005970| 5f 6f 66 66 73 65 74 2c | 0a 58 09 09 09 20 20 20 |_offset,|.X... |
|00005980| 20 63 6f 70 79 5f 73 69 | 7a 65 29 29 0a 58 09 72 | copy_si|ze)).X.r|
|00005990| 65 74 75 72 6e 20 30 3b | 0a 58 20 20 20 20 7d 0a |eturn 0;|.X }.|
|000059a0| 58 0a 58 20 20 2f 2a 20 | 43 6f 70 79 20 73 74 75 |X.X /* |Copy stu|
|000059b0| 66 66 20 66 6f 72 20 66 | 69 6c 65 20 31 2e 20 20 |ff for f|ile 1. |
|000059c0| 46 69 72 73 74 20 64 65 | 61 6c 20 77 69 74 68 20 |First de|al with |
|000059d0| 61 6e 79 74 68 69 6e 67 | 20 74 68 61 74 20 6d 69 |anything| that mi|
|000059e0| 67 68 74 20 62 65 0a 58 | 20 20 20 20 20 62 65 66 |ght be.X| bef|
|000059f0| 6f 72 65 20 74 68 65 20 | 66 69 72 73 74 20 64 69 |ore the |first di|
|00005a00| 66 66 2e 20 2a 2f 0a 58 | 0a 58 20 20 66 6f 72 20 |ff. */.X|.X for |
|00005a10| 28 69 20 3d 20 30 3b 0a | 58 20 20 20 20 20 20 20 |(i = 0;.|X |
|00005a20| 69 20 2b 20 6c 6f 77 31 | 20 3c 20 28 75 73 69 6e |i + low1| < (usin|
|00005a30| 67 5b 30 5d 20 3f 20 44 | 5f 4c 4f 57 4c 49 4e 45 |g[0] ? D|_LOWLINE|
|00005a40| 20 28 75 73 69 6e 67 5b | 30 5d 2c 20 46 49 4c 45 | (using[|0], FILE|
|00005a50| 31 29 20 3a 20 68 69 67 | 68 31 20 2b 20 31 29 3b |1) : hig|h1 + 1);|
|00005a60| 0a 58 20 20 20 20 20 20 | 20 69 2b 2b 29 0a 58 20 |.X | i++).X |
|00005a70| 20 20 20 7b 0a 58 20 20 | 20 20 20 20 44 5f 52 45 | {.X | D_RE|
|00005a80| 4c 4e 55 4d 20 28 72 65 | 73 75 6c 74 2c 20 46 49 |LNUM (re|sult, FI|
|00005a90| 4c 45 31 2c 20 69 29 20 | 3d 20 44 5f 52 45 4c 4e |LE1, i) |= D_RELN|
|00005aa0| 55 4d 20 28 72 65 73 75 | 6c 74 2c 20 46 49 4c 45 |UM (resu|lt, FILE|
|00005ab0| 43 2c 20 69 29 3b 0a 58 | 20 20 20 20 20 20 44 5f |C, i);.X| D_|
|00005ac0| 52 45 4c 4c 45 4e 20 28 | 72 65 73 75 6c 74 2c 20 |RELLEN (|result, |
|00005ad0| 46 49 4c 45 31 2c 20 69 | 29 20 3d 20 44 5f 52 45 |FILE1, i|) = D_RE|
|00005ae0| 4c 4c 45 4e 20 28 72 65 | 73 75 6c 74 2c 20 46 49 |LLEN (re|sult, FI|
|00005af0| 4c 45 43 2c 20 69 29 3b | 0a 58 20 20 20 20 7d 0a |LEC, i);|.X }.|
|00005b00| 58 20 20 0a 58 20 20 66 | 6f 72 20 28 70 74 72 20 |X .X f|or (ptr |
|00005b10| 3d 20 75 73 69 6e 67 5b | 30 5d 3b 20 70 74 72 3b |= using[|0]; ptr;|
|00005b20| 20 70 74 72 20 3d 20 44 | 5f 4e 45 58 54 20 28 70 | ptr = D|_NEXT (p|
|00005b30| 74 72 29 29 0a 58 20 20 | 20 20 7b 0a 58 20 20 20 |tr)).X | {.X |
|00005b40| 20 20 20 69 6e 74 20 72 | 65 73 75 6c 74 5f 6f 66 | int r|esult_of|
|00005b50| 66 73 65 74 20 3d 20 44 | 5f 4c 4f 57 4c 49 4e 45 |fset = D|_LOWLINE|
|00005b60| 20 28 70 74 72 2c 20 46 | 49 4c 45 31 29 20 2d 20 | (ptr, F|ILE1) - |
|00005b70| 6c 6f 77 31 3b 0a 58 20 | 20 20 20 20 20 69 6e 74 |low1;.X | int|
|00005b80| 20 63 6f 70 79 5f 73 69 | 7a 65 0a 58 09 3d 20 44 | copy_si|ze.X.= D|
|00005b90| 5f 48 49 47 48 4c 49 4e | 45 20 28 70 74 72 2c 20 |_HIGHLIN|E (ptr, |
|00005ba0| 46 49 4c 45 31 29 20 2d | 20 44 5f 4c 4f 57 4c 49 |FILE1) -| D_LOWLI|
|00005bb0| 4e 45 20 28 70 74 72 2c | 20 46 49 4c 45 31 29 20 |NE (ptr,| FILE1) |
|00005bc0| 2b 20 31 3b 0a 58 0a 58 | 20 20 20 20 20 20 69 66 |+ 1;.X.X| if|
|00005bd0| 20 28 21 63 6f 70 79 5f | 73 74 72 69 6e 67 6c 69 | (!copy_|stringli|
|00005be0| 73 74 20 28 44 5f 4c 49 | 4e 45 41 52 52 41 59 20 |st (D_LI|NEARRAY |
|00005bf0| 28 70 74 72 2c 20 46 49 | 4c 45 31 29 2c 0a 58 09 |(ptr, FI|LE1),.X.|
|00005c00| 09 09 20 20 20 20 44 5f | 4c 45 4e 41 52 52 41 59 |.. D_|LENARRAY|
|00005c10| 20 28 70 74 72 2c 20 46 | 49 4c 45 31 29 2c 0a 58 | (ptr, F|ILE1),.X|
|00005c20| 09 09 09 20 20 20 20 44 | 5f 4c 49 4e 45 41 52 52 |... D|_LINEARR|
|00005c30| 41 59 20 28 72 65 73 75 | 6c 74 2c 20 46 49 4c 45 |AY (resu|lt, FILE|
|00005c40| 31 29 20 2b 20 72 65 73 | 75 6c 74 5f 6f 66 66 73 |1) + res|ult_offs|
|00005c50| 65 74 2c 0a 58 09 09 09 | 20 20 20 20 44 5f 4c 45 |et,.X...| D_LE|
|00005c60| 4e 41 52 52 41 59 20 28 | 72 65 73 75 6c 74 2c 20 |NARRAY (|result, |
|00005c70| 46 49 4c 45 31 29 20 2b | 20 72 65 73 75 6c 74 5f |FILE1) +| result_|
|00005c80| 6f 66 66 73 65 74 2c 0a | 58 09 09 09 20 20 20 20 |offset,.|X... |
|00005c90| 63 6f 70 79 5f 73 69 7a | 65 29 29 0a 58 09 72 65 |copy_siz|e)).X.re|
|00005ca0| 74 75 72 6e 20 30 3b 0a | 58 0a 58 20 20 20 20 20 |turn 0;.|X.X |
|00005cb0| 20 2f 2a 20 43 61 74 63 | 68 20 74 68 65 20 6c 69 | /* Catc|h the li|
|00005cc0| 6e 65 73 20 62 65 74 77 | 65 65 6e 20 68 65 72 65 |nes betw|een here|
|00005cd0| 20 61 6e 64 20 74 68 65 | 20 6e 65 78 74 20 64 69 | and the| next di|
|00005ce0| 66 66 20 2a 2f 0a 58 20 | 20 20 20 20 20 63 75 72 |ff */.X | cur|
|00005cf0| 72 65 6e 74 30 6c 69 6e | 65 20 3d 20 44 5f 48 49 |rent0lin|e = D_HI|
|00005d00| 47 48 4c 49 4e 45 20 28 | 70 74 72 2c 20 46 49 4c |GHLINE (|ptr, FIL|
|00005d10| 45 30 29 20 2b 20 31 20 | 2d 20 6c 6f 77 63 3b 0a |E0) + 1 |- lowc;.|
|00005d20| 58 20 20 20 20 20 20 66 | 6f 72 20 28 69 20 3d 20 |X f|or (i = |
|00005d30| 44 5f 48 49 47 48 4c 49 | 4e 45 20 28 70 74 72 2c |D_HIGHLI|NE (ptr,|
|00005d40| 20 46 49 4c 45 31 29 20 | 2b 20 31 20 2d 20 6c 6f | FILE1) |+ 1 - lo|
|00005d50| 77 31 3b 0a 58 09 20 20 | 20 69 20 3c 20 28 44 5f |w1;.X. | i < (D_|
|00005d60| 4e 45 58 54 20 28 70 74 | 72 29 20 3f 0a 58 09 09 |NEXT (pt|r) ?.X..|
|00005d70| 44 5f 4c 4f 57 4c 49 4e | 45 20 28 44 5f 4e 45 58 |D_LOWLIN|E (D_NEX|
|00005d80| 54 20 28 70 74 72 29 2c | 20 46 49 4c 45 31 29 20 |T (ptr),| FILE1) |
|00005d90| 3a 0a 58 09 09 68 69 67 | 68 31 20 2b 20 31 29 20 |:.X..hig|h1 + 1) |
|00005da0| 2d 20 6c 6f 77 31 3b 0a | 58 09 20 20 20 69 2b 2b |- low1;.|X. i++|
|00005db0| 29 0a 58 09 7b 0a 58 09 | 20 20 44 5f 52 45 4c 4e |).X.{.X.| D_RELN|
|00005dc0| 55 4d 20 28 72 65 73 75 | 6c 74 2c 20 46 49 4c 45 |UM (resu|lt, FILE|
|00005dd0| 31 2c 20 69 29 0a 58 09 | 20 20 20 20 3d 20 44 5f |1, i).X.| = D_|
|00005de0| 52 45 4c 4e 55 4d 20 28 | 72 65 73 75 6c 74 2c 20 |RELNUM (|result, |
|00005df0| 46 49 4c 45 43 2c 20 63 | 75 72 72 65 6e 74 30 6c |FILEC, c|urrent0l|
|00005e00| 69 6e 65 29 3b 0a 58 09 | 20 20 44 5f 52 45 4c 4c |ine);.X.| D_RELL|
|00005e10| 45 4e 20 28 72 65 73 75 | 6c 74 2c 20 46 49 4c 45 |EN (resu|lt, FILE|
|00005e20| 31 2c 20 69 29 0a 58 09 | 20 20 20 20 3d 20 44 5f |1, i).X.| = D_|
|00005e30| 52 45 4c 4c 45 4e 20 28 | 72 65 73 75 6c 74 2c 20 |RELLEN (|result, |
|00005e40| 46 49 4c 45 43 2c 20 63 | 75 72 72 65 6e 74 30 6c |FILEC, c|urrent0l|
|00005e50| 69 6e 65 2b 2b 29 3b 0a | 58 09 7d 0a 58 20 20 20 |ine++);.|X.}.X |
|00005e60| 20 7d 0a 58 0a 58 20 20 | 2f 2a 20 43 6f 70 79 20 | }.X.X |/* Copy |
|00005e70| 73 74 75 66 66 20 66 6f | 72 20 66 69 6c 65 20 32 |stuff fo|r file 2|
|00005e80| 2e 20 20 46 69 72 73 74 | 20 64 65 61 6c 20 77 69 |. First| deal wi|
|00005e90| 74 68 20 61 6e 79 74 68 | 69 6e 67 20 74 68 61 74 |th anyth|ing that|
|00005ea0| 20 6d 69 67 68 74 20 62 | 65 0a 58 20 20 20 20 20 | might b|e.X |
|00005eb0| 62 65 66 6f 72 65 20 74 | 68 65 20 66 69 72 73 74 |before t|he first|
|00005ec0| 20 64 69 66 66 2e 20 2a | 2f 0a 58 0a 58 20 20 66 | diff. *|/.X.X f|
|00005ed0| 6f 72 20 28 69 20 3d 20 | 30 3b 0a 58 20 20 20 20 |or (i = |0;.X |
|00005ee0| 20 20 20 69 20 2b 20 6c | 6f 77 32 20 3c 20 28 75 | i + l|ow2 < (u|
|00005ef0| 73 69 6e 67 5b 31 5d 20 | 3f 20 44 5f 4c 4f 57 4c |sing[1] |? D_LOWL|
|00005f00| 49 4e 45 20 28 75 73 69 | 6e 67 5b 31 5d 2c 20 46 |INE (usi|ng[1], F|
|00005f10| 49 4c 45 31 29 20 3a 20 | 68 69 67 68 32 20 2b 20 |ILE1) : |high2 + |
|00005f20| 31 29 3b 0a 58 20 20 20 | 20 20 20 20 69 2b 2b 29 |1);.X | i++)|
|00005f30| 0a 58 20 20 20 20 7b 0a | 58 20 20 20 20 20 20 44 |.X {.|X D|
|00005f40| 5f 52 45 4c 4e 55 4d 20 | 28 72 65 73 75 6c 74 2c |_RELNUM |(result,|
|00005f50| 20 46 49 4c 45 32 2c 20 | 69 29 20 3d 20 44 5f 52 | FILE2, |i) = D_R|
|00005f60| 45 4c 4e 55 4d 20 28 72 | 65 73 75 6c 74 2c 20 46 |ELNUM (r|esult, F|
|00005f70| 49 4c 45 43 2c 20 69 29 | 3b 0a 58 20 20 20 20 20 |ILEC, i)|;.X |
|00005f80| 20 44 5f 52 45 4c 4c 45 | 4e 20 28 72 65 73 75 6c | D_RELLE|N (resul|
|00005f90| 74 2c 20 46 49 4c 45 32 | 2c 20 69 29 20 3d 20 44 |t, FILE2|, i) = D|
|00005fa0| 5f 52 45 4c 4c 45 4e 20 | 28 72 65 73 75 6c 74 2c |_RELLEN |(result,|
|00005fb0| 20 46 49 4c 45 43 2c 20 | 69 29 3b 0a 58 20 20 20 | FILEC, |i);.X |
|00005fc0| 20 7d 0a 58 20 20 0a 58 | 20 20 66 6f 72 20 28 70 | }.X .X| for (p|
|00005fd0| 74 72 20 3d 20 75 73 69 | 6e 67 5b 31 5d 3b 20 70 |tr = usi|ng[1]; p|
|00005fe0| 74 72 3b 20 70 74 72 20 | 3d 20 44 5f 4e 45 58 54 |tr; ptr |= D_NEXT|
|00005ff0| 20 28 70 74 72 29 29 0a | 58 20 20 20 20 7b 0a 58 | (ptr)).|X {.X|
|00006000| 20 20 20 20 20 20 69 6e | 74 20 72 65 73 75 6c 74 | in|t result|
|00006010| 5f 6f 66 66 73 65 74 20 | 3d 20 44 5f 4c 4f 57 4c |_offset |= D_LOWL|
|00006020| 49 4e 45 20 28 70 74 72 | 2c 20 46 49 4c 45 31 29 |INE (ptr|, FILE1)|
|00006030| 20 2d 20 6c 6f 77 32 3b | 0a 58 20 20 20 20 20 20 | - low2;|.X |
|00006040| 69 6e 74 20 63 6f 70 79 | 5f 73 69 7a 65 0a 58 09 |int copy|_size.X.|
|00006050| 3d 20 44 5f 48 49 47 48 | 4c 49 4e 45 20 28 70 74 |= D_HIGH|LINE (pt|
|00006060| 72 2c 20 46 49 4c 45 31 | 29 20 2d 20 44 5f 4c 4f |r, FILE1|) - D_LO|
|00006070| 57 4c 49 4e 45 20 28 70 | 74 72 2c 20 46 49 4c 45 |WLINE (p|tr, FILE|
|00006080| 31 29 20 2b 20 31 3b 0a | 58 0a 58 20 20 20 20 20 |1) + 1;.|X.X |
|00006090| 20 69 66 20 28 21 63 6f | 70 79 5f 73 74 72 69 6e | if (!co|py_strin|
|000060a0| 67 6c 69 73 74 20 28 44 | 5f 4c 49 4e 45 41 52 52 |glist (D|_LINEARR|
|000060b0| 41 59 20 28 70 74 72 2c | 20 46 49 4c 45 31 29 2c |AY (ptr,| FILE1),|
|000060c0| 0a 58 09 09 09 20 20 20 | 20 44 5f 4c 45 4e 41 52 |.X... | D_LENAR|
|000060d0| 52 41 59 20 28 70 74 72 | 2c 20 46 49 4c 45 31 29 |RAY (ptr|, FILE1)|
|000060e0| 2c 0a 58 09 09 09 20 20 | 20 20 44 5f 4c 49 4e 45 |,.X... | D_LINE|
|000060f0| 41 52 52 41 59 20 28 72 | 65 73 75 6c 74 2c 20 46 |ARRAY (r|esult, F|
|00006100| 49 4c 45 32 29 20 2b 20 | 72 65 73 75 6c 74 5f 6f |ILE2) + |result_o|
|00006110| 66 66 73 65 74 2c 0a 58 | 09 09 09 20 20 20 20 44 |ffset,.X|... D|
|00006120| 5f 4c 45 4e 41 52 52 41 | 59 20 28 72 65 73 75 6c |_LENARRA|Y (resul|
|00006130| 74 2c 20 46 49 4c 45 32 | 29 20 2b 20 72 65 73 75 |t, FILE2|) + resu|
|00006140| 6c 74 5f 6f 66 66 73 65 | 74 2c 0a 58 09 09 09 20 |lt_offse|t,.X... |
|00006150| 20 20 20 63 6f 70 79 5f | 73 69 7a 65 29 29 0a 58 | copy_|size)).X|
|00006160| 09 72 65 74 75 72 6e 20 | 30 3b 0a 58 0a 58 20 20 |.return |0;.X.X |
|00006170| 20 20 20 20 2f 2a 20 43 | 61 74 63 68 20 74 68 65 | /* C|atch the|
|00006180| 20 6c 69 6e 65 73 20 62 | 65 74 77 65 65 6e 20 68 | lines b|etween h|
|00006190| 65 72 65 20 61 6e 64 20 | 74 68 65 20 6e 65 78 74 |ere and |the next|
|000061a0| 20 64 69 66 66 20 2a 2f | 0a 58 20 20 20 20 20 20 | diff */|.X |
|000061b0| 63 75 72 72 65 6e 74 30 | 6c 69 6e 65 20 3d 20 44 |current0|line = D|
|000061c0| 5f 48 49 47 48 4c 49 4e | 45 20 28 70 74 72 2c 20 |_HIGHLIN|E (ptr, |
|000061d0| 46 49 4c 45 30 29 20 2b | 20 31 20 2d 20 6c 6f 77 |FILE0) +| 1 - low|
|000061e0| 63 3b 0a 58 20 20 20 20 | 20 20 66 6f 72 20 28 69 |c;.X | for (i|
|000061f0| 20 3d 20 44 5f 48 49 47 | 48 4c 49 4e 45 20 28 70 | = D_HIG|HLINE (p|
|00006200| 74 72 2c 20 46 49 4c 45 | 31 29 20 2b 20 31 20 2d |tr, FILE|1) + 1 -|
|00006210| 20 6c 6f 77 32 3b 0a 58 | 09 20 20 20 69 20 3c 20 | low2;.X|. i < |
|00006220| 28 44 5f 4e 45 58 54 20 | 28 70 74 72 29 20 3f 0a |(D_NEXT |(ptr) ?.|
|00006230| 58 09 09 44 5f 4c 4f 57 | 4c 49 4e 45 20 28 44 5f |X..D_LOW|LINE (D_|
|00006240| 4e 45 58 54 20 28 70 74 | 72 29 2c 20 46 49 4c 45 |NEXT (pt|r), FILE|
|00006250| 31 29 20 3a 0a 58 09 09 | 68 69 67 68 32 20 2b 20 |1) :.X..|high2 + |
|00006260| 31 29 20 2d 20 6c 6f 77 | 32 3b 0a 58 09 20 20 20 |1) - low|2;.X. |
|00006270| 69 2b 2b 29 0a 58 09 7b | 0a 58 09 20 20 44 5f 52 |i++).X.{|.X. D_R|
|00006280| 45 4c 4e 55 4d 20 28 72 | 65 73 75 6c 74 2c 20 46 |ELNUM (r|esult, F|
|00006290| 49 4c 45 32 2c 20 69 29 | 0a 58 09 20 20 20 20 3d |ILE2, i)|.X. =|
|000062a0| 20 44 5f 52 45 4c 4e 55 | 4d 20 28 72 65 73 75 6c | D_RELNU|M (resul|
|000062b0| 74 2c 20 46 49 4c 45 43 | 2c 20 63 75 72 72 65 6e |t, FILEC|, curren|
|000062c0| 74 30 6c 69 6e 65 29 3b | 0a 58 09 20 20 44 5f 52 |t0line);|.X. D_R|
|000062d0| 45 4c 4c 45 4e 20 28 72 | 65 73 75 6c 74 2c 20 46 |ELLEN (r|esult, F|
|000062e0| 49 4c 45 32 2c 20 69 29 | 0a 58 09 20 20 20 20 3d |ILE2, i)|.X. =|
|000062f0| 20 44 5f 52 45 4c 4c 45 | 4e 20 28 72 65 73 75 6c | D_RELLE|N (resul|
|00006300| 74 2c 20 46 49 4c 45 43 | 2c 20 63 75 72 72 65 6e |t, FILEC|, curren|
|00006310| 74 30 6c 69 6e 65 2b 2b | 29 3b 0a 58 09 7d 0a 58 |t0line++|);.X.}.X|
|00006320| 20 20 20 20 7d 0a 58 0a | 58 20 20 2f 2a 20 53 65 | }.X.|X /* Se|
|00006330| 74 20 63 6f 72 72 65 73 | 70 6f 6e 64 20 2a 2f 0a |t corres|pond */.|
|00006340| 58 20 20 69 66 20 28 21 | 75 73 69 6e 67 5b 30 5d |X if (!|using[0]|
|00006350| 29 0a 58 20 20 20 20 44 | 33 5f 54 59 50 45 20 28 |).X D|3_TYPE (|
|00006360| 72 65 73 75 6c 74 29 20 | 3d 20 44 49 46 46 5f 33 |result) |= DIFF_3|
|00006370| 52 44 3b 0a 58 20 20 65 | 6c 73 65 20 69 66 20 28 |RD;.X e|lse if (|
|00006380| 21 75 73 69 6e 67 5b 31 | 5d 29 0a 58 20 20 20 20 |!using[1|]).X |
|00006390| 44 33 5f 54 59 50 45 20 | 28 72 65 73 75 6c 74 29 |D3_TYPE |(result)|
|000063a0| 20 3d 20 44 49 46 46 5f | 32 4e 44 3b 0a 58 20 20 | = DIFF_|2ND;.X |
|000063b0| 65 6c 73 65 0a 58 20 20 | 20 20 7b 0a 58 20 20 20 |else.X | {.X |
|000063c0| 20 20 20 69 6e 74 20 6e | 6c 31 0a 58 09 3d 20 44 | int n|l1.X.= D|
|000063d0| 5f 48 49 47 48 4c 49 4e | 45 20 28 72 65 73 75 6c |_HIGHLIN|E (resul|
|000063e0| 74 2c 20 46 49 4c 45 31 | 29 20 2d 20 44 5f 4c 4f |t, FILE1|) - D_LO|
|000063f0| 57 4c 49 4e 45 20 28 72 | 65 73 75 6c 74 2c 20 46 |WLINE (r|esult, F|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
