apply.c 32.5 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 write_index = 0;
30
static int diffstat = 0;
31
static int summary = 0;
32 33 34
static int check = 0;
static int apply = 1;
static int show_files = 0;
35
static const char apply_usage[] = "git-apply [--stat] [--summary] [--check] [--show-files] <patch>";
L
Linus Torvalds 已提交
36

37 38 39 40 41 42 43
/*
 * 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;

44 45 46 47 48
/*
 * 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".
 */
49
static int linenr = 1;
50 51 52 53 54 55 56 57 58 59

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

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

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

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;
97 98 99 100 101 102 103 104 105

	/*
	 * 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 已提交
106 107 108
	return buffer;
}

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

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

125 126
#define TERM_SPACE	1
#define TERM_TAB	2
127 128 129 130 131 132 133 134 135 136 137 138

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 已提交
139
{
140 141 142 143
	int len;
	const char *start = line;
	char *name;

L
Linus Torvalds 已提交
144
	for (;;) {
145
		char c = *line;
146 147 148 149 150 151 152

		if (isspace(c)) {
			if (c == '\n')
				break;
			if (name_terminate(start, line-start, c, terminate))
				break;
		}
153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172
		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 已提交
173
	}
174 175 176 177 178 179 180 181 182 183 184 185

	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.
186 187 188 189
 *
 * 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.
190
 */
191
static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
192 193 194 195 196 197 198
{
	int p_value = 1;
	char *name;

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

217
static int gitdiff_hdrend(const char *line, struct patch *patch)
218 219 220 221
{
	return -1;
}

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
/*
 * 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;
}

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

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

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

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

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

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

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

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

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

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

332
static int gitdiff_similarity(const char *line, struct patch *patch)
333
{
334 335
	if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
		patch->score = 0;
336
	return 0;
L
Linus Torvalds 已提交
337 338
}

339 340
static int gitdiff_dissimilarity(const char *line, struct patch *patch)
{
341 342
	if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
		patch->score = 0;
343 344 345
	return 0;
}

346 347 348 349
/*
 * 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.
 */
350
static int gitdiff_unrecognized(const char *line, struct patch *patch)
351 352 353 354
{
	return -1;
}

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
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;
			}
399
			if (second[len] == '\n' && !memcmp(name, second, len)) {
400 401 402 403 404 405 406 407 408 409
				char *ret = xmalloc(len + 1);
				memcpy(ret, name, len);
				ret[len] = 0;
				return ret;
			}
		}
	}
	return NULL;
}

