1/* 2 * apply.c 3 * 4 * Copyright (C) Linus Torvalds, 2005 5 * 6 * This applies patches on top of some (arbitrary) version of the SCM. 7 * 8 */ 9#include "cache.h" 10#include "cache-tree.h" 11#include "quote.h" 12#include "blob.h" 13#include "delta.h" 14#include "builtin.h" 15#include "string-list.h" 16#include "dir.h" 17#include "parse-options.h" 18 19/* 20 * --check turns on checking that the working tree matches the 21 * files that are being modified, but doesn't apply the patch 22 * --stat does just a diffstat, and doesn't actually apply 23 * --numstat does numeric diffstat, and doesn't actually apply 24 * --index-info shows the old and new index info for paths if available. 25 * --index updates the cache as well. 26 * --cached updates only the cache without ever touching the working tree. 27 */ 28static const char *prefix; 29static int prefix_length = -1; 30static int newfd = -1; 31 32static int unidiff_zero; 33static int p_value = 1; 34static int p_value_known; 35static int check_index; 36static int update_index; 37static int cached; 38static int diffstat; 39static int numstat; 40static int summary; 41static int check; 42static int apply = 1; 43static int apply_in_reverse; 44static int apply_with_reject; 45static int apply_verbosely; 46static int allow_overlap; 47static int no_add; 48static const char *fake_ancestor; 49static int line_termination = '\n'; 50static unsigned int p_context = UINT_MAX; 51static const char * const apply_usage[] = { 52 "git apply [options] [<patch>...]", 53 NULL 54}; 55 56static enum ws_error_action { 57 nowarn_ws_error, 58 warn_on_ws_error, 59 die_on_ws_error, 60 correct_ws_error 61} ws_error_action = warn_on_ws_error; 62static int whitespace_error; 63static int squelch_whitespace_errors = 5; 64static int applied_after_fixing_ws; 65 66static enum ws_ignore { 67 ignore_ws_none, 68 ignore_ws_change 69} ws_ignore_action = ignore_ws_none; 70 71 72static const char *patch_input_file; 73static const char *root; 74static int root_len; 75static int read_stdin = 1; 76static int options; 77 78static void parse_whitespace_option(const char *option) 79{ 80 if (!option) { 81 ws_error_action = warn_on_ws_error; 82 return; 83 } 84 if (!strcmp(option, "warn")) { 85 ws_error_action = warn_on_ws_error; 86 return; 87 } 88 if (!strcmp(option, "nowarn")) { 89 ws_error_action = nowarn_ws_error; 90 return; 91 } 92 if (!strcmp(option, "error")) { 93 ws_error_action = die_on_ws_error; 94 return; 95 } 96 if (!strcmp(option, "error-all")) { 97 ws_error_action = die_on_ws_error; 98 squelch_whitespace_errors = 0; 99 return; 100 } 101 if (!strcmp(option, "strip") || !strcmp(option, "fix")) { 102 ws_error_action = correct_ws_error; 103 return; 104 } 105 die("unrecognized whitespace option '%s'", option); 106} 107 108static void parse_ignorewhitespace_option(const char *option) 109{ 110 if (!option || !strcmp(option, "no") || 111 !strcmp(option, "false") || !strcmp(option, "never") || 112 !strcmp(option, "none")) { 113 ws_ignore_action = ignore_ws_none; 114 return; 115 } 116 if (!strcmp(option, "change")) { 117 ws_ignore_action = ignore_ws_change; 118 return; 119 } 120 die("unrecognized whitespace ignore option '%s'", option); 121} 122 123static void set_default_whitespace_mode(const char *whitespace_option) 124{ 125 if (!whitespace_option && !apply_default_whitespace) 126 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); 127} 128 129/* 130 * For "diff-stat" like behaviour, we keep track of the biggest change 131 * we've seen, and the longest filename. That allows us to do simple 132 * scaling. 133 */ 134static int max_change, max_len; 135 136/* 137 * Various "current state", notably line numbers and what 138 * file (and how) we're patching right now.. The "is_xxxx" 139 * things are flags, where -1 means "don't know yet". 140 */ 141static int linenr = 1; 142 143/* 144 * This represents one "hunk" from a patch, starting with 145 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 146 * patch text is pointed at by patch, and its byte length 147 * is stored in size. leading and trailing are the number 148 * of context lines. 149 */ 150struct fragment { 151 unsigned long leading, trailing; 152 unsigned long oldpos, oldlines; 153 unsigned long newpos, newlines; 154 const char *patch; 155 int size; 156 int rejected; 157 int linenr; 158 struct fragment *next; 159}; 160 161/* 162 * When dealing with a binary patch, we reuse "leading" field 163 * to store the type of the binary hunk, either deflated "delta" 164 * or deflated "literal". 165 */ 166#define binary_patch_method leading 167#define BINARY_DELTA_DEFLATED 1 168#define BINARY_LITERAL_DEFLATED 2 169 170/* 171 * This represents a "patch" to a file, both metainfo changes 172 * such as creation/deletion, filemode and content changes represented 173 * as a series of fragments. 174 */ 175struct patch { 176 char *new_name, *old_name, *def_name; 177 unsigned int old_mode, new_mode; 178 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */ 179 int rejected; 180 unsigned ws_rule; 181 unsigned long deflate_origlen; 182 int lines_added, lines_deleted; 183 int score; 184 unsigned int is_toplevel_relative:1; 185 unsigned int inaccurate_eof:1; 186 unsigned int is_binary:1; 187 unsigned int is_copy:1; 188 unsigned int is_rename:1; 189 unsigned int recount:1; 190 struct fragment *fragments; 191 char *result; 192 size_t resultsize; 193 char old_sha1_prefix[41]; 194 char new_sha1_prefix[41]; 195 struct patch *next; 196}; 197 198/* 199 * A line in a file, len-bytes long (includes the terminating LF, 200 * except for an incomplete line at the end if the file ends with 201 * one), and its contents hashes to 'hash'. 202 */ 203struct line { 204 size_t len; 205 unsigned hash : 24; 206 unsigned flag : 8; 207#define LINE_COMMON 1 208#define LINE_PATCHED 2 209}; 210 211/* 212 * This represents a "file", which is an array of "lines". 213 */ 214struct image { 215 char *buf; 216 size_t len; 217 size_t nr; 218 size_t alloc; 219 struct line *line_allocated; 220 struct line *line; 221}; 222 223/* 224 * Records filenames that have been touched, in order to handle 225 * the case where more than one patches touch the same file. 226 */ 227 228static struct string_list fn_table; 229 230static uint32_t hash_line(const char *cp, size_t len) 231{ 232 size_t i; 233 uint32_t h; 234 for (i = 0, h = 0; i < len; i++) { 235 if (!isspace(cp[i])) { 236 h = h * 3 + (cp[i] & 0xff); 237 } 238 } 239 return h; 240} 241 242/* 243 * Compare lines s1 of length n1 and s2 of length n2, ignoring 244 * whitespace difference. Returns 1 if they match, 0 otherwise 245 */ 246static int fuzzy_matchlines(const char *s1, size_t n1, 247 const char *s2, size_t n2) 248{ 249 const char *last1 = s1 + n1 - 1; 250 const char *last2 = s2 + n2 - 1; 251 int result = 0; 252 253 /* ignore line endings */ 254 while ((*last1 == '\r') || (*last1 == '\n')) 255 last1--; 256 while ((*last2 == '\r') || (*last2 == '\n')) 257 last2--; 258 259 /* skip leading whitespace */ 260 while (isspace(*s1) && (s1 <= last1)) 261 s1++; 262 while (isspace(*s2) && (s2 <= last2)) 263 s2++; 264 /* early return if both lines are empty */ 265 if ((s1 > last1) && (s2 > last2)) 266 return 1; 267 while (!result) { 268 result = *s1++ - *s2++; 269 /* 270 * Skip whitespace inside. We check for whitespace on 271 * both buffers because we don't want "a b" to match 272 * "ab" 273 */ 274 if (isspace(*s1) && isspace(*s2)) { 275 while (isspace(*s1) && s1 <= last1) 276 s1++; 277 while (isspace(*s2) && s2 <= last2) 278 s2++; 279 } 280 /* 281 * If we reached the end on one side only, 282 * lines don't match 283 */ 284 if ( 285 ((s2 > last2) && (s1 <= last1)) || 286 ((s1 > last1) && (s2 <= last2))) 287 return 0; 288 if ((s1 > last1) && (s2 > last2)) 289 break; 290 } 291 292 return !result; 293} 294 295static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag) 296{ 297 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc); 298 img->line_allocated[img->nr].len = len; 299 img->line_allocated[img->nr].hash = hash_line(bol, len); 300 img->line_allocated[img->nr].flag = flag; 301 img->nr++; 302} 303 304static void prepare_image(struct image *image, char *buf, size_t len, 305 int prepare_linetable) 306{ 307 const char *cp, *ep; 308 309 memset(image, 0, sizeof(*image)); 310 image->buf = buf; 311 image->len = len; 312 313 if (!prepare_linetable) 314 return; 315 316 ep = image->buf + image->len; 317 cp = image->buf; 318 while (cp < ep) { 319 const char *next; 320 for (next = cp; next < ep && *next != '\n'; next++) 321 ; 322 if (next < ep) 323 next++; 324 add_line_info(image, cp, next - cp, 0); 325 cp = next; 326 } 327 image->line = image->line_allocated; 328} 329 330static void clear_image(struct image *image) 331{ 332 free(image->buf); 333 image->buf = NULL; 334 image->len = 0; 335} 336 337static void say_patch_name(FILE *output, const char *pre, 338 struct patch *patch, const char *post) 339{ 340 fputs(pre, output); 341 if (patch->old_name && patch->new_name && 342 strcmp(patch->old_name, patch->new_name)) { 343 quote_c_style(patch->old_name, NULL, output, 0); 344 fputs(" => ", output); 345 quote_c_style(patch->new_name, NULL, output, 0); 346 } else { 347 const char *n = patch->new_name; 348 if (!n) 349 n = patch->old_name; 350 quote_c_style(n, NULL, output, 0); 351 } 352 fputs(post, output); 353} 354 355#define CHUNKSIZE (8192) 356#define SLOP (16) 357 358static void read_patch_file(struct strbuf *sb, int fd) 359{ 360 if (strbuf_read(sb, fd, 0) < 0) 361 die_errno("git apply: failed to read"); 362 363 /* 364 * Make sure that we have some slop in the buffer 365 * so that we can do speculative "memcmp" etc, and 366 * see to it that it is NUL-filled. 367 */ 368 strbuf_grow(sb, SLOP); 369 memset(sb->buf + sb->len, 0, SLOP); 370} 371 372static unsigned long linelen(const char *buffer, unsigned long size) 373{ 374 unsigned long len = 0; 375 while (size--) { 376 len++; 377 if (*buffer++ == '\n') 378 break; 379 } 380 return len; 381} 382 383static int is_dev_null(const char *str) 384{ 385 return !memcmp("/dev/null", str, 9) && isspace(str[9]); 386} 387 388#define TERM_SPACE 1 389#define TERM_TAB 2 390 391static int name_terminate(const char *name, int namelen, int c, int terminate) 392{ 393 if (c == ' ' && !(terminate & TERM_SPACE)) 394 return 0; 395 if (c == '\t' && !(terminate & TERM_TAB)) 396 return 0; 397 398 return 1; 399} 400 401/* remove double slashes to make --index work with such filenames */ 402static char *squash_slash(char *name) 403{ 404 int i = 0, j = 0; 405 406 if (!name) 407 return NULL; 408 409 while (name[i]) { 410 if ((name[j++] = name[i++]) == '/') 411 while (name[i] == '/') 412 i++; 413 } 414 name[j] = '\0'; 415 return name; 416} 417 418static char *find_name_gnu(const char *line, char *def, int p_value) 419{ 420 struct strbuf name = STRBUF_INIT; 421 char *cp; 422 423 /* 424 * Proposed "new-style" GNU patch/diff format; see 425 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 426 */ 427 if (unquote_c_style(&name, line, NULL)) { 428 strbuf_release(&name); 429 return NULL; 430 } 431 432 for (cp = name.buf; p_value; p_value--) { 433 cp = strchr(cp, '/'); 434 if (!cp) { 435 strbuf_release(&name); 436 return NULL; 437 } 438 cp++; 439 } 440 441 /* name can later be freed, so we need 442 * to memmove, not just return cp 443 */ 444 strbuf_remove(&name, 0, cp - name.buf); 445 free(def); 446 if (root) 447 strbuf_insert(&name, 0, root, root_len); 448 return squash_slash(strbuf_detach(&name, NULL)); 449} 450 451static size_t sane_tz_len(const char *line, size_t len) 452{ 453 const char *tz, *p; 454 455 if (len < strlen(" +0500") || line[len-strlen(" +0500")] != ' ') 456 return 0; 457 tz = line + len - strlen(" +0500"); 458 459 if (tz[1] != '+' && tz[1] != '-') 460 return 0; 461 462 for (p = tz + 2; p != line + len; p++) 463 if (!isdigit(*p)) 464 return 0; 465 466 return line + len - tz; 467} 468 469static size_t tz_with_colon_len(const char *line, size_t len) 470{ 471 const char *tz, *p; 472 473 if (len < strlen(" +08:00") || line[len - strlen(":00")] != ':') 474 return 0; 475 tz = line + len - strlen(" +08:00"); 476 477 if (tz[0] != ' ' || (tz[1] != '+' && tz[1] != '-')) 478 return 0; 479 p = tz + 2; 480 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 481 !isdigit(*p++) || !isdigit(*p++)) 482 return 0; 483 484 return line + len - tz; 485} 486 487static size_t date_len(const char *line, size_t len) 488{ 489 const char *date, *p; 490 491 if (len < strlen("72-02-05") || line[len-strlen("-05")] != '-') 492 return 0; 493 p = date = line + len - strlen("72-02-05"); 494 495 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || 496 !isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || 497 !isdigit(*p++) || !isdigit(*p++)) /* Not a date. */ 498 return 0; 499 500 if (date - line >= strlen("19") && 501 isdigit(date[-1]) && isdigit(date[-2])) /* 4-digit year */ 502 date -= strlen("19"); 503 504 return line + len - date; 505} 506 507static size_t short_time_len(const char *line, size_t len) 508{ 509 const char *time, *p; 510 511 if (len < strlen(" 07:01:32") || line[len-strlen(":32")] != ':') 512 return 0; 513 p = time = line + len - strlen(" 07:01:32"); 514 515 /* Permit 1-digit hours? */ 516 if (*p++ != ' ' || 517 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 518 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 519 !isdigit(*p++) || !isdigit(*p++)) /* Not a time. */ 520 return 0; 521 522 return line + len - time; 523} 524 525static size_t fractional_time_len(const char *line, size_t len) 526{ 527 const char *p; 528 size_t n; 529 530 /* Expected format: 19:41:17.620000023 */ 531 if (!len || !isdigit(line[len - 1])) 532 return 0; 533 p = line + len - 1; 534 535 /* Fractional seconds. */ 536 while (p > line && isdigit(*p)) 537 p--; 538 if (*p != '.') 539 return 0; 540 541 /* Hours, minutes, and whole seconds. */ 542 n = short_time_len(line, p - line); 543 if (!n) 544 return 0; 545 546 return line + len - p + n; 547} 548 549static size_t trailing_spaces_len(const char *line, size_t len) 550{ 551 const char *p; 552 553 /* Expected format: ' ' x (1 or more) */ 554 if (!len || line[len - 1] != ' ') 555 return 0; 556 557 p = line + len; 558 while (p != line) { 559 p--; 560 if (*p != ' ') 561 return line + len - (p + 1); 562 } 563 564 /* All spaces! */ 565 return len; 566} 567 568static size_t diff_timestamp_len(const char *line, size_t len) 569{ 570 const char *end = line + len; 571 size_t n; 572 573 /* 574 * Posix: 2010-07-05 19:41:17 575 * GNU: 2010-07-05 19:41:17.620000023 -0500 576 */ 577 578 if (!isdigit(end[-1])) 579 return 0; 580 581 n = sane_tz_len(line, end - line); 582 if (!n) 583 n = tz_with_colon_len(line, end - line); 584 end -= n; 585 586 n = short_time_len(line, end - line); 587 if (!n) 588 n = fractional_time_len(line, end - line); 589 end -= n; 590 591 n = date_len(line, end - line); 592 if (!n) /* No date. Too bad. */ 593 return 0; 594 end -= n; 595 596 if (end == line) /* No space before date. */ 597 return 0; 598 if (end[-1] == '\t') { /* Success! */ 599 end--; 600 return line + len - end; 601 } 602 if (end[-1] != ' ') /* No space before date. */ 603 return 0; 604 605 /* Whitespace damage. */ 606 end -= trailing_spaces_len(line, end - line); 607 return line + len - end; 608} 609 610static char *find_name_common(const char *line, char *def, int p_value, 611 const char *end, int terminate) 612{ 613 int len; 614 const char *start = NULL; 615 616 if (p_value == 0) 617 start = line; 618 while (line != end) { 619 char c = *line; 620 621 if (!end && isspace(c)) { 622 if (c == '\n') 623 break; 624 if (name_terminate(start, line-start, c, terminate)) 625 break; 626 } 627 line++; 628 if (c == '/' && !--p_value) 629 start = line; 630 } 631 if (!start) 632 return squash_slash(def); 633 len = line - start; 634 if (!len) 635 return squash_slash(def); 636 637 /* 638 * Generally we prefer the shorter name, especially 639 * if the other one is just a variation of that with 640 * something else tacked on to the end (ie "file.orig" 641 * or "file~"). 642 */ 643 if (def) { 644 int deflen = strlen(def); 645 if (deflen < len && !strncmp(start, def, deflen)) 646 return squash_slash(def); 647 free(def); 648 } 649 650 if (root) { 651 char *ret = xmalloc(root_len + len + 1); 652 strcpy(ret, root); 653 memcpy(ret + root_len, start, len); 654 ret[root_len + len] = '\0'; 655 return squash_slash(ret); 656 } 657 658 return squash_slash(xmemdupz(start, len)); 659} 660 661static char *find_name(const char *line, char *def, int p_value, int terminate) 662{ 663 if (*line == '"') { 664 char *name = find_name_gnu(line, def, p_value); 665 if (name) 666 return name; 667 } 668 669 return find_name_common(line, def, p_value, NULL, terminate); 670} 671 672static char *find_name_traditional(const char *line, char *def, int p_value) 673{ 674 size_t len = strlen(line); 675 size_t date_len; 676 677 if (*line == '"') { 678 char *name = find_name_gnu(line, def, p_value); 679 if (name) 680 return name; 681 } 682 683 len = strchrnul(line, '\n') - line; 684 date_len = diff_timestamp_len(line, len); 685 if (!date_len) 686 return find_name_common(line, def, p_value, NULL, TERM_TAB); 687 len -= date_len; 688 689 return find_name_common(line, def, p_value, line + len, 0); 690} 691 692static int count_slashes(const char *cp) 693{ 694 int cnt = 0; 695 char ch; 696 697 while ((ch = *cp++)) 698 if (ch == '/') 699 cnt++; 700 return cnt; 701} 702 703/* 704 * Given the string after "--- " or "+++ ", guess the appropriate 705 * p_value for the given patch. 706 */ 707static int guess_p_value(const char *nameline) 708{ 709 char *name, *cp; 710 int val = -1; 711 712 if (is_dev_null(nameline)) 713 return -1; 714 name = find_name_traditional(nameline, NULL, 0); 715 if (!name) 716 return -1; 717 cp = strchr(name, '/'); 718 if (!cp) 719 val = 0; 720 else if (prefix) { 721 /* 722 * Does it begin with "a/$our-prefix" and such? Then this is 723 * very likely to apply to our directory. 724 */ 725 if (!strncmp(name, prefix, prefix_length)) 726 val = count_slashes(prefix); 727 else { 728 cp++; 729 if (!strncmp(cp, prefix, prefix_length)) 730 val = count_slashes(prefix) + 1; 731 } 732 } 733 free(name); 734 return val; 735} 736 737/* 738 * Does the ---/+++ line has the POSIX timestamp after the last HT? 739 * GNU diff puts epoch there to signal a creation/deletion event. Is 740 * this such a timestamp? 741 */ 742static int has_epoch_timestamp(const char *nameline) 743{ 744 /* 745 * We are only interested in epoch timestamp; any non-zero 746 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 747 * For the same reason, the date must be either 1969-12-31 or 748 * 1970-01-01, and the seconds part must be "00". 749 */ 750 const char stamp_regexp[] = 751 "^(1969-12-31|1970-01-01)" 752 " " 753 "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?" 754 " " 755 "([-+][0-2][0-9]:?[0-5][0-9])\n"; 756 const char *timestamp = NULL, *cp, *colon; 757 static regex_t *stamp; 758 regmatch_t m[10]; 759 int zoneoffset; 760 int hourminute; 761 int status; 762 763 for (cp = nameline; *cp != '\n'; cp++) { 764 if (*cp == '\t') 765 timestamp = cp + 1; 766 } 767 if (!timestamp) 768 return 0; 769 if (!stamp) { 770 stamp = xmalloc(sizeof(*stamp)); 771 if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 772 warning("Cannot prepare timestamp regexp %s", 773 stamp_regexp); 774 return 0; 775 } 776 } 777 778 status = regexec(stamp, timestamp, ARRAY_SIZE(m), m, 0); 779 if (status) { 780 if (status != REG_NOMATCH) 781 warning("regexec returned %d for input: %s", 782 status, timestamp); 783 return 0; 784 } 785 786 zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10); 787 if (*colon == ':') 788 zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10); 789 else 790 zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100); 791 if (timestamp[m[3].rm_so] == '-') 792 zoneoffset = -zoneoffset; 793 794 /* 795 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 796 * (west of GMT) or 1970-01-01 (east of GMT) 797 */ 798 if ((zoneoffset < 0 && memcmp(timestamp, "1969-12-31", 10)) || 799 (0 <= zoneoffset && memcmp(timestamp, "1970-01-01", 10))) 800 return 0; 801 802 hourminute = (strtol(timestamp + 11, NULL, 10) * 60 + 803 strtol(timestamp + 14, NULL, 10) - 804 zoneoffset); 805 806 return ((zoneoffset < 0 && hourminute == 1440) || 807 (0 <= zoneoffset && !hourminute)); 808} 809 810/* 811 * Get the name etc info from the ---/+++ lines of a traditional patch header 812 * 813 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 814 * files, we can happily check the index for a match, but for creating a 815 * new file we should try to match whatever "patch" does. I have no idea. 816 */ 817static void parse_traditional_patch(const char *first, const char *second, struct patch *patch) 818{ 819 char *name; 820 821 first += 4; /* skip "--- " */ 822 second += 4; /* skip "+++ " */ 823 if (!p_value_known) { 824 int p, q; 825 p = guess_p_value(first); 826 q = guess_p_value(second); 827 if (p < 0) p = q; 828 if (0 <= p && p == q) { 829 p_value = p; 830 p_value_known = 1; 831 } 832 } 833 if (is_dev_null(first)) { 834 patch->is_new = 1; 835 patch->is_delete = 0; 836 name = find_name_traditional(second, NULL, p_value); 837 patch->new_name = name; 838 } else if (is_dev_null(second)) { 839 patch->is_new = 0; 840 patch->is_delete = 1; 841 name = find_name_traditional(first, NULL, p_value); 842 patch->old_name = name; 843 } else { 844 name = find_name_traditional(first, NULL, p_value); 845 name = find_name_traditional(second, name, p_value); 846 if (has_epoch_timestamp(first)) { 847 patch->is_new = 1; 848 patch->is_delete = 0; 849 patch->new_name = name; 850 } else if (has_epoch_timestamp(second)) { 851 patch->is_new = 0; 852 patch->is_delete = 1; 853 patch->old_name = name; 854 } else { 855 patch->old_name = patch->new_name = name; 856 } 857 } 858 if (!name) 859 die("unable to find filename in patch at line %d", linenr); 860} 861 862static int gitdiff_hdrend(const char *line, struct patch *patch) 863{ 864 return -1; 865} 866 867/* 868 * We're anal about diff header consistency, to make 869 * sure that we don't end up having strange ambiguous 870 * patches floating around. 871 * 872 * As a result, gitdiff_{old|new}name() will check 873 * their names against any previous information, just 874 * to make sure.. 875 */ 876static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew) 877{ 878 if (!orig_name && !isnull) 879 return find_name(line, NULL, p_value, TERM_TAB); 880 881 if (orig_name) { 882 int len; 883 const char *name; 884 char *another; 885 name = orig_name; 886 len = strlen(name); 887 if (isnull) 888 die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr); 889 another = find_name(line, NULL, p_value, TERM_TAB); 890 if (!another || memcmp(another, name, len + 1)) 891 die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr); 892 free(another); 893 return orig_name; 894 } 895 else { 896 /* expect "/dev/null" */ 897 if (memcmp("/dev/null", line, 9) || line[9] != '\n') 898 die("git apply: bad git-diff - expected /dev/null on line %d", linenr); 899 return NULL; 900 } 901} 902 903static int gitdiff_oldname(const char *line, struct patch *patch) 904{ 905 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old"); 906 return 0; 907} 908 909static int gitdiff_newname(const char *line, struct patch *patch) 910{ 911 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new"); 912 return 0; 913} 914 915static int gitdiff_oldmode(const char *line, struct patch *patch) 916{ 917 patch->old_mode = strtoul(line, NULL, 8); 918 return 0; 919} 920 921static int gitdiff_newmode(const char *line, struct patch *patch) 922{ 923 patch->new_mode = strtoul(line, NULL, 8); 924 return 0; 925} 926 927static int gitdiff_delete(const char *line, struct patch *patch) 928{ 929 patch->is_delete = 1; 930 patch->old_name = patch->def_name; 931 return gitdiff_oldmode(line, patch); 932} 933 934static int gitdiff_newfile(const char *line, struct patch *patch) 935{ 936 patch->is_new = 1; 937 patch->new_name = patch->def_name; 938 return gitdiff_newmode(line, patch); 939} 940 941static int gitdiff_copysrc(const char *line, struct patch *patch) 942{ 943 patch->is_copy = 1; 944 patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0); 945 return 0; 946} 947 948static int gitdiff_copydst(const char *line, struct patch *patch) 949{ 950 patch->is_copy = 1; 951 patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0); 952 return 0; 953} 954 955static int gitdiff_renamesrc(const char *line, struct patch *patch) 956{ 957 patch->is_rename = 1; 958 patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0); 959 return 0; 960} 961 962static int gitdiff_renamedst(const char *line, struct patch *patch) 963{ 964 patch->is_rename = 1; 965 patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0); 966 return 0; 967} 968 969static int gitdiff_similarity(const char *line, struct patch *patch) 970{ 971 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX) 972 patch->score = 0; 973 return 0; 974} 975 976static int gitdiff_dissimilarity(const char *line, struct patch *patch) 977{ 978 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX) 979 patch->score = 0; 980 return 0; 981} 982 983static int gitdiff_index(const char *line, struct patch *patch) 984{ 985 /* 986 * index line is N hexadecimal, "..", N hexadecimal, 987 * and optional space with octal mode. 988 */ 989 const char *ptr, *eol; 990 int len; 991 992 ptr = strchr(line, '.'); 993 if (!ptr || ptr[1] != '.' || 40 < ptr - line) 994 return 0; 995 len = ptr - line; 996 memcpy(patch->old_sha1_prefix, line, len); 997 patch->old_sha1_prefix[len] = 0; 998 999 line = ptr + 2;1000 ptr = strchr(line, ' ');1001 eol = strchr(line, '\n');10021003 if (!ptr || eol < ptr)1004 ptr = eol;1005 len = ptr - line;10061007 if (40 < len)1008 return 0;1009 memcpy(patch->new_sha1_prefix, line, len);1010 patch->new_sha1_prefix[len] = 0;1011 if (*ptr == ' ')1012 patch->old_mode = strtoul(ptr+1, NULL, 8);1013 return 0;1014}10151016/*1017 * This is normal for a diff that doesn't change anything: we'll fall through1018 * into the next diff. Tell the parser to break out.1019 */1020static int gitdiff_unrecognized(const char *line, struct patch *patch)1021{1022 return -1;1023}10241025static const char *stop_at_slash(const char *line, int llen)1026{1027 int nslash = p_value;1028 int i;10291030 for (i = 0; i < llen; i++) {1031 int ch = line[i];1032 if (ch == '/' && --nslash <= 0)1033 return &line[i];1034 }1035 return NULL;1036}10371038/*1039 * This is to extract the same name that appears on "diff --git"1040 * line. We do not find and return anything if it is a rename1041 * patch, and it is OK because we will find the name elsewhere.1042 * We need to reliably find name only when it is mode-change only,1043 * creation or deletion of an empty file. In any of these cases,1044 * both sides are the same name under a/ and b/ respectively.1045 */1046static char *git_header_name(char *line, int llen)1047{1048 const char *name;1049 const char *second = NULL;1050 size_t len, line_len;10511052 line += strlen("diff --git ");1053 llen -= strlen("diff --git ");10541055 if (*line == '"') {1056 const char *cp;1057 struct strbuf first = STRBUF_INIT;1058 struct strbuf sp = STRBUF_INIT;10591060 if (unquote_c_style(&first, line, &second))1061 goto free_and_fail1;10621063 /* advance to the first slash */1064 cp = stop_at_slash(first.buf, first.len);1065 /* we do not accept absolute paths */1066 if (!cp || cp == first.buf)1067 goto free_and_fail1;1068 strbuf_remove(&first, 0, cp + 1 - first.buf);10691070 /*1071 * second points at one past closing dq of name.1072 * find the second name.1073 */1074 while ((second < line + llen) && isspace(*second))1075 second++;10761077 if (line + llen <= second)1078 goto free_and_fail1;1079 if (*second == '"') {1080 if (unquote_c_style(&sp, second, NULL))1081 goto free_and_fail1;1082 cp = stop_at_slash(sp.buf, sp.len);1083 if (!cp || cp == sp.buf)1084 goto free_and_fail1;1085 /* They must match, otherwise ignore */1086 if (strcmp(cp + 1, first.buf))1087 goto free_and_fail1;1088 strbuf_release(&sp);1089 return strbuf_detach(&first, NULL);1090 }10911092 /* unquoted second */1093 cp = stop_at_slash(second, line + llen - second);1094 if (!cp || cp == second)1095 goto free_and_fail1;1096 cp++;1097 if (line + llen - cp != first.len + 1 ||1098 memcmp(first.buf, cp, first.len))1099 goto free_and_fail1;1100 return strbuf_detach(&first, NULL);11011102 free_and_fail1:1103 strbuf_release(&first);1104 strbuf_release(&sp);1105 return NULL;1106 }11071108 /* unquoted first name */1109 name = stop_at_slash(line, llen);1110 if (!name || name == line)1111 return NULL;1112 name++;11131114 /*1115 * since the first name is unquoted, a dq if exists must be1116 * the beginning of the second name.1117 */1118 for (second = name; second < line + llen; second++) {1119 if (*second == '"') {1120 struct strbuf sp = STRBUF_INIT;1121 const char *np;11221123 if (unquote_c_style(&sp, second, NULL))1124 goto free_and_fail2;11251126 np = stop_at_slash(sp.buf, sp.len);1127 if (!np || np == sp.buf)1128 goto free_and_fail2;1129 np++;11301131 len = sp.buf + sp.len - np;1132 if (len < second - name &&1133 !strncmp(np, name, len) &&1134 isspace(name[len])) {1135 /* Good */1136 strbuf_remove(&sp, 0, np - sp.buf);1137 return strbuf_detach(&sp, NULL);1138 }11391140 free_and_fail2:1141 strbuf_release(&sp);1142 return NULL;1143 }1144 }11451146 /*1147 * Accept a name only if it shows up twice, exactly the same1148 * form.1149 */1150 second = strchr(name, '\n');1151 if (!second)1152 return NULL;1153 line_len = second - name;1154 for (len = 0 ; ; len++) {1155 switch (name[len]) {1156 default:1157 continue;1158 case '\n':1159 return NULL;1160 case '\t': case ' ':1161 second = stop_at_slash(name + len, line_len - len);1162 if (!second)1163 return NULL;1164 second++;1165 if (second[len] == '\n' && !strncmp(name, second, len)) {1166 return xmemdupz(name, len);1167 }1168 }1169 }1170}11711172/* Verify that we recognize the lines following a git header */1173static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)1174{1175 unsigned long offset;11761177 /* A git diff has explicit new/delete information, so we don't guess */1178 patch->is_new = 0;1179 patch->is_delete = 0;11801181 /*1182 * Some things may not have the old name in the1183 * rest of the headers anywhere (pure mode changes,1184 * or removing or adding empty files), so we get1185 * the default name from the header.1186 */1187 patch->def_name = git_header_name(line, len);1188 if (patch->def_name && root) {1189 char *s = xmalloc(root_len + strlen(patch->def_name) + 1);1190 strcpy(s, root);1191 strcpy(s + root_len, patch->def_name);1192 free(patch->def_name);1193 patch->def_name = s;1194 }11951196 line += len;1197 size -= len;1198 linenr++;1199 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {1200 static const struct opentry {1201 const char *str;1202 int (*fn)(const char *, struct patch *);1203 } optable[] = {1204 { "@@ -", gitdiff_hdrend },1205 { "--- ", gitdiff_oldname },1206 { "+++ ", gitdiff_newname },1207 { "old mode ", gitdiff_oldmode },1208 { "new mode ", gitdiff_newmode },1209 { "deleted file mode ", gitdiff_delete },1210 { "new file mode ", gitdiff_newfile },1211 { "copy from ", gitdiff_copysrc },1212 { "copy to ", gitdiff_copydst },1213 { "rename old ", gitdiff_renamesrc },1214 { "rename new ", gitdiff_renamedst },1215 { "rename from ", gitdiff_renamesrc },1216 { "rename to ", gitdiff_renamedst },1217 { "similarity index ", gitdiff_similarity },1218 { "dissimilarity index ", gitdiff_dissimilarity },1219 { "index ", gitdiff_index },1220 { "", gitdiff_unrecognized },1221 };1222 int i;12231224 len = linelen(line, size);1225 if (!len || line[len-1] != '\n')1226 break;1227 for (i = 0; i < ARRAY_SIZE(optable); i++) {1228 const struct opentry *p = optable + i;1229 int oplen = strlen(p->str);1230 if (len < oplen || memcmp(p->str, line, oplen))1231 continue;1232 if (p->fn(line + oplen, patch) < 0)1233 return offset;1234 break;1235 }1236 }12371238 return offset;1239}12401241static int parse_num(const char *line, unsigned long *p)1242{1243 char *ptr;12441245 if (!isdigit(*line))1246 return 0;1247 *p = strtoul(line, &ptr, 10);1248 return ptr - line;1249}12501251static int parse_range(const char *line, int len, int offset, const char *expect,1252 unsigned long *p1, unsigned long *p2)1253{1254 int digits, ex;12551256 if (offset < 0 || offset >= len)1257 return -1;1258 line += offset;1259 len -= offset;12601261 digits = parse_num(line, p1);1262 if (!digits)1263 return -1;12641265 offset += digits;1266 line += digits;1267 len -= digits;12681269 *p2 = 1;1270 if (*line == ',') {1271 digits = parse_num(line+1, p2);1272 if (!digits)1273 return -1;12741275 offset += digits+1;1276 line += digits+1;1277 len -= digits+1;1278 }12791280 ex = strlen(expect);1281 if (ex > len)1282 return -1;1283 if (memcmp(line, expect, ex))1284 return -1;12851286 return offset + ex;1287}12881289static void recount_diff(char *line, int size, struct fragment *fragment)1290{1291 int oldlines = 0, newlines = 0, ret = 0;12921293 if (size < 1) {1294 warning("recount: ignore empty hunk");1295 return;1296 }12971298 for (;;) {1299 int len = linelen(line, size);1300 size -= len;1301 line += len;13021303 if (size < 1)1304 break;13051306 switch (*line) {1307 case ' ': case '\n':1308 newlines++;1309 /* fall through */1310 case '-':1311 oldlines++;1312 continue;1313 case '+':1314 newlines++;1315 continue;1316 case '\\':1317 continue;1318 case '@':1319 ret = size < 3 || prefixcmp(line, "@@ ");1320 break;1321 case 'd':1322 ret = size < 5 || prefixcmp(line, "diff ");1323 break;1324 default:1325 ret = -1;1326 break;1327 }1328 if (ret) {1329 warning("recount: unexpected line: %.*s",1330 (int)linelen(line, size), line);1331 return;1332 }1333 break;1334 }1335 fragment->oldlines = oldlines;1336 fragment->newlines = newlines;1337}13381339/*1340 * Parse a unified diff fragment header of the1341 * form "@@ -a,b +c,d @@"1342 */1343static int parse_fragment_header(char *line, int len, struct fragment *fragment)1344{1345 int offset;13461347 if (!len || line[len-1] != '\n')1348 return -1;13491350 /* Figure out the number of lines in a fragment */1351 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);1352 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);13531354 return offset;1355}13561357static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)1358{1359 unsigned long offset, len;13601361 patch->is_toplevel_relative = 0;1362 patch->is_rename = patch->is_copy = 0;1363 patch->is_new = patch->is_delete = -1;1364 patch->old_mode = patch->new_mode = 0;1365 patch->old_name = patch->new_name = NULL;1366 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {1367 unsigned long nextlen;13681369 len = linelen(line, size);1370 if (!len)1371 break;13721373 /* Testing this early allows us to take a few shortcuts.. */1374 if (len < 6)1375 continue;13761377 /*1378 * Make sure we don't find any unconnected patch fragments.1379 * That's a sign that we didn't find a header, and that a1380 * patch has become corrupted/broken up.1381 */1382 if (!memcmp("@@ -", line, 4)) {1383 struct fragment dummy;1384 if (parse_fragment_header(line, len, &dummy) < 0)1385 continue;1386 die("patch fragment without header at line %d: %.*s",1387 linenr, (int)len-1, line);1388 }13891390 if (size < len + 6)1391 break;13921393 /*1394 * Git patch? It might not have a real patch, just a rename1395 * or mode change, so we handle that specially1396 */1397 if (!memcmp("diff --git ", line, 11)) {1398 int git_hdr_len = parse_git_header(line, len, size, patch);1399 if (git_hdr_len <= len)1400 continue;1401 if (!patch->old_name && !patch->new_name) {1402 if (!patch->def_name)1403 die("git diff header lacks filename information when removing "1404 "%d leading pathname components (line %d)" , p_value, linenr);1405 patch->old_name = patch->new_name = patch->def_name;1406 }1407 if (!patch->is_delete && !patch->new_name)1408 die("git diff header lacks filename information "1409 "(line %d)", linenr);1410 patch->is_toplevel_relative = 1;1411 *hdrsize = git_hdr_len;1412 return offset;1413 }14141415 /* --- followed by +++ ? */1416 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))1417 continue;14181419 /*1420 * We only accept unified patches, so we want it to1421 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1422 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1423 */1424 nextlen = linelen(line + len, size - len);1425 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))1426 continue;14271428 /* Ok, we'll consider it a patch */1429 parse_traditional_patch(line, line+len, patch);1430 *hdrsize = len + nextlen;1431 linenr += 2;1432 return offset;1433 }1434 return -1;1435}14361437static void record_ws_error(unsigned result, const char *line, int len, int linenr)1438{1439 char *err;14401441 if (!result)1442 return;14431444 whitespace_error++;1445 if (squelch_whitespace_errors &&1446 squelch_whitespace_errors < whitespace_error)1447 return;14481449 err = whitespace_error_string(result);1450 fprintf(stderr, "%s:%d: %s.\n%.*s\n",1451 patch_input_file, linenr, err, len, line);1452 free(err);1453}14541455static void check_whitespace(const char *line, int len, unsigned ws_rule)1456{1457 unsigned result = ws_check(line + 1, len - 1, ws_rule);14581459 record_ws_error(result, line + 1, len - 2, linenr);1460}14611462/*1463 * Parse a unified diff. Note that this really needs to parse each1464 * fragment separately, since the only way to know the difference1465 * between a "---" that is part of a patch, and a "---" that starts1466 * the next patch is to look at the line counts..1467 */1468static int parse_fragment(char *line, unsigned long size,1469 struct patch *patch, struct fragment *fragment)1470{1471 int added, deleted;1472 int len = linelen(line, size), offset;1473 unsigned long oldlines, newlines;1474 unsigned long leading, trailing;14751476 offset = parse_fragment_header(line, len, fragment);1477 if (offset < 0)1478 return -1;1479 if (offset > 0 && patch->recount)1480 recount_diff(line + offset, size - offset, fragment);1481 oldlines = fragment->oldlines;1482 newlines = fragment->newlines;1483 leading = 0;1484 trailing = 0;14851486 /* Parse the thing.. */1487 line += len;1488 size -= len;1489 linenr++;1490 added = deleted = 0;1491 for (offset = len;1492 0 < size;1493 offset += len, size -= len, line += len, linenr++) {1494 if (!oldlines && !newlines)1495 break;1496 len = linelen(line, size);1497 if (!len || line[len-1] != '\n')1498 return -1;1499 switch (*line) {1500 default:1501 return -1;1502 case '\n': /* newer GNU diff, an empty context line */1503 case ' ':1504 oldlines--;1505 newlines--;1506 if (!deleted && !added)1507 leading++;1508 trailing++;1509 break;1510 case '-':1511 if (apply_in_reverse &&1512 ws_error_action != nowarn_ws_error)1513 check_whitespace(line, len, patch->ws_rule);1514 deleted++;1515 oldlines--;1516 trailing = 0;1517 break;1518 case '+':1519 if (!apply_in_reverse &&1520 ws_error_action != nowarn_ws_error)1521 check_whitespace(line, len, patch->ws_rule);1522 added++;1523 newlines--;1524 trailing = 0;1525 break;15261527 /*1528 * We allow "\ No newline at end of file". Depending1529 * on locale settings when the patch was produced we1530 * don't know what this line looks like. The only1531 * thing we do know is that it begins with "\ ".1532 * Checking for 12 is just for sanity check -- any1533 * l10n of "\ No newline..." is at least that long.1534 */1535 case '\\':1536 if (len < 12 || memcmp(line, "\\ ", 2))1537 return -1;1538 break;1539 }1540 }1541 if (oldlines || newlines)1542 return -1;1543 fragment->leading = leading;1544 fragment->trailing = trailing;15451546 /*1547 * If a fragment ends with an incomplete line, we failed to include1548 * it in the above loop because we hit oldlines == newlines == 01549 * before seeing it.1550 */1551 if (12 < size && !memcmp(line, "\\ ", 2))1552 offset += linelen(line, size);15531554 patch->lines_added += added;1555 patch->lines_deleted += deleted;15561557 if (0 < patch->is_new && oldlines)1558 return error("new file depends on old contents");1559 if (0 < patch->is_delete && newlines)1560 return error("deleted file still has contents");1561 return offset;1562}15631564static int parse_single_patch(char *line, unsigned long size, struct patch *patch)1565{1566 unsigned long offset = 0;1567 unsigned long oldlines = 0, newlines = 0, context = 0;1568 struct fragment **fragp = &patch->fragments;15691570 while (size > 4 && !memcmp(line, "@@ -", 4)) {1571 struct fragment *fragment;1572 int len;15731574 fragment = xcalloc(1, sizeof(*fragment));1575 fragment->linenr = linenr;1576 len = parse_fragment(line, size, patch, fragment);1577 if (len <= 0)1578 die("corrupt patch at line %d", linenr);1579 fragment->patch = line;1580 fragment->size = len;1581 oldlines += fragment->oldlines;1582 newlines += fragment->newlines;1583 context += fragment->leading + fragment->trailing;15841585 *fragp = fragment;1586 fragp = &fragment->next;15871588 offset += len;1589 line += len;1590 size -= len;1591 }15921593 /*1594 * If something was removed (i.e. we have old-lines) it cannot1595 * be creation, and if something was added it cannot be1596 * deletion. However, the reverse is not true; --unified=01597 * patches that only add are not necessarily creation even1598 * though they do not have any old lines, and ones that only1599 * delete are not necessarily deletion.1600 *1601 * Unfortunately, a real creation/deletion patch do _not_ have1602 * any context line by definition, so we cannot safely tell it1603 * apart with --unified=0 insanity. At least if the patch has1604 * more than one hunk it is not creation or deletion.1605 */1606 if (patch->is_new < 0 &&1607 (oldlines || (patch->fragments && patch->fragments->next)))1608 patch->is_new = 0;1609 if (patch->is_delete < 0 &&1610 (newlines || (patch->fragments && patch->fragments->next)))1611 patch->is_delete = 0;16121613 if (0 < patch->is_new && oldlines)1614 die("new file %s depends on old contents", patch->new_name);1615 if (0 < patch->is_delete && newlines)1616 die("deleted file %s still has contents", patch->old_name);1617 if (!patch->is_delete && !newlines && context)1618 fprintf(stderr, "** warning: file %s becomes empty but "1619 "is not deleted\n", patch->new_name);16201621 return offset;1622}16231624static inline int metadata_changes(struct patch *patch)1625{1626 return patch->is_rename > 0 ||1627 patch->is_copy > 0 ||1628 patch->is_new > 0 ||1629 patch->is_delete ||1630 (patch->old_mode && patch->new_mode &&1631 patch->old_mode != patch->new_mode);1632}16331634static char *inflate_it(const void *data, unsigned long size,1635 unsigned long inflated_size)1636{1637 git_zstream stream;1638 void *out;1639 int st;16401641 memset(&stream, 0, sizeof(stream));16421643 stream.next_in = (unsigned char *)data;1644 stream.avail_in = size;1645 stream.next_out = out = xmalloc(inflated_size);1646 stream.avail_out = inflated_size;1647 git_inflate_init(&stream);1648 st = git_inflate(&stream, Z_FINISH);1649 git_inflate_end(&stream);1650 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {1651 free(out);1652 return NULL;1653 }1654 return out;1655}16561657static struct fragment *parse_binary_hunk(char **buf_p,1658 unsigned long *sz_p,1659 int *status_p,1660 int *used_p)1661{1662 /*1663 * Expect a line that begins with binary patch method ("literal"1664 * or "delta"), followed by the length of data before deflating.1665 * a sequence of 'length-byte' followed by base-85 encoded data1666 * should follow, terminated by a newline.1667 *1668 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1669 * and we would limit the patch line to 66 characters,1670 * so one line can fit up to 13 groups that would decode1671 * to 52 bytes max. The length byte 'A'-'Z' corresponds1672 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1673 */1674 int llen, used;1675 unsigned long size = *sz_p;1676 char *buffer = *buf_p;1677 int patch_method;1678 unsigned long origlen;1679 char *data = NULL;1680 int hunk_size = 0;1681 struct fragment *frag;16821683 llen = linelen(buffer, size);1684 used = llen;16851686 *status_p = 0;16871688 if (!prefixcmp(buffer, "delta ")) {1689 patch_method = BINARY_DELTA_DEFLATED;1690 origlen = strtoul(buffer + 6, NULL, 10);1691 }1692 else if (!prefixcmp(buffer, "literal ")) {1693 patch_method = BINARY_LITERAL_DEFLATED;1694 origlen = strtoul(buffer + 8, NULL, 10);1695 }1696 else1697 return NULL;16981699 linenr++;1700 buffer += llen;1701 while (1) {1702 int byte_length, max_byte_length, newsize;1703 llen = linelen(buffer, size);1704 used += llen;1705 linenr++;1706 if (llen == 1) {1707 /* consume the blank line */1708 buffer++;1709 size--;1710 break;1711 }1712 /*1713 * Minimum line is "A00000\n" which is 7-byte long,1714 * and the line length must be multiple of 5 plus 2.1715 */1716 if ((llen < 7) || (llen-2) % 5)1717 goto corrupt;1718 max_byte_length = (llen - 2) / 5 * 4;1719 byte_length = *buffer;1720 if ('A' <= byte_length && byte_length <= 'Z')1721 byte_length = byte_length - 'A' + 1;1722 else if ('a' <= byte_length && byte_length <= 'z')1723 byte_length = byte_length - 'a' + 27;1724 else1725 goto corrupt;1726 /* if the input length was not multiple of 4, we would1727 * have filler at the end but the filler should never1728 * exceed 3 bytes1729 */1730 if (max_byte_length < byte_length ||1731 byte_length <= max_byte_length - 4)1732 goto corrupt;1733 newsize = hunk_size + byte_length;1734 data = xrealloc(data, newsize);1735 if (decode_85(data + hunk_size, buffer + 1, byte_length))1736 goto corrupt;1737 hunk_size = newsize;1738 buffer += llen;1739 size -= llen;1740 }17411742 frag = xcalloc(1, sizeof(*frag));1743 frag->patch = inflate_it(data, hunk_size, origlen);1744 if (!frag->patch)1745 goto corrupt;1746 free(data);1747 frag->size = origlen;1748 *buf_p = buffer;1749 *sz_p = size;1750 *used_p = used;1751 frag->binary_patch_method = patch_method;1752 return frag;17531754 corrupt:1755 free(data);1756 *status_p = -1;1757 error("corrupt binary patch at line %d: %.*s",1758 linenr-1, llen-1, buffer);1759 return NULL;1760}17611762static int parse_binary(char *buffer, unsigned long size, struct patch *patch)1763{1764 /*1765 * We have read "GIT binary patch\n"; what follows is a line1766 * that says the patch method (currently, either "literal" or1767 * "delta") and the length of data before deflating; a1768 * sequence of 'length-byte' followed by base-85 encoded data1769 * follows.1770 *1771 * When a binary patch is reversible, there is another binary1772 * hunk in the same format, starting with patch method (either1773 * "literal" or "delta") with the length of data, and a sequence1774 * of length-byte + base-85 encoded data, terminated with another1775 * empty line. This data, when applied to the postimage, produces1776 * the preimage.1777 */1778 struct fragment *forward;1779 struct fragment *reverse;1780 int status;1781 int used, used_1;17821783 forward = parse_binary_hunk(&buffer, &size, &status, &used);1784 if (!forward && !status)1785 /* there has to be one hunk (forward hunk) */1786 return error("unrecognized binary patch at line %d", linenr-1);1787 if (status)1788 /* otherwise we already gave an error message */1789 return status;17901791 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);1792 if (reverse)1793 used += used_1;1794 else if (status) {1795 /*1796 * Not having reverse hunk is not an error, but having1797 * a corrupt reverse hunk is.1798 */1799 free((void*) forward->patch);1800 free(forward);1801 return status;1802 }1803 forward->next = reverse;1804 patch->fragments = forward;1805 patch->is_binary = 1;1806 return used;1807}18081809static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)1810{1811 int hdrsize, patchsize;1812 int offset = find_header(buffer, size, &hdrsize, patch);18131814 if (offset < 0)1815 return offset;18161817 patch->ws_rule = whitespace_rule(patch->new_name1818 ? patch->new_name1819 : patch->old_name);18201821 patchsize = parse_single_patch(buffer + offset + hdrsize,1822 size - offset - hdrsize, patch);18231824 if (!patchsize) {1825 static const char *binhdr[] = {1826 "Binary files ",1827 "Files ",1828 NULL,1829 };1830 static const char git_binary[] = "GIT binary patch\n";1831 int i;1832 int hd = hdrsize + offset;1833 unsigned long llen = linelen(buffer + hd, size - hd);18341835 if (llen == sizeof(git_binary) - 1 &&1836 !memcmp(git_binary, buffer + hd, llen)) {1837 int used;1838 linenr++;1839 used = parse_binary(buffer + hd + llen,1840 size - hd - llen, patch);1841 if (used)1842 patchsize = used + llen;1843 else1844 patchsize = 0;1845 }1846 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {1847 for (i = 0; binhdr[i]; i++) {1848 int len = strlen(binhdr[i]);1849 if (len < size - hd &&1850 !memcmp(binhdr[i], buffer + hd, len)) {1851 linenr++;1852 patch->is_binary = 1;1853 patchsize = llen;1854 break;1855 }1856 }1857 }18581859 /* Empty patch cannot be applied if it is a text patch1860 * without metadata change. A binary patch appears1861 * empty to us here.1862 */1863 if ((apply || check) &&1864 (!patch->is_binary && !metadata_changes(patch)))1865 die("patch with only garbage at line %d", linenr);1866 }18671868 return offset + hdrsize + patchsize;1869}18701871#define swap(a,b) myswap((a),(b),sizeof(a))18721873#define myswap(a, b, size) do { \1874 unsigned char mytmp[size]; \1875 memcpy(mytmp, &a, size); \1876 memcpy(&a, &b, size); \1877 memcpy(&b, mytmp, size); \1878} while (0)18791880static void reverse_patches(struct patch *p)1881{1882 for (; p; p = p->next) {1883 struct fragment *frag = p->fragments;18841885 swap(p->new_name, p->old_name);1886 swap(p->new_mode, p->old_mode);1887 swap(p->is_new, p->is_delete);1888 swap(p->lines_added, p->lines_deleted);1889 swap(p->old_sha1_prefix, p->new_sha1_prefix);18901891 for (; frag; frag = frag->next) {1892 swap(frag->newpos, frag->oldpos);1893 swap(frag->newlines, frag->oldlines);1894 }1895 }1896}18971898static const char pluses[] =1899"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";1900static const char minuses[]=1901"----------------------------------------------------------------------";19021903static void show_stats(struct patch *patch)1904{1905 struct strbuf qname = STRBUF_INIT;1906 char *cp = patch->new_name ? patch->new_name : patch->old_name;1907 int max, add, del;19081909 quote_c_style(cp, &qname, NULL, 0);19101911 /*1912 * "scale" the filename1913 */1914 max = max_len;1915 if (max > 50)1916 max = 50;19171918 if (qname.len > max) {1919 cp = strchr(qname.buf + qname.len + 3 - max, '/');1920 if (!cp)1921 cp = qname.buf + qname.len + 3 - max;1922 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);1923 }19241925 if (patch->is_binary) {1926 printf(" %-*s | Bin\n", max, qname.buf);1927 strbuf_release(&qname);1928 return;1929 }19301931 printf(" %-*s |", max, qname.buf);1932 strbuf_release(&qname);19331934 /*1935 * scale the add/delete1936 */1937 max = max + max_change > 70 ? 70 - max : max_change;1938 add = patch->lines_added;1939 del = patch->lines_deleted;19401941 if (max_change > 0) {1942 int total = ((add + del) * max + max_change / 2) / max_change;1943 add = (add * max + max_change / 2) / max_change;1944 del = total - add;1945 }1946 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,1947 add, pluses, del, minuses);1948}19491950static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)1951{1952 switch (st->st_mode & S_IFMT) {1953 case S_IFLNK:1954 if (strbuf_readlink(buf, path, st->st_size) < 0)1955 return error("unable to read symlink %s", path);1956 return 0;1957 case S_IFREG:1958 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)1959 return error("unable to open or read %s", path);1960 convert_to_git(path, buf->buf, buf->len, buf, 0);1961 return 0;1962 default:1963 return -1;1964 }1965}19661967/*1968 * Update the preimage, and the common lines in postimage,1969 * from buffer buf of length len. If postlen is 0 the postimage1970 * is updated in place, otherwise it's updated on a new buffer1971 * of length postlen1972 */19731974static void update_pre_post_images(struct image *preimage,1975 struct image *postimage,1976 char *buf,1977 size_t len, size_t postlen)1978{1979 int i, ctx;1980 char *new, *old, *fixed;1981 struct image fixed_preimage;19821983 /*1984 * Update the preimage with whitespace fixes. Note that we1985 * are not losing preimage->buf -- apply_one_fragment() will1986 * free "oldlines".1987 */1988 prepare_image(&fixed_preimage, buf, len, 1);1989 assert(fixed_preimage.nr == preimage->nr);1990 for (i = 0; i < preimage->nr; i++)1991 fixed_preimage.line[i].flag = preimage->line[i].flag;1992 free(preimage->line_allocated);1993 *preimage = fixed_preimage;19941995 /*1996 * Adjust the common context lines in postimage. This can be1997 * done in-place when we are just doing whitespace fixing,1998 * which does not make the string grow, but needs a new buffer1999 * when ignoring whitespace causes the update, since in this case2000 * we could have e.g. tabs converted to multiple spaces.2001 * We trust the caller to tell us if the update can be done2002 * in place (postlen==0) or not.2003 */2004 old = postimage->buf;2005 if (postlen)2006 new = postimage->buf = xmalloc(postlen);2007 else2008 new = old;2009 fixed = preimage->buf;2010 for (i = ctx = 0; i < postimage->nr; i++) {2011 size_t len = postimage->line[i].len;2012 if (!(postimage->line[i].flag & LINE_COMMON)) {2013 /* an added line -- no counterparts in preimage */2014 memmove(new, old, len);2015 old += len;2016 new += len;2017 continue;2018 }20192020 /* a common context -- skip it in the original postimage */2021 old += len;20222023 /* and find the corresponding one in the fixed preimage */2024 while (ctx < preimage->nr &&2025 !(preimage->line[ctx].flag & LINE_COMMON)) {2026 fixed += preimage->line[ctx].len;2027 ctx++;2028 }2029 if (preimage->nr <= ctx)2030 die("oops");20312032 /* and copy it in, while fixing the line length */2033 len = preimage->line[ctx].len;2034 memcpy(new, fixed, len);2035 new += len;2036 fixed += len;2037 postimage->line[i].len = len;2038 ctx++;2039 }20402041 /* Fix the length of the whole thing */2042 postimage->len = new - postimage->buf;2043}20442045static int match_fragment(struct image *img,2046 struct image *preimage,2047 struct image *postimage,2048 unsigned long try,2049 int try_lno,2050 unsigned ws_rule,2051 int match_beginning, int match_end)2052{2053 int i;2054 char *fixed_buf, *buf, *orig, *target;2055 struct strbuf fixed;2056 size_t fixed_len;2057 int preimage_limit;20582059 if (preimage->nr + try_lno <= img->nr) {2060 /*2061 * The hunk falls within the boundaries of img.2062 */2063 preimage_limit = preimage->nr;2064 if (match_end && (preimage->nr + try_lno != img->nr))2065 return 0;2066 } else if (ws_error_action == correct_ws_error &&2067 (ws_rule & WS_BLANK_AT_EOF)) {2068 /*2069 * This hunk extends beyond the end of img, and we are2070 * removing blank lines at the end of the file. This2071 * many lines from the beginning of the preimage must2072 * match with img, and the remainder of the preimage2073 * must be blank.2074 */2075 preimage_limit = img->nr - try_lno;2076 } else {2077 /*2078 * The hunk extends beyond the end of the img and2079 * we are not removing blanks at the end, so we2080 * should reject the hunk at this position.2081 */2082 return 0;2083 }20842085 if (match_beginning && try_lno)2086 return 0;20872088 /* Quick hash check */2089 for (i = 0; i < preimage_limit; i++)2090 if ((img->line[try_lno + i].flag & LINE_PATCHED) ||2091 (preimage->line[i].hash != img->line[try_lno + i].hash))2092 return 0;20932094 if (preimage_limit == preimage->nr) {2095 /*2096 * Do we have an exact match? If we were told to match2097 * at the end, size must be exactly at try+fragsize,2098 * otherwise try+fragsize must be still within the preimage,2099 * and either case, the old piece should match the preimage2100 * exactly.2101 */2102 if ((match_end2103 ? (try + preimage->len == img->len)2104 : (try + preimage->len <= img->len)) &&2105 !memcmp(img->buf + try, preimage->buf, preimage->len))2106 return 1;2107 } else {2108 /*2109 * The preimage extends beyond the end of img, so2110 * there cannot be an exact match.2111 *2112 * There must be one non-blank context line that match2113 * a line before the end of img.2114 */2115 char *buf_end;21162117 buf = preimage->buf;2118 buf_end = buf;2119 for (i = 0; i < preimage_limit; i++)2120 buf_end += preimage->line[i].len;21212122 for ( ; buf < buf_end; buf++)2123 if (!isspace(*buf))2124 break;2125 if (buf == buf_end)2126 return 0;2127 }21282129 /*2130 * No exact match. If we are ignoring whitespace, run a line-by-line2131 * fuzzy matching. We collect all the line length information because2132 * we need it to adjust whitespace if we match.2133 */2134 if (ws_ignore_action == ignore_ws_change) {2135 size_t imgoff = 0;2136 size_t preoff = 0;2137 size_t postlen = postimage->len;2138 size_t extra_chars;2139 char *preimage_eof;2140 char *preimage_end;2141 for (i = 0; i < preimage_limit; i++) {2142 size_t prelen = preimage->line[i].len;2143 size_t imglen = img->line[try_lno+i].len;21442145 if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,2146 preimage->buf + preoff, prelen))2147 return 0;2148 if (preimage->line[i].flag & LINE_COMMON)2149 postlen += imglen - prelen;2150 imgoff += imglen;2151 preoff += prelen;2152 }21532154 /*2155 * Ok, the preimage matches with whitespace fuzz.2156 *2157 * imgoff now holds the true length of the target that2158 * matches the preimage before the end of the file.2159 *2160 * Count the number of characters in the preimage that fall2161 * beyond the end of the file and make sure that all of them2162 * are whitespace characters. (This can only happen if2163 * we are removing blank lines at the end of the file.)2164 */2165 buf = preimage_eof = preimage->buf + preoff;2166 for ( ; i < preimage->nr; i++)2167 preoff += preimage->line[i].len;2168 preimage_end = preimage->buf + preoff;2169 for ( ; buf < preimage_end; buf++)2170 if (!isspace(*buf))2171 return 0;21722173 /*2174 * Update the preimage and the common postimage context2175 * lines to use the same whitespace as the target.2176 * If whitespace is missing in the target (i.e.2177 * if the preimage extends beyond the end of the file),2178 * use the whitespace from the preimage.2179 */2180 extra_chars = preimage_end - preimage_eof;2181 strbuf_init(&fixed, imgoff + extra_chars);2182 strbuf_add(&fixed, img->buf + try, imgoff);2183 strbuf_add(&fixed, preimage_eof, extra_chars);2184 fixed_buf = strbuf_detach(&fixed, &fixed_len);2185 update_pre_post_images(preimage, postimage,2186 fixed_buf, fixed_len, postlen);2187 return 1;2188 }21892190 if (ws_error_action != correct_ws_error)2191 return 0;21922193 /*2194 * The hunk does not apply byte-by-byte, but the hash says2195 * it might with whitespace fuzz. We haven't been asked to2196 * ignore whitespace, we were asked to correct whitespace2197 * errors, so let's try matching after whitespace correction.2198 *2199 * The preimage may extend beyond the end of the file,2200 * but in this loop we will only handle the part of the2201 * preimage that falls within the file.2202 */2203 strbuf_init(&fixed, preimage->len + 1);2204 orig = preimage->buf;2205 target = img->buf + try;2206 for (i = 0; i < preimage_limit; i++) {2207 size_t oldlen = preimage->line[i].len;2208 size_t tgtlen = img->line[try_lno + i].len;2209 size_t fixstart = fixed.len;2210 struct strbuf tgtfix;2211 int match;22122213 /* Try fixing the line in the preimage */2214 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);22152216 /* Try fixing the line in the target */2217 strbuf_init(&tgtfix, tgtlen);2218 ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);22192220 /*2221 * If they match, either the preimage was based on2222 * a version before our tree fixed whitespace breakage,2223 * or we are lacking a whitespace-fix patch the tree2224 * the preimage was based on already had (i.e. target2225 * has whitespace breakage, the preimage doesn't).2226 * In either case, we are fixing the whitespace breakages2227 * so we might as well take the fix together with their2228 * real change.2229 */2230 match = (tgtfix.len == fixed.len - fixstart &&2231 !memcmp(tgtfix.buf, fixed.buf + fixstart,2232 fixed.len - fixstart));22332234 strbuf_release(&tgtfix);2235 if (!match)2236 goto unmatch_exit;22372238 orig += oldlen;2239 target += tgtlen;2240 }224122422243 /*2244 * Now handle the lines in the preimage that falls beyond the2245 * end of the file (if any). They will only match if they are2246 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2247 * false).2248 */2249 for ( ; i < preimage->nr; i++) {2250 size_t fixstart = fixed.len; /* start of the fixed preimage */2251 size_t oldlen = preimage->line[i].len;2252 int j;22532254 /* Try fixing the line in the preimage */2255 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);22562257 for (j = fixstart; j < fixed.len; j++)2258 if (!isspace(fixed.buf[j]))2259 goto unmatch_exit;22602261 orig += oldlen;2262 }22632264 /*2265 * Yes, the preimage is based on an older version that still2266 * has whitespace breakages unfixed, and fixing them makes the2267 * hunk match. Update the context lines in the postimage.2268 */2269 fixed_buf = strbuf_detach(&fixed, &fixed_len);2270 update_pre_post_images(preimage, postimage,2271 fixed_buf, fixed_len, 0);2272 return 1;22732274 unmatch_exit:2275 strbuf_release(&fixed);2276 return 0;2277}22782279static int find_pos(struct image *img,2280 struct image *preimage,2281 struct image *postimage,2282 int line,2283 unsigned ws_rule,2284 int match_beginning, int match_end)2285{2286 int i;2287 unsigned long backwards, forwards, try;2288 int backwards_lno, forwards_lno, try_lno;22892290 /*2291 * If match_beginning or match_end is specified, there is no2292 * point starting from a wrong line that will never match and2293 * wander around and wait for a match at the specified end.2294 */2295 if (match_beginning)2296 line = 0;2297 else if (match_end)2298 line = img->nr - preimage->nr;22992300 /*2301 * Because the comparison is unsigned, the following test2302 * will also take care of a negative line number that can2303 * result when match_end and preimage is larger than the target.2304 */2305 if ((size_t) line > img->nr)2306 line = img->nr;23072308 try = 0;2309 for (i = 0; i < line; i++)2310 try += img->line[i].len;23112312 /*2313 * There's probably some smart way to do this, but I'll leave2314 * that to the smart and beautiful people. I'm simple and stupid.2315 */2316 backwards = try;2317 backwards_lno = line;2318 forwards = try;2319 forwards_lno = line;2320 try_lno = line;23212322 for (i = 0; ; i++) {2323 if (match_fragment(img, preimage, postimage,2324 try, try_lno, ws_rule,2325 match_beginning, match_end))2326 return try_lno;23272328 again:2329 if (backwards_lno == 0 && forwards_lno == img->nr)2330 break;23312332 if (i & 1) {2333 if (backwards_lno == 0) {2334 i++;2335 goto again;2336 }2337 backwards_lno--;2338 backwards -= img->line[backwards_lno].len;2339 try = backwards;2340 try_lno = backwards_lno;2341 } else {2342 if (forwards_lno == img->nr) {2343 i++;2344 goto again;2345 }2346 forwards += img->line[forwards_lno].len;2347 forwards_lno++;2348 try = forwards;2349 try_lno = forwards_lno;2350 }23512352 }2353 return -1;2354}23552356static void remove_first_line(struct image *img)2357{2358 img->buf += img->line[0].len;2359 img->len -= img->line[0].len;2360 img->line++;2361 img->nr--;2362}23632364static void remove_last_line(struct image *img)2365{2366 img->len -= img->line[--img->nr].len;2367}23682369static void update_image(struct image *img,2370 int applied_pos,2371 struct image *preimage,2372 struct image *postimage)2373{2374 /*2375 * remove the copy of preimage at offset in img2376 * and replace it with postimage2377 */2378 int i, nr;2379 size_t remove_count, insert_count, applied_at = 0;2380 char *result;2381 int preimage_limit;23822383 /*2384 * If we are removing blank lines at the end of img,2385 * the preimage may extend beyond the end.2386 * If that is the case, we must be careful only to2387 * remove the part of the preimage that falls within2388 * the boundaries of img. Initialize preimage_limit2389 * to the number of lines in the preimage that falls2390 * within the boundaries.2391 */2392 preimage_limit = preimage->nr;2393 if (preimage_limit > img->nr - applied_pos)2394 preimage_limit = img->nr - applied_pos;23952396 for (i = 0; i < applied_pos; i++)2397 applied_at += img->line[i].len;23982399 remove_count = 0;2400 for (i = 0; i < preimage_limit; i++)2401 remove_count += img->line[applied_pos + i].len;2402 insert_count = postimage->len;24032404 /* Adjust the contents */2405 result = xmalloc(img->len + insert_count - remove_count + 1);2406 memcpy(result, img->buf, applied_at);2407 memcpy(result + applied_at, postimage->buf, postimage->len);2408 memcpy(result + applied_at + postimage->len,2409 img->buf + (applied_at + remove_count),2410 img->len - (applied_at + remove_count));2411 free(img->buf);2412 img->buf = result;2413 img->len += insert_count - remove_count;2414 result[img->len] = '\0';24152416 /* Adjust the line table */2417 nr = img->nr + postimage->nr - preimage_limit;2418 if (preimage_limit < postimage->nr) {2419 /*2420 * NOTE: this knows that we never call remove_first_line()2421 * on anything other than pre/post image.2422 */2423 img->line = xrealloc(img->line, nr * sizeof(*img->line));2424 img->line_allocated = img->line;2425 }2426 if (preimage_limit != postimage->nr)2427 memmove(img->line + applied_pos + postimage->nr,2428 img->line + applied_pos + preimage_limit,2429 (img->nr - (applied_pos + preimage_limit)) *2430 sizeof(*img->line));2431 memcpy(img->line + applied_pos,2432 postimage->line,2433 postimage->nr * sizeof(*img->line));2434 if (!allow_overlap)2435 for (i = 0; i < postimage->nr; i++)2436 img->line[applied_pos + i].flag |= LINE_PATCHED;2437 img->nr = nr;2438}24392440static int apply_one_fragment(struct image *img, struct fragment *frag,2441 int inaccurate_eof, unsigned ws_rule,2442 int nth_fragment)2443{2444 int match_beginning, match_end;2445 const char *patch = frag->patch;2446 int size = frag->size;2447 char *old, *oldlines;2448 struct strbuf newlines;2449 int new_blank_lines_at_end = 0;2450 int found_new_blank_lines_at_end = 0;2451 int hunk_linenr = frag->linenr;2452 unsigned long leading, trailing;2453 int pos, applied_pos;2454 struct image preimage;2455 struct image postimage;24562457 memset(&preimage, 0, sizeof(preimage));2458 memset(&postimage, 0, sizeof(postimage));2459 oldlines = xmalloc(size);2460 strbuf_init(&newlines, size);24612462 old = oldlines;2463 while (size > 0) {2464 char first;2465 int len = linelen(patch, size);2466 int plen;2467 int added_blank_line = 0;2468 int is_blank_context = 0;2469 size_t start;24702471 if (!len)2472 break;24732474 /*2475 * "plen" is how much of the line we should use for2476 * the actual patch data. Normally we just remove the2477 * first character on the line, but if the line is2478 * followed by "\ No newline", then we also remove the2479 * last one (which is the newline, of course).2480 */2481 plen = len - 1;2482 if (len < size && patch[len] == '\\')2483 plen--;2484 first = *patch;2485 if (apply_in_reverse) {2486 if (first == '-')2487 first = '+';2488 else if (first == '+')2489 first = '-';2490 }24912492 switch (first) {2493 case '\n':2494 /* Newer GNU diff, empty context line */2495 if (plen < 0)2496 /* ... followed by '\No newline'; nothing */2497 break;2498 *old++ = '\n';2499 strbuf_addch(&newlines, '\n');2500 add_line_info(&preimage, "\n", 1, LINE_COMMON);2501 add_line_info(&postimage, "\n", 1, LINE_COMMON);2502 is_blank_context = 1;2503 break;2504 case ' ':2505 if (plen && (ws_rule & WS_BLANK_AT_EOF) &&2506 ws_blank_line(patch + 1, plen, ws_rule))2507 is_blank_context = 1;2508 case '-':2509 memcpy(old, patch + 1, plen);2510 add_line_info(&preimage, old, plen,2511 (first == ' ' ? LINE_COMMON : 0));2512 old += plen;2513 if (first == '-')2514 break;2515 /* Fall-through for ' ' */2516 case '+':2517 /* --no-add does not add new lines */2518 if (first == '+' && no_add)2519 break;25202521 start = newlines.len;2522 if (first != '+' ||2523 !whitespace_error ||2524 ws_error_action != correct_ws_error) {2525 strbuf_add(&newlines, patch + 1, plen);2526 }2527 else {2528 ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &applied_after_fixing_ws);2529 }2530 add_line_info(&postimage, newlines.buf + start, newlines.len - start,2531 (first == '+' ? 0 : LINE_COMMON));2532 if (first == '+' &&2533 (ws_rule & WS_BLANK_AT_EOF) &&2534 ws_blank_line(patch + 1, plen, ws_rule))2535 added_blank_line = 1;2536 break;2537 case '@': case '\\':2538 /* Ignore it, we already handled it */2539 break;2540 default:2541 if (apply_verbosely)2542 error("invalid start of line: '%c'", first);2543 return -1;2544 }2545 if (added_blank_line) {2546 if (!new_blank_lines_at_end)2547 found_new_blank_lines_at_end = hunk_linenr;2548 new_blank_lines_at_end++;2549 }2550 else if (is_blank_context)2551 ;2552 else2553 new_blank_lines_at_end = 0;2554 patch += len;2555 size -= len;2556 hunk_linenr++;2557 }2558 if (inaccurate_eof &&2559 old > oldlines && old[-1] == '\n' &&2560 newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {2561 old--;2562 strbuf_setlen(&newlines, newlines.len - 1);2563 }25642565 leading = frag->leading;2566 trailing = frag->trailing;25672568 /*2569 * A hunk to change lines at the beginning would begin with2570 * @@ -1,L +N,M @@2571 * but we need to be careful. -U0 that inserts before the second2572 * line also has this pattern.2573 *2574 * And a hunk to add to an empty file would begin with2575 * @@ -0,0 +N,M @@2576 *2577 * In other words, a hunk that is (frag->oldpos <= 1) with or2578 * without leading context must match at the beginning.2579 */2580 match_beginning = (!frag->oldpos ||2581 (frag->oldpos == 1 && !unidiff_zero));25822583 /*2584 * A hunk without trailing lines must match at the end.2585 * However, we simply cannot tell if a hunk must match end2586 * from the lack of trailing lines if the patch was generated2587 * with unidiff without any context.2588 */2589 match_end = !unidiff_zero && !trailing;25902591 pos = frag->newpos ? (frag->newpos - 1) : 0;2592 preimage.buf = oldlines;2593 preimage.len = old - oldlines;2594 postimage.buf = newlines.buf;2595 postimage.len = newlines.len;2596 preimage.line = preimage.line_allocated;2597 postimage.line = postimage.line_allocated;25982599 for (;;) {26002601 applied_pos = find_pos(img, &preimage, &postimage, pos,2602 ws_rule, match_beginning, match_end);26032604 if (applied_pos >= 0)2605 break;26062607 /* Am I at my context limits? */2608 if ((leading <= p_context) && (trailing <= p_context))2609 break;2610 if (match_beginning || match_end) {2611 match_beginning = match_end = 0;2612 continue;2613 }26142615 /*2616 * Reduce the number of context lines; reduce both2617 * leading and trailing if they are equal otherwise2618 * just reduce the larger context.2619 */2620 if (leading >= trailing) {2621 remove_first_line(&preimage);2622 remove_first_line(&postimage);2623 pos--;2624 leading--;2625 }2626 if (trailing > leading) {2627 remove_last_line(&preimage);2628 remove_last_line(&postimage);2629 trailing--;2630 }2631 }26322633 if (applied_pos >= 0) {2634 if (new_blank_lines_at_end &&2635 preimage.nr + applied_pos >= img->nr &&2636 (ws_rule & WS_BLANK_AT_EOF) &&2637 ws_error_action != nowarn_ws_error) {2638 record_ws_error(WS_BLANK_AT_EOF, "+", 1,2639 found_new_blank_lines_at_end);2640 if (ws_error_action == correct_ws_error) {2641 while (new_blank_lines_at_end--)2642 remove_last_line(&postimage);2643 }2644 /*2645 * We would want to prevent write_out_results()2646 * from taking place in apply_patch() that follows2647 * the callchain led us here, which is:2648 * apply_patch->check_patch_list->check_patch->2649 * apply_data->apply_fragments->apply_one_fragment2650 */2651 if (ws_error_action == die_on_ws_error)2652 apply = 0;2653 }26542655 if (apply_verbosely && applied_pos != pos) {2656 int offset = applied_pos - pos;2657 if (apply_in_reverse)2658 offset = 0 - offset;2659 fprintf(stderr,2660 "Hunk #%d succeeded at %d (offset %d lines).\n",2661 nth_fragment, applied_pos + 1, offset);2662 }26632664 /*2665 * Warn if it was necessary to reduce the number2666 * of context lines.2667 */2668 if ((leading != frag->leading) ||2669 (trailing != frag->trailing))2670 fprintf(stderr, "Context reduced to (%ld/%ld)"2671 " to apply fragment at %d\n",2672 leading, trailing, applied_pos+1);2673 update_image(img, applied_pos, &preimage, &postimage);2674 } else {2675 if (apply_verbosely)2676 error("while searching for:\n%.*s",2677 (int)(old - oldlines), oldlines);2678 }26792680 free(oldlines);2681 strbuf_release(&newlines);2682 free(preimage.line_allocated);2683 free(postimage.line_allocated);26842685 return (applied_pos < 0);2686}26872688static int apply_binary_fragment(struct image *img, struct patch *patch)2689{2690 struct fragment *fragment = patch->fragments;2691 unsigned long len;2692 void *dst;26932694 if (!fragment)2695 return error("missing binary patch data for '%s'",2696 patch->new_name ?2697 patch->new_name :2698 patch->old_name);26992700 /* Binary patch is irreversible without the optional second hunk */2701 if (apply_in_reverse) {2702 if (!fragment->next)2703 return error("cannot reverse-apply a binary patch "2704 "without the reverse hunk to '%s'",2705 patch->new_name2706 ? patch->new_name : patch->old_name);2707 fragment = fragment->next;2708 }2709 switch (fragment->binary_patch_method) {2710 case BINARY_DELTA_DEFLATED:2711 dst = patch_delta(img->buf, img->len, fragment->patch,2712 fragment->size, &len);2713 if (!dst)2714 return -1;2715 clear_image(img);2716 img->buf = dst;2717 img->len = len;2718 return 0;2719 case BINARY_LITERAL_DEFLATED:2720 clear_image(img);2721 img->len = fragment->size;2722 img->buf = xmalloc(img->len+1);2723 memcpy(img->buf, fragment->patch, img->len);2724 img->buf[img->len] = '\0';2725 return 0;2726 }2727 return -1;2728}27292730static int apply_binary(struct image *img, struct patch *patch)2731{2732 const char *name = patch->old_name ? patch->old_name : patch->new_name;2733 unsigned char sha1[20];27342735 /*2736 * For safety, we require patch index line to contain2737 * full 40-byte textual SHA1 for old and new, at least for now.2738 */2739 if (strlen(patch->old_sha1_prefix) != 40 ||2740 strlen(patch->new_sha1_prefix) != 40 ||2741 get_sha1_hex(patch->old_sha1_prefix, sha1) ||2742 get_sha1_hex(patch->new_sha1_prefix, sha1))2743 return error("cannot apply binary patch to '%s' "2744 "without full index line", name);27452746 if (patch->old_name) {2747 /*2748 * See if the old one matches what the patch2749 * applies to.2750 */2751 hash_sha1_file(img->buf, img->len, blob_type, sha1);2752 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2753 return error("the patch applies to '%s' (%s), "2754 "which does not match the "2755 "current contents.",2756 name, sha1_to_hex(sha1));2757 }2758 else {2759 /* Otherwise, the old one must be empty. */2760 if (img->len)2761 return error("the patch applies to an empty "2762 "'%s' but it is not empty", name);2763 }27642765 get_sha1_hex(patch->new_sha1_prefix, sha1);2766 if (is_null_sha1(sha1)) {2767 clear_image(img);2768 return 0; /* deletion patch */2769 }27702771 if (has_sha1_file(sha1)) {2772 /* We already have the postimage */2773 enum object_type type;2774 unsigned long size;2775 char *result;27762777 result = read_sha1_file(sha1, &type, &size);2778 if (!result)2779 return error("the necessary postimage %s for "2780 "'%s' cannot be read",2781 patch->new_sha1_prefix, name);2782 clear_image(img);2783 img->buf = result;2784 img->len = size;2785 } else {2786 /*2787 * We have verified buf matches the preimage;2788 * apply the patch data to it, which is stored2789 * in the patch->fragments->{patch,size}.2790 */2791 if (apply_binary_fragment(img, patch))2792 return error("binary patch does not apply to '%s'",2793 name);27942795 /* verify that the result matches */2796 hash_sha1_file(img->buf, img->len, blob_type, sha1);2797 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))2798 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",2799 name, patch->new_sha1_prefix, sha1_to_hex(sha1));2800 }28012802 return 0;2803}28042805static int apply_fragments(struct image *img, struct patch *patch)2806{2807 struct fragment *frag = patch->fragments;2808 const char *name = patch->old_name ? patch->old_name : patch->new_name;2809 unsigned ws_rule = patch->ws_rule;2810 unsigned inaccurate_eof = patch->inaccurate_eof;2811 int nth = 0;28122813 if (patch->is_binary)2814 return apply_binary(img, patch);28152816 while (frag) {2817 nth++;2818 if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {2819 error("patch failed: %s:%ld", name, frag->oldpos);2820 if (!apply_with_reject)2821 return -1;2822 frag->rejected = 1;2823 }2824 frag = frag->next;2825 }2826 return 0;2827}28282829static int read_file_or_gitlink(struct cache_entry *ce, struct strbuf *buf)2830{2831 if (!ce)2832 return 0;28332834 if (S_ISGITLINK(ce->ce_mode)) {2835 strbuf_grow(buf, 100);2836 strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(ce->sha1));2837 } else {2838 enum object_type type;2839 unsigned long sz;2840 char *result;28412842 result = read_sha1_file(ce->sha1, &type, &sz);2843 if (!result)2844 return -1;2845 /* XXX read_sha1_file NUL-terminates */2846 strbuf_attach(buf, result, sz, sz + 1);2847 }2848 return 0;2849}28502851static struct patch *in_fn_table(const char *name)2852{2853 struct string_list_item *item;28542855 if (name == NULL)2856 return NULL;28572858 item = string_list_lookup(&fn_table, name);2859 if (item != NULL)2860 return (struct patch *)item->util;28612862 return NULL;2863}28642865/*2866 * item->util in the filename table records the status of the path.2867 * Usually it points at a patch (whose result records the contents2868 * of it after applying it), but it could be PATH_WAS_DELETED for a2869 * path that a previously applied patch has already removed.2870 */2871 #define PATH_TO_BE_DELETED ((struct patch *) -2)2872#define PATH_WAS_DELETED ((struct patch *) -1)28732874static int to_be_deleted(struct patch *patch)2875{2876 return patch == PATH_TO_BE_DELETED;2877}28782879static int was_deleted(struct patch *patch)2880{2881 return patch == PATH_WAS_DELETED;2882}28832884static void add_to_fn_table(struct patch *patch)2885{2886 struct string_list_item *item;28872888 /*2889 * Always add new_name unless patch is a deletion2890 * This should cover the cases for normal diffs,2891 * file creations and copies2892 */2893 if (patch->new_name != NULL) {2894 item = string_list_insert(&fn_table, patch->new_name);2895 item->util = patch;2896 }28972898 /*2899 * store a failure on rename/deletion cases because2900 * later chunks shouldn't patch old names2901 */2902 if ((patch->new_name == NULL) || (patch->is_rename)) {2903 item = string_list_insert(&fn_table, patch->old_name);2904 item->util = PATH_WAS_DELETED;2905 }2906}29072908static void prepare_fn_table(struct patch *patch)2909{2910 /*2911 * store information about incoming file deletion2912 */2913 while (patch) {2914 if ((patch->new_name == NULL) || (patch->is_rename)) {2915 struct string_list_item *item;2916 item = string_list_insert(&fn_table, patch->old_name);2917 item->util = PATH_TO_BE_DELETED;2918 }2919 patch = patch->next;2920 }2921}29222923static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)2924{2925 struct strbuf buf = STRBUF_INIT;2926 struct image image;2927 size_t len;2928 char *img;2929 struct patch *tpatch;29302931 if (!(patch->is_copy || patch->is_rename) &&2932 (tpatch = in_fn_table(patch->old_name)) != NULL && !to_be_deleted(tpatch)) {2933 if (was_deleted(tpatch)) {2934 return error("patch %s has been renamed/deleted",2935 patch->old_name);2936 }2937 /* We have a patched copy in memory use that */2938 strbuf_add(&buf, tpatch->result, tpatch->resultsize);2939 } else if (cached) {2940 if (read_file_or_gitlink(ce, &buf))2941 return error("read of %s failed", patch->old_name);2942 } else if (patch->old_name) {2943 if (S_ISGITLINK(patch->old_mode)) {2944 if (ce) {2945 read_file_or_gitlink(ce, &buf);2946 } else {2947 /*2948 * There is no way to apply subproject2949 * patch without looking at the index.2950 */2951 patch->fragments = NULL;2952 }2953 } else {2954 if (read_old_data(st, patch->old_name, &buf))2955 return error("read of %s failed", patch->old_name);2956 }2957 }29582959 img = strbuf_detach(&buf, &len);2960 prepare_image(&image, img, len, !patch->is_binary);29612962 if (apply_fragments(&image, patch) < 0)2963 return -1; /* note with --reject this succeeds. */2964 patch->result = image.buf;2965 patch->resultsize = image.len;2966 add_to_fn_table(patch);2967 free(image.line_allocated);29682969 if (0 < patch->is_delete && patch->resultsize)2970 return error("removal patch leaves file contents");29712972 return 0;2973}29742975static int check_to_create_blob(const char *new_name, int ok_if_exists)2976{2977 struct stat nst;2978 if (!lstat(new_name, &nst)) {2979 if (S_ISDIR(nst.st_mode) || ok_if_exists)2980 return 0;2981 /*2982 * A leading component of new_name might be a symlink2983 * that is going to be removed with this patch, but2984 * still pointing at somewhere that has the path.2985 * In such a case, path "new_name" does not exist as2986 * far as git is concerned.2987 */2988 if (has_symlink_leading_path(new_name, strlen(new_name)))2989 return 0;29902991 return error("%s: already exists in working directory", new_name);2992 }2993 else if ((errno != ENOENT) && (errno != ENOTDIR))2994 return error("%s: %s", new_name, strerror(errno));2995 return 0;2996}29972998static int verify_index_match(struct cache_entry *ce, struct stat *st)2999{3000 if (S_ISGITLINK(ce->ce_mode)) {3001 if (!S_ISDIR(st->st_mode))3002 return -1;3003 return 0;3004 }3005 return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3006}30073008static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)3009{3010 const char *old_name = patch->old_name;3011 struct patch *tpatch = NULL;3012 int stat_ret = 0;3013 unsigned st_mode = 0;30143015 /*3016 * Make sure that we do not have local modifications from the3017 * index when we are looking at the index. Also make sure3018 * we have the preimage file to be patched in the work tree,3019 * unless --cached, which tells git to apply only in the index.3020 */3021 if (!old_name)3022 return 0;30233024 assert(patch->is_new <= 0);30253026 if (!(patch->is_copy || patch->is_rename) &&3027 (tpatch = in_fn_table(old_name)) != NULL && !to_be_deleted(tpatch)) {3028 if (was_deleted(tpatch))3029 return error("%s: has been deleted/renamed", old_name);3030 st_mode = tpatch->new_mode;3031 } else if (!cached) {3032 stat_ret = lstat(old_name, st);3033 if (stat_ret && errno != ENOENT)3034 return error("%s: %s", old_name, strerror(errno));3035 }30363037 if (to_be_deleted(tpatch))3038 tpatch = NULL;30393040 if (check_index && !tpatch) {3041 int pos = cache_name_pos(old_name, strlen(old_name));3042 if (pos < 0) {3043 if (patch->is_new < 0)3044 goto is_new;3045 return error("%s: does not exist in index", old_name);3046 }3047 *ce = active_cache[pos];3048 if (stat_ret < 0) {3049 struct checkout costate;3050 /* checkout */3051 memset(&costate, 0, sizeof(costate));3052 costate.base_dir = "";3053 costate.refresh_cache = 1;3054 if (checkout_entry(*ce, &costate, NULL) ||3055 lstat(old_name, st))3056 return -1;3057 }3058 if (!cached && verify_index_match(*ce, st))3059 return error("%s: does not match index", old_name);3060 if (cached)3061 st_mode = (*ce)->ce_mode;3062 } else if (stat_ret < 0) {3063 if (patch->is_new < 0)3064 goto is_new;3065 return error("%s: %s", old_name, strerror(errno));3066 }30673068 if (!cached && !tpatch)3069 st_mode = ce_mode_from_stat(*ce, st->st_mode);30703071 if (patch->is_new < 0)3072 patch->is_new = 0;3073 if (!patch->old_mode)3074 patch->old_mode = st_mode;3075 if ((st_mode ^ patch->old_mode) & S_IFMT)3076 return error("%s: wrong type", old_name);3077 if (st_mode != patch->old_mode)3078 warning("%s has type %o, expected %o",3079 old_name, st_mode, patch->old_mode);3080 if (!patch->new_mode && !patch->is_delete)3081 patch->new_mode = st_mode;3082 return 0;30833084 is_new:3085 patch->is_new = 1;3086 patch->is_delete = 0;3087 patch->old_name = NULL;3088 return 0;3089}30903091static int check_patch(struct patch *patch)3092{3093 struct stat st;3094 const char *old_name = patch->old_name;3095 const char *new_name = patch->new_name;3096 const char *name = old_name ? old_name : new_name;3097 struct cache_entry *ce = NULL;3098 struct patch *tpatch;3099 int ok_if_exists;3100 int status;31013102 patch->rejected = 1; /* we will drop this after we succeed */31033104 status = check_preimage(patch, &ce, &st);3105 if (status)3106 return status;3107 old_name = patch->old_name;31083109 if ((tpatch = in_fn_table(new_name)) &&3110 (was_deleted(tpatch) || to_be_deleted(tpatch)))3111 /*3112 * A type-change diff is always split into a patch to3113 * delete old, immediately followed by a patch to3114 * create new (see diff.c::run_diff()); in such a case3115 * it is Ok that the entry to be deleted by the3116 * previous patch is still in the working tree and in3117 * the index.3118 */3119 ok_if_exists = 1;3120 else3121 ok_if_exists = 0;31223123 if (new_name &&3124 ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {3125 if (check_index &&3126 cache_name_pos(new_name, strlen(new_name)) >= 0 &&3127 !ok_if_exists)3128 return error("%s: already exists in index", new_name);3129 if (!cached) {3130 int err = check_to_create_blob(new_name, ok_if_exists);3131 if (err)3132 return err;3133 }3134 if (!patch->new_mode) {3135 if (0 < patch->is_new)3136 patch->new_mode = S_IFREG | 0644;3137 else3138 patch->new_mode = patch->old_mode;3139 }3140 }31413142 if (new_name && old_name) {3143 int same = !strcmp(old_name, new_name);3144 if (!patch->new_mode)3145 patch->new_mode = patch->old_mode;3146 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)3147 return error("new mode (%o) of %s does not match old mode (%o)%s%s",3148 patch->new_mode, new_name, patch->old_mode,3149 same ? "" : " of ", same ? "" : old_name);3150 }31513152 if (apply_data(patch, &st, ce) < 0)3153 return error("%s: patch does not apply", name);3154 patch->rejected = 0;3155 return 0;3156}31573158static int check_patch_list(struct patch *patch)3159{3160 int err = 0;31613162 prepare_fn_table(patch);3163 while (patch) {3164 if (apply_verbosely)3165 say_patch_name(stderr,3166 "Checking patch ", patch, "...\n");3167 err |= check_patch(patch);3168 patch = patch->next;3169 }3170 return err;3171}31723173/* This function tries to read the sha1 from the current index */3174static int get_current_sha1(const char *path, unsigned char *sha1)3175{3176 int pos;31773178 if (read_cache() < 0)3179 return -1;3180 pos = cache_name_pos(path, strlen(path));3181 if (pos < 0)3182 return -1;3183 hashcpy(sha1, active_cache[pos]->sha1);3184 return 0;3185}31863187/* Build an index that contains the just the files needed for a 3way merge */3188static void build_fake_ancestor(struct patch *list, const char *filename)3189{3190 struct patch *patch;3191 struct index_state result = { NULL };3192 int fd;31933194 /* Once we start supporting the reverse patch, it may be3195 * worth showing the new sha1 prefix, but until then...3196 */3197 for (patch = list; patch; patch = patch->next) {3198 const unsigned char *sha1_ptr;3199 unsigned char sha1[20];3200 struct cache_entry *ce;3201 const char *name;32023203 name = patch->old_name ? patch->old_name : patch->new_name;3204 if (0 < patch->is_new)3205 continue;3206 else if (get_sha1(patch->old_sha1_prefix, sha1))3207 /* git diff has no index line for mode/type changes */3208 if (!patch->lines_added && !patch->lines_deleted) {3209 if (get_current_sha1(patch->old_name, sha1))3210 die("mode change for %s, which is not "3211 "in current HEAD", name);3212 sha1_ptr = sha1;3213 } else3214 die("sha1 information is lacking or useless "3215 "(%s).", name);3216 else3217 sha1_ptr = sha1;32183219 ce = make_cache_entry(patch->old_mode, sha1_ptr, name, 0, 0);3220 if (!ce)3221 die("make_cache_entry failed for path '%s'", name);3222 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))3223 die ("Could not add %s to temporary index", name);3224 }32253226 fd = open(filename, O_WRONLY | O_CREAT, 0666);3227 if (fd < 0 || write_index(&result, fd) || close(fd))3228 die ("Could not write temporary index to %s", filename);32293230 discard_index(&result);3231}32323233static void stat_patch_list(struct patch *patch)3234{3235 int files, adds, dels;32363237 for (files = adds = dels = 0 ; patch ; patch = patch->next) {3238 files++;3239 adds += patch->lines_added;3240 dels += patch->lines_deleted;3241 show_stats(patch);3242 }32433244 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);3245}32463247static void numstat_patch_list(struct patch *patch)3248{3249 for ( ; patch; patch = patch->next) {3250 const char *name;3251 name = patch->new_name ? patch->new_name : patch->old_name;3252 if (patch->is_binary)3253 printf("-\t-\t");3254 else3255 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);3256 write_name_quoted(name, stdout, line_termination);3257 }3258}32593260static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)3261{3262 if (mode)3263 printf(" %s mode %06o %s\n", newdelete, mode, name);3264 else3265 printf(" %s %s\n", newdelete, name);3266}32673268static void show_mode_change(struct patch *p, int show_name)3269{3270 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {3271 if (show_name)3272 printf(" mode change %06o => %06o %s\n",3273 p->old_mode, p->new_mode, p->new_name);3274 else3275 printf(" mode change %06o => %06o\n",3276 p->old_mode, p->new_mode);3277 }3278}32793280static void show_rename_copy(struct patch *p)3281{3282 const char *renamecopy = p->is_rename ? "rename" : "copy";3283 const char *old, *new;32843285 /* Find common prefix */3286 old = p->old_name;3287 new = p->new_name;3288 while (1) {3289 const char *slash_old, *slash_new;3290 slash_old = strchr(old, '/');3291 slash_new = strchr(new, '/');3292 if (!slash_old ||3293 !slash_new ||3294 slash_old - old != slash_new - new ||3295 memcmp(old, new, slash_new - new))3296 break;3297 old = slash_old + 1;3298 new = slash_new + 1;3299 }3300 /* p->old_name thru old is the common prefix, and old and new3301 * through the end of names are renames3302 */3303 if (old != p->old_name)3304 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,3305 (int)(old - p->old_name), p->old_name,3306 old, new, p->score);3307 else3308 printf(" %s %s => %s (%d%%)\n", renamecopy,3309 p->old_name, p->new_name, p->score);3310 show_mode_change(p, 0);3311}33123313static void summary_patch_list(struct patch *patch)3314{3315 struct patch *p;33163317 for (p = patch; p; p = p->next) {3318 if (p->is_new)3319 show_file_mode_name("create", p->new_mode, p->new_name);3320 else if (p->is_delete)3321 show_file_mode_name("delete", p->old_mode, p->old_name);3322 else {3323 if (p->is_rename || p->is_copy)3324 show_rename_copy(p);3325 else {3326 if (p->score) {3327 printf(" rewrite %s (%d%%)\n",3328 p->new_name, p->score);3329 show_mode_change(p, 0);3330 }3331 else3332 show_mode_change(p, 1);3333 }3334 }3335 }3336}33373338static void patch_stats(struct patch *patch)3339{3340 int lines = patch->lines_added + patch->lines_deleted;33413342 if (lines > max_change)3343 max_change = lines;3344 if (patch->old_name) {3345 int len = quote_c_style(patch->old_name, NULL, NULL, 0);3346 if (!len)3347 len = strlen(patch->old_name);3348 if (len > max_len)3349 max_len = len;3350 }3351 if (patch->new_name) {3352 int len = quote_c_style(patch->new_name, NULL, NULL, 0);3353 if (!len)3354 len = strlen(patch->new_name);3355 if (len > max_len)3356 max_len = len;3357 }3358}33593360static void remove_file(struct patch *patch, int rmdir_empty)3361{3362 if (update_index) {3363 if (remove_file_from_cache(patch->old_name) < 0)3364 die("unable to remove %s from index", patch->old_name);3365 }3366 if (!cached) {3367 if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {3368 remove_path(patch->old_name);3369 }3370 }3371}33723373static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)3374{3375 struct stat st;3376 struct cache_entry *ce;3377 int namelen = strlen(path);3378 unsigned ce_size = cache_entry_size(namelen);33793380 if (!update_index)3381 return;33823383 ce = xcalloc(1, ce_size);3384 memcpy(ce->name, path, namelen);3385 ce->ce_mode = create_ce_mode(mode);3386 ce->ce_flags = namelen;3387 if (S_ISGITLINK(mode)) {3388 const char *s = buf;33893390 if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))3391 die("corrupt patch for subproject %s", path);3392 } else {3393 if (!cached) {3394 if (lstat(path, &st) < 0)3395 die_errno("unable to stat newly created file '%s'",3396 path);3397 fill_stat_cache_info(ce, &st);3398 }3399 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)3400 die("unable to create backing store for newly created file %s", path);3401 }3402 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)3403 die("unable to add cache entry for %s", path);3404}34053406static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)3407{3408 int fd;3409 struct strbuf nbuf = STRBUF_INIT;34103411 if (S_ISGITLINK(mode)) {3412 struct stat st;3413 if (!lstat(path, &st) && S_ISDIR(st.st_mode))3414 return 0;3415 return mkdir(path, 0777);3416 }34173418 if (has_symlinks && S_ISLNK(mode))3419 /* Although buf:size is counted string, it also is NUL3420 * terminated.3421 */3422 return symlink(buf, path);34233424 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);3425 if (fd < 0)3426 return -1;34273428 if (convert_to_working_tree(path, buf, size, &nbuf)) {3429 size = nbuf.len;3430 buf = nbuf.buf;3431 }3432 write_or_die(fd, buf, size);3433 strbuf_release(&nbuf);34343435 if (close(fd) < 0)3436 die_errno("closing file '%s'", path);3437 return 0;3438}34393440/*3441 * We optimistically assume that the directories exist,3442 * which is true 99% of the time anyway. If they don't,3443 * we create them and try again.3444 */3445static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)3446{3447 if (cached)3448 return;3449 if (!try_create_file(path, mode, buf, size))3450 return;34513452 if (errno == ENOENT) {3453 if (safe_create_leading_directories(path))3454 return;3455 if (!try_create_file(path, mode, buf, size))3456 return;3457 }34583459 if (errno == EEXIST || errno == EACCES) {3460 /* We may be trying to create a file where a directory3461 * used to be.3462 */3463 struct stat st;3464 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))3465 errno = EEXIST;3466 }34673468 if (errno == EEXIST) {3469 unsigned int nr = getpid();34703471 for (;;) {3472 char newpath[PATH_MAX];3473 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);3474 if (!try_create_file(newpath, mode, buf, size)) {3475 if (!rename(newpath, path))3476 return;3477 unlink_or_warn(newpath);3478 break;3479 }3480 if (errno != EEXIST)3481 break;3482 ++nr;3483 }3484 }3485 die_errno("unable to write file '%s' mode %o", path, mode);3486}34873488static void create_file(struct patch *patch)3489{3490 char *path = patch->new_name;3491 unsigned mode = patch->new_mode;3492 unsigned long size = patch->resultsize;3493 char *buf = patch->result;34943495 if (!mode)3496 mode = S_IFREG | 0644;3497 create_one_file(path, mode, buf, size);3498 add_index_file(path, mode, buf, size);3499}35003501/* phase zero is to remove, phase one is to create */3502static void write_out_one_result(struct patch *patch, int phase)3503{3504 if (patch->is_delete > 0) {3505 if (phase == 0)3506 remove_file(patch, 1);3507 return;3508 }3509 if (patch->is_new > 0 || patch->is_copy) {3510 if (phase == 1)3511 create_file(patch);3512 return;3513 }3514 /*3515 * Rename or modification boils down to the same3516 * thing: remove the old, write the new3517 */3518 if (phase == 0)3519 remove_file(patch, patch->is_rename);3520 if (phase == 1)3521 create_file(patch);3522}35233524static int write_out_one_reject(struct patch *patch)3525{3526 FILE *rej;3527 char namebuf[PATH_MAX];3528 struct fragment *frag;3529 int cnt = 0;35303531 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {3532 if (!frag->rejected)3533 continue;3534 cnt++;3535 }35363537 if (!cnt) {3538 if (apply_verbosely)3539 say_patch_name(stderr,3540 "Applied patch ", patch, " cleanly.\n");3541 return 0;3542 }35433544 /* This should not happen, because a removal patch that leaves3545 * contents are marked "rejected" at the patch level.3546 */3547 if (!patch->new_name)3548 die("internal error");35493550 /* Say this even without --verbose */3551 say_patch_name(stderr, "Applying patch ", patch, " with");3552 fprintf(stderr, " %d rejects...\n", cnt);35533554 cnt = strlen(patch->new_name);3555 if (ARRAY_SIZE(namebuf) <= cnt + 5) {3556 cnt = ARRAY_SIZE(namebuf) - 5;3557 warning("truncating .rej filename to %.*s.rej",3558 cnt - 1, patch->new_name);3559 }3560 memcpy(namebuf, patch->new_name, cnt);3561 memcpy(namebuf + cnt, ".rej", 5);35623563 rej = fopen(namebuf, "w");3564 if (!rej)3565 return error("cannot open %s: %s", namebuf, strerror(errno));35663567 /* Normal git tools never deal with .rej, so do not pretend3568 * this is a git patch by saying --git nor give extended3569 * headers. While at it, maybe please "kompare" that wants3570 * the trailing TAB and some garbage at the end of line ;-).3571 */3572 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",3573 patch->new_name, patch->new_name);3574 for (cnt = 1, frag = patch->fragments;3575 frag;3576 cnt++, frag = frag->next) {3577 if (!frag->rejected) {3578 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);3579 continue;3580 }3581 fprintf(stderr, "Rejected hunk #%d.\n", cnt);3582 fprintf(rej, "%.*s", frag->size, frag->patch);3583 if (frag->patch[frag->size-1] != '\n')3584 fputc('\n', rej);3585 }3586 fclose(rej);3587 return -1;3588}35893590static int write_out_results(struct patch *list)3591{3592 int phase;3593 int errs = 0;3594 struct patch *l;35953596 for (phase = 0; phase < 2; phase++) {3597 l = list;3598 while (l) {3599 if (l->rejected)3600 errs = 1;3601 else {3602 write_out_one_result(l, phase);3603 if (phase == 1 && write_out_one_reject(l))3604 errs = 1;3605 }3606 l = l->next;3607 }3608 }3609 return errs;3610}36113612static struct lock_file lock_file;36133614static struct string_list limit_by_name;3615static int has_include;3616static void add_name_limit(const char *name, int exclude)3617{3618 struct string_list_item *it;36193620 it = string_list_append(&limit_by_name, name);3621 it->util = exclude ? NULL : (void *) 1;3622}36233624static int use_patch(struct patch *p)3625{3626 const char *pathname = p->new_name ? p->new_name : p->old_name;3627 int i;36283629 /* Paths outside are not touched regardless of "--include" */3630 if (0 < prefix_length) {3631 int pathlen = strlen(pathname);3632 if (pathlen <= prefix_length ||3633 memcmp(prefix, pathname, prefix_length))3634 return 0;3635 }36363637 /* See if it matches any of exclude/include rule */3638 for (i = 0; i < limit_by_name.nr; i++) {3639 struct string_list_item *it = &limit_by_name.items[i];3640 if (!fnmatch(it->string, pathname, 0))3641 return (it->util != NULL);3642 }36433644 /*3645 * If we had any include, a path that does not match any rule is3646 * not used. Otherwise, we saw bunch of exclude rules (or none)3647 * and such a path is used.3648 */3649 return !has_include;3650}365136523653static void prefix_one(char **name)3654{3655 char *old_name = *name;3656 if (!old_name)3657 return;3658 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));3659 free(old_name);3660}36613662static void prefix_patches(struct patch *p)3663{3664 if (!prefix || p->is_toplevel_relative)3665 return;3666 for ( ; p; p = p->next) {3667 if (p->new_name == p->old_name) {3668 char *prefixed = p->new_name;3669 prefix_one(&prefixed);3670 p->new_name = p->old_name = prefixed;3671 }3672 else {3673 prefix_one(&p->new_name);3674 prefix_one(&p->old_name);3675 }3676 }3677}36783679#define INACCURATE_EOF (1<<0)3680#define RECOUNT (1<<1)36813682static int apply_patch(int fd, const char *filename, int options)3683{3684 size_t offset;3685 struct strbuf buf = STRBUF_INIT;3686 struct patch *list = NULL, **listp = &list;3687 int skipped_patch = 0;36883689 /* FIXME - memory leak when using multiple patch files as inputs */3690 memset(&fn_table, 0, sizeof(struct string_list));3691 patch_input_file = filename;3692 read_patch_file(&buf, fd);3693 offset = 0;3694 while (offset < buf.len) {3695 struct patch *patch;3696 int nr;36973698 patch = xcalloc(1, sizeof(*patch));3699 patch->inaccurate_eof = !!(options & INACCURATE_EOF);3700 patch->recount = !!(options & RECOUNT);3701 nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);3702 if (nr < 0)3703 break;3704 if (apply_in_reverse)3705 reverse_patches(patch);3706 if (prefix)3707 prefix_patches(patch);3708 if (use_patch(patch)) {3709 patch_stats(patch);3710 *listp = patch;3711 listp = &patch->next;3712 }3713 else {3714 /* perhaps free it a bit better? */3715 free(patch);3716 skipped_patch++;3717 }3718 offset += nr;3719 }37203721 if (!list && !skipped_patch)3722 die("unrecognized input");37233724 if (whitespace_error && (ws_error_action == die_on_ws_error))3725 apply = 0;37263727 update_index = check_index && apply;3728 if (update_index && newfd < 0)3729 newfd = hold_locked_index(&lock_file, 1);37303731 if (check_index) {3732 if (read_cache() < 0)3733 die("unable to read index file");3734 }37353736 if ((check || apply) &&3737 check_patch_list(list) < 0 &&3738 !apply_with_reject)3739 exit(1);37403741 if (apply && write_out_results(list))3742 exit(1);37433744 if (fake_ancestor)3745 build_fake_ancestor(list, fake_ancestor);37463747 if (diffstat)3748 stat_patch_list(list);37493750 if (numstat)3751 numstat_patch_list(list);37523753 if (summary)3754 summary_patch_list(list);37553756 strbuf_release(&buf);3757 return 0;3758}37593760static int git_apply_config(const char *var, const char *value, void *cb)3761{3762 if (!strcmp(var, "apply.whitespace"))3763 return git_config_string(&apply_default_whitespace, var, value);3764 else if (!strcmp(var, "apply.ignorewhitespace"))3765 return git_config_string(&apply_default_ignorewhitespace, var, value);3766 return git_default_config(var, value, cb);3767}37683769static int option_parse_exclude(const struct option *opt,3770 const char *arg, int unset)3771{3772 add_name_limit(arg, 1);3773 return 0;3774}37753776static int option_parse_include(const struct option *opt,3777 const char *arg, int unset)3778{3779 add_name_limit(arg, 0);3780 has_include = 1;3781 return 0;3782}37833784static int option_parse_p(const struct option *opt,3785 const char *arg, int unset)3786{3787 p_value = atoi(arg);3788 p_value_known = 1;3789 return 0;3790}37913792static int option_parse_z(const struct option *opt,3793 const char *arg, int unset)3794{3795 if (unset)3796 line_termination = '\n';3797 else3798 line_termination = 0;3799 return 0;3800}38013802static int option_parse_space_change(const struct option *opt,3803 const char *arg, int unset)3804{3805 if (unset)3806 ws_ignore_action = ignore_ws_none;3807 else3808 ws_ignore_action = ignore_ws_change;3809 return 0;3810}38113812static int option_parse_whitespace(const struct option *opt,3813 const char *arg, int unset)3814{3815 const char **whitespace_option = opt->value;38163817 *whitespace_option = arg;3818 parse_whitespace_option(arg);3819 return 0;3820}38213822static int option_parse_directory(const struct option *opt,3823 const char *arg, int unset)3824{3825 root_len = strlen(arg);3826 if (root_len && arg[root_len - 1] != '/') {3827 char *new_root;3828 root = new_root = xmalloc(root_len + 2);3829 strcpy(new_root, arg);3830 strcpy(new_root + root_len++, "/");3831 } else3832 root = arg;3833 return 0;3834}38353836int cmd_apply(int argc, const char **argv, const char *prefix_)3837{3838 int i;3839 int errs = 0;3840 int is_not_gitdir = !startup_info->have_repository;3841 int force_apply = 0;38423843 const char *whitespace_option = NULL;38443845 struct option builtin_apply_options[] = {3846 { OPTION_CALLBACK, 0, "exclude", NULL, "path",3847 "don't apply changes matching the given path",3848 0, option_parse_exclude },3849 { OPTION_CALLBACK, 0, "include", NULL, "path",3850 "apply changes matching the given path",3851 0, option_parse_include },3852 { OPTION_CALLBACK, 'p', NULL, NULL, "num",3853 "remove <num> leading slashes from traditional diff paths",3854 0, option_parse_p },3855 OPT_BOOLEAN(0, "no-add", &no_add,3856 "ignore additions made by the patch"),3857 OPT_BOOLEAN(0, "stat", &diffstat,3858 "instead of applying the patch, output diffstat for the input"),3859 OPT_NOOP_NOARG(0, "allow-binary-replacement"),3860 OPT_NOOP_NOARG(0, "binary"),3861 OPT_BOOLEAN(0, "numstat", &numstat,3862 "shows number of added and deleted lines in decimal notation"),3863 OPT_BOOLEAN(0, "summary", &summary,3864 "instead of applying the patch, output a summary for the input"),3865 OPT_BOOLEAN(0, "check", &check,3866 "instead of applying the patch, see if the patch is applicable"),3867 OPT_BOOLEAN(0, "index", &check_index,3868 "make sure the patch is applicable to the current index"),3869 OPT_BOOLEAN(0, "cached", &cached,3870 "apply a patch without touching the working tree"),3871 OPT_BOOLEAN(0, "apply", &force_apply,3872 "also apply the patch (use with --stat/--summary/--check)"),3873 OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor,3874 "build a temporary index based on embedded index information"),3875 { OPTION_CALLBACK, 'z', NULL, NULL, NULL,3876 "paths are separated with NUL character",3877 PARSE_OPT_NOARG, option_parse_z },3878 OPT_INTEGER('C', NULL, &p_context,3879 "ensure at least <n> lines of context match"),3880 { OPTION_CALLBACK, 0, "whitespace", &whitespace_option, "action",3881 "detect new or modified lines that have whitespace errors",3882 0, option_parse_whitespace },3883 { OPTION_CALLBACK, 0, "ignore-space-change", NULL, NULL,3884 "ignore changes in whitespace when finding context",3885 PARSE_OPT_NOARG, option_parse_space_change },3886 { OPTION_CALLBACK, 0, "ignore-whitespace", NULL, NULL,3887 "ignore changes in whitespace when finding context",3888 PARSE_OPT_NOARG, option_parse_space_change },3889 OPT_BOOLEAN('R', "reverse", &apply_in_reverse,3890 "apply the patch in reverse"),3891 OPT_BOOLEAN(0, "unidiff-zero", &unidiff_zero,3892 "don't expect at least one line of context"),3893 OPT_BOOLEAN(0, "reject", &apply_with_reject,3894 "leave the rejected hunks in corresponding *.rej files"),3895 OPT_BOOLEAN(0, "allow-overlap", &allow_overlap,3896 "allow overlapping hunks"),3897 OPT__VERBOSE(&apply_verbosely, "be verbose"),3898 OPT_BIT(0, "inaccurate-eof", &options,3899 "tolerate incorrectly detected missing new-line at the end of file",3900 INACCURATE_EOF),3901 OPT_BIT(0, "recount", &options,3902 "do not trust the line counts in the hunk headers",3903 RECOUNT),3904 { OPTION_CALLBACK, 0, "directory", NULL, "root",3905 "prepend <root> to all filenames",3906 0, option_parse_directory },3907 OPT_END()3908 };39093910 prefix = prefix_;3911 prefix_length = prefix ? strlen(prefix) : 0;3912 git_config(git_apply_config, NULL);3913 if (apply_default_whitespace)3914 parse_whitespace_option(apply_default_whitespace);3915 if (apply_default_ignorewhitespace)3916 parse_ignorewhitespace_option(apply_default_ignorewhitespace);39173918 argc = parse_options(argc, argv, prefix, builtin_apply_options,3919 apply_usage, 0);39203921 if (apply_with_reject)3922 apply = apply_verbosely = 1;3923 if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor))3924 apply = 0;3925 if (check_index && is_not_gitdir)3926 die("--index outside a repository");3927 if (cached) {3928 if (is_not_gitdir)3929 die("--cached outside a repository");3930 check_index = 1;3931 }3932 for (i = 0; i < argc; i++) {3933 const char *arg = argv[i];3934 int fd;39353936 if (!strcmp(arg, "-")) {3937 errs |= apply_patch(0, "<stdin>", options);3938 read_stdin = 0;3939 continue;3940 } else if (0 < prefix_length)3941 arg = prefix_filename(prefix, prefix_length, arg);39423943 fd = open(arg, O_RDONLY);3944 if (fd < 0)3945 die_errno("can't open patch '%s'", arg);3946 read_stdin = 0;3947 set_default_whitespace_mode(whitespace_option);3948 errs |= apply_patch(fd, arg, options);3949 close(fd);3950 }3951 set_default_whitespace_mode(whitespace_option);3952 if (read_stdin)3953 errs |= apply_patch(0, "<stdin>", options);3954 if (whitespace_error) {3955 if (squelch_whitespace_errors &&3956 squelch_whitespace_errors < whitespace_error) {3957 int squelched =3958 whitespace_error - squelch_whitespace_errors;3959 warning("squelched %d "3960 "whitespace error%s",3961 squelched,3962 squelched == 1 ? "" : "s");3963 }3964 if (ws_error_action == die_on_ws_error)3965 die("%d line%s add%s whitespace errors.",3966 whitespace_error,3967 whitespace_error == 1 ? "" : "s",3968 whitespace_error == 1 ? "s" : "");3969 if (applied_after_fixing_ws && apply)3970 warning("%d line%s applied after"3971 " fixing whitespace errors.",3972 applied_after_fixing_ws,3973 applied_after_fixing_ws == 1 ? "" : "s");3974 else if (whitespace_error)3975 warning("%d line%s add%s whitespace errors.",3976 whitespace_error,3977 whitespace_error == 1 ? "" : "s",3978 whitespace_error == 1 ? "s" : "");3979 }39803981 if (update_index) {3982 if (write_cache(newfd, active_cache, active_nr) ||3983 commit_locked_index(&lock_file))3984 die("Unable to write new index file");3985 }39863987 return !!errs;3988}