apply.c 25.9 KB
Newer Older
L
Linus Torvalds 已提交
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
/*
 * apply.c
 *
 * Copyright (C) Linus Torvalds, 2005
 *
 * This applies patches on top of some (arbitrary) version of the SCM.
 *
 * NOTE! It does all its work in the index file, and only cares about
 * the files in the working directory if you tell it to "merge" the
 * patch apply.
 *
 * Even when merging it always takes the source from the index, and
 * uses the working tree as a "branch" for a 3-way merge.
 */
#include <ctype.h>

#include "cache.h"

// We default to the merge behaviour, since that's what most people would
20 21 22 23 24 25 26
// expect.
//
//  --check turns on checking that the working tree matches the
//    files that are being modified, but doesn't apply the patch
//  --stat does just a diffstat, and doesn't actually apply
//  --show-files shows the directory changes
//
L
Linus Torvalds 已提交
27
static int merge_patch = 1;
28
static int check_index = 0;
29
static int diffstat = 0;
30 31 32 33
static int check = 0;
static int apply = 1;
static int show_files = 0;
static const char apply_usage[] = "git-apply [--stat] [--check] [--show-files] <patch>";
L
Linus Torvalds 已提交
34

35 36 37 38 39 40 41
/*
 * For "diff-stat" like behaviour, we keep track of the biggest change
 * we've seen, and the longest filename. That allows us to do simple
 * scaling.
 */
static int max_change, max_len;

42 43 44 45 46
/*
 * Various "current state", notably line numbers and what
 * file (and how) we're patching right now.. The "is_xxxx"
 * things are flags, where -1 means "don't know yet".
 */
47
static int linenr = 1;
48 49 50 51 52 53 54 55 56 57

struct fragment {
	unsigned long oldpos, oldlines;
	unsigned long newpos, newlines;
	const char *patch;
	int size;
	struct fragment *next;
};

struct patch {
58
	char *new_name, *old_name, *def_name;
59 60
	unsigned int old_mode, new_mode;
	int is_rename, is_copy, is_new, is_delete;
61
	int lines_added, lines_deleted;
62
	struct fragment *fragments;
63 64
	const char *result;
	unsigned long resultsize;
65 66
	struct patch *next;
};
67

L
Linus Torvalds 已提交
68
#define CHUNKSIZE (8192)
69
#define SLOP (16)
L
Linus Torvalds 已提交
70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93

static void *read_patch_file(int fd, unsigned long *sizep)
{
	unsigned long size = 0, alloc = CHUNKSIZE;
	void *buffer = xmalloc(alloc);

	for (;;) {
		int nr = alloc - size;
		if (nr < 1024) {
			alloc += CHUNKSIZE;
			buffer = xrealloc(buffer, alloc);
			nr = alloc - size;
		}
		nr = read(fd, buffer + size, nr);
		if (!nr)
			break;
		if (nr < 0) {
			if (errno == EAGAIN)
				continue;
			die("git-apply: read returned %s", strerror(errno));
		}
		size += nr;
	}
	*sizep = size;
94 95 96 97 98 99 100 101 102

	/*
	 * Make sure that we have some slop in the buffer
	 * so that we can do speculative "memcmp" etc, and
	 * see to it that it is NUL-filled.
	 */
	if (alloc < size + SLOP)
		buffer = xrealloc(buffer, size + SLOP);
	memset(buffer + size, 0, SLOP);
L
Linus Torvalds 已提交
103 104 105
	return buffer;
}

106
static unsigned long linelen(const char *buffer, unsigned long size)
L
Linus Torvalds 已提交
107 108 109 110 111 112 113 114 115 116
{
	unsigned long len = 0;
	while (size--) {
		len++;
		if (*buffer++ == '\n')
			break;
	}
	return len;
}

117 118 119 120 121
static int is_dev_null(const char *str)
{
	return !memcmp("/dev/null", str, 9) && isspace(str[9]);
}

122 123
#define TERM_SPACE	1
#define TERM_TAB	2
124 125 126 127 128 129 130 131 132 133 134 135

static int name_terminate(const char *name, int namelen, int c, int terminate)
{
	if (c == ' ' && !(terminate & TERM_SPACE))
		return 0;
	if (c == '\t' && !(terminate & TERM_TAB))
		return 0;

	return 1;
}

