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