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 =strchr(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 =xmalloc(root_len +strlen(patch->def_name) +1);1285strcpy(s, root);1286strcpy(s + root_len, patch->def_name);1287free(patch->def_name);1288 patch->def_name = s;1289}12901291 line += len;1292 size -= len;1293 linenr++;1294for(offset = len ; size >0; offset += len, size -= len, line += len, linenr++) {1295static const struct opentry {1296const char*str;1297int(*fn)(const char*,struct patch *);1298} optable[] = {1299{"@@ -", gitdiff_hdrend },1300{"--- ", gitdiff_oldname },1301{"+++ ", gitdiff_newname },1302{"old mode ", gitdiff_oldmode },1303{"new mode ", gitdiff_newmode },1304{"deleted file mode ", gitdiff_delete },1305{"new file mode ", gitdiff_newfile },1306{"copy from ", gitdiff_copysrc },1307{"copy to ", gitdiff_copydst },1308{"rename old ", gitdiff_renamesrc },1309{"rename new ", gitdiff_renamedst },1310{"rename from ", gitdiff_renamesrc },1311{"rename to ", gitdiff_renamedst },1312{"similarity index ", gitdiff_similarity },1313{"dissimilarity index ", gitdiff_dissimilarity },1314{"index ", gitdiff_index },1315{"", gitdiff_unrecognized },1316};1317int i;13181319 len =linelen(line, size);1320if(!len || line[len-1] !='\n')1321break;1322for(i =0; i <ARRAY_SIZE(optable); i++) {1323const struct opentry *p = optable + i;1324int oplen =strlen(p->str);1325if(len < oplen ||memcmp(p->str, line, oplen))1326continue;1327if(p->fn(line + oplen, patch) <0)1328return offset;1329break;1330}1331}13321333return offset;1334}13351336static intparse_num(const char*line,unsigned long*p)1337{1338char*ptr;13391340if(!isdigit(*line))1341return0;1342*p =strtoul(line, &ptr,10);1343return ptr - line;1344}13451346static intparse_range(const char*line,int len,int offset,const char*expect,1347unsigned long*p1,unsigned long*p2)1348{1349int digits, ex;13501351if(offset <0|| offset >= len)1352return-1;1353 line += offset;1354 len -= offset;13551356 digits =parse_num(line, p1);1357if(!digits)1358return-1;13591360 offset += digits;1361 line += digits;1362 len -= digits;13631364*p2 =1;1365if(*line ==',') {1366 digits =parse_num(line+1, p2);1367if(!digits)1368return-1;13691370 offset += digits+1;1371 line += digits+1;1372 len -= digits+1;1373}13741375 ex =strlen(expect);1376if(ex > len)1377return-1;1378if(memcmp(line, expect, ex))1379return-1;13801381return offset + ex;1382}13831384static voidrecount_diff(const char*line,int size,struct fragment *fragment)1385{1386int oldlines =0, newlines =0, ret =0;13871388if(size <1) {1389warning("recount: ignore empty hunk");1390return;1391}13921393for(;;) {1394int len =linelen(line, size);1395 size -= len;1396 line += len;13971398if(size <1)1399break;14001401switch(*line) {1402case' ':case'\n':1403 newlines++;1404/* fall through */1405case'-':1406 oldlines++;1407continue;1408case'+':1409 newlines++;1410continue;1411case'\\':1412continue;1413case'@':1414 ret = size <3|| !starts_with(line,"@@ ");1415break;1416case'd':1417 ret = size <5|| !starts_with(line,"diff ");1418break;1419default:1420 ret = -1;1421break;1422}1423if(ret) {1424warning(_("recount: unexpected line: %.*s"),1425(int)linelen(line, size), line);1426return;1427}1428break;1429}1430 fragment->oldlines = oldlines;1431 fragment->newlines = newlines;1432}14331434/*1435 * Parse a unified diff fragment header of the1436 * form "@@ -a,b +c,d @@"1437 */1438static intparse_fragment_header(const char*line,int len,struct fragment *fragment)1439{1440int offset;14411442if(!len || line[len-1] !='\n')1443return-1;14441445/* Figure out the number of lines in a fragment */1446 offset =parse_range(line, len,4," +", &fragment->oldpos, &fragment->oldlines);1447 offset =parse_range(line, len, offset," @@", &fragment->newpos, &fragment->newlines);14481449return offset;1450}14511452static intfind_header(const char*line,unsigned long size,int*hdrsize,struct patch *patch)1453{1454unsigned long offset, len;14551456 patch->is_toplevel_relative =0;1457 patch->is_rename = patch->is_copy =0;1458 patch->is_new = patch->is_delete = -1;1459 patch->old_mode = patch->new_mode =0;1460 patch->old_name = patch->new_name = NULL;1461for(offset =0; size >0; offset += len, size -= len, line += len, linenr++) {1462unsigned long nextlen;14631464 len =linelen(line, size);1465if(!len)1466break;14671468/* Testing this early allows us to take a few shortcuts.. */1469if(len <6)1470continue;14711472/*1473 * Make sure we don't find any unconnected patch fragments.1474 * That's a sign that we didn't find a header, and that a1475 * patch has become corrupted/broken up.1476 */1477if(!memcmp("@@ -", line,4)) {1478struct fragment dummy;1479if(parse_fragment_header(line, len, &dummy) <0)1480continue;1481die(_("patch fragment without header at line%d: %.*s"),1482 linenr, (int)len-1, line);1483}14841485if(size < len +6)1486break;14871488/*1489 * Git patch? It might not have a real patch, just a rename1490 * or mode change, so we handle that specially1491 */1492if(!memcmp("diff --git ", line,11)) {1493int git_hdr_len =parse_git_header(line, len, size, patch);1494if(git_hdr_len <= len)1495continue;1496if(!patch->old_name && !patch->new_name) {1497if(!patch->def_name)1498die(Q_("git diff header lacks filename information when removing "1499"%dleading pathname component (line%d)",1500"git diff header lacks filename information when removing "1501"%dleading pathname components (line%d)",1502 p_value),1503 p_value, linenr);1504 patch->old_name =xstrdup(patch->def_name);1505 patch->new_name =xstrdup(patch->def_name);1506}1507if(!patch->is_delete && !patch->new_name)1508die("git diff header lacks filename information "1509"(line%d)", linenr);1510 patch->is_toplevel_relative =1;1511*hdrsize = git_hdr_len;1512return offset;1513}15141515/* --- followed by +++ ? */1516if(memcmp("--- ", line,4) ||memcmp("+++ ", line + len,4))1517continue;15181519/*1520 * We only accept unified patches, so we want it to1521 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1522 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1523 */1524 nextlen =linelen(line + len, size - len);1525if(size < nextlen +14||memcmp("@@ -", line + len + nextlen,4))1526continue;15271528/* Ok, we'll consider it a patch */1529parse_traditional_patch(line, line+len, patch);1530*hdrsize = len + nextlen;1531 linenr +=2;1532return offset;1533}1534return-1;1535}15361537static voidrecord_ws_error(unsigned result,const char*line,int len,int linenr)1538{1539char*err;15401541if(!result)1542return;15431544 whitespace_error++;1545if(squelch_whitespace_errors &&1546 squelch_whitespace_errors < whitespace_error)1547return;15481549 err =whitespace_error_string(result);1550fprintf(stderr,"%s:%d:%s.\n%.*s\n",1551 patch_input_file, linenr, err, len, line);1552free(err);1553}15541555static voidcheck_whitespace(const char*line,int len,unsigned ws_rule)1556{1557unsigned result =ws_check(line +1, len -1, ws_rule);15581559record_ws_error(result, line +1, len -2, linenr);1560}15611562/*1563 * Parse a unified diff. Note that this really needs to parse each1564 * fragment separately, since the only way to know the difference1565 * between a "---" that is part of a patch, and a "---" that starts1566 * the next patch is to look at the line counts..1567 */1568static intparse_fragment(const char*line,unsigned long size,1569struct patch *patch,struct fragment *fragment)1570{1571int added, deleted;1572int len =linelen(line, size), offset;1573unsigned long oldlines, newlines;1574unsigned long leading, trailing;15751576 offset =parse_fragment_header(line, len, fragment);1577if(offset <0)1578return-1;1579if(offset >0&& patch->recount)1580recount_diff(line + offset, size - offset, fragment);1581 oldlines = fragment->oldlines;1582 newlines = fragment->newlines;1583 leading =0;1584 trailing =0;15851586/* Parse the thing.. */1587 line += len;1588 size -= len;1589 linenr++;1590 added = deleted =0;1591for(offset = len;15920< size;1593 offset += len, size -= len, line += len, linenr++) {1594if(!oldlines && !newlines)1595break;1596 len =linelen(line, size);1597if(!len || line[len-1] !='\n')1598return-1;1599switch(*line) {1600default:1601return-1;1602case'\n':/* newer GNU diff, an empty context line */1603case' ':1604 oldlines--;1605 newlines--;1606if(!deleted && !added)1607 leading++;1608 trailing++;1609break;1610case'-':1611if(apply_in_reverse &&1612 ws_error_action != nowarn_ws_error)1613check_whitespace(line, len, patch->ws_rule);1614 deleted++;1615 oldlines--;1616 trailing =0;1617break;1618case'+':1619if(!apply_in_reverse &&1620 ws_error_action != nowarn_ws_error)1621check_whitespace(line, len, patch->ws_rule);1622 added++;1623 newlines--;1624 trailing =0;1625break;16261627/*1628 * We allow "\ No newline at end of file". Depending1629 * on locale settings when the patch was produced we1630 * don't know what this line looks like. The only1631 * thing we do know is that it begins with "\ ".1632 * Checking for 12 is just for sanity check -- any1633 * l10n of "\ No newline..." is at least that long.1634 */1635case'\\':1636if(len <12||memcmp(line,"\\",2))1637return-1;1638break;1639}1640}1641if(oldlines || newlines)1642return-1;1643 fragment->leading = leading;1644 fragment->trailing = trailing;16451646/*1647 * If a fragment ends with an incomplete line, we failed to include1648 * it in the above loop because we hit oldlines == newlines == 01649 * before seeing it.1650 */1651if(12< size && !memcmp(line,"\\",2))1652 offset +=linelen(line, size);16531654 patch->lines_added += added;1655 patch->lines_deleted += deleted;16561657if(0< patch->is_new && oldlines)1658returnerror(_("new file depends on old contents"));1659if(0< patch->is_delete && newlines)1660returnerror(_("deleted file still has contents"));1661return offset;1662}16631664/*1665 * We have seen "diff --git a/... b/..." header (or a traditional patch1666 * header). Read hunks that belong to this patch into fragments and hang1667 * them to the given patch structure.1668 *1669 * The (fragment->patch, fragment->size) pair points into the memory given1670 * by the caller, not a copy, when we return.1671 */1672static intparse_single_patch(const char*line,unsigned long size,struct patch *patch)1673{1674unsigned long offset =0;1675unsigned long oldlines =0, newlines =0, context =0;1676struct fragment **fragp = &patch->fragments;16771678while(size >4&& !memcmp(line,"@@ -",4)) {1679struct fragment *fragment;1680int len;16811682 fragment =xcalloc(1,sizeof(*fragment));1683 fragment->linenr = linenr;1684 len =parse_fragment(line, size, patch, fragment);1685if(len <=0)1686die(_("corrupt patch at line%d"), linenr);1687 fragment->patch = line;1688 fragment->size = len;1689 oldlines += fragment->oldlines;1690 newlines += fragment->newlines;1691 context += fragment->leading + fragment->trailing;16921693*fragp = fragment;1694 fragp = &fragment->next;16951696 offset += len;1697 line += len;1698 size -= len;1699}17001701/*1702 * If something was removed (i.e. we have old-lines) it cannot1703 * be creation, and if something was added it cannot be1704 * deletion. However, the reverse is not true; --unified=01705 * patches that only add are not necessarily creation even1706 * though they do not have any old lines, and ones that only1707 * delete are not necessarily deletion.1708 *1709 * Unfortunately, a real creation/deletion patch do _not_ have1710 * any context line by definition, so we cannot safely tell it1711 * apart with --unified=0 insanity. At least if the patch has1712 * more than one hunk it is not creation or deletion.1713 */1714if(patch->is_new <0&&1715(oldlines || (patch->fragments && patch->fragments->next)))1716 patch->is_new =0;1717if(patch->is_delete <0&&1718(newlines || (patch->fragments && patch->fragments->next)))1719 patch->is_delete =0;17201721if(0< patch->is_new && oldlines)1722die(_("new file%sdepends on old contents"), patch->new_name);1723if(0< patch->is_delete && newlines)1724die(_("deleted file%sstill has contents"), patch->old_name);1725if(!patch->is_delete && !newlines && context)1726fprintf_ln(stderr,1727_("** warning: "1728"file%sbecomes empty but is not deleted"),1729 patch->new_name);17301731return offset;1732}17331734staticinlineintmetadata_changes(struct patch *patch)1735{1736return patch->is_rename >0||1737 patch->is_copy >0||1738 patch->is_new >0||1739 patch->is_delete ||1740(patch->old_mode && patch->new_mode &&1741 patch->old_mode != patch->new_mode);1742}17431744static char*inflate_it(const void*data,unsigned long size,1745unsigned long inflated_size)1746{1747 git_zstream stream;1748void*out;1749int st;17501751memset(&stream,0,sizeof(stream));17521753 stream.next_in = (unsigned char*)data;1754 stream.avail_in = size;1755 stream.next_out = out =xmalloc(inflated_size);1756 stream.avail_out = inflated_size;1757git_inflate_init(&stream);1758 st =git_inflate(&stream, Z_FINISH);1759git_inflate_end(&stream);1760if((st != Z_STREAM_END) || stream.total_out != inflated_size) {1761free(out);1762return NULL;1763}1764return out;1765}17661767/*1768 * Read a binary hunk and return a new fragment; fragment->patch1769 * points at an allocated memory that the caller must free, so1770 * it is marked as "->free_patch = 1".1771 */1772static struct fragment *parse_binary_hunk(char**buf_p,1773unsigned long*sz_p,1774int*status_p,1775int*used_p)1776{1777/*1778 * Expect a line that begins with binary patch method ("literal"1779 * or "delta"), followed by the length of data before deflating.1780 * a sequence of 'length-byte' followed by base-85 encoded data1781 * should follow, terminated by a newline.1782 *1783 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1784 * and we would limit the patch line to 66 characters,1785 * so one line can fit up to 13 groups that would decode1786 * to 52 bytes max. The length byte 'A'-'Z' corresponds1787 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1788 */1789int llen, used;1790unsigned long size = *sz_p;1791char*buffer = *buf_p;1792int patch_method;1793unsigned long origlen;1794char*data = NULL;1795int hunk_size =0;1796struct fragment *frag;17971798 llen =linelen(buffer, size);1799 used = llen;18001801*status_p =0;18021803if(starts_with(buffer,"delta ")) {1804 patch_method = BINARY_DELTA_DEFLATED;1805 origlen =strtoul(buffer +6, NULL,10);1806}1807else if(starts_with(buffer,"literal ")) {1808 patch_method = BINARY_LITERAL_DEFLATED;1809 origlen =strtoul(buffer +8, NULL,10);1810}1811else1812return NULL;18131814 linenr++;1815 buffer += llen;1816while(1) {1817int byte_length, max_byte_length, newsize;1818 llen =linelen(buffer, size);1819 used += llen;1820 linenr++;1821if(llen ==1) {1822/* consume the blank line */1823 buffer++;1824 size--;1825break;1826}1827/*1828 * Minimum line is "A00000\n" which is 7-byte long,1829 * and the line length must be multiple of 5 plus 2.1830 */1831if((llen <7) || (llen-2) %5)1832goto corrupt;1833 max_byte_length = (llen -2) /5*4;1834 byte_length = *buffer;1835if('A'<= byte_length && byte_length <='Z')1836 byte_length = byte_length -'A'+1;1837else if('a'<= byte_length && byte_length <='z')1838 byte_length = byte_length -'a'+27;1839else1840goto corrupt;1841/* if the input length was not multiple of 4, we would1842 * have filler at the end but the filler should never1843 * exceed 3 bytes1844 */1845if(max_byte_length < byte_length ||1846 byte_length <= max_byte_length -4)1847goto corrupt;1848 newsize = hunk_size + byte_length;1849 data =xrealloc(data, newsize);1850if(decode_85(data + hunk_size, buffer +1, byte_length))1851goto corrupt;1852 hunk_size = newsize;1853 buffer += llen;1854 size -= llen;1855}18561857 frag =xcalloc(1,sizeof(*frag));1858 frag->patch =inflate_it(data, hunk_size, origlen);1859 frag->free_patch =1;1860if(!frag->patch)1861goto corrupt;1862free(data);1863 frag->size = origlen;1864*buf_p = buffer;1865*sz_p = size;1866*used_p = used;1867 frag->binary_patch_method = patch_method;1868return frag;18691870 corrupt:1871free(data);1872*status_p = -1;1873error(_("corrupt binary patch at line%d: %.*s"),1874 linenr-1, llen-1, buffer);1875return NULL;1876}18771878static intparse_binary(char*buffer,unsigned long size,struct patch *patch)1879{1880/*1881 * We have read "GIT binary patch\n"; what follows is a line1882 * that says the patch method (currently, either "literal" or1883 * "delta") and the length of data before deflating; a1884 * sequence of 'length-byte' followed by base-85 encoded data1885 * follows.1886 *1887 * When a binary patch is reversible, there is another binary1888 * hunk in the same format, starting with patch method (either1889 * "literal" or "delta") with the length of data, and a sequence1890 * of length-byte + base-85 encoded data, terminated with another1891 * empty line. This data, when applied to the postimage, produces1892 * the preimage.1893 */1894struct fragment *forward;1895struct fragment *reverse;1896int status;1897int used, used_1;18981899 forward =parse_binary_hunk(&buffer, &size, &status, &used);1900if(!forward && !status)1901/* there has to be one hunk (forward hunk) */1902returnerror(_("unrecognized binary patch at line%d"), linenr-1);1903if(status)1904/* otherwise we already gave an error message */1905return status;19061907 reverse =parse_binary_hunk(&buffer, &size, &status, &used_1);1908if(reverse)1909 used += used_1;1910else if(status) {1911/*1912 * Not having reverse hunk is not an error, but having1913 * a corrupt reverse hunk is.1914 */1915free((void*) forward->patch);1916free(forward);1917return status;1918}1919 forward->next = reverse;1920 patch->fragments = forward;1921 patch->is_binary =1;1922return used;1923}19241925/*1926 * Read the patch text in "buffer" that extends for "size" bytes; stop1927 * reading after seeing a single patch (i.e. changes to a single file).1928 * Create fragments (i.e. patch hunks) and hang them to the given patch.1929 * Return the number of bytes consumed, so that the caller can call us1930 * again for the next patch.1931 */1932static intparse_chunk(char*buffer,unsigned long size,struct patch *patch)1933{1934int hdrsize, patchsize;1935int offset =find_header(buffer, size, &hdrsize, patch);19361937if(offset <0)1938return offset;19391940 patch->ws_rule =whitespace_rule(patch->new_name1941? patch->new_name1942: patch->old_name);19431944 patchsize =parse_single_patch(buffer + offset + hdrsize,1945 size - offset - hdrsize, patch);19461947if(!patchsize) {1948static const char git_binary[] ="GIT binary patch\n";1949int hd = hdrsize + offset;1950unsigned long llen =linelen(buffer + hd, size - hd);19511952if(llen ==sizeof(git_binary) -1&&1953!memcmp(git_binary, buffer + hd, llen)) {1954int used;1955 linenr++;1956 used =parse_binary(buffer + hd + llen,1957 size - hd - llen, patch);1958if(used)1959 patchsize = used + llen;1960else1961 patchsize =0;1962}1963else if(!memcmp(" differ\n", buffer + hd + llen -8,8)) {1964static const char*binhdr[] = {1965"Binary files ",1966"Files ",1967 NULL,1968};1969int i;1970for(i =0; binhdr[i]; i++) {1971int len =strlen(binhdr[i]);1972if(len < size - hd &&1973!memcmp(binhdr[i], buffer + hd, len)) {1974 linenr++;1975 patch->is_binary =1;1976 patchsize = llen;1977break;1978}1979}1980}19811982/* Empty patch cannot be applied if it is a text patch1983 * without metadata change. A binary patch appears1984 * empty to us here.1985 */1986if((apply || check) &&1987(!patch->is_binary && !metadata_changes(patch)))1988die(_("patch with only garbage at line%d"), linenr);1989}19901991return offset + hdrsize + patchsize;1992}19931994#define swap(a,b) myswap((a),(b),sizeof(a))19951996#define myswap(a, b, size) do { \1997 unsigned char mytmp[size]; \1998 memcpy(mytmp, &a, size); \1999 memcpy(&a, &b, size); \2000 memcpy(&b, mytmp, size); \2001} while (0)20022003static voidreverse_patches(struct patch *p)2004{2005for(; p; p = p->next) {2006struct fragment *frag = p->fragments;20072008swap(p->new_name, p->old_name);2009swap(p->new_mode, p->old_mode);2010swap(p->is_new, p->is_delete);2011swap(p->lines_added, p->lines_deleted);2012swap(p->old_sha1_prefix, p->new_sha1_prefix);20132014for(; frag; frag = frag->next) {2015swap(frag->newpos, frag->oldpos);2016swap(frag->newlines, frag->oldlines);2017}2018}2019}20202021static const char pluses[] =2022"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2023static const char minuses[]=2024"----------------------------------------------------------------------";20252026static voidshow_stats(struct patch *patch)2027{2028struct strbuf qname = STRBUF_INIT;2029char*cp = patch->new_name ? patch->new_name : patch->old_name;2030int max, add, del;20312032quote_c_style(cp, &qname, NULL,0);20332034/*2035 * "scale" the filename2036 */2037 max = max_len;2038if(max >50)2039 max =50;20402041if(qname.len > max) {2042 cp =strchr(qname.buf + qname.len +3- max,'/');2043if(!cp)2044 cp = qname.buf + qname.len +3- max;2045strbuf_splice(&qname,0, cp - qname.buf,"...",3);2046}20472048if(patch->is_binary) {2049printf(" %-*s | Bin\n", max, qname.buf);2050strbuf_release(&qname);2051return;2052}20532054printf(" %-*s |", max, qname.buf);2055strbuf_release(&qname);20562057/*2058 * scale the add/delete2059 */2060 max = max + max_change >70?70- max : max_change;2061 add = patch->lines_added;2062 del = patch->lines_deleted;20632064if(max_change >0) {2065int total = ((add + del) * max + max_change /2) / max_change;2066 add = (add * max + max_change /2) / max_change;2067 del = total - add;2068}2069printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2070 add, pluses, del, minuses);2071}20722073static intread_old_data(struct stat *st,const char*path,struct strbuf *buf)2074{2075switch(st->st_mode & S_IFMT) {2076case S_IFLNK:2077if(strbuf_readlink(buf, path, st->st_size) <0)2078returnerror(_("unable to read symlink%s"), path);2079return0;2080case S_IFREG:2081if(strbuf_read_file(buf, path, st->st_size) != st->st_size)2082returnerror(_("unable to open or read%s"), path);2083convert_to_git(path, buf->buf, buf->len, buf,0);2084return0;2085default:2086return-1;2087}2088}20892090/*2091 * Update the preimage, and the common lines in postimage,2092 * from buffer buf of length len. If postlen is 0 the postimage2093 * is updated in place, otherwise it's updated on a new buffer2094 * of length postlen2095 */20962097static voidupdate_pre_post_images(struct image *preimage,2098struct image *postimage,2099char*buf,2100size_t len,size_t postlen)2101{2102int i, ctx, reduced;2103char*new, *old, *fixed;2104struct image fixed_preimage;21052106/*2107 * Update the preimage with whitespace fixes. Note that we2108 * are not losing preimage->buf -- apply_one_fragment() will2109 * free "oldlines".2110 */2111prepare_image(&fixed_preimage, buf, len,1);2112assert(postlen2113? fixed_preimage.nr == preimage->nr2114: fixed_preimage.nr <= preimage->nr);2115for(i =0; i < fixed_preimage.nr; i++)2116 fixed_preimage.line[i].flag = preimage->line[i].flag;2117free(preimage->line_allocated);2118*preimage = fixed_preimage;21192120/*2121 * Adjust the common context lines in postimage. This can be2122 * done in-place when we are shrinking it with whitespace2123 * fixing, but needs a new buffer when ignoring whitespace or2124 * expanding leading tabs to spaces.2125 *2126 * We trust the caller to tell us if the update can be done2127 * in place (postlen==0) or not.2128 */2129 old = postimage->buf;2130if(postlen)2131new= postimage->buf =xmalloc(postlen);2132else2133new= old;2134 fixed = preimage->buf;21352136for(i = reduced = ctx =0; i < postimage->nr; i++) {2137size_t len = postimage->line[i].len;2138if(!(postimage->line[i].flag & LINE_COMMON)) {2139/* an added line -- no counterparts in preimage */2140memmove(new, old, len);2141 old += len;2142new+= len;2143continue;2144}21452146/* a common context -- skip it in the original postimage */2147 old += len;21482149/* and find the corresponding one in the fixed preimage */2150while(ctx < preimage->nr &&2151!(preimage->line[ctx].flag & LINE_COMMON)) {2152 fixed += preimage->line[ctx].len;2153 ctx++;2154}21552156/*2157 * preimage is expected to run out, if the caller2158 * fixed addition of trailing blank lines.2159 */2160if(preimage->nr <= ctx) {2161 reduced++;2162continue;2163}21642165/* and copy it in, while fixing the line length */2166 len = preimage->line[ctx].len;2167memcpy(new, fixed, len);2168new+= len;2169 fixed += len;2170 postimage->line[i].len = len;2171 ctx++;2172}21732174/* Fix the length of the whole thing */2175 postimage->len =new- postimage->buf;2176 postimage->nr -= reduced;2177}21782179static intmatch_fragment(struct image *img,2180struct image *preimage,2181struct image *postimage,2182unsigned longtry,2183int try_lno,2184unsigned ws_rule,2185int match_beginning,int match_end)2186{2187int i;2188char*fixed_buf, *buf, *orig, *target;2189struct strbuf fixed;2190size_t fixed_len, postlen;2191int preimage_limit;21922193if(preimage->nr + try_lno <= img->nr) {2194/*2195 * The hunk falls within the boundaries of img.2196 */2197 preimage_limit = preimage->nr;2198if(match_end && (preimage->nr + try_lno != img->nr))2199return0;2200}else if(ws_error_action == correct_ws_error &&2201(ws_rule & WS_BLANK_AT_EOF)) {2202/*2203 * This hunk extends beyond the end of img, and we are2204 * removing blank lines at the end of the file. This2205 * many lines from the beginning of the preimage must2206 * match with img, and the remainder of the preimage2207 * must be blank.2208 */2209 preimage_limit = img->nr - try_lno;2210}else{2211/*2212 * The hunk extends beyond the end of the img and2213 * we are not removing blanks at the end, so we2214 * should reject the hunk at this position.2215 */2216return0;2217}22182219if(match_beginning && try_lno)2220return0;22212222/* Quick hash check */2223for(i =0; i < preimage_limit; i++)2224if((img->line[try_lno + i].flag & LINE_PATCHED) ||2225(preimage->line[i].hash != img->line[try_lno + i].hash))2226return0;22272228if(preimage_limit == preimage->nr) {2229/*2230 * Do we have an exact match? If we were told to match2231 * at the end, size must be exactly at try+fragsize,2232 * otherwise try+fragsize must be still within the preimage,2233 * and either case, the old piece should match the preimage2234 * exactly.2235 */2236if((match_end2237? (try+ preimage->len == img->len)2238: (try+ preimage->len <= img->len)) &&2239!memcmp(img->buf +try, preimage->buf, preimage->len))2240return1;2241}else{2242/*2243 * The preimage extends beyond the end of img, so2244 * there cannot be an exact match.2245 *2246 * There must be one non-blank context line that match2247 * a line before the end of img.2248 */2249char*buf_end;22502251 buf = preimage->buf;2252 buf_end = buf;2253for(i =0; i < preimage_limit; i++)2254 buf_end += preimage->line[i].len;22552256for( ; buf < buf_end; buf++)2257if(!isspace(*buf))2258break;2259if(buf == buf_end)2260return0;2261}22622263/*2264 * No exact match. If we are ignoring whitespace, run a line-by-line2265 * fuzzy matching. We collect all the line length information because2266 * we need it to adjust whitespace if we match.2267 */2268if(ws_ignore_action == ignore_ws_change) {2269size_t imgoff =0;2270size_t preoff =0;2271size_t postlen = postimage->len;2272size_t extra_chars;2273char*preimage_eof;2274char*preimage_end;2275for(i =0; i < preimage_limit; i++) {2276size_t prelen = preimage->line[i].len;2277size_t imglen = img->line[try_lno+i].len;22782279if(!fuzzy_matchlines(img->buf +try+ imgoff, imglen,2280 preimage->buf + preoff, prelen))2281return0;2282if(preimage->line[i].flag & LINE_COMMON)2283 postlen += imglen - prelen;2284 imgoff += imglen;2285 preoff += prelen;2286}22872288/*2289 * Ok, the preimage matches with whitespace fuzz.2290 *2291 * imgoff now holds the true length of the target that2292 * matches the preimage before the end of the file.2293 *2294 * Count the number of characters in the preimage that fall2295 * beyond the end of the file and make sure that all of them2296 * are whitespace characters. (This can only happen if2297 * we are removing blank lines at the end of the file.)2298 */2299 buf = preimage_eof = preimage->buf + preoff;2300for( ; i < preimage->nr; i++)2301 preoff += preimage->line[i].len;2302 preimage_end = preimage->buf + preoff;2303for( ; buf < preimage_end; buf++)2304if(!isspace(*buf))2305return0;23062307/*2308 * Update the preimage and the common postimage context2309 * lines to use the same whitespace as the target.2310 * If whitespace is missing in the target (i.e.2311 * if the preimage extends beyond the end of the file),2312 * use the whitespace from the preimage.2313 */2314 extra_chars = preimage_end - preimage_eof;2315strbuf_init(&fixed, imgoff + extra_chars);2316strbuf_add(&fixed, img->buf +try, imgoff);2317strbuf_add(&fixed, preimage_eof, extra_chars);2318 fixed_buf =strbuf_detach(&fixed, &fixed_len);2319update_pre_post_images(preimage, postimage,2320 fixed_buf, fixed_len, postlen);2321return1;2322}23232324if(ws_error_action != correct_ws_error)2325return0;23262327/*2328 * The hunk does not apply byte-by-byte, but the hash says2329 * it might with whitespace fuzz. We haven't been asked to2330 * ignore whitespace, we were asked to correct whitespace2331 * errors, so let's try matching after whitespace correction.2332 *2333 * The preimage may extend beyond the end of the file,2334 * but in this loop we will only handle the part of the2335 * preimage that falls within the file.2336 */2337strbuf_init(&fixed, preimage->len +1);2338 orig = preimage->buf;2339 target = img->buf +try;2340 postlen =0;2341for(i =0; i < preimage_limit; i++) {2342size_t oldlen = preimage->line[i].len;2343size_t tgtlen = img->line[try_lno + i].len;2344size_t fixstart = fixed.len;2345struct strbuf tgtfix;2346int match;23472348/* Try fixing the line in the preimage */2349ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);23502351/* Try fixing the line in the target */2352strbuf_init(&tgtfix, tgtlen);2353ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);23542355/*2356 * If they match, either the preimage was based on2357 * a version before our tree fixed whitespace breakage,2358 * or we are lacking a whitespace-fix patch the tree2359 * the preimage was based on already had (i.e. target2360 * has whitespace breakage, the preimage doesn't).2361 * In either case, we are fixing the whitespace breakages2362 * so we might as well take the fix together with their2363 * real change.2364 */2365 match = (tgtfix.len == fixed.len - fixstart &&2366!memcmp(tgtfix.buf, fixed.buf + fixstart,2367 fixed.len - fixstart));2368 postlen += tgtfix.len;23692370strbuf_release(&tgtfix);2371if(!match)2372goto unmatch_exit;23732374 orig += oldlen;2375 target += tgtlen;2376}237723782379/*2380 * Now handle the lines in the preimage that falls beyond the2381 * end of the file (if any). They will only match if they are2382 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2383 * false).2384 */2385for( ; i < preimage->nr; i++) {2386size_t fixstart = fixed.len;/* start of the fixed preimage */2387size_t oldlen = preimage->line[i].len;2388int j;23892390/* Try fixing the line in the preimage */2391ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);23922393for(j = fixstart; j < fixed.len; j++)2394if(!isspace(fixed.buf[j]))2395goto unmatch_exit;23962397 orig += oldlen;2398}23992400/*2401 * Yes, the preimage is based on an older version that still2402 * has whitespace breakages unfixed, and fixing them makes the2403 * hunk match. Update the context lines in the postimage.2404 */2405 fixed_buf =strbuf_detach(&fixed, &fixed_len);2406if(postlen < postimage->len)2407 postlen =0;2408update_pre_post_images(preimage, postimage,2409 fixed_buf, fixed_len, postlen);2410return1;24112412 unmatch_exit:2413strbuf_release(&fixed);2414return0;2415}24162417static intfind_pos(struct image *img,2418struct image *preimage,2419struct image *postimage,2420int line,2421unsigned ws_rule,2422int match_beginning,int match_end)2423{2424int i;2425unsigned long backwards, forwards,try;2426int backwards_lno, forwards_lno, try_lno;24272428/*2429 * If match_beginning or match_end is specified, there is no2430 * point starting from a wrong line that will never match and2431 * wander around and wait for a match at the specified end.2432 */2433if(match_beginning)2434 line =0;2435else if(match_end)2436 line = img->nr - preimage->nr;24372438/*2439 * Because the comparison is unsigned, the following test2440 * will also take care of a negative line number that can2441 * result when match_end and preimage is larger than the target.2442 */2443if((size_t) line > img->nr)2444 line = img->nr;24452446try=0;2447for(i =0; i < line; i++)2448try+= img->line[i].len;24492450/*2451 * There's probably some smart way to do this, but I'll leave2452 * that to the smart and beautiful people. I'm simple and stupid.2453 */2454 backwards =try;2455 backwards_lno = line;2456 forwards =try;2457 forwards_lno = line;2458 try_lno = line;24592460for(i =0; ; i++) {2461if(match_fragment(img, preimage, postimage,2462try, try_lno, ws_rule,2463 match_beginning, match_end))2464return try_lno;24652466 again:2467if(backwards_lno ==0&& forwards_lno == img->nr)2468break;24692470if(i &1) {2471if(backwards_lno ==0) {2472 i++;2473goto again;2474}2475 backwards_lno--;2476 backwards -= img->line[backwards_lno].len;2477try= backwards;2478 try_lno = backwards_lno;2479}else{2480if(forwards_lno == img->nr) {2481 i++;2482goto again;2483}2484 forwards += img->line[forwards_lno].len;2485 forwards_lno++;2486try= forwards;2487 try_lno = forwards_lno;2488}24892490}2491return-1;2492}24932494static voidremove_first_line(struct image *img)2495{2496 img->buf += img->line[0].len;2497 img->len -= img->line[0].len;2498 img->line++;2499 img->nr--;2500}25012502static voidremove_last_line(struct image *img)2503{2504 img->len -= img->line[--img->nr].len;2505}25062507/*2508 * The change from "preimage" and "postimage" has been found to2509 * apply at applied_pos (counts in line numbers) in "img".2510 * Update "img" to remove "preimage" and replace it with "postimage".2511 */2512static voidupdate_image(struct image *img,2513int applied_pos,2514struct image *preimage,2515struct image *postimage)2516{2517/*2518 * remove the copy of preimage at offset in img2519 * and replace it with postimage2520 */2521int i, nr;2522size_t remove_count, insert_count, applied_at =0;2523char*result;2524int preimage_limit;25252526/*2527 * If we are removing blank lines at the end of img,2528 * the preimage may extend beyond the end.2529 * If that is the case, we must be careful only to2530 * remove the part of the preimage that falls within2531 * the boundaries of img. Initialize preimage_limit2532 * to the number of lines in the preimage that falls2533 * within the boundaries.2534 */2535 preimage_limit = preimage->nr;2536if(preimage_limit > img->nr - applied_pos)2537 preimage_limit = img->nr - applied_pos;25382539for(i =0; i < applied_pos; i++)2540 applied_at += img->line[i].len;25412542 remove_count =0;2543for(i =0; i < preimage_limit; i++)2544 remove_count += img->line[applied_pos + i].len;2545 insert_count = postimage->len;25462547/* Adjust the contents */2548 result =xmalloc(img->len + insert_count - remove_count +1);2549memcpy(result, img->buf, applied_at);2550memcpy(result + applied_at, postimage->buf, postimage->len);2551memcpy(result + applied_at + postimage->len,2552 img->buf + (applied_at + remove_count),2553 img->len - (applied_at + remove_count));2554free(img->buf);2555 img->buf = result;2556 img->len += insert_count - remove_count;2557 result[img->len] ='\0';25582559/* Adjust the line table */2560 nr = img->nr + postimage->nr - preimage_limit;2561if(preimage_limit < postimage->nr) {2562/*2563 * NOTE: this knows that we never call remove_first_line()2564 * on anything other than pre/post image.2565 */2566 img->line =xrealloc(img->line, nr *sizeof(*img->line));2567 img->line_allocated = img->line;2568}2569if(preimage_limit != postimage->nr)2570memmove(img->line + applied_pos + postimage->nr,2571 img->line + applied_pos + preimage_limit,2572(img->nr - (applied_pos + preimage_limit)) *2573sizeof(*img->line));2574memcpy(img->line + applied_pos,2575 postimage->line,2576 postimage->nr *sizeof(*img->line));2577if(!allow_overlap)2578for(i =0; i < postimage->nr; i++)2579 img->line[applied_pos + i].flag |= LINE_PATCHED;2580 img->nr = nr;2581}25822583/*2584 * Use the patch-hunk text in "frag" to prepare two images (preimage and2585 * postimage) for the hunk. Find lines that match "preimage" in "img" and2586 * replace the part of "img" with "postimage" text.2587 */2588static intapply_one_fragment(struct image *img,struct fragment *frag,2589int inaccurate_eof,unsigned ws_rule,2590int nth_fragment)2591{2592int match_beginning, match_end;2593const char*patch = frag->patch;2594int size = frag->size;2595char*old, *oldlines;2596struct strbuf newlines;2597int new_blank_lines_at_end =0;2598int found_new_blank_lines_at_end =0;2599int hunk_linenr = frag->linenr;2600unsigned long leading, trailing;2601int pos, applied_pos;2602struct image preimage;2603struct image postimage;26042605memset(&preimage,0,sizeof(preimage));2606memset(&postimage,0,sizeof(postimage));2607 oldlines =xmalloc(size);2608strbuf_init(&newlines, size);26092610 old = oldlines;2611while(size >0) {2612char first;2613int len =linelen(patch, size);2614int plen;2615int added_blank_line =0;2616int is_blank_context =0;2617size_t start;26182619if(!len)2620break;26212622/*2623 * "plen" is how much of the line we should use for2624 * the actual patch data. Normally we just remove the2625 * first character on the line, but if the line is2626 * followed by "\ No newline", then we also remove the2627 * last one (which is the newline, of course).2628 */2629 plen = len -1;2630if(len < size && patch[len] =='\\')2631 plen--;2632 first = *patch;2633if(apply_in_reverse) {2634if(first =='-')2635 first ='+';2636else if(first =='+')2637 first ='-';2638}26392640switch(first) {2641case'\n':2642/* Newer GNU diff, empty context line */2643if(plen <0)2644/* ... followed by '\No newline'; nothing */2645break;2646*old++ ='\n';2647strbuf_addch(&newlines,'\n');2648add_line_info(&preimage,"\n",1, LINE_COMMON);2649add_line_info(&postimage,"\n",1, LINE_COMMON);2650 is_blank_context =1;2651break;2652case' ':2653if(plen && (ws_rule & WS_BLANK_AT_EOF) &&2654ws_blank_line(patch +1, plen, ws_rule))2655 is_blank_context =1;2656case'-':2657memcpy(old, patch +1, plen);2658add_line_info(&preimage, old, plen,2659(first ==' '? LINE_COMMON :0));2660 old += plen;2661if(first =='-')2662break;2663/* Fall-through for ' ' */2664case'+':2665/* --no-add does not add new lines */2666if(first =='+'&& no_add)2667break;26682669 start = newlines.len;2670if(first !='+'||2671!whitespace_error ||2672 ws_error_action != correct_ws_error) {2673strbuf_add(&newlines, patch +1, plen);2674}2675else{2676ws_fix_copy(&newlines, patch +1, plen, ws_rule, &applied_after_fixing_ws);2677}2678add_line_info(&postimage, newlines.buf + start, newlines.len - start,2679(first =='+'?0: LINE_COMMON));2680if(first =='+'&&2681(ws_rule & WS_BLANK_AT_EOF) &&2682ws_blank_line(patch +1, plen, ws_rule))2683 added_blank_line =1;2684break;2685case'@':case'\\':2686/* Ignore it, we already handled it */2687break;2688default:2689if(apply_verbosely)2690error(_("invalid start of line: '%c'"), first);2691return-1;2692}2693if(added_blank_line) {2694if(!new_blank_lines_at_end)2695 found_new_blank_lines_at_end = hunk_linenr;2696 new_blank_lines_at_end++;2697}2698else if(is_blank_context)2699;2700else2701 new_blank_lines_at_end =0;2702 patch += len;2703 size -= len;2704 hunk_linenr++;2705}2706if(inaccurate_eof &&2707 old > oldlines && old[-1] =='\n'&&2708 newlines.len >0&& newlines.buf[newlines.len -1] =='\n') {2709 old--;2710strbuf_setlen(&newlines, newlines.len -1);2711}27122713 leading = frag->leading;2714 trailing = frag->trailing;27152716/*2717 * A hunk to change lines at the beginning would begin with2718 * @@ -1,L +N,M @@2719 * but we need to be careful. -U0 that inserts before the second2720 * line also has this pattern.2721 *2722 * And a hunk to add to an empty file would begin with2723 * @@ -0,0 +N,M @@2724 *2725 * In other words, a hunk that is (frag->oldpos <= 1) with or2726 * without leading context must match at the beginning.2727 */2728 match_beginning = (!frag->oldpos ||2729(frag->oldpos ==1&& !unidiff_zero));27302731/*2732 * A hunk without trailing lines must match at the end.2733 * However, we simply cannot tell if a hunk must match end2734 * from the lack of trailing lines if the patch was generated2735 * with unidiff without any context.2736 */2737 match_end = !unidiff_zero && !trailing;27382739 pos = frag->newpos ? (frag->newpos -1) :0;2740 preimage.buf = oldlines;2741 preimage.len = old - oldlines;2742 postimage.buf = newlines.buf;2743 postimage.len = newlines.len;2744 preimage.line = preimage.line_allocated;2745 postimage.line = postimage.line_allocated;27462747for(;;) {27482749 applied_pos =find_pos(img, &preimage, &postimage, pos,2750 ws_rule, match_beginning, match_end);27512752if(applied_pos >=0)2753break;27542755/* Am I at my context limits? */2756if((leading <= p_context) && (trailing <= p_context))2757break;2758if(match_beginning || match_end) {2759 match_beginning = match_end =0;2760continue;2761}27622763/*2764 * Reduce the number of context lines; reduce both2765 * leading and trailing if they are equal otherwise2766 * just reduce the larger context.2767 */2768if(leading >= trailing) {2769remove_first_line(&preimage);2770remove_first_line(&postimage);2771 pos--;2772 leading--;2773}2774if(trailing > leading) {2775remove_last_line(&preimage);2776remove_last_line(&postimage);2777 trailing--;2778}2779}27802781if(applied_pos >=0) {2782if(new_blank_lines_at_end &&2783 preimage.nr + applied_pos >= img->nr &&2784(ws_rule & WS_BLANK_AT_EOF) &&2785 ws_error_action != nowarn_ws_error) {2786record_ws_error(WS_BLANK_AT_EOF,"+",1,2787 found_new_blank_lines_at_end);2788if(ws_error_action == correct_ws_error) {2789while(new_blank_lines_at_end--)2790remove_last_line(&postimage);2791}2792/*2793 * We would want to prevent write_out_results()2794 * from taking place in apply_patch() that follows2795 * the callchain led us here, which is:2796 * apply_patch->check_patch_list->check_patch->2797 * apply_data->apply_fragments->apply_one_fragment2798 */2799if(ws_error_action == die_on_ws_error)2800 apply =0;2801}28022803if(apply_verbosely && applied_pos != pos) {2804int offset = applied_pos - pos;2805if(apply_in_reverse)2806 offset =0- offset;2807fprintf_ln(stderr,2808Q_("Hunk #%dsucceeded at%d(offset%dline).",2809"Hunk #%dsucceeded at%d(offset%dlines).",2810 offset),2811 nth_fragment, applied_pos +1, offset);2812}28132814/*2815 * Warn if it was necessary to reduce the number2816 * of context lines.2817 */2818if((leading != frag->leading) ||2819(trailing != frag->trailing))2820fprintf_ln(stderr,_("Context reduced to (%ld/%ld)"2821" to apply fragment at%d"),2822 leading, trailing, applied_pos+1);2823update_image(img, applied_pos, &preimage, &postimage);2824}else{2825if(apply_verbosely)2826error(_("while searching for:\n%.*s"),2827(int)(old - oldlines), oldlines);2828}28292830free(oldlines);2831strbuf_release(&newlines);2832free(preimage.line_allocated);2833free(postimage.line_allocated);28342835return(applied_pos <0);2836}28372838static intapply_binary_fragment(struct image *img,struct patch *patch)2839{2840struct fragment *fragment = patch->fragments;2841unsigned long len;2842void*dst;28432844if(!fragment)2845returnerror(_("missing binary patch data for '%s'"),2846 patch->new_name ?2847 patch->new_name :2848 patch->old_name);28492850/* Binary patch is irreversible without the optional second hunk */2851if(apply_in_reverse) {2852if(!fragment->next)2853returnerror("cannot reverse-apply a binary patch "2854"without the reverse hunk to '%s'",2855 patch->new_name2856? patch->new_name : patch->old_name);2857 fragment = fragment->next;2858}2859switch(fragment->binary_patch_method) {2860case BINARY_DELTA_DEFLATED:2861 dst =patch_delta(img->buf, img->len, fragment->patch,2862 fragment->size, &len);2863if(!dst)2864return-1;2865clear_image(img);2866 img->buf = dst;2867 img->len = len;2868return0;2869case BINARY_LITERAL_DEFLATED:2870clear_image(img);2871 img->len = fragment->size;2872 img->buf =xmemdupz(fragment->patch, img->len);2873return0;2874}2875return-1;2876}28772878/*2879 * Replace "img" with the result of applying the binary patch.2880 * The binary patch data itself in patch->fragment is still kept2881 * but the preimage prepared by the caller in "img" is freed here2882 * or in the helper function apply_binary_fragment() this calls.2883 */2884static intapply_binary(struct image *img,struct patch *patch)2885{2886const char*name = patch->old_name ? patch->old_name : patch->new_name;2887unsigned char sha1[20];28882889/*2890 * For safety, we require patch index line to contain2891 * full 40-byte textual SHA1 for old and new, at least for now.2892 */2893if(strlen(patch->old_sha1_prefix) !=40||2894strlen(patch->new_sha1_prefix) !=40||2895get_sha1_hex(patch->old_sha1_prefix, sha1) ||2896get_sha1_hex(patch->new_sha1_prefix, sha1))2897returnerror("cannot apply binary patch to '%s' "2898"without full index line", name);28992900if(patch->old_name) {2901/*2902 * See if the old one matches what the patch2903 * applies to.2904 */2905hash_sha1_file(img->buf, img->len, blob_type, sha1);2906if(strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2907returnerror("the patch applies to '%s' (%s), "2908"which does not match the "2909"current contents.",2910 name,sha1_to_hex(sha1));2911}2912else{2913/* Otherwise, the old one must be empty. */2914if(img->len)2915returnerror("the patch applies to an empty "2916"'%s' but it is not empty", name);2917}29182919get_sha1_hex(patch->new_sha1_prefix, sha1);2920if(is_null_sha1(sha1)) {2921clear_image(img);2922return0;/* deletion patch */2923}29242925if(has_sha1_file(sha1)) {2926/* We already have the postimage */2927enum object_type type;2928unsigned long size;2929char*result;29302931 result =read_sha1_file(sha1, &type, &size);2932if(!result)2933returnerror("the necessary postimage%sfor "2934"'%s' cannot be read",2935 patch->new_sha1_prefix, name);2936clear_image(img);2937 img->buf = result;2938 img->len = size;2939}else{2940/*2941 * We have verified buf matches the preimage;2942 * apply the patch data to it, which is stored2943 * in the patch->fragments->{patch,size}.2944 */2945if(apply_binary_fragment(img, patch))2946returnerror(_("binary patch does not apply to '%s'"),2947 name);29482949/* verify that the result matches */2950hash_sha1_file(img->buf, img->len, blob_type, sha1);2951if(strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))2952returnerror(_("binary patch to '%s' creates incorrect result (expecting%s, got%s)"),2953 name, patch->new_sha1_prefix,sha1_to_hex(sha1));2954}29552956return0;2957}29582959static intapply_fragments(struct image *img,struct patch *patch)2960{2961struct fragment *frag = patch->fragments;2962const char*name = patch->old_name ? patch->old_name : patch->new_name;2963unsigned ws_rule = patch->ws_rule;2964unsigned inaccurate_eof = patch->inaccurate_eof;2965int nth =0;29662967if(patch->is_binary)2968returnapply_binary(img, patch);29692970while(frag) {2971 nth++;2972if(apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {2973error(_("patch failed:%s:%ld"), name, frag->oldpos);2974if(!apply_with_reject)2975return-1;2976 frag->rejected =1;2977}2978 frag = frag->next;2979}2980return0;2981}29822983static intread_blob_object(struct strbuf *buf,const unsigned char*sha1,unsigned mode)2984{2985if(S_ISGITLINK(mode)) {2986strbuf_grow(buf,100);2987strbuf_addf(buf,"Subproject commit%s\n",sha1_to_hex(sha1));2988}else{2989enum object_type type;2990unsigned long sz;2991char*result;29922993 result =read_sha1_file(sha1, &type, &sz);2994if(!result)2995return-1;2996/* XXX read_sha1_file NUL-terminates */2997strbuf_attach(buf, result, sz, sz +1);2998}2999return0;3000}30013002static intread_file_or_gitlink(const struct cache_entry *ce,struct strbuf *buf)3003{3004if(!ce)3005return0;3006returnread_blob_object(buf, ce->sha1, ce->ce_mode);3007}30083009static struct patch *in_fn_table(const char*name)3010{3011struct string_list_item *item;30123013if(name == NULL)3014return NULL;30153016 item =string_list_lookup(&fn_table, name);3017if(item != NULL)3018return(struct patch *)item->util;30193020return NULL;3021}30223023/*3024 * item->util in the filename table records the status of the path.3025 * Usually it points at a patch (whose result records the contents3026 * of it after applying it), but it could be PATH_WAS_DELETED for a3027 * path that a previously applied patch has already removed, or3028 * PATH_TO_BE_DELETED for a path that a later patch would remove.3029 *3030 * The latter is needed to deal with a case where two paths A and B3031 * are swapped by first renaming A to B and then renaming B to A;3032 * moving A to B should not be prevented due to presence of B as we3033 * will remove it in a later patch.3034 */3035#define PATH_TO_BE_DELETED ((struct patch *) -2)3036#define PATH_WAS_DELETED ((struct patch *) -1)30373038static intto_be_deleted(struct patch *patch)3039{3040return patch == PATH_TO_BE_DELETED;3041}30423043static intwas_deleted(struct patch *patch)3044{3045return patch == PATH_WAS_DELETED;3046}30473048static voidadd_to_fn_table(struct patch *patch)3049{3050struct string_list_item *item;30513052/*3053 * Always add new_name unless patch is a deletion3054 * This should cover the cases for normal diffs,3055 * file creations and copies3056 */3057if(patch->new_name != NULL) {3058 item =string_list_insert(&fn_table, patch->new_name);3059 item->util = patch;3060}30613062/*3063 * store a failure on rename/deletion cases because3064 * later chunks shouldn't patch old names3065 */3066if((patch->new_name == NULL) || (patch->is_rename)) {3067 item =string_list_insert(&fn_table, patch->old_name);3068 item->util = PATH_WAS_DELETED;3069}3070}30713072static voidprepare_fn_table(struct patch *patch)3073{3074/*3075 * store information about incoming file deletion3076 */3077while(patch) {3078if((patch->new_name == NULL) || (patch->is_rename)) {3079struct string_list_item *item;3080 item =string_list_insert(&fn_table, patch->old_name);3081 item->util = PATH_TO_BE_DELETED;3082}3083 patch = patch->next;3084}3085}30863087static intcheckout_target(struct cache_entry *ce,struct stat *st)3088{3089struct checkout costate;30903091memset(&costate,0,sizeof(costate));3092 costate.base_dir ="";3093 costate.refresh_cache =1;3094if(checkout_entry(ce, &costate, NULL) ||lstat(ce->name, st))3095returnerror(_("cannot checkout%s"), ce->name);3096return0;3097}30983099static struct patch *previous_patch(struct patch *patch,int*gone)3100{3101struct patch *previous;31023103*gone =0;3104if(patch->is_copy || patch->is_rename)3105return NULL;/* "git" patches do not depend on the order */31063107 previous =in_fn_table(patch->old_name);3108if(!previous)3109return NULL;31103111if(to_be_deleted(previous))3112return NULL;/* the deletion hasn't happened yet */31133114if(was_deleted(previous))3115*gone =1;31163117return previous;3118}31193120static intverify_index_match(const struct cache_entry *ce,struct stat *st)3121{3122if(S_ISGITLINK(ce->ce_mode)) {3123if(!S_ISDIR(st->st_mode))3124return-1;3125return0;3126}3127returnce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3128}31293130#define SUBMODULE_PATCH_WITHOUT_INDEX 131313132static intload_patch_target(struct strbuf *buf,3133const struct cache_entry *ce,3134struct stat *st,3135const char*name,3136unsigned expected_mode)3137{3138if(cached) {3139if(read_file_or_gitlink(ce, buf))3140returnerror(_("read of%sfailed"), name);3141}else if(name) {3142if(S_ISGITLINK(expected_mode)) {3143if(ce)3144returnread_file_or_gitlink(ce, buf);3145else3146return SUBMODULE_PATCH_WITHOUT_INDEX;3147}else{3148if(read_old_data(st, name, buf))3149returnerror(_("read of%sfailed"), name);3150}3151}3152return0;3153}31543155/*3156 * We are about to apply "patch"; populate the "image" with the3157 * current version we have, from the working tree or from the index,3158 * depending on the situation e.g. --cached/--index. If we are3159 * applying a non-git patch that incrementally updates the tree,3160 * we read from the result of a previous diff.3161 */3162static intload_preimage(struct image *image,3163struct patch *patch,struct stat *st,3164const struct cache_entry *ce)3165{3166struct strbuf buf = STRBUF_INIT;3167size_t len;3168char*img;3169struct patch *previous;3170int status;31713172 previous =previous_patch(patch, &status);3173if(status)3174returnerror(_("path%shas been renamed/deleted"),3175 patch->old_name);3176if(previous) {3177/* We have a patched copy in memory; use that. */3178strbuf_add(&buf, previous->result, previous->resultsize);3179}else{3180 status =load_patch_target(&buf, ce, st,3181 patch->old_name, patch->old_mode);3182if(status <0)3183return status;3184else if(status == SUBMODULE_PATCH_WITHOUT_INDEX) {3185/*3186 * There is no way to apply subproject3187 * patch without looking at the index.3188 * NEEDSWORK: shouldn't this be flagged3189 * as an error???3190 */3191free_fragment_list(patch->fragments);3192 patch->fragments = NULL;3193}else if(status) {3194returnerror(_("read of%sfailed"), patch->old_name);3195}3196}31973198 img =strbuf_detach(&buf, &len);3199prepare_image(image, img, len, !patch->is_binary);3200return0;3201}32023203static intthree_way_merge(struct image *image,3204char*path,3205const unsigned char*base,3206const unsigned char*ours,3207const unsigned char*theirs)3208{3209 mmfile_t base_file, our_file, their_file;3210 mmbuffer_t result = { NULL };3211int status;32123213read_mmblob(&base_file, base);3214read_mmblob(&our_file, ours);3215read_mmblob(&their_file, theirs);3216 status =ll_merge(&result, path,3217&base_file,"base",3218&our_file,"ours",3219&their_file,"theirs", NULL);3220free(base_file.ptr);3221free(our_file.ptr);3222free(their_file.ptr);3223if(status <0|| !result.ptr) {3224free(result.ptr);3225return-1;3226}3227clear_image(image);3228 image->buf = result.ptr;3229 image->len = result.size;32303231return status;3232}32333234/*3235 * When directly falling back to add/add three-way merge, we read from3236 * the current contents of the new_name. In no cases other than that3237 * this function will be called.3238 */3239static intload_current(struct image *image,struct patch *patch)3240{3241struct strbuf buf = STRBUF_INIT;3242int status, pos;3243size_t len;3244char*img;3245struct stat st;3246struct cache_entry *ce;3247char*name = patch->new_name;3248unsigned mode = patch->new_mode;32493250if(!patch->is_new)3251die("BUG: patch to%sis not a creation", patch->old_name);32523253 pos =cache_name_pos(name,strlen(name));3254if(pos <0)3255returnerror(_("%s: does not exist in index"), name);3256 ce = active_cache[pos];3257if(lstat(name, &st)) {3258if(errno != ENOENT)3259returnerror(_("%s:%s"), name,strerror(errno));3260if(checkout_target(ce, &st))3261return-1;3262}3263if(verify_index_match(ce, &st))3264returnerror(_("%s: does not match index"), name);32653266 status =load_patch_target(&buf, ce, &st, name, mode);3267if(status <0)3268return status;3269else if(status)3270return-1;3271 img =strbuf_detach(&buf, &len);3272prepare_image(image, img, len, !patch->is_binary);3273return0;3274}32753276static inttry_threeway(struct image *image,struct patch *patch,3277struct stat *st,const struct cache_entry *ce)3278{3279unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];3280struct strbuf buf = STRBUF_INIT;3281size_t len;3282int status;3283char*img;3284struct image tmp_image;32853286/* No point falling back to 3-way merge in these cases */3287if(patch->is_delete ||3288S_ISGITLINK(patch->old_mode) ||S_ISGITLINK(patch->new_mode))3289return-1;32903291/* Preimage the patch was prepared for */3292if(patch->is_new)3293write_sha1_file("",0, blob_type, pre_sha1);3294else if(get_sha1(patch->old_sha1_prefix, pre_sha1) ||3295read_blob_object(&buf, pre_sha1, patch->old_mode))3296returnerror("repository lacks the necessary blob to fall back on 3-way merge.");32973298fprintf(stderr,"Falling back to three-way merge...\n");32993300 img =strbuf_detach(&buf, &len);3301prepare_image(&tmp_image, img, len,1);3302/* Apply the patch to get the post image */3303if(apply_fragments(&tmp_image, patch) <0) {3304clear_image(&tmp_image);3305return-1;3306}3307/* post_sha1[] is theirs */3308write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_sha1);3309clear_image(&tmp_image);33103311/* our_sha1[] is ours */3312if(patch->is_new) {3313if(load_current(&tmp_image, patch))3314returnerror("cannot read the current contents of '%s'",3315 patch->new_name);3316}else{3317if(load_preimage(&tmp_image, patch, st, ce))3318returnerror("cannot read the current contents of '%s'",3319 patch->old_name);3320}3321write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);3322clear_image(&tmp_image);33233324/* in-core three-way merge between post and our using pre as base */3325 status =three_way_merge(image, patch->new_name,3326 pre_sha1, our_sha1, post_sha1);3327if(status <0) {3328fprintf(stderr,"Failed to fall back on three-way merge...\n");3329return status;3330}33313332if(status) {3333 patch->conflicted_threeway =1;3334if(patch->is_new)3335hashclr(patch->threeway_stage[0]);3336else3337hashcpy(patch->threeway_stage[0], pre_sha1);3338hashcpy(patch->threeway_stage[1], our_sha1);3339hashcpy(patch->threeway_stage[2], post_sha1);3340fprintf(stderr,"Applied patch to '%s' with conflicts.\n", patch->new_name);3341}else{3342fprintf(stderr,"Applied patch to '%s' cleanly.\n", patch->new_name);3343}3344return0;3345}33463347static intapply_data(struct patch *patch,struct stat *st,const struct cache_entry *ce)3348{3349struct image image;33503351if(load_preimage(&image, patch, st, ce) <0)3352return-1;33533354if(patch->direct_to_threeway ||3355apply_fragments(&image, patch) <0) {3356/* Note: with --reject, apply_fragments() returns 0 */3357if(!threeway ||try_threeway(&image, patch, st, ce) <0)3358return-1;3359}3360 patch->result = image.buf;3361 patch->resultsize = image.len;3362add_to_fn_table(patch);3363free(image.line_allocated);33643365if(0< patch->is_delete && patch->resultsize)3366returnerror(_("removal patch leaves file contents"));33673368return0;3369}33703371/*3372 * If "patch" that we are looking at modifies or deletes what we have,3373 * we would want it not to lose any local modification we have, either3374 * in the working tree or in the index.3375 *3376 * This also decides if a non-git patch is a creation patch or a3377 * modification to an existing empty file. We do not check the state3378 * of the current tree for a creation patch in this function; the caller3379 * check_patch() separately makes sure (and errors out otherwise) that3380 * the path the patch creates does not exist in the current tree.3381 */3382static intcheck_preimage(struct patch *patch,struct cache_entry **ce,struct stat *st)3383{3384const char*old_name = patch->old_name;3385struct patch *previous = NULL;3386int stat_ret =0, status;3387unsigned st_mode =0;33883389if(!old_name)3390return0;33913392assert(patch->is_new <=0);3393 previous =previous_patch(patch, &status);33943395if(status)3396returnerror(_("path%shas been renamed/deleted"), old_name);3397if(previous) {3398 st_mode = previous->new_mode;3399}else if(!cached) {3400 stat_ret =lstat(old_name, st);3401if(stat_ret && errno != ENOENT)3402returnerror(_("%s:%s"), old_name,strerror(errno));3403}34043405if(check_index && !previous) {3406int pos =cache_name_pos(old_name,strlen(old_name));3407if(pos <0) {3408if(patch->is_new <0)3409goto is_new;3410returnerror(_("%s: does not exist in index"), old_name);3411}3412*ce = active_cache[pos];3413if(stat_ret <0) {3414if(checkout_target(*ce, st))3415return-1;3416}3417if(!cached &&verify_index_match(*ce, st))3418returnerror(_("%s: does not match index"), old_name);3419if(cached)3420 st_mode = (*ce)->ce_mode;3421}else if(stat_ret <0) {3422if(patch->is_new <0)3423goto is_new;3424returnerror(_("%s:%s"), old_name,strerror(errno));3425}34263427if(!cached && !previous)3428 st_mode =ce_mode_from_stat(*ce, st->st_mode);34293430if(patch->is_new <0)3431 patch->is_new =0;3432if(!patch->old_mode)3433 patch->old_mode = st_mode;3434if((st_mode ^ patch->old_mode) & S_IFMT)3435returnerror(_("%s: wrong type"), old_name);3436if(st_mode != patch->old_mode)3437warning(_("%shas type%o, expected%o"),3438 old_name, st_mode, patch->old_mode);3439if(!patch->new_mode && !patch->is_delete)3440 patch->new_mode = st_mode;3441return0;34423443 is_new:3444 patch->is_new =1;3445 patch->is_delete =0;3446free(patch->old_name);3447 patch->old_name = NULL;3448return0;3449}345034513452#define EXISTS_IN_INDEX 13453#define EXISTS_IN_WORKTREE 234543455static intcheck_to_create(const char*new_name,int ok_if_exists)3456{3457struct stat nst;34583459if(check_index &&3460cache_name_pos(new_name,strlen(new_name)) >=0&&3461!ok_if_exists)3462return EXISTS_IN_INDEX;3463if(cached)3464return0;34653466if(!lstat(new_name, &nst)) {3467if(S_ISDIR(nst.st_mode) || ok_if_exists)3468return0;3469/*3470 * A leading component of new_name might be a symlink3471 * that is going to be removed with this patch, but3472 * still pointing at somewhere that has the path.3473 * In such a case, path "new_name" does not exist as3474 * far as git is concerned.3475 */3476if(has_symlink_leading_path(new_name,strlen(new_name)))3477return0;34783479return EXISTS_IN_WORKTREE;3480}else if((errno != ENOENT) && (errno != ENOTDIR)) {3481returnerror("%s:%s", new_name,strerror(errno));3482}3483return0;3484}34853486/*3487 * Check and apply the patch in-core; leave the result in patch->result3488 * for the caller to write it out to the final destination.3489 */3490static intcheck_patch(struct patch *patch)3491{3492struct stat st;3493const char*old_name = patch->old_name;3494const char*new_name = patch->new_name;3495const char*name = old_name ? old_name : new_name;3496struct cache_entry *ce = NULL;3497struct patch *tpatch;3498int ok_if_exists;3499int status;35003501 patch->rejected =1;/* we will drop this after we succeed */35023503 status =check_preimage(patch, &ce, &st);3504if(status)3505return status;3506 old_name = patch->old_name;35073508/*3509 * A type-change diff is always split into a patch to delete3510 * old, immediately followed by a patch to create new (see3511 * diff.c::run_diff()); in such a case it is Ok that the entry3512 * to be deleted by the previous patch is still in the working3513 * tree and in the index.3514 *3515 * A patch to swap-rename between A and B would first rename A3516 * to B and then rename B to A. While applying the first one,3517 * the presence of B should not stop A from getting renamed to3518 * B; ask to_be_deleted() about the later rename. Removal of3519 * B and rename from A to B is handled the same way by asking3520 * was_deleted().3521 */3522if((tpatch =in_fn_table(new_name)) &&3523(was_deleted(tpatch) ||to_be_deleted(tpatch)))3524 ok_if_exists =1;3525else3526 ok_if_exists =0;35273528if(new_name &&3529((0< patch->is_new) || patch->is_rename || patch->is_copy)) {3530int err =check_to_create(new_name, ok_if_exists);35313532if(err && threeway) {3533 patch->direct_to_threeway =1;3534}else switch(err) {3535case0:3536break;/* happy */3537case EXISTS_IN_INDEX:3538returnerror(_("%s: already exists in index"), new_name);3539break;3540case EXISTS_IN_WORKTREE:3541returnerror(_("%s: already exists in working directory"),3542 new_name);3543default:3544return err;3545}35463547if(!patch->new_mode) {3548if(0< patch->is_new)3549 patch->new_mode = S_IFREG |0644;3550else3551 patch->new_mode = patch->old_mode;3552}3553}35543555if(new_name && old_name) {3556int same = !strcmp(old_name, new_name);3557if(!patch->new_mode)3558 patch->new_mode = patch->old_mode;3559if((patch->old_mode ^ patch->new_mode) & S_IFMT) {3560if(same)3561returnerror(_("new mode (%o) of%sdoes not "3562"match old mode (%o)"),3563 patch->new_mode, new_name,3564 patch->old_mode);3565else3566returnerror(_("new mode (%o) of%sdoes not "3567"match old mode (%o) of%s"),3568 patch->new_mode, new_name,3569 patch->old_mode, old_name);3570}3571}35723573if(apply_data(patch, &st, ce) <0)3574returnerror(_("%s: patch does not apply"), name);3575 patch->rejected =0;3576return0;3577}35783579static intcheck_patch_list(struct patch *patch)3580{3581int err =0;35823583prepare_fn_table(patch);3584while(patch) {3585if(apply_verbosely)3586say_patch_name(stderr,3587_("Checking patch%s..."), patch);3588 err |=check_patch(patch);3589 patch = patch->next;3590}3591return err;3592}35933594/* This function tries to read the sha1 from the current index */3595static intget_current_sha1(const char*path,unsigned char*sha1)3596{3597int pos;35983599if(read_cache() <0)3600return-1;3601 pos =cache_name_pos(path,strlen(path));3602if(pos <0)3603return-1;3604hashcpy(sha1, active_cache[pos]->sha1);3605return0;3606}36073608static intpreimage_sha1_in_gitlink_patch(struct patch *p,unsigned char sha1[20])3609{3610/*3611 * A usable gitlink patch has only one fragment (hunk) that looks like:3612 * @@ -1 +1 @@3613 * -Subproject commit <old sha1>3614 * +Subproject commit <new sha1>3615 * or3616 * @@ -1 +0,0 @@3617 * -Subproject commit <old sha1>3618 * for a removal patch.3619 */3620struct fragment *hunk = p->fragments;3621static const char heading[] ="-Subproject commit ";3622char*preimage;36233624if(/* does the patch have only one hunk? */3625 hunk && !hunk->next &&3626/* is its preimage one line? */3627 hunk->oldpos ==1&& hunk->oldlines ==1&&3628/* does preimage begin with the heading? */3629(preimage =memchr(hunk->patch,'\n', hunk->size)) != NULL &&3630starts_with(++preimage, heading) &&3631/* does it record full SHA-1? */3632!get_sha1_hex(preimage +sizeof(heading) -1, sha1) &&3633 preimage[sizeof(heading) +40-1] =='\n'&&3634/* does the abbreviated name on the index line agree with it? */3635starts_with(preimage +sizeof(heading) -1, p->old_sha1_prefix))3636return0;/* it all looks fine */36373638/* we may have full object name on the index line */3639returnget_sha1_hex(p->old_sha1_prefix, sha1);3640}36413642/* Build an index that contains the just the files needed for a 3way merge */3643static voidbuild_fake_ancestor(struct patch *list,const char*filename)3644{3645struct patch *patch;3646struct index_state result = { NULL };3647int fd;36483649/* Once we start supporting the reverse patch, it may be3650 * worth showing the new sha1 prefix, but until then...3651 */3652for(patch = list; patch; patch = patch->next) {3653unsigned char sha1[20];3654struct cache_entry *ce;3655const char*name;36563657 name = patch->old_name ? patch->old_name : patch->new_name;3658if(0< patch->is_new)3659continue;36603661if(S_ISGITLINK(patch->old_mode)) {3662if(!preimage_sha1_in_gitlink_patch(patch, sha1))3663;/* ok, the textual part looks sane */3664else3665die("sha1 information is lacking or useless for submoule%s",3666 name);3667}else if(!get_sha1_blob(patch->old_sha1_prefix, sha1)) {3668;/* ok */3669}else if(!patch->lines_added && !patch->lines_deleted) {3670/* mode-only change: update the current */3671if(get_current_sha1(patch->old_name, sha1))3672die("mode change for%s, which is not "3673"in current HEAD", name);3674}else3675die("sha1 information is lacking or useless "3676"(%s).", name);36773678 ce =make_cache_entry(patch->old_mode, sha1, name,0,0);3679if(!ce)3680die(_("make_cache_entry failed for path '%s'"), name);3681if(add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))3682die("Could not add%sto temporary index", name);3683}36843685 fd =open(filename, O_WRONLY | O_CREAT,0666);3686if(fd <0||write_index(&result, fd) ||close(fd))3687die("Could not write temporary index to%s", filename);36883689discard_index(&result);3690}36913692static voidstat_patch_list(struct patch *patch)3693{3694int files, adds, dels;36953696for(files = adds = dels =0; patch ; patch = patch->next) {3697 files++;3698 adds += patch->lines_added;3699 dels += patch->lines_deleted;3700show_stats(patch);3701}37023703print_stat_summary(stdout, files, adds, dels);3704}37053706static voidnumstat_patch_list(struct patch *patch)3707{3708for( ; patch; patch = patch->next) {3709const char*name;3710 name = patch->new_name ? patch->new_name : patch->old_name;3711if(patch->is_binary)3712printf("-\t-\t");3713else3714printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);3715write_name_quoted(name, stdout, line_termination);3716}3717}37183719static voidshow_file_mode_name(const char*newdelete,unsigned int mode,const char*name)3720{3721if(mode)3722printf("%smode%06o%s\n", newdelete, mode, name);3723else3724printf("%s %s\n", newdelete, name);3725}37263727static voidshow_mode_change(struct patch *p,int show_name)3728{3729if(p->old_mode && p->new_mode && p->old_mode != p->new_mode) {3730if(show_name)3731printf(" mode change%06o =>%06o%s\n",3732 p->old_mode, p->new_mode, p->new_name);3733else3734printf(" mode change%06o =>%06o\n",3735 p->old_mode, p->new_mode);3736}3737}37383739static voidshow_rename_copy(struct patch *p)3740{3741const char*renamecopy = p->is_rename ?"rename":"copy";3742const char*old, *new;37433744/* Find common prefix */3745 old = p->old_name;3746new= p->new_name;3747while(1) {3748const char*slash_old, *slash_new;3749 slash_old =strchr(old,'/');3750 slash_new =strchr(new,'/');3751if(!slash_old ||3752!slash_new ||3753 slash_old - old != slash_new -new||3754memcmp(old,new, slash_new -new))3755break;3756 old = slash_old +1;3757new= slash_new +1;3758}3759/* p->old_name thru old is the common prefix, and old and new3760 * through the end of names are renames3761 */3762if(old != p->old_name)3763printf("%s%.*s{%s=>%s} (%d%%)\n", renamecopy,3764(int)(old - p->old_name), p->old_name,3765 old,new, p->score);3766else3767printf("%s %s=>%s(%d%%)\n", renamecopy,3768 p->old_name, p->new_name, p->score);3769show_mode_change(p,0);3770}37713772static voidsummary_patch_list(struct patch *patch)3773{3774struct patch *p;37753776for(p = patch; p; p = p->next) {3777if(p->is_new)3778show_file_mode_name("create", p->new_mode, p->new_name);3779else if(p->is_delete)3780show_file_mode_name("delete", p->old_mode, p->old_name);3781else{3782if(p->is_rename || p->is_copy)3783show_rename_copy(p);3784else{3785if(p->score) {3786printf(" rewrite%s(%d%%)\n",3787 p->new_name, p->score);3788show_mode_change(p,0);3789}3790else3791show_mode_change(p,1);3792}3793}3794}3795}37963797static voidpatch_stats(struct patch *patch)3798{3799int lines = patch->lines_added + patch->lines_deleted;38003801if(lines > max_change)3802 max_change = lines;3803if(patch->old_name) {3804int len =quote_c_style(patch->old_name, NULL, NULL,0);3805if(!len)3806 len =strlen(patch->old_name);3807if(len > max_len)3808 max_len = len;3809}3810if(patch->new_name) {3811int len =quote_c_style(patch->new_name, NULL, NULL,0);3812if(!len)3813 len =strlen(patch->new_name);3814if(len > max_len)3815 max_len = len;3816}3817}38183819static voidremove_file(struct patch *patch,int rmdir_empty)3820{3821if(update_index) {3822if(remove_file_from_cache(patch->old_name) <0)3823die(_("unable to remove%sfrom index"), patch->old_name);3824}3825if(!cached) {3826if(!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {3827remove_path(patch->old_name);3828}3829}3830}38313832static voidadd_index_file(const char*path,unsigned mode,void*buf,unsigned long size)3833{3834struct stat st;3835struct cache_entry *ce;3836int namelen =strlen(path);3837unsigned ce_size =cache_entry_size(namelen);38383839if(!update_index)3840return;38413842 ce =xcalloc(1, ce_size);3843memcpy(ce->name, path, namelen);3844 ce->ce_mode =create_ce_mode(mode);3845 ce->ce_flags =create_ce_flags(0);3846 ce->ce_namelen = namelen;3847if(S_ISGITLINK(mode)) {3848const char*s = buf;38493850if(get_sha1_hex(s +strlen("Subproject commit "), ce->sha1))3851die(_("corrupt patch for submodule%s"), path);3852}else{3853if(!cached) {3854if(lstat(path, &st) <0)3855die_errno(_("unable to stat newly created file '%s'"),3856 path);3857fill_stat_cache_info(ce, &st);3858}3859if(write_sha1_file(buf, size, blob_type, ce->sha1) <0)3860die(_("unable to create backing store for newly created file%s"), path);3861}3862if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)3863die(_("unable to add cache entry for%s"), path);3864}38653866static inttry_create_file(const char*path,unsigned int mode,const char*buf,unsigned long size)3867{3868int fd;3869struct strbuf nbuf = STRBUF_INIT;38703871if(S_ISGITLINK(mode)) {3872struct stat st;3873if(!lstat(path, &st) &&S_ISDIR(st.st_mode))3874return0;3875returnmkdir(path,0777);3876}38773878if(has_symlinks &&S_ISLNK(mode))3879/* Although buf:size is counted string, it also is NUL3880 * terminated.3881 */3882returnsymlink(buf, path);38833884 fd =open(path, O_CREAT | O_EXCL | O_WRONLY, (mode &0100) ?0777:0666);3885if(fd <0)3886return-1;38873888if(convert_to_working_tree(path, buf, size, &nbuf)) {3889 size = nbuf.len;3890 buf = nbuf.buf;3891}3892write_or_die(fd, buf, size);3893strbuf_release(&nbuf);38943895if(close(fd) <0)3896die_errno(_("closing file '%s'"), path);3897return0;3898}38993900/*3901 * We optimistically assume that the directories exist,3902 * which is true 99% of the time anyway. If they don't,3903 * we create them and try again.3904 */3905static voidcreate_one_file(char*path,unsigned mode,const char*buf,unsigned long size)3906{3907if(cached)3908return;3909if(!try_create_file(path, mode, buf, size))3910return;39113912if(errno == ENOENT) {3913if(safe_create_leading_directories(path))3914return;3915if(!try_create_file(path, mode, buf, size))3916return;3917}39183919if(errno == EEXIST || errno == EACCES) {3920/* We may be trying to create a file where a directory3921 * used to be.3922 */3923struct stat st;3924if(!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))3925 errno = EEXIST;3926}39273928if(errno == EEXIST) {3929unsigned int nr =getpid();39303931for(;;) {3932char newpath[PATH_MAX];3933mksnpath(newpath,sizeof(newpath),"%s~%u", path, nr);3934if(!try_create_file(newpath, mode, buf, size)) {3935if(!rename(newpath, path))3936return;3937unlink_or_warn(newpath);3938break;3939}3940if(errno != EEXIST)3941break;3942++nr;3943}3944}3945die_errno(_("unable to write file '%s' mode%o"), path, mode);3946}39473948static voidadd_conflicted_stages_file(struct patch *patch)3949{3950int stage, namelen;3951unsigned ce_size, mode;3952struct cache_entry *ce;39533954if(!update_index)3955return;3956 namelen =strlen(patch->new_name);3957 ce_size =cache_entry_size(namelen);3958 mode = patch->new_mode ? patch->new_mode : (S_IFREG |0644);39593960remove_file_from_cache(patch->new_name);3961for(stage =1; stage <4; stage++) {3962if(is_null_sha1(patch->threeway_stage[stage -1]))3963continue;3964 ce =xcalloc(1, ce_size);3965memcpy(ce->name, patch->new_name, namelen);3966 ce->ce_mode =create_ce_mode(mode);3967 ce->ce_flags =create_ce_flags(stage);3968 ce->ce_namelen = namelen;3969hashcpy(ce->sha1, patch->threeway_stage[stage -1]);3970if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)3971die(_("unable to add cache entry for%s"), patch->new_name);3972}3973}39743975static voidcreate_file(struct patch *patch)3976{3977char*path = patch->new_name;3978unsigned mode = patch->new_mode;3979unsigned long size = patch->resultsize;3980char*buf = patch->result;39813982if(!mode)3983 mode = S_IFREG |0644;3984create_one_file(path, mode, buf, size);39853986if(patch->conflicted_threeway)3987add_conflicted_stages_file(patch);3988else3989add_index_file(path, mode, buf, size);3990}39913992/* phase zero is to remove, phase one is to create */3993static voidwrite_out_one_result(struct patch *patch,int phase)3994{3995if(patch->is_delete >0) {3996if(phase ==0)3997remove_file(patch,1);3998return;3999}4000if(patch->is_new >0|| patch->is_copy) {4001if(phase ==1)4002create_file(patch);4003return;4004}4005/*4006 * Rename or modification boils down to the same4007 * thing: remove the old, write the new4008 */4009if(phase ==0)4010remove_file(patch, patch->is_rename);4011if(phase ==1)4012create_file(patch);4013}40144015static intwrite_out_one_reject(struct patch *patch)4016{4017FILE*rej;4018char namebuf[PATH_MAX];4019struct fragment *frag;4020int cnt =0;4021struct strbuf sb = STRBUF_INIT;40224023for(cnt =0, frag = patch->fragments; frag; frag = frag->next) {4024if(!frag->rejected)4025continue;4026 cnt++;4027}40284029if(!cnt) {4030if(apply_verbosely)4031say_patch_name(stderr,4032_("Applied patch%scleanly."), patch);4033return0;4034}40354036/* This should not happen, because a removal patch that leaves4037 * contents are marked "rejected" at the patch level.4038 */4039if(!patch->new_name)4040die(_("internal error"));40414042/* Say this even without --verbose */4043strbuf_addf(&sb,Q_("Applying patch %%swith%dreject...",4044"Applying patch %%swith%drejects...",4045 cnt),4046 cnt);4047say_patch_name(stderr, sb.buf, patch);4048strbuf_release(&sb);40494050 cnt =strlen(patch->new_name);4051if(ARRAY_SIZE(namebuf) <= cnt +5) {4052 cnt =ARRAY_SIZE(namebuf) -5;4053warning(_("truncating .rej filename to %.*s.rej"),4054 cnt -1, patch->new_name);4055}4056memcpy(namebuf, patch->new_name, cnt);4057memcpy(namebuf + cnt,".rej",5);40584059 rej =fopen(namebuf,"w");4060if(!rej)4061returnerror(_("cannot open%s:%s"), namebuf,strerror(errno));40624063/* Normal git tools never deal with .rej, so do not pretend4064 * this is a git patch by saying --git or giving extended4065 * headers. While at it, maybe please "kompare" that wants4066 * the trailing TAB and some garbage at the end of line ;-).4067 */4068fprintf(rej,"diff a/%sb/%s\t(rejected hunks)\n",4069 patch->new_name, patch->new_name);4070for(cnt =1, frag = patch->fragments;4071 frag;4072 cnt++, frag = frag->next) {4073if(!frag->rejected) {4074fprintf_ln(stderr,_("Hunk #%dapplied cleanly."), cnt);4075continue;4076}4077fprintf_ln(stderr,_("Rejected hunk #%d."), cnt);4078fprintf(rej,"%.*s", frag->size, frag->patch);4079if(frag->patch[frag->size-1] !='\n')4080fputc('\n', rej);4081}4082fclose(rej);4083return-1;4084}40854086static intwrite_out_results(struct patch *list)4087{4088int phase;4089int errs =0;4090struct patch *l;4091struct string_list cpath = STRING_LIST_INIT_DUP;40924093for(phase =0; phase <2; phase++) {4094 l = list;4095while(l) {4096if(l->rejected)4097 errs =1;4098else{4099write_out_one_result(l, phase);4100if(phase ==1) {4101if(write_out_one_reject(l))4102 errs =1;4103if(l->conflicted_threeway) {4104string_list_append(&cpath, l->new_name);4105 errs =1;4106}4107}4108}4109 l = l->next;4110}4111}41124113if(cpath.nr) {4114struct string_list_item *item;41154116sort_string_list(&cpath);4117for_each_string_list_item(item, &cpath)4118fprintf(stderr,"U%s\n", item->string);4119string_list_clear(&cpath,0);41204121rerere(0);4122}41234124return errs;4125}41264127static struct lock_file lock_file;41284129static struct string_list limit_by_name;4130static int has_include;4131static voidadd_name_limit(const char*name,int exclude)4132{4133struct string_list_item *it;41344135 it =string_list_append(&limit_by_name, name);4136 it->util = exclude ? NULL : (void*)1;4137}41384139static intuse_patch(struct patch *p)4140{4141const char*pathname = p->new_name ? p->new_name : p->old_name;4142int i;41434144/* Paths outside are not touched regardless of "--include" */4145if(0< prefix_length) {4146int pathlen =strlen(pathname);4147if(pathlen <= prefix_length ||4148memcmp(prefix, pathname, prefix_length))4149return0;4150}41514152/* See if it matches any of exclude/include rule */4153for(i =0; i < limit_by_name.nr; i++) {4154struct string_list_item *it = &limit_by_name.items[i];4155if(!wildmatch(it->string, pathname,0, NULL))4156return(it->util != NULL);4157}41584159/*4160 * If we had any include, a path that does not match any rule is4161 * not used. Otherwise, we saw bunch of exclude rules (or none)4162 * and such a path is used.4163 */4164return!has_include;4165}416641674168static voidprefix_one(char**name)4169{4170char*old_name = *name;4171if(!old_name)4172return;4173*name =xstrdup(prefix_filename(prefix, prefix_length, *name));4174free(old_name);4175}41764177static voidprefix_patches(struct patch *p)4178{4179if(!prefix || p->is_toplevel_relative)4180return;4181for( ; p; p = p->next) {4182prefix_one(&p->new_name);4183prefix_one(&p->old_name);4184}4185}41864187#define INACCURATE_EOF (1<<0)4188#define RECOUNT (1<<1)41894190static intapply_patch(int fd,const char*filename,int options)4191{4192size_t offset;4193struct strbuf buf = STRBUF_INIT;/* owns the patch text */4194struct patch *list = NULL, **listp = &list;4195int skipped_patch =0;41964197 patch_input_file = filename;4198read_patch_file(&buf, fd);4199 offset =0;4200while(offset < buf.len) {4201struct patch *patch;4202int nr;42034204 patch =xcalloc(1,sizeof(*patch));4205 patch->inaccurate_eof = !!(options & INACCURATE_EOF);4206 patch->recount = !!(options & RECOUNT);4207 nr =parse_chunk(buf.buf + offset, buf.len - offset, patch);4208if(nr <0)4209break;4210if(apply_in_reverse)4211reverse_patches(patch);4212if(prefix)4213prefix_patches(patch);4214if(use_patch(patch)) {4215patch_stats(patch);4216*listp = patch;4217 listp = &patch->next;4218}4219else{4220free_patch(patch);4221 skipped_patch++;4222}4223 offset += nr;4224}42254226if(!list && !skipped_patch)4227die(_("unrecognized input"));42284229if(whitespace_error && (ws_error_action == die_on_ws_error))4230 apply =0;42314232 update_index = check_index && apply;4233if(update_index && newfd <0)4234 newfd =hold_locked_index(&lock_file,1);42354236if(check_index) {4237if(read_cache() <0)4238die(_("unable to read index file"));4239}42404241if((check || apply) &&4242check_patch_list(list) <0&&4243!apply_with_reject)4244exit(1);42454246if(apply &&write_out_results(list)) {4247if(apply_with_reject)4248exit(1);4249/* with --3way, we still need to write the index out */4250return1;4251}42524253if(fake_ancestor)4254build_fake_ancestor(list, fake_ancestor);42554256if(diffstat)4257stat_patch_list(list);42584259if(numstat)4260numstat_patch_list(list);42614262if(summary)4263summary_patch_list(list);42644265free_patch_list(list);4266strbuf_release(&buf);4267string_list_clear(&fn_table,0);4268return0;4269}42704271static intgit_apply_config(const char*var,const char*value,void*cb)4272{4273if(!strcmp(var,"apply.whitespace"))4274returngit_config_string(&apply_default_whitespace, var, value);4275else if(!strcmp(var,"apply.ignorewhitespace"))4276returngit_config_string(&apply_default_ignorewhitespace, var, value);4277returngit_default_config(var, value, cb);4278}42794280static intoption_parse_exclude(const struct option *opt,4281const char*arg,int unset)4282{4283add_name_limit(arg,1);4284return0;4285}42864287static intoption_parse_include(const struct option *opt,4288const char*arg,int unset)4289{4290add_name_limit(arg,0);4291 has_include =1;4292return0;4293}42944295static intoption_parse_p(const struct option *opt,4296const char*arg,int unset)4297{4298 p_value =atoi(arg);4299 p_value_known =1;4300return0;4301}43024303static intoption_parse_z(const struct option *opt,4304const char*arg,int unset)4305{4306if(unset)4307 line_termination ='\n';4308else4309 line_termination =0;4310return0;4311}43124313static intoption_parse_space_change(const struct option *opt,4314const char*arg,int unset)4315{4316if(unset)4317 ws_ignore_action = ignore_ws_none;4318else4319 ws_ignore_action = ignore_ws_change;4320return0;4321}43224323static intoption_parse_whitespace(const struct option *opt,4324const char*arg,int unset)4325{4326const char**whitespace_option = opt->value;43274328*whitespace_option = arg;4329parse_whitespace_option(arg);4330return0;4331}43324333static intoption_parse_directory(const struct option *opt,4334const char*arg,int unset)4335{4336 root_len =strlen(arg);4337if(root_len && arg[root_len -1] !='/') {4338char*new_root;4339 root = new_root =xmalloc(root_len +2);4340strcpy(new_root, arg);4341strcpy(new_root + root_len++,"/");4342}else4343 root = arg;4344return0;4345}43464347intcmd_apply(int argc,const char**argv,const char*prefix_)4348{4349int i;4350int errs =0;4351int is_not_gitdir = !startup_info->have_repository;4352int force_apply =0;43534354const char*whitespace_option = NULL;43554356struct option builtin_apply_options[] = {4357{ OPTION_CALLBACK,0,"exclude", NULL,N_("path"),4358N_("don't apply changes matching the given path"),43590, option_parse_exclude },4360{ OPTION_CALLBACK,0,"include", NULL,N_("path"),4361N_("apply changes matching the given path"),43620, option_parse_include },4363{ OPTION_CALLBACK,'p', NULL, NULL,N_("num"),4364N_("remove <num> leading slashes from traditional diff paths"),43650, option_parse_p },4366OPT_BOOL(0,"no-add", &no_add,4367N_("ignore additions made by the patch")),4368OPT_BOOL(0,"stat", &diffstat,4369N_("instead of applying the patch, output diffstat for the input")),4370OPT_NOOP_NOARG(0,"allow-binary-replacement"),4371OPT_NOOP_NOARG(0,"binary"),4372OPT_BOOL(0,"numstat", &numstat,4373N_("show number of added and deleted lines in decimal notation")),4374OPT_BOOL(0,"summary", &summary,4375N_("instead of applying the patch, output a summary for the input")),4376OPT_BOOL(0,"check", &check,4377N_("instead of applying the patch, see if the patch is applicable")),4378OPT_BOOL(0,"index", &check_index,4379N_("make sure the patch is applicable to the current index")),4380OPT_BOOL(0,"cached", &cached,4381N_("apply a patch without touching the working tree")),4382OPT_BOOL(0,"apply", &force_apply,4383N_("also apply the patch (use with --stat/--summary/--check)")),4384OPT_BOOL('3',"3way", &threeway,4385N_("attempt three-way merge if a patch does not apply")),4386OPT_FILENAME(0,"build-fake-ancestor", &fake_ancestor,4387N_("build a temporary index based on embedded index information")),4388{ OPTION_CALLBACK,'z', NULL, NULL, NULL,4389N_("paths are separated with NUL character"),4390 PARSE_OPT_NOARG, option_parse_z },4391OPT_INTEGER('C', NULL, &p_context,4392N_("ensure at least <n> lines of context match")),4393{ OPTION_CALLBACK,0,"whitespace", &whitespace_option,N_("action"),4394N_("detect new or modified lines that have whitespace errors"),43950, option_parse_whitespace },4396{ OPTION_CALLBACK,0,"ignore-space-change", NULL, NULL,4397N_("ignore changes in whitespace when finding context"),4398 PARSE_OPT_NOARG, option_parse_space_change },4399{ OPTION_CALLBACK,0,"ignore-whitespace", NULL, NULL,4400N_("ignore changes in whitespace when finding context"),4401 PARSE_OPT_NOARG, option_parse_space_change },4402OPT_BOOL('R',"reverse", &apply_in_reverse,4403N_("apply the patch in reverse")),4404OPT_BOOL(0,"unidiff-zero", &unidiff_zero,4405N_("don't expect at least one line of context")),4406OPT_BOOL(0,"reject", &apply_with_reject,4407N_("leave the rejected hunks in corresponding *.rej files")),4408OPT_BOOL(0,"allow-overlap", &allow_overlap,4409N_("allow overlapping hunks")),4410OPT__VERBOSE(&apply_verbosely,N_("be verbose")),4411OPT_BIT(0,"inaccurate-eof", &options,4412N_("tolerate incorrectly detected missing new-line at the end of file"),4413 INACCURATE_EOF),4414OPT_BIT(0,"recount", &options,4415N_("do not trust the line counts in the hunk headers"),4416 RECOUNT),4417{ OPTION_CALLBACK,0,"directory", NULL,N_("root"),4418N_("prepend <root> to all filenames"),44190, option_parse_directory },4420OPT_END()4421};44224423 prefix = prefix_;4424 prefix_length = prefix ?strlen(prefix) :0;4425git_config(git_apply_config, NULL);4426if(apply_default_whitespace)4427parse_whitespace_option(apply_default_whitespace);4428if(apply_default_ignorewhitespace)4429parse_ignorewhitespace_option(apply_default_ignorewhitespace);44304431 argc =parse_options(argc, argv, prefix, builtin_apply_options,4432 apply_usage,0);44334434if(apply_with_reject && threeway)4435die("--reject and --3way cannot be used together.");4436if(cached && threeway)4437die("--cached and --3way cannot be used together.");4438if(threeway) {4439if(is_not_gitdir)4440die(_("--3way outside a repository"));4441 check_index =1;4442}4443if(apply_with_reject)4444 apply = apply_verbosely =1;4445if(!force_apply && (diffstat || numstat || summary || check || fake_ancestor))4446 apply =0;4447if(check_index && is_not_gitdir)4448die(_("--index outside a repository"));4449if(cached) {4450if(is_not_gitdir)4451die(_("--cached outside a repository"));4452 check_index =1;4453}4454for(i =0; i < argc; i++) {4455const char*arg = argv[i];4456int fd;44574458if(!strcmp(arg,"-")) {4459 errs |=apply_patch(0,"<stdin>", options);4460 read_stdin =0;4461continue;4462}else if(0< prefix_length)4463 arg =prefix_filename(prefix, prefix_length, arg);44644465 fd =open(arg, O_RDONLY);4466if(fd <0)4467die_errno(_("can't open patch '%s'"), arg);4468 read_stdin =0;4469set_default_whitespace_mode(whitespace_option);4470 errs |=apply_patch(fd, arg, options);4471close(fd);4472}4473set_default_whitespace_mode(whitespace_option);4474if(read_stdin)4475 errs |=apply_patch(0,"<stdin>", options);4476if(whitespace_error) {4477if(squelch_whitespace_errors &&4478 squelch_whitespace_errors < whitespace_error) {4479int squelched =4480 whitespace_error - squelch_whitespace_errors;4481warning(Q_("squelched%dwhitespace error",4482"squelched%dwhitespace errors",4483 squelched),4484 squelched);4485}4486if(ws_error_action == die_on_ws_error)4487die(Q_("%dline adds whitespace errors.",4488"%dlines add whitespace errors.",4489 whitespace_error),4490 whitespace_error);4491if(applied_after_fixing_ws && apply)4492warning("%dline%sapplied after"4493" fixing whitespace errors.",4494 applied_after_fixing_ws,4495 applied_after_fixing_ws ==1?"":"s");4496else if(whitespace_error)4497warning(Q_("%dline adds whitespace errors.",4498"%dlines add whitespace errors.",4499 whitespace_error),4500 whitespace_error);4501}45024503if(update_index) {4504if(write_cache(newfd, active_cache, active_nr) ||4505commit_locked_index(&lock_file))4506die(_("Unable to write new index file"));4507}45084509return!!errs;4510}