static char * find_name(const char *line, char *def, int p_value, int terminate)
L
Linus Torvalds 已提交
136
{
137 138 139 140
	int len;
	const char *start = line;
	char *name;

L
Linus Torvalds 已提交
141
	for (;;) {
142
		char c = *line;
143 144 145 146 147 148 149

		if (isspace(c)) {
			if (c == '\n')
				break;
			if (name_terminate(start, line-start, c, terminate))
				break;
		}
150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169
		line++;
		if (c == '/' && !--p_value)
			start = line;
	}
	if (!start)
		return def;
	len = line - start;
	if (!len)
		return def;

	/*
	 * Generally we prefer the shorter name, especially
	 * if the other one is just a variation of that with
	 * something else tacked on to the end (ie "file.orig"
	 * or "file~").
	 */
	if (def) {
		int deflen = strlen(def);
		if (deflen < len && !strncmp(start, def, deflen))
			return def;
L
Linus Torvalds 已提交
170
	}
171 172 173 174 175 176 177 178 179 180 181 182

	name = xmalloc(len + 1);
	memcpy(name, start, len);
	name[len] = 0;
	free(def);
	return name;
}

/*
 * Get the name etc info from the --/+++ lines of a traditional patch header
 *
 * NOTE! This hardcodes "-p1" behaviour in filename detection.
183 184 185 186
 *
 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
 * files, we can happily check the index for a match, but for creating a
 * new file we should try to match whatever "patch" does. I have no idea.
187
 */
188
static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
189 190 191 192 193 194 195
{
	int p_value = 1;
	char *name;

	first += 4;	// skip "--- "
	second += 4;	// skip "+++ "
	if (is_dev_null(first)) {
196 197
		patch->is_new = 1;
		patch->is_delete = 0;
198
		name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
199
		patch->new_name = name;
200
	} else if (is_dev_null(second)) {
201 202
		patch->is_new = 0;
		patch->is_delete = 1;
203
		name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
204
		patch->old_name = name;
205
	} else {
206 207
		name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
		name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
208
		patch->old_name = patch->new_name = name;
209 210 211 212 213
	}
	if (!name)
		die("unable to find filename in patch at line %d", linenr);
}

214
static int gitdiff_hdrend(const char *line, struct patch *patch)
215 216 217 218
{
	return -1;
}

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
/*
 * We're anal about diff header consistency, to make
 * sure that we don't end up having strange ambiguous
 * patches floating around.
 *
 * As a result, gitdiff_{old|new}name() will check
 * their names against any previous information, just
 * to make sure..
 */
static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
{
	int len;
	const char *name;

	if (!orig_name && !isnull)
		return find_name(line, NULL, 1, 0);

	name = "/dev/null";
	len = 9;
	if (orig_name) {
		name = orig_name;
		len = strlen(name);
		if (isnull)
			die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
	}

	if (*name == '/')
		goto absolute_path;

	for (;;) {
		char c = *line++;
		if (c == '\n')
			break;
		if (c != '/')
			continue;
absolute_path:
		if (memcmp(line, name, len) || line[len] != '\n')
			break;
		return orig_name;
	}
	die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
	return NULL;
}

263
static int gitdiff_oldname(const char *line, struct patch *patch)
264
{
265
	patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
266 267 268
	return 0;
}

269
static int gitdiff_newname(const char *line, struct patch *patch)
270
{
271
	patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
272 273 274
	return 0;
}

275
static int gitdiff_oldmode(const char *line, struct patch *patch)
276
{
277
	patch->old_mode = strtoul(line, NULL, 8);
278 279 280
	return 0;
}

281
static int gitdiff_newmode(const char *line, struct patch *patch)
282
{
283
	patch->new_mode = strtoul(line, NULL, 8);
284 285 286
	return 0;
}

287
static int gitdiff_delete(const char *line, struct patch *patch)
288
{
289
	patch->is_delete = 1;
290
	patch->old_name = patch->def_name;
291
	return gitdiff_oldmode(line, patch);
292 293
}

294
static int gitdiff_newfile(const char *line, struct patch *patch)
295
{
296
	patch->is_new = 1;
297
	patch->new_name = patch->def_name;
298
	return gitdiff_newmode(line, patch);
299 300
}

