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