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