301
static int gitdiff_copysrc(const char *line, struct patch *patch)
302
{
303 304
	patch->is_copy = 1;
	patch->old_name = find_name(line, NULL, 0, 0);
305 306 307
	return 0;
}

308
static int gitdiff_copydst(const char *line, struct patch *patch)
309
{
310 311
	patch->is_copy = 1;
	patch->new_name = find_name(line, NULL, 0, 0);
312 313 314
	return 0;
}

315
static int gitdiff_renamesrc(const char *line, struct patch *patch)
316
{
317 318
	patch->is_rename = 1;
	patch->old_name = find_name(line, NULL, 0, 0);
319 320 321
	return 0;
}

322
static int gitdiff_renamedst(const char *line, struct patch *patch)
323
{
324 325
	patch->is_rename = 1;
	patch->new_name = find_name(line, NULL, 0, 0);
326 327 328
	return 0;
}

329
static int gitdiff_similarity(const char *line, struct patch *patch)
330 331
{
	return 0;
L
Linus Torvalds 已提交
332 333
}

334 335 336 337 338
static int gitdiff_dissimilarity(const char *line, struct patch *patch)
{
	return 0;
}

339 340 341 342
/*
 * This is normal for a diff that doesn't change anything: we'll fall through
 * into the next diff. Tell the parser to break out.
 */
343
static int gitdiff_unrecognized(const char *line, struct patch *patch)
344 345 346 347
{
	return -1;
}

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
static char *git_header_name(char *line)
{
	int len;
	char *name, *second;

	/*
	 * Find the first '/'
	 */
	name = line;
	for (;;) {
		char c = *name++;
		if (c == '\n')
			return NULL;
		if (c == '/')
			break;
	}

	/*
	 * We don't accept absolute paths (/dev/null) as possibly valid
	 */
	if (name == line+1)
		return NULL;

	/*
	 * Accept a name only if it shows up twice, exactly the same
	 * form.
	 */
	for (len = 0 ; ; len++) {
		char c = name[len];

		switch (c) {
		default:
			continue;
		case '\n':
			break;
		case '\t': case ' ':
			second = name+len;
			for (;;) {
				char c = *second++;
				if (c == '\n')
					return NULL;
				if (c == '/')
					break;
			}
392
			if (second[len] == '\n' && !memcmp(name, second, len)) {
393 394 395 396 397 398 399 400 401 402
				char *ret = xmalloc(len + 1);
				memcpy(ret, name, len);
				ret[len] = 0;
				return ret;
			}
		}
	}
	return NULL;
}

L
Linus Torvalds 已提交
403
/* Verify that we recognize the lines following a git header */
404
static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
L
Linus Torvalds 已提交
405
{
406 407 408
	unsigned long offset;

	/* A git diff has explicit new/delete information, so we don't guess */
409 410
	patch->is_new = 0;
	patch->is_delete = 0;
411

412 413 414 415 416 417 418 419
	/*
	 * Some things may not have the old name in the
	 * rest of the headers anywhere (pure mode changes,
	 * or removing or adding empty files), so we get
	 * the default name from the header.
	 */
	patch->def_name = git_header_name(line + strlen("diff --git "));

420 421 422 423 424 425
	line += len;
	size -= len;
	linenr++;
	for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
		static const struct opentry {
			const char *str;
426
			int (*fn)(const char *, struct patch *);
427 428 429 430 431 432 433 434 435 436 437 438 439
		} optable[] = {
			{ "@@ -", gitdiff_hdrend },
			{ "--- ", gitdiff_oldname },
			{ "+++ ", gitdiff_newname },
			{ "old mode ", gitdiff_oldmode },
			{ "new mode ", gitdiff_newmode },
			{ "deleted file mode ", gitdiff_delete },
			{ "new file mode ", gitdiff_newfile },
			{ "copy from ", gitdiff_copysrc },
			{ "copy to ", gitdiff_copydst },
			{ "rename from ", gitdiff_renamesrc },
			{ "rename to ", gitdiff_renamedst },
			{ "similarity index ", gitdiff_similarity },
440
			{ "dissimilarity index ", gitdiff_dissimilarity },
441
			{ "", gitdiff_unrecognized },
442 443
		};
		int i;
L
Linus Torvalds 已提交
444 445

		len = linelen(line, size);
446
		if (!len || line[len-1] != '\n')
L
Linus Torvalds 已提交
447
			break;
448 449 450 451 452
		for (i = 0; i < sizeof(optable) / sizeof(optable[0]); i++) {
			const struct opentry *p = optable + i;
			int oplen = strlen(p->str);
			if (len < oplen || memcmp(p->str, line, oplen))
				continue;
453
			if (p->fn(line + oplen, patch) < 0)
454
				return offset;
455
			break;
456
		}
L
Linus Torvalds 已提交
457 458
	}