L
Linus Torvalds 已提交
410
/* Verify that we recognize the lines following a git header */
411
static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
L
Linus Torvalds 已提交
412
{
413 414 415
	unsigned long offset;

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

419 420 421 422 423 424 425 426
	/*
	 * 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 "));

427 428 429 430 431 432
	line += len;
	size -= len;
	linenr++;
	for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
		static const struct opentry {
			const char *str;
433
			int (*fn)(const char *, struct patch *);
434 435 436 437 438 439 440 441 442 443
		} 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 },
444 445
			{ "rename old ", gitdiff_renamesrc },
			{ "rename new ", gitdiff_renamedst },
L
Linus Torvalds 已提交
446 447
			{ "rename from ", gitdiff_renamesrc },
			{ "rename to ", gitdiff_renamedst },
448
			{ "similarity index ", gitdiff_similarity },
449
			{ "dissimilarity index ", gitdiff_dissimilarity },
450
			{ "", gitdiff_unrecognized },
451 452
		};
		int i;
L
Linus Torvalds 已提交
453 454

		len = linelen(line, size);
455
		if (!len || line[len-1] != '\n')
L
Linus Torvalds 已提交
456
			break;
457 458 459 460 461
		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;
462
			if (p->fn(line + oplen, patch) < 0)
463
				return offset;
464
			break;
465
		}
L
Linus Torvalds 已提交
466 467
	}

468
	return offset;
L
Linus Torvalds 已提交
469 470
}

471
static int parse_num(const char *line, unsigned long *p)
472 473
{
	char *ptr;
474 475 476 477 478 479 480 481 482 483

	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)
{
484 485 486 487 488 489 490
	int digits, ex;

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

491 492
	digits = parse_num(line, p1);
	if (!digits)
493 494 495 496 497 498
		return -1;

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

499 500 501 502 503 504 505 506 507 508 509
	*p2 = *p1;
	if (*line == ',') {
		digits = parse_num(line+1, p2);
		if (!digits)
			return -1;

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

510 511 512 513 514 515 516 517 518 519 520 521 522
	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 @@"
 */
523
static int parse_fragment_header(char *line, int len, struct fragment *fragment)
524 525 526 527 528 529 530
{
	int offset;

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

	/* Figure out the number of lines in a fragment */
531 532
	offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
	offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
533 534 535 536

	return offset;
}

537
static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
L
Linus Torvalds 已提交
538 539 540
{
	unsigned long offset, len;

541 542 543 544
	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;
545
	for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
L
Linus Torvalds 已提交
546 547 548 549 550 551 552 553 554
		unsigned long nextlen;

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

		/* Testing this early allows us to take a few shortcuts.. */
		if (len < 6)
			continue;
555 556 557 558 559 560 561

		/*
		 * 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)) {
562 563
			struct fragment dummy;
			if (parse_fragment_header(line, len, &dummy) < 0)
564 565 566 567
				continue;
			error("patch fragment without header at line %d: %.*s", linenr, len-1, line);
		}

L
Linus Torvalds 已提交
568 569 570 571 572 573 574 575
		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)) {
576
			int git_hdr_len = parse_git_header(line, len, size, patch);
577
			if (git_hdr_len <= len)
L
Linus Torvalds 已提交
578
				continue;
579 580 581 582 583
			if (!patch->old_name && !patch->new_name) {
				if (!patch->def_name)
					die("git diff header lacks filename information (line %d)", linenr);
				patch->old_name = patch->new_name = patch->def_name;
			}
584
			*hdrsize = git_hdr_len;
L
Linus Torvalds 已提交
585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601
			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 */
602
		parse_traditional_patch(line, line+len, patch);
L
Linus Torvalds 已提交
603
		*hdrsize = len + nextlen;
604
		linenr += 2;
L
Linus Torvalds 已提交
605 606 607 608 609 610 611 612 613 614 615 616
		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..
 */
617
static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
L
Linus Torvalds 已提交
618
{
619
	int added, deleted;
L
Linus Torvalds 已提交
620
	int len = linelen(line, size), offset;
621
	unsigned long oldlines, newlines;
L
Linus Torvalds 已提交
622

623
	offset = parse_fragment_header(line, len, fragment);
L
Linus Torvalds 已提交
624 625
	if (offset < 0)
		return -1;
626 627
	oldlines = fragment->oldlines;
	newlines = fragment->newlines;
L
Linus Torvalds 已提交
628

629 630 631 632 633 634 635 636 637 638 639 640 641
	if (patch->is_new < 0) {
		patch->is_new =  !oldlines;
		if (!oldlines)
			patch->old_name = NULL;
	}
	if (patch->is_delete < 0) {
		patch->is_delete = !newlines;
		if (!newlines)
			patch->new_name = NULL;
	}

	if (patch->is_new != !oldlines)
		return error("new file depends on old contents");
642 643 644 645 646
	if (patch->is_delete != !newlines) {
		if (newlines)
			return error("deleted file still has contents");
		fprintf(stderr, "** warning: file %s becomes empty but is not deleted\n", patch->new_name);
	}
647

L
Linus Torvalds 已提交
648 649 650
	/* Parse the thing.. */
	line += len;
	size -= len;
651
	linenr++;
652
	added = deleted = 0;
653
	for (offset = len; size > 0; offset += len, size -= len, line += len, linenr++) {
L
Linus Torvalds 已提交
654 655 656 657 658 659 660 661 662 663 664 665 666
		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 '-':
667
			deleted++;
L
Linus Torvalds 已提交
668 669 670
			oldlines--;
			break;
		case '+':
671
			added++;
L
Linus Torvalds 已提交
672 673
			newlines--;
			break;
674 675
		/* We allow "\ No newline at end of file" */
		case '\\':
676 677
			if (len < 12 || memcmp(line, "\\ No newline", 12))
				return -1;
678
			break;
L
Linus Torvalds 已提交
679 680
		}
	}
681 682
	patch->lines_added += added;
	patch->lines_deleted += deleted;
L
Linus Torvalds 已提交
683 684 685
	return offset;
}

686
static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
L
Linus Torvalds 已提交
687 688
{
	unsigned long offset = 0;
689
	struct fragment **fragp = &patch->fragments;
L
Linus Torvalds 已提交
690 691

	while (size > 4 && !memcmp(line, "@@ -", 4)) {
692 693 694 695 696 697
		struct fragment *fragment;
		int len;

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

701 702 703 704 705
		fragment->patch = line;
		fragment->size = len;

		*fragp = fragment;
		fragp = &fragment->next;
L
Linus Torvalds 已提交
706 707 708 709 710 711 712 713

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

714
static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
L
Linus Torvalds 已提交
715 716
{
	int hdrsize, patchsize;
717
	int offset = find_header(buffer, size, &hdrsize, patch);
L
Linus Torvalds 已提交
718 719 720 721

	if (offset < 0)
		return offset;

722
	patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
L
Linus Torvalds 已提交
723 724 725 726

	return offset + hdrsize + patchsize;
}

727 728 729 730 731
const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
const char minuses[]= "----------------------------------------------------------------------";

static void show_stats(struct patch *patch)
{
732
	char *name = patch->new_name;
733
	int len, max, add, del, total;
734

735
	if (!name)
736
		name = patch->old_name;
737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754

	/*
	 * "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;
755 756 757 758 759

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

760 761 762 763 764
	if (max_change > 0) {
		total = (total * max + max_change / 2) / max_change;
		add = (add * max + max_change / 2) / max_change;
		del = total - add;
	}
765 766 767 768 769
	printf(" %-*s |%5d %.*s%.*s\n",
		len, name, patch->lines_added + patch->lines_deleted,
		add, pluses, del, minuses);
}

770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803
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)
{
804 805
	int i;
	unsigned long start, backwards, forwards;
806 807 808 809 810 811 812

	if (fragsize > size)
		return -1;

	start = 0;
	if (line > 1) {
		unsigned long offset = 0;
813 814
		i = line-1;
		while (offset + fragsize <= size) {
815 816
			if (buf[offset++] == '\n') {
				start = offset;
817
				if (!--i)
818 819 820 821 822 823 824 825 826
					break;
			}
		}
	}

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

827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865
	/*
	 * 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;
		return try;
	}

866 867 868 869 870 871
	/*
	 * We should start searching forward and backward.
	 */
	return -1;
}

872 873 874 875 876 877 878
struct buffer_desc {
	char *buffer;
	unsigned long size;
	unsigned long alloc;
};

static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
879
{
880
	char *buf = desc->buffer;
881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925
	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;
	}

926
	offset = find_offset(buf, desc->size, old, oldsize, frag->newpos);
927
	if (offset >= 0) {
928 929 930 931 932 933 934 935 936 937 938 939 940
		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);
941 942 943 944 945 946 947 948
		offset = 0;
	}

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

949
static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
950 951 952 953
{
	struct fragment *frag = patch->fragments;

	while (frag) {
954
		if (apply_one_fragment(desc, frag) < 0)
955 956 957
			return error("patch failed: %s:%d", patch->old_name, frag->oldpos);
		frag = frag->next;
	}
958
	return 0;
959 960 961 962
}

static int apply_data(struct patch *patch, struct stat *st)
{
963 964 965
	char *buf;
	unsigned long size, alloc;
	struct buffer_desc desc;
966

967 968 969 970 971 972 973 974 975 976
	size = 0;
	alloc = 0;
	buf = NULL;
	if (patch->old_name) {
		size = st->st_size;
		alloc = size + 8192;
		buf = xmalloc(alloc);
		if (read_old_data(st, patch->old_name, buf, alloc) != size)
			return error("read of %s failed", patch->old_name);
	}
977 978 979 980 981

	desc.size = size;
	desc.alloc = alloc;
	desc.buffer = buf;
	if (apply_fragments(&desc, patch) < 0)
982
		return -1;
983 984
	patch->result = desc.buffer;
	patch->resultsize = desc.size;
985 986 987 988

	if (patch->is_delete && patch->resultsize)
		return error("removal patch leaves file contents");

989 990 991
	return 0;
}

992
static int check_patch(struct patch *patch)
993
{
994
	struct stat st;
995 996 997 998
	const char *old_name = patch->old_name;
	const char *new_name = patch->new_name;

	if (old_name) {
999 1000 1001
		int changed;

		if (lstat(old_name, &st) < 0)
1002
			return error("%s: %s", old_name, strerror(errno));
1003 1004 1005 1006 1007 1008 1009 1010 1011 1012
		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;
1013
		st.st_mode = ntohl(create_ce_mode(st.st_mode));
1014 1015
		if (!patch->old_mode)
			patch->old_mode = st.st_mode;
1016 1017 1018 1019 1020
		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);
1021
	}
1022

1023
	if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
1024
		if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0)
1025 1026 1027 1028 1029
			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));
