1 74b37681 2019-02-07 stsp /*	$OpenBSD: diff3.c,v 1.41 2016/10/18 21:06:52 millert Exp $	*/
  2 74b37681 2019-02-07 stsp 
  3 74b37681 2019-02-07 stsp /*
  4 74b37681 2019-02-07 stsp  * Copyright (C) Caldera International Inc.  2001-2002.
  5 74b37681 2019-02-07 stsp  * All rights reserved.
  6 74b37681 2019-02-07 stsp  *
  7 74b37681 2019-02-07 stsp  * Redistribution and use in source and binary forms, with or without
  8 74b37681 2019-02-07 stsp  * modification, are permitted provided that the following conditions
  9 74b37681 2019-02-07 stsp  * are met:
 10 74b37681 2019-02-07 stsp  * 1. Redistributions of source code and documentation must retain the above
 11 74b37681 2019-02-07 stsp  *    copyright notice, this list of conditions and the following disclaimer.
 12 74b37681 2019-02-07 stsp  * 2. Redistributions in binary form must reproduce the above copyright
 13 74b37681 2019-02-07 stsp  *    notice, this list of conditions and the following disclaimer in the
 14 74b37681 2019-02-07 stsp  *    documentation and/or other materials provided with the distribution.
 15 74b37681 2019-02-07 stsp  * 3. All advertising materials mentioning features or use of this software
 16 74b37681 2019-02-07 stsp  *    must display the following acknowledgement:
 17 74b37681 2019-02-07 stsp  *	This product includes software developed or owned by Caldera
 18 74b37681 2019-02-07 stsp  *	International, Inc.
 19 74b37681 2019-02-07 stsp  * 4. Neither the name of Caldera International, Inc. nor the names of other
 20 74b37681 2019-02-07 stsp  *    contributors may be used to endorse or promote products derived from
 21 74b37681 2019-02-07 stsp  *    this software without specific prior written permission.
 22 74b37681 2019-02-07 stsp  *
 23 74b37681 2019-02-07 stsp  * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
 24 74b37681 2019-02-07 stsp  * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
 25 74b37681 2019-02-07 stsp  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 26 74b37681 2019-02-07 stsp  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 27 74b37681 2019-02-07 stsp  * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
 28 74b37681 2019-02-07 stsp  * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 29 74b37681 2019-02-07 stsp  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 30 74b37681 2019-02-07 stsp  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 31 74b37681 2019-02-07 stsp  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 32 74b37681 2019-02-07 stsp  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 33 74b37681 2019-02-07 stsp  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 34 74b37681 2019-02-07 stsp  * POSSIBILITY OF SUCH DAMAGE.
 35 74b37681 2019-02-07 stsp  */
 36 74b37681 2019-02-07 stsp /*-
 37 74b37681 2019-02-07 stsp  * Copyright (c) 1991, 1993
 38 74b37681 2019-02-07 stsp  *	The Regents of the University of California.  All rights reserved.
 39 74b37681 2019-02-07 stsp  *
 40 74b37681 2019-02-07 stsp  * Redistribution and use in source and binary forms, with or without
 41 74b37681 2019-02-07 stsp  * modification, are permitted provided that the following conditions
 42 74b37681 2019-02-07 stsp  * are met:
 43 74b37681 2019-02-07 stsp  * 1. Redistributions of source code must retain the above copyright
 44 74b37681 2019-02-07 stsp  *    notice, this list of conditions and the following disclaimer.
 45 74b37681 2019-02-07 stsp  * 2. Redistributions in binary form must reproduce the above copyright
 46 74b37681 2019-02-07 stsp  *    notice, this list of conditions and the following disclaimer in the
 47 74b37681 2019-02-07 stsp  *    documentation and/or other materials provided with the distribution.
 48 74b37681 2019-02-07 stsp  * 3. Neither the name of the University nor the names of its contributors
 49 74b37681 2019-02-07 stsp  *    may be used to endorse or promote products derived from this software
 50 74b37681 2019-02-07 stsp  *    without specific prior written permission.
 51 74b37681 2019-02-07 stsp  *
 52 74b37681 2019-02-07 stsp  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 53 74b37681 2019-02-07 stsp  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 54 74b37681 2019-02-07 stsp  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 55 74b37681 2019-02-07 stsp  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 56 74b37681 2019-02-07 stsp  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 57 74b37681 2019-02-07 stsp  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 58 74b37681 2019-02-07 stsp  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 59 74b37681 2019-02-07 stsp  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 60 74b37681 2019-02-07 stsp  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 61 74b37681 2019-02-07 stsp  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 62 74b37681 2019-02-07 stsp  * SUCH DAMAGE.
 63 74b37681 2019-02-07 stsp  *
 64 74b37681 2019-02-07 stsp  *	@(#)diff3.c	8.1 (Berkeley) 6/6/93
 65 74b37681 2019-02-07 stsp  */
 66 74b37681 2019-02-07 stsp 
 67 c03c6cb3 2019-02-08 stsp #include <sys/stat.h>
 68 c03c6cb3 2019-02-08 stsp #include <sys/queue.h>
 69 c03c6cb3 2019-02-08 stsp 
 70 74b37681 2019-02-07 stsp #include <ctype.h>
 71 c03c6cb3 2019-02-08 stsp #include <limits.h>
 72 74b37681 2019-02-07 stsp #include <stdio.h>
 73 c03c6cb3 2019-02-08 stsp #include <stdarg.h>
 74 74b37681 2019-02-07 stsp #include <stdlib.h>
 75 74b37681 2019-02-07 stsp #include <string.h>
 76 74b37681 2019-02-07 stsp #include <time.h>
 77 74b37681 2019-02-07 stsp #include <unistd.h>
 78 74b37681 2019-02-07 stsp 
 79 c03c6cb3 2019-02-08 stsp #include "got_error.h"
 80 c03c6cb3 2019-02-08 stsp #include "got_opentemp.h"
 81 c03c6cb3 2019-02-08 stsp #include "got_object.h"
 82 74b37681 2019-02-07 stsp 
 83 c03c6cb3 2019-02-08 stsp #include "buf.h"
 84 c03c6cb3 2019-02-08 stsp #include "rcsutil.h"
 85 c03c6cb3 2019-02-08 stsp #include "got_lib_diff.h"
 86 c03c6cb3 2019-02-08 stsp #include "worklist.h"
 87 c03c6cb3 2019-02-08 stsp 
 88 0d26ce36 2019-02-08 stsp #ifndef nitems
 89 0d26ce36 2019-02-08 stsp #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
 90 0d26ce36 2019-02-08 stsp #endif
 91 0d26ce36 2019-02-08 stsp 
 92 c03c6cb3 2019-02-08 stsp /* flags shared between merge(1) and rcsmerge(1) */
 93 c03c6cb3 2019-02-08 stsp #define MERGE_EFLAG     (1<<16)
 94 c03c6cb3 2019-02-08 stsp #define MERGE_OFLAG     (1<<17)
 95 c03c6cb3 2019-02-08 stsp 
 96 74b37681 2019-02-07 stsp /* diff3 - 3-way differential file comparison */
 97 74b37681 2019-02-07 stsp 
 98 74b37681 2019-02-07 stsp /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
 99 74b37681 2019-02-07 stsp  *