459
	return offset;
L
Linus Torvalds 已提交
460 461
}

462
static int parse_num(const char *line, unsigned long *p)
463 464
{
	char *ptr;
465 466 467 468 469 470 471 472 473 474

	if (!isdigit(*line))
		return 0;
	*p = strtoul(line, &ptr, 10);
	return ptr - line;
}

static int parse_range(const char *line, int len, int offset, const char *expect,
			unsigned long *p1, unsigned long *p2)
{
475 476 477 478 479 480 481
	int digits, ex;

	if (offset < 0 || offset >= len)
		return -1;
	line += offset;
	len -= offset;

482 483
	digits = parse_num(line, p1);
	if (!digits)
484 485 486 487 488 489
		return -1;

	offset += digits;
	line += digits;
	len -= digits;

490 491 492 493 494 495 496 497 498 499 500
	*p2 = *p1;
	if (*line == ',') {
		digits = parse_num(line+1, p2);
		if (!digits)
			return -1;

		offset += digits+1;
		line += digits+1;
		len -= digits+1;
	}

501 502 503 504 505 506 507 508 509 510 511 512 513
	ex = strlen(expect);
	if (ex > len)
		return -1;
	if (memcmp(line, expect, ex))
		return -1;

	return offset + ex;
}

/*
 * Parse a unified diff fragment header of the
 * form "@@ -a,b +c,d @@"
 */
514
static int parse_fragment_header(char *line, int len, struct fragment *fragment)
515 516 517 518 519 520 521
{
	int offset;

	if (!len || line[len-1] != '\n')
		return -1;

	/* Figure out the number of lines in a fragment */
522 523
	offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
	offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
524 525 526 527

	return offset;
}

528
static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
L
Linus Torvalds 已提交
529 530 531
{
	unsigned long offset, len;

532 533 534 535
	patch->is_rename = patch->is_copy = 0;
	patch->is_new = patch->is_delete = -1;
	patch->old_mode = patch->new_mode = 0;
	patch->old_name = patch->new_name = NULL;
536
	for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
L
Linus Torvalds 已提交
537 538 539 540 541 542 543 544 545
		unsigned long nextlen;

		len = linelen(line, size);
		if (!len)
			break;

		/* Testing this early allows us to take a few shortcuts.. */
		if (len < 6)
			continue;
546 547 548 549 550 551 552

		/*
		 * Make sure we don't find any unconnected patch fragmants.
		 * That's a sign that we didn't find a header, and that a
		 * patch has become corrupted/broken up.
		 */
		if (!memcmp("@@ -", line, 4)) {
553 554
			struct fragment dummy;
			if (parse_fragment_header(line, len, &dummy) < 0)
555 556 557 558
				continue;
			error("patch fragment without header at line %d: %.*s", linenr, len-1, line);
		}

L
Linus Torvalds 已提交
559 560 561 562 563 564 565 566
		if (size < len + 6)
			break;

		/*
		 * Git patch? It might not have a real patch, just a rename
		 * or mode change, so we handle that specially
		 */
		if (!memcmp("diff --git ", line, 11)) {
567
			int git_hdr_len = parse_git_header(line, len, size, patch);
L
Linus Torvalds 已提交
568 569
			if (git_hdr_len < 0)
				continue;
570 571
			if (!patch->old_name && !patch->new_name)
				die("git diff header lacks filename information");
572
			*hdrsize = git_hdr_len;
L
Linus Torvalds 已提交
573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589
			return offset;
		}

		/** --- followed by +++ ? */
		if (memcmp("--- ", line,  4) || memcmp("+++ ", line + len, 4))
			continue;

		/*
		 * We only accept unified patches, so we want it to
		 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
		 * minimum
		 */
		nextlen = linelen(line + len, size - len);
		if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
			continue;

		/* Ok, we'll consider it a patch */
590
		parse_traditional_patch(line, line+len, patch);
L
Linus Torvalds 已提交
591
		*hdrsize = len + nextlen;
592
		linenr += 2;
L
Linus Torvalds 已提交
593 594 595 596 597 598 599 600 601 602 603 604
		return offset;
	}
	return -1;
}