1030 1031
		if (!patch->new_mode)
			patch->new_mode = S_IFREG | 0644;
1032
	}
1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045

	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);
1046
	return 0;
1047 1048
}

1049
static int check_patch_list(struct patch *patch)
1050
{
1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061
	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);
}
1062

1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081
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;
1082
		}
1083 1084 1085
		printf("M %o %s\n", patch->old_mode, patch->old_name);
	}
}
1086

1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098
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);
1099 1100
}

1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178
static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
{
	if (mode)
		printf(" %s mode %06o %s\n", newdelete, mode, name);
	else
		printf(" %s %s\n", newdelete, name);
}

static void show_mode_change(struct patch *p, int show_name)
{
	if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
		if (show_name)
			printf(" mode change %06o => %06o %s\n",
			       p->old_mode, p->new_mode, p->new_name);
		else
			printf(" mode change %06o => %06o\n",
			       p->old_mode, p->new_mode);
	}
}

static void show_rename_copy(struct patch *p)
{
	const char *renamecopy = p->is_rename ? "rename" : "copy";
	const char *old, *new;

	/* Find common prefix */
	old = p->old_name;
	new = p->new_name;
	while (1) {
		const char *slash_old, *slash_new;
		slash_old = strchr(old, '/');
		slash_new = strchr(new, '/');
		if (!slash_old ||
		    !slash_new ||
		    slash_old - old != slash_new - new ||
		    memcmp(old, new, slash_new - new))
			break;
		old = slash_old + 1;
		new = slash_new + 1;
	}
	/* p->old_name thru old is the common prefix, and old and new
	 * through the end of names are renames
	 */
	if (old != p->old_name)
		printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
		       old - p->old_name, p->old_name,
		       old, new, p->score);
	else
		printf(" %s %s => %s (%d%%)\n", renamecopy,
		       p->old_name, p->new_name, p->score);
	show_mode_change(p, 0);
}

