summaryrefslogtreecommitdiffstats
path: root/usr.bin/csup/diff.c
blob: bafb458e05bec3d73cd6bb54209465f2912540eb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
/*-
 * Copyright (c) 2003-2006, Maxime Henrion <mux@FreeBSD.org>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
 * $FreeBSD$
 */

#include <assert.h>
#include <err.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include "diff.h"
#include "keyword.h"
#include "misc.h"
#include "stream.h"
#include "queue.h"

typedef long lineno_t;

#define	EC_ADD	0
#define	EC_DEL	1
#define	MAXKEY	LONG_MAX

/* Editing command and state. */
struct editcmd {
	int cmd;
	long key;
	int havetext;
	int offset;
	lineno_t where;
	lineno_t count;
	lineno_t lasta;
	lineno_t lastd;
	lineno_t editline;
	/* For convenience. */
	struct keyword *keyword;
	struct diffinfo *di;
	struct stream *orig;
	struct stream *dest;
	LIST_ENTRY(editcmd) next;
};

struct diffstart {
	LIST_HEAD(, editcmd) dhead;
};

static int	diff_geteditcmd(struct editcmd *, char *);
static int	diff_copyln(struct editcmd *, lineno_t);
static int	diff_ignoreln(struct editcmd *, lineno_t);
static void	diff_write(struct editcmd *, void *, size_t);
static int	diff_insert_edit(struct diffstart *, struct editcmd *);
static void	diff_free(struct diffstart *);

int
diff_apply(struct stream *rd, struct stream *orig, struct stream *dest,
    struct keyword *keyword, struct diffinfo *di, int comode)
{
	struct editcmd ec;
	lineno_t i;
	size_t size;
	char *line;
	int empty, error, noeol;

	memset(&ec, 0, sizeof(ec));
	empty = 0;
	noeol = 0;
	ec.di = di;
	ec.keyword = keyword;
	ec.orig = orig;
	ec.dest = dest;
	line = stream_getln(rd, NULL);
	while (line != NULL && strcmp(line, ".") != 0 &&
	    strcmp(line, ".+") != 0) {
		/*
		 * The server sends an empty line and then terminates
		 * with .+ for forced (and thus empty) commits.
		 */
		if (*line == '\0') {
			if (empty)
				return (-1);
			empty = 1;
			line = stream_getln(rd, NULL);
			continue;
		}
		error = diff_geteditcmd(&ec, line);
		if (error)
			return (-1);

		if (ec.cmd == EC_ADD) {
			error = diff_copyln(&ec, ec.where);
			if (error)
				return (-1);
			for (i = 0; i < ec.count; i++) {
				line = stream_getln(rd, &size);
				if (line == NULL)
					return (-1);
				if (comode && line[0] == '.') {
					line++;
					size--;
				}
				diff_write(&ec, line, size);
			}
		} else {
			assert(ec.cmd == EC_DEL);
			error = diff_copyln(&ec, ec.where - 1);
			if (error)
				return (-1);
			for (i = 0; i < ec.count; i++) {
				line = stream_getln(orig, NULL);
				if (line == NULL)
					return (-1);
				ec.editline++;
			}
		}
		line = stream_getln(rd, NULL);
	}
	if (comode && line == NULL)
		return (-1);
	/* If we got ".+", there's no ending newline. */
	if (comode && strcmp(line, ".+") == 0 && !empty)
		noeol = 1;
	ec.where = 0;
	while ((line = stream_getln(orig, &size)) != NULL)
		diff_write(&ec, line, size);
	stream_flush(dest);
	if (noeol) {
		error = stream_truncate_rel(dest, -1);
		if (error) {
			warn("stream_truncate_rel");
			return (-1);
		}
	}
	return (0);
}

/*
 * Reverse a diff using the same algorithm as in cvsup.
 */
static int
diff_write_reverse(struct stream *dest, struct diffstart *ds)
{
	struct editcmd *ec, *nextec;
	long editline, endline, firstoutputlinedeleted;
	long num_added, num_deleted, startline;
	int num;

	nextec = LIST_FIRST(&ds->dhead);
	editline = 0;
	num = 0;
	while (nextec != NULL) {
		ec = nextec;
		nextec = LIST_NEXT(nextec, next);
		if (nextec == NULL)
			break;
		num++;
		num_deleted = 0;
		if (ec->havetext)
			num_deleted = ec->count;
		num_added = num_deleted + nextec->offset - ec->offset;
		if (num_deleted > 0) {
			firstoutputlinedeleted = ec->key - num_deleted + 1;
			stream_printf(dest, "d%ld %ld\n", firstoutputlinedeleted,
			    num_deleted);
			if (num_added <= 0)
				continue;
		}
		if (num_added > 0) {
			stream_printf(dest, "a%ld %ld\n", ec->key, num_added);
			startline = ec->key - num_deleted + 1 + ec->offset;
			endline = startline + num_added - 1;

			/* Copy lines from original file. First ignore some. */
			ec->editline = editline;
			diff_ignoreln(ec,  startline - 1);
			diff_copyln(ec, endline);
			editline = ec->editline;
		}
	}
	return (0);
}

/* 
 * Insert a diff into the list sorted on key. Should perhaps use quicker
 * algorithms than insertion sort, but do this for now.
 */
static int
diff_insert_edit(struct diffstart *ds, struct editcmd *ec)
{
	struct editcmd *curec;

	if (ec == NULL)
		return (0);

	if (LIST_EMPTY(&ds->dhead)) {
		LIST_INSERT_HEAD(&ds->dhead, ec, next);
		return (0);
	}

	/* Insertion sort based on key. */
	LIST_FOREACH(curec, &ds->dhead, next) {
		if (ec->key < curec->key) {
			LIST_INSERT_BEFORE(curec, ec, next);
			return (0);
		}
		if (LIST_NEXT(curec, next) == NULL)
			break;
	}
	/* Just insert it after. */
	LIST_INSERT_AFTER(curec, ec, next);
	return (0);
}