/*
 * Parse a unified diff. Note that this really needs
 * to parse each fragment separately, since the only
 * way to know the difference between a "---" that is
 * part of a patch, and a "---" that starts the next
 * patch is to look at the line counts..
 */
605
static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
L
Linus Torvalds 已提交
606
{
607
	int added, deleted;
L
Linus Torvalds 已提交
608
	int len = linelen(line, size), offset;
609
	unsigned long pos[4], oldlines, newlines;
L
Linus Torvalds 已提交
610

611
	offset = parse_fragment_header(line, len, fragment);
L
Linus Torvalds 已提交
612 613
	if (offset < 0)
		return -1;
614 615
	oldlines = fragment->oldlines;
	newlines = fragment->newlines;
L
Linus Torvalds 已提交
616

617 618 619 620
	if (patch->is_new < 0 && (pos[0] || oldlines))
		patch->is_new = 0;
	if (patch->is_delete < 0 && (pos[1] || newlines))
		patch->is_delete = 0;
621

L
Linus Torvalds 已提交
622 623 624
	/* Parse the thing.. */
	line += len;
	size -= len;
625
	linenr++;
626
	added = deleted = 0;
627
	for (offset = len; size > 0; offset += len, size -= len, line += len, linenr++) {
L
Linus Torvalds 已提交
628 629 630 631 632 633 634 635 636 637 638 639 640
		if (!oldlines && !newlines)
			break;
		len = linelen(line, size);
		if (!len || line[len-1] != '\n')
			return -1;
		switch (*line) {
		default:
			return -1;
		case ' ':
			oldlines--;
			newlines--;
			break;
		case '-':
641
			deleted++;
L
Linus Torvalds 已提交
642 643 644
			oldlines--;
			break;
		case '+':
645
			added++;
L
Linus Torvalds 已提交
646 647
			newlines--;
			break;
648 649
		/* We allow "\ No newline at end of file" */
		case '\\':
650 651
			if (len < 12 || memcmp(line, "\\ No newline", 12))
				return -1;
652
			break;
L
Linus Torvalds 已提交
653 654
		}
	}
655 656
	patch->lines_added += added;
	patch->lines_deleted += deleted;
L
Linus Torvalds 已提交
657 658 659
	return offset;
}

660
static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
L
Linus Torvalds 已提交
661 662
{
	unsigned long offset = 0;
663
	struct fragment **fragp = &patch->fragments;
L
Linus Torvalds 已提交
664 665

	while (size > 4 && !memcmp(line, "@@ -", 4)) {
666 667 668 669 670 671
		struct fragment *fragment;
		int len;

		fragment = xmalloc(sizeof(*fragment));
		memset(fragment, 0, sizeof(*fragment));
		len = parse_fragment(line, size, patch, fragment);
L
Linus Torvalds 已提交
672
		if (len <= 0)
673
			die("corrupt patch at line %d", linenr);
L
Linus Torvalds 已提交
674

675 676 677 678 679
		fragment->patch = line;
		fragment->size = len;

		*fragp = fragment;
		fragp = &fragment->next;
L
Linus Torvalds 已提交
680 681 682 683 684 685 686 687

		offset += len;
		line += len;
		size -= len;
	}
	return offset;
}

688
static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
L
Linus Torvalds 已提交
689 690
{
	int hdrsize, patchsize;
691
	int offset = find_header(buffer, size, &hdrsize, patch);
L
Linus Torvalds 已提交
692 693 694 695

	if (offset < 0)
		return offset;

696
	patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
L
Linus Torvalds 已提交
697 698 699 700

	return offset + hdrsize + patchsize;
}

701 702 703 704 705 706
const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
const char minuses[]= "----------------------------------------------------------------------";