static void summary_patch_list(struct patch *patch)
{
	struct patch *p;

	for (p = patch; p; p = p->next) {
		if (p->is_new)
			show_file_mode_name("create", p->new_mode, p->new_name);
		else if (p->is_delete)
			show_file_mode_name("delete", p->old_mode, p->old_name);
		else {
			if (p->is_rename || p->is_copy)
				show_rename_copy(p);
			else {
				if (p->score) {
					printf(" rewrite %s (%d%%)\n",
					       p->new_name, p->score);
					show_mode_change(p, 0);
				}
				else
					show_mode_change(p, 1);
			}
		}
	}
}

1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194
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;
	}
1195 1196
}

1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229
static void remove_file(struct patch *patch)
{
	if (write_index) {
		if (remove_file_from_cache(patch->old_name) < 0)
			die("unable to remove %s from index", patch->old_name);
	}
	unlink(patch->old_name);
}

static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
{
	struct stat st;
	struct cache_entry *ce;
	int namelen = strlen(path);
	unsigned ce_size = cache_entry_size(namelen);

	if (!write_index)
		return;

	ce = xmalloc(ce_size);
	memset(ce, 0, ce_size);
	memcpy(ce->name, path, namelen);
	ce->ce_mode = create_ce_mode(mode);
	ce->ce_flags = htons(namelen);
	if (lstat(path, &st) < 0)
		die("unable to stat newly created file %s", path);
	fill_stat_cache_info(ce, &st);
	if (write_sha1_file(buf, size, "blob", ce->sha1) < 0)
		die("unable to create backing store for newly created file %s", path);
	if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
		die("unable to add cache entry for %s", path);
}

