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