static void show_stats(struct patch *patch)
{
	char *name = patch->old_name;
707
	int len, max, add, del, total;
708

709
	if (!name)
710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728
		name = patch->new_name;

	/*
	 * "scale" the filename
	 */
	len = strlen(name);
	max = max_len;
	if (max > 50)
		max = 50;
	if (len > max)
		name += len - max;
	len = max;

	/*
	 * scale the add/delete
	 */
	max = max_change;
	if (max + len > 70)
		max = 70 - len;
729 730 731 732 733 734 735 736

	add = patch->lines_added;
	del = patch->lines_deleted;
	total = add + del;

	total = (total * max + max_change / 2) / max_change;
	add = (add * max + max_change / 2) / max_change;
	del = total - add;
737 738 739 740 741
	printf(" %-*s |%5d %.*s%.*s\n",
		len, name, patch->lines_added + patch->lines_deleted,
		add, pluses, del, minuses);
}

742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775
static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
{
	int fd;
	unsigned long got;

	switch (st->st_mode & S_IFMT) {
	case S_IFLNK:
		return readlink(path, buf, size);
	case S_IFREG:
		fd = open(path, O_RDONLY);
		if (fd < 0)
			return error("unable to open %s", path);
		got = 0;
		for (;;) {
			int ret = read(fd, buf + got, size - got);
			if (ret < 0) {
				if (errno == EAGAIN)
					continue;
				break;
			}
			if (!ret)
				break;
			got += ret;
		}
		close(fd);
		return got;

	default:
		return -1;
	}
}

static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line)
{
776 777
	int i;
	unsigned long start, backwards, forwards;
778 779 780 781 782 783 784

	if (fragsize > size)
		return -1;

	start = 0;
	if (line > 1) {
		unsigned long offset = 0;
785 786
		i = line-1;
		while (offset + fragsize <= size) {
787 788
			if (buf[offset++] == '\n') {
				start = offset;
789
				if (!--i)
790 791 792 793 794 795 796 797 798
					break;
			}
		}
	}

	/* Exact line number? */
	if (!memcmp(buf + start, fragment, fragsize))
		return start;

799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838
	/*
	 * There's probably some smart way to do this, but I'll leave
	 * that to the smart and beautiful people. I'm simple and stupid.
	 */
	backwards = start;
	forwards = start;
	for (i = 0; ; i++) {
		unsigned long try;
		int n;

		/* "backward" */
		if (i & 1) {
			if (!backwards) {
				if (forwards + fragsize > size)
					break;
				continue;
			}
			do {
				--backwards;
			} while (backwards && buf[backwards-1] != '\n');
			try = backwards;
		} else {
			while (forwards + fragsize <= size) {
				if (buf[forwards++] == '\n')
					break;
			}
			try = forwards;
		}

		if (try + fragsize > size)
			continue;
		if (memcmp(buf + try, fragment, fragsize))
			continue;
		n = (i >> 1)+1;
		if (i & 1)
			n = -n;
		fprintf(stderr, "Fragment applied at offset %d\n", n);
		return try;
	}

839 840 841 842 843 844
	/*
	 * We should start searching forward and backward.
	 */
	return -1;
}

845 846 847 848 849 850 851
struct buffer_desc {
	char *buffer;
	unsigned long size;
	unsigned long alloc;
};

static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
852
{
853
	char *buf = desc->buffer;
854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898
	const char *patch = frag->patch;
	int offset, size = frag->size;
	char *old = xmalloc(size);
	char *new = xmalloc(size);
	int oldsize = 0, newsize = 0;

	while (size > 0) {
		int len = linelen(patch, size);
		int plen;

		if (!len)
			break;

		/*
		 * "plen" is how much of the line we should use for
		 * the actual patch data. Normally we just remove the
		 * first character on the line, but if the line is
		 * followed by "\ No newline", then we also remove the
		 * last one (which is the newline, of course).
		 */
		plen = len-1;
		if (len > size && patch[len] == '\\')
			plen--;
		switch (*patch) {
		case ' ':
		case '-':
			memcpy(old + oldsize, patch + 1, plen);
			oldsize += plen;
			if (*patch == '-')
				break;
		/* Fall-through for ' ' */
		case '+':
			memcpy(new + newsize, patch + 1, plen);
			newsize += plen;
			break;
		case '@': case '\\':
			/* Ignore it, we already handled it */
			break;
		default:
			return -1;
		}
		patch += len;
		size -= len;
	}

899
	offset = find_offset(buf, desc->size, old, oldsize, frag->newpos);
900
	if (offset >= 0) {
901 902 903 904 905 906 907 908 909 910 911 912 913
		int diff = newsize - oldsize;
		unsigned long size = desc->size + diff;
		unsigned long alloc = desc->alloc;

		if (size > alloc) {
			alloc = size + 8192;
			desc->alloc = alloc;
			buf = xrealloc(buf, alloc);
			desc->buffer = buf;
		}
		desc->size = size;
		memmove(buf + offset + newsize, buf + offset + oldsize, size - offset - newsize);
		memcpy(buf + offset, new, newsize);
914 915 916 917 918 919 920 921
		offset = 0;
	}

	free(old);
	free(new);
	return offset;
}

