1/* 2 * apply.c 3 * 4 * Copyright (C) Linus Torvalds, 2005 5 * 6 * This applies patches on top of some (arbitrary) version of the SCM. 7 * 8 */ 9#include"cache.h" 10#include"cache-tree.h" 11#include"quote.h" 12#include"blob.h" 13#include"delta.h" 14#include"builtin.h" 15#include"string-list.h" 16#include"dir.h" 17#include"diff.h" 18#include"parse-options.h" 19#include"xdiff-interface.h" 20#include"ll-merge.h" 21#include"rerere.h" 22 23/* 24 * --check turns on checking that the working tree matches the 25 * files that are being modified, but doesn't apply the patch 26 * --stat does just a diffstat, and doesn't actually apply 27 * --numstat does numeric diffstat, and doesn't actually apply 28 * --index-info shows the old and new index info for paths if available. 29 * --index updates the cache as well. 30 * --cached updates only the cache without ever touching the working tree. 31 */ 32static const char*prefix; 33static int prefix_length = -1; 34static int newfd = -1; 35 36static int unidiff_zero; 37static int p_value =1; 38static int p_value_known; 39static int check_index; 40static int update_index; 41static int cached; 42static int diffstat; 43static int numstat; 44static int summary; 45static int check; 46static int apply =1; 47static int apply_in_reverse; 48static int apply_with_reject; 49static int apply_verbosely; 50static int allow_overlap; 51static int no_add; 52static int threeway; 53static const char*fake_ancestor; 54static int line_termination ='\n'; 55static unsigned int p_context = UINT_MAX; 56static const char*const apply_usage[] = { 57N_("git apply [options] [<patch>...]"), 58 NULL 59}; 60 61static enum ws_error_action { 62 nowarn_ws_error, 63 warn_on_ws_error, 64 die_on_ws_error, 65 correct_ws_error 66} ws_error_action = warn_on_ws_error; 67static int whitespace_error; 68static int squelch_whitespace_errors =5; 69static int applied_after_fixing_ws; 70 71static enum ws_ignore { 72 ignore_ws_none, 73 ignore_ws_change 74} ws_ignore_action = ignore_ws_none; 75 76 77static const char*patch_input_file; 78static const char*root; 79static int root_len; 80static int read_stdin =1; 81static int options; 82 83static voidparse_whitespace_option(const char*option) 84{ 85if(!option) { 86 ws_error_action = warn_on_ws_error; 87return; 88} 89if(!strcmp(option,"warn")) { 90 ws_error_action = warn_on_ws_error; 91return; 92} 93if(!strcmp(option,"nowarn")) { 94 ws_error_action = nowarn_ws_error; 95return; 96} 97if(!strcmp(option,"error")) { 98 ws_error_action = die_on_ws_error; 99return; 100} 101if(!strcmp(option,"error-all")) { 102 ws_error_action = die_on_ws_error; 103 squelch_whitespace_errors =0; 104return; 105} 106if(!strcmp(option,"strip") || !strcmp(option,"fix")) { 107 ws_error_action = correct_ws_error; 108return; 109} 110die(_("unrecognized whitespace option '%s'"), option); 111} 112 113static voidparse_ignorewhitespace_option(const char*option) 114{ 115if(!option || !strcmp(option,"no") || 116!strcmp(option,"false") || !strcmp(option,"never") || 117!strcmp(option,"none")) { 118 ws_ignore_action = ignore_ws_none; 119return; 120} 121if(!strcmp(option,"change")) { 122 ws_ignore_action = ignore_ws_change; 123return; 124} 125die(_("unrecognized whitespace ignore option '%s'"), option); 126} 127 128static voidset_default_whitespace_mode(const char*whitespace_option) 129{ 130if(!whitespace_option && !apply_default_whitespace) 131 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); 132} 133 134/* 135 * For "diff-stat" like behaviour, we keep track of the biggest change 136 * we've seen, and the longest filename. That allows us to do simple 137 * scaling. 138 */ 139static int max_change, max_len; 140 141/* 142 * Various "current state", notably line numbers and what 143 * file (and how) we're patching right now.. The "is_xxxx" 144 * things are flags, where -1 means "don't know yet". 145 */ 146static int linenr =1; 147 148/* 149 * This represents one "hunk" from a patch, starting with 150 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 151 * patch text is pointed at by patch, and its byte length 152 * is stored in size. leading and trailing are the number 153 * of context lines. 154 */ 155struct fragment { 156unsigned long leading, trailing; 157unsigned long oldpos, oldlines; 158unsigned long newpos, newlines; 159/* 160 * 'patch' is usually borrowed from buf in apply_patch(), 161 * but some codepaths store an allocated buffer. 162 */ 163const char*patch; 164unsigned free_patch:1, 165 rejected:1; 166int size; 167int linenr; 168struct fragment *next; 169}; 170 171/* 172 * When dealing with a binary patch, we reuse "leading" field 173 * to store the type of the binary hunk, either deflated "delta" 174 * or deflated "literal". 175 */ 176#define binary_patch_method leading 177#define BINARY_DELTA_DEFLATED 1 178#define BINARY_LITERAL_DEFLATED 2 179 180/* 181 * This represents a "patch" to a file, both metainfo changes 182 * such as creation/deletion, filemode and content changes represented 183 * as a series of fragments. 184 */ 185struct patch { 186char*new_name, *old_name, *def_name; 187unsigned int old_mode, new_mode; 188int is_new, is_delete;/* -1 = unknown, 0 = false, 1 = true */ 189int rejected; 190unsigned ws_rule; 191int lines_added, lines_deleted; 192int score; 193unsigned int is_toplevel_relative:1; 194unsigned int inaccurate_eof:1; 195unsigned int is_binary:1; 196unsigned int is_copy:1; 197unsigned int is_rename:1; 198unsigned int recount:1; 199unsigned int conflicted_threeway:1; 200unsigned int direct_to_threeway:1; 201struct fragment *fragments; 202char*result; 203size_t resultsize; 204char old_sha1_prefix[41]; 205char new_sha1_prefix[41]; 206struct patch *next; 207 208/* three-way fallback result */ 209unsigned char threeway_stage[3][20]; 210}; 211 212static voidfree_fragment_list(struct fragment *list) 213{ 214while(list) { 215struct fragment *next = list->next; 216if(list->free_patch) 217free((char*)list->patch); 218free(list); 219 list = next; 220} 221} 222 223static voidfree_patch(struct patch *patch) 224{ 225free_fragment_list(patch->fragments); 226free(patch->def_name); 227free(patch->old_name); 228free(patch->new_name); 229free(patch->result); 230free(patch); 231} 232 233static voidfree_patch_list(struct patch *list) 234{ 235while(list) { 236struct patch *next = list->next; 237free_patch(list); 238 list = next; 239} 240} 241 242/* 243 * A line in a file, len-bytes long (includes the terminating LF, 244 * except for an incomplete line at the end if the file ends with 245 * one), and its contents hashes to 'hash'. 246 */ 247struct line { 248size_t len; 249unsigned hash :24; 250unsigned flag :8; 251#define LINE_COMMON 1 252#define LINE_PATCHED 2 253}; 254 255/* 256 * This represents a "file", which is an array of "lines". 257 */ 258struct image { 259char*buf; 260size_t len; 261size_t nr; 262size_t alloc; 263struct line *line_allocated; 264struct line *line; 265}; 266 267/* 268 * Records filenames that have been touched, in order to handle 269 * the case where more than one patches touch the same file. 270 */ 271 272static struct string_list fn_table; 273 274static uint32_thash_line(const char*cp,size_t len) 275{ 276size_t i; 277uint32_t h; 278for(i =0, h =0; i < len; i++) { 279if(!isspace(cp[i])) { 280 h = h *3+ (cp[i] &0xff); 281} 282} 283return h; 284} 285 286/* 287 * Compare lines s1 of length n1 and s2 of length n2, ignoring 288 * whitespace difference. Returns 1 if they match, 0 otherwise 289 */ 290static intfuzzy_matchlines(const char*s1,size_t n1, 291const char*s2,size_t n2) 292{ 293const char*last1 = s1 + n1 -1; 294const char*last2 = s2 + n2 -1; 295int result =0; 296 297/* ignore line endings */ 298while((*last1 =='\r') || (*last1 =='\n')) 299 last1--; 300while((*last2 =='\r') || (*last2 =='\n')) 301 last2--; 302 303/* skip leading whitespaces, if both begin with whitespace */ 304if(s1 <= last1 && s2 <= last2 &&isspace(*s1) &&isspace(*s2)) { 305while(isspace(*s1) && (s1 <= last1)) 306 s1++; 307while(isspace(*s2) && (s2 <= last2)) 308 s2++; 309} 310/* early return if both lines are empty */ 311if((s1 > last1) && (s2 > last2)) 312return1; 313while(!result) { 314 result = *s1++ - *s2++; 315/* 316 * Skip whitespace inside. We check for whitespace on 317 * both buffers because we don't want "a b" to match 318 * "ab" 319 */ 320if(isspace(*s1) &&isspace(*s2)) { 321while(isspace(*s1) && s1 <= last1) 322 s1++; 323while(isspace(*s2) && s2 <= last2) 324 s2++; 325} 326/* 327 * If we reached the end on one side only, 328 * lines don't match 329 */ 330if( 331((s2 > last2) && (s1 <= last1)) || 332((s1 > last1) && (s2 <= last2))) 333return0; 334if((s1 > last1) && (s2 > last2)) 335break; 336} 337 338return!result; 339} 340 341static voidadd_line_info(struct image *img,const char*bol,size_t len,unsigned flag) 342{ 343ALLOC_GROW(img->line_allocated, img->nr +1, img->alloc); 344 img->line_allocated[img->nr].len = len; 345 img->line_allocated[img->nr].hash =hash_line(bol, len); 346 img->line_allocated[img->nr].flag = flag; 347 img->nr++; 348} 349 350/* 351 * "buf" has the file contents to be patched (read from various sources). 352 * attach it to "image" and add line-based index to it. 353 * "image" now owns the "buf". 354 */ 355static voidprepare_image(struct image *image,char*buf,size_t len, 356int prepare_linetable) 357{ 358const char*cp, *ep; 359 360memset(image,0,sizeof(*image)); 361 image->buf = buf; 362 image->len = len; 363 364if(!prepare_linetable) 365return; 366 367 ep = image->buf + image->len; 368 cp = image->buf; 369while(cp < ep) { 370const char*next; 371for(next = cp; next < ep && *next !='\n'; next++) 372; 373if(next < ep) 374 next++; 375add_line_info(image, cp, next - cp,0); 376 cp = next; 377} 378 image->line = image->line_allocated; 379} 380 381static voidclear_image(struct image *image) 382{ 383free(image->buf); 384free(image->line_allocated); 385memset(image,0,sizeof(*image)); 386} 387 388/* fmt must contain _one_ %s and no other substitution */ 389static voidsay_patch_name(FILE*output,const char*fmt,struct patch *patch) 390{ 391struct strbuf sb = STRBUF_INIT; 392 393if(patch->old_name && patch->new_name && 394strcmp(patch->old_name, patch->new_name)) { 395quote_c_style(patch->old_name, &sb, NULL,0); 396strbuf_addstr(&sb," => "); 397quote_c_style(patch->new_name, &sb, NULL,0); 398}else{ 399const char*n = patch->new_name; 400if(!n) 401 n = patch->old_name; 402quote_c_style(n, &sb, NULL,0); 403} 404fprintf(output, fmt, sb.buf); 405fputc('\n', output); 406strbuf_release(&sb); 407} 408 409#define SLOP (16) 410 411static voidread_patch_file(struct strbuf *sb,int fd) 412{ 413if(strbuf_read(sb, fd,0) <0) 414die_errno("git apply: failed to read"); 415 416/* 417 * Make sure that we have some slop in the buffer 418 * so that we can do speculative "memcmp" etc, and 419 * see to it that it is NUL-filled. 420 */ 421strbuf_grow(sb, SLOP); 422memset(sb->buf + sb->len,0, SLOP); 423} 424 425static unsigned longlinelen(const char*buffer,unsigned long size) 426{ 427unsigned long len =0; 428while(size--) { 429 len++; 430if(*buffer++ =='\n') 431break; 432} 433return len; 434} 435 436static intis_dev_null(const char*str) 437{ 438return!memcmp("/dev/null", str,9) &&isspace(str[9]); 439} 440 441#define TERM_SPACE 1 442#define TERM_TAB 2 443 444static intname_terminate(const char*name,int namelen,int c,int terminate) 445{ 446if(c ==' '&& !(terminate & TERM_SPACE)) 447return0; 448if(c =='\t'&& !(terminate & TERM_TAB)) 449return0; 450 451return1; 452} 453 454/* remove double slashes to make --index work with such filenames */ 455static char*squash_slash(char*name) 456{ 457int i =0, j =0; 458 459if(!name) 460return NULL; 461 462while(name[i]) { 463if((name[j++] = name[i++]) =='/') 464while(name[i] =='/') 465 i++; 466} 467 name[j] ='\0'; 468return name; 469} 470 471static char*find_name_gnu(const char*line,const char*def,int p_value) 472{ 473struct strbuf name = STRBUF_INIT; 474char*cp; 475 476/* 477 * Proposed "new-style" GNU patch/diff format; see 478 * http://marc.info/?l=git&m=112927316408690&w=2 479 */ 480if(unquote_c_style(&name, line, NULL)) { 481strbuf_release(&name); 482return NULL; 483} 484 485for(cp = name.buf; p_value; p_value--) { 486 cp =strchr(cp,'/'); 487if(!cp) { 488strbuf_release(&name); 489return NULL; 490} 491 cp++; 492} 493 494strbuf_remove(&name,0, cp - name.buf); 495if(root) 496strbuf_insert(&name,0, root, root_len); 497returnsquash_slash(strbuf_detach(&name, NULL)); 498} 499 500static size_tsane_tz_len(const char*line,size_t len) 501{ 502const char*tz, *p; 503 504if(len <strlen(" +0500") || line[len-strlen(" +0500")] !=' ') 505return0; 506 tz = line + len -strlen(" +0500"); 507 508if(tz[1] !='+'&& tz[1] !='-') 509return0; 510 511for(p = tz +2; p != line + len; p++) 512if(!isdigit(*p)) 513return0; 514 515return line + len - tz; 516} 517 518static size_ttz_with_colon_len(const char*line,size_t len) 519{ 520const char*tz, *p; 521 522if(len <strlen(" +08:00") || line[len -strlen(":00")] !=':') 523return0; 524 tz = line + len -strlen(" +08:00"); 525 526if(tz[0] !=' '|| (tz[1] !='+'&& tz[1] !='-')) 527return0; 528 p = tz +2; 529if(!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 530!isdigit(*p++) || !isdigit(*p++)) 531return0; 532 533return line + len - tz; 534} 535 536static size_tdate_len(const char*line,size_t len) 537{ 538const char*date, *p; 539 540if(len <strlen("72-02-05") || line[len-strlen("-05")] !='-') 541return0; 542 p = date = line + len -strlen("72-02-05"); 543 544if(!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 545!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 546!isdigit(*p++) || !isdigit(*p++))/* Not a date. */ 547return0; 548 549if(date - line >=strlen("19") && 550isdigit(date[-1]) &&isdigit(date[-2]))/* 4-digit year */ 551 date -=strlen("19"); 552 553return line + len - date; 554} 555 556static size_tshort_time_len(const char*line,size_t len) 557{ 558const char*time, *p; 559 560if(len <strlen(" 07:01:32") || line[len-strlen(":32")] !=':') 561return0; 562 p = time = line + len -strlen(" 07:01:32"); 563 564/* Permit 1-digit hours? */ 565if(*p++ !=' '|| 566!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 567!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 568!isdigit(*p++) || !isdigit(*p++))/* Not a time. */ 569return0; 570 571return line + len - time; 572} 573 574static size_tfractional_time_len(const char*line,size_t len) 575{ 576const char*p; 577size_t n; 578 579/* Expected format: 19:41:17.620000023 */ 580if(!len || !isdigit(line[len -1])) 581return0; 582 p = line + len -1; 583 584/* Fractional seconds. */ 585while(p > line &&isdigit(*p)) 586 p--; 587if(*p !='.') 588return0; 589 590/* Hours, minutes, and whole seconds. */ 591 n =short_time_len(line, p - line); 592if(!n) 593return0; 594 595return line + len - p + n; 596} 597 598static size_ttrailing_spaces_len(const char*line,size_t len) 599{ 600const char*p; 601 602/* Expected format: ' ' x (1 or more) */ 603if(!len || line[len -1] !=' ') 604return0; 605 606 p = line + len; 607while(p != line) { 608 p--; 609if(*p !=' ') 610return line + len - (p +1); 611} 612 613/* All spaces! */ 614return len; 615} 616 617static size_tdiff_timestamp_len(const char*line,size_t len) 618{ 619const char*end = line + len; 620size_t n; 621 622/* 623 * Posix: 2010-07-05 19:41:17 624 * GNU: 2010-07-05 19:41:17.620000023 -0500 625 */ 626 627if(!isdigit(end[-1])) 628return0; 629 630 n =sane_tz_len(line, end - line); 631if(!n) 632 n =tz_with_colon_len(line, end - line); 633 end -= n; 634 635 n =short_time_len(line, end - line); 636if(!n) 637 n =fractional_time_len(line, end - line); 638 end -= n; 639 640 n =date_len(line, end - line); 641if(!n)/* No date. Too bad. */ 642return0; 643 end -= n; 644 645if(end == line)/* No space before date. */ 646return0; 647if(end[-1] =='\t') {/* Success! */ 648 end--; 649return line + len - end; 650} 651if(end[-1] !=' ')/* No space before date. */ 652return0; 653 654/* Whitespace damage. */ 655 end -=trailing_spaces_len(line, end - line); 656return line + len - end; 657} 658 659static char*null_strdup(const char*s) 660{ 661return s ?xstrdup(s) : NULL; 662} 663 664static char*find_name_common(const char*line,const char*def, 665int p_value,const char*end,int terminate) 666{ 667int len; 668const char*start = NULL; 669 670if(p_value ==0) 671 start = line; 672while(line != end) { 673char c = *line; 674 675if(!end &&isspace(c)) { 676if(c =='\n') 677break; 678if(name_terminate(start, line-start, c, terminate)) 679break; 680} 681 line++; 682if(c =='/'&& !--p_value) 683 start = line; 684} 685if(!start) 686returnsquash_slash(null_strdup(def)); 687 len = line - start; 688if(!len) 689returnsquash_slash(null_strdup(def)); 690 691/* 692 * Generally we prefer the shorter name, especially 693 * if the other one is just a variation of that with 694 * something else tacked on to the end (ie "file.orig" 695 * or "file~"). 696 */ 697if(def) { 698int deflen =strlen(def); 699if(deflen < len && !strncmp(start, def, deflen)) 700returnsquash_slash(xstrdup(def)); 701} 702 703if(root) { 704char*ret =xmalloc(root_len + len +1); 705strcpy(ret, root); 706memcpy(ret + root_len, start, len); 707 ret[root_len + len] ='\0'; 708returnsquash_slash(ret); 709} 710 711returnsquash_slash(xmemdupz(start, len)); 712} 713 714static char*find_name(const char*line,char*def,int p_value,int terminate) 715{ 716if(*line =='"') { 717char*name =find_name_gnu(line, def, p_value); 718if(name) 719return name; 720} 721 722returnfind_name_common(line, def, p_value, NULL, terminate); 723} 724 725static char*find_name_traditional(const char*line,char*def,int p_value) 726{ 727size_t len; 728size_t date_len; 729 730if(*line =='"') { 731char*name =find_name_gnu(line, def, p_value); 732if(name) 733return name; 734} 735 736 len =strchrnul(line,'\n') - line; 737 date_len =diff_timestamp_len(line, len); 738if(!date_len) 739returnfind_name_common(line, def, p_value, NULL, TERM_TAB); 740 len -= date_len; 741 742returnfind_name_common(line, def, p_value, line + len,0); 743} 744 745static intcount_slashes(const char*cp) 746{ 747int cnt =0; 748char ch; 749 750while((ch = *cp++)) 751if(ch =='/') 752 cnt++; 753return cnt; 754} 755 756/* 757 * Given the string after "--- " or "+++ ", guess the appropriate 758 * p_value for the given patch. 759 */ 760static intguess_p_value(const char*nameline) 761{ 762char*name, *cp; 763int val = -1; 764 765if(is_dev_null(nameline)) 766return-1; 767 name =find_name_traditional(nameline, NULL,0); 768if(!name) 769return-1; 770 cp =strchr(name,'/'); 771if(!cp) 772 val =0; 773else if(prefix) { 774/* 775 * Does it begin with "a/$our-prefix" and such? Then this is 776 * very likely to apply to our directory. 777 */ 778if(!strncmp(name, prefix, prefix_length)) 779 val =count_slashes(prefix); 780else{ 781 cp++; 782if(!strncmp(cp, prefix, prefix_length)) 783 val =count_slashes(prefix) +1; 784} 785} 786free(name); 787return val; 788} 789 790/* 791 * Does the ---/+++ line has the POSIX timestamp after the last HT? 792 * GNU diff puts epoch there to signal a creation/deletion event. Is 793 * this such a timestamp? 794 */ 795static inthas_epoch_timestamp(const char*nameline) 796{ 797/* 798 * We are only interested in epoch timestamp; any non-zero 799 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 800 * For the same reason, the date must be either 1969-12-31 or 801 * 1970-01-01, and the seconds part must be "00". 802 */ 803const char stamp_regexp[] = 804"^(1969-12-31|1970-01-01)" 805" " 806"[0-2][0-9]:[0-5][0-9]:00(\\.0+)?" 807" " 808"([-+][0-2][0-9]:?[0-5][0-9])\n"; 809const char*timestamp = NULL, *cp, *colon; 810static regex_t *stamp; 811 regmatch_t m[10]; 812int zoneoffset; 813int hourminute; 814int status; 815 816for(cp = nameline; *cp !='\n'; cp++) { 817if(*cp =='\t') 818 timestamp = cp +1; 819} 820if(!timestamp) 821return0; 822if(!stamp) { 823 stamp =xmalloc(sizeof(*stamp)); 824if(regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 825warning(_("Cannot prepare timestamp regexp%s"), 826 stamp_regexp); 827return0; 828} 829} 830 831 status =regexec(stamp, timestamp,ARRAY_SIZE(m), m,0); 832if(status) { 833if(status != REG_NOMATCH) 834warning(_("regexec returned%dfor input:%s"), 835 status, timestamp); 836return0; 837} 838 839 zoneoffset =strtol(timestamp + m[3].rm_so +1, (char**) &colon,10); 840if(*colon ==':') 841 zoneoffset = zoneoffset *60+strtol(colon +1, NULL,10); 842else 843 zoneoffset = (zoneoffset /100) *60+ (zoneoffset %100); 844if(timestamp[m[3].rm_so] =='-') 845 zoneoffset = -zoneoffset; 846 847/* 848 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 849 * (west of GMT) or 1970-01-01 (east of GMT) 850 */ 851if((zoneoffset <0&&memcmp(timestamp,"1969-12-31",10)) || 852(0<= zoneoffset &&memcmp(timestamp,"1970-01-01",10))) 853return0; 854 855 hourminute = (strtol(timestamp +11, NULL,10) *60+ 856strtol(timestamp +14, NULL,10) - 857 zoneoffset); 858 859return((zoneoffset <0&& hourminute ==1440) || 860(0<= zoneoffset && !hourminute)); 861} 862 863/* 864 * Get the name etc info from the ---/+++ lines of a traditional patch header 865 * 866 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 867 * files, we can happily check the index for a match, but for creating a 868 * new file we should try to match whatever "patch" does. I have no idea. 869 */ 870static voidparse_traditional_patch(const char*first,const char*second,struct patch *patch) 871{ 872char*name; 873 874 first +=4;/* skip "--- " */ 875 second +=4;/* skip "+++ " */ 876if(!p_value_known) { 877int p, q; 878 p =guess_p_value(first); 879 q =guess_p_value(second); 880if(p <0) p = q; 881if(0<= p && p == q) { 882 p_value = p; 883 p_value_known =1; 884} 885} 886if(is_dev_null(first)) { 887 patch->is_new =1; 888 patch->is_delete =0; 889 name =find_name_traditional(second, NULL, p_value); 890 patch->new_name = name; 891}else if(is_dev_null(second)) { 892 patch->is_new =0; 893 patch->is_delete =1; 894 name =find_name_traditional(first, NULL, p_value); 895 patch->old_name = name; 896}else{ 897char*first_name; 898 first_name =find_name_traditional(first, NULL, p_value); 899 name =find_name_traditional(second, first_name, p_value); 900free(first_name); 901if(has_epoch_timestamp(first)) { 902 patch->is_new =1; 903 patch->is_delete =0; 904 patch->new_name = name; 905}else if(has_epoch_timestamp(second)) { 906 patch->is_new =0; 907 patch->is_delete =1; 908 patch->old_name = name; 909}else{ 910 patch->old_name = name; 911 patch->new_name =null_strdup(name); 912} 913} 914if(!name) 915die(_("unable to find filename in patch at line%d"), linenr); 916} 917 918static intgitdiff_hdrend(const char*line,struct patch *patch) 919{ 920return-1; 921} 922 923/* 924 * We're anal about diff header consistency, to make 925 * sure that we don't end up having strange ambiguous 926 * patches floating around. 927 * 928 * As a result, gitdiff_{old|new}name() will check 929 * their names against any previous information, just 930 * to make sure.. 931 */ 932#define DIFF_OLD_NAME 0 933#define DIFF_NEW_NAME 1 934 935static char*gitdiff_verify_name(const char*line,int isnull,char*orig_name,int side) 936{ 937if(!orig_name && !isnull) 938returnfind_name(line, NULL, p_value, TERM_TAB); 939 940if(orig_name) { 941int len; 942const char*name; 943char*another; 944 name = orig_name; 945 len =strlen(name); 946if(isnull) 947die(_("git apply: bad git-diff - expected /dev/null, got%son line%d"), name, linenr); 948 another =find_name(line, NULL, p_value, TERM_TAB); 949if(!another ||memcmp(another, name, len +1)) 950die((side == DIFF_NEW_NAME) ? 951_("git apply: bad git-diff - inconsistent new filename on line%d") : 952_("git apply: bad git-diff - inconsistent old filename on line%d"), linenr); 953free(another); 954return orig_name; 955} 956else{ 957/* expect "/dev/null" */ 958if(memcmp("/dev/null", line,9) || line[9] !='\n') 959die(_("git apply: bad git-diff - expected /dev/null on line%d"), linenr); 960return NULL; 961} 962} 963 964static intgitdiff_oldname(const char*line,struct patch *patch) 965{ 966char*orig = patch->old_name; 967 patch->old_name =gitdiff_verify_name(line, patch->is_new, patch->old_name, 968 DIFF_OLD_NAME); 969if(orig != patch->old_name) 970free(orig); 971return0; 972} 973 974static intgitdiff_newname(const char*line,struct patch *patch) 975{ 976char*orig = patch->new_name; 977 patch->new_name =gitdiff_verify_name(line, patch->is_delete, patch->new_name, 978 DIFF_NEW_NAME); 979if(orig != patch->new_name) 980free(orig); 981return0; 982} 983 984static intgitdiff_oldmode(const char*line,struct patch *patch) 985{ 986 patch->old_mode =strtoul(line, NULL,8); 987return0; 988} 989 990static intgitdiff_newmode(const char*line,struct patch *patch) 991{ 992 patch->new_mode =strtoul(line, NULL,8); 993return0; 994} 995 996static intgitdiff_delete(const char*line,struct patch *patch) 997{ 998 patch->is_delete =1; 999free(patch->old_name);1000 patch->old_name =null_strdup(patch->def_name);1001returngitdiff_oldmode(line, patch);1002}10031004static intgitdiff_newfile(const char*line,struct patch *patch)1005{1006 patch->is_new =1;1007free(patch->new_name);1008 patch->new_name =null_strdup(patch->def_name);1009returngitdiff_newmode(line, patch);1010}10111012static intgitdiff_copysrc(const char*line,struct patch *patch)1013{1014 patch->is_copy =1;1015free(patch->old_name);1016 patch->old_name =find_name(line, NULL, p_value ? p_value -1:0,0);1017return0;1018}10191020static intgitdiff_copydst(const char*line,struct patch *patch)1021{1022 patch->is_copy =1;1023free(patch->new_name);1024 patch->new_name =find_name(line, NULL, p_value ? p_value -1:0,0);1025return0;1026}10271028static intgitdiff_renamesrc(const char*line,struct patch *patch)1029{1030 patch->is_rename =1;1031free(patch->old_name);1032 patch->old_name =find_name(line, NULL, p_value ? p_value -1:0,0);1033return0;1034}10351036static intgitdiff_renamedst(const char*line,struct patch *patch)1037{1038 patch->is_rename =1;1039free(patch->new_name);1040 patch->new_name =find_name(line, NULL, p_value ? p_value -1:0,0);1041return0;1042}10431044static intgitdiff_similarity(const char*line,struct patch *patch)1045{1046unsigned long val =strtoul(line, NULL,10);1047if(val <=100)1048 patch->score = val;1049return0;1050}10511052static intgitdiff_dissimilarity(const char*line,struct patch *patch)1053{1054unsigned long val =strtoul(line, NULL,10);1055if(val <=100)1056 patch->score = val;1057return0;1058}10591060static intgitdiff_index(const char*line,struct patch *patch)1061{1062/*1063 * index line is N hexadecimal, "..", N hexadecimal,1064 * and optional space with octal mode.1065 */1066const char*ptr, *eol;1067int len;10681069 ptr =strchr(line,'.');1070if(!ptr || ptr[1] !='.'||40< ptr - line)1071return0;1072 len = ptr - line;1073memcpy(patch->old_sha1_prefix, line, len);1074 patch->old_sha1_prefix[len] =0;10751076 line = ptr +2;1077 ptr =strchr(line,' ');1078 eol =strchrnul(line,'\n');10791080if(!ptr || eol < ptr)1081 ptr = eol;1082 len = ptr - line;10831084if(40< len)1085return0;1086memcpy(patch->new_sha1_prefix, line, len);1087 patch->new_sha1_prefix[len] =0;1088if(*ptr ==' ')1089 patch->old_mode =strtoul(ptr+1, NULL,8);1090return0;1091}10921093/*1094 * This is normal for a diff that doesn't change anything: we'll fall through1095 * into the next diff. Tell the parser to break out.1096 */1097static intgitdiff_unrecognized(const char*line,struct patch *patch)1098{1099return-1;1100}11011102/*1103 * Skip p_value leading components from "line"; as we do not accept1104 * absolute paths, return NULL in that case.1105 */1106static const char*skip_tree_prefix(const char*line,int llen)1107{1108int nslash;1109int i;11101111if(!p_value)1112return(llen && line[0] =='/') ? NULL : line;11131114 nslash = p_value;1115for(i =0; i < llen; i++) {1116int ch = line[i];1117if(ch =='/'&& --nslash <=0)1118return(i ==0) ? NULL : &line[i +1];1119}1120return NULL;1121}11221123/*1124 * This is to extract the same name that appears on "diff --git"1125 * line. We do not find and return anything if it is a rename1126 * patch, and it is OK because we will find the name elsewhere.1127 * We need to reliably find name only when it is mode-change only,1128 * creation or deletion of an empty file. In any of these cases,1129 * both sides are the same name under a/ and b/ respectively.1130 */1131static char*git_header_name(const char*line,int llen)1132{1133const char*name;1134const char*second = NULL;1135size_t len, line_len;11361137 line +=strlen("diff --git ");1138 llen -=strlen("diff --git ");11391140if(*line =='"') {1141const char*cp;1142struct strbuf first = STRBUF_INIT;1143struct strbuf sp = STRBUF_INIT;11441145if(unquote_c_style(&first, line, &second))1146goto free_and_fail1;11471148/* strip the a/b prefix including trailing slash */1149 cp =skip_tree_prefix(first.buf, first.len);1150if(!cp)1151goto free_and_fail1;1152strbuf_remove(&first,0, cp - first.buf);11531154/*1155 * second points at one past closing dq of name.1156 * find the second name.1157 */1158while((second < line + llen) &&isspace(*second))1159 second++;11601161if(line + llen <= second)1162goto free_and_fail1;1163if(*second =='"') {1164if(unquote_c_style(&sp, second, NULL))1165goto free_and_fail1;1166 cp =skip_tree_prefix(sp.buf, sp.len);1167if(!cp)1168goto free_and_fail1;1169/* They must match, otherwise ignore */1170if(strcmp(cp, first.buf))1171goto free_and_fail1;1172strbuf_release(&sp);1173returnstrbuf_detach(&first, NULL);1174}11751176/* unquoted second */1177 cp =skip_tree_prefix(second, line + llen - second);1178if(!cp)1179goto free_and_fail1;1180if(line + llen - cp != first.len ||1181memcmp(first.buf, cp, first.len))1182goto free_and_fail1;1183returnstrbuf_detach(&first, NULL);11841185 free_and_fail1:1186strbuf_release(&first);1187strbuf_release(&sp);1188return NULL;1189}11901191/* unquoted first name */1192 name =skip_tree_prefix(line, llen);1193if(!name)1194return NULL;11951196/*1197 * since the first name is unquoted, a dq if exists must be1198 * the beginning of the second name.1199 */1200for(second = name; second < line + llen; second++) {1201if(*second =='"') {1202struct strbuf sp = STRBUF_INIT;1203const char*np;12041205if(unquote_c_style(&sp, second, NULL))1206goto free_and_fail2;12071208 np =skip_tree_prefix(sp.buf, sp.len);1209if(!np)1210goto free_and_fail2;12111212 len = sp.buf + sp.len - np;1213if(len < second - name &&1214!strncmp(np, name, len) &&1215isspace(name[len])) {1216/* Good */1217strbuf_remove(&sp,0, np - sp.buf);1218returnstrbuf_detach(&sp, NULL);1219}12201221 free_and_fail2:1222strbuf_release(&sp);1223return NULL;1224}1225}12261227/*1228 * Accept a name only if it shows up twice, exactly the same1229 * form.1230 */1231 second =strchr(name,'\n');1232if(!second)1233return NULL;1234 line_len = second - name;1235for(len =0; ; len++) {1236switch(name[len]) {1237default:1238continue;1239case'\n':1240return NULL;1241case'\t':case' ':1242/*1243 * Is this the separator between the preimage1244 * and the postimage pathname? Again, we are1245 * only interested in the case where there is1246 * no rename, as this is only to set def_name1247 * and a rename patch has the names elsewhere1248 * in an unambiguous form.1249 */1250if(!name[len +1])1251return NULL;/* no postimage name */1252 second =skip_tree_prefix(name + len +1,1253 line_len - (len +1));1254if(!second)1255return NULL;1256/*1257 * Does len bytes starting at "name" and "second"1258 * (that are separated by one HT or SP we just1259 * found) exactly match?1260 */1261if(second[len] =='\n'&& !strncmp(name, second, len))1262returnxmemdupz(name, len);1263}1264}1265}12661267/* Verify that we recognize the lines following a git header */1268static intparse_git_header(const char*line,int len,unsigned int size,struct patch *patch)1269{1270unsigned long offset;12711272/* A git diff has explicit new/delete information, so we don't guess */1273 patch->is_new =0;1274 patch->is_delete =0;12751276/*1277 * Some things may not have the old name in the1278 * rest of the headers anywhere (pure mode changes,1279 * or removing or adding empty files), so we get1280 * the default name from the header.1281 */1282 patch->def_name =git_header_name(line, len);1283if(patch->def_name && root) {1284char*s =xstrfmt("%s%s", root, patch->def_name);1285free(patch->def_name);1286 patch->def_name = s;1287}12881289 line += len;1290 size -= len;1291 linenr++;1292for(offset = len ; size >0; offset += len, size -= len, line += len, linenr++) {1293static const struct opentry {1294const char*str;1295int(*fn)(const char*,struct patch *);1296} optable[] = {1297{"@@ -", gitdiff_hdrend },1298{"--- ", gitdiff_oldname },1299{"+++ ", gitdiff_newname },1300{"old mode ", gitdiff_oldmode },1301{"new mode ", gitdiff_newmode },1302{"deleted file mode ", gitdiff_delete },1303{"new file mode ", gitdiff_newfile },1304{"copy from ", gitdiff_copysrc },1305{"copy to ", gitdiff_copydst },1306{"rename old ", gitdiff_renamesrc },1307{"rename new ", gitdiff_renamedst },1308{"rename from ", gitdiff_renamesrc },1309{"rename to ", gitdiff_renamedst },1310{"similarity index ", gitdiff_similarity },1311{"dissimilarity index ", gitdiff_dissimilarity },1312{"index ", gitdiff_index },1313{"", gitdiff_unrecognized },1314};1315int i;13161317 len =linelen(line, size);1318if(!len || line[len-1] !='\n')1319break;1320for(i =0; i <ARRAY_SIZE(optable); i++) {1321const struct opentry *p = optable + i;1322int oplen =strlen(p->str);1323if(len < oplen ||memcmp(p->str, line, oplen))1324continue;1325if(p->fn(line + oplen, patch) <0)1326return offset;1327break;1328}1329}13301331return offset;1332}13331334static intparse_num(const char*line,unsigned long*p)1335{1336char*ptr;13371338if(!isdigit(*line))1339return0;1340*p =strtoul(line, &ptr,10);1341return ptr - line;1342}13431344static intparse_range(const char*line,int len,int offset,const char*expect,1345unsigned long*p1,unsigned long*p2)1346{1347int digits, ex;13481349if(offset <0|| offset >= len)1350return-1;1351 line += offset;1352 len -= offset;13531354 digits =parse_num(line, p1);1355if(!digits)1356return-1;13571358 offset += digits;1359 line += digits;1360 len -= digits;13611362*p2 =1;1363if(*line ==',') {1364 digits =parse_num(line+1, p2);1365if(!digits)1366return-1;13671368 offset += digits+1;1369 line += digits+1;1370 len -= digits+1;1371}13721373 ex =strlen(expect);1374if(ex > len)1375return-1;1376if(memcmp(line, expect, ex))1377return-1;13781379return offset + ex;1380}13811382static voidrecount_diff(const char*line,int size,struct fragment *fragment)1383{1384int oldlines =0, newlines =0, ret =0;13851386if(size <1) {1387warning("recount: ignore empty hunk");1388return;1389}13901391for(;;) {1392int len =linelen(line, size);1393 size -= len;1394 line += len;13951396if(size <1)1397break;13981399switch(*line) {1400case' ':case'\n':1401 newlines++;1402/* fall through */1403case'-':1404 oldlines++;1405continue;1406case'+':1407 newlines++;1408continue;1409case'\\':1410continue;1411case'@':1412 ret = size <3|| !starts_with(line,"@@ ");1413break;1414case'd':1415 ret = size <5|| !starts_with(line,"diff ");1416break;1417default:1418 ret = -1;1419break;1420}1421if(ret) {1422warning(_("recount: unexpected line: %.*s"),1423(int)linelen(line, size), line);1424return;1425}1426break;1427}1428 fragment->oldlines = oldlines;1429 fragment->newlines = newlines;1430}14311432/*1433 * Parse a unified diff fragment header of the1434 * form "@@ -a,b +c,d @@"1435 */1436static intparse_fragment_header(const char*line,int len,struct fragment *fragment)1437{1438int offset;14391440if(!len || line[len-1] !='\n')1441return-1;14421443/* Figure out the number of lines in a fragment */1444 offset =parse_range(line, len,4," +", &fragment->oldpos, &fragment->oldlines);1445 offset =parse_range(line, len, offset," @@", &fragment->newpos, &fragment->newlines);14461447return offset;1448}14491450static intfind_header(const char*line,unsigned long size,int*hdrsize,struct patch *patch)1451{1452unsigned long offset, len;14531454 patch->is_toplevel_relative =0;1455 patch->is_rename = patch->is_copy =0;1456 patch->is_new = patch->is_delete = -1;1457 patch->old_mode = patch->new_mode =0;1458 patch->old_name = patch->new_name = NULL;1459for(offset =0; size >0; offset += len, size -= len, line += len, linenr++) {1460unsigned long nextlen;14611462 len =linelen(line, size);1463if(!len)1464break;14651466/* Testing this early allows us to take a few shortcuts.. */1467if(len <6)1468continue;14691470/*1471 * Make sure we don't find any unconnected patch fragments.1472 * That's a sign that we didn't find a header, and that a1473 * patch has become corrupted/broken up.1474 */1475if(!memcmp("@@ -", line,4)) {1476struct fragment dummy;1477if(parse_fragment_header(line, len, &dummy) <0)1478continue;1479die(_("patch fragment without header at line%d: %.*s"),1480 linenr, (int)len-1, line);1481}14821483if(size < len +6)1484break;14851486/*1487 * Git patch? It might not have a real patch, just a rename1488 * or mode change, so we handle that specially1489 */1490if(!memcmp("diff --git ", line,11)) {1491int git_hdr_len =parse_git_header(line, len, size, patch);1492if(git_hdr_len <= len)1493continue;1494if(!patch->old_name && !patch->new_name) {1495if(!patch->def_name)1496die(Q_("git diff header lacks filename information when removing "1497"%dleading pathname component (line%d)",1498"git diff header lacks filename information when removing "1499"%dleading pathname components (line%d)",1500 p_value),1501 p_value, linenr);1502 patch->old_name =xstrdup(patch->def_name);1503 patch->new_name =xstrdup(patch->def_name);1504}1505if(!patch->is_delete && !patch->new_name)1506die("git diff header lacks filename information "1507"(line%d)", linenr);1508 patch->is_toplevel_relative =1;1509*hdrsize = git_hdr_len;1510return offset;1511}15121513/* --- followed by +++ ? */1514if(memcmp("--- ", line,4) ||memcmp("+++ ", line + len,4))1515continue;15161517/*1518 * We only accept unified patches, so we want it to1519 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1520 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1521 */1522 nextlen =linelen(line + len, size - len);1523if(size < nextlen +14||memcmp("@@ -", line + len + nextlen,4))1524continue;15251526/* Ok, we'll consider it a patch */1527parse_traditional_patch(line, line+len, patch);1528*hdrsize = len + nextlen;1529 linenr +=2;1530return offset;1531}1532return-1;1533}15341535static voidrecord_ws_error(unsigned result,const char*line,int len,int linenr)1536{1537char*err;15381539if(!result)1540return;15411542 whitespace_error++;1543if(squelch_whitespace_errors &&1544 squelch_whitespace_errors < whitespace_error)1545return;15461547 err =whitespace_error_string(result);1548fprintf(stderr,"%s:%d:%s.\n%.*s\n",1549 patch_input_file, linenr, err, len, line);1550free(err);1551}15521553static voidcheck_whitespace(const char*line,int len,unsigned ws_rule)1554{1555unsigned result =ws_check(line +1, len -1, ws_rule);15561557record_ws_error(result, line +1, len -2, linenr);1558}15591560/*1561 * Parse a unified diff. Note that this really needs to parse each1562 * fragment separately, since the only way to know the difference1563 * between a "---" that is part of a patch, and a "---" that starts1564 * the next patch is to look at the line counts..1565 */1566static intparse_fragment(const char*line,unsigned long size,1567struct patch *patch,struct fragment *fragment)1568{1569int added, deleted;1570int len =linelen(line, size), offset;1571unsigned long oldlines, newlines;1572unsigned long leading, trailing;15731574 offset =parse_fragment_header(line, len, fragment);1575if(offset <0)1576return-1;1577if(offset >0&& patch->recount)1578recount_diff(line + offset, size - offset, fragment);1579 oldlines = fragment->oldlines;1580 newlines = fragment->newlines;1581 leading =0;1582 trailing =0;15831584/* Parse the thing.. */1585 line += len;1586 size -= len;1587 linenr++;1588 added = deleted =0;1589for(offset = len;15900< size;1591 offset += len, size -= len, line += len, linenr++) {1592if(!oldlines && !newlines)1593break;1594 len =linelen(line, size);1595if(!len || line[len-1] !='\n')1596return-1;1597switch(*line) {1598default:1599return-1;1600case'\n':/* newer GNU diff, an empty context line */1601case' ':1602 oldlines--;1603 newlines--;1604if(!deleted && !added)1605 leading++;1606 trailing++;1607break;1608case'-':1609if(apply_in_reverse &&1610 ws_error_action != nowarn_ws_error)1611check_whitespace(line, len, patch->ws_rule);1612 deleted++;1613 oldlines--;1614 trailing =0;1615break;1616case'+':1617if(!apply_in_reverse &&1618 ws_error_action != nowarn_ws_error)1619check_whitespace(line, len, patch->ws_rule);1620 added++;1621 newlines--;1622 trailing =0;1623break;16241625/*1626 * We allow "\ No newline at end of file". Depending1627 * on locale settings when the patch was produced we1628 * don't know what this line looks like. The only1629 * thing we do know is that it begins with "\ ".1630 * Checking for 12 is just for sanity check -- any1631 * l10n of "\ No newline..." is at least that long.1632 */1633case'\\':1634if(len <12||memcmp(line,"\\",2))1635return-1;1636break;1637}1638}1639if(oldlines || newlines)1640return-1;1641 fragment->leading = leading;1642 fragment->trailing = trailing;16431644/*1645 * If a fragment ends with an incomplete line, we failed to include1646 * it in the above loop because we hit oldlines == newlines == 01647 * before seeing it.1648 */1649if(12< size && !memcmp(line,"\\",2))1650 offset +=linelen(line, size);16511652 patch->lines_added += added;1653 patch->lines_deleted += deleted;16541655if(0< patch->is_new && oldlines)1656returnerror(_("new file depends on old contents"));1657if(0< patch->is_delete && newlines)1658returnerror(_("deleted file still has contents"));1659return offset;1660}16611662/*1663 * We have seen "diff --git a/... b/..." header (or a traditional patch1664 * header). Read hunks that belong to this patch into fragments and hang1665 * them to the given patch structure.1666 *1667 * The (fragment->patch, fragment->size) pair points into the memory given1668 * by the caller, not a copy, when we return.1669 */1670static intparse_single_patch(const char*line,unsigned long size,struct patch *patch)1671{1672unsigned long offset =0;1673unsigned long oldlines =0, newlines =0, context =0;1674struct fragment **fragp = &patch->fragments;16751676while(size >4&& !memcmp(line,"@@ -",4)) {1677struct fragment *fragment;1678int len;16791680 fragment =xcalloc(1,sizeof(*fragment));1681 fragment->linenr = linenr;1682 len =parse_fragment(line, size, patch, fragment);1683if(len <=0)1684die(_("corrupt patch at line%d"), linenr);1685 fragment->patch = line;1686 fragment->size = len;1687 oldlines += fragment->oldlines;1688 newlines += fragment->newlines;1689 context += fragment->leading + fragment->trailing;16901691*fragp = fragment;1692 fragp = &fragment->next;16931694 offset += len;1695 line += len;1696 size -= len;1697}16981699/*1700 * If something was removed (i.e. we have old-lines) it cannot1701 * be creation, and if something was added it cannot be1702 * deletion. However, the reverse is not true; --unified=01703 * patches that only add are not necessarily creation even1704 * though they do not have any old lines, and ones that only1705 * delete are not necessarily deletion.1706 *1707 * Unfortunately, a real creation/deletion patch do _not_ have1708 * any context line by definition, so we cannot safely tell it1709 * apart with --unified=0 insanity. At least if the patch has1710 * more than one hunk it is not creation or deletion.1711 */1712if(patch->is_new <0&&1713(oldlines || (patch->fragments && patch->fragments->next)))1714 patch->is_new =0;1715if(patch->is_delete <0&&1716(newlines || (patch->fragments && patch->fragments->next)))1717 patch->is_delete =0;17181719if(0< patch->is_new && oldlines)1720die(_("new file%sdepends on old contents"), patch->new_name);1721if(0< patch->is_delete && newlines)1722die(_("deleted file%sstill has contents"), patch->old_name);1723if(!patch->is_delete && !newlines && context)1724fprintf_ln(stderr,1725_("** warning: "1726"file%sbecomes empty but is not deleted"),1727 patch->new_name);17281729return offset;1730}17311732staticinlineintmetadata_changes(struct patch *patch)1733{1734return patch->is_rename >0||1735 patch->is_copy >0||1736 patch->is_new >0||1737 patch->is_delete ||1738(patch->old_mode && patch->new_mode &&1739 patch->old_mode != patch->new_mode);1740}17411742static char*inflate_it(const void*data,unsigned long size,1743unsigned long inflated_size)1744{1745 git_zstream stream;1746void*out;1747int st;17481749memset(&stream,0,sizeof(stream));17501751 stream.next_in = (unsigned char*)data;1752 stream.avail_in = size;1753 stream.next_out = out =xmalloc(inflated_size);1754 stream.avail_out = inflated_size;1755git_inflate_init(&stream);1756 st =git_inflate(&stream, Z_FINISH);1757git_inflate_end(&stream);1758if((st != Z_STREAM_END) || stream.total_out != inflated_size) {1759free(out);1760return NULL;1761}1762return out;1763}17641765/*1766 * Read a binary hunk and return a new fragment; fragment->patch1767 * points at an allocated memory that the caller must free, so1768 * it is marked as "->free_patch = 1".1769 */1770static struct fragment *parse_binary_hunk(char**buf_p,1771unsigned long*sz_p,1772int*status_p,1773int*used_p)1774{1775/*1776 * Expect a line that begins with binary patch method ("literal"1777 * or "delta"), followed by the length of data before deflating.1778 * a sequence of 'length-byte' followed by base-85 encoded data1779 * should follow, terminated by a newline.1780 *1781 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1782 * and we would limit the patch line to 66 characters,1783 * so one line can fit up to 13 groups that would decode1784 * to 52 bytes max. The length byte 'A'-'Z' corresponds1785 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1786 */1787int llen, used;1788unsigned long size = *sz_p;1789char*buffer = *buf_p;1790int patch_method;1791unsigned long origlen;1792char*data = NULL;1793int hunk_size =0;1794struct fragment *frag;17951796 llen =linelen(buffer, size);1797 used = llen;17981799*status_p =0;18001801if(starts_with(buffer,"delta ")) {1802 patch_method = BINARY_DELTA_DEFLATED;1803 origlen =strtoul(buffer +6, NULL,10);1804}1805else if(starts_with(buffer,"literal ")) {1806 patch_method = BINARY_LITERAL_DEFLATED;1807 origlen =strtoul(buffer +8, NULL,10);1808}1809else1810return NULL;18111812 linenr++;1813 buffer += llen;1814while(1) {1815int byte_length, max_byte_length, newsize;1816 llen =linelen(buffer, size);1817 used += llen;1818 linenr++;1819if(llen ==1) {1820/* consume the blank line */1821 buffer++;1822 size--;1823break;1824}1825/*1826 * Minimum line is "A00000\n" which is 7-byte long,1827 * and the line length must be multiple of 5 plus 2.1828 */1829if((llen <7) || (llen-2) %5)1830goto corrupt;1831 max_byte_length = (llen -2) /5*4;1832 byte_length = *buffer;1833if('A'<= byte_length && byte_length <='Z')1834 byte_length = byte_length -'A'+1;1835else if('a'<= byte_length && byte_length <='z')1836 byte_length = byte_length -'a'+27;1837else1838goto corrupt;1839/* if the input length was not multiple of 4, we would1840 * have filler at the end but the filler should never1841 * exceed 3 bytes1842 */1843if(max_byte_length < byte_length ||1844 byte_length <= max_byte_length -4)1845goto corrupt;1846 newsize = hunk_size + byte_length;1847 data =xrealloc(data, newsize);1848if(decode_85(data + hunk_size, buffer +1, byte_length))1849goto corrupt;1850 hunk_size = newsize;1851 buffer += llen;1852 size -= llen;1853}18541855 frag =xcalloc(1,sizeof(*frag));1856 frag->patch =inflate_it(data, hunk_size, origlen);1857 frag->free_patch =1;1858if(!frag->patch)1859goto corrupt;1860free(data);1861 frag->size = origlen;1862*buf_p = buffer;1863*sz_p = size;1864*used_p = used;1865 frag->binary_patch_method = patch_method;1866return frag;18671868 corrupt:1869free(data);1870*status_p = -1;1871error(_("corrupt binary patch at line%d: %.*s"),1872 linenr-1, llen-1, buffer);1873return NULL;1874}18751876static intparse_binary(char*buffer,unsigned long size,struct patch *patch)1877{1878/*1879 * We have read "GIT binary patch\n"; what follows is a line1880 * that says the patch method (currently, either "literal" or1881 * "delta") and the length of data before deflating; a1882 * sequence of 'length-byte' followed by base-85 encoded data1883 * follows.1884 *1885 * When a binary patch is reversible, there is another binary1886 * hunk in the same format, starting with patch method (either1887 * "literal" or "delta") with the length of data, and a sequence1888 * of length-byte + base-85 encoded data, terminated with another1889 * empty line. This data, when applied to the postimage, produces1890 * the preimage.1891 */1892struct fragment *forward;1893struct fragment *reverse;1894int status;1895int used, used_1;18961897 forward =parse_binary_hunk(&buffer, &size, &status, &used);1898if(!forward && !status)1899/* there has to be one hunk (forward hunk) */1900returnerror(_("unrecognized binary patch at line%d"), linenr-1);1901if(status)1902/* otherwise we already gave an error message */1903return status;19041905 reverse =parse_binary_hunk(&buffer, &size, &status, &used_1);1906if(reverse)1907 used += used_1;1908else if(status) {1909/*1910 * Not having reverse hunk is not an error, but having1911 * a corrupt reverse hunk is.1912 */1913free((void*) forward->patch);1914free(forward);1915return status;1916}1917 forward->next = reverse;1918 patch->fragments = forward;1919 patch->is_binary =1;1920return used;1921}19221923static voidprefix_one(char**name)1924{1925char*old_name = *name;1926if(!old_name)1927return;1928*name =xstrdup(prefix_filename(prefix, prefix_length, *name));1929free(old_name);1930}19311932static voidprefix_patch(struct patch *p)1933{1934if(!prefix || p->is_toplevel_relative)1935return;1936prefix_one(&p->new_name);1937prefix_one(&p->old_name);1938}19391940/*1941 * include/exclude1942 */19431944static struct string_list limit_by_name;1945static int has_include;1946static voidadd_name_limit(const char*name,int exclude)1947{1948struct string_list_item *it;19491950 it =string_list_append(&limit_by_name, name);1951 it->util = exclude ? NULL : (void*)1;1952}19531954static intuse_patch(struct patch *p)1955{1956const char*pathname = p->new_name ? p->new_name : p->old_name;1957int i;19581959/* Paths outside are not touched regardless of "--include" */1960if(0< prefix_length) {1961int pathlen =strlen(pathname);1962if(pathlen <= prefix_length ||1963memcmp(prefix, pathname, prefix_length))1964return0;1965}19661967/* See if it matches any of exclude/include rule */1968for(i =0; i < limit_by_name.nr; i++) {1969struct string_list_item *it = &limit_by_name.items[i];1970if(!wildmatch(it->string, pathname,0, NULL))1971return(it->util != NULL);1972}19731974/*1975 * If we had any include, a path that does not match any rule is1976 * not used. Otherwise, we saw bunch of exclude rules (or none)1977 * and such a path is used.1978 */1979return!has_include;1980}198119821983/*1984 * Read the patch text in "buffer" that extends for "size" bytes; stop1985 * reading after seeing a single patch (i.e. changes to a single file).1986 * Create fragments (i.e. patch hunks) and hang them to the given patch.1987 * Return the number of bytes consumed, so that the caller can call us1988 * again for the next patch.1989 */1990static intparse_chunk(char*buffer,unsigned long size,struct patch *patch)1991{1992int hdrsize, patchsize;1993int offset =find_header(buffer, size, &hdrsize, patch);19941995if(offset <0)1996return offset;19971998prefix_patch(patch);19992000if(!use_patch(patch))2001 patch->ws_rule =0;2002else2003 patch->ws_rule =whitespace_rule(patch->new_name2004? patch->new_name2005: patch->old_name);20062007 patchsize =parse_single_patch(buffer + offset + hdrsize,2008 size - offset - hdrsize, patch);20092010if(!patchsize) {2011static const char git_binary[] ="GIT binary patch\n";2012int hd = hdrsize + offset;2013unsigned long llen =linelen(buffer + hd, size - hd);20142015if(llen ==sizeof(git_binary) -1&&2016!memcmp(git_binary, buffer + hd, llen)) {2017int used;2018 linenr++;2019 used =parse_binary(buffer + hd + llen,2020 size - hd - llen, patch);2021if(used)2022 patchsize = used + llen;2023else2024 patchsize =0;2025}2026else if(!memcmp(" differ\n", buffer + hd + llen -8,8)) {2027static const char*binhdr[] = {2028"Binary files ",2029"Files ",2030 NULL,2031};2032int i;2033for(i =0; binhdr[i]; i++) {2034int len =strlen(binhdr[i]);2035if(len < size - hd &&2036!memcmp(binhdr[i], buffer + hd, len)) {2037 linenr++;2038 patch->is_binary =1;2039 patchsize = llen;2040break;2041}2042}2043}20442045/* Empty patch cannot be applied if it is a text patch2046 * without metadata change. A binary patch appears2047 * empty to us here.2048 */2049if((apply || check) &&2050(!patch->is_binary && !metadata_changes(patch)))2051die(_("patch with only garbage at line%d"), linenr);2052}20532054return offset + hdrsize + patchsize;2055}20562057#define swap(a,b) myswap((a),(b),sizeof(a))20582059#define myswap(a, b, size) do { \2060 unsigned char mytmp[size]; \2061 memcpy(mytmp, &a, size); \2062 memcpy(&a, &b, size); \2063 memcpy(&b, mytmp, size); \2064} while (0)20652066static voidreverse_patches(struct patch *p)2067{2068for(; p; p = p->next) {2069struct fragment *frag = p->fragments;20702071swap(p->new_name, p->old_name);2072swap(p->new_mode, p->old_mode);2073swap(p->is_new, p->is_delete);2074swap(p->lines_added, p->lines_deleted);2075swap(p->old_sha1_prefix, p->new_sha1_prefix);20762077for(; frag; frag = frag->next) {2078swap(frag->newpos, frag->oldpos);2079swap(frag->newlines, frag->oldlines);2080}2081}2082}20832084static const char pluses[] =2085"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2086static const char minuses[]=2087"----------------------------------------------------------------------";20882089static voidshow_stats(struct patch *patch)2090{2091struct strbuf qname = STRBUF_INIT;2092char*cp = patch->new_name ? patch->new_name : patch->old_name;2093int max, add, del;20942095quote_c_style(cp, &qname, NULL,0);20962097/*2098 * "scale" the filename2099 */2100 max = max_len;2101if(max >50)2102 max =50;21032104if(qname.len > max) {2105 cp =strchr(qname.buf + qname.len +3- max,'/');2106if(!cp)2107 cp = qname.buf + qname.len +3- max;2108strbuf_splice(&qname,0, cp - qname.buf,"...",3);2109}21102111if(patch->is_binary) {2112printf(" %-*s | Bin\n", max, qname.buf);2113strbuf_release(&qname);2114return;2115}21162117printf(" %-*s |", max, qname.buf);2118strbuf_release(&qname);21192120/*2121 * scale the add/delete2122 */2123 max = max + max_change >70?70- max : max_change;2124 add = patch->lines_added;2125 del = patch->lines_deleted;21262127if(max_change >0) {2128int total = ((add + del) * max + max_change /2) / max_change;2129 add = (add * max + max_change /2) / max_change;2130 del = total - add;2131}2132printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2133 add, pluses, del, minuses);2134}21352136static intread_old_data(struct stat *st,const char*path,struct strbuf *buf)2137{2138switch(st->st_mode & S_IFMT) {2139case S_IFLNK:2140if(strbuf_readlink(buf, path, st->st_size) <0)2141returnerror(_("unable to read symlink%s"), path);2142return0;2143case S_IFREG:2144if(strbuf_read_file(buf, path, st->st_size) != st->st_size)2145returnerror(_("unable to open or read%s"), path);2146convert_to_git(path, buf->buf, buf->len, buf,0);2147return0;2148default:2149return-1;2150}2151}21522153/*2154 * Update the preimage, and the common lines in postimage,2155 * from buffer buf of length len. If postlen is 0 the postimage2156 * is updated in place, otherwise it's updated on a new buffer2157 * of length postlen2158 */21592160static voidupdate_pre_post_images(struct image *preimage,2161struct image *postimage,2162char*buf,2163size_t len,size_t postlen)2164{2165int i, ctx, reduced;2166char*new, *old, *fixed;2167struct image fixed_preimage;21682169/*2170 * Update the preimage with whitespace fixes. Note that we2171 * are not losing preimage->buf -- apply_one_fragment() will2172 * free "oldlines".2173 */2174prepare_image(&fixed_preimage, buf, len,1);2175assert(postlen2176? fixed_preimage.nr == preimage->nr2177: fixed_preimage.nr <= preimage->nr);2178for(i =0; i < fixed_preimage.nr; i++)2179 fixed_preimage.line[i].flag = preimage->line[i].flag;2180free(preimage->line_allocated);2181*preimage = fixed_preimage;21822183/*2184 * Adjust the common context lines in postimage. This can be2185 * done in-place when we are shrinking it with whitespace2186 * fixing, but needs a new buffer when ignoring whitespace or2187 * expanding leading tabs to spaces.2188 *2189 * We trust the caller to tell us if the update can be done2190 * in place (postlen==0) or not.2191 */2192 old = postimage->buf;2193if(postlen)2194new= postimage->buf =xmalloc(postlen);2195else2196new= old;2197 fixed = preimage->buf;21982199for(i = reduced = ctx =0; i < postimage->nr; i++) {2200size_t len = postimage->line[i].len;2201if(!(postimage->line[i].flag & LINE_COMMON)) {2202/* an added line -- no counterparts in preimage */2203memmove(new, old, len);2204 old += len;2205new+= len;2206continue;2207}22082209/* a common context -- skip it in the original postimage */2210 old += len;22112212/* and find the corresponding one in the fixed preimage */2213while(ctx < preimage->nr &&2214!(preimage->line[ctx].flag & LINE_COMMON)) {2215 fixed += preimage->line[ctx].len;2216 ctx++;2217}22182219/*2220 * preimage is expected to run out, if the caller2221 * fixed addition of trailing blank lines.2222 */2223if(preimage->nr <= ctx) {2224 reduced++;2225continue;2226}22272228/* and copy it in, while fixing the line length */2229 len = preimage->line[ctx].len;2230memcpy(new, fixed, len);2231new+= len;2232 fixed += len;2233 postimage->line[i].len = len;2234 ctx++;2235}22362237/* Fix the length of the whole thing */2238 postimage->len =new- postimage->buf;2239 postimage->nr -= reduced;2240}22412242static intmatch_fragment(struct image *img,2243struct image *preimage,2244struct image *postimage,2245unsigned longtry,2246int try_lno,2247unsigned ws_rule,2248int match_beginning,int match_end)2249{2250int i;2251char*fixed_buf, *buf, *orig, *target;2252struct strbuf fixed;2253size_t fixed_len, postlen;2254int preimage_limit;22552256if(preimage->nr + try_lno <= img->nr) {2257/*2258 * The hunk falls within the boundaries of img.2259 */2260 preimage_limit = preimage->nr;2261if(match_end && (preimage->nr + try_lno != img->nr))2262return0;2263}else if(ws_error_action == correct_ws_error &&2264(ws_rule & WS_BLANK_AT_EOF)) {2265/*2266 * This hunk extends beyond the end of img, and we are2267 * removing blank lines at the end of the file. This2268 * many lines from the beginning of the preimage must2269 * match with img, and the remainder of the preimage2270 * must be blank.2271 */2272 preimage_limit = img->nr - try_lno;2273}else{2274/*2275 * The hunk extends beyond the end of the img and2276 * we are not removing blanks at the end, so we2277 * should reject the hunk at this position.2278 */2279return0;2280}22812282if(match_beginning && try_lno)2283return0;22842285/* Quick hash check */2286for(i =0; i < preimage_limit; i++)2287if((img->line[try_lno + i].flag & LINE_PATCHED) ||2288(preimage->line[i].hash != img->line[try_lno + i].hash))2289return0;22902291if(preimage_limit == preimage->nr) {2292/*2293 * Do we have an exact match? If we were told to match2294 * at the end, size must be exactly at try+fragsize,2295 * otherwise try+fragsize must be still within the preimage,2296 * and either case, the old piece should match the preimage2297 * exactly.2298 */2299if((match_end2300? (try+ preimage->len == img->len)2301: (try+ preimage->len <= img->len)) &&2302!memcmp(img->buf +try, preimage->buf, preimage->len))2303return1;2304}else{2305/*2306 * The preimage extends beyond the end of img, so2307 * there cannot be an exact match.2308 *2309 * There must be one non-blank context line that match2310 * a line before the end of img.2311 */2312char*buf_end;23132314 buf = preimage->buf;2315 buf_end = buf;2316for(i =0; i < preimage_limit; i++)2317 buf_end += preimage->line[i].len;23182319for( ; buf < buf_end; buf++)2320if(!isspace(*buf))2321break;2322if(buf == buf_end)2323return0;2324}23252326/*2327 * No exact match. If we are ignoring whitespace, run a line-by-line2328 * fuzzy matching. We collect all the line length information because2329 * we need it to adjust whitespace if we match.2330 */2331if(ws_ignore_action == ignore_ws_change) {2332size_t imgoff =0;2333size_t preoff =0;2334size_t postlen = postimage->len;2335size_t extra_chars;2336char*preimage_eof;2337char*preimage_end;2338for(i =0; i < preimage_limit; i++) {2339size_t prelen = preimage->line[i].len;2340size_t imglen = img->line[try_lno+i].len;23412342if(!fuzzy_matchlines(img->buf +try+ imgoff, imglen,2343 preimage->buf + preoff, prelen))2344return0;2345if(preimage->line[i].flag & LINE_COMMON)2346 postlen += imglen - prelen;2347 imgoff += imglen;2348 preoff += prelen;2349}23502351/*2352 * Ok, the preimage matches with whitespace fuzz.2353 *2354 * imgoff now holds the true length of the target that2355 * matches the preimage before the end of the file.2356 *2357 * Count the number of characters in the preimage that fall2358 * beyond the end of the file and make sure that all of them2359 * are whitespace characters. (This can only happen if2360 * we are removing blank lines at the end of the file.)2361 */2362 buf = preimage_eof = preimage->buf + preoff;2363for( ; i < preimage->nr; i++)2364 preoff += preimage->line[i].len;2365 preimage_end = preimage->buf + preoff;2366for( ; buf < preimage_end; buf++)2367if(!isspace(*buf))2368return0;23692370/*2371 * Update the preimage and the common postimage context2372 * lines to use the same whitespace as the target.2373 * If whitespace is missing in the target (i.e.2374 * if the preimage extends beyond the end of the file),2375 * use the whitespace from the preimage.2376 */2377 extra_chars = preimage_end - preimage_eof;2378strbuf_init(&fixed, imgoff + extra_chars);2379strbuf_add(&fixed, img->buf +try, imgoff);2380strbuf_add(&fixed, preimage_eof, extra_chars);2381 fixed_buf =strbuf_detach(&fixed, &fixed_len);2382update_pre_post_images(preimage, postimage,2383 fixed_buf, fixed_len, postlen);2384return1;2385}23862387if(ws_error_action != correct_ws_error)2388return0;23892390/*2391 * The hunk does not apply byte-by-byte, but the hash says2392 * it might with whitespace fuzz. We haven't been asked to2393 * ignore whitespace, we were asked to correct whitespace2394 * errors, so let's try matching after whitespace correction.2395 *2396 * The preimage may extend beyond the end of the file,2397 * but in this loop we will only handle the part of the2398 * preimage that falls within the file.2399 */2400strbuf_init(&fixed, preimage->len +1);2401 orig = preimage->buf;2402 target = img->buf +try;2403 postlen =0;2404for(i =0; i < preimage_limit; i++) {2405size_t oldlen = preimage->line[i].len;2406size_t tgtlen = img->line[try_lno + i].len;2407size_t fixstart = fixed.len;2408struct strbuf tgtfix;2409int match;24102411/* Try fixing the line in the preimage */2412ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);24132414/* Try fixing the line in the target */2415strbuf_init(&tgtfix, tgtlen);2416ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);24172418/*2419 * If they match, either the preimage was based on2420 * a version before our tree fixed whitespace breakage,2421 * or we are lacking a whitespace-fix patch the tree2422 * the preimage was based on already had (i.e. target2423 * has whitespace breakage, the preimage doesn't).2424 * In either case, we are fixing the whitespace breakages2425 * so we might as well take the fix together with their2426 * real change.2427 */2428 match = (tgtfix.len == fixed.len - fixstart &&2429!memcmp(tgtfix.buf, fixed.buf + fixstart,2430 fixed.len - fixstart));2431 postlen += tgtfix.len;24322433strbuf_release(&tgtfix);2434if(!match)2435goto unmatch_exit;24362437 orig += oldlen;2438 target += tgtlen;2439}244024412442/*2443 * Now handle the lines in the preimage that falls beyond the2444 * end of the file (if any). They will only match if they are2445 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2446 * false).2447 */2448for( ; i < preimage->nr; i++) {2449size_t fixstart = fixed.len;/* start of the fixed preimage */2450size_t oldlen = preimage->line[i].len;2451int j;24522453/* Try fixing the line in the preimage */2454ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);24552456for(j = fixstart; j < fixed.len; j++)2457if(!isspace(fixed.buf[j]))2458goto unmatch_exit;24592460 orig += oldlen;2461}24622463/*2464 * Yes, the preimage is based on an older version that still2465 * has whitespace breakages unfixed, and fixing them makes the2466 * hunk match. Update the context lines in the postimage.2467 */2468 fixed_buf =strbuf_detach(&fixed, &fixed_len);2469if(postlen < postimage->len)2470 postlen =0;2471update_pre_post_images(preimage, postimage,2472 fixed_buf, fixed_len, postlen);2473return1;24742475 unmatch_exit:2476strbuf_release(&fixed);2477return0;2478}24792480static intfind_pos(struct image *img,2481struct image *preimage,2482struct image *postimage,2483int line,2484unsigned ws_rule,2485int match_beginning,int match_end)2486{2487int i;2488unsigned long backwards, forwards,try;2489int backwards_lno, forwards_lno, try_lno;24902491/*2492 * If match_beginning or match_end is specified, there is no2493 * point starting from a wrong line that will never match and2494 * wander around and wait for a match at the specified end.2495 */2496if(match_beginning)2497 line =0;2498else if(match_end)2499 line = img->nr - preimage->nr;25002501/*2502 * Because the comparison is unsigned, the following test2503 * will also take care of a negative line number that can2504 * result when match_end and preimage is larger than the target.2505 */2506if((size_t) line > img->nr)2507 line = img->nr;25082509try=0;2510for(i =0; i < line; i++)2511try+= img->line[i].len;25122513/*2514 * There's probably some smart way to do this, but I'll leave2515 * that to the smart and beautiful people. I'm simple and stupid.2516 */2517 backwards =try;2518 backwards_lno = line;2519 forwards =try;2520 forwards_lno = line;2521 try_lno = line;25222523for(i =0; ; i++) {2524if(match_fragment(img, preimage, postimage,2525try, try_lno, ws_rule,2526 match_beginning, match_end))2527return try_lno;25282529 again:2530if(backwards_lno ==0&& forwards_lno == img->nr)2531break;25322533if(i &1) {2534if(backwards_lno ==0) {2535 i++;2536goto again;2537}2538 backwards_lno--;2539 backwards -= img->line[backwards_lno].len;2540try= backwards;2541 try_lno = backwards_lno;2542}else{2543if(forwards_lno == img->nr) {2544 i++;2545goto again;2546}2547 forwards += img->line[forwards_lno].len;2548 forwards_lno++;2549try= forwards;2550 try_lno = forwards_lno;2551}25522553}2554return-1;2555}25562557static voidremove_first_line(struct image *img)2558{2559 img->buf += img->line[0].len;2560 img->len -= img->line[0].len;2561 img->line++;2562 img->nr--;2563}25642565static voidremove_last_line(struct image *img)2566{2567 img->len -= img->line[--img->nr].len;2568}25692570/*2571 * The change from "preimage" and "postimage" has been found to2572 * apply at applied_pos (counts in line numbers) in "img".2573 * Update "img" to remove "preimage" and replace it with "postimage".2574 */2575static voidupdate_image(struct image *img,2576int applied_pos,2577struct image *preimage,2578struct image *postimage)2579{2580/*2581 * remove the copy of preimage at offset in img2582 * and replace it with postimage2583 */2584int i, nr;2585size_t remove_count, insert_count, applied_at =0;2586char*result;2587int preimage_limit;25882589/*2590 * If we are removing blank lines at the end of img,2591 * the preimage may extend beyond the end.2592 * If that is the case, we must be careful only to2593 * remove the part of the preimage that falls within2594 * the boundaries of img. Initialize preimage_limit2595 * to the number of lines in the preimage that falls2596 * within the boundaries.2597 */2598 preimage_limit = preimage->nr;2599if(preimage_limit > img->nr - applied_pos)2600 preimage_limit = img->nr - applied_pos;26012602for(i =0; i < applied_pos; i++)2603 applied_at += img->line[i].len;26042605 remove_count =0;2606for(i =0; i < preimage_limit; i++)2607 remove_count += img->line[applied_pos + i].len;2608 insert_count = postimage->len;26092610/* Adjust the contents */2611 result =xmalloc(img->len + insert_count - remove_count +1);2612memcpy(result, img->buf, applied_at);2613memcpy(result + applied_at, postimage->buf, postimage->len);2614memcpy(result + applied_at + postimage->len,2615 img->buf + (applied_at + remove_count),2616 img->len - (applied_at + remove_count));2617free(img->buf);2618 img->buf = result;2619 img->len += insert_count - remove_count;2620 result[img->len] ='\0';26212622/* Adjust the line table */2623 nr = img->nr + postimage->nr - preimage_limit;2624if(preimage_limit < postimage->nr) {2625/*2626 * NOTE: this knows that we never call remove_first_line()2627 * on anything other than pre/post image.2628 */2629 img->line =xrealloc(img->line, nr *sizeof(*img->line));2630 img->line_allocated = img->line;2631}2632if(preimage_limit != postimage->nr)2633memmove(img->line + applied_pos + postimage->nr,2634 img->line + applied_pos + preimage_limit,2635(img->nr - (applied_pos + preimage_limit)) *2636sizeof(*img->line));2637memcpy(img->line + applied_pos,2638 postimage->line,2639 postimage->nr *sizeof(*img->line));2640if(!allow_overlap)2641for(i =0; i < postimage->nr; i++)2642 img->line[applied_pos + i].flag |= LINE_PATCHED;2643 img->nr = nr;2644}26452646/*2647 * Use the patch-hunk text in "frag" to prepare two images (preimage and2648 * postimage) for the hunk. Find lines that match "preimage" in "img" and2649 * replace the part of "img" with "postimage" text.2650 */2651static intapply_one_fragment(struct image *img,struct fragment *frag,2652int inaccurate_eof,unsigned ws_rule,2653int nth_fragment)2654{2655int match_beginning, match_end;2656const char*patch = frag->patch;2657int size = frag->size;2658char*old, *oldlines;2659struct strbuf newlines;2660int new_blank_lines_at_end =0;2661int found_new_blank_lines_at_end =0;2662int hunk_linenr = frag->linenr;2663unsigned long leading, trailing;2664int pos, applied_pos;2665struct image preimage;2666struct image postimage;26672668memset(&preimage,0,sizeof(preimage));2669memset(&postimage,0,sizeof(postimage));2670 oldlines =xmalloc(size);2671strbuf_init(&newlines, size);26722673 old = oldlines;2674while(size >0) {2675char first;2676int len =linelen(patch, size);2677int plen;2678int added_blank_line =0;2679int is_blank_context =0;2680size_t start;26812682if(!len)2683break;26842685/*2686 * "plen" is how much of the line we should use for2687 * the actual patch data. Normally we just remove the2688 * first character on the line, but if the line is2689 * followed by "\ No newline", then we also remove the2690 * last one (which is the newline, of course).2691 */2692 plen = len -1;2693if(len < size && patch[len] =='\\')2694 plen--;2695 first = *patch;2696if(apply_in_reverse) {2697if(first =='-')2698 first ='+';2699else if(first =='+')2700 first ='-';2701}27022703switch(first) {2704case'\n':2705/* Newer GNU diff, empty context line */2706if(plen <0)2707/* ... followed by '\No newline'; nothing */2708break;2709*old++ ='\n';2710strbuf_addch(&newlines,'\n');2711add_line_info(&preimage,"\n",1, LINE_COMMON);2712add_line_info(&postimage,"\n",1, LINE_COMMON);2713 is_blank_context =1;2714break;2715case' ':2716if(plen && (ws_rule & WS_BLANK_AT_EOF) &&2717ws_blank_line(patch +1, plen, ws_rule))2718 is_blank_context =1;2719case'-':2720memcpy(old, patch +1, plen);2721add_line_info(&preimage, old, plen,2722(first ==' '? LINE_COMMON :0));2723 old += plen;2724if(first =='-')2725break;2726/* Fall-through for ' ' */2727case'+':2728/* --no-add does not add new lines */2729if(first =='+'&& no_add)2730break;27312732 start = newlines.len;2733if(first !='+'||2734!whitespace_error ||2735 ws_error_action != correct_ws_error) {2736strbuf_add(&newlines, patch +1, plen);2737}2738else{2739ws_fix_copy(&newlines, patch +1, plen, ws_rule, &applied_after_fixing_ws);2740}2741add_line_info(&postimage, newlines.buf + start, newlines.len - start,2742(first =='+'?0: LINE_COMMON));2743if(first =='+'&&2744(ws_rule & WS_BLANK_AT_EOF) &&2745ws_blank_line(patch +1, plen, ws_rule))2746 added_blank_line =1;2747break;2748case'@':case'\\':2749/* Ignore it, we already handled it */2750break;2751default:2752if(apply_verbosely)2753error(_("invalid start of line: '%c'"), first);2754return-1;2755}2756if(added_blank_line) {2757if(!new_blank_lines_at_end)2758 found_new_blank_lines_at_end = hunk_linenr;2759 new_blank_lines_at_end++;2760}2761else if(is_blank_context)2762;2763else2764 new_blank_lines_at_end =0;2765 patch += len;2766 size -= len;2767 hunk_linenr++;2768}2769if(inaccurate_eof &&2770 old > oldlines && old[-1] =='\n'&&2771 newlines.len >0&& newlines.buf[newlines.len -1] =='\n') {2772 old--;2773strbuf_setlen(&newlines, newlines.len -1);2774}27752776 leading = frag->leading;2777 trailing = frag->trailing;27782779/*2780 * A hunk to change lines at the beginning would begin with2781 * @@ -1,L +N,M @@2782 * but we need to be careful. -U0 that inserts before the second2783 * line also has this pattern.2784 *2785 * And a hunk to add to an empty file would begin with2786 * @@ -0,0 +N,M @@2787 *2788 * In other words, a hunk that is (frag->oldpos <= 1) with or2789 * without leading context must match at the beginning.2790 */2791 match_beginning = (!frag->oldpos ||2792(frag->oldpos ==1&& !unidiff_zero));27932794/*2795 * A hunk without trailing lines must match at the end.2796 * However, we simply cannot tell if a hunk must match end2797 * from the lack of trailing lines if the patch was generated2798 * with unidiff without any context.2799 */2800 match_end = !unidiff_zero && !trailing;28012802 pos = frag->newpos ? (frag->newpos -1) :0;2803 preimage.buf = oldlines;2804 preimage.len = old - oldlines;2805 postimage.buf = newlines.buf;2806 postimage.len = newlines.len;2807 preimage.line = preimage.line_allocated;2808 postimage.line = postimage.line_allocated;28092810for(;;) {28112812 applied_pos =find_pos(img, &preimage, &postimage, pos,2813 ws_rule, match_beginning, match_end);28142815if(applied_pos >=0)2816break;28172818/* Am I at my context limits? */2819if((leading <= p_context) && (trailing <= p_context))2820break;2821if(match_beginning || match_end) {2822 match_beginning = match_end =0;2823continue;2824}28252826/*2827 * Reduce the number of context lines; reduce both2828 * leading and trailing if they are equal otherwise2829 * just reduce the larger context.2830 */2831if(leading >= trailing) {2832remove_first_line(&preimage);2833remove_first_line(&postimage);2834 pos--;2835 leading--;2836}2837if(trailing > leading) {2838remove_last_line(&preimage);2839remove_last_line(&postimage);2840 trailing--;2841}2842}28432844if(applied_pos >=0) {2845if(new_blank_lines_at_end &&2846 preimage.nr + applied_pos >= img->nr &&2847(ws_rule & WS_BLANK_AT_EOF) &&2848 ws_error_action != nowarn_ws_error) {2849record_ws_error(WS_BLANK_AT_EOF,"+",1,2850 found_new_blank_lines_at_end);2851if(ws_error_action == correct_ws_error) {2852while(new_blank_lines_at_end--)2853remove_last_line(&postimage);2854}2855/*2856 * We would want to prevent write_out_results()2857 * from taking place in apply_patch() that follows2858 * the callchain led us here, which is:2859 * apply_patch->check_patch_list->check_patch->2860 * apply_data->apply_fragments->apply_one_fragment2861 */2862if(ws_error_action == die_on_ws_error)2863 apply =0;2864}28652866if(apply_verbosely && applied_pos != pos) {2867int offset = applied_pos - pos;2868if(apply_in_reverse)2869 offset =0- offset;2870fprintf_ln(stderr,2871Q_("Hunk #%dsucceeded at%d(offset%dline).",2872"Hunk #%dsucceeded at%d(offset%dlines).",2873 offset),2874 nth_fragment, applied_pos +1, offset);2875}28762877/*2878 * Warn if it was necessary to reduce the number2879 * of context lines.2880 */2881if((leading != frag->leading) ||2882(trailing != frag->trailing))2883fprintf_ln(stderr,_("Context reduced to (%ld/%ld)"2884" to apply fragment at%d"),2885 leading, trailing, applied_pos+1);2886update_image(img, applied_pos, &preimage, &postimage);2887}else{2888if(apply_verbosely)2889error(_("while searching for:\n%.*s"),2890(int)(old - oldlines), oldlines);2891}28922893free(oldlines);2894strbuf_release(&newlines);2895free(preimage.line_allocated);2896free(postimage.line_allocated);28972898return(applied_pos <0);2899}29002901static intapply_binary_fragment(struct image *img,struct patch *patch)2902{2903struct fragment *fragment = patch->fragments;2904unsigned long len;2905void*dst;29062907if(!fragment)2908returnerror(_("missing binary patch data for '%s'"),2909 patch->new_name ?2910 patch->new_name :2911 patch->old_name);29122913/* Binary patch is irreversible without the optional second hunk */2914if(apply_in_reverse) {2915if(!fragment->next)2916returnerror("cannot reverse-apply a binary patch "2917"without the reverse hunk to '%s'",2918 patch->new_name2919? patch->new_name : patch->old_name);2920 fragment = fragment->next;2921}2922switch(fragment->binary_patch_method) {2923case BINARY_DELTA_DEFLATED:2924 dst =patch_delta(img->buf, img->len, fragment->patch,2925 fragment->size, &len);2926if(!dst)2927return-1;2928clear_image(img);2929 img->buf = dst;2930 img->len = len;2931return0;2932case BINARY_LITERAL_DEFLATED:2933clear_image(img);2934 img->len = fragment->size;2935 img->buf =xmemdupz(fragment->patch, img->len);2936return0;2937}2938return-1;2939}29402941/*2942 * Replace "img" with the result of applying the binary patch.2943 * The binary patch data itself in patch->fragment is still kept2944 * but the preimage prepared by the caller in "img" is freed here2945 * or in the helper function apply_binary_fragment() this calls.2946 */2947static intapply_binary(struct image *img,struct patch *patch)2948{2949const char*name = patch->old_name ? patch->old_name : patch->new_name;2950unsigned char sha1[20];29512952/*2953 * For safety, we require patch index line to contain2954 * full 40-byte textual SHA1 for old and new, at least for now.2955 */2956if(strlen(patch->old_sha1_prefix) !=40||2957strlen(patch->new_sha1_prefix) !=40||2958get_sha1_hex(patch->old_sha1_prefix, sha1) ||2959get_sha1_hex(patch->new_sha1_prefix, sha1))2960returnerror("cannot apply binary patch to '%s' "2961"without full index line", name);29622963if(patch->old_name) {2964/*2965 * See if the old one matches what the patch2966 * applies to.2967 */2968hash_sha1_file(img->buf, img->len, blob_type, sha1);2969if(strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2970returnerror("the patch applies to '%s' (%s), "2971"which does not match the "2972"current contents.",2973 name,sha1_to_hex(sha1));2974}2975else{2976/* Otherwise, the old one must be empty. */2977if(img->len)2978returnerror("the patch applies to an empty "2979"'%s' but it is not empty", name);2980}29812982get_sha1_hex(patch->new_sha1_prefix, sha1);2983if(is_null_sha1(sha1)) {2984clear_image(img);2985return0;/* deletion patch */2986}29872988if(has_sha1_file(sha1)) {2989/* We already have the postimage */2990enum object_type type;2991unsigned long size;2992char*result;29932994 result =read_sha1_file(sha1, &type, &size);2995if(!result)2996returnerror("the necessary postimage%sfor "2997"'%s' cannot be read",2998 patch->new_sha1_prefix, name);2999clear_image(img);3000 img->buf = result;3001 img->len = size;3002}else{3003/*3004 * We have verified buf matches the preimage;3005 * apply the patch data to it, which is stored3006 * in the patch->fragments->{patch,size}.3007 */3008if(apply_binary_fragment(img, patch))3009returnerror(_("binary patch does not apply to '%s'"),3010 name);30113012/* verify that the result matches */3013hash_sha1_file(img->buf, img->len, blob_type, sha1);3014if(strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))3015returnerror(_("binary patch to '%s' creates incorrect result (expecting%s, got%s)"),3016 name, patch->new_sha1_prefix,sha1_to_hex(sha1));3017}30183019return0;3020}30213022static intapply_fragments(struct image *img,struct patch *patch)3023{3024struct fragment *frag = patch->fragments;3025const char*name = patch->old_name ? patch->old_name : patch->new_name;3026unsigned ws_rule = patch->ws_rule;3027unsigned inaccurate_eof = patch->inaccurate_eof;3028int nth =0;30293030if(patch->is_binary)3031returnapply_binary(img, patch);30323033while(frag) {3034 nth++;3035if(apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {3036error(_("patch failed:%s:%ld"), name, frag->oldpos);3037if(!apply_with_reject)3038return-1;3039 frag->rejected =1;3040}3041 frag = frag->next;3042}3043return0;3044}30453046static intread_blob_object(struct strbuf *buf,const unsigned char*sha1,unsigned mode)3047{3048if(S_ISGITLINK(mode)) {3049strbuf_grow(buf,100);3050strbuf_addf(buf,"Subproject commit%s\n",sha1_to_hex(sha1));3051}else{3052enum object_type type;3053unsigned long sz;3054char*result;30553056 result =read_sha1_file(sha1, &type, &sz);3057if(!result)3058return-1;3059/* XXX read_sha1_file NUL-terminates */3060strbuf_attach(buf, result, sz, sz +1);3061}3062return0;3063}30643065static intread_file_or_gitlink(const struct cache_entry *ce,struct strbuf *buf)3066{3067if(!ce)3068return0;3069returnread_blob_object(buf, ce->sha1, ce->ce_mode);3070}30713072static struct patch *in_fn_table(const char*name)3073{3074struct string_list_item *item;30753076if(name == NULL)3077return NULL;30783079 item =string_list_lookup(&fn_table, name);3080if(item != NULL)3081return(struct patch *)item->util;30823083return NULL;3084}30853086/*3087 * item->util in the filename table records the status of the path.3088 * Usually it points at a patch (whose result records the contents3089 * of it after applying it), but it could be PATH_WAS_DELETED for a3090 * path that a previously applied patch has already removed, or3091 * PATH_TO_BE_DELETED for a path that a later patch would remove.3092 *3093 * The latter is needed to deal with a case where two paths A and B3094 * are swapped by first renaming A to B and then renaming B to A;3095 * moving A to B should not be prevented due to presence of B as we3096 * will remove it in a later patch.3097 */3098#define PATH_TO_BE_DELETED ((struct patch *) -2)3099#define PATH_WAS_DELETED ((struct patch *) -1)31003101static intto_be_deleted(struct patch *patch)3102{3103return patch == PATH_TO_BE_DELETED;3104}31053106static intwas_deleted(struct patch *patch)3107{3108return patch == PATH_WAS_DELETED;3109}31103111static voidadd_to_fn_table(struct patch *patch)3112{3113struct string_list_item *item;31143115/*3116 * Always add new_name unless patch is a deletion3117 * This should cover the cases for normal diffs,3118 * file creations and copies3119 */3120if(patch->new_name != NULL) {3121 item =string_list_insert(&fn_table, patch->new_name);3122 item->util = patch;3123}31243125/*3126 * store a failure on rename/deletion cases because3127 * later chunks shouldn't patch old names3128 */3129if((patch->new_name == NULL) || (patch->is_rename)) {3130 item =string_list_insert(&fn_table, patch->old_name);3131 item->util = PATH_WAS_DELETED;3132}3133}31343135static voidprepare_fn_table(struct patch *patch)3136{3137/*3138 * store information about incoming file deletion3139 */3140while(patch) {3141if((patch->new_name == NULL) || (patch->is_rename)) {3142struct string_list_item *item;3143 item =string_list_insert(&fn_table, patch->old_name);3144 item->util = PATH_TO_BE_DELETED;3145}3146 patch = patch->next;3147}3148}31493150static intcheckout_target(struct index_state *istate,3151struct cache_entry *ce,struct stat *st)3152{3153struct checkout costate;31543155memset(&costate,0,sizeof(costate));3156 costate.base_dir ="";3157 costate.refresh_cache =1;3158 costate.istate = istate;3159if(checkout_entry(ce, &costate, NULL) ||lstat(ce->name, st))3160returnerror(_("cannot checkout%s"), ce->name);3161return0;3162}31633164static struct patch *previous_patch(struct patch *patch,int*gone)3165{3166struct patch *previous;31673168*gone =0;3169if(patch->is_copy || patch->is_rename)3170return NULL;/* "git" patches do not depend on the order */31713172 previous =in_fn_table(patch->old_name);3173if(!previous)3174return NULL;31753176if(to_be_deleted(previous))3177return NULL;/* the deletion hasn't happened yet */31783179if(was_deleted(previous))3180*gone =1;31813182return previous;3183}31843185static intverify_index_match(const struct cache_entry *ce,struct stat *st)3186{3187if(S_ISGITLINK(ce->ce_mode)) {3188if(!S_ISDIR(st->st_mode))3189return-1;3190return0;3191}3192returnce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3193}31943195#define SUBMODULE_PATCH_WITHOUT_INDEX 131963197static intload_patch_target(struct strbuf *buf,3198const struct cache_entry *ce,3199struct stat *st,3200const char*name,3201unsigned expected_mode)3202{3203if(cached) {3204if(read_file_or_gitlink(ce, buf))3205returnerror(_("read of%sfailed"), name);3206}else if(name) {3207if(S_ISGITLINK(expected_mode)) {3208if(ce)3209returnread_file_or_gitlink(ce, buf);3210else3211return SUBMODULE_PATCH_WITHOUT_INDEX;3212}else{3213if(read_old_data(st, name, buf))3214returnerror(_("read of%sfailed"), name);3215}3216}3217return0;3218}32193220/*3221 * We are about to apply "patch"; populate the "image" with the3222 * current version we have, from the working tree or from the index,3223 * depending on the situation e.g. --cached/--index. If we are3224 * applying a non-git patch that incrementally updates the tree,3225 * we read from the result of a previous diff.3226 */3227static intload_preimage(struct image *image,3228struct patch *patch,struct stat *st,3229const struct cache_entry *ce)3230{3231struct strbuf buf = STRBUF_INIT;3232size_t len;3233char*img;3234struct patch *previous;3235int status;32363237 previous =previous_patch(patch, &status);3238if(status)3239returnerror(_("path%shas been renamed/deleted"),3240 patch->old_name);3241if(previous) {3242/* We have a patched copy in memory; use that. */3243strbuf_add(&buf, previous->result, previous->resultsize);3244}else{3245 status =load_patch_target(&buf, ce, st,3246 patch->old_name, patch->old_mode);3247if(status <0)3248return status;3249else if(status == SUBMODULE_PATCH_WITHOUT_INDEX) {3250/*3251 * There is no way to apply subproject3252 * patch without looking at the index.3253 * NEEDSWORK: shouldn't this be flagged3254 * as an error???3255 */3256free_fragment_list(patch->fragments);3257 patch->fragments = NULL;3258}else if(status) {3259returnerror(_("read of%sfailed"), patch->old_name);3260}3261}32623263 img =strbuf_detach(&buf, &len);3264prepare_image(image, img, len, !patch->is_binary);3265return0;3266}32673268static intthree_way_merge(struct image *image,3269char*path,3270const unsigned char*base,3271const unsigned char*ours,3272const unsigned char*theirs)3273{3274 mmfile_t base_file, our_file, their_file;3275 mmbuffer_t result = { NULL };3276int status;32773278read_mmblob(&base_file, base);3279read_mmblob(&our_file, ours);3280read_mmblob(&their_file, theirs);3281 status =ll_merge(&result, path,3282&base_file,"base",3283&our_file,"ours",3284&their_file,"theirs", NULL);3285free(base_file.ptr);3286free(our_file.ptr);3287free(their_file.ptr);3288if(status <0|| !result.ptr) {3289free(result.ptr);3290return-1;3291}3292clear_image(image);3293 image->buf = result.ptr;3294 image->len = result.size;32953296return status;3297}32983299/*3300 * When directly falling back to add/add three-way merge, we read from3301 * the current contents of the new_name. In no cases other than that3302 * this function will be called.3303 */3304static intload_current(struct image *image,struct patch *patch)3305{3306struct strbuf buf = STRBUF_INIT;3307int status, pos;3308size_t len;3309char*img;3310struct stat st;3311struct cache_entry *ce;3312char*name = patch->new_name;3313unsigned mode = patch->new_mode;33143315if(!patch->is_new)3316die("BUG: patch to%sis not a creation", patch->old_name);33173318 pos =cache_name_pos(name,strlen(name));3319if(pos <0)3320returnerror(_("%s: does not exist in index"), name);3321 ce = active_cache[pos];3322if(lstat(name, &st)) {3323if(errno != ENOENT)3324returnerror(_("%s:%s"), name,strerror(errno));3325if(checkout_target(&the_index, ce, &st))3326return-1;3327}3328if(verify_index_match(ce, &st))3329returnerror(_("%s: does not match index"), name);33303331 status =load_patch_target(&buf, ce, &st, name, mode);3332if(status <0)3333return status;3334else if(status)3335return-1;3336 img =strbuf_detach(&buf, &len);3337prepare_image(image, img, len, !patch->is_binary);3338return0;3339}33403341static inttry_threeway(struct image *image,struct patch *patch,3342struct stat *st,const struct cache_entry *ce)3343{3344unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];3345struct strbuf buf = STRBUF_INIT;3346size_t len;3347int status;3348char*img;3349struct image tmp_image;33503351/* No point falling back to 3-way merge in these cases */3352if(patch->is_delete ||3353S_ISGITLINK(patch->old_mode) ||S_ISGITLINK(patch->new_mode))3354return-1;33553356/* Preimage the patch was prepared for */3357if(patch->is_new)3358write_sha1_file("",0, blob_type, pre_sha1);3359else if(get_sha1(patch->old_sha1_prefix, pre_sha1) ||3360read_blob_object(&buf, pre_sha1, patch->old_mode))3361returnerror("repository lacks the necessary blob to fall back on 3-way merge.");33623363fprintf(stderr,"Falling back to three-way merge...\n");33643365 img =strbuf_detach(&buf, &len);3366prepare_image(&tmp_image, img, len,1);3367/* Apply the patch to get the post image */3368if(apply_fragments(&tmp_image, patch) <0) {3369clear_image(&tmp_image);3370return-1;3371}3372/* post_sha1[] is theirs */3373write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_sha1);3374clear_image(&tmp_image);33753376/* our_sha1[] is ours */3377if(patch->is_new) {3378if(load_current(&tmp_image, patch))3379returnerror("cannot read the current contents of '%s'",3380 patch->new_name);3381}else{3382if(load_preimage(&tmp_image, patch, st, ce))3383returnerror("cannot read the current contents of '%s'",3384 patch->old_name);3385}3386write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);3387clear_image(&tmp_image);33883389/* in-core three-way merge between post and our using pre as base */3390 status =three_way_merge(image, patch->new_name,3391 pre_sha1, our_sha1, post_sha1);3392if(status <0) {3393fprintf(stderr,"Failed to fall back on three-way merge...\n");3394return status;3395}33963397if(status) {3398 patch->conflicted_threeway =1;3399if(patch->is_new)3400hashclr(patch->threeway_stage[0]);3401else3402hashcpy(patch->threeway_stage[0], pre_sha1);3403hashcpy(patch->threeway_stage[1], our_sha1);3404hashcpy(patch->threeway_stage[2], post_sha1);3405fprintf(stderr,"Applied patch to '%s' with conflicts.\n", patch->new_name);3406}else{3407fprintf(stderr,"Applied patch to '%s' cleanly.\n", patch->new_name);3408}3409return0;3410}34113412static intapply_data(struct patch *patch,struct stat *st,const struct cache_entry *ce)3413{3414struct image image;34153416if(load_preimage(&image, patch, st, ce) <0)3417return-1;34183419if(patch->direct_to_threeway ||3420apply_fragments(&image, patch) <0) {3421/* Note: with --reject, apply_fragments() returns 0 */3422if(!threeway ||try_threeway(&image, patch, st, ce) <0)3423return-1;3424}3425 patch->result = image.buf;3426 patch->resultsize = image.len;3427add_to_fn_table(patch);3428free(image.line_allocated);34293430if(0< patch->is_delete && patch->resultsize)3431returnerror(_("removal patch leaves file contents"));34323433return0;3434}34353436/*3437 * If "patch" that we are looking at modifies or deletes what we have,3438 * we would want it not to lose any local modification we have, either3439 * in the working tree or in the index.3440 *3441 * This also decides if a non-git patch is a creation patch or a3442 * modification to an existing empty file. We do not check the state3443 * of the current tree for a creation patch in this function; the caller3444 * check_patch() separately makes sure (and errors out otherwise) that3445 * the path the patch creates does not exist in the current tree.3446 */3447static intcheck_preimage(struct patch *patch,struct cache_entry **ce,struct stat *st)3448{3449const char*old_name = patch->old_name;3450struct patch *previous = NULL;3451int stat_ret =0, status;3452unsigned st_mode =0;34533454if(!old_name)3455return0;34563457assert(patch->is_new <=0);3458 previous =previous_patch(patch, &status);34593460if(status)3461returnerror(_("path%shas been renamed/deleted"), old_name);3462if(previous) {3463 st_mode = previous->new_mode;3464}else if(!cached) {3465 stat_ret =lstat(old_name, st);3466if(stat_ret && errno != ENOENT)3467returnerror(_("%s:%s"), old_name,strerror(errno));3468}34693470if(check_index && !previous) {3471int pos =cache_name_pos(old_name,strlen(old_name));3472if(pos <0) {3473if(patch->is_new <0)3474goto is_new;3475returnerror(_("%s: does not exist in index"), old_name);3476}3477*ce = active_cache[pos];3478if(stat_ret <0) {3479if(checkout_target(&the_index, *ce, st))3480return-1;3481}3482if(!cached &&verify_index_match(*ce, st))3483returnerror(_("%s: does not match index"), old_name);3484if(cached)3485 st_mode = (*ce)->ce_mode;3486}else if(stat_ret <0) {3487if(patch->is_new <0)3488goto is_new;3489returnerror(_("%s:%s"), old_name,strerror(errno));3490}34913492if(!cached && !previous)3493 st_mode =ce_mode_from_stat(*ce, st->st_mode);34943495if(patch->is_new <0)3496 patch->is_new =0;3497if(!patch->old_mode)3498 patch->old_mode = st_mode;3499if((st_mode ^ patch->old_mode) & S_IFMT)3500returnerror(_("%s: wrong type"), old_name);3501if(st_mode != patch->old_mode)3502warning(_("%shas type%o, expected%o"),3503 old_name, st_mode, patch->old_mode);3504if(!patch->new_mode && !patch->is_delete)3505 patch->new_mode = st_mode;3506return0;35073508 is_new:3509 patch->is_new =1;3510 patch->is_delete =0;3511free(patch->old_name);3512 patch->old_name = NULL;3513return0;3514}351535163517#define EXISTS_IN_INDEX 13518#define EXISTS_IN_WORKTREE 235193520static intcheck_to_create(const char*new_name,int ok_if_exists)3521{3522struct stat nst;35233524if(check_index &&3525cache_name_pos(new_name,strlen(new_name)) >=0&&3526!ok_if_exists)3527return EXISTS_IN_INDEX;3528if(cached)3529return0;35303531if(!lstat(new_name, &nst)) {3532if(S_ISDIR(nst.st_mode) || ok_if_exists)3533return0;3534/*3535 * A leading component of new_name might be a symlink3536 * that is going to be removed with this patch, but3537 * still pointing at somewhere that has the path.3538 * In such a case, path "new_name" does not exist as3539 * far as git is concerned.3540 */3541if(has_symlink_leading_path(new_name,strlen(new_name)))3542return0;35433544return EXISTS_IN_WORKTREE;3545}else if((errno != ENOENT) && (errno != ENOTDIR)) {3546returnerror("%s:%s", new_name,strerror(errno));3547}3548return0;3549}35503551/*3552 * Check and apply the patch in-core; leave the result in patch->result3553 * for the caller to write it out to the final destination.3554 */3555static intcheck_patch(struct patch *patch)3556{3557struct stat st;3558const char*old_name = patch->old_name;3559const char*new_name = patch->new_name;3560const char*name = old_name ? old_name : new_name;3561struct cache_entry *ce = NULL;3562struct patch *tpatch;3563int ok_if_exists;3564int status;35653566 patch->rejected =1;/* we will drop this after we succeed */35673568 status =check_preimage(patch, &ce, &st);3569if(status)3570return status;3571 old_name = patch->old_name;35723573/*3574 * A type-change diff is always split into a patch to delete3575 * old, immediately followed by a patch to create new (see3576 * diff.c::run_diff()); in such a case it is Ok that the entry3577 * to be deleted by the previous patch is still in the working3578 * tree and in the index.3579 *3580 * A patch to swap-rename between A and B would first rename A3581 * to B and then rename B to A. While applying the first one,3582 * the presence of B should not stop A from getting renamed to3583 * B; ask to_be_deleted() about the later rename. Removal of3584 * B and rename from A to B is handled the same way by asking3585 * was_deleted().3586 */3587if((tpatch =in_fn_table(new_name)) &&3588(was_deleted(tpatch) ||to_be_deleted(tpatch)))3589 ok_if_exists =1;3590else3591 ok_if_exists =0;35923593if(new_name &&3594((0< patch->is_new) || patch->is_rename || patch->is_copy)) {3595int err =check_to_create(new_name, ok_if_exists);35963597if(err && threeway) {3598 patch->direct_to_threeway =1;3599}else switch(err) {3600case0:3601break;/* happy */3602case EXISTS_IN_INDEX:3603returnerror(_("%s: already exists in index"), new_name);3604break;3605case EXISTS_IN_WORKTREE:3606returnerror(_("%s: already exists in working directory"),3607 new_name);3608default:3609return err;3610}36113612if(!patch->new_mode) {3613if(0< patch->is_new)3614 patch->new_mode = S_IFREG |0644;3615else3616 patch->new_mode = patch->old_mode;3617}3618}36193620if(new_name && old_name) {3621int same = !strcmp(old_name, new_name);3622if(!patch->new_mode)3623 patch->new_mode = patch->old_mode;3624if((patch->old_mode ^ patch->new_mode) & S_IFMT) {3625if(same)3626returnerror(_("new mode (%o) of%sdoes not "3627"match old mode (%o)"),3628 patch->new_mode, new_name,3629 patch->old_mode);3630else3631returnerror(_("new mode (%o) of%sdoes not "3632"match old mode (%o) of%s"),3633 patch->new_mode, new_name,3634 patch->old_mode, old_name);3635}3636}36373638if(apply_data(patch, &st, ce) <0)3639returnerror(_("%s: patch does not apply"), name);3640 patch->rejected =0;3641return0;3642}36433644static intcheck_patch_list(struct patch *patch)3645{3646int err =0;36473648prepare_fn_table(patch);3649while(patch) {3650if(apply_verbosely)3651say_patch_name(stderr,3652_("Checking patch%s..."), patch);3653 err |=check_patch(patch);3654 patch = patch->next;3655}3656return err;3657}36583659/* This function tries to read the sha1 from the current index */3660static intget_current_sha1(const char*path,unsigned char*sha1)3661{3662int pos;36633664if(read_cache() <0)3665return-1;3666 pos =cache_name_pos(path,strlen(path));3667if(pos <0)3668return-1;3669hashcpy(sha1, active_cache[pos]->sha1);3670return0;3671}36723673static intpreimage_sha1_in_gitlink_patch(struct patch *p,unsigned char sha1[20])3674{3675/*3676 * A usable gitlink patch has only one fragment (hunk) that looks like:3677 * @@ -1 +1 @@3678 * -Subproject commit <old sha1>3679 * +Subproject commit <new sha1>3680 * or3681 * @@ -1 +0,0 @@3682 * -Subproject commit <old sha1>3683 * for a removal patch.3684 */3685struct fragment *hunk = p->fragments;3686static const char heading[] ="-Subproject commit ";3687char*preimage;36883689if(/* does the patch have only one hunk? */3690 hunk && !hunk->next &&3691/* is its preimage one line? */3692 hunk->oldpos ==1&& hunk->oldlines ==1&&3693/* does preimage begin with the heading? */3694(preimage =memchr(hunk->patch,'\n', hunk->size)) != NULL &&3695starts_with(++preimage, heading) &&3696/* does it record full SHA-1? */3697!get_sha1_hex(preimage +sizeof(heading) -1, sha1) &&3698 preimage[sizeof(heading) +40-1] =='\n'&&3699/* does the abbreviated name on the index line agree with it? */3700starts_with(preimage +sizeof(heading) -1, p->old_sha1_prefix))3701return0;/* it all looks fine */37023703/* we may have full object name on the index line */3704returnget_sha1_hex(p->old_sha1_prefix, sha1);3705}37063707/* Build an index that contains the just the files needed for a 3way merge */3708static voidbuild_fake_ancestor(struct patch *list,const char*filename)3709{3710struct patch *patch;3711struct index_state result = { NULL };3712static struct lock_file lock;37133714/* Once we start supporting the reverse patch, it may be3715 * worth showing the new sha1 prefix, but until then...3716 */3717for(patch = list; patch; patch = patch->next) {3718unsigned char sha1[20];3719struct cache_entry *ce;3720const char*name;37213722 name = patch->old_name ? patch->old_name : patch->new_name;3723if(0< patch->is_new)3724continue;37253726if(S_ISGITLINK(patch->old_mode)) {3727if(!preimage_sha1_in_gitlink_patch(patch, sha1))3728;/* ok, the textual part looks sane */3729else3730die("sha1 information is lacking or useless for submoule%s",3731 name);3732}else if(!get_sha1_blob(patch->old_sha1_prefix, sha1)) {3733;/* ok */3734}else if(!patch->lines_added && !patch->lines_deleted) {3735/* mode-only change: update the current */3736if(get_current_sha1(patch->old_name, sha1))3737die("mode change for%s, which is not "3738"in current HEAD", name);3739}else3740die("sha1 information is lacking or useless "3741"(%s).", name);37423743 ce =make_cache_entry(patch->old_mode, sha1, name,0,0);3744if(!ce)3745die(_("make_cache_entry failed for path '%s'"), name);3746if(add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))3747die("Could not add%sto temporary index", name);3748}37493750hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);3751if(write_locked_index(&result, &lock, COMMIT_LOCK))3752die("Could not write temporary index to%s", filename);37533754discard_index(&result);3755}37563757static voidstat_patch_list(struct patch *patch)3758{3759int files, adds, dels;37603761for(files = adds = dels =0; patch ; patch = patch->next) {3762 files++;3763 adds += patch->lines_added;3764 dels += patch->lines_deleted;3765show_stats(patch);3766}37673768print_stat_summary(stdout, files, adds, dels);3769}37703771static voidnumstat_patch_list(struct patch *patch)3772{3773for( ; patch; patch = patch->next) {3774const char*name;3775 name = patch->new_name ? patch->new_name : patch->old_name;3776if(patch->is_binary)3777printf("-\t-\t");3778else3779printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);3780write_name_quoted(name, stdout, line_termination);3781}3782}37833784static voidshow_file_mode_name(const char*newdelete,unsigned int mode,const char*name)3785{3786if(mode)3787printf("%smode%06o%s\n", newdelete, mode, name);3788else3789printf("%s %s\n", newdelete, name);3790}37913792static voidshow_mode_change(struct patch *p,int show_name)3793{3794if(p->old_mode && p->new_mode && p->old_mode != p->new_mode) {3795if(show_name)3796printf(" mode change%06o =>%06o%s\n",3797 p->old_mode, p->new_mode, p->new_name);3798else3799printf(" mode change%06o =>%06o\n",3800 p->old_mode, p->new_mode);3801}3802}38033804static voidshow_rename_copy(struct patch *p)3805{3806const char*renamecopy = p->is_rename ?"rename":"copy";3807const char*old, *new;38083809/* Find common prefix */3810 old = p->old_name;3811new= p->new_name;3812while(1) {3813const char*slash_old, *slash_new;3814 slash_old =strchr(old,'/');3815 slash_new =strchr(new,'/');3816if(!slash_old ||3817!slash_new ||3818 slash_old - old != slash_new -new||3819memcmp(old,new, slash_new -new))3820break;3821 old = slash_old +1;3822new= slash_new +1;3823}3824/* p->old_name thru old is the common prefix, and old and new3825 * through the end of names are renames3826 */3827if(old != p->old_name)3828printf("%s%.*s{%s=>%s} (%d%%)\n", renamecopy,3829(int)(old - p->old_name), p->old_name,3830 old,new, p->score);3831else3832printf("%s %s=>%s(%d%%)\n", renamecopy,3833 p->old_name, p->new_name, p->score);3834show_mode_change(p,0);3835}38363837static voidsummary_patch_list(struct patch *patch)3838{3839struct patch *p;38403841for(p = patch; p; p = p->next) {3842if(p->is_new)3843show_file_mode_name("create", p->new_mode, p->new_name);3844else if(p->is_delete)3845show_file_mode_name("delete", p->old_mode, p->old_name);3846else{3847if(p->is_rename || p->is_copy)3848show_rename_copy(p);3849else{3850if(p->score) {3851printf(" rewrite%s(%d%%)\n",3852 p->new_name, p->score);3853show_mode_change(p,0);3854}3855else3856show_mode_change(p,1);3857}3858}3859}3860}38613862static voidpatch_stats(struct patch *patch)3863{3864int lines = patch->lines_added + patch->lines_deleted;38653866if(lines > max_change)3867 max_change = lines;3868if(patch->old_name) {3869int len =quote_c_style(patch->old_name, NULL, NULL,0);3870if(!len)3871 len =strlen(patch->old_name);3872if(len > max_len)3873 max_len = len;3874}3875if(patch->new_name) {3876int len =quote_c_style(patch->new_name, NULL, NULL,0);3877if(!len)3878 len =strlen(patch->new_name);3879if(len > max_len)3880 max_len = len;3881}3882}38833884static voidremove_file(struct patch *patch,int rmdir_empty)3885{3886if(update_index) {3887if(remove_file_from_cache(patch->old_name) <0)3888die(_("unable to remove%sfrom index"), patch->old_name);3889}3890if(!cached) {3891if(!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {3892remove_path(patch->old_name);3893}3894}3895}38963897static voidadd_index_file(const char*path,unsigned mode,void*buf,unsigned long size)3898{3899struct stat st;3900struct cache_entry *ce;3901int namelen =strlen(path);3902unsigned ce_size =cache_entry_size(namelen);39033904if(!update_index)3905return;39063907 ce =xcalloc(1, ce_size);3908memcpy(ce->name, path, namelen);3909 ce->ce_mode =create_ce_mode(mode);3910 ce->ce_flags =create_ce_flags(0);3911 ce->ce_namelen = namelen;3912if(S_ISGITLINK(mode)) {3913const char*s;39143915if(!skip_prefix(buf,"Subproject commit ", &s) ||3916get_sha1_hex(s, ce->sha1))3917die(_("corrupt patch for submodule%s"), path);3918}else{3919if(!cached) {3920if(lstat(path, &st) <0)3921die_errno(_("unable to stat newly created file '%s'"),3922 path);3923fill_stat_cache_info(ce, &st);3924}3925if(write_sha1_file(buf, size, blob_type, ce->sha1) <0)3926die(_("unable to create backing store for newly created file%s"), path);3927}3928if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)3929die(_("unable to add cache entry for%s"), path);3930}39313932static inttry_create_file(const char*path,unsigned int mode,const char*buf,unsigned long size)3933{3934int fd;3935struct strbuf nbuf = STRBUF_INIT;39363937if(S_ISGITLINK(mode)) {3938struct stat st;3939if(!lstat(path, &st) &&S_ISDIR(st.st_mode))3940return0;3941returnmkdir(path,0777);3942}39433944if(has_symlinks &&S_ISLNK(mode))3945/* Although buf:size is counted string, it also is NUL3946 * terminated.3947 */3948returnsymlink(buf, path);39493950 fd =open(path, O_CREAT | O_EXCL | O_WRONLY, (mode &0100) ?0777:0666);3951if(fd <0)3952return-1;39533954if(convert_to_working_tree(path, buf, size, &nbuf)) {3955 size = nbuf.len;3956 buf = nbuf.buf;3957}3958write_or_die(fd, buf, size);3959strbuf_release(&nbuf);39603961if(close(fd) <0)3962die_errno(_("closing file '%s'"), path);3963return0;3964}39653966/*3967 * We optimistically assume that the directories exist,3968 * which is true 99% of the time anyway. If they don't,3969 * we create them and try again.3970 */3971static voidcreate_one_file(char*path,unsigned mode,const char*buf,unsigned long size)3972{3973if(cached)3974return;3975if(!try_create_file(path, mode, buf, size))3976return;39773978if(errno == ENOENT) {3979if(safe_create_leading_directories(path))3980return;3981if(!try_create_file(path, mode, buf, size))3982return;3983}39843985if(errno == EEXIST || errno == EACCES) {3986/* We may be trying to create a file where a directory3987 * used to be.3988 */3989struct stat st;3990if(!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))3991 errno = EEXIST;3992}39933994if(errno == EEXIST) {3995unsigned int nr =getpid();39963997for(;;) {3998char newpath[PATH_MAX];3999mksnpath(newpath,sizeof(newpath),"%s~%u", path, nr);4000if(!try_create_file(newpath, mode, buf, size)) {4001if(!rename(newpath, path))4002return;4003unlink_or_warn(newpath);4004break;4005}4006if(errno != EEXIST)4007break;4008++nr;4009}4010}4011die_errno(_("unable to write file '%s' mode%o"), path, mode);4012}40134014static voidadd_conflicted_stages_file(struct patch *patch)4015{4016int stage, namelen;4017unsigned ce_size, mode;4018struct cache_entry *ce;40194020if(!update_index)4021return;4022 namelen =strlen(patch->new_name);4023 ce_size =cache_entry_size(namelen);4024 mode = patch->new_mode ? patch->new_mode : (S_IFREG |0644);40254026remove_file_from_cache(patch->new_name);4027for(stage =1; stage <4; stage++) {4028if(is_null_sha1(patch->threeway_stage[stage -1]))4029continue;4030 ce =xcalloc(1, ce_size);4031memcpy(ce->name, patch->new_name, namelen);4032 ce->ce_mode =create_ce_mode(mode);4033 ce->ce_flags =create_ce_flags(stage);4034 ce->ce_namelen = namelen;4035hashcpy(ce->sha1, patch->threeway_stage[stage -1]);4036if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)4037die(_("unable to add cache entry for%s"), patch->new_name);4038}4039}40404041static voidcreate_file(struct patch *patch)4042{4043char*path = patch->new_name;4044unsigned mode = patch->new_mode;4045unsigned long size = patch->resultsize;4046char*buf = patch->result;40474048if(!mode)4049 mode = S_IFREG |0644;4050create_one_file(path, mode, buf, size);40514052if(patch->conflicted_threeway)4053add_conflicted_stages_file(patch);4054else4055add_index_file(path, mode, buf, size);4056}40574058/* phase zero is to remove, phase one is to create */4059static voidwrite_out_one_result(struct patch *patch,int phase)4060{4061if(patch->is_delete >0) {4062if(phase ==0)4063remove_file(patch,1);4064return;4065}4066if(patch->is_new >0|| patch->is_copy) {4067if(phase ==1)4068create_file(patch);4069return;4070}4071/*4072 * Rename or modification boils down to the same4073 * thing: remove the old, write the new4074 */4075if(phase ==0)4076remove_file(patch, patch->is_rename);4077if(phase ==1)4078create_file(patch);4079}40804081static intwrite_out_one_reject(struct patch *patch)4082{4083FILE*rej;4084char namebuf[PATH_MAX];4085struct fragment *frag;4086int cnt =0;4087struct strbuf sb = STRBUF_INIT;40884089for(cnt =0, frag = patch->fragments; frag; frag = frag->next) {4090if(!frag->rejected)4091continue;4092 cnt++;4093}40944095if(!cnt) {4096if(apply_verbosely)4097say_patch_name(stderr,4098_("Applied patch%scleanly."), patch);4099return0;4100}41014102/* This should not happen, because a removal patch that leaves4103 * contents are marked "rejected" at the patch level.4104 */4105if(!patch->new_name)4106die(_("internal error"));41074108/* Say this even without --verbose */4109strbuf_addf(&sb,Q_("Applying patch %%swith%dreject...",4110"Applying patch %%swith%drejects...",4111 cnt),4112 cnt);4113say_patch_name(stderr, sb.buf, patch);4114strbuf_release(&sb);41154116 cnt =strlen(patch->new_name);4117if(ARRAY_SIZE(namebuf) <= cnt +5) {4118 cnt =ARRAY_SIZE(namebuf) -5;4119warning(_("truncating .rej filename to %.*s.rej"),4120 cnt -1, patch->new_name);4121}4122memcpy(namebuf, patch->new_name, cnt);4123memcpy(namebuf + cnt,".rej",5);41244125 rej =fopen(namebuf,"w");4126if(!rej)4127returnerror(_("cannot open%s:%s"), namebuf,strerror(errno));41284129/* Normal git tools never deal with .rej, so do not pretend4130 * this is a git patch by saying --git or giving extended4131 * headers. While at it, maybe please "kompare" that wants4132 * the trailing TAB and some garbage at the end of line ;-).4133 */4134fprintf(rej,"diff a/%sb/%s\t(rejected hunks)\n",4135 patch->new_name, patch->new_name);4136for(cnt =1, frag = patch->fragments;4137 frag;4138 cnt++, frag = frag->next) {4139if(!frag->rejected) {4140fprintf_ln(stderr,_("Hunk #%dapplied cleanly."), cnt);4141continue;4142}4143fprintf_ln(stderr,_("Rejected hunk #%d."), cnt);4144fprintf(rej,"%.*s", frag->size, frag->patch);4145if(frag->patch[frag->size-1] !='\n')4146fputc('\n', rej);4147}4148fclose(rej);4149return-1;4150}41514152static intwrite_out_results(struct patch *list)4153{4154int phase;4155int errs =0;4156struct patch *l;4157struct string_list cpath = STRING_LIST_INIT_DUP;41584159for(phase =0; phase <2; phase++) {4160 l = list;4161while(l) {4162if(l->rejected)4163 errs =1;4164else{4165write_out_one_result(l, phase);4166if(phase ==1) {4167if(write_out_one_reject(l))4168 errs =1;4169if(l->conflicted_threeway) {4170string_list_append(&cpath, l->new_name);4171 errs =1;4172}4173}4174}4175 l = l->next;4176}4177}41784179if(cpath.nr) {4180struct string_list_item *item;41814182sort_string_list(&cpath);4183for_each_string_list_item(item, &cpath)4184fprintf(stderr,"U%s\n", item->string);4185string_list_clear(&cpath,0);41864187rerere(0);4188}41894190return errs;4191}41924193static struct lock_file lock_file;41944195#define INACCURATE_EOF (1<<0)4196#define RECOUNT (1<<1)41974198static intapply_patch(int fd,const char*filename,int options)4199{4200size_t offset;4201struct strbuf buf = STRBUF_INIT;/* owns the patch text */4202struct patch *list = NULL, **listp = &list;4203int skipped_patch =0;42044205 patch_input_file = filename;4206read_patch_file(&buf, fd);4207 offset =0;4208while(offset < buf.len) {4209struct patch *patch;4210int nr;42114212 patch =xcalloc(1,sizeof(*patch));4213 patch->inaccurate_eof = !!(options & INACCURATE_EOF);4214 patch->recount = !!(options & RECOUNT);4215 nr =parse_chunk(buf.buf + offset, buf.len - offset, patch);4216if(nr <0)4217break;4218if(apply_in_reverse)4219reverse_patches(patch);4220if(use_patch(patch)) {4221patch_stats(patch);4222*listp = patch;4223 listp = &patch->next;4224}4225else{4226free_patch(patch);4227 skipped_patch++;4228}4229 offset += nr;4230}42314232if(!list && !skipped_patch)4233die(_("unrecognized input"));42344235if(whitespace_error && (ws_error_action == die_on_ws_error))4236 apply =0;42374238 update_index = check_index && apply;4239if(update_index && newfd <0)4240 newfd =hold_locked_index(&lock_file,1);42414242if(check_index) {4243if(read_cache() <0)4244die(_("unable to read index file"));4245}42464247if((check || apply) &&4248check_patch_list(list) <0&&4249!apply_with_reject)4250exit(1);42514252if(apply &&write_out_results(list)) {4253if(apply_with_reject)4254exit(1);4255/* with --3way, we still need to write the index out */4256return1;4257}42584259if(fake_ancestor)4260build_fake_ancestor(list, fake_ancestor);42614262if(diffstat)4263stat_patch_list(list);42644265if(numstat)4266numstat_patch_list(list);42674268if(summary)4269summary_patch_list(list);42704271free_patch_list(list);4272strbuf_release(&buf);4273string_list_clear(&fn_table,0);4274return0;4275}42764277static voidgit_apply_config(void)4278{4279git_config_get_string_const("apply.whitespace", &apply_default_whitespace);4280git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);4281git_config(git_default_config, NULL);4282}42834284static intoption_parse_exclude(const struct option *opt,4285const char*arg,int unset)4286{4287add_name_limit(arg,1);4288return0;4289}42904291static intoption_parse_include(const struct option *opt,4292const char*arg,int unset)4293{4294add_name_limit(arg,0);4295 has_include =1;4296return0;4297}42984299static intoption_parse_p(const struct option *opt,4300const char*arg,int unset)4301{4302 p_value =atoi(arg);4303 p_value_known =1;4304return0;4305}43064307static intoption_parse_z(const struct option *opt,4308const char*arg,int unset)4309{4310if(unset)4311 line_termination ='\n';4312else4313 line_termination =0;4314return0;4315}43164317static intoption_parse_space_change(const struct option *opt,4318const char*arg,int unset)4319{4320if(unset)4321 ws_ignore_action = ignore_ws_none;4322else4323 ws_ignore_action = ignore_ws_change;4324return0;4325}43264327static intoption_parse_whitespace(const struct option *opt,4328const char*arg,int unset)4329{4330const char**whitespace_option = opt->value;43314332*whitespace_option = arg;4333parse_whitespace_option(arg);4334return0;4335}43364337static intoption_parse_directory(const struct option *opt,4338const char*arg,int unset)4339{4340 root_len =strlen(arg);4341if(root_len && arg[root_len -1] !='/') {4342char*new_root;4343 root = new_root =xmalloc(root_len +2);4344strcpy(new_root, arg);4345strcpy(new_root + root_len++,"/");4346}else4347 root = arg;4348return0;4349}43504351intcmd_apply(int argc,const char**argv,const char*prefix_)4352{4353int i;4354int errs =0;4355int is_not_gitdir = !startup_info->have_repository;4356int force_apply =0;43574358const char*whitespace_option = NULL;43594360struct option builtin_apply_options[] = {4361{ OPTION_CALLBACK,0,"exclude", NULL,N_("path"),4362N_("don't apply changes matching the given path"),43630, option_parse_exclude },4364{ OPTION_CALLBACK,0,"include", NULL,N_("path"),4365N_("apply changes matching the given path"),43660, option_parse_include },4367{ OPTION_CALLBACK,'p', NULL, NULL,N_("num"),4368N_("remove <num> leading slashes from traditional diff paths"),43690, option_parse_p },4370OPT_BOOL(0,"no-add", &no_add,4371N_("ignore additions made by the patch")),4372OPT_BOOL(0,"stat", &diffstat,4373N_("instead of applying the patch, output diffstat for the input")),4374OPT_NOOP_NOARG(0,"allow-binary-replacement"),4375OPT_NOOP_NOARG(0,"binary"),4376OPT_BOOL(0,"numstat", &numstat,4377N_("show number of added and deleted lines in decimal notation")),4378OPT_BOOL(0,"summary", &summary,4379N_("instead of applying the patch, output a summary for the input")),4380OPT_BOOL(0,"check", &check,4381N_("instead of applying the patch, see if the patch is applicable")),4382OPT_BOOL(0,"index", &check_index,4383N_("make sure the patch is applicable to the current index")),4384OPT_BOOL(0,"cached", &cached,4385N_("apply a patch without touching the working tree")),4386OPT_BOOL(0,"apply", &force_apply,4387N_("also apply the patch (use with --stat/--summary/--check)")),4388OPT_BOOL('3',"3way", &threeway,4389N_("attempt three-way merge if a patch does not apply")),4390OPT_FILENAME(0,"build-fake-ancestor", &fake_ancestor,4391N_("build a temporary index based on embedded index information")),4392{ OPTION_CALLBACK,'z', NULL, NULL, NULL,4393N_("paths are separated with NUL character"),4394 PARSE_OPT_NOARG, option_parse_z },4395OPT_INTEGER('C', NULL, &p_context,4396N_("ensure at least <n> lines of context match")),4397{ OPTION_CALLBACK,0,"whitespace", &whitespace_option,N_("action"),4398N_("detect new or modified lines that have whitespace errors"),43990, option_parse_whitespace },4400{ OPTION_CALLBACK,0,"ignore-space-change", NULL, NULL,4401N_("ignore changes in whitespace when finding context"),4402 PARSE_OPT_NOARG, option_parse_space_change },4403{ OPTION_CALLBACK,0,"ignore-whitespace", NULL, NULL,4404N_("ignore changes in whitespace when finding context"),4405 PARSE_OPT_NOARG, option_parse_space_change },4406OPT_BOOL('R',"reverse", &apply_in_reverse,4407N_("apply the patch in reverse")),4408OPT_BOOL(0,"unidiff-zero", &unidiff_zero,4409N_("don't expect at least one line of context")),4410OPT_BOOL(0,"reject", &apply_with_reject,4411N_("leave the rejected hunks in corresponding *.rej files")),4412OPT_BOOL(0,"allow-overlap", &allow_overlap,4413N_("allow overlapping hunks")),4414OPT__VERBOSE(&apply_verbosely,N_("be verbose")),4415OPT_BIT(0,"inaccurate-eof", &options,4416N_("tolerate incorrectly detected missing new-line at the end of file"),4417 INACCURATE_EOF),4418OPT_BIT(0,"recount", &options,4419N_("do not trust the line counts in the hunk headers"),4420 RECOUNT),4421{ OPTION_CALLBACK,0,"directory", NULL,N_("root"),4422N_("prepend <root> to all filenames"),44230, option_parse_directory },4424OPT_END()4425};44264427 prefix = prefix_;4428 prefix_length = prefix ?strlen(prefix) :0;4429git_apply_config();4430if(apply_default_whitespace)4431parse_whitespace_option(apply_default_whitespace);4432if(apply_default_ignorewhitespace)4433parse_ignorewhitespace_option(apply_default_ignorewhitespace);44344435 argc =parse_options(argc, argv, prefix, builtin_apply_options,4436 apply_usage,0);44374438if(apply_with_reject && threeway)4439die("--reject and --3way cannot be used together.");4440if(cached && threeway)4441die("--cached and --3way cannot be used together.");4442if(threeway) {4443if(is_not_gitdir)4444die(_("--3way outside a repository"));4445 check_index =1;4446}4447if(apply_with_reject)4448 apply = apply_verbosely =1;4449if(!force_apply && (diffstat || numstat || summary || check || fake_ancestor))4450 apply =0;4451if(check_index && is_not_gitdir)4452die(_("--index outside a repository"));4453if(cached) {4454if(is_not_gitdir)4455die(_("--cached outside a repository"));4456 check_index =1;4457}4458for(i =0; i < argc; i++) {4459const char*arg = argv[i];4460int fd;44614462if(!strcmp(arg,"-")) {4463 errs |=apply_patch(0,"<stdin>", options);4464 read_stdin =0;4465continue;4466}else if(0< prefix_length)4467 arg =prefix_filename(prefix, prefix_length, arg);44684469 fd =open(arg, O_RDONLY);4470if(fd <0)4471die_errno(_("can't open patch '%s'"), arg);4472 read_stdin =0;4473set_default_whitespace_mode(whitespace_option);4474 errs |=apply_patch(fd, arg, options);4475close(fd);4476}4477set_default_whitespace_mode(whitespace_option);4478if(read_stdin)4479 errs |=apply_patch(0,"<stdin>", options);4480if(whitespace_error) {4481if(squelch_whitespace_errors &&4482 squelch_whitespace_errors < whitespace_error) {4483int squelched =4484 whitespace_error - squelch_whitespace_errors;4485warning(Q_("squelched%dwhitespace error",4486"squelched%dwhitespace errors",4487 squelched),4488 squelched);4489}4490if(ws_error_action == die_on_ws_error)4491die(Q_("%dline adds whitespace errors.",4492"%dlines add whitespace errors.",4493 whitespace_error),4494 whitespace_error);4495if(applied_after_fixing_ws && apply)4496warning("%dline%sapplied after"4497" fixing whitespace errors.",4498 applied_after_fixing_ws,4499 applied_after_fixing_ws ==1?"":"s");4500else if(whitespace_error)4501warning(Q_("%dline adds whitespace errors.",4502"%dlines add whitespace errors.",4503 whitespace_error),4504 whitespace_error);4505}45064507if(update_index) {4508if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK))4509die(_("Unable to write new index file"));4510}45114512return!!errs;4513}