1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274
static void create_subdirectories(const char *path)
{
	int len = strlen(path);
	char *buf = xmalloc(len + 1);
	const char *slash = path;

	while ((slash = strchr(slash+1, '/')) != NULL) {
		len = slash - path;
		memcpy(buf, path, len);
		buf[len] = 0;
		if (mkdir(buf, 0755) < 0) {
			if (errno != EEXIST)
				break;
		}
	}
	free(buf);
}

/*
 * We optimistically assume that the directories exist,
 * which is true 99% of the time anyway. If they don't,
 * we create them and try again.
 */
static int create_regular_file(const char *path, unsigned int mode)
{
	int ret = open(path, O_WRONLY | O_CREAT | O_TRUNC, mode);

	if (ret < 0 && errno == ENOENT) {
		create_subdirectories(path);
		ret = open(path, O_WRONLY | O_CREAT | O_TRUNC, mode);
	}
	return ret;
}

static int create_symlink(const char *buf, const char *path)
{
	int ret = symlink(buf, path);

	if (ret < 0 && errno == ENOENT) {
		create_subdirectories(path);
		ret = symlink(buf, path);
	}
	return ret;
}

1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286
static void create_file(struct patch *patch)
{
	const char *path = patch->new_name;
	unsigned mode = patch->new_mode;
	unsigned long size = patch->resultsize;
	char *buf = patch->result;

	if (!mode)
		mode = S_IFREG | 0644;
	if (S_ISREG(mode)) {
		int fd;
		mode = (mode & 0100) ? 0777 : 0666;
1287
		fd = create_regular_file(path, mode);
1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299
		if (fd < 0)
			die("unable to create file %s (%s)", path, strerror(errno));
		if (write(fd, buf, size) != size)
			die("unable to write file %s", path);
		close(fd);
		add_index_file(path, mode, buf, size);
		return;
	}
	if (S_ISLNK(mode)) {
		if (size && buf[size-1] == '\n')
			size--;
		buf[size] = 0;
1300
		if (create_symlink(buf, path) < 0)
1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327
			die("unable to write symlink %s", path);
		add_index_file(path, mode, buf, size);
		return;
	}
	die("unable to write file mode %o", mode);
}

static void write_out_one_result(struct patch *patch)
{
	if (patch->is_delete > 0) {
		remove_file(patch);
		return;
	}
	if (patch->is_new > 0 || patch->is_copy) {
		create_file(patch);
		return;
	}
	/*
	 * Rename or modification boils down to the same
	 * thing: remove the old, write the new
	 */
	remove_file(patch);
	create_file(patch);
}

static void write_out_results(struct patch *list)
{
1328 1329 1330
	if (!list)
		die("No changes");

1331 1332 1333 1334 1335 1336 1337 1338
	while (list) {
		write_out_one_result(list);
		list = list->next;
	}
}