922
static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
923 924 925 926
{
	struct fragment *frag = patch->fragments;

	while (frag) {
927
		if (apply_one_fragment(desc, frag) < 0)
928 929 930 931 932 933 934
			return error("patch failed: %s:%d", patch->old_name, frag->oldpos);
		frag = frag->next;
	}
}

static int apply_data(struct patch *patch, struct stat *st)
{
935 936 937
	char *buf;
	unsigned long size, alloc;
	struct buffer_desc desc;
938 939 940 941

	if (!patch->old_name || !patch->fragments)
		return 0;
	size = st->st_size;
942 943 944
	alloc = size + 8192;
	buf = xmalloc(alloc);
	if (read_old_data(st, patch->old_name, buf, alloc) != size)
945
		return error("read of %s failed", patch->old_name);
946 947 948 949 950

	desc.size = size;
	desc.alloc = alloc;
	desc.buffer = buf;
	if (apply_fragments(&desc, patch) < 0)
951
		return -1;
952 953
	patch->result = desc.buffer;
	patch->resultsize = desc.size;
954 955 956
	return 0;
}

957
static int check_patch(struct patch *patch)
958
{
959
	struct stat st;
960 961 962 963
	const char *old_name = patch->old_name;
	const char *new_name = patch->new_name;

	if (old_name) {
964 965 966 967
		int changed;

		if (lstat(old_name, &st) < 0)
			return error("%s: %s\n", strerror(errno));
968 969 970 971 972 973 974 975 976 977
		if (check_index) {
			int pos = cache_name_pos(old_name, strlen(old_name));
			if (pos < 0)
				return error("%s: does not exist in index", old_name);
			changed = ce_match_stat(active_cache[pos], &st);
			if (changed)
				return error("%s: does not match index", old_name);
		}
		if (patch->is_new < 0)
			patch->is_new = 0;
978 979
		if (!patch->old_mode)
			patch->old_mode = st.st_mode;
980 981 982 983 984
		if ((st.st_mode ^ patch->old_mode) & S_IFMT)
			return error("%s: wrong type", old_name);
		if (st.st_mode != patch->old_mode)
			fprintf(stderr, "warning: %s has type %o, expected %o\n",
				old_name, st.st_mode, patch->old_mode);
985
	}
986

987
	if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
988
		if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0)
989 990 991 992 993
			return error("%s: already exists in index", new_name);
		if (!lstat(new_name, &st))
			return error("%s: already exists in working directory", new_name);
		if (errno != ENOENT)
			return error("%s: %s", new_name, strerror(errno));
994
	}
995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007

	if (new_name && old_name) {
		int same = !strcmp(old_name, new_name);
		if (!patch->new_mode)
			patch->new_mode = patch->old_mode;
		if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
			return error("new mode (%o) of %s does not match old mode (%o)%s%s",
				patch->new_mode, new_name, patch->old_mode,
				same ? "" : " of ", same ? "" : old_name);
	}	

	if (apply_data(patch, &st) < 0)
		return error("%s: patch does not apply", old_name);
1008
	return 0;
1009 1010
}

1011
static int check_patch_list(struct patch *patch)
1012
{
1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023
	int error = 0;

	for (;patch ; patch = patch->next)
		error |= check_patch(patch);
	return error;
}

static void show_file(int c, unsigned int mode, const char *name)
{
	printf("%c %o %s\n", c, mode, name);
}
1024

