2 * LibXDiff by Davide Libenzi ( File Differential Library )
3 * Copyright (C) 2003 Davide Libenzi
5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either
8 * version 2.1 of the License, or (at your option) any later version.
10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Lesser General Public License for more details.
15 * You should have received a copy of the GNU Lesser General Public
16 * License along with this library; if not, write to the Free Software
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 * Davide Libenzi <davidel@xmailserver.org>
28 static long xdl_get_rec(xdfile_t
*xdf
, long ri
, char const **rec
);
29 static int xdl_emit_record(xdfile_t
*xdf
, long ri
, char const *pre
, xdemitcb_t
*ecb
);
34 static long xdl_get_rec(xdfile_t
*xdf
, long ri
, char const **rec
) {
36 *rec
= xdf
->recs
[ri
]->ptr
;
38 return xdf
->recs
[ri
]->size
;
42 static int xdl_emit_record(xdfile_t
*xdf
, long ri
, char const *pre
, xdemitcb_t
*ecb
) {
43 long size
, psize
= strlen(pre
);
46 size
= xdl_get_rec(xdf
, ri
, &rec
);
47 if (xdl_emit_diffrec(rec
, size
, pre
, psize
, ecb
) < 0) {
57 * Starting at the passed change atom, find the latest change atom to be included
58 * inside the differential hunk according to the specified configuration.
60 xdchange_t
*xdl_get_hunk(xdchange_t
*xscr
, xdemitconf_t
const *xecfg
) {
61 xdchange_t
*xch
, *xchp
;
62 long max_common
= 2 * xecfg
->ctxlen
+ xecfg
->interhunkctxlen
;
64 for (xchp
= xscr
, xch
= xscr
->next
; xch
; xchp
= xch
, xch
= xch
->next
)
65 if (xch
->i1
- (xchp
->i1
+ xchp
->chg1
) > max_common
)
72 static long def_ff(const char *rec
, long len
, char *buf
, long sz
, void *priv
)
75 (isalpha((unsigned char)*rec
) || /* identifier? */
76 *rec
== '_' || /* also identifier? */
77 *rec
== '$')) { /* identifiers from VMS and other esoterico */
80 while (0 < len
&& isspace((unsigned char)rec
[len
- 1]))
82 memcpy(buf
, rec
, len
);
88 static int xdl_emit_common(xdfenv_t
*xe
, xdchange_t
*xscr
, xdemitcb_t
*ecb
,
89 xdemitconf_t
const *xecfg
) {
90 xdfile_t
*xdf
= &xe
->xdf2
;
91 const char *rchg
= xdf
->rchg
;
94 for (ix
= 0; ix
< xdf
->nrec
; ix
++) {
97 if (xdl_emit_record(xdf
, ix
, "", ecb
))
108 static long get_func_line(xdfenv_t
*xe
, xdemitconf_t
const *xecfg
,
109 struct func_line
*func_line
, long start
, long limit
)
111 find_func_t ff
= xecfg
->find_func
? xecfg
->find_func
: def_ff
;
112 long l
, size
, step
= (start
> limit
) ? -1 : 1;
115 buf
= func_line
? func_line
->buf
: dummy
;
116 size
= func_line
? sizeof(func_line
->buf
) : sizeof(dummy
);
118 for (l
= start
; l
!= limit
&& 0 <= l
&& l
< xe
->xdf1
.nrec
; l
+= step
) {
120 long reclen
= xdl_get_rec(&xe
->xdf1
, l
, &rec
);
121 long len
= ff(rec
, reclen
, buf
, size
, xecfg
->find_func_priv
);
124 func_line
->len
= len
;
131 int xdl_emit_diff(xdfenv_t
*xe
, xdchange_t
*xscr
, xdemitcb_t
*ecb
,
132 xdemitconf_t
const *xecfg
) {
133 long s1
, s2
, e1
, e2
, lctx
;
134 xdchange_t
*xch
, *xche
;
135 long funclineprev
= -1;
136 struct func_line func_line
= { 0 };
138 if (xecfg
->flags
& XDL_EMIT_COMMON
)
139 return xdl_emit_common(xe
, xscr
, ecb
, xecfg
);
141 for (xch
= xscr
; xch
; xch
= xche
->next
) {
142 xche
= xdl_get_hunk(xch
, xecfg
);
144 s1
= XDL_MAX(xch
->i1
- xecfg
->ctxlen
, 0);
145 s2
= XDL_MAX(xch
->i2
- xecfg
->ctxlen
, 0);
147 if (xecfg
->flags
& XDL_EMIT_FUNCCONTEXT
) {
148 long fs1
= get_func_line(xe
, xecfg
, NULL
, xch
->i1
, -1);
158 lctx
= xecfg
->ctxlen
;
159 lctx
= XDL_MIN(lctx
, xe
->xdf1
.nrec
- (xche
->i1
+ xche
->chg1
));
160 lctx
= XDL_MIN(lctx
, xe
->xdf2
.nrec
- (xche
->i2
+ xche
->chg2
));
162 e1
= xche
->i1
+ xche
->chg1
+ lctx
;
163 e2
= xche
->i2
+ xche
->chg2
+ lctx
;
165 if (xecfg
->flags
& XDL_EMIT_FUNCCONTEXT
) {
166 long fe1
= get_func_line(xe
, xecfg
, NULL
,
167 xche
->i1
+ xche
->chg1
,
177 * Overlap with next change? Then include it
178 * in the current hunk and start over to find
182 long l
= xche
->next
->i1
;
184 get_func_line(xe
, xecfg
, NULL
, l
, e1
) < 0) {
192 * Emit current hunk header.
195 if (xecfg
->flags
& XDL_EMIT_FUNCNAMES
) {
196 get_func_line(xe
, xecfg
, &func_line
,
197 s1
- 1, funclineprev
);
198 funclineprev
= s1
- 1;
200 if (xdl_emit_hunk_hdr(s1
+ 1, e1
- s1
, s2
+ 1, e2
- s2
,
201 func_line
.buf
, func_line
.len
, ecb
) < 0)
207 for (; s2
< xch
->i2
; s2
++)
208 if (xdl_emit_record(&xe
->xdf2
, s2
, " ", ecb
) < 0)
211 for (s1
= xch
->i1
, s2
= xch
->i2
;; xch
= xch
->next
) {
213 * Merge previous with current change atom.
215 for (; s1
< xch
->i1
&& s2
< xch
->i2
; s1
++, s2
++)
216 if (xdl_emit_record(&xe
->xdf2
, s2
, " ", ecb
) < 0)
220 * Removes lines from the first file.
222 for (s1
= xch
->i1
; s1
< xch
->i1
+ xch
->chg1
; s1
++)
223 if (xdl_emit_record(&xe
->xdf1
, s1
, "-", ecb
) < 0)
227 * Adds lines from the second file.
229 for (s2
= xch
->i2
; s2
< xch
->i2
+ xch
->chg2
; s2
++)
230 if (xdl_emit_record(&xe
->xdf2
, s2
, "+", ecb
) < 0)
235 s1
= xch
->i1
+ xch
->chg1
;
236 s2
= xch
->i2
+ xch
->chg2
;
242 for (s2
= xche
->i2
+ xche
->chg2
; s2
< e2
; s2
++)
243 if (xdl_emit_record(&xe
->xdf2
, s2
, " ", ecb
) < 0)