static void 
diff_free(struct diffstart *ds)
{
	struct editcmd *ec;

	while(!LIST_EMPTY(&ds->dhead)) {
		ec = LIST_FIRST(&ds->dhead);
		LIST_REMOVE(ec, next);
		free(ec);
	}
}

/*
 * Write the reverse diff from the diff in rd, and original file into
 * destination. This algorithm is the same as used in cvsup.
 */
int
diff_reverse(struct stream *rd, struct stream *orig, struct stream *dest,
    struct keyword *keyword, struct diffinfo *di)
{
	struct diffstart ds;
	struct editcmd ec, *addec, *delec;
	lineno_t i;
	char *line;
	int error, offset;

	memset(&ec, 0, sizeof(ec));
	ec.orig = orig;
	ec.dest = dest;
	ec.keyword = keyword;
	ec.di = di;
	addec = NULL;
	delec = NULL;
	ec.havetext = 0;
	offset = 0;
	LIST_INIT(&ds.dhead);

	/* Start with next since we need it. */
	line = stream_getln(rd, NULL);
	/* First we build up the list of diffs from input. */
	while (line != NULL) {
		error = diff_geteditcmd(&ec, line);
		if (error)
			break;
		if (ec.cmd == EC_ADD) {
			addec = xmalloc(sizeof(struct editcmd));
			*addec = ec;
			addec->havetext = 1;
			/* Ignore the lines we was supposed to add. */
			for (i = 0; i < ec.count; i++) {
				line = stream_getln(rd, NULL);
				if (line == NULL)
					return (-1);
			}

			/* Get the next diff command if we have one. */
			addec->key = addec->where + addec->count - offset;
			if (delec != NULL &&
			    delec->key == addec->key - addec->count) {
				delec->key = addec->key;
				delec->havetext = addec->havetext;
				delec->count = addec->count;
				diff_insert_edit(&ds, delec);
				free(addec);
				delec = NULL;
				addec = NULL;
			} else {
				if (delec != NULL) {
					diff_insert_edit(&ds, delec);
				}
				delec = NULL;
				addec->offset = offset;
				diff_insert_edit(&ds, addec);
				addec = NULL;
			}
			offset -= ec.count;
		} else if (ec.cmd == EC_DEL) {
			if (delec != NULL) {
				/* Update offset to our next. */
				diff_insert_edit(&ds, delec);
				delec = NULL;
			}
			delec = xmalloc(sizeof(struct editcmd));
			*delec = ec;
			delec->key = delec->where - 1 - offset;
			delec->offset = offset;
			delec->count = 0;
			delec->havetext = 0;
			/* Important to use the count we had before reset.*/
			offset += ec.count;
		}
		line = stream_getln(rd, NULL);
	}

	while (line != NULL)
		line = stream_getln(rd, NULL);
	if (delec != NULL) {
		diff_insert_edit(&ds, delec);
		delec = NULL;
	}

	addec = xmalloc(sizeof(struct editcmd));
	/* Should be filesize, but we set it to max value. */
	addec->key = MAXKEY;
	addec->offset = offset;
	addec->havetext = 0;
	addec->count = 0;
	diff_insert_edit(&ds, addec);
	addec = NULL;
	diff_write_reverse(dest, &ds);
	diff_free(&ds);
	stream_flush(dest);
	return (0);
}

/* Get an editing command from the diff. */
static int
diff_geteditcmd(struct editcmd *ec, char *line)
{
	char *end;

	if (line[0] == 'a')
		ec->cmd = EC_ADD;
	else if (line[0] == 'd')
		ec->cmd = EC_DEL;
	else
		return (-1);
	errno = 0;
	ec->where = strtol(line + 1, &end, 10);
	if (errno || ec->where < 0 || *end != ' ')
		return (-1);
	line = end + 1;
	errno = 0;
	ec->count = strtol(line, &end, 10);
	if (errno || ec->count <= 0 || *end != '\0')
		return (-1);
	if (ec->cmd == EC_ADD) {
		if (ec->where < ec->lasta)
			return (-1);
		ec->lasta = ec->where + 1;
	} else {
		if (ec->where < ec->lasta || ec->where < ec->lastd)
			return (-1);
		ec->lasta = ec->where;
		ec->lastd = ec->where + ec->count;
	}
	return (0);
}

/* Copy lines from the original version of the file up to line "to". */
static int
diff_copyln(struct editcmd *ec, lineno_t to)
{
	size_t size;
	char *line;

	while (ec->editline < to) {
		line = stream_getln(ec->orig, &size);
		if (line == NULL)
			return (-1);
		ec->editline++;
		diff_write(ec, line, size);
	}
	return (0);
}

/* Ignore lines from the original version of the file up to line "to". */
static int
diff_ignoreln(struct editcmd *ec, lineno_t to)
{
	size_t size;
	char *line;

	while (ec->editline < to) {
		line = stream_getln(ec->orig, &size);
		if (line == NULL)
			return (-1);
		ec->editline++;
	}
	return (0);
}

/* Write a new line to the file, expanding RCS keywords appropriately. */
static void
diff_write(struct editcmd *ec, void *buf, size_t size)
{
	size_t newsize;
	char *line, *newline;
	int ret;

	line = buf;
	ret = keyword_expand(ec->keyword, ec->di, line, size,
	    &newline, &newsize);
	if (ret) {
		stream_write(ec->dest, newline, newsize);
		free(newline);
	} else {
		stream_write(ec->dest, buf, size);
	}
}
OpenPOWER on IntegriCloud