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"lockfile.h" 11#include"cache-tree.h" 12#include"quote.h" 13#include"blob.h" 14#include"delta.h" 15#include"builtin.h" 16#include"string-list.h" 17#include"dir.h" 18#include"diff.h" 19#include"parse-options.h" 20#include"xdiff-interface.h" 21#include"ll-merge.h" 22#include"rerere.h" 23 24/* 25 * --check turns on checking that the working tree matches the 26 * files that are being modified, but doesn't apply the patch 27 * --stat does just a diffstat, and doesn't actually apply 28 * --numstat does numeric diffstat, and doesn't actually apply 29 * --index-info shows the old and new index info for paths if available. 30 * --index updates the cache as well. 31 * --cached updates only the cache without ever touching the working tree. 32 */ 33static const char*prefix; 34static int prefix_length = -1; 35static int newfd = -1; 36 37static int unidiff_zero; 38static int p_value =1; 39static int p_value_known; 40static int check_index; 41static int update_index; 42static int cached; 43static int diffstat; 44static int numstat; 45static int summary; 46static int check; 47static int apply =1; 48static int apply_in_reverse; 49static int apply_with_reject; 50static int apply_verbosely; 51static int allow_overlap; 52static int no_add; 53static int threeway; 54static const char*fake_ancestor; 55static int line_termination ='\n'; 56static unsigned int p_context = UINT_MAX; 57static const char*const apply_usage[] = { 58N_("git apply [options] [<patch>...]"), 59 NULL 60}; 61 62static enum ws_error_action { 63 nowarn_ws_error, 64 warn_on_ws_error, 65 die_on_ws_error, 66 correct_ws_error 67} ws_error_action = warn_on_ws_error; 68static int whitespace_error; 69static int squelch_whitespace_errors =5; 70static int applied_after_fixing_ws; 71 72static enum ws_ignore { 73 ignore_ws_none, 74 ignore_ws_change 75} ws_ignore_action = ignore_ws_none; 76 77 78static const char*patch_input_file; 79static const char*root; 80static int root_len; 81static int read_stdin =1; 82static int options; 83 84static voidparse_whitespace_option(const char*option) 85{ 86if(!option) { 87 ws_error_action = warn_on_ws_error; 88return; 89} 90if(!strcmp(option,"warn")) { 91 ws_error_action = warn_on_ws_error; 92return; 93} 94if(!strcmp(option,"nowarn")) { 95 ws_error_action = nowarn_ws_error; 96return; 97} 98if(!strcmp(option,"error")) { 99 ws_error_action = die_on_ws_error; 100return; 101} 102if(!strcmp(option,"error-all")) { 103 ws_error_action = die_on_ws_error; 104 squelch_whitespace_errors =0; 105return; 106} 107if(!strcmp(option,"strip") || !strcmp(option,"fix")) { 108 ws_error_action = correct_ws_error; 109return; 110} 111die(_("unrecognized whitespace option '%s'"), option); 112} 113 114static voidparse_ignorewhitespace_option(const char*option) 115{ 116if(!option || !strcmp(option,"no") || 117!strcmp(option,"false") || !strcmp(option,"never") || 118!strcmp(option,"none")) { 119 ws_ignore_action = ignore_ws_none; 120return; 121} 122if(!strcmp(option,"change")) { 123 ws_ignore_action = ignore_ws_change; 124return; 125} 126die(_("unrecognized whitespace ignore option '%s'"), option); 127} 128 129static voidset_default_whitespace_mode(const char*whitespace_option) 130{ 131if(!whitespace_option && !apply_default_whitespace) 132 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); 133} 134 135/* 136 * For "diff-stat" like behaviour, we keep track of the biggest change 137 * we've seen, and the longest filename. That allows us to do simple 138 * scaling. 139 */ 140static int max_change, max_len; 141 142/* 143 * Various "current state", notably line numbers and what 144 * file (and how) we're patching right now.. The "is_xxxx" 145 * things are flags, where -1 means "don't know yet". 146 */ 147static int linenr =1; 148 149/* 150 * This represents one "hunk" from a patch, starting with 151 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 152 * patch text is pointed at by patch, and its byte length 153 * is stored in size. leading and trailing are the number 154 * of context lines. 155 */ 156struct fragment { 157unsigned long leading, trailing; 158unsigned long oldpos, oldlines; 159unsigned long newpos, newlines; 160/* 161 * 'patch' is usually borrowed from buf in apply_patch(), 162 * but some codepaths store an allocated buffer. 163 */ 164const char*patch; 165unsigned free_patch:1, 166 rejected:1; 167int size; 168int linenr; 169struct fragment *next; 170}; 171 172/* 173 * When dealing with a binary patch, we reuse "leading" field 174 * to store the type of the binary hunk, either deflated "delta" 175 * or deflated "literal". 176 */ 177#define binary_patch_method leading 178#define BINARY_DELTA_DEFLATED 1 179#define BINARY_LITERAL_DEFLATED 2 180 181/* 182 * This represents a "patch" to a file, both metainfo changes 183 * such as creation/deletion, filemode and content changes represented 184 * as a series of fragments. 185 */ 186struct patch { 187char*new_name, *old_name, *def_name; 188unsigned int old_mode, new_mode; 189int is_new, is_delete;/* -1 = unknown, 0 = false, 1 = true */ 190int rejected; 191unsigned ws_rule; 192int lines_added, lines_deleted; 193int score; 194unsigned int is_toplevel_relative:1; 195unsigned int inaccurate_eof:1; 196unsigned int is_binary:1; 197unsigned int is_copy:1; 198unsigned int is_rename:1; 199unsigned int recount:1; 200unsigned int conflicted_threeway:1; 201unsigned int direct_to_threeway:1; 202struct fragment *fragments; 203char*result; 204size_t resultsize; 205char old_sha1_prefix[41]; 206char new_sha1_prefix[41]; 207struct patch *next; 208 209/* three-way fallback result */ 210unsigned char threeway_stage[3][20]; 211}; 212 213static voidfree_fragment_list(struct fragment *list) 214{ 215while(list) { 216struct fragment *next = list->next; 217if(list->free_patch) 218free((char*)list->patch); 219free(list); 220 list = next; 221} 222} 223 224static voidfree_patch(struct patch *patch) 225{ 226free_fragment_list(patch->fragments); 227free(patch->def_name); 228free(patch->old_name); 229free(patch->new_name); 230free(patch->result); 231free(patch); 232} 233 234static voidfree_patch_list(struct patch *list) 235{ 236while(list) { 237struct patch *next = list->next; 238free_patch(list); 239 list = next; 240} 241} 242 243/* 244 * A line in a file, len-bytes long (includes the terminating LF, 245 * except for an incomplete line at the end if the file ends with 246 * one), and its contents hashes to 'hash'. 247 */ 248struct line { 249size_t len; 250unsigned hash :24; 251unsigned flag :8; 252#define LINE_COMMON 1 253#define LINE_PATCHED 2 254}; 255 256/* 257 * This represents a "file", which is an array of "lines". 258 */ 259struct image { 260char*buf; 261size_t len; 262size_t nr; 263size_t alloc; 264struct line *line_allocated; 265struct line *line; 266}; 267 268/* 269 * Records filenames that have been touched, in order to handle 270 * the case where more than one patches touch the same file. 271 */ 272 273static struct string_list fn_table; 274 275static uint32_thash_line(const char*cp,size_t len) 276{ 277size_t i; 278uint32_t h; 279for(i =0, h =0; i < len; i++) { 280if(!isspace(cp[i])) { 281 h = h *3+ (cp[i] &0xff); 282} 283} 284return h; 285} 286 287/* 288 * Compare lines s1 of length n1 and s2 of length n2, ignoring 289 * whitespace difference. Returns 1 if they match, 0 otherwise 290 */ 291static intfuzzy_matchlines(const char*s1,size_t n1, 292const char*s2,size_t n2) 293{ 294const char*last1 = s1 + n1 -1; 295const char*last2 = s2 + n2 -1; 296int result =0; 297 298/* ignore line endings */ 299while((*last1 =='\r') || (*last1 =='\n')) 300 last1--; 301while((*last2 =='\r') || (*last2 =='\n')) 302 last2--; 303 304/* skip leading whitespaces, if both begin with whitespace */ 305if(s1 <= last1 && s2 <= last2 &&isspace(*s1) &&isspace(*s2)) { 306while(isspace(*s1) && (s1 <= last1)) 307 s1++; 308while(isspace(*s2) && (s2 <= last2)) 309 s2++; 310} 311/* early return if both lines are empty */ 312if((s1 > last1) && (s2 > last2)) 313return1; 314while(!result) { 315 result = *s1++ - *s2++; 316/* 317 * Skip whitespace inside. We check for whitespace on 318 * both buffers because we don't want "a b" to match 319 * "ab" 320 */ 321if(isspace(*s1) &&isspace(*s2)) { 322while(isspace(*s1) && s1 <= last1) 323 s1++; 324while(isspace(*s2) && s2 <= last2) 325 s2++; 326} 327/* 328 * If we reached the end on one side only, 329 * lines don't match 330 */ 331if( 332((s2 > last2) && (s1 <= last1)) || 333((s1 > last1) && (s2 <= last2))) 334return0; 335if((s1 > last1) && (s2 > last2)) 336break; 337} 338 339return!result; 340} 341 342static voidadd_line_info(struct image *img,const char*bol,size_t len,unsigned flag) 343{ 344ALLOC_GROW(img->line_allocated, img->nr +1, img->alloc); 345 img->line_allocated[img->nr].len = len; 346 img->line_allocated[img->nr].hash =hash_line(bol, len); 347 img->line_allocated[img->nr].flag = flag; 348 img->nr++; 349} 350 351/* 352 * "buf" has the file contents to be patched (read from various sources). 353 * attach it to "image" and add line-based index to it. 354 * "image" now owns the "buf". 355 */ 356static voidprepare_image(struct image *image,char*buf,size_t len, 357int prepare_linetable) 358{ 359const char*cp, *ep; 360 361memset(image,0,sizeof(*image)); 362 image->buf = buf; 363 image->len = len; 364 365if(!prepare_linetable) 366return; 367 368 ep = image->buf + image->len; 369 cp = image->buf; 370while(cp < ep) { 371const char*next; 372for(next = cp; next < ep && *next !='\n'; next++) 373; 374if(next < ep) 375 next++; 376add_line_info(image, cp, next - cp,0); 377 cp = next; 378} 379 image->line = image->line_allocated; 380} 381 382static voidclear_image(struct image *image) 383{ 384free(image->buf); 385free(image->line_allocated); 386memset(image,0,sizeof(*image)); 387} 388 389/* fmt must contain _one_ %s and no other substitution */ 390static voidsay_patch_name(FILE*output,const char*fmt,struct patch *patch) 391{ 392struct strbuf sb = STRBUF_INIT; 393 394if(patch->old_name && patch->new_name && 395strcmp(patch->old_name, patch->new_name)) { 396quote_c_style(patch->old_name, &sb, NULL,0); 397strbuf_addstr(&sb," => "); 398quote_c_style(patch->new_name, &sb, NULL,0); 399}else{ 400const char*n = patch->new_name; 401if(!n) 402 n = patch->old_name; 403quote_c_style(n, &sb, NULL,0); 404} 405fprintf(output, fmt, sb.buf); 406fputc('\n', output); 407strbuf_release(&sb); 408} 409 410#define SLOP (16) 411 412static voidread_patch_file(struct strbuf *sb,int fd) 413{ 414if(strbuf_read(sb, fd,0) <0) 415die_errno("git apply: failed to read"); 416 417/* 418 * Make sure that we have some slop in the buffer 419 * so that we can do speculative "memcmp" etc, and 420 * see to it that it is NUL-filled. 421 */ 422strbuf_grow(sb, SLOP); 423memset(sb->buf + sb->len,0, SLOP); 424} 425 426static unsigned longlinelen(const char*buffer,unsigned long size) 427{ 428unsigned long len =0; 429while(size--) { 430 len++; 431if(*buffer++ =='\n') 432break; 433} 434return len; 435} 436 437static intis_dev_null(const char*str) 438{ 439returnskip_prefix(str,"/dev/null", &str) &&isspace(*str); 440} 441 442#define TERM_SPACE 1 443#define TERM_TAB 2 444 445static intname_terminate(const char*name,int namelen,int c,int terminate) 446{ 447if(c ==' '&& !(terminate & TERM_SPACE)) 448return0; 449if(c =='\t'&& !(terminate & TERM_TAB)) 450return0; 451 452return1; 453} 454 455/* remove double slashes to make --index work with such filenames */ 456static char*squash_slash(char*name) 457{ 458int i =0, j =0; 459 460if(!name) 461return NULL; 462 463while(name[i]) { 464if((name[j++] = name[i++]) =='/') 465while(name[i] =='/') 466 i++; 467} 468 name[j] ='\0'; 469return name; 470} 471 472static char*find_name_gnu(const char*line,const char*def,int p_value) 473{ 474struct strbuf name = STRBUF_INIT; 475char*cp; 476 477/* 478 * Proposed "new-style" GNU patch/diff format; see 479 * http://marc.info/?l=git&m=112927316408690&w=2 480 */ 481if(unquote_c_style(&name, line, NULL)) { 482strbuf_release(&name); 483return NULL; 484} 485 486for(cp = name.buf; p_value; p_value--) { 487 cp =strchr(cp,'/'); 488if(!cp) { 489strbuf_release(&name); 490return NULL; 491} 492 cp++; 493} 494 495strbuf_remove(&name,0, cp - name.buf); 496if(root) 497strbuf_insert(&name,0, root, root_len); 498returnsquash_slash(strbuf_detach(&name, NULL)); 499} 500 501static size_tsane_tz_len(const char*line,size_t len) 502{ 503const char*tz, *p; 504 505if(len <strlen(" +0500") || line[len-strlen(" +0500")] !=' ') 506return0; 507 tz = line + len -strlen(" +0500"); 508 509if(tz[1] !='+'&& tz[1] !='-') 510return0; 511 512for(p = tz +2; p != line + len; p++) 513if(!isdigit(*p)) 514return0; 515 516return line + len - tz; 517} 518 519static size_ttz_with_colon_len(const char*line,size_t len) 520{ 521const char*tz, *p; 522 523if(len <strlen(" +08:00") || line[len -strlen(":00")] !=':') 524return0; 525 tz = line + len -strlen(" +08:00"); 526 527if(tz[0] !=' '|| (tz[1] !='+'&& tz[1] !='-')) 528return0; 529 p = tz +2; 530if(!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 531!isdigit(*p++) || !isdigit(*p++)) 532return0; 533 534return line + len - tz; 535} 536 537static size_tdate_len(const char*line,size_t len) 538{ 539const char*date, *p; 540 541if(len <strlen("72-02-05") || line[len-strlen("-05")] !='-') 542return0; 543 p = date = line + len -strlen("72-02-05"); 544 545if(!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 546!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 547!isdigit(*p++) || !isdigit(*p++))/* Not a date. */ 548return0; 549 550if(date - line >=strlen("19") && 551isdigit(date[-1]) &&isdigit(date[-2]))/* 4-digit year */ 552 date -=strlen("19"); 553 554return line + len - date; 555} 556 557static size_tshort_time_len(const char*line,size_t len) 558{ 559const char*time, *p; 560 561if(len <strlen(" 07:01:32") || line[len-strlen(":32")] !=':') 562return0; 563 p = time = line + len -strlen(" 07:01:32"); 564 565/* Permit 1-digit hours? */ 566if(*p++ !=' '|| 567!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 568!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 569!isdigit(*p++) || !isdigit(*p++))/* Not a time. */ 570return0; 571 572return line + len - time; 573} 574 575static size_tfractional_time_len(const char*line,size_t len) 576{ 577const char*p; 578size_t n; 579 580/* Expected format: 19:41:17.620000023 */ 581if(!len || !isdigit(line[len -1])) 582return0; 583 p = line + len -1; 584 585/* Fractional seconds. */ 586while(p > line &&isdigit(*p)) 587 p--; 588if(*p !='.') 589return0; 590 591/* Hours, minutes, and whole seconds. */ 592 n =short_time_len(line, p - line); 593if(!n) 594return0; 595 596return line + len - p + n; 597} 598 599static size_ttrailing_spaces_len(const char*line,size_t len) 600{ 601const char*p; 602 603/* Expected format: ' ' x (1 or more) */ 604if(!len || line[len -1] !=' ') 605return0; 606 607 p = line + len; 608while(p != line) { 609 p--; 610if(*p !=' ') 611return line + len - (p +1); 612} 613 614/* All spaces! */ 615return len; 616} 617 618static size_tdiff_timestamp_len(const char*line,size_t len) 619{ 620const char*end = line + len; 621size_t n; 622 623/* 624 * Posix: 2010-07-05 19:41:17 625 * GNU: 2010-07-05 19:41:17.620000023 -0500 626 */ 627 628if(!isdigit(end[-1])) 629return0; 630 631 n =sane_tz_len(line, end - line); 632if(!n) 633 n =tz_with_colon_len(line, end - line); 634 end -= n; 635 636 n =short_time_len(line, end - line); 637if(!n) 638 n =fractional_time_len(line, end - line); 639 end -= n; 640 641 n =date_len(line, end - line); 642if(!n)/* No date. Too bad. */ 643return0; 644 end -= n; 645 646if(end == line)/* No space before date. */ 647return0; 648if(end[-1] =='\t') {/* Success! */ 649 end--; 650return line + len - end; 651} 652if(end[-1] !=' ')/* No space before date. */ 653return0; 654 655/* Whitespace damage. */ 656 end -=trailing_spaces_len(line, end - line); 657return line + len - end; 658} 659 660static char*null_strdup(const char*s) 661{ 662return s ?xstrdup(s) : NULL; 663} 664 665static char*find_name_common(const char*line,const char*def, 666int p_value,const char*end,int terminate) 667{ 668int len; 669const char*start = NULL; 670 671if(p_value ==0) 672 start = line; 673while(line != end) { 674char c = *line; 675 676if(!end &&isspace(c)) { 677if(c =='\n') 678break; 679if(name_terminate(start, line-start, c, terminate)) 680break; 681} 682 line++; 683if(c =='/'&& !--p_value) 684 start = line; 685} 686if(!start) 687returnsquash_slash(null_strdup(def)); 688 len = line - start; 689if(!len) 690returnsquash_slash(null_strdup(def)); 691 692/* 693 * Generally we prefer the shorter name, especially 694 * if the other one is just a variation of that with 695 * something else tacked on to the end (ie "file.orig" 696 * or "file~"). 697 */ 698if(def) { 699int deflen =strlen(def); 700if(deflen < len && !strncmp(start, def, deflen)) 701returnsquash_slash(xstrdup(def)); 702} 703 704if(root) { 705char*ret =xmalloc(root_len + len +1); 706strcpy(ret, root); 707memcpy(ret + root_len, start, len); 708 ret[root_len + len] ='\0'; 709returnsquash_slash(ret); 710} 711 712returnsquash_slash(xmemdupz(start, len)); 713} 714 715static char*find_name(const char*line,char*def,int p_value,int terminate) 716{ 717if(*line =='"') { 718char*name =find_name_gnu(line, def, p_value); 719if(name) 720return name; 721} 722 723returnfind_name_common(line, def, p_value, NULL, terminate); 724} 725 726static char*find_name_traditional(const char*line,char*def,int p_value) 727{ 728size_t len; 729size_t date_len; 730 731if(*line =='"') { 732char*name =find_name_gnu(line, def, p_value); 733if(name) 734return name; 735} 736 737 len =strchrnul(line,'\n') - line; 738 date_len =diff_timestamp_len(line, len); 739if(!date_len) 740returnfind_name_common(line, def, p_value, NULL, TERM_TAB); 741 len -= date_len; 742 743returnfind_name_common(line, def, p_value, line + len,0); 744} 745 746static intcount_slashes(const char*cp) 747{ 748int cnt =0; 749char ch; 750 751while((ch = *cp++)) 752if(ch =='/') 753 cnt++; 754return cnt; 755} 756 757/* 758 * Given the string after "--- " or "+++ ", guess the appropriate 759 * p_value for the given patch. 760 */ 761static intguess_p_value(const char*nameline) 762{ 763char*name, *cp; 764int val = -1; 765 766if(is_dev_null(nameline)) 767return-1; 768 name =find_name_traditional(nameline, NULL,0); 769if(!name) 770return-1; 771 cp =strchr(name,'/'); 772if(!cp) 773 val =0; 774else if(prefix) { 775/* 776 * Does it begin with "a/$our-prefix" and such? Then this is 777 * very likely to apply to our directory. 778 */ 779if(!strncmp(name, prefix, prefix_length)) 780 val =count_slashes(prefix); 781else{ 782 cp++; 783if(!strncmp(cp, prefix, prefix_length)) 784 val =count_slashes(prefix) +1; 785} 786} 787free(name); 788return val; 789} 790 791/* 792 * Does the ---/+++ line has the POSIX timestamp after the last HT? 793 * GNU diff puts epoch there to signal a creation/deletion event. Is 794 * this such a timestamp? 795 */ 796static inthas_epoch_timestamp(const char*nameline) 797{ 798/* 799 * We are only interested in epoch timestamp; any non-zero 800 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 801 * For the same reason, the date must be either 1969-12-31 or 802 * 1970-01-01, and the seconds part must be "00". 803 */ 804const char stamp_regexp[] = 805"^(1969-12-31|1970-01-01)" 806" " 807"[0-2][0-9]:[0-5][0-9]:00(\\.0+)?" 808" " 809"([-+][0-2][0-9]:?[0-5][0-9])\n"; 810const char*timestamp = NULL, *cp, *colon; 811static regex_t *stamp; 812 regmatch_t m[10]; 813int zoneoffset; 814int hourminute; 815int status; 816 817for(cp = nameline; *cp !='\n'; cp++) { 818if(*cp =='\t') 819 timestamp = cp +1; 820} 821if(!timestamp) 822return0; 823if(!stamp) { 824 stamp =xmalloc(sizeof(*stamp)); 825if(regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 826warning(_("Cannot prepare timestamp regexp%s"), 827 stamp_regexp); 828return0; 829} 830} 831 832 status =regexec(stamp, timestamp,ARRAY_SIZE(m), m,0); 833if(status) { 834if(status != REG_NOMATCH) 835warning(_("regexec returned%dfor input:%s"), 836 status, timestamp); 837return0; 838} 839 840 zoneoffset =strtol(timestamp + m[3].rm_so +1, (char**) &colon,10); 841if(*colon ==':') 842 zoneoffset = zoneoffset *60+strtol(colon +1, NULL,10); 843else 844 zoneoffset = (zoneoffset /100) *60+ (zoneoffset %100); 845if(timestamp[m[3].rm_so] =='-') 846 zoneoffset = -zoneoffset; 847 848/* 849 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 850 * (west of GMT) or 1970-01-01 (east of GMT) 851 */ 852if((zoneoffset <0&&memcmp(timestamp,"1969-12-31",10)) || 853(0<= zoneoffset &&memcmp(timestamp,"1970-01-01",10))) 854return0; 855 856 hourminute = (strtol(timestamp +11, NULL,10) *60+ 857strtol(timestamp +14, NULL,10) - 858 zoneoffset); 859 860return((zoneoffset <0&& hourminute ==1440) || 861(0<= zoneoffset && !hourminute)); 862} 863 864/* 865 * Get the name etc info from the ---/+++ lines of a traditional patch header 866 * 867 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 868 * files, we can happily check the index for a match, but for creating a 869 * new file we should try to match whatever "patch" does. I have no idea. 870 */ 871static voidparse_traditional_patch(const char*first,const char*second,struct patch *patch) 872{ 873char*name; 874 875 first +=4;/* skip "--- " */ 876 second +=4;/* skip "+++ " */ 877if(!p_value_known) { 878int p, q; 879 p =guess_p_value(first); 880 q =guess_p_value(second); 881if(p <0) p = q; 882if(0<= p && p == q) { 883 p_value = p; 884 p_value_known =1; 885} 886} 887if(is_dev_null(first)) { 888 patch->is_new =1; 889 patch->is_delete =0; 890 name =find_name_traditional(second, NULL, p_value); 891 patch->new_name = name; 892}else if(is_dev_null(second)) { 893 patch->is_new =0; 894 patch->is_delete =1; 895 name =find_name_traditional(first, NULL, p_value); 896 patch->old_name = name; 897}else{ 898char*first_name; 899 first_name =find_name_traditional(first, NULL, p_value); 900 name =find_name_traditional(second, first_name, p_value); 901free(first_name); 902if(has_epoch_timestamp(first)) { 903 patch->is_new =1; 904 patch->is_delete =0; 905 patch->new_name = name; 906}else if(has_epoch_timestamp(second)) { 907 patch->is_new =0; 908 patch->is_delete =1; 909 patch->old_name = name; 910}else{ 911 patch->old_name = name; 912 patch->new_name =null_strdup(name); 913} 914} 915if(!name) 916die(_("unable to find filename in patch at line%d"), linenr); 917} 918 919static intgitdiff_hdrend(const char*line,struct patch *patch) 920{ 921return-1; 922} 923 924/* 925 * We're anal about diff header consistency, to make 926 * sure that we don't end up having strange ambiguous 927 * patches floating around. 928 * 929 * As a result, gitdiff_{old|new}name() will check 930 * their names against any previous information, just 931 * to make sure.. 932 */ 933#define DIFF_OLD_NAME 0 934#define DIFF_NEW_NAME 1 935 936static char*gitdiff_verify_name(const char*line,int isnull,char*orig_name,int side) 937{ 938if(!orig_name && !isnull) 939returnfind_name(line, NULL, p_value, TERM_TAB); 940 941if(orig_name) { 942int len; 943const char*name; 944char*another; 945 name = orig_name; 946 len =strlen(name); 947if(isnull) 948die(_("git apply: bad git-diff - expected /dev/null, got%son line%d"), name, linenr); 949 another =find_name(line, NULL, p_value, TERM_TAB); 950if(!another ||memcmp(another, name, len +1)) 951die((side == DIFF_NEW_NAME) ? 952_("git apply: bad git-diff - inconsistent new filename on line%d") : 953_("git apply: bad git-diff - inconsistent old filename on line%d"), linenr); 954free(another); 955return orig_name; 956} 957else{ 958/* expect "/dev/null" */ 959if(memcmp("/dev/null", line,9) || line[9] !='\n') 960die(_("git apply: bad git-diff - expected /dev/null on line%d"), linenr); 961return NULL; 962} 963} 964 965static intgitdiff_oldname(const char*line,struct patch *patch) 966{ 967char*orig = patch->old_name; 968 patch->old_name =gitdiff_verify_name(line, patch->is_new, patch->old_name, 969 DIFF_OLD_NAME); 970if(orig != patch->old_name) 971free(orig); 972return0; 973} 974 975static intgitdiff_newname(const char*line,struct patch *patch) 976{ 977char*orig = patch->new_name; 978 patch->new_name =gitdiff_verify_name(line, patch->is_delete, patch->new_name, 979 DIFF_NEW_NAME); 980if(orig != patch->new_name) 981free(orig); 982return0; 983} 984 985static intgitdiff_oldmode(const char*line,struct patch *patch) 986{ 987 patch->old_mode =strtoul(line, NULL,8); 988return0; 989} 990 991static intgitdiff_newmode(const char*line,struct patch *patch) 992{ 993 patch->new_mode =strtoul(line, NULL,8); 994return0; 995} 996 997static intgitdiff_delete(const char*line,struct patch *patch) 998{ 999 patch->is_delete =1;1000free(patch->old_name);1001 patch->old_name =null_strdup(patch->def_name);1002returngitdiff_oldmode(line, patch);1003}10041005static intgitdiff_newfile(const char*line,struct patch *patch)1006{1007 patch->is_new =1;1008free(patch->new_name);1009 patch->new_name =null_strdup(patch->def_name);1010returngitdiff_newmode(line, patch);1011}10121013static intgitdiff_copysrc(const char*line,struct patch *patch)1014{1015 patch->is_copy =1;1016free(patch->old_name);1017 patch->old_name =find_name(line, NULL, p_value ? p_value -1:0,0);1018return0;1019}10201021static intgitdiff_copydst(const char*line,struct patch *patch)1022{1023 patch->is_copy =1;1024free(patch->new_name);1025 patch->new_name =find_name(line, NULL, p_value ? p_value -1:0,0);1026return0;1027}10281029static intgitdiff_renamesrc(const char*line,struct patch *patch)1030{1031 patch->is_rename =1;1032free(patch->old_name);1033 patch->old_name =find_name(line, NULL, p_value ? p_value -1:0,0);1034return0;1035}10361037static intgitdiff_renamedst(const char*line,struct patch *patch)1038{1039 patch->is_rename =1;1040free(patch->new_name);1041 patch->new_name =find_name(line, NULL, p_value ? p_value -1:0,0);1042return0;1043}10441045static intgitdiff_similarity(const char*line,struct patch *patch)1046{1047unsigned long val =strtoul(line, NULL,10);1048if(val <=100)1049 patch->score = val;1050return0;1051}10521053static intgitdiff_dissimilarity(const char*line,struct patch *patch)1054{1055unsigned long val =strtoul(line, NULL,10);1056if(val <=100)1057 patch->score = val;1058return0;1059}10601061static intgitdiff_index(const char*line,struct patch *patch)1062{1063/*1064 * index line is N hexadecimal, "..", N hexadecimal,1065 * and optional space with octal mode.1066 */1067const char*ptr, *eol;1068int len;10691070 ptr =strchr(line,'.');1071if(!ptr || ptr[1] !='.'||40< ptr - line)1072return0;1073 len = ptr - line;1074memcpy(patch->old_sha1_prefix, line, len);1075 patch->old_sha1_prefix[len] =0;10761077 line = ptr +2;1078 ptr =strchr(line,' ');1079 eol =strchrnul(line,'\n');10801081if(!ptr || eol < ptr)1082 ptr = eol;1083 len = ptr - line;10841085if(40< len)1086return0;1087memcpy(patch->new_sha1_prefix, line, len);1088 patch->new_sha1_prefix[len] =0;1089if(*ptr ==' ')1090 patch->old_mode =strtoul(ptr+1, NULL,8);1091return0;1092}10931094/*1095 * This is normal for a diff that doesn't change anything: we'll fall through1096 * into the next diff. Tell the parser to break out.1097 */1098static intgitdiff_unrecognized(const char*line,struct patch *patch)1099{1100return-1;1101}11021103/*1104 * Skip p_value leading components from "line"; as we do not accept1105 * absolute paths, return NULL in that case.1106 */1107static const char*skip_tree_prefix(const char*line,int llen)1108{1109int nslash;1110int i;11111112if(!p_value)1113return(llen && line[0] =='/') ? NULL : line;11141115 nslash = p_value;1116for(i =0; i < llen; i++) {1117int ch = line[i];1118if(ch =='/'&& --nslash <=0)1119return(i ==0) ? NULL : &line[i +1];1120}1121return NULL;1122}11231124/*1125 * This is to extract the same name that appears on "diff --git"1126 * line. We do not find and return anything if it is a rename1127 * patch, and it is OK because we will find the name elsewhere.1128 * We need to reliably find name only when it is mode-change only,1129 * creation or deletion of an empty file. In any of these cases,1130 * both sides are the same name under a/ and b/ respectively.1131 */1132static char*git_header_name(const char*line,int llen)1133{1134const char*name;1135const char*second = NULL;1136size_t len, line_len;11371138 line +=strlen("diff --git ");1139 llen -=strlen("diff --git ");11401141if(*line =='"') {1142const char*cp;1143struct strbuf first = STRBUF_INIT;1144struct strbuf sp = STRBUF_INIT;11451146if(unquote_c_style(&first, line, &second))1147goto free_and_fail1;11481149/* strip the a/b prefix including trailing slash */1150 cp =skip_tree_prefix(first.buf, first.len);1151if(!cp)1152goto free_and_fail1;1153strbuf_remove(&first,0, cp - first.buf);11541155/*1156 * second points at one past closing dq of name.1157 * find the second name.1158 */1159while((second < line + llen) &&isspace(*second))1160 second++;11611162if(line + llen <= second)1163goto free_and_fail1;1164if(*second =='"') {1165if(unquote_c_style(&sp, second, NULL))1166goto free_and_fail1;1167 cp =skip_tree_prefix(sp.buf, sp.len);1168if(!cp)1169goto free_and_fail1;1170/* They must match, otherwise ignore */1171if(strcmp(cp, first.buf))1172goto free_and_fail1;1173strbuf_release(&sp);1174returnstrbuf_detach(&first, NULL);1175}11761177/* unquoted second */1178 cp =skip_tree_prefix(second, line + llen - second);1179if(!cp)1180goto free_and_fail1;1181if(line + llen - cp != first.len ||1182memcmp(first.buf, cp, first.len))1183goto free_and_fail1;1184returnstrbuf_detach(&first, NULL);11851186 free_and_fail1:1187strbuf_release(&first);1188strbuf_release(&sp);1189return NULL;1190}11911192/* unquoted first name */1193 name =skip_tree_prefix(line, llen);1194if(!name)1195return NULL;11961197/*1198 * since the first name is unquoted, a dq if exists must be1199 * the beginning of the second name.1200 */1201for(second = name; second < line + llen; second++) {1202if(*second =='"') {1203struct strbuf sp = STRBUF_INIT;1204const char*np;12051206if(unquote_c_style(&sp, second, NULL))1207goto free_and_fail2;12081209 np =skip_tree_prefix(sp.buf, sp.len);1210if(!np)1211goto free_and_fail2;12121213 len = sp.buf + sp.len - np;1214if(len < second - name &&1215!strncmp(np, name, len) &&1216isspace(name[len])) {1217/* Good */1218strbuf_remove(&sp,0, np - sp.buf);1219returnstrbuf_detach(&sp, NULL);1220}12211222 free_and_fail2:1223strbuf_release(&sp);1224return NULL;1225}1226}12271228/*1229 * Accept a name only if it shows up twice, exactly the same1230 * form.1231 */1232 second =strchr(name,'\n');1233if(!second)1234return NULL;1235 line_len = second - name;1236for(len =0; ; len++) {1237switch(name[len]) {1238default:1239continue;1240case'\n':1241return NULL;1242case'\t':case' ':1243/*1244 * Is this the separator between the preimage1245 * and the postimage pathname? Again, we are1246 * only interested in the case where there is1247 * no rename, as this is only to set def_name1248 * and a rename patch has the names elsewhere1249 * in an unambiguous form.1250 */1251if(!name[len +1])1252return NULL;/* no postimage name */1253 second =skip_tree_prefix(name + len +1,1254 line_len - (len +1));1255if(!second)1256return NULL;1257/*1258 * Does len bytes starting at "name" and "second"1259 * (that are separated by one HT or SP we just1260 * found) exactly match?1261 */1262if(second[len] =='\n'&& !strncmp(name, second, len))1263returnxmemdupz(name, len);1264}1265}1266}12671268/* Verify that we recognize the lines following a git header */1269static intparse_git_header(const char*line,int len,unsigned int size,struct patch *patch)1270{1271unsigned long offset;12721273/* A git diff has explicit new/delete information, so we don't guess */1274 patch->is_new =0;1275 patch->is_delete =0;12761277/*1278 * Some things may not have the old name in the1279 * rest of the headers anywhere (pure mode changes,1280 * or removing or adding empty files), so we get1281 * the default name from the header.1282 */1283 patch->def_name =git_header_name(line, len);1284if(patch->def_name && root) {1285char*s =xstrfmt("%s%s", root, patch->def_name);1286free(patch->def_name);1287 patch->def_name = s;1288}12891290 line += len;1291 size -= len;1292 linenr++;1293for(offset = len ; size >0; offset += len, size -= len, line += len, linenr++) {1294static const struct opentry {1295const char*str;1296int(*fn)(const char*,struct patch *);1297} optable[] = {1298{"@@ -", gitdiff_hdrend },1299{"--- ", gitdiff_oldname },1300{"+++ ", gitdiff_newname },1301{"old mode ", gitdiff_oldmode },1302{"new mode ", gitdiff_newmode },1303{"deleted file mode ", gitdiff_delete },1304{"new file mode ", gitdiff_newfile },1305{"copy from ", gitdiff_copysrc },1306{"copy to ", gitdiff_copydst },1307{"rename old ", gitdiff_renamesrc },1308{"rename new ", gitdiff_renamedst },1309{"rename from ", gitdiff_renamesrc },1310{"rename to ", gitdiff_renamedst },1311{"similarity index ", gitdiff_similarity },1312{"dissimilarity index ", gitdiff_dissimilarity },1313{"index ", gitdiff_index },1314{"", gitdiff_unrecognized },1315};1316int i;13171318 len =linelen(line, size);1319if(!len || line[len-1] !='\n')1320break;1321for(i =0; i <ARRAY_SIZE(optable); i++) {1322const struct opentry *p = optable + i;1323int oplen =strlen(p->str);1324if(len < oplen ||memcmp(p->str, line, oplen))1325continue;1326if(p->fn(line + oplen, patch) <0)1327return offset;1328break;1329}1330}13311332return offset;1333}13341335static intparse_num(const char*line,unsigned long*p)1336{1337char*ptr;13381339if(!isdigit(*line))1340return0;1341*p =strtoul(line, &ptr,10);1342return ptr - line;1343}13441345static intparse_range(const char*line,int len,int offset,const char*expect,1346unsigned long*p1,unsigned long*p2)1347{1348int digits, ex;13491350if(offset <0|| offset >= len)1351return-1;1352 line += offset;1353 len -= offset;13541355 digits =parse_num(line, p1);1356if(!digits)1357return-1;13581359 offset += digits;1360 line += digits;1361 len -= digits;13621363*p2 =1;1364if(*line ==',') {1365 digits =parse_num(line+1, p2);1366if(!digits)1367return-1;13681369 offset += digits+1;1370 line += digits+1;1371 len -= digits+1;1372}13731374 ex =strlen(expect);1375if(ex > len)1376return-1;1377if(memcmp(line, expect, ex))1378return-1;13791380return offset + ex;1381}13821383static voidrecount_diff(const char*line,int size,struct fragment *fragment)1384{1385int oldlines =0, newlines =0, ret =0;13861387if(size <1) {1388warning("recount: ignore empty hunk");1389return;1390}13911392for(;;) {1393int len =linelen(line, size);1394 size -= len;1395 line += len;13961397if(size <1)1398break;13991400switch(*line) {1401case' ':case'\n':1402 newlines++;1403/* fall through */1404case'-':1405 oldlines++;1406continue;1407case'+':1408 newlines++;1409continue;1410case'\\':1411continue;1412case'@':1413 ret = size <3|| !starts_with(line,"@@ ");1414break;1415case'd':1416 ret = size <5|| !starts_with(line,"diff ");1417break;1418default:1419 ret = -1;1420break;1421}1422if(ret) {1423warning(_("recount: unexpected line: %.*s"),1424(int)linelen(line, size), line);1425return;1426}1427break;1428}1429 fragment->oldlines = oldlines;1430 fragment->newlines = newlines;1431}14321433/*1434 * Parse a unified diff fragment header of the1435 * form "@@ -a,b +c,d @@"1436 */1437static intparse_fragment_header(const char*line,int len,struct fragment *fragment)1438{1439int offset;14401441if(!len || line[len-1] !='\n')1442return-1;14431444/* Figure out the number of lines in a fragment */1445 offset =parse_range(line, len,4," +", &fragment->oldpos, &fragment->oldlines);1446 offset =parse_range(line, len, offset," @@", &fragment->newpos, &fragment->newlines);14471448return offset;1449}14501451static intfind_header(const char*line,unsigned long size,int*hdrsize,struct patch *patch)1452{1453unsigned long offset, len;14541455 patch->is_toplevel_relative =0;1456 patch->is_rename = patch->is_copy =0;1457 patch->is_new = patch->is_delete = -1;1458 patch->old_mode = patch->new_mode =0;1459 patch->old_name = patch->new_name = NULL;1460for(offset =0; size >0; offset += len, size -= len, line += len, linenr++) {1461unsigned long nextlen;14621463 len =linelen(line, size);1464if(!len)1465break;14661467/* Testing this early allows us to take a few shortcuts.. */1468if(len <6)1469continue;14701471/*1472 * Make sure we don't find any unconnected patch fragments.1473 * That's a sign that we didn't find a header, and that a1474 * patch has become corrupted/broken up.1475 */1476if(!memcmp("@@ -", line,4)) {1477struct fragment dummy;1478if(parse_fragment_header(line, len, &dummy) <0)1479continue;1480die(_("patch fragment without header at line%d: %.*s"),1481 linenr, (int)len-1, line);1482}14831484if(size < len +6)1485break;14861487/*1488 * Git patch? It might not have a real patch, just a rename1489 * or mode change, so we handle that specially1490 */1491if(!memcmp("diff --git ", line,11)) {1492int git_hdr_len =parse_git_header(line, len, size, patch);1493if(git_hdr_len <= len)1494continue;1495if(!patch->old_name && !patch->new_name) {1496if(!patch->def_name)1497die(Q_("git diff header lacks filename information when removing "1498"%dleading pathname component (line%d)",1499"git diff header lacks filename information when removing "1500"%dleading pathname components (line%d)",1501 p_value),1502 p_value, linenr);1503 patch->old_name =xstrdup(patch->def_name);1504 patch->new_name =xstrdup(patch->def_name);1505}1506if(!patch->is_delete && !patch->new_name)1507die("git diff header lacks filename information "1508"(line%d)", linenr);1509 patch->is_toplevel_relative =1;1510*hdrsize = git_hdr_len;1511return offset;1512}15131514/* --- followed by +++ ? */1515if(memcmp("--- ", line,4) ||memcmp("+++ ", line + len,4))1516continue;15171518/*1519 * We only accept unified patches, so we want it to1520 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1521 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1522 */1523 nextlen =linelen(line + len, size - len);1524if(size < nextlen +14||memcmp("@@ -", line + len + nextlen,4))1525continue;15261527/* Ok, we'll consider it a patch */1528parse_traditional_patch(line, line+len, patch);1529*hdrsize = len + nextlen;1530 linenr +=2;1531return offset;1532}1533return-1;1534}15351536static voidrecord_ws_error(unsigned result,const char*line,int len,int linenr)1537{1538char*err;15391540if(!result)1541return;15421543 whitespace_error++;1544if(squelch_whitespace_errors &&1545 squelch_whitespace_errors < whitespace_error)1546return;15471548 err =whitespace_error_string(result);1549fprintf(stderr,"%s:%d:%s.\n%.*s\n",1550 patch_input_file, linenr, err, len, line);1551free(err);1552}15531554static voidcheck_whitespace(const char*line,int len,unsigned ws_rule)1555{1556unsigned result =ws_check(line +1, len -1, ws_rule);15571558record_ws_error(result, line +1, len -2, linenr);1559}15601561/*1562 * Parse a unified diff. Note that this really needs to parse each1563 * fragment separately, since the only way to know the difference1564 * between a "---" that is part of a patch, and a "---" that starts1565 * the next patch is to look at the line counts..1566 */1567static intparse_fragment(const char*line,unsigned long size,1568struct patch *patch,struct fragment *fragment)1569{1570int added, deleted;1571int len =linelen(line, size), offset;1572unsigned long oldlines, newlines;1573unsigned long leading, trailing;15741575 offset =parse_fragment_header(line, len, fragment);1576if(offset <0)1577return-1;1578if(offset >0&& patch->recount)1579recount_diff(line + offset, size - offset, fragment);1580 oldlines = fragment->oldlines;1581 newlines = fragment->newlines;1582 leading =0;1583 trailing =0;15841585/* Parse the thing.. */1586 line += len;1587 size -= len;1588 linenr++;1589 added = deleted =0;1590for(offset = len;15910< size;1592 offset += len, size -= len, line += len, linenr++) {1593if(!oldlines && !newlines)1594break;1595 len =linelen(line, size);1596if(!len || line[len-1] !='\n')1597return-1;1598switch(*line) {1599default:1600return-1;1601case'\n':/* newer GNU diff, an empty context line */1602case' ':1603 oldlines--;1604 newlines--;1605if(!deleted && !added)1606 leading++;1607 trailing++;1608break;1609case'-':1610if(apply_in_reverse &&1611 ws_error_action != nowarn_ws_error)1612check_whitespace(line, len, patch->ws_rule);1613 deleted++;1614 oldlines--;1615 trailing =0;1616break;1617case'+':1618if(!apply_in_reverse &&1619 ws_error_action != nowarn_ws_error)1620check_whitespace(line, len, patch->ws_rule);1621 added++;1622 newlines--;1623 trailing =0;1624break;16251626/*1627 * We allow "\ No newline at end of file". Depending1628 * on locale settings when the patch was produced we1629 * don't know what this line looks like. The only1630 * thing we do know is that it begins with "\ ".1631 * Checking for 12 is just for sanity check -- any1632 * l10n of "\ No newline..." is at least that long.1633 */1634case'\\':1635if(len <12||memcmp(line,"\\",2))1636return-1;1637break;1638}1639}1640if(oldlines || newlines)1641return-1;1642 fragment->leading = leading;1643 fragment->trailing = trailing;16441645/*1646 * If a fragment ends with an incomplete line, we failed to include1647 * it in the above loop because we hit oldlines == newlines == 01648 * before seeing it.1649 */1650if(12< size && !memcmp(line,"\\",2))1651 offset +=linelen(line, size);16521653 patch->lines_added += added;1654 patch->lines_deleted += deleted;16551656if(0< patch->is_new && oldlines)1657returnerror(_("new file depends on old contents"));1658if(0< patch->is_delete && newlines)1659returnerror(_("deleted file still has contents"));1660return offset;1661}16621663/*1664 * We have seen "diff --git a/... b/..." header (or a traditional patch1665 * header). Read hunks that belong to this patch into fragments and hang1666 * them to the given patch structure.1667 *1668 * The (fragment->patch, fragment->size) pair points into the memory given1669 * by the caller, not a copy, when we return.1670 */1671static intparse_single_patch(const char*line,unsigned long size,struct patch *patch)1672{1673unsigned long offset =0;1674unsigned long oldlines =0, newlines =0, context =0;1675struct fragment **fragp = &patch->fragments;16761677while(size >4&& !memcmp(line,"@@ -",4)) {1678struct fragment *fragment;1679int len;16801681 fragment =xcalloc(1,sizeof(*fragment));1682 fragment->linenr = linenr;1683 len =parse_fragment(line, size, patch, fragment);1684if(len <=0)1685die(_("corrupt patch at line%d"), linenr);1686 fragment->patch = line;1687 fragment->size = len;1688 oldlines += fragment->oldlines;1689 newlines += fragment->newlines;1690 context += fragment->leading + fragment->trailing;16911692*fragp = fragment;1693 fragp = &fragment->next;16941695 offset += len;1696 line += len;1697 size -= len;1698}16991700/*1701 * If something was removed (i.e. we have old-lines) it cannot1702 * be creation, and if something was added it cannot be1703 * deletion. However, the reverse is not true; --unified=01704 * patches that only add are not necessarily creation even1705 * though they do not have any old lines, and ones that only1706 * delete are not necessarily deletion.1707 *1708 * Unfortunately, a real creation/deletion patch do _not_ have1709 * any context line by definition, so we cannot safely tell it1710 * apart with --unified=0 insanity. At least if the patch has1711 * more than one hunk it is not creation or deletion.1712 */1713if(patch->is_new <0&&1714(oldlines || (patch->fragments && patch->fragments->next)))1715 patch->is_new =0;1716if(patch->is_delete <0&&1717(newlines || (patch->fragments && patch->fragments->next)))1718 patch->is_delete =0;17191720if(0< patch->is_new && oldlines)1721die(_("new file%sdepends on old contents"), patch->new_name);1722if(0< patch->is_delete && newlines)1723die(_("deleted file%sstill has contents"), patch->old_name);1724if(!patch->is_delete && !newlines && context)1725fprintf_ln(stderr,1726_("** warning: "1727"file%sbecomes empty but is not deleted"),1728 patch->new_name);17291730return offset;1731}17321733staticinlineintmetadata_changes(struct patch *patch)1734{1735return patch->is_rename >0||1736 patch->is_copy >0||1737 patch->is_new >0||1738 patch->is_delete ||1739(patch->old_mode && patch->new_mode &&1740 patch->old_mode != patch->new_mode);1741}17421743static char*inflate_it(const void*data,unsigned long size,1744unsigned long inflated_size)1745{1746 git_zstream stream;1747void*out;1748int st;17491750memset(&stream,0,sizeof(stream));17511752 stream.next_in = (unsigned char*)data;1753 stream.avail_in = size;1754 stream.next_out = out =xmalloc(inflated_size);1755 stream.avail_out = inflated_size;1756git_inflate_init(&stream);1757 st =git_inflate(&stream, Z_FINISH);1758git_inflate_end(&stream);1759if((st != Z_STREAM_END) || stream.total_out != inflated_size) {1760free(out);1761return NULL;1762}1763return out;1764}17651766/*1767 * Read a binary hunk and return a new fragment; fragment->patch1768 * points at an allocated memory that the caller must free, so1769 * it is marked as "->free_patch = 1".1770 */1771static struct fragment *parse_binary_hunk(char**buf_p,1772unsigned long*sz_p,1773int*status_p,1774int*used_p)1775{1776/*1777 * Expect a line that begins with binary patch method ("literal"1778 * or "delta"), followed by the length of data before deflating.1779 * a sequence of 'length-byte' followed by base-85 encoded data1780 * should follow, terminated by a newline.1781 *1782 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1783 * and we would limit the patch line to 66 characters,1784 * so one line can fit up to 13 groups that would decode1785 * to 52 bytes max. The length byte 'A'-'Z' corresponds1786 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1787 */1788int llen, used;1789unsigned long size = *sz_p;1790char*buffer = *buf_p;1791int patch_method;1792unsigned long origlen;1793char*data = NULL;1794int hunk_size =0;1795struct fragment *frag;17961797 llen =linelen(buffer, size);1798 used = llen;17991800*status_p =0;18011802if(starts_with(buffer,"delta ")) {1803 patch_method = BINARY_DELTA_DEFLATED;1804 origlen =strtoul(buffer +6, NULL,10);1805}1806else if(starts_with(buffer,"literal ")) {1807 patch_method = BINARY_LITERAL_DEFLATED;1808 origlen =strtoul(buffer +8, NULL,10);1809}1810else1811return NULL;18121813 linenr++;1814 buffer += llen;1815while(1) {1816int byte_length, max_byte_length, newsize;1817 llen =linelen(buffer, size);1818 used += llen;1819 linenr++;1820if(llen ==1) {1821/* consume the blank line */1822 buffer++;1823 size--;1824break;1825}1826/*1827 * Minimum line is "A00000\n" which is 7-byte long,1828 * and the line length must be multiple of 5 plus 2.1829 */1830if((llen <7) || (llen-2) %5)1831goto corrupt;1832 max_byte_length = (llen -2) /5*4;1833 byte_length = *buffer;1834if('A'<= byte_length && byte_length <='Z')1835 byte_length = byte_length -'A'+1;1836else if('a'<= byte_length && byte_length <='z')1837 byte_length = byte_length -'a'+27;1838else1839goto corrupt;1840/* if the input length was not multiple of 4, we would1841 * have filler at the end but the filler should never1842 * exceed 3 bytes1843 */1844if(max_byte_length < byte_length ||1845 byte_length <= max_byte_length -4)1846goto corrupt;1847 newsize = hunk_size + byte_length;1848 data =xrealloc(data, newsize);1849if(decode_85(data + hunk_size, buffer +1, byte_length))1850goto corrupt;1851 hunk_size = newsize;1852 buffer += llen;1853 size -= llen;1854}18551856 frag =xcalloc(1,sizeof(*frag));1857 frag->patch =inflate_it(data, hunk_size, origlen);1858 frag->free_patch =1;1859if(!frag->patch)1860goto corrupt;1861free(data);1862 frag->size = origlen;1863*buf_p = buffer;1864*sz_p = size;1865*used_p = used;1866 frag->binary_patch_method = patch_method;1867return frag;18681869 corrupt:1870free(data);1871*status_p = -1;1872error(_("corrupt binary patch at line%d: %.*s"),1873 linenr-1, llen-1, buffer);1874return NULL;1875}18761877static intparse_binary(char*buffer,unsigned long size,struct patch *patch)1878{1879/*1880 * We have read "GIT binary patch\n"; what follows is a line1881 * that says the patch method (currently, either "literal" or1882 * "delta") and the length of data before deflating; a1883 * sequence of 'length-byte' followed by base-85 encoded data1884 * follows.1885 *1886 * When a binary patch is reversible, there is another binary1887 * hunk in the same format, starting with patch method (either1888 * "literal" or "delta") with the length of data, and a sequence1889 * of length-byte + base-85 encoded data, terminated with another1890 * empty line. This data, when applied to the postimage, produces1891 * the preimage.1892 */1893struct fragment *forward;1894struct fragment *reverse;1895int status;1896int used, used_1;18971898 forward =parse_binary_hunk(&buffer, &size, &status, &used);1899if(!forward && !status)1900/* there has to be one hunk (forward hunk) */1901returnerror(_("unrecognized binary patch at line%d"), linenr-1);1902if(status)1903/* otherwise we already gave an error message */1904return status;19051906 reverse =parse_binary_hunk(&buffer, &size, &status, &used_1);1907if(reverse)1908 used += used_1;1909else if(status) {1910/*1911 * Not having reverse hunk is not an error, but having1912 * a corrupt reverse hunk is.1913 */1914free((void*) forward->patch);1915free(forward);1916return status;1917}1918 forward->next = reverse;1919 patch->fragments = forward;1920 patch->is_binary =1;1921return used;1922}19231924static voidprefix_one(char**name)1925{1926char*old_name = *name;1927if(!old_name)1928return;1929*name =xstrdup(prefix_filename(prefix, prefix_length, *name));1930free(old_name);1931}19321933static voidprefix_patch(struct patch *p)1934{1935if(!prefix || p->is_toplevel_relative)1936return;1937prefix_one(&p->new_name);1938prefix_one(&p->old_name);1939}19401941/*1942 * include/exclude1943 */19441945static struct string_list limit_by_name;1946static int has_include;1947static voidadd_name_limit(const char*name,int exclude)1948{1949struct string_list_item *it;19501951 it =string_list_append(&limit_by_name, name);1952 it->util = exclude ? NULL : (void*)1;1953}19541955static intuse_patch(struct patch *p)1956{1957const char*pathname = p->new_name ? p->new_name : p->old_name;1958int i;19591960/* Paths outside are not touched regardless of "--include" */1961if(0< prefix_length) {1962int pathlen =strlen(pathname);1963if(pathlen <= prefix_length ||1964memcmp(prefix, pathname, prefix_length))1965return0;1966}19671968/* See if it matches any of exclude/include rule */1969for(i =0; i < limit_by_name.nr; i++) {1970struct string_list_item *it = &limit_by_name.items[i];1971if(!wildmatch(it->string, pathname,0, NULL))1972return(it->util != NULL);1973}19741975/*1976 * If we had any include, a path that does not match any rule is1977 * not used. Otherwise, we saw bunch of exclude rules (or none)1978 * and such a path is used.1979 */1980return!has_include;1981}198219831984/*1985 * Read the patch text in "buffer" that extends for "size" bytes; stop1986 * reading after seeing a single patch (i.e. changes to a single file).1987 * Create fragments (i.e. patch hunks) and hang them to the given patch.1988 * Return the number of bytes consumed, so that the caller can call us1989 * again for the next patch.1990 */1991static intparse_chunk(char*buffer,unsigned long size,struct patch *patch)1992{1993int hdrsize, patchsize;1994int offset =find_header(buffer, size, &hdrsize, patch);19951996if(offset <0)1997return offset;19981999prefix_patch(patch);20002001if(!use_patch(patch))2002 patch->ws_rule =0;2003else2004 patch->ws_rule =whitespace_rule(patch->new_name2005? patch->new_name2006: patch->old_name);20072008 patchsize =parse_single_patch(buffer + offset + hdrsize,2009 size - offset - hdrsize, patch);20102011if(!patchsize) {2012static const char git_binary[] ="GIT binary patch\n";2013int hd = hdrsize + offset;2014unsigned long llen =linelen(buffer + hd, size - hd);20152016if(llen ==sizeof(git_binary) -1&&2017!memcmp(git_binary, buffer + hd, llen)) {2018int used;2019 linenr++;2020 used =parse_binary(buffer + hd + llen,2021 size - hd - llen, patch);2022if(used)2023 patchsize = used + llen;2024else2025 patchsize =0;2026}2027else if(!memcmp(" differ\n", buffer + hd + llen -8,8)) {2028static const char*binhdr[] = {2029"Binary files ",2030"Files ",2031 NULL,2032};2033int i;2034for(i =0; binhdr[i]; i++) {2035int len =strlen(binhdr[i]);2036if(len < size - hd &&2037!memcmp(binhdr[i], buffer + hd, len)) {2038 linenr++;2039 patch->is_binary =1;2040 patchsize = llen;2041break;2042}2043}2044}20452046/* Empty patch cannot be applied if it is a text patch2047 * without metadata change. A binary patch appears2048 * empty to us here.2049 */2050if((apply || check) &&2051(!patch->is_binary && !metadata_changes(patch)))2052die(_("patch with only garbage at line%d"), linenr);2053}20542055return offset + hdrsize + patchsize;2056}20572058#define swap(a,b) myswap((a),(b),sizeof(a))20592060#define myswap(a, b, size) do { \2061 unsigned char mytmp[size]; \2062 memcpy(mytmp, &a, size); \2063 memcpy(&a, &b, size); \2064 memcpy(&b, mytmp, size); \2065} while (0)20662067static voidreverse_patches(struct patch *p)2068{2069for(; p; p = p->next) {2070struct fragment *frag = p->fragments;20712072swap(p->new_name, p->old_name);2073swap(p->new_mode, p->old_mode);2074swap(p->is_new, p->is_delete);2075swap(p->lines_added, p->lines_deleted);2076swap(p->old_sha1_prefix, p->new_sha1_prefix);20772078for(; frag; frag = frag->next) {2079swap(frag->newpos, frag->oldpos);2080swap(frag->newlines, frag->oldlines);2081}2082}2083}20842085static const char pluses[] =2086"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2087static const char minuses[]=2088"----------------------------------------------------------------------";20892090static voidshow_stats(struct patch *patch)2091{2092struct strbuf qname = STRBUF_INIT;2093char*cp = patch->new_name ? patch->new_name : patch->old_name;2094int max, add, del;20952096quote_c_style(cp, &qname, NULL,0);20972098/*2099 * "scale" the filename2100 */2101 max = max_len;2102if(max >50)2103 max =50;21042105if(qname.len > max) {2106 cp =strchr(qname.buf + qname.len +3- max,'/');2107if(!cp)2108 cp = qname.buf + qname.len +3- max;2109strbuf_splice(&qname,0, cp - qname.buf,"...",3);2110}21112112if(patch->is_binary) {2113printf(" %-*s | Bin\n", max, qname.buf);2114strbuf_release(&qname);2115return;2116}21172118printf(" %-*s |", max, qname.buf);2119strbuf_release(&qname);21202121/*2122 * scale the add/delete2123 */2124 max = max + max_change >70?70- max : max_change;2125 add = patch->lines_added;2126 del = patch->lines_deleted;21272128if(max_change >0) {2129int total = ((add + del) * max + max_change /2) / max_change;2130 add = (add * max + max_change /2) / max_change;2131 del = total - add;2132}2133printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2134 add, pluses, del, minuses);2135}21362137static intread_old_data(struct stat *st,const char*path,struct strbuf *buf)2138{2139switch(st->st_mode & S_IFMT) {2140case S_IFLNK:2141if(strbuf_readlink(buf, path, st->st_size) <0)2142returnerror(_("unable to read symlink%s"), path);2143return0;2144case S_IFREG:2145if(strbuf_read_file(buf, path, st->st_size) != st->st_size)2146returnerror(_("unable to open or read%s"), path);2147convert_to_git(path, buf->buf, buf->len, buf,0);2148return0;2149default:2150return-1;2151}2152}21532154/*2155 * Update the preimage, and the common lines in postimage,2156 * from buffer buf of length len. If postlen is 0 the postimage2157 * is updated in place, otherwise it's updated on a new buffer2158 * of length postlen2159 */21602161static voidupdate_pre_post_images(struct image *preimage,2162struct image *postimage,2163char*buf,2164size_t len,size_t postlen)2165{2166int i, ctx, reduced;2167char*new, *old, *fixed;2168struct image fixed_preimage;21692170/*2171 * Update the preimage with whitespace fixes. Note that we2172 * are not losing preimage->buf -- apply_one_fragment() will2173 * free "oldlines".2174 */2175prepare_image(&fixed_preimage, buf, len,1);2176assert(postlen2177? fixed_preimage.nr == preimage->nr2178: fixed_preimage.nr <= preimage->nr);2179for(i =0; i < fixed_preimage.nr; i++)2180 fixed_preimage.line[i].flag = preimage->line[i].flag;2181free(preimage->line_allocated);2182*preimage = fixed_preimage;21832184/*2185 * Adjust the common context lines in postimage. This can be2186 * done in-place when we are shrinking it with whitespace2187 * fixing, but needs a new buffer when ignoring whitespace or2188 * expanding leading tabs to spaces.2189 *2190 * We trust the caller to tell us if the update can be done2191 * in place (postlen==0) or not.2192 */2193 old = postimage->buf;2194if(postlen)2195new= postimage->buf =xmalloc(postlen);2196else2197new= old;2198 fixed = preimage->buf;21992200for(i = reduced = ctx =0; i < postimage->nr; i++) {2201size_t len = postimage->line[i].len;2202if(!(postimage->line[i].flag & LINE_COMMON)) {2203/* an added line -- no counterparts in preimage */2204memmove(new, old, len);2205 old += len;2206new+= len;2207continue;2208}22092210/* a common context -- skip it in the original postimage */2211 old += len;22122213/* and find the corresponding one in the fixed preimage */2214while(ctx < preimage->nr &&2215!(preimage->line[ctx].flag & LINE_COMMON)) {2216 fixed += preimage->line[ctx].len;2217 ctx++;2218}22192220/*2221 * preimage is expected to run out, if the caller2222 * fixed addition of trailing blank lines.2223 */2224if(preimage->nr <= ctx) {2225 reduced++;2226continue;2227}22282229/* and copy it in, while fixing the line length */2230 len = preimage->line[ctx].len;2231memcpy(new, fixed, len);2232new+= len;2233 fixed += len;2234 postimage->line[i].len = len;2235 ctx++;2236}22372238/* Fix the length of the whole thing */2239 postimage->len =new- postimage->buf;2240 postimage->nr -= reduced;2241}22422243static intmatch_fragment(struct image *img,2244struct image *preimage,2245struct image *postimage,2246unsigned longtry,2247int try_lno,2248unsigned ws_rule,2249int match_beginning,int match_end)2250{2251int i;2252char*fixed_buf, *buf, *orig, *target;2253struct strbuf fixed;2254size_t fixed_len, postlen;2255int preimage_limit;22562257if(preimage->nr + try_lno <= img->nr) {2258/*2259 * The hunk falls within the boundaries of img.2260 */2261 preimage_limit = preimage->nr;2262if(match_end && (preimage->nr + try_lno != img->nr))2263return0;2264}else if(ws_error_action == correct_ws_error &&2265(ws_rule & WS_BLANK_AT_EOF)) {2266/*2267 * This hunk extends beyond the end of img, and we are2268 * removing blank lines at the end of the file. This2269 * many lines from the beginning of the preimage must2270 * match with img, and the remainder of the preimage2271 * must be blank.2272 */2273 preimage_limit = img->nr - try_lno;2274}else{2275/*2276 * The hunk extends beyond the end of the img and2277 * we are not removing blanks at the end, so we2278 * should reject the hunk at this position.2279 */2280return0;2281}22822283if(match_beginning && try_lno)2284return0;22852286/* Quick hash check */2287for(i =0; i < preimage_limit; i++)2288if((img->line[try_lno + i].flag & LINE_PATCHED) ||2289(preimage->line[i].hash != img->line[try_lno + i].hash))2290return0;22912292if(preimage_limit == preimage->nr) {2293/*2294 * Do we have an exact match? If we were told to match2295 * at the end, size must be exactly at try+fragsize,2296 * otherwise try+fragsize must be still within the preimage,2297 * and either case, the old piece should match the preimage2298 * exactly.2299 */2300if((match_end2301? (try+ preimage->len == img->len)2302: (try+ preimage->len <= img->len)) &&2303!memcmp(img->buf +try, preimage->buf, preimage->len))2304return1;2305}else{2306/*2307 * The preimage extends beyond the end of img, so2308 * there cannot be an exact match.2309 *2310 * There must be one non-blank context line that match2311 * a line before the end of img.2312 */2313char*buf_end;23142315 buf = preimage->buf;2316 buf_end = buf;2317for(i =0; i < preimage_limit; i++)2318 buf_end += preimage->line[i].len;23192320for( ; buf < buf_end; buf++)2321if(!isspace(*buf))2322break;2323if(buf == buf_end)2324return0;2325}23262327/*2328 * No exact match. If we are ignoring whitespace, run a line-by-line2329 * fuzzy matching. We collect all the line length information because2330 * we need it to adjust whitespace if we match.2331 */2332if(ws_ignore_action == ignore_ws_change) {2333size_t imgoff =0;2334size_t preoff =0;2335size_t postlen = postimage->len;2336size_t extra_chars;2337char*preimage_eof;2338char*preimage_end;2339for(i =0; i < preimage_limit; i++) {2340size_t prelen = preimage->line[i].len;2341size_t imglen = img->line[try_lno+i].len;23422343if(!fuzzy_matchlines(img->buf +try+ imgoff, imglen,2344 preimage->buf + preoff, prelen))2345return0;2346if(preimage->line[i].flag & LINE_COMMON)2347 postlen += imglen - prelen;2348 imgoff += imglen;2349 preoff += prelen;2350}23512352/*2353 * Ok, the preimage matches with whitespace fuzz.2354 *2355 * imgoff now holds the true length of the target that2356 * matches the preimage before the end of the file.2357 *2358 * Count the number of characters in the preimage that fall2359 * beyond the end of the file and make sure that all of them2360 * are whitespace characters. (This can only happen if2361 * we are removing blank lines at the end of the file.)2362 */2363 buf = preimage_eof = preimage->buf + preoff;2364for( ; i < preimage->nr; i++)2365 preoff += preimage->line[i].len;2366 preimage_end = preimage->buf + preoff;2367for( ; buf < preimage_end; buf++)2368if(!isspace(*buf))2369return0;23702371/*2372 * Update the preimage and the common postimage context2373 * lines to use the same whitespace as the target.2374 * If whitespace is missing in the target (i.e.2375 * if the preimage extends beyond the end of the file),2376 * use the whitespace from the preimage.2377 */2378 extra_chars = preimage_end - preimage_eof;2379strbuf_init(&fixed, imgoff + extra_chars);2380strbuf_add(&fixed, img->buf +try, imgoff);2381strbuf_add(&fixed, preimage_eof, extra_chars);2382 fixed_buf =strbuf_detach(&fixed, &fixed_len);2383update_pre_post_images(preimage, postimage,2384 fixed_buf, fixed_len, postlen);2385return1;2386}23872388if(ws_error_action != correct_ws_error)2389return0;23902391/*2392 * The hunk does not apply byte-by-byte, but the hash says2393 * it might with whitespace fuzz. We haven't been asked to2394 * ignore whitespace, we were asked to correct whitespace2395 * errors, so let's try matching after whitespace correction.2396 *2397 * The preimage may extend beyond the end of the file,2398 * but in this loop we will only handle the part of the2399 * preimage that falls within the file.2400 */2401strbuf_init(&fixed, preimage->len +1);2402 orig = preimage->buf;2403 target = img->buf +try;2404 postlen =0;2405for(i =0; i < preimage_limit; i++) {2406size_t oldlen = preimage->line[i].len;2407size_t tgtlen = img->line[try_lno + i].len;2408size_t fixstart = fixed.len;2409struct strbuf tgtfix;2410int match;24112412/* Try fixing the line in the preimage */2413ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);24142415/* Try fixing the line in the target */2416strbuf_init(&tgtfix, tgtlen);2417ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);24182419/*2420 * If they match, either the preimage was based on2421 * a version before our tree fixed whitespace breakage,2422 * or we are lacking a whitespace-fix patch the tree2423 * the preimage was based on already had (i.e. target2424 * has whitespace breakage, the preimage doesn't).2425 * In either case, we are fixing the whitespace breakages2426 * so we might as well take the fix together with their2427 * real change.2428 */2429 match = (tgtfix.len == fixed.len - fixstart &&2430!memcmp(tgtfix.buf, fixed.buf + fixstart,2431 fixed.len - fixstart));2432 postlen += tgtfix.len;24332434strbuf_release(&tgtfix);2435if(!match)2436goto unmatch_exit;24372438 orig += oldlen;2439 target += tgtlen;2440}244124422443/*2444 * Now handle the lines in the preimage that falls beyond the2445 * end of the file (if any). They will only match if they are2446 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2447 * false).2448 */2449for( ; i < preimage->nr; i++) {2450size_t fixstart = fixed.len;/* start of the fixed preimage */2451size_t oldlen = preimage->line[i].len;2452int j;24532454/* Try fixing the line in the preimage */2455ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);24562457for(j = fixstart; j < fixed.len; j++)2458if(!isspace(fixed.buf[j]))2459goto unmatch_exit;24602461 orig += oldlen;2462}24632464/*2465 * Yes, the preimage is based on an older version that still2466 * has whitespace breakages unfixed, and fixing them makes the2467 * hunk match. Update the context lines in the postimage.2468 */2469 fixed_buf =strbuf_detach(&fixed, &fixed_len);2470if(postlen < postimage->len)2471 postlen =0;2472update_pre_post_images(preimage, postimage,2473 fixed_buf, fixed_len, postlen);2474return1;24752476 unmatch_exit:2477strbuf_release(&fixed);2478return0;2479}24802481static intfind_pos(struct image *img,2482struct image *preimage,2483struct image *postimage,2484int line,2485unsigned ws_rule,2486int match_beginning,int match_end)2487{2488int i;2489unsigned long backwards, forwards,try;2490int backwards_lno, forwards_lno, try_lno;24912492/*2493 * If match_beginning or match_end is specified, there is no2494 * point starting from a wrong line that will never match and2495 * wander around and wait for a match at the specified end.2496 */2497if(match_beginning)2498 line =0;2499else if(match_end)2500 line = img->nr - preimage->nr;25012502/*2503 * Because the comparison is unsigned, the following test2504 * will also take care of a negative line number that can2505 * result when match_end and preimage is larger than the target.2506 */2507if((size_t) line > img->nr)2508 line = img->nr;25092510try=0;2511for(i =0; i < line; i++)2512try+= img->line[i].len;25132514/*2515 * There's probably some smart way to do this, but I'll leave2516 * that to the smart and beautiful people. I'm simple and stupid.2517 */2518 backwards =try;2519 backwards_lno = line;2520 forwards =try;2521 forwards_lno = line;2522 try_lno = line;25232524for(i =0; ; i++) {2525if(match_fragment(img, preimage, postimage,2526try, try_lno, ws_rule,2527 match_beginning, match_end))2528return try_lno;25292530 again:2531if(backwards_lno ==0&& forwards_lno == img->nr)2532break;25332534if(i &1) {2535if(backwards_lno ==0) {2536 i++;2537goto again;2538}2539 backwards_lno--;2540 backwards -= img->line[backwards_lno].len;2541try= backwards;2542 try_lno = backwards_lno;2543}else{2544if(forwards_lno == img->nr) {2545 i++;2546goto again;2547}2548 forwards += img->line[forwards_lno].len;2549 forwards_lno++;2550try= forwards;2551 try_lno = forwards_lno;2552}25532554}2555return-1;2556}25572558static voidremove_first_line(struct image *img)2559{2560 img->buf += img->line[0].len;2561 img->len -= img->line[0].len;2562 img->line++;2563 img->nr--;2564}25652566static voidremove_last_line(struct image *img)2567{2568 img->len -= img->line[--img->nr].len;2569}25702571/*2572 * The change from "preimage" and "postimage" has been found to2573 * apply at applied_pos (counts in line numbers) in "img".2574 * Update "img" to remove "preimage" and replace it with "postimage".2575 */2576static voidupdate_image(struct image *img,2577int applied_pos,2578struct image *preimage,2579struct image *postimage)2580{2581/*2582 * remove the copy of preimage at offset in img2583 * and replace it with postimage2584 */2585int i, nr;2586size_t remove_count, insert_count, applied_at =0;2587char*result;2588int preimage_limit;25892590/*2591 * If we are removing blank lines at the end of img,2592 * the preimage may extend beyond the end.2593 * If that is the case, we must be careful only to2594 * remove the part of the preimage that falls within2595 * the boundaries of img. Initialize preimage_limit2596 * to the number of lines in the preimage that falls2597 * within the boundaries.2598 */2599 preimage_limit = preimage->nr;2600if(preimage_limit > img->nr - applied_pos)2601 preimage_limit = img->nr - applied_pos;26022603for(i =0; i < applied_pos; i++)2604 applied_at += img->line[i].len;26052606 remove_count =0;2607for(i =0; i < preimage_limit; i++)2608 remove_count += img->line[applied_pos + i].len;2609 insert_count = postimage->len;26102611/* Adjust the contents */2612 result =xmalloc(img->len + insert_count - remove_count +1);2613memcpy(result, img->buf, applied_at);2614memcpy(result + applied_at, postimage->buf, postimage->len);2615memcpy(result + applied_at + postimage->len,2616 img->buf + (applied_at + remove_count),2617 img->len - (applied_at + remove_count));2618free(img->buf);2619 img->buf = result;2620 img->len += insert_count - remove_count;2621 result[img->len] ='\0';26222623/* Adjust the line table */2624 nr = img->nr + postimage->nr - preimage_limit;2625if(preimage_limit < postimage->nr) {2626/*2627 * NOTE: this knows that we never call remove_first_line()2628 * on anything other than pre/post image.2629 */2630REALLOC_ARRAY(img->line, nr);2631 img->line_allocated = img->line;2632}2633if(preimage_limit != postimage->nr)2634memmove(img->line + applied_pos + postimage->nr,2635 img->line + applied_pos + preimage_limit,2636(img->nr - (applied_pos + preimage_limit)) *2637sizeof(*img->line));2638memcpy(img->line + applied_pos,2639 postimage->line,2640 postimage->nr *sizeof(*img->line));2641if(!allow_overlap)2642for(i =0; i < postimage->nr; i++)2643 img->line[applied_pos + i].flag |= LINE_PATCHED;2644 img->nr = nr;2645}26462647/*2648 * Use the patch-hunk text in "frag" to prepare two images (preimage and2649 * postimage) for the hunk. Find lines that match "preimage" in "img" and2650 * replace the part of "img" with "postimage" text.2651 */2652static intapply_one_fragment(struct image *img,struct fragment *frag,2653int inaccurate_eof,unsigned ws_rule,2654int nth_fragment)2655{2656int match_beginning, match_end;2657const char*patch = frag->patch;2658int size = frag->size;2659char*old, *oldlines;2660struct strbuf newlines;2661int new_blank_lines_at_end =0;2662int found_new_blank_lines_at_end =0;2663int hunk_linenr = frag->linenr;2664unsigned long leading, trailing;2665int pos, applied_pos;2666struct image preimage;2667struct image postimage;26682669memset(&preimage,0,sizeof(preimage));2670memset(&postimage,0,sizeof(postimage));2671 oldlines =xmalloc(size);2672strbuf_init(&newlines, size);26732674 old = oldlines;2675while(size >0) {2676char first;2677int len =linelen(patch, size);2678int plen;2679int added_blank_line =0;2680int is_blank_context =0;2681size_t start;26822683if(!len)2684break;26852686/*2687 * "plen" is how much of the line we should use for2688 * the actual patch data. Normally we just remove the2689 * first character on the line, but if the line is2690 * followed by "\ No newline", then we also remove the2691 * last one (which is the newline, of course).2692 */2693 plen = len -1;2694if(len < size && patch[len] =='\\')2695 plen--;2696 first = *patch;2697if(apply_in_reverse) {2698if(first =='-')2699 first ='+';2700else if(first =='+')2701 first ='-';2702}27032704switch(first) {2705case'\n':2706/* Newer GNU diff, empty context line */2707if(plen <0)2708/* ... followed by '\No newline'; nothing */2709break;2710*old++ ='\n';2711strbuf_addch(&newlines,'\n');2712add_line_info(&preimage,"\n",1, LINE_COMMON);2713add_line_info(&postimage,"\n",1, LINE_COMMON);2714 is_blank_context =1;2715break;2716case' ':2717if(plen && (ws_rule & WS_BLANK_AT_EOF) &&2718ws_blank_line(patch +1, plen, ws_rule))2719 is_blank_context =1;2720case'-':2721memcpy(old, patch +1, plen);2722add_line_info(&preimage, old, plen,2723(first ==' '? LINE_COMMON :0));2724 old += plen;2725if(first =='-')2726break;2727/* Fall-through for ' ' */2728case'+':2729/* --no-add does not add new lines */2730if(first =='+'&& no_add)2731break;27322733 start = newlines.len;2734if(first !='+'||2735!whitespace_error ||2736 ws_error_action != correct_ws_error) {2737strbuf_add(&newlines, patch +1, plen);2738}2739else{2740ws_fix_copy(&newlines, patch +1, plen, ws_rule, &applied_after_fixing_ws);2741}2742add_line_info(&postimage, newlines.buf + start, newlines.len - start,2743(first =='+'?0: LINE_COMMON));2744if(first =='+'&&2745(ws_rule & WS_BLANK_AT_EOF) &&2746ws_blank_line(patch +1, plen, ws_rule))2747 added_blank_line =1;2748break;2749case'@':case'\\':2750/* Ignore it, we already handled it */2751break;2752default:2753if(apply_verbosely)2754error(_("invalid start of line: '%c'"), first);2755return-1;2756}2757if(added_blank_line) {2758if(!new_blank_lines_at_end)2759 found_new_blank_lines_at_end = hunk_linenr;2760 new_blank_lines_at_end++;2761}2762else if(is_blank_context)2763;2764else2765 new_blank_lines_at_end =0;2766 patch += len;2767 size -= len;2768 hunk_linenr++;2769}2770if(inaccurate_eof &&2771 old > oldlines && old[-1] =='\n'&&2772 newlines.len >0&& newlines.buf[newlines.len -1] =='\n') {2773 old--;2774strbuf_setlen(&newlines, newlines.len -1);2775}27762777 leading = frag->leading;2778 trailing = frag->trailing;27792780/*2781 * A hunk to change lines at the beginning would begin with2782 * @@ -1,L +N,M @@2783 * but we need to be careful. -U0 that inserts before the second2784 * line also has this pattern.2785 *2786 * And a hunk to add to an empty file would begin with2787 * @@ -0,0 +N,M @@2788 *2789 * In other words, a hunk that is (frag->oldpos <= 1) with or2790 * without leading context must match at the beginning.2791 */2792 match_beginning = (!frag->oldpos ||2793(frag->oldpos ==1&& !unidiff_zero));27942795/*2796 * A hunk without trailing lines must match at the end.2797 * However, we simply cannot tell if a hunk must match end2798 * from the lack of trailing lines if the patch was generated2799 * with unidiff without any context.2800 */2801 match_end = !unidiff_zero && !trailing;28022803 pos = frag->newpos ? (frag->newpos -1) :0;2804 preimage.buf = oldlines;2805 preimage.len = old - oldlines;2806 postimage.buf = newlines.buf;2807 postimage.len = newlines.len;2808 preimage.line = preimage.line_allocated;2809 postimage.line = postimage.line_allocated;28102811for(;;) {28122813 applied_pos =find_pos(img, &preimage, &postimage, pos,2814 ws_rule, match_beginning, match_end);28152816if(applied_pos >=0)2817break;28182819/* Am I at my context limits? */2820if((leading <= p_context) && (trailing <= p_context))2821break;2822if(match_beginning || match_end) {2823 match_beginning = match_end =0;2824continue;2825}28262827/*2828 * Reduce the number of context lines; reduce both2829 * leading and trailing if they are equal otherwise2830 * just reduce the larger context.2831 */2832if(leading >= trailing) {2833remove_first_line(&preimage);2834remove_first_line(&postimage);2835 pos--;2836 leading--;2837}2838if(trailing > leading) {2839remove_last_line(&preimage);2840remove_last_line(&postimage);2841 trailing--;2842}2843}28442845if(applied_pos >=0) {2846if(new_blank_lines_at_end &&2847 preimage.nr + applied_pos >= img->nr &&2848(ws_rule & WS_BLANK_AT_EOF) &&2849 ws_error_action != nowarn_ws_error) {2850record_ws_error(WS_BLANK_AT_EOF,"+",1,2851 found_new_blank_lines_at_end);2852if(ws_error_action == correct_ws_error) {2853while(new_blank_lines_at_end--)2854remove_last_line(&postimage);2855}2856/*2857 * We would want to prevent write_out_results()2858 * from taking place in apply_patch() that follows2859 * the callchain led us here, which is:2860 * apply_patch->check_patch_list->check_patch->2861 * apply_data->apply_fragments->apply_one_fragment2862 */2863if(ws_error_action == die_on_ws_error)2864 apply =0;2865}28662867if(apply_verbosely && applied_pos != pos) {2868int offset = applied_pos - pos;2869if(apply_in_reverse)2870 offset =0- offset;2871fprintf_ln(stderr,2872Q_("Hunk #%dsucceeded at%d(offset%dline).",2873"Hunk #%dsucceeded at%d(offset%dlines).",2874 offset),2875 nth_fragment, applied_pos +1, offset);2876}28772878/*2879 * Warn if it was necessary to reduce the number2880 * of context lines.2881 */2882if((leading != frag->leading) ||2883(trailing != frag->trailing))2884fprintf_ln(stderr,_("Context reduced to (%ld/%ld)"2885" to apply fragment at%d"),2886 leading, trailing, applied_pos+1);2887update_image(img, applied_pos, &preimage, &postimage);2888}else{2889if(apply_verbosely)2890error(_("while searching for:\n%.*s"),2891(int)(old - oldlines), oldlines);2892}28932894free(oldlines);2895strbuf_release(&newlines);2896free(preimage.line_allocated);2897free(postimage.line_allocated);28982899return(applied_pos <0);2900}29012902static intapply_binary_fragment(struct image *img,struct patch *patch)2903{2904struct fragment *fragment = patch->fragments;2905unsigned long len;2906void*dst;29072908if(!fragment)2909returnerror(_("missing binary patch data for '%s'"),2910 patch->new_name ?2911 patch->new_name :2912 patch->old_name);29132914/* Binary patch is irreversible without the optional second hunk */2915if(apply_in_reverse) {2916if(!fragment->next)2917returnerror("cannot reverse-apply a binary patch "2918"without the reverse hunk to '%s'",2919 patch->new_name2920? patch->new_name : patch->old_name);2921 fragment = fragment->next;2922}2923switch(fragment->binary_patch_method) {2924case BINARY_DELTA_DEFLATED:2925 dst =patch_delta(img->buf, img->len, fragment->patch,2926 fragment->size, &len);2927if(!dst)2928return-1;2929clear_image(img);2930 img->buf = dst;2931 img->len = len;2932return0;2933case BINARY_LITERAL_DEFLATED:2934clear_image(img);2935 img->len = fragment->size;2936 img->buf =xmemdupz(fragment->patch, img->len);2937return0;2938}2939return-1;2940}29412942/*2943 * Replace "img" with the result of applying the binary patch.2944 * The binary patch data itself in patch->fragment is still kept2945 * but the preimage prepared by the caller in "img" is freed here2946 * or in the helper function apply_binary_fragment() this calls.2947 */2948static intapply_binary(struct image *img,struct patch *patch)2949{2950const char*name = patch->old_name ? patch->old_name : patch->new_name;2951unsigned char sha1[20];29522953/*2954 * For safety, we require patch index line to contain2955 * full 40-byte textual SHA1 for old and new, at least for now.2956 */2957if(strlen(patch->old_sha1_prefix) !=40||2958strlen(patch->new_sha1_prefix) !=40||2959get_sha1_hex(patch->old_sha1_prefix, sha1) ||2960get_sha1_hex(patch->new_sha1_prefix, sha1))2961returnerror("cannot apply binary patch to '%s' "2962"without full index line", name);29632964if(patch->old_name) {2965/*2966 * See if the old one matches what the patch2967 * applies to.2968 */2969hash_sha1_file(img->buf, img->len, blob_type, sha1);2970if(strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2971returnerror("the patch applies to '%s' (%s), "2972"which does not match the "2973"current contents.",2974 name,sha1_to_hex(sha1));2975}2976else{2977/* Otherwise, the old one must be empty. */2978if(img->len)2979returnerror("the patch applies to an empty "2980"'%s' but it is not empty", name);2981}29822983get_sha1_hex(patch->new_sha1_prefix, sha1);2984if(is_null_sha1(sha1)) {2985clear_image(img);2986return0;/* deletion patch */2987}29882989if(has_sha1_file(sha1)) {2990/* We already have the postimage */2991enum object_type type;2992unsigned long size;2993char*result;29942995 result =read_sha1_file(sha1, &type, &size);2996if(!result)2997returnerror("the necessary postimage%sfor "2998"'%s' cannot be read",2999 patch->new_sha1_prefix, name);3000clear_image(img);3001 img->buf = result;3002 img->len = size;3003}else{3004/*3005 * We have verified buf matches the preimage;3006 * apply the patch data to it, which is stored3007 * in the patch->fragments->{patch,size}.3008 */3009if(apply_binary_fragment(img, patch))3010returnerror(_("binary patch does not apply to '%s'"),3011 name);30123013/* verify that the result matches */3014hash_sha1_file(img->buf, img->len, blob_type, sha1);3015if(strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))3016returnerror(_("binary patch to '%s' creates incorrect result (expecting%s, got%s)"),3017 name, patch->new_sha1_prefix,sha1_to_hex(sha1));3018}30193020return0;3021}30223023static intapply_fragments(struct image *img,struct patch *patch)3024{3025struct fragment *frag = patch->fragments;3026const char*name = patch->old_name ? patch->old_name : patch->new_name;3027unsigned ws_rule = patch->ws_rule;3028unsigned inaccurate_eof = patch->inaccurate_eof;3029int nth =0;30303031if(patch->is_binary)3032returnapply_binary(img, patch);30333034while(frag) {3035 nth++;3036if(apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {3037error(_("patch failed:%s:%ld"), name, frag->oldpos);3038if(!apply_with_reject)3039return-1;3040 frag->rejected =1;3041}3042 frag = frag->next;3043}3044return0;3045}30463047static intread_blob_object(struct strbuf *buf,const unsigned char*sha1,unsigned mode)3048{3049if(S_ISGITLINK(mode)) {3050strbuf_grow(buf,100);3051strbuf_addf(buf,"Subproject commit%s\n",sha1_to_hex(sha1));3052}else{3053enum object_type type;3054unsigned long sz;3055char*result;30563057 result =read_sha1_file(sha1, &type, &sz);3058if(!result)3059return-1;3060/* XXX read_sha1_file NUL-terminates */3061strbuf_attach(buf, result, sz, sz +1);3062}3063return0;3064}30653066static intread_file_or_gitlink(const struct cache_entry *ce,struct strbuf *buf)3067{3068if(!ce)3069return0;3070returnread_blob_object(buf, ce->sha1, ce->ce_mode);3071}30723073static struct patch *in_fn_table(const char*name)3074{3075struct string_list_item *item;30763077if(name == NULL)3078return NULL;30793080 item =string_list_lookup(&fn_table, name);3081if(item != NULL)3082return(struct patch *)item->util;30833084return NULL;3085}30863087/*3088 * item->util in the filename table records the status of the path.3089 * Usually it points at a patch (whose result records the contents3090 * of it after applying it), but it could be PATH_WAS_DELETED for a3091 * path that a previously applied patch has already removed, or3092 * PATH_TO_BE_DELETED for a path that a later patch would remove.3093 *3094 * The latter is needed to deal with a case where two paths A and B3095 * are swapped by first renaming A to B and then renaming B to A;3096 * moving A to B should not be prevented due to presence of B as we3097 * will remove it in a later patch.3098 */3099#define PATH_TO_BE_DELETED ((struct patch *) -2)3100#define PATH_WAS_DELETED ((struct patch *) -1)31013102static intto_be_deleted(struct patch *patch)3103{3104return patch == PATH_TO_BE_DELETED;3105}31063107static intwas_deleted(struct patch *patch)3108{3109return patch == PATH_WAS_DELETED;3110}31113112static voidadd_to_fn_table(struct patch *patch)3113{3114struct string_list_item *item;31153116/*3117 * Always add new_name unless patch is a deletion3118 * This should cover the cases for normal diffs,3119 * file creations and copies3120 */3121if(patch->new_name != NULL) {3122 item =string_list_insert(&fn_table, patch->new_name);3123 item->util = patch;3124}31253126/*3127 * store a failure on rename/deletion cases because3128 * later chunks shouldn't patch old names3129 */3130if((patch->new_name == NULL) || (patch->is_rename)) {3131 item =string_list_insert(&fn_table, patch->old_name);3132 item->util = PATH_WAS_DELETED;3133}3134}31353136static voidprepare_fn_table(struct patch *patch)3137{3138/*3139 * store information about incoming file deletion3140 */3141while(patch) {3142if((patch->new_name == NULL) || (patch->is_rename)) {3143struct string_list_item *item;3144 item =string_list_insert(&fn_table, patch->old_name);3145 item->util = PATH_TO_BE_DELETED;3146}3147 patch = patch->next;3148}3149}31503151static intcheckout_target(struct index_state *istate,3152struct cache_entry *ce,struct stat *st)3153{3154struct checkout costate;31553156memset(&costate,0,sizeof(costate));3157 costate.base_dir ="";3158 costate.refresh_cache =1;3159 costate.istate = istate;3160if(checkout_entry(ce, &costate, NULL) ||lstat(ce->name, st))3161returnerror(_("cannot checkout%s"), ce->name);3162return0;3163}31643165static struct patch *previous_patch(struct patch *patch,int*gone)3166{3167struct patch *previous;31683169*gone =0;3170if(patch->is_copy || patch->is_rename)3171return NULL;/* "git" patches do not depend on the order */31723173 previous =in_fn_table(patch->old_name);3174if(!previous)3175return NULL;31763177if(to_be_deleted(previous))3178return NULL;/* the deletion hasn't happened yet */31793180if(was_deleted(previous))3181*gone =1;31823183return previous;3184}31853186static intverify_index_match(const struct cache_entry *ce,struct stat *st)3187{3188if(S_ISGITLINK(ce->ce_mode)) {3189if(!S_ISDIR(st->st_mode))3190return-1;3191return0;3192}3193returnce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3194}31953196#define SUBMODULE_PATCH_WITHOUT_INDEX 131973198static intload_patch_target(struct strbuf *buf,3199const struct cache_entry *ce,3200struct stat *st,3201const char*name,3202unsigned expected_mode)3203{3204if(cached) {3205if(read_file_or_gitlink(ce, buf))3206returnerror(_("read of%sfailed"), name);3207}else if(name) {3208if(S_ISGITLINK(expected_mode)) {3209if(ce)3210returnread_file_or_gitlink(ce, buf);3211else3212return SUBMODULE_PATCH_WITHOUT_INDEX;3213}else{3214if(read_old_data(st, name, buf))3215returnerror(_("read of%sfailed"), name);3216}3217}3218return0;3219}32203221/*3222 * We are about to apply "patch"; populate the "image" with the3223 * current version we have, from the working tree or from the index,3224 * depending on the situation e.g. --cached/--index. If we are3225 * applying a non-git patch that incrementally updates the tree,3226 * we read from the result of a previous diff.3227 */3228static intload_preimage(struct image *image,3229struct patch *patch,struct stat *st,3230const struct cache_entry *ce)3231{3232struct strbuf buf = STRBUF_INIT;3233size_t len;3234char*img;3235struct patch *previous;3236int status;32373238 previous =previous_patch(patch, &status);3239if(status)3240returnerror(_("path%shas been renamed/deleted"),3241 patch->old_name);3242if(previous) {3243/* We have a patched copy in memory; use that. */3244strbuf_add(&buf, previous->result, previous->resultsize);3245}else{3246 status =load_patch_target(&buf, ce, st,3247 patch->old_name, patch->old_mode);3248if(status <0)3249return status;3250else if(status == SUBMODULE_PATCH_WITHOUT_INDEX) {3251/*3252 * There is no way to apply subproject3253 * patch without looking at the index.3254 * NEEDSWORK: shouldn't this be flagged3255 * as an error???3256 */3257free_fragment_list(patch->fragments);3258 patch->fragments = NULL;3259}else if(status) {3260returnerror(_("read of%sfailed"), patch->old_name);3261}3262}32633264 img =strbuf_detach(&buf, &len);3265prepare_image(image, img, len, !patch->is_binary);3266return0;3267}32683269static intthree_way_merge(struct image *image,3270char*path,3271const unsigned char*base,3272const unsigned char*ours,3273const unsigned char*theirs)3274{3275 mmfile_t base_file, our_file, their_file;3276 mmbuffer_t result = { NULL };3277int status;32783279read_mmblob(&base_file, base);3280read_mmblob(&our_file, ours);3281read_mmblob(&their_file, theirs);3282 status =ll_merge(&result, path,3283&base_file,"base",3284&our_file,"ours",3285&their_file,"theirs", NULL);3286free(base_file.ptr);3287free(our_file.ptr);3288free(their_file.ptr);3289if(status <0|| !result.ptr) {3290free(result.ptr);3291return-1;3292}3293clear_image(image);3294 image->buf = result.ptr;3295 image->len = result.size;32963297return status;3298}32993300/*3301 * When directly falling back to add/add three-way merge, we read from3302 * the current contents of the new_name. In no cases other than that3303 * this function will be called.3304 */3305static intload_current(struct image *image,struct patch *patch)3306{3307struct strbuf buf = STRBUF_INIT;3308int status, pos;3309size_t len;3310char*img;3311struct stat st;3312struct cache_entry *ce;3313char*name = patch->new_name;3314unsigned mode = patch->new_mode;33153316if(!patch->is_new)3317die("BUG: patch to%sis not a creation", patch->old_name);33183319 pos =cache_name_pos(name,strlen(name));3320if(pos <0)3321returnerror(_("%s: does not exist in index"), name);3322 ce = active_cache[pos];3323if(lstat(name, &st)) {3324if(errno != ENOENT)3325returnerror(_("%s:%s"), name,strerror(errno));3326if(checkout_target(&the_index, ce, &st))3327return-1;3328}3329if(verify_index_match(ce, &st))3330returnerror(_("%s: does not match index"), name);33313332 status =load_patch_target(&buf, ce, &st, name, mode);3333if(status <0)3334return status;3335else if(status)3336return-1;3337 img =strbuf_detach(&buf, &len);3338prepare_image(image, img, len, !patch->is_binary);3339return0;3340}33413342static inttry_threeway(struct image *image,struct patch *patch,3343struct stat *st,const struct cache_entry *ce)3344{3345unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];3346struct strbuf buf = STRBUF_INIT;3347size_t len;3348int status;3349char*img;3350struct image tmp_image;33513352/* No point falling back to 3-way merge in these cases */3353if(patch->is_delete ||3354S_ISGITLINK(patch->old_mode) ||S_ISGITLINK(patch->new_mode))3355return-1;33563357/* Preimage the patch was prepared for */3358if(patch->is_new)3359write_sha1_file("",0, blob_type, pre_sha1);3360else if(get_sha1(patch->old_sha1_prefix, pre_sha1) ||3361read_blob_object(&buf, pre_sha1, patch->old_mode))3362returnerror("repository lacks the necessary blob to fall back on 3-way merge.");33633364fprintf(stderr,"Falling back to three-way merge...\n");33653366 img =strbuf_detach(&buf, &len);3367prepare_image(&tmp_image, img, len,1);3368/* Apply the patch to get the post image */3369if(apply_fragments(&tmp_image, patch) <0) {3370clear_image(&tmp_image);3371return-1;3372}3373/* post_sha1[] is theirs */3374write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_sha1);3375clear_image(&tmp_image);33763377/* our_sha1[] is ours */3378if(patch->is_new) {3379if(load_current(&tmp_image, patch))3380returnerror("cannot read the current contents of '%s'",3381 patch->new_name);3382}else{3383if(load_preimage(&tmp_image, patch, st, ce))3384returnerror("cannot read the current contents of '%s'",3385 patch->old_name);3386}3387write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);3388clear_image(&tmp_image);33893390/* in-core three-way merge between post and our using pre as base */3391 status =three_way_merge(image, patch->new_name,3392 pre_sha1, our_sha1, post_sha1);3393if(status <0) {3394fprintf(stderr,"Failed to fall back on three-way merge...\n");3395return status;3396}33973398if(status) {3399 patch->conflicted_threeway =1;3400if(patch->is_new)3401hashclr(patch->threeway_stage[0]);3402else3403hashcpy(patch->threeway_stage[0], pre_sha1);3404hashcpy(patch->threeway_stage[1], our_sha1);3405hashcpy(patch->threeway_stage[2], post_sha1);3406fprintf(stderr,"Applied patch to '%s' with conflicts.\n", patch->new_name);3407}else{3408fprintf(stderr,"Applied patch to '%s' cleanly.\n", patch->new_name);3409}3410return0;3411}34123413static intapply_data(struct patch *patch,struct stat *st,const struct cache_entry *ce)3414{3415struct image image;34163417if(load_preimage(&image, patch, st, ce) <0)3418return-1;34193420if(patch->direct_to_threeway ||3421apply_fragments(&image, patch) <0) {3422/* Note: with --reject, apply_fragments() returns 0 */3423if(!threeway ||try_threeway(&image, patch, st, ce) <0)3424return-1;3425}3426 patch->result = image.buf;3427 patch->resultsize = image.len;3428add_to_fn_table(patch);3429free(image.line_allocated);34303431if(0< patch->is_delete && patch->resultsize)3432returnerror(_("removal patch leaves file contents"));34333434return0;3435}34363437/*3438 * If "patch" that we are looking at modifies or deletes what we have,3439 * we would want it not to lose any local modification we have, either3440 * in the working tree or in the index.3441 *3442 * This also decides if a non-git patch is a creation patch or a3443 * modification to an existing empty file. We do not check the state3444 * of the current tree for a creation patch in this function; the caller3445 * check_patch() separately makes sure (and errors out otherwise) that3446 * the path the patch creates does not exist in the current tree.3447 */3448static intcheck_preimage(struct patch *patch,struct cache_entry **ce,struct stat *st)3449{3450const char*old_name = patch->old_name;3451struct patch *previous = NULL;3452int stat_ret =0, status;3453unsigned st_mode =0;34543455if(!old_name)3456return0;34573458assert(patch->is_new <=0);3459 previous =previous_patch(patch, &status);34603461if(status)3462returnerror(_("path%shas been renamed/deleted"), old_name);3463if(previous) {3464 st_mode = previous->new_mode;3465}else if(!cached) {3466 stat_ret =lstat(old_name, st);3467if(stat_ret && errno != ENOENT)3468returnerror(_("%s:%s"), old_name,strerror(errno));3469}34703471if(check_index && !previous) {3472int pos =cache_name_pos(old_name,strlen(old_name));3473if(pos <0) {3474if(patch->is_new <0)3475goto is_new;3476returnerror(_("%s: does not exist in index"), old_name);3477}3478*ce = active_cache[pos];3479if(stat_ret <0) {3480if(checkout_target(&the_index, *ce, st))3481return-1;3482}3483if(!cached &&verify_index_match(*ce, st))3484returnerror(_("%s: does not match index"), old_name);3485if(cached)3486 st_mode = (*ce)->ce_mode;3487}else if(stat_ret <0) {3488if(patch->is_new <0)3489goto is_new;3490returnerror(_("%s:%s"), old_name,strerror(errno));3491}34923493if(!cached && !previous)3494 st_mode =ce_mode_from_stat(*ce, st->st_mode);34953496if(patch->is_new <0)3497 patch->is_new =0;3498if(!patch->old_mode)3499 patch->old_mode = st_mode;3500if((st_mode ^ patch->old_mode) & S_IFMT)3501returnerror(_("%s: wrong type"), old_name);3502if(st_mode != patch->old_mode)3503warning(_("%shas type%o, expected%o"),3504 old_name, st_mode, patch->old_mode);3505if(!patch->new_mode && !patch->is_delete)3506 patch->new_mode = st_mode;3507return0;35083509 is_new:3510 patch->is_new =1;3511 patch->is_delete =0;3512free(patch->old_name);3513 patch->old_name = NULL;3514return0;3515}351635173518#define EXISTS_IN_INDEX 13519#define EXISTS_IN_WORKTREE 235203521static intcheck_to_create(const char*new_name,int ok_if_exists)3522{3523struct stat nst;35243525if(check_index &&3526cache_name_pos(new_name,strlen(new_name)) >=0&&3527!ok_if_exists)3528return EXISTS_IN_INDEX;3529if(cached)3530return0;35313532if(!lstat(new_name, &nst)) {3533if(S_ISDIR(nst.st_mode) || ok_if_exists)3534return0;3535/*3536 * A leading component of new_name might be a symlink3537 * that is going to be removed with this patch, but3538 * still pointing at somewhere that has the path.3539 * In such a case, path "new_name" does not exist as3540 * far as git is concerned.3541 */3542if(has_symlink_leading_path(new_name,strlen(new_name)))3543return0;35443545return EXISTS_IN_WORKTREE;3546}else if((errno != ENOENT) && (errno != ENOTDIR)) {3547returnerror("%s:%s", new_name,strerror(errno));3548}3549return0;3550}35513552/*3553 * Check and apply the patch in-core; leave the result in patch->result3554 * for the caller to write it out to the final destination.3555 */3556static intcheck_patch(struct patch *patch)3557{3558struct stat st;3559const char*old_name = patch->old_name;3560const char*new_name = patch->new_name;3561const char*name = old_name ? old_name : new_name;3562struct cache_entry *ce = NULL;3563struct patch *tpatch;3564int ok_if_exists;3565int status;35663567 patch->rejected =1;/* we will drop this after we succeed */35683569 status =check_preimage(patch, &ce, &st);3570if(status)3571return status;3572 old_name = patch->old_name;35733574/*3575 * A type-change diff is always split into a patch to delete3576 * old, immediately followed by a patch to create new (see3577 * diff.c::run_diff()); in such a case it is Ok that the entry3578 * to be deleted by the previous patch is still in the working3579 * tree and in the index.3580 *3581 * A patch to swap-rename between A and B would first rename A3582 * to B and then rename B to A. While applying the first one,3583 * the presence of B should not stop A from getting renamed to3584 * B; ask to_be_deleted() about the later rename. Removal of3585 * B and rename from A to B is handled the same way by asking3586 * was_deleted().3587 */3588if((tpatch =in_fn_table(new_name)) &&3589(was_deleted(tpatch) ||to_be_deleted(tpatch)))3590 ok_if_exists =1;3591else3592 ok_if_exists =0;35933594if(new_name &&3595((0< patch->is_new) || patch->is_rename || patch->is_copy)) {3596int err =check_to_create(new_name, ok_if_exists);35973598if(err && threeway) {3599 patch->direct_to_threeway =1;3600}else switch(err) {3601case0:3602break;/* happy */3603case EXISTS_IN_INDEX:3604returnerror(_("%s: already exists in index"), new_name);3605break;3606case EXISTS_IN_WORKTREE:3607returnerror(_("%s: already exists in working directory"),3608 new_name);3609default:3610return err;3611}36123613if(!patch->new_mode) {3614if(0< patch->is_new)3615 patch->new_mode = S_IFREG |0644;3616else3617 patch->new_mode = patch->old_mode;3618}3619}36203621if(new_name && old_name) {3622int same = !strcmp(old_name, new_name);3623if(!patch->new_mode)3624 patch->new_mode = patch->old_mode;3625if((patch->old_mode ^ patch->new_mode) & S_IFMT) {3626if(same)3627returnerror(_("new mode (%o) of%sdoes not "3628"match old mode (%o)"),3629 patch->new_mode, new_name,3630 patch->old_mode);3631else3632returnerror(_("new mode (%o) of%sdoes not "3633"match old mode (%o) of%s"),3634 patch->new_mode, new_name,3635 patch->old_mode, old_name);3636}3637}36383639if(apply_data(patch, &st, ce) <0)3640returnerror(_("%s: patch does not apply"), name);3641 patch->rejected =0;3642return0;3643}36443645static intcheck_patch_list(struct patch *patch)3646{3647int err =0;36483649prepare_fn_table(patch);3650while(patch) {3651if(apply_verbosely)3652say_patch_name(stderr,3653_("Checking patch%s..."), patch);3654 err |=check_patch(patch);3655 patch = patch->next;3656}3657return err;3658}36593660/* This function tries to read the sha1 from the current index */3661static intget_current_sha1(const char*path,unsigned char*sha1)3662{3663int pos;36643665if(read_cache() <0)3666return-1;3667 pos =cache_name_pos(path,strlen(path));3668if(pos <0)3669return-1;3670hashcpy(sha1, active_cache[pos]->sha1);3671return0;3672}36733674static intpreimage_sha1_in_gitlink_patch(struct patch *p,unsigned char sha1[20])3675{3676/*3677 * A usable gitlink patch has only one fragment (hunk) that looks like:3678 * @@ -1 +1 @@3679 * -Subproject commit <old sha1>3680 * +Subproject commit <new sha1>3681 * or3682 * @@ -1 +0,0 @@3683 * -Subproject commit <old sha1>3684 * for a removal patch.3685 */3686struct fragment *hunk = p->fragments;3687static const char heading[] ="-Subproject commit ";3688char*preimage;36893690if(/* does the patch have only one hunk? */3691 hunk && !hunk->next &&3692/* is its preimage one line? */3693 hunk->oldpos ==1&& hunk->oldlines ==1&&3694/* does preimage begin with the heading? */3695(preimage =memchr(hunk->patch,'\n', hunk->size)) != NULL &&3696starts_with(++preimage, heading) &&3697/* does it record full SHA-1? */3698!get_sha1_hex(preimage +sizeof(heading) -1, sha1) &&3699 preimage[sizeof(heading) +40-1] =='\n'&&3700/* does the abbreviated name on the index line agree with it? */3701starts_with(preimage +sizeof(heading) -1, p->old_sha1_prefix))3702return0;/* it all looks fine */37033704/* we may have full object name on the index line */3705returnget_sha1_hex(p->old_sha1_prefix, sha1);3706}37073708/* Build an index that contains the just the files needed for a 3way merge */3709static voidbuild_fake_ancestor(struct patch *list,const char*filename)3710{3711struct patch *patch;3712struct index_state result = { NULL };3713static struct lock_file lock;37143715/* Once we start supporting the reverse patch, it may be3716 * worth showing the new sha1 prefix, but until then...3717 */3718for(patch = list; patch; patch = patch->next) {3719unsigned char sha1[20];3720struct cache_entry *ce;3721const char*name;37223723 name = patch->old_name ? patch->old_name : patch->new_name;3724if(0< patch->is_new)3725continue;37263727if(S_ISGITLINK(patch->old_mode)) {3728if(!preimage_sha1_in_gitlink_patch(patch, sha1))3729;/* ok, the textual part looks sane */3730else3731die("sha1 information is lacking or useless for submodule%s",3732 name);3733}else if(!get_sha1_blob(patch->old_sha1_prefix, sha1)) {3734;/* ok */3735}else if(!patch->lines_added && !patch->lines_deleted) {3736/* mode-only change: update the current */3737if(get_current_sha1(patch->old_name, sha1))3738die("mode change for%s, which is not "3739"in current HEAD", name);3740}else3741die("sha1 information is lacking or useless "3742"(%s).", name);37433744 ce =make_cache_entry(patch->old_mode, sha1, name,0,0);3745if(!ce)3746die(_("make_cache_entry failed for path '%s'"), name);3747if(add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))3748die("Could not add%sto temporary index", name);3749}37503751hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);3752if(write_locked_index(&result, &lock, COMMIT_LOCK))3753die("Could not write temporary index to%s", filename);37543755discard_index(&result);3756}37573758static voidstat_patch_list(struct patch *patch)3759{3760int files, adds, dels;37613762for(files = adds = dels =0; patch ; patch = patch->next) {3763 files++;3764 adds += patch->lines_added;3765 dels += patch->lines_deleted;3766show_stats(patch);3767}37683769print_stat_summary(stdout, files, adds, dels);3770}37713772static voidnumstat_patch_list(struct patch *patch)3773{3774for( ; patch; patch = patch->next) {3775const char*name;3776 name = patch->new_name ? patch->new_name : patch->old_name;3777if(patch->is_binary)3778printf("-\t-\t");3779else3780printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);3781write_name_quoted(name, stdout, line_termination);3782}3783}37843785static voidshow_file_mode_name(const char*newdelete,unsigned int mode,const char*name)3786{3787if(mode)3788printf("%smode%06o%s\n", newdelete, mode, name);3789else3790printf("%s %s\n", newdelete, name);3791}37923793static voidshow_mode_change(struct patch *p,int show_name)3794{3795if(p->old_mode && p->new_mode && p->old_mode != p->new_mode) {3796if(show_name)3797printf(" mode change%06o =>%06o%s\n",3798 p->old_mode, p->new_mode, p->new_name);3799else3800printf(" mode change%06o =>%06o\n",3801 p->old_mode, p->new_mode);3802}3803}38043805static voidshow_rename_copy(struct patch *p)3806{3807const char*renamecopy = p->is_rename ?"rename":"copy";3808const char*old, *new;38093810/* Find common prefix */3811 old = p->old_name;3812new= p->new_name;3813while(1) {3814const char*slash_old, *slash_new;3815 slash_old =strchr(old,'/');3816 slash_new =strchr(new,'/');3817if(!slash_old ||3818!slash_new ||3819 slash_old - old != slash_new -new||3820memcmp(old,new, slash_new -new))3821break;3822 old = slash_old +1;3823new= slash_new +1;3824}3825/* p->old_name thru old is the common prefix, and old and new3826 * through the end of names are renames3827 */3828if(old != p->old_name)3829printf("%s%.*s{%s=>%s} (%d%%)\n", renamecopy,3830(int)(old - p->old_name), p->old_name,3831 old,new, p->score);3832else3833printf("%s %s=>%s(%d%%)\n", renamecopy,3834 p->old_name, p->new_name, p->score);3835show_mode_change(p,0);3836}38373838static voidsummary_patch_list(struct patch *patch)3839{3840struct patch *p;38413842for(p = patch; p; p = p->next) {3843if(p->is_new)3844show_file_mode_name("create", p->new_mode, p->new_name);3845else if(p->is_delete)3846show_file_mode_name("delete", p->old_mode, p->old_name);3847else{3848if(p->is_rename || p->is_copy)3849show_rename_copy(p);3850else{3851if(p->score) {3852printf(" rewrite%s(%d%%)\n",3853 p->new_name, p->score);3854show_mode_change(p,0);3855}3856else3857show_mode_change(p,1);3858}3859}3860}3861}38623863static voidpatch_stats(struct patch *patch)3864{3865int lines = patch->lines_added + patch->lines_deleted;38663867if(lines > max_change)3868 max_change = lines;3869if(patch->old_name) {3870int len =quote_c_style(patch->old_name, NULL, NULL,0);3871if(!len)3872 len =strlen(patch->old_name);3873if(len > max_len)3874 max_len = len;3875}3876if(patch->new_name) {3877int len =quote_c_style(patch->new_name, NULL, NULL,0);3878if(!len)3879 len =strlen(patch->new_name);3880if(len > max_len)3881 max_len = len;3882}3883}38843885static voidremove_file(struct patch *patch,int rmdir_empty)3886{3887if(update_index) {3888if(remove_file_from_cache(patch->old_name) <0)3889die(_("unable to remove%sfrom index"), patch->old_name);3890}3891if(!cached) {3892if(!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {3893remove_path(patch->old_name);3894}3895}3896}38973898static voidadd_index_file(const char*path,unsigned mode,void*buf,unsigned long size)3899{3900struct stat st;3901struct cache_entry *ce;3902int namelen =strlen(path);3903unsigned ce_size =cache_entry_size(namelen);39043905if(!update_index)3906return;39073908 ce =xcalloc(1, ce_size);3909memcpy(ce->name, path, namelen);3910 ce->ce_mode =create_ce_mode(mode);3911 ce->ce_flags =create_ce_flags(0);3912 ce->ce_namelen = namelen;3913if(S_ISGITLINK(mode)) {3914const char*s;39153916if(!skip_prefix(buf,"Subproject commit ", &s) ||3917get_sha1_hex(s, ce->sha1))3918die(_("corrupt patch for submodule%s"), path);3919}else{3920if(!cached) {3921if(lstat(path, &st) <0)3922die_errno(_("unable to stat newly created file '%s'"),3923 path);3924fill_stat_cache_info(ce, &st);3925}3926if(write_sha1_file(buf, size, blob_type, ce->sha1) <0)3927die(_("unable to create backing store for newly created file%s"), path);3928}3929if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)3930die(_("unable to add cache entry for%s"), path);3931}39323933static inttry_create_file(const char*path,unsigned int mode,const char*buf,unsigned long size)3934{3935int fd;3936struct strbuf nbuf = STRBUF_INIT;39373938if(S_ISGITLINK(mode)) {3939struct stat st;3940if(!lstat(path, &st) &&S_ISDIR(st.st_mode))3941return0;3942returnmkdir(path,0777);3943}39443945if(has_symlinks &&S_ISLNK(mode))3946/* Although buf:size is counted string, it also is NUL3947 * terminated.3948 */3949returnsymlink(buf, path);39503951 fd =open(path, O_CREAT | O_EXCL | O_WRONLY, (mode &0100) ?0777:0666);3952if(fd <0)3953return-1;39543955if(convert_to_working_tree(path, buf, size, &nbuf)) {3956 size = nbuf.len;3957 buf = nbuf.buf;3958}3959write_or_die(fd, buf, size);3960strbuf_release(&nbuf);39613962if(close(fd) <0)3963die_errno(_("closing file '%s'"), path);3964return0;3965}39663967/*3968 * We optimistically assume that the directories exist,3969 * which is true 99% of the time anyway. If they don't,3970 * we create them and try again.3971 */3972static voidcreate_one_file(char*path,unsigned mode,const char*buf,unsigned long size)3973{3974if(cached)3975return;3976if(!try_create_file(path, mode, buf, size))3977return;39783979if(errno == ENOENT) {3980if(safe_create_leading_directories(path))3981return;3982if(!try_create_file(path, mode, buf, size))3983return;3984}39853986if(errno == EEXIST || errno == EACCES) {3987/* We may be trying to create a file where a directory3988 * used to be.3989 */3990struct stat st;3991if(!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))3992 errno = EEXIST;3993}39943995if(errno == EEXIST) {3996unsigned int nr =getpid();39973998for(;;) {3999char newpath[PATH_MAX];4000mksnpath(newpath,sizeof(newpath),"%s~%u", path, nr);4001if(!try_create_file(newpath, mode, buf, size)) {4002if(!rename(newpath, path))4003return;4004unlink_or_warn(newpath);4005break;4006}4007if(errno != EEXIST)4008break;4009++nr;4010}4011}4012die_errno(_("unable to write file '%s' mode%o"), path, mode);4013}40144015static voidadd_conflicted_stages_file(struct patch *patch)4016{4017int stage, namelen;4018unsigned ce_size, mode;4019struct cache_entry *ce;40204021if(!update_index)4022return;4023 namelen =strlen(patch->new_name);4024 ce_size =cache_entry_size(namelen);4025 mode = patch->new_mode ? patch->new_mode : (S_IFREG |0644);40264027remove_file_from_cache(patch->new_name);4028for(stage =1; stage <4; stage++) {4029if(is_null_sha1(patch->threeway_stage[stage -1]))4030continue;4031 ce =xcalloc(1, ce_size);4032memcpy(ce->name, patch->new_name, namelen);4033 ce->ce_mode =create_ce_mode(mode);4034 ce->ce_flags =create_ce_flags(stage);4035 ce->ce_namelen = namelen;4036hashcpy(ce->sha1, patch->threeway_stage[stage -1]);4037if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)4038die(_("unable to add cache entry for%s"), patch->new_name);4039}4040}40414042static voidcreate_file(struct patch *patch)4043{4044char*path = patch->new_name;4045unsigned mode = patch->new_mode;4046unsigned long size = patch->resultsize;4047char*buf = patch->result;40484049if(!mode)4050 mode = S_IFREG |0644;4051create_one_file(path, mode, buf, size);40524053if(patch->conflicted_threeway)4054add_conflicted_stages_file(patch);4055else4056add_index_file(path, mode, buf, size);4057}40584059/* phase zero is to remove, phase one is to create */4060static voidwrite_out_one_result(struct patch *patch,int phase)4061{4062if(patch->is_delete >0) {4063if(phase ==0)4064remove_file(patch,1);4065return;4066}4067if(patch->is_new >0|| patch->is_copy) {4068if(phase ==1)4069create_file(patch);4070return;4071}4072/*4073 * Rename or modification boils down to the same4074 * thing: remove the old, write the new4075 */4076if(phase ==0)4077remove_file(patch, patch->is_rename);4078if(phase ==1)4079create_file(patch);4080}40814082static intwrite_out_one_reject(struct patch *patch)4083{4084FILE*rej;4085char namebuf[PATH_MAX];4086struct fragment *frag;4087int cnt =0;4088struct strbuf sb = STRBUF_INIT;40894090for(cnt =0, frag = patch->fragments; frag; frag = frag->next) {4091if(!frag->rejected)4092continue;4093 cnt++;4094}40954096if(!cnt) {4097if(apply_verbosely)4098say_patch_name(stderr,4099_("Applied patch%scleanly."), patch);4100return0;4101}41024103/* This should not happen, because a removal patch that leaves4104 * contents are marked "rejected" at the patch level.4105 */4106if(!patch->new_name)4107die(_("internal error"));41084109/* Say this even without --verbose */4110strbuf_addf(&sb,Q_("Applying patch %%swith%dreject...",4111"Applying patch %%swith%drejects...",4112 cnt),4113 cnt);4114say_patch_name(stderr, sb.buf, patch);4115strbuf_release(&sb);41164117 cnt =strlen(patch->new_name);4118if(ARRAY_SIZE(namebuf) <= cnt +5) {4119 cnt =ARRAY_SIZE(namebuf) -5;4120warning(_("truncating .rej filename to %.*s.rej"),4121 cnt -1, patch->new_name);4122}4123memcpy(namebuf, patch->new_name, cnt);4124memcpy(namebuf + cnt,".rej",5);41254126 rej =fopen(namebuf,"w");4127if(!rej)4128returnerror(_("cannot open%s:%s"), namebuf,strerror(errno));41294130/* Normal git tools never deal with .rej, so do not pretend4131 * this is a git patch by saying --git or giving extended4132 * headers. While at it, maybe please "kompare" that wants4133 * the trailing TAB and some garbage at the end of line ;-).4134 */4135fprintf(rej,"diff a/%sb/%s\t(rejected hunks)\n",4136 patch->new_name, patch->new_name);4137for(cnt =1, frag = patch->fragments;4138 frag;4139 cnt++, frag = frag->next) {4140if(!frag->rejected) {4141fprintf_ln(stderr,_("Hunk #%dapplied cleanly."), cnt);4142continue;4143}4144fprintf_ln(stderr,_("Rejected hunk #%d."), cnt);4145fprintf(rej,"%.*s", frag->size, frag->patch);4146if(frag->patch[frag->size-1] !='\n')4147fputc('\n', rej);4148}4149fclose(rej);4150return-1;4151}41524153static intwrite_out_results(struct patch *list)4154{4155int phase;4156int errs =0;4157struct patch *l;4158struct string_list cpath = STRING_LIST_INIT_DUP;41594160for(phase =0; phase <2; phase++) {4161 l = list;4162while(l) {4163if(l->rejected)4164 errs =1;4165else{4166write_out_one_result(l, phase);4167if(phase ==1) {4168if(write_out_one_reject(l))4169 errs =1;4170if(l->conflicted_threeway) {4171string_list_append(&cpath, l->new_name);4172 errs =1;4173}4174}4175}4176 l = l->next;4177}4178}41794180if(cpath.nr) {4181struct string_list_item *item;41824183string_list_sort(&cpath);4184for_each_string_list_item(item, &cpath)4185fprintf(stderr,"U%s\n", item->string);4186string_list_clear(&cpath,0);41874188rerere(0);4189}41904191return errs;4192}41934194static struct lock_file lock_file;41954196#define INACCURATE_EOF (1<<0)4197#define RECOUNT (1<<1)41984199static intapply_patch(int fd,const char*filename,int options)4200{4201size_t offset;4202struct strbuf buf = STRBUF_INIT;/* owns the patch text */4203struct patch *list = NULL, **listp = &list;4204int skipped_patch =0;42054206 patch_input_file = filename;4207read_patch_file(&buf, fd);4208 offset =0;4209while(offset < buf.len) {4210struct patch *patch;4211int nr;42124213 patch =xcalloc(1,sizeof(*patch));4214 patch->inaccurate_eof = !!(options & INACCURATE_EOF);4215 patch->recount = !!(options & RECOUNT);4216 nr =parse_chunk(buf.buf + offset, buf.len - offset, patch);4217if(nr <0)4218break;4219if(apply_in_reverse)4220reverse_patches(patch);4221if(use_patch(patch)) {4222patch_stats(patch);4223*listp = patch;4224 listp = &patch->next;4225}4226else{4227free_patch(patch);4228 skipped_patch++;4229}4230 offset += nr;4231}42324233if(!list && !skipped_patch)4234die(_("unrecognized input"));42354236if(whitespace_error && (ws_error_action == die_on_ws_error))4237 apply =0;42384239 update_index = check_index && apply;4240if(update_index && newfd <0)4241 newfd =hold_locked_index(&lock_file,1);42424243if(check_index) {4244if(read_cache() <0)4245die(_("unable to read index file"));4246}42474248if((check || apply) &&4249check_patch_list(list) <0&&4250!apply_with_reject)4251exit(1);42524253if(apply &&write_out_results(list)) {4254if(apply_with_reject)4255exit(1);4256/* with --3way, we still need to write the index out */4257return1;4258}42594260if(fake_ancestor)4261build_fake_ancestor(list, fake_ancestor);42624263if(diffstat)4264stat_patch_list(list);42654266if(numstat)4267numstat_patch_list(list);42684269if(summary)4270summary_patch_list(list);42714272free_patch_list(list);4273strbuf_release(&buf);4274string_list_clear(&fn_table,0);4275return0;4276}42774278static voidgit_apply_config(void)4279{4280git_config_get_string_const("apply.whitespace", &apply_default_whitespace);4281git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);4282git_config(git_default_config, NULL);4283}42844285static intoption_parse_exclude(const struct option *opt,4286const char*arg,int unset)4287{4288add_name_limit(arg,1);4289return0;4290}42914292static intoption_parse_include(const struct option *opt,4293const char*arg,int unset)4294{4295add_name_limit(arg,0);4296 has_include =1;4297return0;4298}42994300static intoption_parse_p(const struct option *opt,4301const char*arg,int unset)4302{4303 p_value =atoi(arg);4304 p_value_known =1;4305return0;4306}43074308static intoption_parse_z(const struct option *opt,4309const char*arg,int unset)4310{4311if(unset)4312 line_termination ='\n';4313else4314 line_termination =0;4315return0;4316}43174318static intoption_parse_space_change(const struct option *opt,4319const char*arg,int unset)4320{4321if(unset)4322 ws_ignore_action = ignore_ws_none;4323else4324 ws_ignore_action = ignore_ws_change;4325return0;4326}43274328static intoption_parse_whitespace(const struct option *opt,4329const char*arg,int unset)4330{4331const char**whitespace_option = opt->value;43324333*whitespace_option = arg;4334parse_whitespace_option(arg);4335return0;4336}43374338static intoption_parse_directory(const struct option *opt,4339const char*arg,int unset)4340{4341 root_len =strlen(arg);4342if(root_len && arg[root_len -1] !='/') {4343char*new_root;4344 root = new_root =xmalloc(root_len +2);4345strcpy(new_root, arg);4346strcpy(new_root + root_len++,"/");4347}else4348 root = arg;4349return0;4350}43514352intcmd_apply(int argc,const char**argv,const char*prefix_)4353{4354int i;4355int errs =0;4356int is_not_gitdir = !startup_info->have_repository;4357int force_apply =0;43584359const char*whitespace_option = NULL;43604361struct option builtin_apply_options[] = {4362{ OPTION_CALLBACK,0,"exclude", NULL,N_("path"),4363N_("don't apply changes matching the given path"),43640, option_parse_exclude },4365{ OPTION_CALLBACK,0,"include", NULL,N_("path"),4366N_("apply changes matching the given path"),43670, option_parse_include },4368{ OPTION_CALLBACK,'p', NULL, NULL,N_("num"),4369N_("remove <num> leading slashes from traditional diff paths"),43700, option_parse_p },4371OPT_BOOL(0,"no-add", &no_add,4372N_("ignore additions made by the patch")),4373OPT_BOOL(0,"stat", &diffstat,4374N_("instead of applying the patch, output diffstat for the input")),4375OPT_NOOP_NOARG(0,"allow-binary-replacement"),4376OPT_NOOP_NOARG(0,"binary"),4377OPT_BOOL(0,"numstat", &numstat,4378N_("show number of added and deleted lines in decimal notation")),4379OPT_BOOL(0,"summary", &summary,4380N_("instead of applying the patch, output a summary for the input")),4381OPT_BOOL(0,"check", &check,4382N_("instead of applying the patch, see if the patch is applicable")),4383OPT_BOOL(0,"index", &check_index,4384N_("make sure the patch is applicable to the current index")),4385OPT_BOOL(0,"cached", &cached,4386N_("apply a patch without touching the working tree")),4387OPT_BOOL(0,"apply", &force_apply,4388N_("also apply the patch (use with --stat/--summary/--check)")),4389OPT_BOOL('3',"3way", &threeway,4390N_("attempt three-way merge if a patch does not apply")),4391OPT_FILENAME(0,"build-fake-ancestor", &fake_ancestor,4392N_("build a temporary index based on embedded index information")),4393{ OPTION_CALLBACK,'z', NULL, NULL, NULL,4394N_("paths are separated with NUL character"),4395 PARSE_OPT_NOARG, option_parse_z },4396OPT_INTEGER('C', NULL, &p_context,4397N_("ensure at least <n> lines of context match")),4398{ OPTION_CALLBACK,0,"whitespace", &whitespace_option,N_("action"),4399N_("detect new or modified lines that have whitespace errors"),44000, option_parse_whitespace },4401{ OPTION_CALLBACK,0,"ignore-space-change", NULL, NULL,4402N_("ignore changes in whitespace when finding context"),4403 PARSE_OPT_NOARG, option_parse_space_change },4404{ OPTION_CALLBACK,0,"ignore-whitespace", NULL, NULL,4405N_("ignore changes in whitespace when finding context"),4406 PARSE_OPT_NOARG, option_parse_space_change },4407OPT_BOOL('R',"reverse", &apply_in_reverse,4408N_("apply the patch in reverse")),4409OPT_BOOL(0,"unidiff-zero", &unidiff_zero,4410N_("don't expect at least one line of context")),4411OPT_BOOL(0,"reject", &apply_with_reject,4412N_("leave the rejected hunks in corresponding *.rej files")),4413OPT_BOOL(0,"allow-overlap", &allow_overlap,4414N_("allow overlapping hunks")),4415OPT__VERBOSE(&apply_verbosely,N_("be verbose")),4416OPT_BIT(0,"inaccurate-eof", &options,4417N_("tolerate incorrectly detected missing new-line at the end of file"),4418 INACCURATE_EOF),4419OPT_BIT(0,"recount", &options,4420N_("do not trust the line counts in the hunk headers"),4421 RECOUNT),4422{ OPTION_CALLBACK,0,"directory", NULL,N_("root"),4423N_("prepend <root> to all filenames"),44240, option_parse_directory },4425OPT_END()4426};44274428 prefix = prefix_;4429 prefix_length = prefix ?strlen(prefix) :0;4430git_apply_config();4431if(apply_default_whitespace)4432parse_whitespace_option(apply_default_whitespace);4433if(apply_default_ignorewhitespace)4434parse_ignorewhitespace_option(apply_default_ignorewhitespace);44354436 argc =parse_options(argc, argv, prefix, builtin_apply_options,4437 apply_usage,0);44384439if(apply_with_reject && threeway)4440die("--reject and --3way cannot be used together.");4441if(cached && threeway)4442die("--cached and --3way cannot be used together.");4443if(threeway) {4444if(is_not_gitdir)4445die(_("--3way outside a repository"));4446 check_index =1;4447}4448if(apply_with_reject)4449 apply = apply_verbosely =1;4450if(!force_apply && (diffstat || numstat || summary || check || fake_ancestor))4451 apply =0;4452if(check_index && is_not_gitdir)4453die(_("--index outside a repository"));4454if(cached) {4455if(is_not_gitdir)4456die(_("--cached outside a repository"));4457 check_index =1;4458}4459for(i =0; i < argc; i++) {4460const char*arg = argv[i];4461int fd;44624463if(!strcmp(arg,"-")) {4464 errs |=apply_patch(0,"<stdin>", options);4465 read_stdin =0;4466continue;4467}else if(0< prefix_length)4468 arg =prefix_filename(prefix, prefix_length, arg);44694470 fd =open(arg, O_RDONLY);4471if(fd <0)4472die_errno(_("can't open patch '%s'"), arg);4473 read_stdin =0;4474set_default_whitespace_mode(whitespace_option);4475 errs |=apply_patch(fd, arg, options);4476close(fd);4477}4478set_default_whitespace_mode(whitespace_option);4479if(read_stdin)4480 errs |=apply_patch(0,"<stdin>", options);4481if(whitespace_error) {4482if(squelch_whitespace_errors &&4483 squelch_whitespace_errors < whitespace_error) {4484int squelched =4485 whitespace_error - squelch_whitespace_errors;4486warning(Q_("squelched%dwhitespace error",4487"squelched%dwhitespace errors",4488 squelched),4489 squelched);4490}4491if(ws_error_action == die_on_ws_error)4492die(Q_("%dline adds whitespace errors.",4493"%dlines add whitespace errors.",4494 whitespace_error),4495 whitespace_error);4496if(applied_after_fixing_ws && apply)4497warning("%dline%sapplied after"4498" fixing whitespace errors.",4499 applied_after_fixing_ws,4500 applied_after_fixing_ws ==1?"":"s");4501else if(whitespace_error)4502warning(Q_("%dline adds whitespace errors.",4503"%dlines add whitespace errors.",4504 whitespace_error),4505 whitespace_error);4506}45074508if(update_index) {4509if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK))4510die(_("Unable to write new index file"));4511}45124513return!!errs;4514}