1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043
static void show_file_list(struct patch *patch)
{
	for (;patch ; patch = patch->next) {
		if (patch->is_rename) {
			show_file('-', patch->old_mode, patch->old_name);
			show_file('+', patch->new_mode, patch->new_name);
			continue;
		}
		if (patch->is_copy || patch->is_new) {
			show_file('+', patch->new_mode, patch->new_name);
			continue;
		}
		if (patch->is_delete) {
			show_file('-', patch->old_mode, patch->old_name);
			continue;
		}
		if (patch->old_mode && patch->new_mode && patch->old_mode != patch->new_mode) {
			printf("M %o:%o %s\n", patch->old_mode, patch->new_mode, patch->old_name);
			continue;
1044
		}
1045 1046 1047
		printf("M %o %s\n", patch->old_mode, patch->old_name);
	}
}
1048

1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060
static void stat_patch_list(struct patch *patch)
{
	int files, adds, dels;

	for (files = adds = dels = 0 ; patch ; patch = patch->next) {
		files++;
		adds += patch->lines_added;
		dels += patch->lines_deleted;
		show_stats(patch);
	}

	printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078
}

static void patch_stats(struct patch *patch)
{
	int lines = patch->lines_added + patch->lines_deleted;

	if (lines > max_change)
		max_change = lines;
	if (patch->old_name) {
		int len = strlen(patch->old_name);
		if (len > max_len)
			max_len = len;
	}
	if (patch->new_name) {
		int len = strlen(patch->new_name);
		if (len > max_len)
			max_len = len;
	}
1079 1080
}

L
Linus Torvalds 已提交
1081 1082 1083 1084
static int apply_patch(int fd)
{
	unsigned long offset, size;
	char *buffer = read_patch_file(fd, &size);
1085
	struct patch *list = NULL, **listp = &list;
L
Linus Torvalds 已提交
1086 1087 1088 1089 1090

	if (!buffer)
		return -1;
	offset = 0;
	while (size > 0) {
1091 1092 1093 1094 1095 1096
		struct patch *patch;
		int nr;

		patch = xmalloc(sizeof(*patch));
		memset(patch, 0, sizeof(*patch));
		nr = parse_chunk(buffer + offset, size, patch);
L
Linus Torvalds 已提交
1097 1098
		if (nr < 0)
			break;
1099
		patch_stats(patch);
1100 1101
		*listp = patch;
		listp = &patch->next;
L
Linus Torvalds 已提交
1102 1103 1104
		offset += nr;
		size -= nr;
	}
1105

1106 1107 1108 1109 1110 1111 1112 1113
	if ((check || apply) && check_patch_list(list) < 0)
		exit(1);

	if (show_files)
		show_file_list(list);

	if (diffstat)
		stat_patch_list(list);
1114

L
Linus Torvalds 已提交
1115 1116 1117 1118 1119 1120 1121
	free(buffer);
	return 0;
}

int main(int argc, char **argv)
{
	int i;
1122
	int read_stdin = 1;
L
Linus Torvalds 已提交
1123 1124 1125 1126 1127 1128 1129 1130 1131 1132

	if (read_cache() < 0)
		die("unable to read index file");

	for (i = 1; i < argc; i++) {
		const char *arg = argv[i];
		int fd;

		if (!strcmp(arg, "-")) {
			apply_patch(0);
1133
			read_stdin = 0;
L
Linus Torvalds 已提交
1134 1135 1136 1137 1138 1139
			continue;
		}
		if (!strcmp(arg, "--no-merge")) {
			merge_patch = 0;
			continue;
		}
1140
		if (!strcmp(arg, "--stat")) {
1141
			apply = 0;
1142 1143 1144
			diffstat = 1;
			continue;
		}
1145 1146 1147 1148 1149
		if (!strcmp(arg, "--check")) {
			apply = 0;
			check = 1;
			continue;
		}
1150 1151 1152 1153
		if (!strcmp(arg, "--index")) {
			check_index = 1;
			continue;
		}
1154 1155 1156 1157
		if (!strcmp(arg, "--show-files")) {
			show_files = 1;
			continue;
		}
L
Linus Torvalds 已提交
1158 1159 1160
		fd = open(arg, O_RDONLY);
		if (fd < 0)
			usage(apply_usage);
1161
		read_stdin = 0;
L
Linus Torvalds 已提交
1162 1163 1164
		apply_patch(fd);
		close(fd);
	}
1165 1166
	if (read_stdin)
		apply_patch(0);
L
Linus Torvalds 已提交
1167 1168
	return 0;
}