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