static struct cache_file cache_file;

L
Linus Torvalds 已提交
1339 1340
static int apply_patch(int fd)
{
1341
	int newfd;
L
Linus Torvalds 已提交
1342 1343
	unsigned long offset, size;
	char *buffer = read_patch_file(fd, &size);
1344
	struct patch *list = NULL, **listp = &list;
L
Linus Torvalds 已提交
1345 1346 1347 1348 1349

	if (!buffer)
		return -1;
	offset = 0;
	while (size > 0) {
1350 1351 1352 1353 1354 1355
		struct patch *patch;
		int nr;

		patch = xmalloc(sizeof(*patch));
		memset(patch, 0, sizeof(*patch));
		nr = parse_chunk(buffer + offset, size, patch);
L
Linus Torvalds 已提交
1356 1357
		if (nr < 0)
			break;
1358
		patch_stats(patch);
1359 1360
		*listp = patch;
		listp = &patch->next;
L
Linus Torvalds 已提交
1361 1362 1363
		offset += nr;
		size -= nr;
	}
1364

1365 1366 1367 1368 1369 1370 1371 1372 1373
	newfd = -1;
	write_index = check_index && apply;
	if (write_index)
		newfd = hold_index_file_for_update(&cache_file, get_index_file());
	if (check_index) {
		if (read_cache() < 0)
			die("unable to read index file");
	}

1374 1375 1376
	if ((check || apply) && check_patch_list(list) < 0)
		exit(1);

1377 1378 1379 1380 1381 1382 1383 1384 1385
	if (apply)
		write_out_results(list);

	if (write_index) {
		if (write_cache(newfd, active_cache, active_nr) ||
		    commit_index_file(&cache_file))
			die("Unable to write new cachefile");
	}

1386 1387 1388 1389 1390
	if (show_files)
		show_file_list(list);

	if (diffstat)
		stat_patch_list(list);
1391

1392 1393 1394
	if (summary)
		summary_patch_list(list);

L
Linus Torvalds 已提交
1395 1396 1397 1398 1399 1400 1401
	free(buffer);
	return 0;
}

int main(int argc, char **argv)
{
	int i;
1402
	int read_stdin = 1;
L
Linus Torvalds 已提交
1403 1404 1405 1406 1407 1408 1409

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

		if (!strcmp(arg, "-")) {
			apply_patch(0);
1410
			read_stdin = 0;
L
Linus Torvalds 已提交
1411 1412 1413 1414 1415 1416
			continue;
		}
		if (!strcmp(arg, "--no-merge")) {
			merge_patch = 0;
			continue;
		}
1417
		if (!strcmp(arg, "--stat")) {
1418
			apply = 0;
1419 1420 1421
			diffstat = 1;
			continue;
		}
1422 1423 1424 1425 1426
		if (!strcmp(arg, "--summary")) {
			apply = 0;
			summary = 1;
			continue;
		}
1427 1428 1429 1430 1431
		if (!strcmp(arg, "--check")) {
			apply = 0;
			check = 1;
			continue;
		}
1432 1433 1434 1435
		if (!strcmp(arg, "--index")) {
			check_index = 1;
			continue;
		}
1436 1437 1438 1439
		if (!strcmp(arg, "--apply")) {
			apply = 1;
			continue;
		}
1440 1441 1442 1443
		if (!strcmp(arg, "--show-files")) {
			show_files = 1;
			continue;
		}
L
Linus Torvalds 已提交
1444 1445 1446
		fd = open(arg, O_RDONLY);
		if (fd < 0)
			usage(apply_usage);
1447
		read_stdin = 0;
L
Linus Torvalds 已提交
1448 1449 1450
		apply_patch(fd);
		close(fd);
	}
1451 1452
	if (read_stdin)
		apply_patch(0);
L
Linus Torvalds 已提交
1453 1454
	return 0;
}