100 74b37681 2019-02-07 stsp  * d13 = diff report on f1 vs f3
101 74b37681 2019-02-07 stsp  * d23 = diff report on f2 vs f3
102 74b37681 2019-02-07 stsp  * f1, f2, f3 the 3 files
103 74b37681 2019-02-07 stsp  * if changes in f1 overlap with changes in f3, m1 and m3 are used
104 74b37681 2019-02-07 stsp  * to mark the overlaps; otherwise, the file names f1 and f3 are used
105 74b37681 2019-02-07 stsp  * (only for options E and X).
106 74b37681 2019-02-07 stsp  */
107 74b37681 2019-02-07 stsp 
108 74b37681 2019-02-07 stsp /*
109 74b37681 2019-02-07 stsp  * "from" is first in range of changed lines; "to" is last+1
110 74b37681 2019-02-07 stsp  * from=to=line after point of insertion for added lines.
111 74b37681 2019-02-07 stsp  */
112 74b37681 2019-02-07 stsp struct range {
113 74b37681 2019-02-07 stsp 	int from;
114 74b37681 2019-02-07 stsp 	int to;
115 74b37681 2019-02-07 stsp };
116 74b37681 2019-02-07 stsp 
117 74b37681 2019-02-07 stsp struct diff {
118 74b37681 2019-02-07 stsp 	struct range old;
119 74b37681 2019-02-07 stsp 	struct range new;
120 74b37681 2019-02-07 stsp };
121 74b37681 2019-02-07 stsp 
122 078e971d 2019-02-08 stsp struct diff3_state {
123 078e971d 2019-02-08 stsp 	size_t szchanges;
124 74b37681 2019-02-07 stsp 
125 078e971d 2019-02-08 stsp 	struct diff *d13;
126 078e971d 2019-02-08 stsp 	struct diff *d23;
127 74b37681 2019-02-07 stsp 
128 078e971d 2019-02-08 stsp 	/*
129 078e971d 2019-02-08 stsp 	 * "de" is used to gather editing scripts.  These are later spewed out
130 078e971d 2019-02-08 stsp 	 * in reverse order.  Its first element must be all zero, the "new"
131 078e971d 2019-02-08 stsp 	 * component of "de" contains line positions or byte positions
132 078e971d 2019-02-08 stsp 	 * depending on when you look (!?).  Array overlap indicates which
133 078e971d 2019-02-08 stsp 	 * sections in "de" correspond to lines that are different in all
134 078e971d 2019-02-08 stsp 	 * three files.
135 078e971d 2019-02-08 stsp 	 */
136 078e971d 2019-02-08 stsp 	struct diff *de;
137 078e971d 2019-02-08 stsp 	char *overlap;
138 078e971d 2019-02-08 stsp 	int overlapcnt;
139 078e971d 2019-02-08 stsp 	FILE *fp[3];
140 078e971d 2019-02-08 stsp 	int cline[3];		/* # of the last-read line in each file (0-2) */
141 74b37681 2019-02-07 stsp 
142 078e971d 2019-02-08 stsp 	/*
143 078e971d 2019-02-08 stsp 	 * the latest known correspondence between line numbers of the 3 files
144 078e971d 2019-02-08 stsp 	 * is stored in last[1-3];
145 078e971d 2019-02-08 stsp 	 */
146 078e971d 2019-02-08 stsp 	int last[4];
147 078e971d 2019-02-08 stsp 	int eflag;
148 078e971d 2019-02-08 stsp 	int oflag;
149 078e971d 2019-02-08 stsp 	int debug;
150 078e971d 2019-02-08 stsp 	char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* markers for -E and -X */
151 dfc4f8fe 2019-02-08 stsp 
152 dfc4f8fe 2019-02-08 stsp 	char *buf;
153 dfc4f8fe 2019-02-08 stsp 	size_t bufsize;
154 078e971d 2019-02-08 stsp };
155 078e971d 2019-02-08 stsp 
156 c03c6cb3 2019-02-08 stsp static BUF *diffbuf;
157 c03c6cb3 2019-02-08 stsp 
158 078e971d 2019-02-08 stsp static int duplicate(struct range *, struct range *, struct diff3_state *);
159 078e971d 2019-02-08 stsp static int edit(struct diff *, int, int, struct diff3_state *);
160 dfc4f8fe 2019-02-08 stsp static char *getchange(FILE *, struct diff3_state *);
161 dfc4f8fe 2019-02-08 stsp static char *get_line(FILE *, size_t *, struct diff3_state *);
162 74b37681 2019-02-07 stsp static int number(char **);
163 b90524b1 2019-02-08 stsp static const struct got_error *readin(size_t *, char *, struct diff **,
164 b90524b1 2019-02-08 stsp     struct diff3_state *);
165 c03c6cb3 2019-02-08 stsp static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
166 078e971d 2019-02-08 stsp static int skip(int, int, char *, struct diff3_state *);
167 078e971d 2019-02-08 stsp static int edscript(int, struct diff3_state *);
168 078e971d 2019-02-08 stsp static int merge(size_t, size_t, struct diff3_state *);
169 078e971d 2019-02-08 stsp static void change(int, struct range *, int, struct diff3_state *);
170 078e971d 2019-02-08 stsp static void keep(int, struct range *, struct diff3_state *);
171 74b37681 2019-02-07 stsp static void prange(struct range *);
172 078e971d 2019-02-08 stsp static void repos(int, struct diff3_state *);
173 74b37681 2019-02-07 stsp static void separate(const char *);
174 078e971d 2019-02-08 stsp static const struct got_error *increase(struct diff3_state *);
175 c03c6cb3 2019-02-08 stsp static const struct got_error *diff3_internal(char *, char *, char *,
176 078e971d 2019-02-08 stsp     char *, char *, const char *, const char *, struct diff3_state *);
177 74b37681 2019-02-07 stsp 
178 74b37681 2019-02-07 stsp int diff3_conflicts = 0;
179 74b37681 2019-02-07 stsp 
180 c03c6cb3 2019-02-08 stsp static const struct got_error *
181 c03c6cb3 2019-02-08 stsp diff_output(const char *fmt, ...)
182 c03c6cb3 2019-02-08 stsp {
183 c03c6cb3 2019-02-08 stsp 	va_list vap;
184 c03c6cb3 2019-02-08 stsp 	int i;
185 c03c6cb3 2019-02-08 stsp 	char *str;
186 c03c6cb3 2019-02-08 stsp 	size_t newsize;
187 c03c6cb3 2019-02-08 stsp 
188 c03c6cb3 2019-02-08 stsp 	va_start(vap, fmt);
189 c03c6cb3 2019-02-08 stsp 	i = vasprintf(&str, fmt, vap);
190 c03c6cb3 2019-02-08 stsp 	va_end(vap);
191 c03c6cb3 2019-02-08 stsp 	if (i == -1)
192 c03c6cb3 2019-02-08 stsp 		return got_error_from_errno();
193 c03c6cb3 2019-02-08 stsp 	if (diffbuf != NULL)
194 c03c6cb3 2019-02-08 stsp 		buf_append(&newsize, diffbuf, str, strlen(str));
195 c03c6cb3 2019-02-08 stsp 	else
196 c03c6cb3 2019-02-08 stsp 		printf("%s", str);
197 c03c6cb3 2019-02-08 stsp 	free(str);
198 c03c6cb3 2019-02-08 stsp 	return NULL;
199 c03c6cb3 2019-02-08 stsp }
200 c03c6cb3 2019-02-08 stsp 
201 c03c6cb3 2019-02-08 stsp static const struct got_error*
202 c03c6cb3 2019-02-08 stsp diffreg(BUF **d, const char *path1, const char *path2)
203 c03c6cb3 2019-02-08 stsp {
204 c03c6cb3 2019-02-08 stsp 	const struct got_error *err = NULL;
205 c03c6cb3 2019-02-08 stsp 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
206 c03c6cb3 2019-02-08 stsp 	char *outpath = NULL;
207 c03c6cb3 2019-02-08 stsp 	struct got_diff_state ds;
208 c03c6cb3 2019-02-08 stsp 	struct got_diff_args args;
209 c03c6cb3 2019-02-08 stsp 	int res;
210 c03c6cb3 2019-02-08 stsp 
211 c03c6cb3 2019-02-08 stsp 	*d = NULL;
212 c03c6cb3 2019-02-08 stsp 
213 c03c6cb3 2019-02-08 stsp 	f1 = fopen(path1, "r");
214 c03c6cb3 2019-02-08 stsp 	if (f1 == NULL) {
215 c03c6cb3 2019-02-08 stsp 		err = got_error_from_errno();
216 c03c6cb3 2019-02-08 stsp 		goto done;
217 c03c6cb3 2019-02-08 stsp 	}
218 c03c6cb3 2019-02-08 stsp 	f2 = fopen(path2, "r");
219 c03c6cb3 2019-02-08 stsp 	if (f1 == NULL) {
220 c03c6cb3 2019-02-08 stsp 		err = got_error_from_errno();
221 c03c6cb3 2019-02-08 stsp 		goto done;
222 c03c6cb3 2019-02-08 stsp 	}
223 c03c6cb3 2019-02-08 stsp 
224 c03c6cb3 2019-02-08 stsp 	err = got_opentemp_named(&outpath, &outfile, "/tmp/got-diff");
225 c03c6cb3 2019-02-08 stsp 	if (err)
226 c03c6cb3 2019-02-08 stsp 		goto done;
227 c03c6cb3 2019-02-08 stsp 
228 c03c6cb3 2019-02-08 stsp 	memset(&ds, 0, sizeof(ds));
229 c03c6cb3 2019-02-08 stsp 	/* XXX should stat buffers be passed in args instead of ds? */
230 c03c6cb3 2019-02-08 stsp 	if (stat(path1, &ds.stb1) == -1) {
231 c03c6cb3 2019-02-08 stsp 		err = got_error_from_errno();
232 c03c6cb3 2019-02-08 stsp 		goto done;
233 c03c6cb3 2019-02-08 stsp 	}
234 c03c6cb3 2019-02-08 stsp 	if (stat(path2, &ds.stb2) == -1) {
235 c03c6cb3 2019-02-08 stsp 		err = got_error_from_errno();
236 c03c6cb3 2019-02-08 stsp 		goto done;
237 c03c6cb3 2019-02-08 stsp 	}
238 c03c6cb3 2019-02-08 stsp 
239 c03c6cb3 2019-02-08 stsp 	memset(&args, 0, sizeof(args));
240 c03c6cb3 2019-02-08 stsp 	args.diff_format = D_NORMAL;
241 c03c6cb3 2019-02-08 stsp 	args.label[0] = "";
242 c03c6cb3 2019-02-08 stsp 	args.label[1] = "";
243 c03c6cb3 2019-02-08 stsp 	args.diff_context = 0;
244 c03c6cb3 2019-02-08 stsp 
245 c03c6cb3 2019-02-08 stsp 	err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
246 c03c6cb3 2019-02-08 stsp 	    outfile, NULL);
247 c03c6cb3 2019-02-08 stsp 	if (err)
248 c03c6cb3 2019-02-08 stsp 		goto done;
249 c03c6cb3 2019-02-08 stsp 
250 c03c6cb3 2019-02-08 stsp 	*d = buf_load(outpath);
251 c03c6cb3 2019-02-08 stsp 	if (*d == NULL)
252 c03c6cb3 2019-02-08 stsp 		err = got_error_from_errno();
253 c03c6cb3 2019-02-08 stsp done:
254 c03c6cb3 2019-02-08 stsp 	free(outpath);
255 c03c6cb3 2019-02-08 stsp 	if (outfile)
256 c03c6cb3 2019-02-08 stsp 		fclose(outfile);
257 c03c6cb3 2019-02-08 stsp 	if (f1)
258 c03c6cb3 2019-02-08 stsp 		fclose(f1);
259 c03c6cb3 2019-02-08 stsp 	if (f2)
260 c03c6cb3 2019-02-08 stsp 		fclose(f2);
261 c03c6cb3 2019-02-08 stsp 	return err;
262 c03c6cb3 2019-02-08 stsp }
263 c03c6cb3 2019-02-08 stsp 
264 74b37681 2019-02-07 stsp /*
265 74b37681 2019-02-07 stsp  * For merge(1).
266 74b37681 2019-02-07 stsp  */
267 c03c6cb3 2019-02-08 stsp const struct got_error *
268 0ec6f014 2019-02-08 stsp merge_diff3(BUF **buf, char *p1, char *p2, char *p3, int flags)
269 74b37681 2019-02-07 stsp {
270 c03c6cb3 2019-02-08 stsp 	const struct got_error *err = NULL;
271 c03c6cb3 2019-02-08 stsp 	char *dp13, *dp23, *path1, *path2, *path3;
272 74b37681 2019-02-07 stsp 	BUF *b1, *b2, *b3, *d1, *d2, *diffb;
273 74b37681 2019-02-07 stsp 	u_char *data, *patch;
274 74b37681 2019-02-07 stsp 	size_t dlen, plen;
275 c03c6cb3 2019-02-08 stsp 	struct wklhead temp_files;
276 078e971d 2019-02-08 stsp 	struct diff3_state *d3s;
277 0d26ce36 2019-02-08 stsp 	int i;
278 74b37681 2019-02-07 stsp 
279 c03c6cb3 2019-02-08 stsp 	*buf = NULL;
280 c03c6cb3 2019-02-08 stsp 
281 078e971d 2019-02-08 stsp 	d3s = calloc(1, sizeof(*d3s));
282 078e971d 2019-02-08 stsp 	if (d3s == NULL)
283 078e971d 2019-02-08 stsp 		return got_error_from_errno();
284 078e971d 2019-02-08 stsp 	d3s->eflag = 3; /* default -E for compatibility with former RCS */
285 078e971d 2019-02-08 stsp 	d3s->oflag = 1; /* default -E for compatibility with former RCS */
286 078e971d 2019-02-08 stsp 
287 74b37681 2019-02-07 stsp 	b1 = b2 = b3 = d1 = d2 = diffb = NULL;
288 74b37681 2019-02-07 stsp 	dp13 = dp23 = path1 = path2 = path3 = NULL;
289 74b37681 2019-02-07 stsp 	data = patch = NULL;
290 74b37681 2019-02-07 stsp 
291 74b37681 2019-02-07 stsp 	if ((flags & MERGE_EFLAG) && !(flags & MERGE_OFLAG))
292 078e971d 2019-02-08 stsp 		d3s->oflag = 0;
293 74b37681 2019-02-07 stsp 
294 0ec6f014 2019-02-08 stsp 	if ((b1 = buf_load(p1)) == NULL)
295 74b37681 2019-02-07 stsp 		goto out;
296 0ec6f014 2019-02-08 stsp 	if ((b2 = buf_load(p2)) == NULL)
297 74b37681 2019-02-07 stsp 		goto out;
298 0ec6f014 2019-02-08 stsp 	if ((b3 = buf_load(p3)) == NULL)
299 74b37681 2019-02-07 stsp 		goto out;
300 74b37681 2019-02-07 stsp 
301 74b37681 2019-02-07 stsp 	diffb = buf_alloc(128);
302 74b37681 2019-02-07 stsp 
303 c03c6cb3 2019-02-08 stsp 	if (asprintf(&path1, "/tmp/got-diff1.XXXXXXXX") == -1) {
304 c03c6cb3 2019-02-08 stsp 		err = got_error_from_errno();
305 74b37681 2019-02-07 stsp 		goto out;
306 74b37681 2019-02-07 stsp 	}
307 c03c6cb3 2019-02-08 stsp 	if (asprintf(&path2, "/tmp/got-diff2.XXXXXXXX") == -1) {
308 c03c6cb3 2019-02-08 stsp 		err = got_error_from_errno();
309 74b37681 2019-02-07 stsp 		goto out;
310 74b37681 2019-02-07 stsp 	}
311 c03c6cb3 2019-02-08 stsp 	if (asprintf(&path3, "/tmp/got-diff3.XXXXXXXX") == -1) {
312 c03c6cb3 2019-02-08 stsp 		err = got_error_from_errno();
313 74b37681 2019-02-07 stsp 		goto out;
314 c03c6cb3 2019-02-08 stsp 	}
315 74b37681 2019-02-07 stsp 
316 c03c6cb3 2019-02-08 stsp 	err = buf_write_stmp(b1, path1, &temp_files);
317 c03c6cb3 2019-02-08 stsp 	if (err)
318 74b37681 2019-02-07 stsp 		goto out;
319 c03c6cb3 2019-02-08 stsp 	err = buf_write_stmp(b2, path2, &temp_files);
320 c03c6cb3 2019-02-08 stsp 	if (err)
321 74b37681 2019-02-07 stsp 		goto out;
322 c03c6cb3 2019-02-08 stsp 	err = buf_write_stmp(b3, path3, &temp_files);
323 c03c6cb3 2019-02-08 stsp 	if (err)
324 74b37681 2019-02-07 stsp 		goto out;
325 74b37681 2019-02-07 stsp 
326 74b37681 2019-02-07 stsp 	buf_free(b2);
327 74b37681 2019-02-07 stsp 	b2 = NULL;
328 74b37681 2019-02-07 stsp 
329 c03c6cb3 2019-02-08 stsp 	err = diffreg(&d1, path1, path3);
330 c03c6cb3 2019-02-08 stsp 	if (err) {
331 74b37681 2019-02-07 stsp 		buf_free(diffb);
332 74b37681 2019-02-07 stsp 		diffb = NULL;
333 74b37681 2019-02-07 stsp 		goto out;
334 c03c6cb3 2019-02-08 stsp 
335 74b37681 2019-02-07 stsp 	}
336 c03c6cb3 2019-02-08 stsp 	err = diffreg(&d2, path2, path3);
337 c03c6cb3 2019-02-08 stsp 	if (err) {
338 c03c6cb3 2019-02-08 stsp 		buf_free(diffb);
339 c03c6cb3 2019-02-08 stsp 		diffb = NULL;
340 c03c6cb3 2019-02-08 stsp 		goto out;
341 c03c6cb3 2019-02-08 stsp 	}
342 74b37681 2019-02-07 stsp 
343 c03c6cb3 2019-02-08 stsp 	if (asprintf(&dp13, "/tmp/got-d13.XXXXXXXXXX") == -1) {
344 c03c6cb3 2019-02-08 stsp 		err = got_error_from_errno();
345 c03c6cb3 2019-02-08 stsp 		goto out;
346 c03c6cb3 2019-02-08 stsp 	}
347 c03c6cb3 2019-02-08 stsp 	err = buf_write_stmp(d1, dp13, &temp_files);
348 c03c6cb3 2019-02-08 stsp 	if (err)
349 c03c6cb3 2019-02-08 stsp 		goto out;
350 74b37681 2019-02-07 stsp 
351 74b37681 2019-02-07 stsp 	buf_free(d1);
352 74b37681 2019-02-07 stsp 	d1 = NULL;
353 74b37681 2019-02-07 stsp 
354 c03c6cb3 2019-02-08 stsp 	if (asprintf(&dp23, "/tmp/got-d23.XXXXXXXXXX") == -1) {
355 c03c6cb3 2019-02-08 stsp 		err = got_error_from_errno();
356 c03c6cb3 2019-02-08 stsp 		goto out;
357 c03c6cb3 2019-02-08 stsp 	}
358 c03c6cb3 2019-02-08 stsp 	err = buf_write_stmp(d2, dp23, &temp_files);
359 c03c6cb3 2019-02-08 stsp 	if (err)
360 c03c6cb3 2019-02-08 stsp 		goto out;
361 74b37681 2019-02-07 stsp 
362 74b37681 2019-02-07 stsp 	buf_free(d2);
363 74b37681 2019-02-07 stsp 	d2 = NULL;
364 74b37681 2019-02-07 stsp 
365 74b37681 2019-02-07 stsp 	diffbuf = diffb;
366 0ec6f014 2019-02-08 stsp 	err = diff3_internal(dp13, dp23, path1, path2, path3, p1, p3,
367 078e971d 2019-02-08 stsp 	    d3s);
368 c03c6cb3 2019-02-08 stsp 	if (err) {
369 74b37681 2019-02-07 stsp 		buf_free(diffb);
370 74b37681 2019-02-07 stsp 		diffb = NULL;
371 74b37681 2019-02-07 stsp 		goto out;
372 74b37681 2019-02-07 stsp 	}
373 74b37681 2019-02-07 stsp 
374 74b37681 2019-02-07 stsp 	plen = buf_len(diffb);
375 74b37681 2019-02-07 stsp 	patch = buf_release(diffb);
376 74b37681 2019-02-07 stsp 	dlen = buf_len(b1);
377 74b37681 2019-02-07 stsp 	data = buf_release(b1);
378 74b37681 2019-02-07 stsp 
379 74b37681 2019-02-07 stsp 	if ((diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines)) == NULL)
380 74b37681 2019-02-07 stsp 		goto out;
381 74b37681 2019-02-07 stsp out:
382 74b37681 2019-02-07 stsp 	buf_free(b2);
383 74b37681 2019-02-07 stsp 	buf_free(b3);
384 74b37681 2019-02-07 stsp 	buf_free(d1);
385 74b37681 2019-02-07 stsp 	buf_free(d2);
386 74b37681 2019-02-07 stsp 
387 74b37681 2019-02-07 stsp 	(void)unlink(path1);
388 74b37681 2019-02-07 stsp 	(void)unlink(path2);
389 74b37681 2019-02-07 stsp 	(void)unlink(path3);
390 74b37681 2019-02-07 stsp 	(void)unlink(dp13);
391 74b37681 2019-02-07 stsp 	(void)unlink(dp23);
392 74b37681 2019-02-07 stsp 
393 74b37681 2019-02-07 stsp 	free(path1);
394 74b37681 2019-02-07 stsp 	free(path2);
395 74b37681 2019-02-07 stsp 	free(path3);
396 74b37681 2019-02-07 stsp 	free(dp13);
397 74b37681 2019-02-07 stsp 	free(dp23);
398 74b37681 2019-02-07 stsp 	free(data);
399 74b37681 2019-02-07 stsp 	free(patch);
400 74b37681 2019-02-07 stsp 
401 c03c6cb3 2019-02-08 stsp 	worklist_clean(&temp_files, worklist_unlink);
402 c03c6cb3 2019-02-08 stsp 
403 0d26ce36 2019-02-08 stsp 	for (i = 0; i < nitems(d3s->fp); i++) {
404 0d26ce36 2019-02-08 stsp 		if (d3s->fp[i])
405 0d26ce36 2019-02-08 stsp 			fclose(d3s->fp[i]);
406 0d26ce36 2019-02-08 stsp 	}
407 0d26ce36 2019-02-08 stsp 	free(d3s);
408 c03c6cb3 2019-02-08 stsp 	if (err == NULL)
409 c03c6cb3 2019-02-08 stsp 		*buf = diffb;
410 c03c6cb3 2019-02-08 stsp 	return err;
411 74b37681 2019-02-07 stsp }
412 74b37681 2019-02-07 stsp 
413 c03c6cb3 2019-02-08 stsp static const struct got_error *
414 c03c6cb3 2019-02-08 stsp diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
415 078e971d 2019-02-08 stsp     const char *fmark, const char *rmark, struct diff3_state *d3s)
416 74b37681 2019-02-07 stsp {
417 c03c6cb3 2019-02-08 stsp 	const struct got_error *err = NULL;
418 74b37681 2019-02-07 stsp 	ssize_t m, n;
419 74b37681 2019-02-07 stsp 	int i;
420 74b37681 2019-02-07 stsp 
421 078e971d 2019-02-08 stsp 	i = snprintf(d3s->f1mark, sizeof(d3s->f1mark), "<<<<<<< %s", fmark);
422 078e971d 2019-02-08 stsp 	if (i < 0 || i >= (int)sizeof(d3s->f1mark))
423 c03c6cb3 2019-02-08 stsp 		return got_error(GOT_ERR_NO_SPACE);
424 74b37681 2019-02-07 stsp 
425 078e971d 2019-02-08 stsp 	i = snprintf(d3s->f3mark, sizeof(d3s->f3mark), ">>>>>>> %s", rmark);
426 078e971d 2019-02-08 stsp 	if (i < 0 || i >= (int)sizeof(d3s->f3mark))
427 c03c6cb3 2019-02-08 stsp 		return got_error(GOT_ERR_NO_SPACE);
428 74b37681 2019-02-07 stsp 
429 078e971d 2019-02-08 stsp 	err = increase(d3s);
430 c03c6cb3 2019-02-08 stsp 	if (err)
431 c03c6cb3 2019-02-08 stsp 		return err;
432 b90524b1 2019-02-08 stsp 
433 b90524b1 2019-02-08 stsp 	err = readin(&m, dp13, &d3s->d13, d3s);
434 b90524b1 2019-02-08 stsp 	if (err)
435 b90524b1 2019-02-08 stsp 		return err;
436 b90524b1 2019-02-08 stsp 	err = readin(&n, dp23, &d3s->d23, d3s);
437 b90524b1 2019-02-08 stsp 	if (err)
438 b90524b1 2019-02-08 stsp 		return err;
439 74b37681 2019-02-07 stsp 
440 078e971d 2019-02-08 stsp 	if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
441 c03c6cb3 2019-02-08 stsp 		return got_error_from_errno();
442 078e971d 2019-02-08 stsp 	if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
443 c03c6cb3 2019-02-08 stsp 		return got_error_from_errno();
444 078e971d 2019-02-08 stsp 	if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
445 c03c6cb3 2019-02-08 stsp 		return got_error_from_errno();
446 74b37681 2019-02-07 stsp 
447 078e971d 2019-02-08 stsp 	if (merge(m, n, d3s) < 0)
448 c03c6cb3 2019-02-08 stsp 		return got_error_from_errno();
449 c03c6cb3 2019-02-08 stsp 	return NULL;
450 74b37681 2019-02-07 stsp }
451 74b37681 2019-02-07 stsp 
452 c03c6cb3 2019-02-08 stsp static int
453 74b37681 2019-02-07 stsp ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
454 74b37681 2019-02-07 stsp {
455 74b37681 2019-02-07 stsp 	char op, *ep;
456 74b37681 2019-02-07 stsp 	struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
457 74b37681 2019-02-07 stsp 	int start, end, i, lineno;
458 74b37681 2019-02-07 stsp 	u_char tmp;
459 74b37681 2019-02-07 stsp 
460 74b37681 2019-02-07 stsp 	dlp = TAILQ_FIRST(&(dlines->l_lines));
461 74b37681 2019-02-07 stsp 	lp = TAILQ_FIRST(&(plines->l_lines));
462 74b37681 2019-02-07 stsp 
463 74b37681 2019-02-07 stsp 	end = 0;
464 74b37681 2019-02-07 stsp 	for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
465 74b37681 2019-02-07 stsp 	    lp = TAILQ_NEXT(lp, l_list)) {
466 74b37681 2019-02-07 stsp 		/* Skip blank lines */
467 74b37681 2019-02-07 stsp 		if (lp->l_len < 2)
468 74b37681 2019-02-07 stsp 			continue;
469 74b37681 2019-02-07 stsp 
470 74b37681 2019-02-07 stsp 		/* NUL-terminate line buffer for strtol() safety. */
471 74b37681 2019-02-07 stsp 		tmp = lp->l_line[lp->l_len - 1];
472 74b37681 2019-02-07 stsp 		lp->l_line[lp->l_len - 1] = '\0';
473 74b37681 2019-02-07 stsp 
474 74b37681 2019-02-07 stsp 		/* len - 1 is NUL terminator so we use len - 2 for 'op' */
475 74b37681 2019-02-07 stsp 		op = lp->l_line[lp->l_len - 2];
476 74b37681 2019-02-07 stsp 		start = (int)strtol(lp->l_line, &ep, 10);
477 74b37681 2019-02-07 stsp 
478 74b37681 2019-02-07 stsp 		/* Restore the last byte of the buffer */
479 74b37681 2019-02-07 stsp 		lp->l_line[lp->l_len - 1] = tmp;
480 74b37681 2019-02-07 stsp 
481 74b37681 2019-02-07 stsp 		if (op == 'a') {
482 74b37681 2019-02-07 stsp 			if (start > dlines->l_nblines ||
483 74b37681 2019-02-07 stsp 			    start < 0 || *ep != 'a')
484 c03c6cb3 2019-02-08 stsp 				return -1;
485 74b37681 2019-02-07 stsp 		} else if (op == 'c') {
486 74b37681 2019-02-07 stsp 			if (start > dlines->l_nblines ||
487 74b37681 2019-02-07 stsp 			    start < 0 || (*ep != ',' && *ep != 'c'))
488 c03c6cb3 2019-02-08 stsp 				return -1;
489 74b37681 2019-02-07 stsp 
490 74b37681 2019-02-07 stsp 			if (*ep == ',') {
491 74b37681 2019-02-07 stsp 				ep++;
492 74b37681 2019-02-07 stsp 				end = (int)strtol(ep, &ep, 10);
493 74b37681 2019-02-07 stsp 				if (end < 0 || *ep != 'c')
494 c03c6cb3 2019-02-08 stsp 					return -1;
495 74b37681 2019-02-07 stsp 			} else {
496 74b37681 2019-02-07 stsp 				end = start;
497 74b37681 2019-02-07 stsp 			}
498 74b37681 2019-02-07 stsp 		}
499 74b37681 2019-02-07 stsp 
500 74b37681 2019-02-07 stsp 
501 74b37681 2019-02-07 stsp 		for (;;) {
502 74b37681 2019-02-07 stsp 			if (dlp == NULL)
503 74b37681 2019-02-07 stsp 				break;
504 74b37681 2019-02-07 stsp 			if (dlp->l_lineno == start)
505 74b37681 2019-02-07 stsp 				break;
506 74b37681 2019-02-07 stsp 			if (dlp->l_lineno > start) {
507 74b37681 2019-02-07 stsp 				dlp = TAILQ_PREV(dlp, tqh, l_list);
508 74b37681 2019-02-07 stsp 			} else if (dlp->l_lineno < start) {
509 74b37681 2019-02-07 stsp 				ndlp = TAILQ_NEXT(dlp, l_list);
510 74b37681 2019-02-07 stsp 				if (ndlp->l_lineno > start)
511 74b37681 2019-02-07 stsp 					break;
512 74b37681 2019-02-07 stsp 				dlp = ndlp;
513 74b37681 2019-02-07 stsp 			}
514 74b37681 2019-02-07 stsp 		}
515 74b37681 2019-02-07 stsp 
516 74b37681 2019-02-07 stsp 		if (dlp == NULL)
517 c03c6cb3 2019-02-08 stsp 			return -1;
518 74b37681 2019-02-07 stsp 
519 74b37681 2019-02-07 stsp 
520 74b37681 2019-02-07 stsp 		if (op == 'c') {
521 74b37681 2019-02-07 stsp 			insert_after = TAILQ_PREV(dlp, tqh, l_list);
522 74b37681 2019-02-07 stsp 			for (i = 0; i <= (end - start); i++) {
523 74b37681 2019-02-07 stsp 				ndlp = TAILQ_NEXT(dlp, l_list);
524 74b37681 2019-02-07 stsp 				TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
525 74b37681 2019-02-07 stsp 				dlp = ndlp;
526 74b37681 2019-02-07 stsp 			}
527 74b37681 2019-02-07 stsp 			dlp = insert_after;
528 74b37681 2019-02-07 stsp 		}
529 74b37681 2019-02-07 stsp 
530 74b37681 2019-02-07 stsp 		if (op == 'a' || op == 'c') {
531 74b37681 2019-02-07 stsp 			for (;;) {
532 74b37681 2019-02-07 stsp 				ndlp = lp;
533 74b37681 2019-02-07 stsp 				lp = TAILQ_NEXT(lp, l_list);
534 74b37681 2019-02-07 stsp 				if (lp == NULL)
535 c03c6cb3 2019-02-08 stsp 					return -1;
536 74b37681 2019-02-07 stsp 
537 74b37681 2019-02-07 stsp 				if (!memcmp(lp->l_line, ".", 1))
538 74b37681 2019-02-07 stsp 					break;
539 74b37681 2019-02-07 stsp 
540 74b37681 2019-02-07 stsp 				TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
541 74b37681 2019-02-07 stsp 				TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
542 74b37681 2019-02-07 stsp 				    lp, l_list);
543 74b37681 2019-02-07 stsp 				dlp = lp;
544 74b37681 2019-02-07 stsp 
545 74b37681 2019-02-07 stsp 				lp->l_lineno = start;
546 74b37681 2019-02-07 stsp 				lp = ndlp;
547 74b37681 2019-02-07 stsp 			}
548 74b37681 2019-02-07 stsp 		}
549 74b37681 2019-02-07 stsp 
550 74b37681 2019-02-07 stsp 		/*
551 74b37681 2019-02-07 stsp 		 * always resort lines as the markers might be put at the
552 74b37681 2019-02-07 stsp 		 * same line as we first started editing.
553 74b37681 2019-02-07 stsp 		 */
554 74b37681 2019-02-07 stsp 		lineno = 0;
555 74b37681 2019-02-07 stsp 		TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
556 74b37681 2019-02-07 stsp 			sort->l_lineno = lineno++;
557 74b37681 2019-02-07 stsp 		dlines->l_nblines = lineno - 1;
558 74b37681 2019-02-07 stsp 	}
559 74b37681 2019-02-07 stsp 
560 74b37681 2019-02-07 stsp 	return (0);
561 74b37681 2019-02-07 stsp }
562 74b37681 2019-02-07 stsp 
563 74b37681 2019-02-07 stsp /*
564 74b37681 2019-02-07 stsp  * Pick up the line numbers of all changes from one change file.
565 74b37681 2019-02-07 stsp  * (This puts the numbers in a vector, which is not strictly necessary,
566 74b37681 2019-02-07 stsp  * since the vector is processed in one sequential pass.
567 74b37681 2019-02-07 stsp  * The vector could be optimized out of existence)
568 74b37681 2019-02-07 stsp  */
569 b90524b1 2019-02-08 stsp static const struct got_error *
570 b90524b1 2019-02-08 stsp readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
571 74b37681 2019-02-07 stsp {
572 b90524b1 2019-02-08 stsp 	const struct got_error *err = NULL;
573 74b37681 2019-02-07 stsp 	int a, b, c, d;
574 74b37681 2019-02-07 stsp 	char kind, *p;
575 74b37681 2019-02-07 stsp 	size_t i;
576 74b37681 2019-02-07 stsp 
577 078e971d 2019-02-08 stsp 	d3s->fp[0] = fopen(name, "r");
578 078e971d 2019-02-08 stsp 	if (d3s->fp[0] == NULL)
579 b90524b1 2019-02-08 stsp 		return got_error_from_errno();
580 dfc4f8fe 2019-02-08 stsp 	for (i = 0; (p = getchange(d3s->fp[0], d3s)); i++) {
581 b90524b1 2019-02-08 stsp 		if (i >= d3s->szchanges - 1) {
582 b90524b1 2019-02-08 stsp 			err = increase(d3s);
583 b90524b1 2019-02-08 stsp 			if (err)
584 b90524b1 2019-02-08 stsp 				return err;
585 b90524b1 2019-02-08 stsp 		}
586 74b37681 2019-02-07 stsp 		a = b = number(&p);
587 74b37681 2019-02-07 stsp 		if (*p == ',') {
588 74b37681 2019-02-07 stsp 			p++;
589 74b37681 2019-02-07 stsp 			b = number(&p);
590 74b37681 2019-02-07 stsp 		}
591 74b37681 2019-02-07 stsp 		kind = *p++;
592 74b37681 2019-02-07 stsp 		c = d = number(&p);
593 74b37681 2019-02-07 stsp 		if (*p==',') {
594 74b37681 2019-02-07 stsp 			p++;
595 74b37681 2019-02-07 stsp 			d = number(&p);
596 74b37681 2019-02-07 stsp 		}
597 74b37681 2019-02-07 stsp 		if (kind == 'a')
598 74b37681 2019-02-07 stsp 			a++;
599 74b37681 2019-02-07 stsp 		if (kind == 'd')
600 74b37681 2019-02-07 stsp 			c++;
601 74b37681 2019-02-07 stsp 		b++;
602 74b37681 2019-02-07 stsp 		d++;
603 74b37681 2019-02-07 stsp 		(*dd)[i].old.from = a;
604 74b37681 2019-02-07 stsp 		(*dd)[i].old.to = b;
605 74b37681 2019-02-07 stsp 		(*dd)[i].new.from = c;
606 74b37681 2019-02-07 stsp 		(*dd)[i].new.to = d;
607 74b37681 2019-02-07 stsp 	}
608 74b37681 2019-02-07 stsp 
609 74b37681 2019-02-07 stsp 	if (i) {
610 74b37681 2019-02-07 stsp 		(*dd)[i].old.from = (*dd)[i-1].old.to;
611 74b37681 2019-02-07 stsp 		(*dd)[i].new.from = (*dd)[i-1].new.to;
612 74b37681 2019-02-07 stsp 	}
613 74b37681 2019-02-07 stsp 
614 078e971d 2019-02-08 stsp 	(void)fclose(d3s->fp[0]);
615 74b37681 2019-02-07 stsp 
616 b90524b1 2019-02-08 stsp 	return NULL;
617 74b37681 2019-02-07 stsp }
618 74b37681 2019-02-07 stsp 
619 74b37681 2019-02-07 stsp static int
620 74b37681 2019-02-07 stsp number(char **lc)
621 74b37681 2019-02-07 stsp {
622 74b37681 2019-02-07 stsp 	int nn;
623 74b37681 2019-02-07 stsp 
624 74b37681 2019-02-07 stsp 	nn = 0;
625 74b37681 2019-02-07 stsp 	while (isdigit((unsigned char)(**lc)))
626 74b37681 2019-02-07 stsp 		nn = nn*10 + *(*lc)++ - '0';
627 74b37681 2019-02-07 stsp 
628 74b37681 2019-02-07 stsp 	return (nn);
629 74b37681 2019-02-07 stsp }
630 74b37681 2019-02-07 stsp 
631 74b37681 2019-02-07 stsp static char *
632 dfc4f8fe 2019-02-08 stsp getchange(FILE *b, struct diff3_state *d3s)
633 74b37681 2019-02-07 stsp {
634 74b37681 2019-02-07 stsp 	char *line;
635 74b37681 2019-02-07 stsp 
636 dfc4f8fe 2019-02-08 stsp 	while ((line = get_line(b, NULL, d3s))) {
637 74b37681 2019-02-07 stsp 		if (isdigit((unsigned char)line[0]))
638 74b37681 2019-02-07 stsp 			return (line);
639 74b37681 2019-02-07 stsp 	}
640 74b37681 2019-02-07 stsp 
641 74b37681 2019-02-07 stsp 	return (NULL);
642 74b37681 2019-02-07 stsp }
643 74b37681 2019-02-07 stsp 
644 74b37681 2019-02-07 stsp static char *
645 dfc4f8fe 2019-02-08 stsp get_line(FILE *b, size_t *n, struct diff3_state *d3s)
646 74b37681 2019-02-07 stsp {
647 74b37681 2019-02-07 stsp 	char *cp;
648 74b37681 2019-02-07 stsp 	size_t len;
649 c03c6cb3 2019-02-08 stsp 	char *new;
650 74b37681 2019-02-07 stsp 
651 74b37681 2019-02-07 stsp 	if ((cp = fgetln(b, &len)) == NULL)
652 74b37681 2019-02-07 stsp 		return (NULL);
653 74b37681 2019-02-07 stsp 
654 74b37681 2019-02-07 stsp 	if (cp[len - 1] != '\n')
655 74b37681 2019-02-07 stsp 		len++;
656 dfc4f8fe 2019-02-08 stsp 	if (len + 1 > d3s->bufsize) {
657 74b37681 2019-02-07 stsp 		do {
658 dfc4f8fe 2019-02-08 stsp 			d3s->bufsize += 1024;
659 dfc4f8fe 2019-02-08 stsp 		} while (len + 1 > d3s->bufsize);
660 dfc4f8fe 2019-02-08 stsp 		new = reallocarray(d3s->buf, 1, d3s->bufsize);
661 c03c6cb3 2019-02-08 stsp 		if (new == NULL)
662 c03c6cb3 2019-02-08 stsp 			return NULL;
663 dfc4f8fe 2019-02-08 stsp 		d3s->buf = new;
664 74b37681 2019-02-07 stsp 	}
665 dfc4f8fe 2019-02-08 stsp 	memcpy(d3s->buf, cp, len - 1);
666 dfc4f8fe 2019-02-08 stsp 	d3s->buf[len - 1] = '\n';
667 dfc4f8fe 2019-02-08 stsp 	d3s->buf[len] = '\0';
668 74b37681 2019-02-07 stsp 	if (n != NULL)
669 74b37681 2019-02-07 stsp 		*n = len;
670 74b37681 2019-02-07 stsp 
671 dfc4f8fe 2019-02-08 stsp 	return (d3s->buf);
672 74b37681 2019-02-07 stsp }
673 74b37681 2019-02-07 stsp 
674 74b37681 2019-02-07 stsp static int
675 078e971d 2019-02-08 stsp merge(size_t m1, size_t m2, struct diff3_state *d3s)
676 74b37681 2019-02-07 stsp {
677 74b37681 2019-02-07 stsp 	struct diff *d1, *d2, *d3;
678 74b37681 2019-02-07 stsp 	int dpl, j, t1, t2;
679 74b37681 2019-02-07 stsp 
680 078e971d 2019-02-08 stsp 	d1 = d3s->d13;
681 078e971d 2019-02-08 stsp 	d2 = d3s->d23;
682 74b37681 2019-02-07 stsp 	j = 0;
683 74b37681 2019-02-07 stsp 	for (;;) {
684 078e971d 2019-02-08 stsp 		t1 = (d1 < d3s->d13 + m1);
685 078e971d 2019-02-08 stsp 		t2 = (d2 < d3s->d23 + m2);
686 74b37681 2019-02-07 stsp 		if (!t1 && !t2)
687 74b37681 2019-02-07 stsp 			break;
688 74b37681 2019-02-07 stsp 
689 078e971d 2019-02-08 stsp 		if (d3s->debug) {
690 74b37681 2019-02-07 stsp 			printf("%d,%d=%d,%d %d,%d=%d,%d\n",
691 74b37681 2019-02-07 stsp 			d1->old.from, d1->old.to,
692 74b37681 2019-02-07 stsp 			d1->new.from, d1->new.to,
693 74b37681 2019-02-07 stsp 			d2->old.from, d2->old.to,
694 74b37681 2019-02-07 stsp 			d2->new.from, d2->new.to);
695 74b37681 2019-02-07 stsp 		}
696 74b37681 2019-02-07 stsp 
697 74b37681 2019-02-07 stsp 		/* first file is different from others */
698 74b37681 2019-02-07 stsp 		if (!t2 || (t1 && d1->new.to < d2->new.from)) {
699 74b37681 2019-02-07 stsp 			/* stuff peculiar to 1st file */
700 078e971d 2019-02-08 stsp 			if (d3s->eflag == 0) {
701 74b37681 2019-02-07 stsp 				separate("1");
702 078e971d 2019-02-08 stsp 				change(1, &d1->old, 0, d3s);
703 078e971d 2019-02-08 stsp 				keep(2, &d1->new, d3s);
704 078e971d 2019-02-08 stsp 				change(3, &d1->new, 0, d3s);
705 74b37681 2019-02-07 stsp 			}
706 74b37681 2019-02-07 stsp 			d1++;
707 74b37681 2019-02-07 stsp 			continue;
708 74b37681 2019-02-07 stsp 		}
709 74b37681 2019-02-07 stsp 
710 74b37681 2019-02-07 stsp 		/* second file is different from others */
711 74b37681 2019-02-07 stsp 		if (!t1 || (t2 && d2->new.to < d1->new.from)) {
712 078e971d 2019-02-08 stsp 			if (d3s->eflag == 0) {
713 74b37681 2019-02-07 stsp 				separate("2");
714 078e971d 2019-02-08 stsp 				keep(1, &d2->new, d3s);
715 078e971d 2019-02-08 stsp 				change(2, &d2->old, 0, d3s);
716 078e971d 2019-02-08 stsp 				change(3, &d2->new, 0, d3s);
717 74b37681 2019-02-07 stsp 			}
718 74b37681 2019-02-07 stsp 			d2++;
719 74b37681 2019-02-07 stsp 			continue;
720 74b37681 2019-02-07 stsp 		}
721 74b37681 2019-02-07 stsp 
722 74b37681 2019-02-07 stsp 		/*
723 74b37681 2019-02-07 stsp 		 * Merge overlapping changes in first file
724 74b37681 2019-02-07 stsp 		 * this happens after extension (see below).
725 74b37681 2019-02-07 stsp 		 */
726 078e971d 2019-02-08 stsp 		if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
727 74b37681 2019-02-07 stsp 			d1[1].old.from = d1->old.from;
728 74b37681 2019-02-07 stsp 			d1[1].new.from = d1->new.from;
729 74b37681 2019-02-07 stsp 			d1++;
730 74b37681 2019-02-07 stsp 			continue;
731 74b37681 2019-02-07 stsp 		}
732 74b37681 2019-02-07 stsp 
733 74b37681 2019-02-07 stsp 		/* merge overlapping changes in second */
734 078e971d 2019-02-08 stsp 		if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
735 74b37681 2019-02-07 stsp 			d2[1].old.from = d2->old.from;
736 74b37681 2019-02-07 stsp 			d2[1].new.from = d2->new.from;
737 74b37681 2019-02-07 stsp 			d2++;
738 74b37681 2019-02-07 stsp 			continue;
739 74b37681 2019-02-07 stsp 		}
740 74b37681 2019-02-07 stsp 		/* stuff peculiar to third file or different in all */
741 74b37681 2019-02-07 stsp 		if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
742 078e971d 2019-02-08 stsp 			dpl = duplicate(&d1->old, &d2->old, d3s);
743 74b37681 2019-02-07 stsp 			if (dpl == -1)
744 74b37681 2019-02-07 stsp 				return (-1);
745 74b37681 2019-02-07 stsp 
746 74b37681 2019-02-07 stsp 			/*
747 74b37681 2019-02-07 stsp 			 * dpl = 0 means all files differ
748 74b37681 2019-02-07 stsp 			 * dpl = 1 means files 1 and 2 identical
749 74b37681 2019-02-07 stsp 			 */
750 078e971d 2019-02-08 stsp 			if (d3s->eflag == 0) {
751 74b37681 2019-02-07 stsp 				separate(dpl ? "3" : "");
752 078e971d 2019-02-08 stsp 				change(1, &d1->old, dpl, d3s);
753 078e971d 2019-02-08 stsp 				change(2, &d2->old, 0, d3s);
754 74b37681 2019-02-07 stsp 				d3 = d1->old.to > d1->old.from ? d1 : d2;
755 078e971d 2019-02-08 stsp 				change(3, &d3->new, 0, d3s);
756 74b37681 2019-02-07 stsp 			} else
757 078e971d 2019-02-08 stsp 				j = edit(d1, dpl, j, d3s);
758 74b37681 2019-02-07 stsp 			d1++;
759 74b37681 2019-02-07 stsp 			d2++;
760 74b37681 2019-02-07 stsp 			continue;
761 74b37681 2019-02-07 stsp 		}
762 74b37681 2019-02-07 stsp 
763 74b37681 2019-02-07 stsp 		/*
764 74b37681 2019-02-07 stsp 		 * Overlapping changes from file 1 and 2; extend changes
765 74b37681 2019-02-07 stsp 		 * appropriately to make them coincide.
766 74b37681 2019-02-07 stsp 		 */
767 74b37681 2019-02-07 stsp 		if (d1->new.from < d2->new.from) {
768 74b37681 2019-02-07 stsp 			d2->old.from -= d2->new.from-d1->new.from;
769 74b37681 2019-02-07 stsp 			d2->new.from = d1->new.from;
770 74b37681 2019-02-07 stsp 		} else if (d2->new.from < d1->new.from) {
771 74b37681 2019-02-07 stsp 			d1->old.from -= d1->new.from-d2->new.from;
772 74b37681 2019-02-07 stsp 			d1->new.from = d2->new.from;
773 74b37681 2019-02-07 stsp 		}
774 74b37681 2019-02-07 stsp 		if (d1->new.to > d2->new.to) {
775 74b37681 2019-02-07 stsp 			d2->old.to += d1->new.to - d2->new.to;
776 74b37681 2019-02-07 stsp 			d2->new.to = d1->new.to;
777 74b37681 2019-02-07 stsp 		} else if (d2->new.to > d1->new.to) {
778 74b37681 2019-02-07 stsp 			d1->old.to += d2->new.to - d1->new.to;
779 74b37681 2019-02-07 stsp 			d1->new.to = d2->new.to;
780 74b37681 2019-02-07 stsp 		}
781 74b37681 2019-02-07 stsp 	}
782 74b37681 2019-02-07 stsp 
783 078e971d 2019-02-08 stsp 	return (edscript(j, d3s));
784 74b37681 2019-02-07 stsp }
785 74b37681 2019-02-07 stsp 
786 74b37681 2019-02-07 stsp static void
787 74b37681 2019-02-07 stsp separate(const char *s)
788 74b37681 2019-02-07 stsp {
789 74b37681 2019-02-07 stsp 	diff_output("====%s\n", s);
790 74b37681 2019-02-07 stsp }
791 74b37681 2019-02-07 stsp 
792 74b37681 2019-02-07 stsp /*
793 74b37681 2019-02-07 stsp  * The range of lines rold.from thru rold.to in file i is to be changed.
794 74b37681 2019-02-07 stsp  * It is to be printed only if it does not duplicate something to be
795 74b37681 2019-02-07 stsp  * printed later.
796 74b37681 2019-02-07 stsp  */
797 74b37681 2019-02-07 stsp static void
798 078e971d 2019-02-08 stsp change(int i, struct range *rold, int fdup, struct diff3_state *d3s)
799 74b37681 2019-02-07 stsp {
800 74b37681 2019-02-07 stsp 	diff_output("%d:", i);
801 078e971d 2019-02-08 stsp 	d3s->last[i] = rold->to;
802 74b37681 2019-02-07 stsp 	prange(rold);
803 078e971d 2019-02-08 stsp 	if (fdup || d3s->debug)
804 74b37681 2019-02-07 stsp 		return;
805 74b37681 2019-02-07 stsp 	i--;
806 078e971d 2019-02-08 stsp 	(void)skip(i, rold->from, NULL, d3s);
807 078e971d 2019-02-08 stsp 	(void)skip(i, rold->to, "  ", d3s);
808 74b37681 2019-02-07 stsp }
809 74b37681 2019-02-07 stsp 
810 74b37681 2019-02-07 stsp /*
811 74b37681 2019-02-07 stsp  * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
812 74b37681 2019-02-07 stsp  */
813 74b37681 2019-02-07 stsp static void
814 74b37681 2019-02-07 stsp prange(struct range *rold)
815 74b37681 2019-02-07 stsp {
816 74b37681 2019-02-07 stsp 	if (rold->to <= rold->from)
817 74b37681 2019-02-07 stsp 		diff_output("%da\n", rold->from - 1);
818 74b37681 2019-02-07 stsp 	else {
819 74b37681 2019-02-07 stsp 		diff_output("%d", rold->from);
820 74b37681 2019-02-07 stsp 		if (rold->to > rold->from+1)
821 74b37681 2019-02-07 stsp 			diff_output(",%d", rold->to - 1);
822 74b37681 2019-02-07 stsp 		diff_output("c\n");
823 74b37681 2019-02-07 stsp 	}
824 74b37681 2019-02-07 stsp }
825 74b37681 2019-02-07 stsp 
826 74b37681 2019-02-07 stsp /*
827 74b37681 2019-02-07 stsp  * No difference was reported by diff between file 1 (or 2) and file 3,
828 74b37681 2019-02-07 stsp  * and an artificial dummy difference (trange) must be ginned up to
829 74b37681 2019-02-07 stsp  * correspond to the change reported in the other file.
830 74b37681 2019-02-07 stsp  */
831 74b37681 2019-02-07 stsp static void
832 078e971d 2019-02-08 stsp keep(int i, struct range *rnew, struct diff3_state *d3s)
833 74b37681 2019-02-07 stsp {
834 74b37681 2019-02-07 stsp 	int delta;
835 74b37681 2019-02-07 stsp 	struct range trange;
836 74b37681 2019-02-07 stsp 
837 078e971d 2019-02-08 stsp 	delta = d3s->last[3] - d3s->last[i];
838 74b37681 2019-02-07 stsp 	trange.from = rnew->from - delta;
839 74b37681 2019-02-07 stsp 	trange.to = rnew->to - delta;
840 078e971d 2019-02-08 stsp 	change(i, &trange, 1, d3s);
841 74b37681 2019-02-07 stsp }
842 74b37681 2019-02-07 stsp 
843 74b37681 2019-02-07 stsp /*
844 74b37681 2019-02-07 stsp  * skip to just before line number from in file "i".  If "pr" is non-NULL,
845 74b37681 2019-02-07 stsp  * print all skipped stuff with string pr as a prefix.
846 74b37681 2019-02-07 stsp  */
847 74b37681 2019-02-07 stsp static int
848 078e971d 2019-02-08 stsp skip(int i, int from, char *pr, struct diff3_state *d3s)
849 74b37681 2019-02-07 stsp {
850 74b37681 2019-02-07 stsp 	size_t j, n;
851 74b37681 2019-02-07 stsp 	char *line;
852 74b37681 2019-02-07 stsp 
853 078e971d 2019-02-08 stsp 	for (n = 0; d3s->cline[i] < from - 1; n += j) {
854 dfc4f8fe 2019-02-08 stsp 		if ((line = get_line(d3s->fp[i], &j, d3s)) == NULL)
855 74b37681 2019-02-07 stsp 			return (-1);
856 74b37681 2019-02-07 stsp 		if (pr != NULL)
857 74b37681 2019-02-07 stsp 			diff_output("%s%s", pr, line);
858 078e971d 2019-02-08 stsp 		d3s->cline[i]++;
859 74b37681 2019-02-07 stsp 	}
860 74b37681 2019-02-07 stsp 	return ((int) n);
861 74b37681 2019-02-07 stsp }
862 74b37681 2019-02-07 stsp 
863 74b37681 2019-02-07 stsp /*
864 74b37681 2019-02-07 stsp  * Return 1 or 0 according as the old range (in file 1) contains exactly
865 74b37681 2019-02-07 stsp  * the same data as the new range (in file 2).
866 74b37681 2019-02-07 stsp  */
867 74b37681 2019-02-07 stsp static int
868 078e971d 2019-02-08 stsp duplicate(struct range *r1, struct range *r2, struct diff3_state *d3s)
869 74b37681 2019-02-07 stsp {
870 74b37681 2019-02-07 stsp 	int c,d;
871 74b37681 2019-02-07 stsp 	int nchar;
872 74b37681 2019-02-07 stsp 	int nline;
873 74b37681 2019-02-07 stsp 
874 74b37681 2019-02-07 stsp 	if (r1->to-r1->from != r2->to-r2->from)
875 74b37681 2019-02-07 stsp 		return (0);
876 078e971d 2019-02-08 stsp 	(void)skip(0, r1->from, NULL, d3s);
877 078e971d 2019-02-08 stsp 	(void)skip(1, r2->from, NULL, d3s);
878 74b37681 2019-02-07 stsp 	nchar = 0;
879 74b37681 2019-02-07 stsp 	for (nline=0; nline < r1->to - r1->from; nline++) {
880 74b37681 2019-02-07 stsp 		do {
881 078e971d 2019-02-08 stsp 			c = getc(d3s->fp[0]);
882 078e971d 2019-02-08 stsp 			d = getc(d3s->fp[1]);
883 74b37681 2019-02-07 stsp 			if (c == -1 || d== -1)
884 74b37681 2019-02-07 stsp 				return (-1);
885 74b37681 2019-02-07 stsp 			nchar++;
886 74b37681 2019-02-07 stsp 			if (c != d) {
887 078e971d 2019-02-08 stsp 				repos(nchar, d3s);
888 74b37681 2019-02-07 stsp 				return (0);
889 74b37681 2019-02-07 stsp 			}
890 74b37681 2019-02-07 stsp 		} while (c != '\n');
891 74b37681 2019-02-07 stsp 	}
892 078e971d 2019-02-08 stsp 	repos(nchar, d3s);
893 74b37681 2019-02-07 stsp 	return (1);
894 74b37681 2019-02-07 stsp }
895 74b37681 2019-02-07 stsp 
896 74b37681 2019-02-07 stsp static void
897 078e971d 2019-02-08 stsp repos(int nchar, struct diff3_state *d3s)
898 74b37681 2019-02-07 stsp {
899 74b37681 2019-02-07 stsp 	int i;
900 74b37681 2019-02-07 stsp 
901 74b37681 2019-02-07 stsp 	for (i = 0; i < 2; i++)
902 078e971d 2019-02-08 stsp 		(void)fseek(d3s->fp[i], (long)-nchar, SEEK_CUR);
903 74b37681 2019-02-07 stsp }
904 74b37681 2019-02-07 stsp 
905 74b37681 2019-02-07 stsp /*
906 74b37681 2019-02-07 stsp  * collect an editing script for later regurgitation
907 74b37681 2019-02-07 stsp  */
908 74b37681 2019-02-07 stsp static int
909 078e971d 2019-02-08 stsp edit(struct diff *diff, int fdup, int j, struct diff3_state *d3s)
910 74b37681 2019-02-07 stsp {
911 078e971d 2019-02-08 stsp 	if (((fdup + 1) & d3s->eflag) == 0)
912 74b37681 2019-02-07 stsp 		return (j);
913 74b37681 2019-02-07 stsp 	j++;
914 078e971d 2019-02-08 stsp 	d3s->overlap[j] = !fdup;
915 74b37681 2019-02-07 stsp 	if (!fdup)
916 078e971d 2019-02-08 stsp 		d3s->overlapcnt++;
917 078e971d 2019-02-08 stsp 	d3s->de[j].old.from = diff->old.from;
918 078e971d 2019-02-08 stsp 	d3s->de[j].old.to = diff->old.to;
919 078e971d 2019-02-08 stsp 	d3s->de[j].new.from =
920 078e971d 2019-02-08 stsp 	    d3s->de[j-1].new.to + skip(2, diff->new.from, NULL, d3s);
921 078e971d 2019-02-08 stsp 	d3s->de[j].new.to =
922 078e971d 2019-02-08 stsp 	    d3s->de[j].new.from + skip(2, diff->new.to, NULL, d3s);
923 74b37681 2019-02-07 stsp 	return (j);
924 74b37681 2019-02-07 stsp }
925 74b37681 2019-02-07 stsp 
926 74b37681 2019-02-07 stsp /* regurgitate */
927 74b37681 2019-02-07 stsp static int
928 078e971d 2019-02-08 stsp edscript(int n, struct diff3_state *d3s)
929 74b37681 2019-02-07 stsp {
930 74b37681 2019-02-07 stsp 	int j, k;
931 74b37681 2019-02-07 stsp 	char block[BUFSIZ+1];
932 74b37681 2019-02-07 stsp 
933 74b37681 2019-02-07 stsp 	for (; n > 0; n--) {
934 078e971d 2019-02-08 stsp 		if (!d3s->oflag || !d3s->overlap[n])
935 078e971d 2019-02-08 stsp 			prange(&d3s->de[n].old);
936 74b37681 2019-02-07 stsp 		else
937 078e971d 2019-02-08 stsp 			diff_output("%da\n=======\n", d3s->de[n].old.to -1);
938 078e971d 2019-02-08 stsp 		(void)fseek(d3s->fp[2], (long)d3s->de[n].new.from, SEEK_SET);
939 078e971d 2019-02-08 stsp 		k = d3s->de[n].new.to - d3s->de[n].new.from;
940 078e971d 2019-02-08 stsp 		for (; k > 0; k-= j) {
941 74b37681 2019-02-07 stsp 			j = k > BUFSIZ ? BUFSIZ : k;
942 078e971d 2019-02-08 stsp 			if (fread(block, 1, j, d3s->fp[2]) != (size_t)j)
943 74b37681 2019-02-07 stsp 				return (-1);
944 74b37681 2019-02-07 stsp 			block[j] = '\0';
945 74b37681 2019-02-07 stsp 			diff_output("%s", block);
946 74b37681 2019-02-07 stsp 		}
947 74b37681 2019-02-07 stsp 
948 078e971d 2019-02-08 stsp 		if (!d3s->oflag || !d3s->overlap[n])
949 74b37681 2019-02-07 stsp 			diff_output(".\n");
950 74b37681 2019-02-07 stsp 		else {
951 078e971d 2019-02-08 stsp 			diff_output("%s\n.\n", d3s->f3mark);
952 078e971d 2019-02-08 stsp 			diff_output("%da\n%s\n.\n", d3s->de[n].old.from - 1,
953 078e971d 2019-02-08 stsp 			    d3s->f1mark);
954 74b37681 2019-02-07 stsp 		}
955 74b37681 2019-02-07 stsp 	}
956 74b37681 2019-02-07 stsp 
957 078e971d 2019-02-08 stsp 	return (d3s->overlapcnt);
958 74b37681 2019-02-07 stsp }
959 74b37681 2019-02-07 stsp 
960 c03c6cb3 2019-02-08 stsp static const struct got_error *
961 078e971d 2019-02-08 stsp increase(struct diff3_state *d3s)
962 74b37681 2019-02-07 stsp {
963 74b37681 2019-02-07 stsp 	size_t newsz, incr;
964 c03c6cb3 2019-02-08 stsp 	struct diff *d;
965 c03c6cb3 2019-02-08 stsp 	char *s;
966 74b37681 2019-02-07 stsp 
967 74b37681 2019-02-07 stsp 	/* are the memset(3) calls needed? */
968 078e971d 2019-02-08 stsp 	newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
969 078e971d 2019-02-08 stsp 	incr = newsz - d3s->szchanges;
970 74b37681 2019-02-07 stsp 
971 078e971d 2019-02-08 stsp 	d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
972 c03c6cb3 2019-02-08 stsp 	if (d == NULL)
973 c03c6cb3 2019-02-08 stsp 		return got_error_from_errno();
974 078e971d 2019-02-08 stsp 	d3s->d13 = d;
975 078e971d 2019-02-08 stsp 	memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
976 c03c6cb3 2019-02-08 stsp 
977 078e971d 2019-02-08 stsp 	d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
978 c03c6cb3 2019-02-08 stsp 	if (d == NULL)
979 c03c6cb3 2019-02-08 stsp 		return got_error_from_errno();
980 078e971d 2019-02-08 stsp 	d3s->d23 = d;
981 078e971d 2019-02-08 stsp 	memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
982 c03c6cb3 2019-02-08 stsp 
983 078e971d 2019-02-08 stsp 	d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
984 c03c6cb3 2019-02-08 stsp 	if (d == NULL)
985 c03c6cb3 2019-02-08 stsp 		return got_error_from_errno();
986 078e971d 2019-02-08 stsp 	d3s->de = d;
987 078e971d 2019-02-08 stsp 	memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
988 c03c6cb3 2019-02-08 stsp 
989 078e971d 2019-02-08 stsp 	s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
990 c03c6cb3 2019-02-08 stsp 	if (s == NULL)
991 c03c6cb3 2019-02-08 stsp 		return got_error_from_errno();
992 078e971d 2019-02-08 stsp 	d3s->overlap = s;
993 078e971d 2019-02-08 stsp 	memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
994 078e971d 2019-02-08 stsp 	d3s->szchanges = newsz;
995 c03c6cb3 2019-02-08 stsp 
996 c03c6cb3 2019-02-08 stsp 	return NULL;
997 74b37681 2019-02-07 stsp }