1/* 2 * apply.c 3 * 4 * Copyright (C) Linus Torvalds, 2005 5 * 6 * This applies patches on top of some (arbitrary) version of the SCM. 7 * 8 */ 9#include"cache.h" 10#include"lockfile.h" 11#include"cache-tree.h" 12#include"quote.h" 13#include"blob.h" 14#include"delta.h" 15#include"builtin.h" 16#include"string-list.h" 17#include"dir.h" 18#include"diff.h" 19#include"parse-options.h" 20#include"xdiff-interface.h" 21#include"ll-merge.h" 22#include"rerere.h" 23#include"apply.h" 24 25static const char*const apply_usage[] = { 26N_("git apply [<options>] [<patch>...]"), 27 NULL 28}; 29 30static voidparse_whitespace_option(struct apply_state *state,const char*option) 31{ 32if(!option) { 33 state->ws_error_action = warn_on_ws_error; 34return; 35} 36if(!strcmp(option,"warn")) { 37 state->ws_error_action = warn_on_ws_error; 38return; 39} 40if(!strcmp(option,"nowarn")) { 41 state->ws_error_action = nowarn_ws_error; 42return; 43} 44if(!strcmp(option,"error")) { 45 state->ws_error_action = die_on_ws_error; 46return; 47} 48if(!strcmp(option,"error-all")) { 49 state->ws_error_action = die_on_ws_error; 50 state->squelch_whitespace_errors =0; 51return; 52} 53if(!strcmp(option,"strip") || !strcmp(option,"fix")) { 54 state->ws_error_action = correct_ws_error; 55return; 56} 57die(_("unrecognized whitespace option '%s'"), option); 58} 59 60static voidparse_ignorewhitespace_option(struct apply_state *state, 61const char*option) 62{ 63if(!option || !strcmp(option,"no") || 64!strcmp(option,"false") || !strcmp(option,"never") || 65!strcmp(option,"none")) { 66 state->ws_ignore_action = ignore_ws_none; 67return; 68} 69if(!strcmp(option,"change")) { 70 state->ws_ignore_action = ignore_ws_change; 71return; 72} 73die(_("unrecognized whitespace ignore option '%s'"), option); 74} 75 76static voidset_default_whitespace_mode(struct apply_state *state) 77{ 78if(!state->whitespace_option && !apply_default_whitespace) 79 state->ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error); 80} 81 82/* 83 * This represents one "hunk" from a patch, starting with 84 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 85 * patch text is pointed at by patch, and its byte length 86 * is stored in size. leading and trailing are the number 87 * of context lines. 88 */ 89struct fragment { 90unsigned long leading, trailing; 91unsigned long oldpos, oldlines; 92unsigned long newpos, newlines; 93/* 94 * 'patch' is usually borrowed from buf in apply_patch(), 95 * but some codepaths store an allocated buffer. 96 */ 97const char*patch; 98unsigned free_patch:1, 99 rejected:1; 100int size; 101int linenr; 102struct fragment *next; 103}; 104 105/* 106 * When dealing with a binary patch, we reuse "leading" field 107 * to store the type of the binary hunk, either deflated "delta" 108 * or deflated "literal". 109 */ 110#define binary_patch_method leading 111#define BINARY_DELTA_DEFLATED 1 112#define BINARY_LITERAL_DEFLATED 2 113 114/* 115 * This represents a "patch" to a file, both metainfo changes 116 * such as creation/deletion, filemode and content changes represented 117 * as a series of fragments. 118 */ 119struct patch { 120char*new_name, *old_name, *def_name; 121unsigned int old_mode, new_mode; 122int is_new, is_delete;/* -1 = unknown, 0 = false, 1 = true */ 123int rejected; 124unsigned ws_rule; 125int lines_added, lines_deleted; 126int score; 127unsigned int is_toplevel_relative:1; 128unsigned int inaccurate_eof:1; 129unsigned int is_binary:1; 130unsigned int is_copy:1; 131unsigned int is_rename:1; 132unsigned int recount:1; 133unsigned int conflicted_threeway:1; 134unsigned int direct_to_threeway:1; 135struct fragment *fragments; 136char*result; 137size_t resultsize; 138char old_sha1_prefix[41]; 139char new_sha1_prefix[41]; 140struct patch *next; 141 142/* three-way fallback result */ 143struct object_id threeway_stage[3]; 144}; 145 146static voidfree_fragment_list(struct fragment *list) 147{ 148while(list) { 149struct fragment *next = list->next; 150if(list->free_patch) 151free((char*)list->patch); 152free(list); 153 list = next; 154} 155} 156 157static voidfree_patch(struct patch *patch) 158{ 159free_fragment_list(patch->fragments); 160free(patch->def_name); 161free(patch->old_name); 162free(patch->new_name); 163free(patch->result); 164free(patch); 165} 166 167static voidfree_patch_list(struct patch *list) 168{ 169while(list) { 170struct patch *next = list->next; 171free_patch(list); 172 list = next; 173} 174} 175 176/* 177 * A line in a file, len-bytes long (includes the terminating LF, 178 * except for an incomplete line at the end if the file ends with 179 * one), and its contents hashes to 'hash'. 180 */ 181struct line { 182size_t len; 183unsigned hash :24; 184unsigned flag :8; 185#define LINE_COMMON 1 186#define LINE_PATCHED 2 187}; 188 189/* 190 * This represents a "file", which is an array of "lines". 191 */ 192struct image { 193char*buf; 194size_t len; 195size_t nr; 196size_t alloc; 197struct line *line_allocated; 198struct line *line; 199}; 200 201static uint32_thash_line(const char*cp,size_t len) 202{ 203size_t i; 204uint32_t h; 205for(i =0, h =0; i < len; i++) { 206if(!isspace(cp[i])) { 207 h = h *3+ (cp[i] &0xff); 208} 209} 210return h; 211} 212 213/* 214 * Compare lines s1 of length n1 and s2 of length n2, ignoring 215 * whitespace difference. Returns 1 if they match, 0 otherwise 216 */ 217static intfuzzy_matchlines(const char*s1,size_t n1, 218const char*s2,size_t n2) 219{ 220const char*last1 = s1 + n1 -1; 221const char*last2 = s2 + n2 -1; 222int result =0; 223 224/* ignore line endings */ 225while((*last1 =='\r') || (*last1 =='\n')) 226 last1--; 227while((*last2 =='\r') || (*last2 =='\n')) 228 last2--; 229 230/* skip leading whitespaces, if both begin with whitespace */ 231if(s1 <= last1 && s2 <= last2 &&isspace(*s1) &&isspace(*s2)) { 232while(isspace(*s1) && (s1 <= last1)) 233 s1++; 234while(isspace(*s2) && (s2 <= last2)) 235 s2++; 236} 237/* early return if both lines are empty */ 238if((s1 > last1) && (s2 > last2)) 239return1; 240while(!result) { 241 result = *s1++ - *s2++; 242/* 243 * Skip whitespace inside. We check for whitespace on 244 * both buffers because we don't want "a b" to match 245 * "ab" 246 */ 247if(isspace(*s1) &&isspace(*s2)) { 248while(isspace(*s1) && s1 <= last1) 249 s1++; 250while(isspace(*s2) && s2 <= last2) 251 s2++; 252} 253/* 254 * If we reached the end on one side only, 255 * lines don't match 256 */ 257if( 258((s2 > last2) && (s1 <= last1)) || 259((s1 > last1) && (s2 <= last2))) 260return0; 261if((s1 > last1) && (s2 > last2)) 262break; 263} 264 265return!result; 266} 267 268static voidadd_line_info(struct image *img,const char*bol,size_t len,unsigned flag) 269{ 270ALLOC_GROW(img->line_allocated, img->nr +1, img->alloc); 271 img->line_allocated[img->nr].len = len; 272 img->line_allocated[img->nr].hash =hash_line(bol, len); 273 img->line_allocated[img->nr].flag = flag; 274 img->nr++; 275} 276 277/* 278 * "buf" has the file contents to be patched (read from various sources). 279 * attach it to "image" and add line-based index to it. 280 * "image" now owns the "buf". 281 */ 282static voidprepare_image(struct image *image,char*buf,size_t len, 283int prepare_linetable) 284{ 285const char*cp, *ep; 286 287memset(image,0,sizeof(*image)); 288 image->buf = buf; 289 image->len = len; 290 291if(!prepare_linetable) 292return; 293 294 ep = image->buf + image->len; 295 cp = image->buf; 296while(cp < ep) { 297const char*next; 298for(next = cp; next < ep && *next !='\n'; next++) 299; 300if(next < ep) 301 next++; 302add_line_info(image, cp, next - cp,0); 303 cp = next; 304} 305 image->line = image->line_allocated; 306} 307 308static voidclear_image(struct image *image) 309{ 310free(image->buf); 311free(image->line_allocated); 312memset(image,0,sizeof(*image)); 313} 314 315/* fmt must contain _one_ %s and no other substitution */ 316static voidsay_patch_name(FILE*output,const char*fmt,struct patch *patch) 317{ 318struct strbuf sb = STRBUF_INIT; 319 320if(patch->old_name && patch->new_name && 321strcmp(patch->old_name, patch->new_name)) { 322quote_c_style(patch->old_name, &sb, NULL,0); 323strbuf_addstr(&sb," => "); 324quote_c_style(patch->new_name, &sb, NULL,0); 325}else{ 326const char*n = patch->new_name; 327if(!n) 328 n = patch->old_name; 329quote_c_style(n, &sb, NULL,0); 330} 331fprintf(output, fmt, sb.buf); 332fputc('\n', output); 333strbuf_release(&sb); 334} 335 336#define SLOP (16) 337 338static intread_patch_file(struct strbuf *sb,int fd) 339{ 340if(strbuf_read(sb, fd,0) <0) 341returnerror_errno("git apply: failed to read"); 342 343/* 344 * Make sure that we have some slop in the buffer 345 * so that we can do speculative "memcmp" etc, and 346 * see to it that it is NUL-filled. 347 */ 348strbuf_grow(sb, SLOP); 349memset(sb->buf + sb->len,0, SLOP); 350return0; 351} 352 353static unsigned longlinelen(const char*buffer,unsigned long size) 354{ 355unsigned long len =0; 356while(size--) { 357 len++; 358if(*buffer++ =='\n') 359break; 360} 361return len; 362} 363 364static intis_dev_null(const char*str) 365{ 366returnskip_prefix(str,"/dev/null", &str) &&isspace(*str); 367} 368 369#define TERM_SPACE 1 370#define TERM_TAB 2 371 372static intname_terminate(int c,int terminate) 373{ 374if(c ==' '&& !(terminate & TERM_SPACE)) 375return0; 376if(c =='\t'&& !(terminate & TERM_TAB)) 377return0; 378 379return1; 380} 381 382/* remove double slashes to make --index work with such filenames */ 383static char*squash_slash(char*name) 384{ 385int i =0, j =0; 386 387if(!name) 388return NULL; 389 390while(name[i]) { 391if((name[j++] = name[i++]) =='/') 392while(name[i] =='/') 393 i++; 394} 395 name[j] ='\0'; 396return name; 397} 398 399static char*find_name_gnu(struct apply_state *state, 400const char*line, 401const char*def, 402int p_value) 403{ 404struct strbuf name = STRBUF_INIT; 405char*cp; 406 407/* 408 * Proposed "new-style" GNU patch/diff format; see 409 * http://marc.info/?l=git&m=112927316408690&w=2 410 */ 411if(unquote_c_style(&name, line, NULL)) { 412strbuf_release(&name); 413return NULL; 414} 415 416for(cp = name.buf; p_value; p_value--) { 417 cp =strchr(cp,'/'); 418if(!cp) { 419strbuf_release(&name); 420return NULL; 421} 422 cp++; 423} 424 425strbuf_remove(&name,0, cp - name.buf); 426if(state->root.len) 427strbuf_insert(&name,0, state->root.buf, state->root.len); 428returnsquash_slash(strbuf_detach(&name, NULL)); 429} 430 431static size_tsane_tz_len(const char*line,size_t len) 432{ 433const char*tz, *p; 434 435if(len <strlen(" +0500") || line[len-strlen(" +0500")] !=' ') 436return0; 437 tz = line + len -strlen(" +0500"); 438 439if(tz[1] !='+'&& tz[1] !='-') 440return0; 441 442for(p = tz +2; p != line + len; p++) 443if(!isdigit(*p)) 444return0; 445 446return line + len - tz; 447} 448 449static size_ttz_with_colon_len(const char*line,size_t len) 450{ 451const char*tz, *p; 452 453if(len <strlen(" +08:00") || line[len -strlen(":00")] !=':') 454return0; 455 tz = line + len -strlen(" +08:00"); 456 457if(tz[0] !=' '|| (tz[1] !='+'&& tz[1] !='-')) 458return0; 459 p = tz +2; 460if(!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 461!isdigit(*p++) || !isdigit(*p++)) 462return0; 463 464return line + len - tz; 465} 466 467static size_tdate_len(const char*line,size_t len) 468{ 469const char*date, *p; 470 471if(len <strlen("72-02-05") || line[len-strlen("-05")] !='-') 472return0; 473 p = date = line + len -strlen("72-02-05"); 474 475if(!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 476!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 477!isdigit(*p++) || !isdigit(*p++))/* Not a date. */ 478return0; 479 480if(date - line >=strlen("19") && 481isdigit(date[-1]) &&isdigit(date[-2]))/* 4-digit year */ 482 date -=strlen("19"); 483 484return line + len - date; 485} 486 487static size_tshort_time_len(const char*line,size_t len) 488{ 489const char*time, *p; 490 491if(len <strlen(" 07:01:32") || line[len-strlen(":32")] !=':') 492return0; 493 p = time = line + len -strlen(" 07:01:32"); 494 495/* Permit 1-digit hours? */ 496if(*p++ !=' '|| 497!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 498!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 499!isdigit(*p++) || !isdigit(*p++))/* Not a time. */ 500return0; 501 502return line + len - time; 503} 504 505static size_tfractional_time_len(const char*line,size_t len) 506{ 507const char*p; 508size_t n; 509 510/* Expected format: 19:41:17.620000023 */ 511if(!len || !isdigit(line[len -1])) 512return0; 513 p = line + len -1; 514 515/* Fractional seconds. */ 516while(p > line &&isdigit(*p)) 517 p--; 518if(*p !='.') 519return0; 520 521/* Hours, minutes, and whole seconds. */ 522 n =short_time_len(line, p - line); 523if(!n) 524return0; 525 526return line + len - p + n; 527} 528 529static size_ttrailing_spaces_len(const char*line,size_t len) 530{ 531const char*p; 532 533/* Expected format: ' ' x (1 or more) */ 534if(!len || line[len -1] !=' ') 535return0; 536 537 p = line + len; 538while(p != line) { 539 p--; 540if(*p !=' ') 541return line + len - (p +1); 542} 543 544/* All spaces! */ 545return len; 546} 547 548static size_tdiff_timestamp_len(const char*line,size_t len) 549{ 550const char*end = line + len; 551size_t n; 552 553/* 554 * Posix: 2010-07-05 19:41:17 555 * GNU: 2010-07-05 19:41:17.620000023 -0500 556 */ 557 558if(!isdigit(end[-1])) 559return0; 560 561 n =sane_tz_len(line, end - line); 562if(!n) 563 n =tz_with_colon_len(line, end - line); 564 end -= n; 565 566 n =short_time_len(line, end - line); 567if(!n) 568 n =fractional_time_len(line, end - line); 569 end -= n; 570 571 n =date_len(line, end - line); 572if(!n)/* No date. Too bad. */ 573return0; 574 end -= n; 575 576if(end == line)/* No space before date. */ 577return0; 578if(end[-1] =='\t') {/* Success! */ 579 end--; 580return line + len - end; 581} 582if(end[-1] !=' ')/* No space before date. */ 583return0; 584 585/* Whitespace damage. */ 586 end -=trailing_spaces_len(line, end - line); 587return line + len - end; 588} 589 590static char*find_name_common(struct apply_state *state, 591const char*line, 592const char*def, 593int p_value, 594const char*end, 595int terminate) 596{ 597int len; 598const char*start = NULL; 599 600if(p_value ==0) 601 start = line; 602while(line != end) { 603char c = *line; 604 605if(!end &&isspace(c)) { 606if(c =='\n') 607break; 608if(name_terminate(c, terminate)) 609break; 610} 611 line++; 612if(c =='/'&& !--p_value) 613 start = line; 614} 615if(!start) 616returnsquash_slash(xstrdup_or_null(def)); 617 len = line - start; 618if(!len) 619returnsquash_slash(xstrdup_or_null(def)); 620 621/* 622 * Generally we prefer the shorter name, especially 623 * if the other one is just a variation of that with 624 * something else tacked on to the end (ie "file.orig" 625 * or "file~"). 626 */ 627if(def) { 628int deflen =strlen(def); 629if(deflen < len && !strncmp(start, def, deflen)) 630returnsquash_slash(xstrdup(def)); 631} 632 633if(state->root.len) { 634char*ret =xstrfmt("%s%.*s", state->root.buf, len, start); 635returnsquash_slash(ret); 636} 637 638returnsquash_slash(xmemdupz(start, len)); 639} 640 641static char*find_name(struct apply_state *state, 642const char*line, 643char*def, 644int p_value, 645int terminate) 646{ 647if(*line =='"') { 648char*name =find_name_gnu(state, line, def, p_value); 649if(name) 650return name; 651} 652 653returnfind_name_common(state, line, def, p_value, NULL, terminate); 654} 655 656static char*find_name_traditional(struct apply_state *state, 657const char*line, 658char*def, 659int p_value) 660{ 661size_t len; 662size_t date_len; 663 664if(*line =='"') { 665char*name =find_name_gnu(state, line, def, p_value); 666if(name) 667return name; 668} 669 670 len =strchrnul(line,'\n') - line; 671 date_len =diff_timestamp_len(line, len); 672if(!date_len) 673returnfind_name_common(state, line, def, p_value, NULL, TERM_TAB); 674 len -= date_len; 675 676returnfind_name_common(state, line, def, p_value, line + len,0); 677} 678 679static intcount_slashes(const char*cp) 680{ 681int cnt =0; 682char ch; 683 684while((ch = *cp++)) 685if(ch =='/') 686 cnt++; 687return cnt; 688} 689 690/* 691 * Given the string after "--- " or "+++ ", guess the appropriate 692 * p_value for the given patch. 693 */ 694static intguess_p_value(struct apply_state *state,const char*nameline) 695{ 696char*name, *cp; 697int val = -1; 698 699if(is_dev_null(nameline)) 700return-1; 701 name =find_name_traditional(state, nameline, NULL,0); 702if(!name) 703return-1; 704 cp =strchr(name,'/'); 705if(!cp) 706 val =0; 707else if(state->prefix) { 708/* 709 * Does it begin with "a/$our-prefix" and such? Then this is 710 * very likely to apply to our directory. 711 */ 712if(!strncmp(name, state->prefix, state->prefix_length)) 713 val =count_slashes(state->prefix); 714else{ 715 cp++; 716if(!strncmp(cp, state->prefix, state->prefix_length)) 717 val =count_slashes(state->prefix) +1; 718} 719} 720free(name); 721return val; 722} 723 724/* 725 * Does the ---/+++ line have the POSIX timestamp after the last HT? 726 * GNU diff puts epoch there to signal a creation/deletion event. Is 727 * this such a timestamp? 728 */ 729static inthas_epoch_timestamp(const char*nameline) 730{ 731/* 732 * We are only interested in epoch timestamp; any non-zero 733 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 734 * For the same reason, the date must be either 1969-12-31 or 735 * 1970-01-01, and the seconds part must be "00". 736 */ 737const char stamp_regexp[] = 738"^(1969-12-31|1970-01-01)" 739" " 740"[0-2][0-9]:[0-5][0-9]:00(\\.0+)?" 741" " 742"([-+][0-2][0-9]:?[0-5][0-9])\n"; 743const char*timestamp = NULL, *cp, *colon; 744static regex_t *stamp; 745 regmatch_t m[10]; 746int zoneoffset; 747int hourminute; 748int status; 749 750for(cp = nameline; *cp !='\n'; cp++) { 751if(*cp =='\t') 752 timestamp = cp +1; 753} 754if(!timestamp) 755return0; 756if(!stamp) { 757 stamp =xmalloc(sizeof(*stamp)); 758if(regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 759warning(_("Cannot prepare timestamp regexp%s"), 760 stamp_regexp); 761return0; 762} 763} 764 765 status =regexec(stamp, timestamp,ARRAY_SIZE(m), m,0); 766if(status) { 767if(status != REG_NOMATCH) 768warning(_("regexec returned%dfor input:%s"), 769 status, timestamp); 770return0; 771} 772 773 zoneoffset =strtol(timestamp + m[3].rm_so +1, (char**) &colon,10); 774if(*colon ==':') 775 zoneoffset = zoneoffset *60+strtol(colon +1, NULL,10); 776else 777 zoneoffset = (zoneoffset /100) *60+ (zoneoffset %100); 778if(timestamp[m[3].rm_so] =='-') 779 zoneoffset = -zoneoffset; 780 781/* 782 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 783 * (west of GMT) or 1970-01-01 (east of GMT) 784 */ 785if((zoneoffset <0&&memcmp(timestamp,"1969-12-31",10)) || 786(0<= zoneoffset &&memcmp(timestamp,"1970-01-01",10))) 787return0; 788 789 hourminute = (strtol(timestamp +11, NULL,10) *60+ 790strtol(timestamp +14, NULL,10) - 791 zoneoffset); 792 793return((zoneoffset <0&& hourminute ==1440) || 794(0<= zoneoffset && !hourminute)); 795} 796 797/* 798 * Get the name etc info from the ---/+++ lines of a traditional patch header 799 * 800 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 801 * files, we can happily check the index for a match, but for creating a 802 * new file we should try to match whatever "patch" does. I have no idea. 803 */ 804static voidparse_traditional_patch(struct apply_state *state, 805const char*first, 806const char*second, 807struct patch *patch) 808{ 809char*name; 810 811 first +=4;/* skip "--- " */ 812 second +=4;/* skip "+++ " */ 813if(!state->p_value_known) { 814int p, q; 815 p =guess_p_value(state, first); 816 q =guess_p_value(state, second); 817if(p <0) p = q; 818if(0<= p && p == q) { 819 state->p_value = p; 820 state->p_value_known =1; 821} 822} 823if(is_dev_null(first)) { 824 patch->is_new =1; 825 patch->is_delete =0; 826 name =find_name_traditional(state, second, NULL, state->p_value); 827 patch->new_name = name; 828}else if(is_dev_null(second)) { 829 patch->is_new =0; 830 patch->is_delete =1; 831 name =find_name_traditional(state, first, NULL, state->p_value); 832 patch->old_name = name; 833}else{ 834char*first_name; 835 first_name =find_name_traditional(state, first, NULL, state->p_value); 836 name =find_name_traditional(state, second, first_name, state->p_value); 837free(first_name); 838if(has_epoch_timestamp(first)) { 839 patch->is_new =1; 840 patch->is_delete =0; 841 patch->new_name = name; 842}else if(has_epoch_timestamp(second)) { 843 patch->is_new =0; 844 patch->is_delete =1; 845 patch->old_name = name; 846}else{ 847 patch->old_name = name; 848 patch->new_name =xstrdup_or_null(name); 849} 850} 851if(!name) 852die(_("unable to find filename in patch at line%d"), state->linenr); 853} 854 855static intgitdiff_hdrend(struct apply_state *state, 856const char*line, 857struct patch *patch) 858{ 859return-1; 860} 861 862/* 863 * We're anal about diff header consistency, to make 864 * sure that we don't end up having strange ambiguous 865 * patches floating around. 866 * 867 * As a result, gitdiff_{old|new}name() will check 868 * their names against any previous information, just 869 * to make sure.. 870 */ 871#define DIFF_OLD_NAME 0 872#define DIFF_NEW_NAME 1 873 874static voidgitdiff_verify_name(struct apply_state *state, 875const char*line, 876int isnull, 877char**name, 878int side) 879{ 880if(!*name && !isnull) { 881*name =find_name(state, line, NULL, state->p_value, TERM_TAB); 882return; 883} 884 885if(*name) { 886int len =strlen(*name); 887char*another; 888if(isnull) 889die(_("git apply: bad git-diff - expected /dev/null, got%son line%d"), 890*name, state->linenr); 891 another =find_name(state, line, NULL, state->p_value, TERM_TAB); 892if(!another ||memcmp(another, *name, len +1)) 893die((side == DIFF_NEW_NAME) ? 894_("git apply: bad git-diff - inconsistent new filename on line%d") : 895_("git apply: bad git-diff - inconsistent old filename on line%d"), state->linenr); 896free(another); 897}else{ 898/* expect "/dev/null" */ 899if(memcmp("/dev/null", line,9) || line[9] !='\n') 900die(_("git apply: bad git-diff - expected /dev/null on line%d"), state->linenr); 901} 902} 903 904static intgitdiff_oldname(struct apply_state *state, 905const char*line, 906struct patch *patch) 907{ 908gitdiff_verify_name(state, line, 909 patch->is_new, &patch->old_name, 910 DIFF_OLD_NAME); 911return0; 912} 913 914static intgitdiff_newname(struct apply_state *state, 915const char*line, 916struct patch *patch) 917{ 918gitdiff_verify_name(state, line, 919 patch->is_delete, &patch->new_name, 920 DIFF_NEW_NAME); 921return0; 922} 923 924static intgitdiff_oldmode(struct apply_state *state, 925const char*line, 926struct patch *patch) 927{ 928 patch->old_mode =strtoul(line, NULL,8); 929return0; 930} 931 932static intgitdiff_newmode(struct apply_state *state, 933const char*line, 934struct patch *patch) 935{ 936 patch->new_mode =strtoul(line, NULL,8); 937return0; 938} 939 940static intgitdiff_delete(struct apply_state *state, 941const char*line, 942struct patch *patch) 943{ 944 patch->is_delete =1; 945free(patch->old_name); 946 patch->old_name =xstrdup_or_null(patch->def_name); 947returngitdiff_oldmode(state, line, patch); 948} 949 950static intgitdiff_newfile(struct apply_state *state, 951const char*line, 952struct patch *patch) 953{ 954 patch->is_new =1; 955free(patch->new_name); 956 patch->new_name =xstrdup_or_null(patch->def_name); 957returngitdiff_newmode(state, line, patch); 958} 959 960static intgitdiff_copysrc(struct apply_state *state, 961const char*line, 962struct patch *patch) 963{ 964 patch->is_copy =1; 965free(patch->old_name); 966 patch->old_name =find_name(state, line, NULL, state->p_value ? state->p_value -1:0,0); 967return0; 968} 969 970static intgitdiff_copydst(struct apply_state *state, 971const char*line, 972struct patch *patch) 973{ 974 patch->is_copy =1; 975free(patch->new_name); 976 patch->new_name =find_name(state, line, NULL, state->p_value ? state->p_value -1:0,0); 977return0; 978} 979 980static intgitdiff_renamesrc(struct apply_state *state, 981const char*line, 982struct patch *patch) 983{ 984 patch->is_rename =1; 985free(patch->old_name); 986 patch->old_name =find_name(state, line, NULL, state->p_value ? state->p_value -1:0,0); 987return0; 988} 989 990static intgitdiff_renamedst(struct apply_state *state, 991const char*line, 992struct patch *patch) 993{ 994 patch->is_rename =1; 995free(patch->new_name); 996 patch->new_name =find_name(state, line, NULL, state->p_value ? state->p_value -1:0,0); 997return0; 998} 9991000static intgitdiff_similarity(struct apply_state *state,1001const char*line,1002struct patch *patch)1003{1004unsigned long val =strtoul(line, NULL,10);1005if(val <=100)1006 patch->score = val;1007return0;1008}10091010static intgitdiff_dissimilarity(struct apply_state *state,1011const char*line,1012struct patch *patch)1013{1014unsigned long val =strtoul(line, NULL,10);1015if(val <=100)1016 patch->score = val;1017return0;1018}10191020static intgitdiff_index(struct apply_state *state,1021const char*line,1022struct patch *patch)1023{1024/*1025 * index line is N hexadecimal, "..", N hexadecimal,1026 * and optional space with octal mode.1027 */1028const char*ptr, *eol;1029int len;10301031 ptr =strchr(line,'.');1032if(!ptr || ptr[1] !='.'||40< ptr - line)1033return0;1034 len = ptr - line;1035memcpy(patch->old_sha1_prefix, line, len);1036 patch->old_sha1_prefix[len] =0;10371038 line = ptr +2;1039 ptr =strchr(line,' ');1040 eol =strchrnul(line,'\n');10411042if(!ptr || eol < ptr)1043 ptr = eol;1044 len = ptr - line;10451046if(40< len)1047return0;1048memcpy(patch->new_sha1_prefix, line, len);1049 patch->new_sha1_prefix[len] =0;1050if(*ptr ==' ')1051 patch->old_mode =strtoul(ptr+1, NULL,8);1052return0;1053}10541055/*1056 * This is normal for a diff that doesn't change anything: we'll fall through1057 * into the next diff. Tell the parser to break out.1058 */1059static intgitdiff_unrecognized(struct apply_state *state,1060const char*line,1061struct patch *patch)1062{1063return-1;1064}10651066/*1067 * Skip p_value leading components from "line"; as we do not accept1068 * absolute paths, return NULL in that case.1069 */1070static const char*skip_tree_prefix(struct apply_state *state,1071const char*line,1072int llen)1073{1074int nslash;1075int i;10761077if(!state->p_value)1078return(llen && line[0] =='/') ? NULL : line;10791080 nslash = state->p_value;1081for(i =0; i < llen; i++) {1082int ch = line[i];1083if(ch =='/'&& --nslash <=0)1084return(i ==0) ? NULL : &line[i +1];1085}1086return NULL;1087}10881089/*1090 * This is to extract the same name that appears on "diff --git"1091 * line. We do not find and return anything if it is a rename1092 * patch, and it is OK because we will find the name elsewhere.1093 * We need to reliably find name only when it is mode-change only,1094 * creation or deletion of an empty file. In any of these cases,1095 * both sides are the same name under a/ and b/ respectively.1096 */1097static char*git_header_name(struct apply_state *state,1098const char*line,1099int llen)1100{1101const char*name;1102const char*second = NULL;1103size_t len, line_len;11041105 line +=strlen("diff --git ");1106 llen -=strlen("diff --git ");11071108if(*line =='"') {1109const char*cp;1110struct strbuf first = STRBUF_INIT;1111struct strbuf sp = STRBUF_INIT;11121113if(unquote_c_style(&first, line, &second))1114goto free_and_fail1;11151116/* strip the a/b prefix including trailing slash */1117 cp =skip_tree_prefix(state, first.buf, first.len);1118if(!cp)1119goto free_and_fail1;1120strbuf_remove(&first,0, cp - first.buf);11211122/*1123 * second points at one past closing dq of name.1124 * find the second name.1125 */1126while((second < line + llen) &&isspace(*second))1127 second++;11281129if(line + llen <= second)1130goto free_and_fail1;1131if(*second =='"') {1132if(unquote_c_style(&sp, second, NULL))1133goto free_and_fail1;1134 cp =skip_tree_prefix(state, sp.buf, sp.len);1135if(!cp)1136goto free_and_fail1;1137/* They must match, otherwise ignore */1138if(strcmp(cp, first.buf))1139goto free_and_fail1;1140strbuf_release(&sp);1141returnstrbuf_detach(&first, NULL);1142}11431144/* unquoted second */1145 cp =skip_tree_prefix(state, second, line + llen - second);1146if(!cp)1147goto free_and_fail1;1148if(line + llen - cp != first.len ||1149memcmp(first.buf, cp, first.len))1150goto free_and_fail1;1151returnstrbuf_detach(&first, NULL);11521153 free_and_fail1:1154strbuf_release(&first);1155strbuf_release(&sp);1156return NULL;1157}11581159/* unquoted first name */1160 name =skip_tree_prefix(state, line, llen);1161if(!name)1162return NULL;11631164/*1165 * since the first name is unquoted, a dq if exists must be1166 * the beginning of the second name.1167 */1168for(second = name; second < line + llen; second++) {1169if(*second =='"') {1170struct strbuf sp = STRBUF_INIT;1171const char*np;11721173if(unquote_c_style(&sp, second, NULL))1174goto free_and_fail2;11751176 np =skip_tree_prefix(state, sp.buf, sp.len);1177if(!np)1178goto free_and_fail2;11791180 len = sp.buf + sp.len - np;1181if(len < second - name &&1182!strncmp(np, name, len) &&1183isspace(name[len])) {1184/* Good */1185strbuf_remove(&sp,0, np - sp.buf);1186returnstrbuf_detach(&sp, NULL);1187}11881189 free_and_fail2:1190strbuf_release(&sp);1191return NULL;1192}1193}11941195/*1196 * Accept a name only if it shows up twice, exactly the same1197 * form.1198 */1199 second =strchr(name,'\n');1200if(!second)1201return NULL;1202 line_len = second - name;1203for(len =0; ; len++) {1204switch(name[len]) {1205default:1206continue;1207case'\n':1208return NULL;1209case'\t':case' ':1210/*1211 * Is this the separator between the preimage1212 * and the postimage pathname? Again, we are1213 * only interested in the case where there is1214 * no rename, as this is only to set def_name1215 * and a rename patch has the names elsewhere1216 * in an unambiguous form.1217 */1218if(!name[len +1])1219return NULL;/* no postimage name */1220 second =skip_tree_prefix(state, name + len +1,1221 line_len - (len +1));1222if(!second)1223return NULL;1224/*1225 * Does len bytes starting at "name" and "second"1226 * (that are separated by one HT or SP we just1227 * found) exactly match?1228 */1229if(second[len] =='\n'&& !strncmp(name, second, len))1230returnxmemdupz(name, len);1231}1232}1233}12341235/* Verify that we recognize the lines following a git header */1236static intparse_git_header(struct apply_state *state,1237const char*line,1238int len,1239unsigned int size,1240struct patch *patch)1241{1242unsigned long offset;12431244/* A git diff has explicit new/delete information, so we don't guess */1245 patch->is_new =0;1246 patch->is_delete =0;12471248/*1249 * Some things may not have the old name in the1250 * rest of the headers anywhere (pure mode changes,1251 * or removing or adding empty files), so we get1252 * the default name from the header.1253 */1254 patch->def_name =git_header_name(state, line, len);1255if(patch->def_name && state->root.len) {1256char*s =xstrfmt("%s%s", state->root.buf, patch->def_name);1257free(patch->def_name);1258 patch->def_name = s;1259}12601261 line += len;1262 size -= len;1263 state->linenr++;1264for(offset = len ; size >0; offset += len, size -= len, line += len, state->linenr++) {1265static const struct opentry {1266const char*str;1267int(*fn)(struct apply_state *,const char*,struct patch *);1268} optable[] = {1269{"@@ -", gitdiff_hdrend },1270{"--- ", gitdiff_oldname },1271{"+++ ", gitdiff_newname },1272{"old mode ", gitdiff_oldmode },1273{"new mode ", gitdiff_newmode },1274{"deleted file mode ", gitdiff_delete },1275{"new file mode ", gitdiff_newfile },1276{"copy from ", gitdiff_copysrc },1277{"copy to ", gitdiff_copydst },1278{"rename old ", gitdiff_renamesrc },1279{"rename new ", gitdiff_renamedst },1280{"rename from ", gitdiff_renamesrc },1281{"rename to ", gitdiff_renamedst },1282{"similarity index ", gitdiff_similarity },1283{"dissimilarity index ", gitdiff_dissimilarity },1284{"index ", gitdiff_index },1285{"", gitdiff_unrecognized },1286};1287int i;12881289 len =linelen(line, size);1290if(!len || line[len-1] !='\n')1291break;1292for(i =0; i <ARRAY_SIZE(optable); i++) {1293const struct opentry *p = optable + i;1294int oplen =strlen(p->str);1295if(len < oplen ||memcmp(p->str, line, oplen))1296continue;1297if(p->fn(state, line + oplen, patch) <0)1298return offset;1299break;1300}1301}13021303return offset;1304}13051306static intparse_num(const char*line,unsigned long*p)1307{1308char*ptr;13091310if(!isdigit(*line))1311return0;1312*p =strtoul(line, &ptr,10);1313return ptr - line;1314}13151316static intparse_range(const char*line,int len,int offset,const char*expect,1317unsigned long*p1,unsigned long*p2)1318{1319int digits, ex;13201321if(offset <0|| offset >= len)1322return-1;1323 line += offset;1324 len -= offset;13251326 digits =parse_num(line, p1);1327if(!digits)1328return-1;13291330 offset += digits;1331 line += digits;1332 len -= digits;13331334*p2 =1;1335if(*line ==',') {1336 digits =parse_num(line+1, p2);1337if(!digits)1338return-1;13391340 offset += digits+1;1341 line += digits+1;1342 len -= digits+1;1343}13441345 ex =strlen(expect);1346if(ex > len)1347return-1;1348if(memcmp(line, expect, ex))1349return-1;13501351return offset + ex;1352}13531354static voidrecount_diff(const char*line,int size,struct fragment *fragment)1355{1356int oldlines =0, newlines =0, ret =0;13571358if(size <1) {1359warning("recount: ignore empty hunk");1360return;1361}13621363for(;;) {1364int len =linelen(line, size);1365 size -= len;1366 line += len;13671368if(size <1)1369break;13701371switch(*line) {1372case' ':case'\n':1373 newlines++;1374/* fall through */1375case'-':1376 oldlines++;1377continue;1378case'+':1379 newlines++;1380continue;1381case'\\':1382continue;1383case'@':1384 ret = size <3|| !starts_with(line,"@@ ");1385break;1386case'd':1387 ret = size <5|| !starts_with(line,"diff ");1388break;1389default:1390 ret = -1;1391break;1392}1393if(ret) {1394warning(_("recount: unexpected line: %.*s"),1395(int)linelen(line, size), line);1396return;1397}1398break;1399}1400 fragment->oldlines = oldlines;1401 fragment->newlines = newlines;1402}14031404/*1405 * Parse a unified diff fragment header of the1406 * form "@@ -a,b +c,d @@"1407 */1408static intparse_fragment_header(const char*line,int len,struct fragment *fragment)1409{1410int offset;14111412if(!len || line[len-1] !='\n')1413return-1;14141415/* Figure out the number of lines in a fragment */1416 offset =parse_range(line, len,4," +", &fragment->oldpos, &fragment->oldlines);1417 offset =parse_range(line, len, offset," @@", &fragment->newpos, &fragment->newlines);14181419return offset;1420}14211422/*1423 * Find file diff header1424 *1425 * Returns:1426 * -1 if no header was found1427 * -128 in case of error1428 * the size of the header in bytes (called "offset") otherwise1429 */1430static intfind_header(struct apply_state *state,1431const char*line,1432unsigned long size,1433int*hdrsize,1434struct patch *patch)1435{1436unsigned long offset, len;14371438 patch->is_toplevel_relative =0;1439 patch->is_rename = patch->is_copy =0;1440 patch->is_new = patch->is_delete = -1;1441 patch->old_mode = patch->new_mode =0;1442 patch->old_name = patch->new_name = NULL;1443for(offset =0; size >0; offset += len, size -= len, line += len, state->linenr++) {1444unsigned long nextlen;14451446 len =linelen(line, size);1447if(!len)1448break;14491450/* Testing this early allows us to take a few shortcuts.. */1451if(len <6)1452continue;14531454/*1455 * Make sure we don't find any unconnected patch fragments.1456 * That's a sign that we didn't find a header, and that a1457 * patch has become corrupted/broken up.1458 */1459if(!memcmp("@@ -", line,4)) {1460struct fragment dummy;1461if(parse_fragment_header(line, len, &dummy) <0)1462continue;1463error(_("patch fragment without header at line%d: %.*s"),1464 state->linenr, (int)len-1, line);1465return-128;1466}14671468if(size < len +6)1469break;14701471/*1472 * Git patch? It might not have a real patch, just a rename1473 * or mode change, so we handle that specially1474 */1475if(!memcmp("diff --git ", line,11)) {1476int git_hdr_len =parse_git_header(state, line, len, size, patch);1477if(git_hdr_len <= len)1478continue;1479if(!patch->old_name && !patch->new_name) {1480if(!patch->def_name) {1481error(Q_("git diff header lacks filename information when removing "1482"%dleading pathname component (line%d)",1483"git diff header lacks filename information when removing "1484"%dleading pathname components (line%d)",1485 state->p_value),1486 state->p_value, state->linenr);1487return-128;1488}1489 patch->old_name =xstrdup(patch->def_name);1490 patch->new_name =xstrdup(patch->def_name);1491}1492if(!patch->is_delete && !patch->new_name) {1493error("git diff header lacks filename information "1494"(line%d)", state->linenr);1495return-128;1496}1497 patch->is_toplevel_relative =1;1498*hdrsize = git_hdr_len;1499return offset;1500}15011502/* --- followed by +++ ? */1503if(memcmp("--- ", line,4) ||memcmp("+++ ", line + len,4))1504continue;15051506/*1507 * We only accept unified patches, so we want it to1508 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1509 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1510 */1511 nextlen =linelen(line + len, size - len);1512if(size < nextlen +14||memcmp("@@ -", line + len + nextlen,4))1513continue;15141515/* Ok, we'll consider it a patch */1516parse_traditional_patch(state, line, line+len, patch);1517*hdrsize = len + nextlen;1518 state->linenr +=2;1519return offset;1520}1521return-1;1522}15231524static voidrecord_ws_error(struct apply_state *state,1525unsigned result,1526const char*line,1527int len,1528int linenr)1529{1530char*err;15311532if(!result)1533return;15341535 state->whitespace_error++;1536if(state->squelch_whitespace_errors &&1537 state->squelch_whitespace_errors < state->whitespace_error)1538return;15391540 err =whitespace_error_string(result);1541fprintf(stderr,"%s:%d:%s.\n%.*s\n",1542 state->patch_input_file, linenr, err, len, line);1543free(err);1544}15451546static voidcheck_whitespace(struct apply_state *state,1547const char*line,1548int len,1549unsigned ws_rule)1550{1551unsigned result =ws_check(line +1, len -1, ws_rule);15521553record_ws_error(state, result, line +1, len -2, state->linenr);1554}15551556/*1557 * Parse a unified diff. Note that this really needs to parse each1558 * fragment separately, since the only way to know the difference1559 * between a "---" that is part of a patch, and a "---" that starts1560 * the next patch is to look at the line counts..1561 */1562static intparse_fragment(struct apply_state *state,1563const char*line,1564unsigned long size,1565struct patch *patch,1566struct fragment *fragment)1567{1568int added, deleted;1569int len =linelen(line, size), offset;1570unsigned long oldlines, newlines;1571unsigned long leading, trailing;15721573 offset =parse_fragment_header(line, len, fragment);1574if(offset <0)1575return-1;1576if(offset >0&& patch->recount)1577recount_diff(line + offset, size - offset, fragment);1578 oldlines = fragment->oldlines;1579 newlines = fragment->newlines;1580 leading =0;1581 trailing =0;15821583/* Parse the thing.. */1584 line += len;1585 size -= len;1586 state->linenr++;1587 added = deleted =0;1588for(offset = len;15890< size;1590 offset += len, size -= len, line += len, state->linenr++) {1591if(!oldlines && !newlines)1592break;1593 len =linelen(line, size);1594if(!len || line[len-1] !='\n')1595return-1;1596switch(*line) {1597default:1598return-1;1599case'\n':/* newer GNU diff, an empty context line */1600case' ':1601 oldlines--;1602 newlines--;1603if(!deleted && !added)1604 leading++;1605 trailing++;1606if(!state->apply_in_reverse &&1607 state->ws_error_action == correct_ws_error)1608check_whitespace(state, line, len, patch->ws_rule);1609break;1610case'-':1611if(state->apply_in_reverse &&1612 state->ws_error_action != nowarn_ws_error)1613check_whitespace(state, line, len, patch->ws_rule);1614 deleted++;1615 oldlines--;1616 trailing =0;1617break;1618case'+':1619if(!state->apply_in_reverse &&1620 state->ws_error_action != nowarn_ws_error)1621check_whitespace(state, 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;1643if(!deleted && !added)1644return-1;16451646 fragment->leading = leading;1647 fragment->trailing = trailing;16481649/*1650 * If a fragment ends with an incomplete line, we failed to include1651 * it in the above loop because we hit oldlines == newlines == 01652 * before seeing it.1653 */1654if(12< size && !memcmp(line,"\\",2))1655 offset +=linelen(line, size);16561657 patch->lines_added += added;1658 patch->lines_deleted += deleted;16591660if(0< patch->is_new && oldlines)1661returnerror(_("new file depends on old contents"));1662if(0< patch->is_delete && newlines)1663returnerror(_("deleted file still has contents"));1664return offset;1665}16661667/*1668 * We have seen "diff --git a/... b/..." header (or a traditional patch1669 * header). Read hunks that belong to this patch into fragments and hang1670 * them to the given patch structure.1671 *1672 * The (fragment->patch, fragment->size) pair points into the memory given1673 * by the caller, not a copy, when we return.1674 */1675static intparse_single_patch(struct apply_state *state,1676const char*line,1677unsigned long size,1678struct patch *patch)1679{1680unsigned long offset =0;1681unsigned long oldlines =0, newlines =0, context =0;1682struct fragment **fragp = &patch->fragments;16831684while(size >4&& !memcmp(line,"@@ -",4)) {1685struct fragment *fragment;1686int len;16871688 fragment =xcalloc(1,sizeof(*fragment));1689 fragment->linenr = state->linenr;1690 len =parse_fragment(state, line, size, patch, fragment);1691if(len <=0)1692die(_("corrupt patch at line%d"), state->linenr);1693 fragment->patch = line;1694 fragment->size = len;1695 oldlines += fragment->oldlines;1696 newlines += fragment->newlines;1697 context += fragment->leading + fragment->trailing;16981699*fragp = fragment;1700 fragp = &fragment->next;17011702 offset += len;1703 line += len;1704 size -= len;1705}17061707/*1708 * If something was removed (i.e. we have old-lines) it cannot1709 * be creation, and if something was added it cannot be1710 * deletion. However, the reverse is not true; --unified=01711 * patches that only add are not necessarily creation even1712 * though they do not have any old lines, and ones that only1713 * delete are not necessarily deletion.1714 *1715 * Unfortunately, a real creation/deletion patch do _not_ have1716 * any context line by definition, so we cannot safely tell it1717 * apart with --unified=0 insanity. At least if the patch has1718 * more than one hunk it is not creation or deletion.1719 */1720if(patch->is_new <0&&1721(oldlines || (patch->fragments && patch->fragments->next)))1722 patch->is_new =0;1723if(patch->is_delete <0&&1724(newlines || (patch->fragments && patch->fragments->next)))1725 patch->is_delete =0;17261727if(0< patch->is_new && oldlines)1728die(_("new file%sdepends on old contents"), patch->new_name);1729if(0< patch->is_delete && newlines)1730die(_("deleted file%sstill has contents"), patch->old_name);1731if(!patch->is_delete && !newlines && context)1732fprintf_ln(stderr,1733_("** warning: "1734"file%sbecomes empty but is not deleted"),1735 patch->new_name);17361737return offset;1738}17391740staticinlineintmetadata_changes(struct patch *patch)1741{1742return patch->is_rename >0||1743 patch->is_copy >0||1744 patch->is_new >0||1745 patch->is_delete ||1746(patch->old_mode && patch->new_mode &&1747 patch->old_mode != patch->new_mode);1748}17491750static char*inflate_it(const void*data,unsigned long size,1751unsigned long inflated_size)1752{1753 git_zstream stream;1754void*out;1755int st;17561757memset(&stream,0,sizeof(stream));17581759 stream.next_in = (unsigned char*)data;1760 stream.avail_in = size;1761 stream.next_out = out =xmalloc(inflated_size);1762 stream.avail_out = inflated_size;1763git_inflate_init(&stream);1764 st =git_inflate(&stream, Z_FINISH);1765git_inflate_end(&stream);1766if((st != Z_STREAM_END) || stream.total_out != inflated_size) {1767free(out);1768return NULL;1769}1770return out;1771}17721773/*1774 * Read a binary hunk and return a new fragment; fragment->patch1775 * points at an allocated memory that the caller must free, so1776 * it is marked as "->free_patch = 1".1777 */1778static struct fragment *parse_binary_hunk(struct apply_state *state,1779char**buf_p,1780unsigned long*sz_p,1781int*status_p,1782int*used_p)1783{1784/*1785 * Expect a line that begins with binary patch method ("literal"1786 * or "delta"), followed by the length of data before deflating.1787 * a sequence of 'length-byte' followed by base-85 encoded data1788 * should follow, terminated by a newline.1789 *1790 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1791 * and we would limit the patch line to 66 characters,1792 * so one line can fit up to 13 groups that would decode1793 * to 52 bytes max. The length byte 'A'-'Z' corresponds1794 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1795 */1796int llen, used;1797unsigned long size = *sz_p;1798char*buffer = *buf_p;1799int patch_method;1800unsigned long origlen;1801char*data = NULL;1802int hunk_size =0;1803struct fragment *frag;18041805 llen =linelen(buffer, size);1806 used = llen;18071808*status_p =0;18091810if(starts_with(buffer,"delta ")) {1811 patch_method = BINARY_DELTA_DEFLATED;1812 origlen =strtoul(buffer +6, NULL,10);1813}1814else if(starts_with(buffer,"literal ")) {1815 patch_method = BINARY_LITERAL_DEFLATED;1816 origlen =strtoul(buffer +8, NULL,10);1817}1818else1819return NULL;18201821 state->linenr++;1822 buffer += llen;1823while(1) {1824int byte_length, max_byte_length, newsize;1825 llen =linelen(buffer, size);1826 used += llen;1827 state->linenr++;1828if(llen ==1) {1829/* consume the blank line */1830 buffer++;1831 size--;1832break;1833}1834/*1835 * Minimum line is "A00000\n" which is 7-byte long,1836 * and the line length must be multiple of 5 plus 2.1837 */1838if((llen <7) || (llen-2) %5)1839goto corrupt;1840 max_byte_length = (llen -2) /5*4;1841 byte_length = *buffer;1842if('A'<= byte_length && byte_length <='Z')1843 byte_length = byte_length -'A'+1;1844else if('a'<= byte_length && byte_length <='z')1845 byte_length = byte_length -'a'+27;1846else1847goto corrupt;1848/* if the input length was not multiple of 4, we would1849 * have filler at the end but the filler should never1850 * exceed 3 bytes1851 */1852if(max_byte_length < byte_length ||1853 byte_length <= max_byte_length -4)1854goto corrupt;1855 newsize = hunk_size + byte_length;1856 data =xrealloc(data, newsize);1857if(decode_85(data + hunk_size, buffer +1, byte_length))1858goto corrupt;1859 hunk_size = newsize;1860 buffer += llen;1861 size -= llen;1862}18631864 frag =xcalloc(1,sizeof(*frag));1865 frag->patch =inflate_it(data, hunk_size, origlen);1866 frag->free_patch =1;1867if(!frag->patch)1868goto corrupt;1869free(data);1870 frag->size = origlen;1871*buf_p = buffer;1872*sz_p = size;1873*used_p = used;1874 frag->binary_patch_method = patch_method;1875return frag;18761877 corrupt:1878free(data);1879*status_p = -1;1880error(_("corrupt binary patch at line%d: %.*s"),1881 state->linenr-1, llen-1, buffer);1882return NULL;1883}18841885/*1886 * Returns:1887 * -1 in case of error,1888 * the length of the parsed binary patch otherwise1889 */1890static intparse_binary(struct apply_state *state,1891char*buffer,1892unsigned long size,1893struct patch *patch)1894{1895/*1896 * We have read "GIT binary patch\n"; what follows is a line1897 * that says the patch method (currently, either "literal" or1898 * "delta") and the length of data before deflating; a1899 * sequence of 'length-byte' followed by base-85 encoded data1900 * follows.1901 *1902 * When a binary patch is reversible, there is another binary1903 * hunk in the same format, starting with patch method (either1904 * "literal" or "delta") with the length of data, and a sequence1905 * of length-byte + base-85 encoded data, terminated with another1906 * empty line. This data, when applied to the postimage, produces1907 * the preimage.1908 */1909struct fragment *forward;1910struct fragment *reverse;1911int status;1912int used, used_1;19131914 forward =parse_binary_hunk(state, &buffer, &size, &status, &used);1915if(!forward && !status)1916/* there has to be one hunk (forward hunk) */1917returnerror(_("unrecognized binary patch at line%d"), state->linenr-1);1918if(status)1919/* otherwise we already gave an error message */1920return status;19211922 reverse =parse_binary_hunk(state, &buffer, &size, &status, &used_1);1923if(reverse)1924 used += used_1;1925else if(status) {1926/*1927 * Not having reverse hunk is not an error, but having1928 * a corrupt reverse hunk is.1929 */1930free((void*) forward->patch);1931free(forward);1932return status;1933}1934 forward->next = reverse;1935 patch->fragments = forward;1936 patch->is_binary =1;1937return used;1938}19391940static voidprefix_one(struct apply_state *state,char**name)1941{1942char*old_name = *name;1943if(!old_name)1944return;1945*name =xstrdup(prefix_filename(state->prefix, state->prefix_length, *name));1946free(old_name);1947}19481949static voidprefix_patch(struct apply_state *state,struct patch *p)1950{1951if(!state->prefix || p->is_toplevel_relative)1952return;1953prefix_one(state, &p->new_name);1954prefix_one(state, &p->old_name);1955}19561957/*1958 * include/exclude1959 */19601961static voidadd_name_limit(struct apply_state *state,1962const char*name,1963int exclude)1964{1965struct string_list_item *it;19661967 it =string_list_append(&state->limit_by_name, name);1968 it->util = exclude ? NULL : (void*)1;1969}19701971static intuse_patch(struct apply_state *state,struct patch *p)1972{1973const char*pathname = p->new_name ? p->new_name : p->old_name;1974int i;19751976/* Paths outside are not touched regardless of "--include" */1977if(0< state->prefix_length) {1978int pathlen =strlen(pathname);1979if(pathlen <= state->prefix_length ||1980memcmp(state->prefix, pathname, state->prefix_length))1981return0;1982}19831984/* See if it matches any of exclude/include rule */1985for(i =0; i < state->limit_by_name.nr; i++) {1986struct string_list_item *it = &state->limit_by_name.items[i];1987if(!wildmatch(it->string, pathname,0, NULL))1988return(it->util != NULL);1989}19901991/*1992 * If we had any include, a path that does not match any rule is1993 * not used. Otherwise, we saw bunch of exclude rules (or none)1994 * and such a path is used.1995 */1996return!state->has_include;1997}199819992000/*2001 * Read the patch text in "buffer" that extends for "size" bytes; stop2002 * reading after seeing a single patch (i.e. changes to a single file).2003 * Create fragments (i.e. patch hunks) and hang them to the given patch.2004 * Return the number of bytes consumed, so that the caller can call us2005 * again for the next patch.2006 */2007static intparse_chunk(struct apply_state *state,char*buffer,unsigned long size,struct patch *patch)2008{2009int hdrsize, patchsize;2010int offset =find_header(state, buffer, size, &hdrsize, patch);20112012if(offset == -128)2013exit(128);20142015if(offset <0)2016return offset;20172018prefix_patch(state, patch);20192020if(!use_patch(state, patch))2021 patch->ws_rule =0;2022else2023 patch->ws_rule =whitespace_rule(patch->new_name2024? patch->new_name2025: patch->old_name);20262027 patchsize =parse_single_patch(state,2028 buffer + offset + hdrsize,2029 size - offset - hdrsize,2030 patch);20312032if(!patchsize) {2033static const char git_binary[] ="GIT binary patch\n";2034int hd = hdrsize + offset;2035unsigned long llen =linelen(buffer + hd, size - hd);20362037if(llen ==sizeof(git_binary) -1&&2038!memcmp(git_binary, buffer + hd, llen)) {2039int used;2040 state->linenr++;2041 used =parse_binary(state, buffer + hd + llen,2042 size - hd - llen, patch);2043if(used <0)2044return-1;2045if(used)2046 patchsize = used + llen;2047else2048 patchsize =0;2049}2050else if(!memcmp(" differ\n", buffer + hd + llen -8,8)) {2051static const char*binhdr[] = {2052"Binary files ",2053"Files ",2054 NULL,2055};2056int i;2057for(i =0; binhdr[i]; i++) {2058int len =strlen(binhdr[i]);2059if(len < size - hd &&2060!memcmp(binhdr[i], buffer + hd, len)) {2061 state->linenr++;2062 patch->is_binary =1;2063 patchsize = llen;2064break;2065}2066}2067}20682069/* Empty patch cannot be applied if it is a text patch2070 * without metadata change. A binary patch appears2071 * empty to us here.2072 */2073if((state->apply || state->check) &&2074(!patch->is_binary && !metadata_changes(patch)))2075die(_("patch with only garbage at line%d"), state->linenr);2076}20772078return offset + hdrsize + patchsize;2079}20802081#define swap(a,b) myswap((a),(b),sizeof(a))20822083#define myswap(a, b, size) do { \2084 unsigned char mytmp[size]; \2085 memcpy(mytmp, &a, size); \2086 memcpy(&a, &b, size); \2087 memcpy(&b, mytmp, size); \2088} while (0)20892090static voidreverse_patches(struct patch *p)2091{2092for(; p; p = p->next) {2093struct fragment *frag = p->fragments;20942095swap(p->new_name, p->old_name);2096swap(p->new_mode, p->old_mode);2097swap(p->is_new, p->is_delete);2098swap(p->lines_added, p->lines_deleted);2099swap(p->old_sha1_prefix, p->new_sha1_prefix);21002101for(; frag; frag = frag->next) {2102swap(frag->newpos, frag->oldpos);2103swap(frag->newlines, frag->oldlines);2104}2105}2106}21072108static const char pluses[] =2109"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2110static const char minuses[]=2111"----------------------------------------------------------------------";21122113static voidshow_stats(struct apply_state *state,struct patch *patch)2114{2115struct strbuf qname = STRBUF_INIT;2116char*cp = patch->new_name ? patch->new_name : patch->old_name;2117int max, add, del;21182119quote_c_style(cp, &qname, NULL,0);21202121/*2122 * "scale" the filename2123 */2124 max = state->max_len;2125if(max >50)2126 max =50;21272128if(qname.len > max) {2129 cp =strchr(qname.buf + qname.len +3- max,'/');2130if(!cp)2131 cp = qname.buf + qname.len +3- max;2132strbuf_splice(&qname,0, cp - qname.buf,"...",3);2133}21342135if(patch->is_binary) {2136printf(" %-*s | Bin\n", max, qname.buf);2137strbuf_release(&qname);2138return;2139}21402141printf(" %-*s |", max, qname.buf);2142strbuf_release(&qname);21432144/*2145 * scale the add/delete2146 */2147 max = max + state->max_change >70?70- max : state->max_change;2148 add = patch->lines_added;2149 del = patch->lines_deleted;21502151if(state->max_change >0) {2152int total = ((add + del) * max + state->max_change /2) / state->max_change;2153 add = (add * max + state->max_change /2) / state->max_change;2154 del = total - add;2155}2156printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2157 add, pluses, del, minuses);2158}21592160static intread_old_data(struct stat *st,const char*path,struct strbuf *buf)2161{2162switch(st->st_mode & S_IFMT) {2163case S_IFLNK:2164if(strbuf_readlink(buf, path, st->st_size) <0)2165returnerror(_("unable to read symlink%s"), path);2166return0;2167case S_IFREG:2168if(strbuf_read_file(buf, path, st->st_size) != st->st_size)2169returnerror(_("unable to open or read%s"), path);2170convert_to_git(path, buf->buf, buf->len, buf,0);2171return0;2172default:2173return-1;2174}2175}21762177/*2178 * Update the preimage, and the common lines in postimage,2179 * from buffer buf of length len. If postlen is 0 the postimage2180 * is updated in place, otherwise it's updated on a new buffer2181 * of length postlen2182 */21832184static voidupdate_pre_post_images(struct image *preimage,2185struct image *postimage,2186char*buf,2187size_t len,size_t postlen)2188{2189int i, ctx, reduced;2190char*new, *old, *fixed;2191struct image fixed_preimage;21922193/*2194 * Update the preimage with whitespace fixes. Note that we2195 * are not losing preimage->buf -- apply_one_fragment() will2196 * free "oldlines".2197 */2198prepare_image(&fixed_preimage, buf, len,1);2199assert(postlen2200? fixed_preimage.nr == preimage->nr2201: fixed_preimage.nr <= preimage->nr);2202for(i =0; i < fixed_preimage.nr; i++)2203 fixed_preimage.line[i].flag = preimage->line[i].flag;2204free(preimage->line_allocated);2205*preimage = fixed_preimage;22062207/*2208 * Adjust the common context lines in postimage. This can be2209 * done in-place when we are shrinking it with whitespace2210 * fixing, but needs a new buffer when ignoring whitespace or2211 * expanding leading tabs to spaces.2212 *2213 * We trust the caller to tell us if the update can be done2214 * in place (postlen==0) or not.2215 */2216 old = postimage->buf;2217if(postlen)2218new= postimage->buf =xmalloc(postlen);2219else2220new= old;2221 fixed = preimage->buf;22222223for(i = reduced = ctx =0; i < postimage->nr; i++) {2224size_t l_len = postimage->line[i].len;2225if(!(postimage->line[i].flag & LINE_COMMON)) {2226/* an added line -- no counterparts in preimage */2227memmove(new, old, l_len);2228 old += l_len;2229new+= l_len;2230continue;2231}22322233/* a common context -- skip it in the original postimage */2234 old += l_len;22352236/* and find the corresponding one in the fixed preimage */2237while(ctx < preimage->nr &&2238!(preimage->line[ctx].flag & LINE_COMMON)) {2239 fixed += preimage->line[ctx].len;2240 ctx++;2241}22422243/*2244 * preimage is expected to run out, if the caller2245 * fixed addition of trailing blank lines.2246 */2247if(preimage->nr <= ctx) {2248 reduced++;2249continue;2250}22512252/* and copy it in, while fixing the line length */2253 l_len = preimage->line[ctx].len;2254memcpy(new, fixed, l_len);2255new+= l_len;2256 fixed += l_len;2257 postimage->line[i].len = l_len;2258 ctx++;2259}22602261if(postlen2262? postlen <new- postimage->buf2263: postimage->len <new- postimage->buf)2264die("BUG: caller miscounted postlen: asked%d, orig =%d, used =%d",2265(int)postlen, (int) postimage->len, (int)(new- postimage->buf));22662267/* Fix the length of the whole thing */2268 postimage->len =new- postimage->buf;2269 postimage->nr -= reduced;2270}22712272static intline_by_line_fuzzy_match(struct image *img,2273struct image *preimage,2274struct image *postimage,2275unsigned longtry,2276int try_lno,2277int preimage_limit)2278{2279int i;2280size_t imgoff =0;2281size_t preoff =0;2282size_t postlen = postimage->len;2283size_t extra_chars;2284char*buf;2285char*preimage_eof;2286char*preimage_end;2287struct strbuf fixed;2288char*fixed_buf;2289size_t fixed_len;22902291for(i =0; i < preimage_limit; i++) {2292size_t prelen = preimage->line[i].len;2293size_t imglen = img->line[try_lno+i].len;22942295if(!fuzzy_matchlines(img->buf +try+ imgoff, imglen,2296 preimage->buf + preoff, prelen))2297return0;2298if(preimage->line[i].flag & LINE_COMMON)2299 postlen += imglen - prelen;2300 imgoff += imglen;2301 preoff += prelen;2302}23032304/*2305 * Ok, the preimage matches with whitespace fuzz.2306 *2307 * imgoff now holds the true length of the target that2308 * matches the preimage before the end of the file.2309 *2310 * Count the number of characters in the preimage that fall2311 * beyond the end of the file and make sure that all of them2312 * are whitespace characters. (This can only happen if2313 * we are removing blank lines at the end of the file.)2314 */2315 buf = preimage_eof = preimage->buf + preoff;2316for( ; i < preimage->nr; i++)2317 preoff += preimage->line[i].len;2318 preimage_end = preimage->buf + preoff;2319for( ; buf < preimage_end; buf++)2320if(!isspace(*buf))2321return0;23222323/*2324 * Update the preimage and the common postimage context2325 * lines to use the same whitespace as the target.2326 * If whitespace is missing in the target (i.e.2327 * if the preimage extends beyond the end of the file),2328 * use the whitespace from the preimage.2329 */2330 extra_chars = preimage_end - preimage_eof;2331strbuf_init(&fixed, imgoff + extra_chars);2332strbuf_add(&fixed, img->buf +try, imgoff);2333strbuf_add(&fixed, preimage_eof, extra_chars);2334 fixed_buf =strbuf_detach(&fixed, &fixed_len);2335update_pre_post_images(preimage, postimage,2336 fixed_buf, fixed_len, postlen);2337return1;2338}23392340static intmatch_fragment(struct apply_state *state,2341struct image *img,2342struct image *preimage,2343struct image *postimage,2344unsigned longtry,2345int try_lno,2346unsigned ws_rule,2347int match_beginning,int match_end)2348{2349int i;2350char*fixed_buf, *buf, *orig, *target;2351struct strbuf fixed;2352size_t fixed_len, postlen;2353int preimage_limit;23542355if(preimage->nr + try_lno <= img->nr) {2356/*2357 * The hunk falls within the boundaries of img.2358 */2359 preimage_limit = preimage->nr;2360if(match_end && (preimage->nr + try_lno != img->nr))2361return0;2362}else if(state->ws_error_action == correct_ws_error &&2363(ws_rule & WS_BLANK_AT_EOF)) {2364/*2365 * This hunk extends beyond the end of img, and we are2366 * removing blank lines at the end of the file. This2367 * many lines from the beginning of the preimage must2368 * match with img, and the remainder of the preimage2369 * must be blank.2370 */2371 preimage_limit = img->nr - try_lno;2372}else{2373/*2374 * The hunk extends beyond the end of the img and2375 * we are not removing blanks at the end, so we2376 * should reject the hunk at this position.2377 */2378return0;2379}23802381if(match_beginning && try_lno)2382return0;23832384/* Quick hash check */2385for(i =0; i < preimage_limit; i++)2386if((img->line[try_lno + i].flag & LINE_PATCHED) ||2387(preimage->line[i].hash != img->line[try_lno + i].hash))2388return0;23892390if(preimage_limit == preimage->nr) {2391/*2392 * Do we have an exact match? If we were told to match2393 * at the end, size must be exactly at try+fragsize,2394 * otherwise try+fragsize must be still within the preimage,2395 * and either case, the old piece should match the preimage2396 * exactly.2397 */2398if((match_end2399? (try+ preimage->len == img->len)2400: (try+ preimage->len <= img->len)) &&2401!memcmp(img->buf +try, preimage->buf, preimage->len))2402return1;2403}else{2404/*2405 * The preimage extends beyond the end of img, so2406 * there cannot be an exact match.2407 *2408 * There must be one non-blank context line that match2409 * a line before the end of img.2410 */2411char*buf_end;24122413 buf = preimage->buf;2414 buf_end = buf;2415for(i =0; i < preimage_limit; i++)2416 buf_end += preimage->line[i].len;24172418for( ; buf < buf_end; buf++)2419if(!isspace(*buf))2420break;2421if(buf == buf_end)2422return0;2423}24242425/*2426 * No exact match. If we are ignoring whitespace, run a line-by-line2427 * fuzzy matching. We collect all the line length information because2428 * we need it to adjust whitespace if we match.2429 */2430if(state->ws_ignore_action == ignore_ws_change)2431returnline_by_line_fuzzy_match(img, preimage, postimage,2432try, try_lno, preimage_limit);24332434if(state->ws_error_action != correct_ws_error)2435return0;24362437/*2438 * The hunk does not apply byte-by-byte, but the hash says2439 * it might with whitespace fuzz. We weren't asked to2440 * ignore whitespace, we were asked to correct whitespace2441 * errors, so let's try matching after whitespace correction.2442 *2443 * While checking the preimage against the target, whitespace2444 * errors in both fixed, we count how large the corresponding2445 * postimage needs to be. The postimage prepared by2446 * apply_one_fragment() has whitespace errors fixed on added2447 * lines already, but the common lines were propagated as-is,2448 * which may become longer when their whitespace errors are2449 * fixed.2450 */24512452/* First count added lines in postimage */2453 postlen =0;2454for(i =0; i < postimage->nr; i++) {2455if(!(postimage->line[i].flag & LINE_COMMON))2456 postlen += postimage->line[i].len;2457}24582459/*2460 * The preimage may extend beyond the end of the file,2461 * but in this loop we will only handle the part of the2462 * preimage that falls within the file.2463 */2464strbuf_init(&fixed, preimage->len +1);2465 orig = preimage->buf;2466 target = img->buf +try;2467for(i =0; i < preimage_limit; i++) {2468size_t oldlen = preimage->line[i].len;2469size_t tgtlen = img->line[try_lno + i].len;2470size_t fixstart = fixed.len;2471struct strbuf tgtfix;2472int match;24732474/* Try fixing the line in the preimage */2475ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);24762477/* Try fixing the line in the target */2478strbuf_init(&tgtfix, tgtlen);2479ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);24802481/*2482 * If they match, either the preimage was based on2483 * a version before our tree fixed whitespace breakage,2484 * or we are lacking a whitespace-fix patch the tree2485 * the preimage was based on already had (i.e. target2486 * has whitespace breakage, the preimage doesn't).2487 * In either case, we are fixing the whitespace breakages2488 * so we might as well take the fix together with their2489 * real change.2490 */2491 match = (tgtfix.len == fixed.len - fixstart &&2492!memcmp(tgtfix.buf, fixed.buf + fixstart,2493 fixed.len - fixstart));24942495/* Add the length if this is common with the postimage */2496if(preimage->line[i].flag & LINE_COMMON)2497 postlen += tgtfix.len;24982499strbuf_release(&tgtfix);2500if(!match)2501goto unmatch_exit;25022503 orig += oldlen;2504 target += tgtlen;2505}250625072508/*2509 * Now handle the lines in the preimage that falls beyond the2510 * end of the file (if any). They will only match if they are2511 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2512 * false).2513 */2514for( ; i < preimage->nr; i++) {2515size_t fixstart = fixed.len;/* start of the fixed preimage */2516size_t oldlen = preimage->line[i].len;2517int j;25182519/* Try fixing the line in the preimage */2520ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);25212522for(j = fixstart; j < fixed.len; j++)2523if(!isspace(fixed.buf[j]))2524goto unmatch_exit;25252526 orig += oldlen;2527}25282529/*2530 * Yes, the preimage is based on an older version that still2531 * has whitespace breakages unfixed, and fixing them makes the2532 * hunk match. Update the context lines in the postimage.2533 */2534 fixed_buf =strbuf_detach(&fixed, &fixed_len);2535if(postlen < postimage->len)2536 postlen =0;2537update_pre_post_images(preimage, postimage,2538 fixed_buf, fixed_len, postlen);2539return1;25402541 unmatch_exit:2542strbuf_release(&fixed);2543return0;2544}25452546static intfind_pos(struct apply_state *state,2547struct image *img,2548struct image *preimage,2549struct image *postimage,2550int line,2551unsigned ws_rule,2552int match_beginning,int match_end)2553{2554int i;2555unsigned long backwards, forwards,try;2556int backwards_lno, forwards_lno, try_lno;25572558/*2559 * If match_beginning or match_end is specified, there is no2560 * point starting from a wrong line that will never match and2561 * wander around and wait for a match at the specified end.2562 */2563if(match_beginning)2564 line =0;2565else if(match_end)2566 line = img->nr - preimage->nr;25672568/*2569 * Because the comparison is unsigned, the following test2570 * will also take care of a negative line number that can2571 * result when match_end and preimage is larger than the target.2572 */2573if((size_t) line > img->nr)2574 line = img->nr;25752576try=0;2577for(i =0; i < line; i++)2578try+= img->line[i].len;25792580/*2581 * There's probably some smart way to do this, but I'll leave2582 * that to the smart and beautiful people. I'm simple and stupid.2583 */2584 backwards =try;2585 backwards_lno = line;2586 forwards =try;2587 forwards_lno = line;2588 try_lno = line;25892590for(i =0; ; i++) {2591if(match_fragment(state, img, preimage, postimage,2592try, try_lno, ws_rule,2593 match_beginning, match_end))2594return try_lno;25952596 again:2597if(backwards_lno ==0&& forwards_lno == img->nr)2598break;25992600if(i &1) {2601if(backwards_lno ==0) {2602 i++;2603goto again;2604}2605 backwards_lno--;2606 backwards -= img->line[backwards_lno].len;2607try= backwards;2608 try_lno = backwards_lno;2609}else{2610if(forwards_lno == img->nr) {2611 i++;2612goto again;2613}2614 forwards += img->line[forwards_lno].len;2615 forwards_lno++;2616try= forwards;2617 try_lno = forwards_lno;2618}26192620}2621return-1;2622}26232624static voidremove_first_line(struct image *img)2625{2626 img->buf += img->line[0].len;2627 img->len -= img->line[0].len;2628 img->line++;2629 img->nr--;2630}26312632static voidremove_last_line(struct image *img)2633{2634 img->len -= img->line[--img->nr].len;2635}26362637/*2638 * The change from "preimage" and "postimage" has been found to2639 * apply at applied_pos (counts in line numbers) in "img".2640 * Update "img" to remove "preimage" and replace it with "postimage".2641 */2642static voidupdate_image(struct apply_state *state,2643struct image *img,2644int applied_pos,2645struct image *preimage,2646struct image *postimage)2647{2648/*2649 * remove the copy of preimage at offset in img2650 * and replace it with postimage2651 */2652int i, nr;2653size_t remove_count, insert_count, applied_at =0;2654char*result;2655int preimage_limit;26562657/*2658 * If we are removing blank lines at the end of img,2659 * the preimage may extend beyond the end.2660 * If that is the case, we must be careful only to2661 * remove the part of the preimage that falls within2662 * the boundaries of img. Initialize preimage_limit2663 * to the number of lines in the preimage that falls2664 * within the boundaries.2665 */2666 preimage_limit = preimage->nr;2667if(preimage_limit > img->nr - applied_pos)2668 preimage_limit = img->nr - applied_pos;26692670for(i =0; i < applied_pos; i++)2671 applied_at += img->line[i].len;26722673 remove_count =0;2674for(i =0; i < preimage_limit; i++)2675 remove_count += img->line[applied_pos + i].len;2676 insert_count = postimage->len;26772678/* Adjust the contents */2679 result =xmalloc(st_add3(st_sub(img->len, remove_count), insert_count,1));2680memcpy(result, img->buf, applied_at);2681memcpy(result + applied_at, postimage->buf, postimage->len);2682memcpy(result + applied_at + postimage->len,2683 img->buf + (applied_at + remove_count),2684 img->len - (applied_at + remove_count));2685free(img->buf);2686 img->buf = result;2687 img->len += insert_count - remove_count;2688 result[img->len] ='\0';26892690/* Adjust the line table */2691 nr = img->nr + postimage->nr - preimage_limit;2692if(preimage_limit < postimage->nr) {2693/*2694 * NOTE: this knows that we never call remove_first_line()2695 * on anything other than pre/post image.2696 */2697REALLOC_ARRAY(img->line, nr);2698 img->line_allocated = img->line;2699}2700if(preimage_limit != postimage->nr)2701memmove(img->line + applied_pos + postimage->nr,2702 img->line + applied_pos + preimage_limit,2703(img->nr - (applied_pos + preimage_limit)) *2704sizeof(*img->line));2705memcpy(img->line + applied_pos,2706 postimage->line,2707 postimage->nr *sizeof(*img->line));2708if(!state->allow_overlap)2709for(i =0; i < postimage->nr; i++)2710 img->line[applied_pos + i].flag |= LINE_PATCHED;2711 img->nr = nr;2712}27132714/*2715 * Use the patch-hunk text in "frag" to prepare two images (preimage and2716 * postimage) for the hunk. Find lines that match "preimage" in "img" and2717 * replace the part of "img" with "postimage" text.2718 */2719static intapply_one_fragment(struct apply_state *state,2720struct image *img,struct fragment *frag,2721int inaccurate_eof,unsigned ws_rule,2722int nth_fragment)2723{2724int match_beginning, match_end;2725const char*patch = frag->patch;2726int size = frag->size;2727char*old, *oldlines;2728struct strbuf newlines;2729int new_blank_lines_at_end =0;2730int found_new_blank_lines_at_end =0;2731int hunk_linenr = frag->linenr;2732unsigned long leading, trailing;2733int pos, applied_pos;2734struct image preimage;2735struct image postimage;27362737memset(&preimage,0,sizeof(preimage));2738memset(&postimage,0,sizeof(postimage));2739 oldlines =xmalloc(size);2740strbuf_init(&newlines, size);27412742 old = oldlines;2743while(size >0) {2744char first;2745int len =linelen(patch, size);2746int plen;2747int added_blank_line =0;2748int is_blank_context =0;2749size_t start;27502751if(!len)2752break;27532754/*2755 * "plen" is how much of the line we should use for2756 * the actual patch data. Normally we just remove the2757 * first character on the line, but if the line is2758 * followed by "\ No newline", then we also remove the2759 * last one (which is the newline, of course).2760 */2761 plen = len -1;2762if(len < size && patch[len] =='\\')2763 plen--;2764 first = *patch;2765if(state->apply_in_reverse) {2766if(first =='-')2767 first ='+';2768else if(first =='+')2769 first ='-';2770}27712772switch(first) {2773case'\n':2774/* Newer GNU diff, empty context line */2775if(plen <0)2776/* ... followed by '\No newline'; nothing */2777break;2778*old++ ='\n';2779strbuf_addch(&newlines,'\n');2780add_line_info(&preimage,"\n",1, LINE_COMMON);2781add_line_info(&postimage,"\n",1, LINE_COMMON);2782 is_blank_context =1;2783break;2784case' ':2785if(plen && (ws_rule & WS_BLANK_AT_EOF) &&2786ws_blank_line(patch +1, plen, ws_rule))2787 is_blank_context =1;2788case'-':2789memcpy(old, patch +1, plen);2790add_line_info(&preimage, old, plen,2791(first ==' '? LINE_COMMON :0));2792 old += plen;2793if(first =='-')2794break;2795/* Fall-through for ' ' */2796case'+':2797/* --no-add does not add new lines */2798if(first =='+'&& state->no_add)2799break;28002801 start = newlines.len;2802if(first !='+'||2803!state->whitespace_error ||2804 state->ws_error_action != correct_ws_error) {2805strbuf_add(&newlines, patch +1, plen);2806}2807else{2808ws_fix_copy(&newlines, patch +1, plen, ws_rule, &state->applied_after_fixing_ws);2809}2810add_line_info(&postimage, newlines.buf + start, newlines.len - start,2811(first =='+'?0: LINE_COMMON));2812if(first =='+'&&2813(ws_rule & WS_BLANK_AT_EOF) &&2814ws_blank_line(patch +1, plen, ws_rule))2815 added_blank_line =1;2816break;2817case'@':case'\\':2818/* Ignore it, we already handled it */2819break;2820default:2821if(state->apply_verbosely)2822error(_("invalid start of line: '%c'"), first);2823 applied_pos = -1;2824goto out;2825}2826if(added_blank_line) {2827if(!new_blank_lines_at_end)2828 found_new_blank_lines_at_end = hunk_linenr;2829 new_blank_lines_at_end++;2830}2831else if(is_blank_context)2832;2833else2834 new_blank_lines_at_end =0;2835 patch += len;2836 size -= len;2837 hunk_linenr++;2838}2839if(inaccurate_eof &&2840 old > oldlines && old[-1] =='\n'&&2841 newlines.len >0&& newlines.buf[newlines.len -1] =='\n') {2842 old--;2843strbuf_setlen(&newlines, newlines.len -1);2844}28452846 leading = frag->leading;2847 trailing = frag->trailing;28482849/*2850 * A hunk to change lines at the beginning would begin with2851 * @@ -1,L +N,M @@2852 * but we need to be careful. -U0 that inserts before the second2853 * line also has this pattern.2854 *2855 * And a hunk to add to an empty file would begin with2856 * @@ -0,0 +N,M @@2857 *2858 * In other words, a hunk that is (frag->oldpos <= 1) with or2859 * without leading context must match at the beginning.2860 */2861 match_beginning = (!frag->oldpos ||2862(frag->oldpos ==1&& !state->unidiff_zero));28632864/*2865 * A hunk without trailing lines must match at the end.2866 * However, we simply cannot tell if a hunk must match end2867 * from the lack of trailing lines if the patch was generated2868 * with unidiff without any context.2869 */2870 match_end = !state->unidiff_zero && !trailing;28712872 pos = frag->newpos ? (frag->newpos -1) :0;2873 preimage.buf = oldlines;2874 preimage.len = old - oldlines;2875 postimage.buf = newlines.buf;2876 postimage.len = newlines.len;2877 preimage.line = preimage.line_allocated;2878 postimage.line = postimage.line_allocated;28792880for(;;) {28812882 applied_pos =find_pos(state, img, &preimage, &postimage, pos,2883 ws_rule, match_beginning, match_end);28842885if(applied_pos >=0)2886break;28872888/* Am I at my context limits? */2889if((leading <= state->p_context) && (trailing <= state->p_context))2890break;2891if(match_beginning || match_end) {2892 match_beginning = match_end =0;2893continue;2894}28952896/*2897 * Reduce the number of context lines; reduce both2898 * leading and trailing if they are equal otherwise2899 * just reduce the larger context.2900 */2901if(leading >= trailing) {2902remove_first_line(&preimage);2903remove_first_line(&postimage);2904 pos--;2905 leading--;2906}2907if(trailing > leading) {2908remove_last_line(&preimage);2909remove_last_line(&postimage);2910 trailing--;2911}2912}29132914if(applied_pos >=0) {2915if(new_blank_lines_at_end &&2916 preimage.nr + applied_pos >= img->nr &&2917(ws_rule & WS_BLANK_AT_EOF) &&2918 state->ws_error_action != nowarn_ws_error) {2919record_ws_error(state, WS_BLANK_AT_EOF,"+",1,2920 found_new_blank_lines_at_end);2921if(state->ws_error_action == correct_ws_error) {2922while(new_blank_lines_at_end--)2923remove_last_line(&postimage);2924}2925/*2926 * We would want to prevent write_out_results()2927 * from taking place in apply_patch() that follows2928 * the callchain led us here, which is:2929 * apply_patch->check_patch_list->check_patch->2930 * apply_data->apply_fragments->apply_one_fragment2931 */2932if(state->ws_error_action == die_on_ws_error)2933 state->apply =0;2934}29352936if(state->apply_verbosely && applied_pos != pos) {2937int offset = applied_pos - pos;2938if(state->apply_in_reverse)2939 offset =0- offset;2940fprintf_ln(stderr,2941Q_("Hunk #%dsucceeded at%d(offset%dline).",2942"Hunk #%dsucceeded at%d(offset%dlines).",2943 offset),2944 nth_fragment, applied_pos +1, offset);2945}29462947/*2948 * Warn if it was necessary to reduce the number2949 * of context lines.2950 */2951if((leading != frag->leading) ||2952(trailing != frag->trailing))2953fprintf_ln(stderr,_("Context reduced to (%ld/%ld)"2954" to apply fragment at%d"),2955 leading, trailing, applied_pos+1);2956update_image(state, img, applied_pos, &preimage, &postimage);2957}else{2958if(state->apply_verbosely)2959error(_("while searching for:\n%.*s"),2960(int)(old - oldlines), oldlines);2961}29622963out:2964free(oldlines);2965strbuf_release(&newlines);2966free(preimage.line_allocated);2967free(postimage.line_allocated);29682969return(applied_pos <0);2970}29712972static intapply_binary_fragment(struct apply_state *state,2973struct image *img,2974struct patch *patch)2975{2976struct fragment *fragment = patch->fragments;2977unsigned long len;2978void*dst;29792980if(!fragment)2981returnerror(_("missing binary patch data for '%s'"),2982 patch->new_name ?2983 patch->new_name :2984 patch->old_name);29852986/* Binary patch is irreversible without the optional second hunk */2987if(state->apply_in_reverse) {2988if(!fragment->next)2989returnerror("cannot reverse-apply a binary patch "2990"without the reverse hunk to '%s'",2991 patch->new_name2992? patch->new_name : patch->old_name);2993 fragment = fragment->next;2994}2995switch(fragment->binary_patch_method) {2996case BINARY_DELTA_DEFLATED:2997 dst =patch_delta(img->buf, img->len, fragment->patch,2998 fragment->size, &len);2999if(!dst)3000return-1;3001clear_image(img);3002 img->buf = dst;3003 img->len = len;3004return0;3005case BINARY_LITERAL_DEFLATED:3006clear_image(img);3007 img->len = fragment->size;3008 img->buf =xmemdupz(fragment->patch, img->len);3009return0;3010}3011return-1;3012}30133014/*3015 * Replace "img" with the result of applying the binary patch.3016 * The binary patch data itself in patch->fragment is still kept3017 * but the preimage prepared by the caller in "img" is freed here3018 * or in the helper function apply_binary_fragment() this calls.3019 */3020static intapply_binary(struct apply_state *state,3021struct image *img,3022struct patch *patch)3023{3024const char*name = patch->old_name ? patch->old_name : patch->new_name;3025unsigned char sha1[20];30263027/*3028 * For safety, we require patch index line to contain3029 * full 40-byte textual SHA1 for old and new, at least for now.3030 */3031if(strlen(patch->old_sha1_prefix) !=40||3032strlen(patch->new_sha1_prefix) !=40||3033get_sha1_hex(patch->old_sha1_prefix, sha1) ||3034get_sha1_hex(patch->new_sha1_prefix, sha1))3035returnerror("cannot apply binary patch to '%s' "3036"without full index line", name);30373038if(patch->old_name) {3039/*3040 * See if the old one matches what the patch3041 * applies to.3042 */3043hash_sha1_file(img->buf, img->len, blob_type, sha1);3044if(strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))3045returnerror("the patch applies to '%s' (%s), "3046"which does not match the "3047"current contents.",3048 name,sha1_to_hex(sha1));3049}3050else{3051/* Otherwise, the old one must be empty. */3052if(img->len)3053returnerror("the patch applies to an empty "3054"'%s' but it is not empty", name);3055}30563057get_sha1_hex(patch->new_sha1_prefix, sha1);3058if(is_null_sha1(sha1)) {3059clear_image(img);3060return0;/* deletion patch */3061}30623063if(has_sha1_file(sha1)) {3064/* We already have the postimage */3065enum object_type type;3066unsigned long size;3067char*result;30683069 result =read_sha1_file(sha1, &type, &size);3070if(!result)3071returnerror("the necessary postimage%sfor "3072"'%s' cannot be read",3073 patch->new_sha1_prefix, name);3074clear_image(img);3075 img->buf = result;3076 img->len = size;3077}else{3078/*3079 * We have verified buf matches the preimage;3080 * apply the patch data to it, which is stored3081 * in the patch->fragments->{patch,size}.3082 */3083if(apply_binary_fragment(state, img, patch))3084returnerror(_("binary patch does not apply to '%s'"),3085 name);30863087/* verify that the result matches */3088hash_sha1_file(img->buf, img->len, blob_type, sha1);3089if(strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))3090returnerror(_("binary patch to '%s' creates incorrect result (expecting%s, got%s)"),3091 name, patch->new_sha1_prefix,sha1_to_hex(sha1));3092}30933094return0;3095}30963097static intapply_fragments(struct apply_state *state,struct image *img,struct patch *patch)3098{3099struct fragment *frag = patch->fragments;3100const char*name = patch->old_name ? patch->old_name : patch->new_name;3101unsigned ws_rule = patch->ws_rule;3102unsigned inaccurate_eof = patch->inaccurate_eof;3103int nth =0;31043105if(patch->is_binary)3106returnapply_binary(state, img, patch);31073108while(frag) {3109 nth++;3110if(apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) {3111error(_("patch failed:%s:%ld"), name, frag->oldpos);3112if(!state->apply_with_reject)3113return-1;3114 frag->rejected =1;3115}3116 frag = frag->next;3117}3118return0;3119}31203121static intread_blob_object(struct strbuf *buf,const unsigned char*sha1,unsigned mode)3122{3123if(S_ISGITLINK(mode)) {3124strbuf_grow(buf,100);3125strbuf_addf(buf,"Subproject commit%s\n",sha1_to_hex(sha1));3126}else{3127enum object_type type;3128unsigned long sz;3129char*result;31303131 result =read_sha1_file(sha1, &type, &sz);3132if(!result)3133return-1;3134/* XXX read_sha1_file NUL-terminates */3135strbuf_attach(buf, result, sz, sz +1);3136}3137return0;3138}31393140static intread_file_or_gitlink(const struct cache_entry *ce,struct strbuf *buf)3141{3142if(!ce)3143return0;3144returnread_blob_object(buf, ce->sha1, ce->ce_mode);3145}31463147static struct patch *in_fn_table(struct apply_state *state,const char*name)3148{3149struct string_list_item *item;31503151if(name == NULL)3152return NULL;31533154 item =string_list_lookup(&state->fn_table, name);3155if(item != NULL)3156return(struct patch *)item->util;31573158return NULL;3159}31603161/*3162 * item->util in the filename table records the status of the path.3163 * Usually it points at a patch (whose result records the contents3164 * of it after applying it), but it could be PATH_WAS_DELETED for a3165 * path that a previously applied patch has already removed, or3166 * PATH_TO_BE_DELETED for a path that a later patch would remove.3167 *3168 * The latter is needed to deal with a case where two paths A and B3169 * are swapped by first renaming A to B and then renaming B to A;3170 * moving A to B should not be prevented due to presence of B as we3171 * will remove it in a later patch.3172 */3173#define PATH_TO_BE_DELETED ((struct patch *) -2)3174#define PATH_WAS_DELETED ((struct patch *) -1)31753176static intto_be_deleted(struct patch *patch)3177{3178return patch == PATH_TO_BE_DELETED;3179}31803181static intwas_deleted(struct patch *patch)3182{3183return patch == PATH_WAS_DELETED;3184}31853186static voidadd_to_fn_table(struct apply_state *state,struct patch *patch)3187{3188struct string_list_item *item;31893190/*3191 * Always add new_name unless patch is a deletion3192 * This should cover the cases for normal diffs,3193 * file creations and copies3194 */3195if(patch->new_name != NULL) {3196 item =string_list_insert(&state->fn_table, patch->new_name);3197 item->util = patch;3198}31993200/*3201 * store a failure on rename/deletion cases because3202 * later chunks shouldn't patch old names3203 */3204if((patch->new_name == NULL) || (patch->is_rename)) {3205 item =string_list_insert(&state->fn_table, patch->old_name);3206 item->util = PATH_WAS_DELETED;3207}3208}32093210static voidprepare_fn_table(struct apply_state *state,struct patch *patch)3211{3212/*3213 * store information about incoming file deletion3214 */3215while(patch) {3216if((patch->new_name == NULL) || (patch->is_rename)) {3217struct string_list_item *item;3218 item =string_list_insert(&state->fn_table, patch->old_name);3219 item->util = PATH_TO_BE_DELETED;3220}3221 patch = patch->next;3222}3223}32243225static intcheckout_target(struct index_state *istate,3226struct cache_entry *ce,struct stat *st)3227{3228struct checkout costate;32293230memset(&costate,0,sizeof(costate));3231 costate.base_dir ="";3232 costate.refresh_cache =1;3233 costate.istate = istate;3234if(checkout_entry(ce, &costate, NULL) ||lstat(ce->name, st))3235returnerror(_("cannot checkout%s"), ce->name);3236return0;3237}32383239static struct patch *previous_patch(struct apply_state *state,3240struct patch *patch,3241int*gone)3242{3243struct patch *previous;32443245*gone =0;3246if(patch->is_copy || patch->is_rename)3247return NULL;/* "git" patches do not depend on the order */32483249 previous =in_fn_table(state, patch->old_name);3250if(!previous)3251return NULL;32523253if(to_be_deleted(previous))3254return NULL;/* the deletion hasn't happened yet */32553256if(was_deleted(previous))3257*gone =1;32583259return previous;3260}32613262static intverify_index_match(const struct cache_entry *ce,struct stat *st)3263{3264if(S_ISGITLINK(ce->ce_mode)) {3265if(!S_ISDIR(st->st_mode))3266return-1;3267return0;3268}3269returnce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3270}32713272#define SUBMODULE_PATCH_WITHOUT_INDEX 132733274static intload_patch_target(struct apply_state *state,3275struct strbuf *buf,3276const struct cache_entry *ce,3277struct stat *st,3278const char*name,3279unsigned expected_mode)3280{3281if(state->cached || state->check_index) {3282if(read_file_or_gitlink(ce, buf))3283returnerror(_("failed to read%s"), name);3284}else if(name) {3285if(S_ISGITLINK(expected_mode)) {3286if(ce)3287returnread_file_or_gitlink(ce, buf);3288else3289return SUBMODULE_PATCH_WITHOUT_INDEX;3290}else if(has_symlink_leading_path(name,strlen(name))) {3291returnerror(_("reading from '%s' beyond a symbolic link"), name);3292}else{3293if(read_old_data(st, name, buf))3294returnerror(_("failed to read%s"), name);3295}3296}3297return0;3298}32993300/*3301 * We are about to apply "patch"; populate the "image" with the3302 * current version we have, from the working tree or from the index,3303 * depending on the situation e.g. --cached/--index. If we are3304 * applying a non-git patch that incrementally updates the tree,3305 * we read from the result of a previous diff.3306 */3307static intload_preimage(struct apply_state *state,3308struct image *image,3309struct patch *patch,struct stat *st,3310const struct cache_entry *ce)3311{3312struct strbuf buf = STRBUF_INIT;3313size_t len;3314char*img;3315struct patch *previous;3316int status;33173318 previous =previous_patch(state, patch, &status);3319if(status)3320returnerror(_("path%shas been renamed/deleted"),3321 patch->old_name);3322if(previous) {3323/* We have a patched copy in memory; use that. */3324strbuf_add(&buf, previous->result, previous->resultsize);3325}else{3326 status =load_patch_target(state, &buf, ce, st,3327 patch->old_name, patch->old_mode);3328if(status <0)3329return status;3330else if(status == SUBMODULE_PATCH_WITHOUT_INDEX) {3331/*3332 * There is no way to apply subproject3333 * patch without looking at the index.3334 * NEEDSWORK: shouldn't this be flagged3335 * as an error???3336 */3337free_fragment_list(patch->fragments);3338 patch->fragments = NULL;3339}else if(status) {3340returnerror(_("failed to read%s"), patch->old_name);3341}3342}33433344 img =strbuf_detach(&buf, &len);3345prepare_image(image, img, len, !patch->is_binary);3346return0;3347}33483349static intthree_way_merge(struct image *image,3350char*path,3351const unsigned char*base,3352const unsigned char*ours,3353const unsigned char*theirs)3354{3355 mmfile_t base_file, our_file, their_file;3356 mmbuffer_t result = { NULL };3357int status;33583359read_mmblob(&base_file, base);3360read_mmblob(&our_file, ours);3361read_mmblob(&their_file, theirs);3362 status =ll_merge(&result, path,3363&base_file,"base",3364&our_file,"ours",3365&their_file,"theirs", NULL);3366free(base_file.ptr);3367free(our_file.ptr);3368free(their_file.ptr);3369if(status <0|| !result.ptr) {3370free(result.ptr);3371return-1;3372}3373clear_image(image);3374 image->buf = result.ptr;3375 image->len = result.size;33763377return status;3378}33793380/*3381 * When directly falling back to add/add three-way merge, we read from3382 * the current contents of the new_name. In no cases other than that3383 * this function will be called.3384 */3385static intload_current(struct apply_state *state,3386struct image *image,3387struct patch *patch)3388{3389struct strbuf buf = STRBUF_INIT;3390int status, pos;3391size_t len;3392char*img;3393struct stat st;3394struct cache_entry *ce;3395char*name = patch->new_name;3396unsigned mode = patch->new_mode;33973398if(!patch->is_new)3399die("BUG: patch to%sis not a creation", patch->old_name);34003401 pos =cache_name_pos(name,strlen(name));3402if(pos <0)3403returnerror(_("%s: does not exist in index"), name);3404 ce = active_cache[pos];3405if(lstat(name, &st)) {3406if(errno != ENOENT)3407returnerror(_("%s:%s"), name,strerror(errno));3408if(checkout_target(&the_index, ce, &st))3409return-1;3410}3411if(verify_index_match(ce, &st))3412returnerror(_("%s: does not match index"), name);34133414 status =load_patch_target(state, &buf, ce, &st, name, mode);3415if(status <0)3416return status;3417else if(status)3418return-1;3419 img =strbuf_detach(&buf, &len);3420prepare_image(image, img, len, !patch->is_binary);3421return0;3422}34233424static inttry_threeway(struct apply_state *state,3425struct image *image,3426struct patch *patch,3427struct stat *st,3428const struct cache_entry *ce)3429{3430unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];3431struct strbuf buf = STRBUF_INIT;3432size_t len;3433int status;3434char*img;3435struct image tmp_image;34363437/* No point falling back to 3-way merge in these cases */3438if(patch->is_delete ||3439S_ISGITLINK(patch->old_mode) ||S_ISGITLINK(patch->new_mode))3440return-1;34413442/* Preimage the patch was prepared for */3443if(patch->is_new)3444write_sha1_file("",0, blob_type, pre_sha1);3445else if(get_sha1(patch->old_sha1_prefix, pre_sha1) ||3446read_blob_object(&buf, pre_sha1, patch->old_mode))3447returnerror("repository lacks the necessary blob to fall back on 3-way merge.");34483449fprintf(stderr,"Falling back to three-way merge...\n");34503451 img =strbuf_detach(&buf, &len);3452prepare_image(&tmp_image, img, len,1);3453/* Apply the patch to get the post image */3454if(apply_fragments(state, &tmp_image, patch) <0) {3455clear_image(&tmp_image);3456return-1;3457}3458/* post_sha1[] is theirs */3459write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_sha1);3460clear_image(&tmp_image);34613462/* our_sha1[] is ours */3463if(patch->is_new) {3464if(load_current(state, &tmp_image, patch))3465returnerror("cannot read the current contents of '%s'",3466 patch->new_name);3467}else{3468if(load_preimage(state, &tmp_image, patch, st, ce))3469returnerror("cannot read the current contents of '%s'",3470 patch->old_name);3471}3472write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);3473clear_image(&tmp_image);34743475/* in-core three-way merge between post and our using pre as base */3476 status =three_way_merge(image, patch->new_name,3477 pre_sha1, our_sha1, post_sha1);3478if(status <0) {3479fprintf(stderr,"Failed to fall back on three-way merge...\n");3480return status;3481}34823483if(status) {3484 patch->conflicted_threeway =1;3485if(patch->is_new)3486oidclr(&patch->threeway_stage[0]);3487else3488hashcpy(patch->threeway_stage[0].hash, pre_sha1);3489hashcpy(patch->threeway_stage[1].hash, our_sha1);3490hashcpy(patch->threeway_stage[2].hash, post_sha1);3491fprintf(stderr,"Applied patch to '%s' with conflicts.\n", patch->new_name);3492}else{3493fprintf(stderr,"Applied patch to '%s' cleanly.\n", patch->new_name);3494}3495return0;3496}34973498static intapply_data(struct apply_state *state,struct patch *patch,3499struct stat *st,const struct cache_entry *ce)3500{3501struct image image;35023503if(load_preimage(state, &image, patch, st, ce) <0)3504return-1;35053506if(patch->direct_to_threeway ||3507apply_fragments(state, &image, patch) <0) {3508/* Note: with --reject, apply_fragments() returns 0 */3509if(!state->threeway ||try_threeway(state, &image, patch, st, ce) <0)3510return-1;3511}3512 patch->result = image.buf;3513 patch->resultsize = image.len;3514add_to_fn_table(state, patch);3515free(image.line_allocated);35163517if(0< patch->is_delete && patch->resultsize)3518returnerror(_("removal patch leaves file contents"));35193520return0;3521}35223523/*3524 * If "patch" that we are looking at modifies or deletes what we have,3525 * we would want it not to lose any local modification we have, either3526 * in the working tree or in the index.3527 *3528 * This also decides if a non-git patch is a creation patch or a3529 * modification to an existing empty file. We do not check the state3530 * of the current tree for a creation patch in this function; the caller3531 * check_patch() separately makes sure (and errors out otherwise) that3532 * the path the patch creates does not exist in the current tree.3533 */3534static intcheck_preimage(struct apply_state *state,3535struct patch *patch,3536struct cache_entry **ce,3537struct stat *st)3538{3539const char*old_name = patch->old_name;3540struct patch *previous = NULL;3541int stat_ret =0, status;3542unsigned st_mode =0;35433544if(!old_name)3545return0;35463547assert(patch->is_new <=0);3548 previous =previous_patch(state, patch, &status);35493550if(status)3551returnerror(_("path%shas been renamed/deleted"), old_name);3552if(previous) {3553 st_mode = previous->new_mode;3554}else if(!state->cached) {3555 stat_ret =lstat(old_name, st);3556if(stat_ret && errno != ENOENT)3557returnerror(_("%s:%s"), old_name,strerror(errno));3558}35593560if(state->check_index && !previous) {3561int pos =cache_name_pos(old_name,strlen(old_name));3562if(pos <0) {3563if(patch->is_new <0)3564goto is_new;3565returnerror(_("%s: does not exist in index"), old_name);3566}3567*ce = active_cache[pos];3568if(stat_ret <0) {3569if(checkout_target(&the_index, *ce, st))3570return-1;3571}3572if(!state->cached &&verify_index_match(*ce, st))3573returnerror(_("%s: does not match index"), old_name);3574if(state->cached)3575 st_mode = (*ce)->ce_mode;3576}else if(stat_ret <0) {3577if(patch->is_new <0)3578goto is_new;3579returnerror(_("%s:%s"), old_name,strerror(errno));3580}35813582if(!state->cached && !previous)3583 st_mode =ce_mode_from_stat(*ce, st->st_mode);35843585if(patch->is_new <0)3586 patch->is_new =0;3587if(!patch->old_mode)3588 patch->old_mode = st_mode;3589if((st_mode ^ patch->old_mode) & S_IFMT)3590returnerror(_("%s: wrong type"), old_name);3591if(st_mode != patch->old_mode)3592warning(_("%shas type%o, expected%o"),3593 old_name, st_mode, patch->old_mode);3594if(!patch->new_mode && !patch->is_delete)3595 patch->new_mode = st_mode;3596return0;35973598 is_new:3599 patch->is_new =1;3600 patch->is_delete =0;3601free(patch->old_name);3602 patch->old_name = NULL;3603return0;3604}360536063607#define EXISTS_IN_INDEX 13608#define EXISTS_IN_WORKTREE 236093610static intcheck_to_create(struct apply_state *state,3611const char*new_name,3612int ok_if_exists)3613{3614struct stat nst;36153616if(state->check_index &&3617cache_name_pos(new_name,strlen(new_name)) >=0&&3618!ok_if_exists)3619return EXISTS_IN_INDEX;3620if(state->cached)3621return0;36223623if(!lstat(new_name, &nst)) {3624if(S_ISDIR(nst.st_mode) || ok_if_exists)3625return0;3626/*3627 * A leading component of new_name might be a symlink3628 * that is going to be removed with this patch, but3629 * still pointing at somewhere that has the path.3630 * In such a case, path "new_name" does not exist as3631 * far as git is concerned.3632 */3633if(has_symlink_leading_path(new_name,strlen(new_name)))3634return0;36353636return EXISTS_IN_WORKTREE;3637}else if((errno != ENOENT) && (errno != ENOTDIR)) {3638returnerror("%s:%s", new_name,strerror(errno));3639}3640return0;3641}36423643static uintptr_tregister_symlink_changes(struct apply_state *state,3644const char*path,3645uintptr_t what)3646{3647struct string_list_item *ent;36483649 ent =string_list_lookup(&state->symlink_changes, path);3650if(!ent) {3651 ent =string_list_insert(&state->symlink_changes, path);3652 ent->util = (void*)0;3653}3654 ent->util = (void*)(what | ((uintptr_t)ent->util));3655return(uintptr_t)ent->util;3656}36573658static uintptr_tcheck_symlink_changes(struct apply_state *state,const char*path)3659{3660struct string_list_item *ent;36613662 ent =string_list_lookup(&state->symlink_changes, path);3663if(!ent)3664return0;3665return(uintptr_t)ent->util;3666}36673668static voidprepare_symlink_changes(struct apply_state *state,struct patch *patch)3669{3670for( ; patch; patch = patch->next) {3671if((patch->old_name &&S_ISLNK(patch->old_mode)) &&3672(patch->is_rename || patch->is_delete))3673/* the symlink at patch->old_name is removed */3674register_symlink_changes(state, patch->old_name, APPLY_SYMLINK_GOES_AWAY);36753676if(patch->new_name &&S_ISLNK(patch->new_mode))3677/* the symlink at patch->new_name is created or remains */3678register_symlink_changes(state, patch->new_name, APPLY_SYMLINK_IN_RESULT);3679}3680}36813682static intpath_is_beyond_symlink_1(struct apply_state *state,struct strbuf *name)3683{3684do{3685unsigned int change;36863687while(--name->len && name->buf[name->len] !='/')3688;/* scan backwards */3689if(!name->len)3690break;3691 name->buf[name->len] ='\0';3692 change =check_symlink_changes(state, name->buf);3693if(change & APPLY_SYMLINK_IN_RESULT)3694return1;3695if(change & APPLY_SYMLINK_GOES_AWAY)3696/*3697 * This cannot be "return 0", because we may3698 * see a new one created at a higher level.3699 */3700continue;37013702/* otherwise, check the preimage */3703if(state->check_index) {3704struct cache_entry *ce;37053706 ce =cache_file_exists(name->buf, name->len, ignore_case);3707if(ce &&S_ISLNK(ce->ce_mode))3708return1;3709}else{3710struct stat st;3711if(!lstat(name->buf, &st) &&S_ISLNK(st.st_mode))3712return1;3713}3714}while(1);3715return0;3716}37173718static intpath_is_beyond_symlink(struct apply_state *state,const char*name_)3719{3720int ret;3721struct strbuf name = STRBUF_INIT;37223723assert(*name_ !='\0');3724strbuf_addstr(&name, name_);3725 ret =path_is_beyond_symlink_1(state, &name);3726strbuf_release(&name);37273728return ret;3729}37303731static voiddie_on_unsafe_path(struct patch *patch)3732{3733const char*old_name = NULL;3734const char*new_name = NULL;3735if(patch->is_delete)3736 old_name = patch->old_name;3737else if(!patch->is_new && !patch->is_copy)3738 old_name = patch->old_name;3739if(!patch->is_delete)3740 new_name = patch->new_name;37413742if(old_name && !verify_path(old_name))3743die(_("invalid path '%s'"), old_name);3744if(new_name && !verify_path(new_name))3745die(_("invalid path '%s'"), new_name);3746}37473748/*3749 * Check and apply the patch in-core; leave the result in patch->result3750 * for the caller to write it out to the final destination.3751 */3752static intcheck_patch(struct apply_state *state,struct patch *patch)3753{3754struct stat st;3755const char*old_name = patch->old_name;3756const char*new_name = patch->new_name;3757const char*name = old_name ? old_name : new_name;3758struct cache_entry *ce = NULL;3759struct patch *tpatch;3760int ok_if_exists;3761int status;37623763 patch->rejected =1;/* we will drop this after we succeed */37643765 status =check_preimage(state, patch, &ce, &st);3766if(status)3767return status;3768 old_name = patch->old_name;37693770/*3771 * A type-change diff is always split into a patch to delete3772 * old, immediately followed by a patch to create new (see3773 * diff.c::run_diff()); in such a case it is Ok that the entry3774 * to be deleted by the previous patch is still in the working3775 * tree and in the index.3776 *3777 * A patch to swap-rename between A and B would first rename A3778 * to B and then rename B to A. While applying the first one,3779 * the presence of B should not stop A from getting renamed to3780 * B; ask to_be_deleted() about the later rename. Removal of3781 * B and rename from A to B is handled the same way by asking3782 * was_deleted().3783 */3784if((tpatch =in_fn_table(state, new_name)) &&3785(was_deleted(tpatch) ||to_be_deleted(tpatch)))3786 ok_if_exists =1;3787else3788 ok_if_exists =0;37893790if(new_name &&3791((0< patch->is_new) || patch->is_rename || patch->is_copy)) {3792int err =check_to_create(state, new_name, ok_if_exists);37933794if(err && state->threeway) {3795 patch->direct_to_threeway =1;3796}else switch(err) {3797case0:3798break;/* happy */3799case EXISTS_IN_INDEX:3800returnerror(_("%s: already exists in index"), new_name);3801break;3802case EXISTS_IN_WORKTREE:3803returnerror(_("%s: already exists in working directory"),3804 new_name);3805default:3806return err;3807}38083809if(!patch->new_mode) {3810if(0< patch->is_new)3811 patch->new_mode = S_IFREG |0644;3812else3813 patch->new_mode = patch->old_mode;3814}3815}38163817if(new_name && old_name) {3818int same = !strcmp(old_name, new_name);3819if(!patch->new_mode)3820 patch->new_mode = patch->old_mode;3821if((patch->old_mode ^ patch->new_mode) & S_IFMT) {3822if(same)3823returnerror(_("new mode (%o) of%sdoes not "3824"match old mode (%o)"),3825 patch->new_mode, new_name,3826 patch->old_mode);3827else3828returnerror(_("new mode (%o) of%sdoes not "3829"match old mode (%o) of%s"),3830 patch->new_mode, new_name,3831 patch->old_mode, old_name);3832}3833}38343835if(!state->unsafe_paths)3836die_on_unsafe_path(patch);38373838/*3839 * An attempt to read from or delete a path that is beyond a3840 * symbolic link will be prevented by load_patch_target() that3841 * is called at the beginning of apply_data() so we do not3842 * have to worry about a patch marked with "is_delete" bit3843 * here. We however need to make sure that the patch result3844 * is not deposited to a path that is beyond a symbolic link3845 * here.3846 */3847if(!patch->is_delete &&path_is_beyond_symlink(state, patch->new_name))3848returnerror(_("affected file '%s' is beyond a symbolic link"),3849 patch->new_name);38503851if(apply_data(state, patch, &st, ce) <0)3852returnerror(_("%s: patch does not apply"), name);3853 patch->rejected =0;3854return0;3855}38563857static intcheck_patch_list(struct apply_state *state,struct patch *patch)3858{3859int err =0;38603861prepare_symlink_changes(state, patch);3862prepare_fn_table(state, patch);3863while(patch) {3864if(state->apply_verbosely)3865say_patch_name(stderr,3866_("Checking patch%s..."), patch);3867 err |=check_patch(state, patch);3868 patch = patch->next;3869}3870return err;3871}38723873/* This function tries to read the sha1 from the current index */3874static intget_current_sha1(const char*path,unsigned char*sha1)3875{3876int pos;38773878if(read_cache() <0)3879return-1;3880 pos =cache_name_pos(path,strlen(path));3881if(pos <0)3882return-1;3883hashcpy(sha1, active_cache[pos]->sha1);3884return0;3885}38863887static intpreimage_sha1_in_gitlink_patch(struct patch *p,unsigned char sha1[20])3888{3889/*3890 * A usable gitlink patch has only one fragment (hunk) that looks like:3891 * @@ -1 +1 @@3892 * -Subproject commit <old sha1>3893 * +Subproject commit <new sha1>3894 * or3895 * @@ -1 +0,0 @@3896 * -Subproject commit <old sha1>3897 * for a removal patch.3898 */3899struct fragment *hunk = p->fragments;3900static const char heading[] ="-Subproject commit ";3901char*preimage;39023903if(/* does the patch have only one hunk? */3904 hunk && !hunk->next &&3905/* is its preimage one line? */3906 hunk->oldpos ==1&& hunk->oldlines ==1&&3907/* does preimage begin with the heading? */3908(preimage =memchr(hunk->patch,'\n', hunk->size)) != NULL &&3909starts_with(++preimage, heading) &&3910/* does it record full SHA-1? */3911!get_sha1_hex(preimage +sizeof(heading) -1, sha1) &&3912 preimage[sizeof(heading) +40-1] =='\n'&&3913/* does the abbreviated name on the index line agree with it? */3914starts_with(preimage +sizeof(heading) -1, p->old_sha1_prefix))3915return0;/* it all looks fine */39163917/* we may have full object name on the index line */3918returnget_sha1_hex(p->old_sha1_prefix, sha1);3919}39203921/* Build an index that contains the just the files needed for a 3way merge */3922static voidbuild_fake_ancestor(struct patch *list,const char*filename)3923{3924struct patch *patch;3925struct index_state result = { NULL };3926static struct lock_file lock;39273928/* Once we start supporting the reverse patch, it may be3929 * worth showing the new sha1 prefix, but until then...3930 */3931for(patch = list; patch; patch = patch->next) {3932unsigned char sha1[20];3933struct cache_entry *ce;3934const char*name;39353936 name = patch->old_name ? patch->old_name : patch->new_name;3937if(0< patch->is_new)3938continue;39393940if(S_ISGITLINK(patch->old_mode)) {3941if(!preimage_sha1_in_gitlink_patch(patch, sha1))3942;/* ok, the textual part looks sane */3943else3944die("sha1 information is lacking or useless for submodule%s",3945 name);3946}else if(!get_sha1_blob(patch->old_sha1_prefix, sha1)) {3947;/* ok */3948}else if(!patch->lines_added && !patch->lines_deleted) {3949/* mode-only change: update the current */3950if(get_current_sha1(patch->old_name, sha1))3951die("mode change for%s, which is not "3952"in current HEAD", name);3953}else3954die("sha1 information is lacking or useless "3955"(%s).", name);39563957 ce =make_cache_entry(patch->old_mode, sha1, name,0,0);3958if(!ce)3959die(_("make_cache_entry failed for path '%s'"), name);3960if(add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))3961die("Could not add%sto temporary index", name);3962}39633964hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);3965if(write_locked_index(&result, &lock, COMMIT_LOCK))3966die("Could not write temporary index to%s", filename);39673968discard_index(&result);3969}39703971static voidstat_patch_list(struct apply_state *state,struct patch *patch)3972{3973int files, adds, dels;39743975for(files = adds = dels =0; patch ; patch = patch->next) {3976 files++;3977 adds += patch->lines_added;3978 dels += patch->lines_deleted;3979show_stats(state, patch);3980}39813982print_stat_summary(stdout, files, adds, dels);3983}39843985static voidnumstat_patch_list(struct apply_state *state,3986struct patch *patch)3987{3988for( ; patch; patch = patch->next) {3989const char*name;3990 name = patch->new_name ? patch->new_name : patch->old_name;3991if(patch->is_binary)3992printf("-\t-\t");3993else3994printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);3995write_name_quoted(name, stdout, state->line_termination);3996}3997}39983999static voidshow_file_mode_name(const char*newdelete,unsigned int mode,const char*name)4000{4001if(mode)4002printf("%smode%06o%s\n", newdelete, mode, name);4003else4004printf("%s %s\n", newdelete, name);4005}40064007static voidshow_mode_change(struct patch *p,int show_name)4008{4009if(p->old_mode && p->new_mode && p->old_mode != p->new_mode) {4010if(show_name)4011printf(" mode change%06o =>%06o%s\n",4012 p->old_mode, p->new_mode, p->new_name);4013else4014printf(" mode change%06o =>%06o\n",4015 p->old_mode, p->new_mode);4016}4017}40184019static voidshow_rename_copy(struct patch *p)4020{4021const char*renamecopy = p->is_rename ?"rename":"copy";4022const char*old, *new;40234024/* Find common prefix */4025 old = p->old_name;4026new= p->new_name;4027while(1) {4028const char*slash_old, *slash_new;4029 slash_old =strchr(old,'/');4030 slash_new =strchr(new,'/');4031if(!slash_old ||4032!slash_new ||4033 slash_old - old != slash_new -new||4034memcmp(old,new, slash_new -new))4035break;4036 old = slash_old +1;4037new= slash_new +1;4038}4039/* p->old_name thru old is the common prefix, and old and new4040 * through the end of names are renames4041 */4042if(old != p->old_name)4043printf("%s%.*s{%s=>%s} (%d%%)\n", renamecopy,4044(int)(old - p->old_name), p->old_name,4045 old,new, p->score);4046else4047printf("%s %s=>%s(%d%%)\n", renamecopy,4048 p->old_name, p->new_name, p->score);4049show_mode_change(p,0);4050}40514052static voidsummary_patch_list(struct patch *patch)4053{4054struct patch *p;40554056for(p = patch; p; p = p->next) {4057if(p->is_new)4058show_file_mode_name("create", p->new_mode, p->new_name);4059else if(p->is_delete)4060show_file_mode_name("delete", p->old_mode, p->old_name);4061else{4062if(p->is_rename || p->is_copy)4063show_rename_copy(p);4064else{4065if(p->score) {4066printf(" rewrite%s(%d%%)\n",4067 p->new_name, p->score);4068show_mode_change(p,0);4069}4070else4071show_mode_change(p,1);4072}4073}4074}4075}40764077static voidpatch_stats(struct apply_state *state,struct patch *patch)4078{4079int lines = patch->lines_added + patch->lines_deleted;40804081if(lines > state->max_change)4082 state->max_change = lines;4083if(patch->old_name) {4084int len =quote_c_style(patch->old_name, NULL, NULL,0);4085if(!len)4086 len =strlen(patch->old_name);4087if(len > state->max_len)4088 state->max_len = len;4089}4090if(patch->new_name) {4091int len =quote_c_style(patch->new_name, NULL, NULL,0);4092if(!len)4093 len =strlen(patch->new_name);4094if(len > state->max_len)4095 state->max_len = len;4096}4097}40984099static voidremove_file(struct apply_state *state,struct patch *patch,int rmdir_empty)4100{4101if(state->update_index) {4102if(remove_file_from_cache(patch->old_name) <0)4103die(_("unable to remove%sfrom index"), patch->old_name);4104}4105if(!state->cached) {4106if(!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {4107remove_path(patch->old_name);4108}4109}4110}41114112static voidadd_index_file(struct apply_state *state,4113const char*path,4114unsigned mode,4115void*buf,4116unsigned long size)4117{4118struct stat st;4119struct cache_entry *ce;4120int namelen =strlen(path);4121unsigned ce_size =cache_entry_size(namelen);41224123if(!state->update_index)4124return;41254126 ce =xcalloc(1, ce_size);4127memcpy(ce->name, path, namelen);4128 ce->ce_mode =create_ce_mode(mode);4129 ce->ce_flags =create_ce_flags(0);4130 ce->ce_namelen = namelen;4131if(S_ISGITLINK(mode)) {4132const char*s;41334134if(!skip_prefix(buf,"Subproject commit ", &s) ||4135get_sha1_hex(s, ce->sha1))4136die(_("corrupt patch for submodule%s"), path);4137}else{4138if(!state->cached) {4139if(lstat(path, &st) <0)4140die_errno(_("unable to stat newly created file '%s'"),4141 path);4142fill_stat_cache_info(ce, &st);4143}4144if(write_sha1_file(buf, size, blob_type, ce->sha1) <0)4145die(_("unable to create backing store for newly created file%s"), path);4146}4147if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)4148die(_("unable to add cache entry for%s"), path);4149}41504151static inttry_create_file(const char*path,unsigned int mode,const char*buf,unsigned long size)4152{4153int fd;4154struct strbuf nbuf = STRBUF_INIT;41554156if(S_ISGITLINK(mode)) {4157struct stat st;4158if(!lstat(path, &st) &&S_ISDIR(st.st_mode))4159return0;4160returnmkdir(path,0777);4161}41624163if(has_symlinks &&S_ISLNK(mode))4164/* Although buf:size is counted string, it also is NUL4165 * terminated.4166 */4167returnsymlink(buf, path);41684169 fd =open(path, O_CREAT | O_EXCL | O_WRONLY, (mode &0100) ?0777:0666);4170if(fd <0)4171return-1;41724173if(convert_to_working_tree(path, buf, size, &nbuf)) {4174 size = nbuf.len;4175 buf = nbuf.buf;4176}4177write_or_die(fd, buf, size);4178strbuf_release(&nbuf);41794180if(close(fd) <0)4181die_errno(_("closing file '%s'"), path);4182return0;4183}41844185/*4186 * We optimistically assume that the directories exist,4187 * which is true 99% of the time anyway. If they don't,4188 * we create them and try again.4189 */4190static voidcreate_one_file(struct apply_state *state,4191char*path,4192unsigned mode,4193const char*buf,4194unsigned long size)4195{4196if(state->cached)4197return;4198if(!try_create_file(path, mode, buf, size))4199return;42004201if(errno == ENOENT) {4202if(safe_create_leading_directories(path))4203return;4204if(!try_create_file(path, mode, buf, size))4205return;4206}42074208if(errno == EEXIST || errno == EACCES) {4209/* We may be trying to create a file where a directory4210 * used to be.4211 */4212struct stat st;4213if(!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))4214 errno = EEXIST;4215}42164217if(errno == EEXIST) {4218unsigned int nr =getpid();42194220for(;;) {4221char newpath[PATH_MAX];4222mksnpath(newpath,sizeof(newpath),"%s~%u", path, nr);4223if(!try_create_file(newpath, mode, buf, size)) {4224if(!rename(newpath, path))4225return;4226unlink_or_warn(newpath);4227break;4228}4229if(errno != EEXIST)4230break;4231++nr;4232}4233}4234die_errno(_("unable to write file '%s' mode%o"), path, mode);4235}42364237static voidadd_conflicted_stages_file(struct apply_state *state,4238struct patch *patch)4239{4240int stage, namelen;4241unsigned ce_size, mode;4242struct cache_entry *ce;42434244if(!state->update_index)4245return;4246 namelen =strlen(patch->new_name);4247 ce_size =cache_entry_size(namelen);4248 mode = patch->new_mode ? patch->new_mode : (S_IFREG |0644);42494250remove_file_from_cache(patch->new_name);4251for(stage =1; stage <4; stage++) {4252if(is_null_oid(&patch->threeway_stage[stage -1]))4253continue;4254 ce =xcalloc(1, ce_size);4255memcpy(ce->name, patch->new_name, namelen);4256 ce->ce_mode =create_ce_mode(mode);4257 ce->ce_flags =create_ce_flags(stage);4258 ce->ce_namelen = namelen;4259hashcpy(ce->sha1, patch->threeway_stage[stage -1].hash);4260if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)4261die(_("unable to add cache entry for%s"), patch->new_name);4262}4263}42644265static voidcreate_file(struct apply_state *state,struct patch *patch)4266{4267char*path = patch->new_name;4268unsigned mode = patch->new_mode;4269unsigned long size = patch->resultsize;4270char*buf = patch->result;42714272if(!mode)4273 mode = S_IFREG |0644;4274create_one_file(state, path, mode, buf, size);42754276if(patch->conflicted_threeway)4277add_conflicted_stages_file(state, patch);4278else4279add_index_file(state, path, mode, buf, size);4280}42814282/* phase zero is to remove, phase one is to create */4283static voidwrite_out_one_result(struct apply_state *state,4284struct patch *patch,4285int phase)4286{4287if(patch->is_delete >0) {4288if(phase ==0)4289remove_file(state, patch,1);4290return;4291}4292if(patch->is_new >0|| patch->is_copy) {4293if(phase ==1)4294create_file(state, patch);4295return;4296}4297/*4298 * Rename or modification boils down to the same4299 * thing: remove the old, write the new4300 */4301if(phase ==0)4302remove_file(state, patch, patch->is_rename);4303if(phase ==1)4304create_file(state, patch);4305}43064307static intwrite_out_one_reject(struct apply_state *state,struct patch *patch)4308{4309FILE*rej;4310char namebuf[PATH_MAX];4311struct fragment *frag;4312int cnt =0;4313struct strbuf sb = STRBUF_INIT;43144315for(cnt =0, frag = patch->fragments; frag; frag = frag->next) {4316if(!frag->rejected)4317continue;4318 cnt++;4319}43204321if(!cnt) {4322if(state->apply_verbosely)4323say_patch_name(stderr,4324_("Applied patch%scleanly."), patch);4325return0;4326}43274328/* This should not happen, because a removal patch that leaves4329 * contents are marked "rejected" at the patch level.4330 */4331if(!patch->new_name)4332die(_("internal error"));43334334/* Say this even without --verbose */4335strbuf_addf(&sb,Q_("Applying patch %%swith%dreject...",4336"Applying patch %%swith%drejects...",4337 cnt),4338 cnt);4339say_patch_name(stderr, sb.buf, patch);4340strbuf_release(&sb);43414342 cnt =strlen(patch->new_name);4343if(ARRAY_SIZE(namebuf) <= cnt +5) {4344 cnt =ARRAY_SIZE(namebuf) -5;4345warning(_("truncating .rej filename to %.*s.rej"),4346 cnt -1, patch->new_name);4347}4348memcpy(namebuf, patch->new_name, cnt);4349memcpy(namebuf + cnt,".rej",5);43504351 rej =fopen(namebuf,"w");4352if(!rej)4353returnerror(_("cannot open%s:%s"), namebuf,strerror(errno));43544355/* Normal git tools never deal with .rej, so do not pretend4356 * this is a git patch by saying --git or giving extended4357 * headers. While at it, maybe please "kompare" that wants4358 * the trailing TAB and some garbage at the end of line ;-).4359 */4360fprintf(rej,"diff a/%sb/%s\t(rejected hunks)\n",4361 patch->new_name, patch->new_name);4362for(cnt =1, frag = patch->fragments;4363 frag;4364 cnt++, frag = frag->next) {4365if(!frag->rejected) {4366fprintf_ln(stderr,_("Hunk #%dapplied cleanly."), cnt);4367continue;4368}4369fprintf_ln(stderr,_("Rejected hunk #%d."), cnt);4370fprintf(rej,"%.*s", frag->size, frag->patch);4371if(frag->patch[frag->size-1] !='\n')4372fputc('\n', rej);4373}4374fclose(rej);4375return-1;4376}43774378static intwrite_out_results(struct apply_state *state,struct patch *list)4379{4380int phase;4381int errs =0;4382struct patch *l;4383struct string_list cpath = STRING_LIST_INIT_DUP;43844385for(phase =0; phase <2; phase++) {4386 l = list;4387while(l) {4388if(l->rejected)4389 errs =1;4390else{4391write_out_one_result(state, l, phase);4392if(phase ==1) {4393if(write_out_one_reject(state, l))4394 errs =1;4395if(l->conflicted_threeway) {4396string_list_append(&cpath, l->new_name);4397 errs =1;4398}4399}4400}4401 l = l->next;4402}4403}44044405if(cpath.nr) {4406struct string_list_item *item;44074408string_list_sort(&cpath);4409for_each_string_list_item(item, &cpath)4410fprintf(stderr,"U%s\n", item->string);4411string_list_clear(&cpath,0);44124413rerere(0);4414}44154416return errs;4417}44184419static struct lock_file lock_file;44204421#define INACCURATE_EOF (1<<0)4422#define RECOUNT (1<<1)44234424/*4425 * Try to apply a patch.4426 *4427 * Returns:4428 * -128 if a bad error happened (like patch unreadable)4429 * -1 if patch did not apply and user cannot deal with it4430 * 0 if the patch applied4431 * 1 if the patch did not apply but user might fix it4432 */4433static intapply_patch(struct apply_state *state,4434int fd,4435const char*filename,4436int options)4437{4438size_t offset;4439struct strbuf buf = STRBUF_INIT;/* owns the patch text */4440struct patch *list = NULL, **listp = &list;4441int skipped_patch =0;4442int res =0;44434444 state->patch_input_file = filename;4445if(read_patch_file(&buf, fd) <0)4446return-128;4447 offset =0;4448while(offset < buf.len) {4449struct patch *patch;4450int nr;44514452 patch =xcalloc(1,sizeof(*patch));4453 patch->inaccurate_eof = !!(options & INACCURATE_EOF);4454 patch->recount = !!(options & RECOUNT);4455 nr =parse_chunk(state, buf.buf + offset, buf.len - offset, patch);4456if(nr <0) {4457free_patch(patch);4458break;4459}4460if(state->apply_in_reverse)4461reverse_patches(patch);4462if(use_patch(state, patch)) {4463patch_stats(state, patch);4464*listp = patch;4465 listp = &patch->next;4466}4467else{4468if(state->apply_verbosely)4469say_patch_name(stderr,_("Skipped patch '%s'."), patch);4470free_patch(patch);4471 skipped_patch++;4472}4473 offset += nr;4474}44754476if(!list && !skipped_patch) {4477error(_("unrecognized input"));4478 res = -128;4479goto end;4480}44814482if(state->whitespace_error && (state->ws_error_action == die_on_ws_error))4483 state->apply =0;44844485 state->update_index = state->check_index && state->apply;4486if(state->update_index && state->newfd <0)4487 state->newfd =hold_locked_index(state->lock_file,1);44884489if(state->check_index &&read_cache() <0) {4490error(_("unable to read index file"));4491 res = -128;4492goto end;4493}44944495if((state->check || state->apply) &&4496check_patch_list(state, list) <0&&4497!state->apply_with_reject) {4498 res = -1;4499goto end;4500}45014502if(state->apply &&write_out_results(state, list)) {4503/* with --3way, we still need to write the index out */4504 res = state->apply_with_reject ? -1:1;4505goto end;4506}45074508if(state->fake_ancestor)4509build_fake_ancestor(list, state->fake_ancestor);45104511if(state->diffstat)4512stat_patch_list(state, list);45134514if(state->numstat)4515numstat_patch_list(state, list);45164517if(state->summary)4518summary_patch_list(list);45194520end:4521free_patch_list(list);4522strbuf_release(&buf);4523string_list_clear(&state->fn_table,0);4524return res;4525}45264527static voidgit_apply_config(void)4528{4529git_config_get_string_const("apply.whitespace", &apply_default_whitespace);4530git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);4531git_config(git_default_config, NULL);4532}45334534static intoption_parse_exclude(const struct option *opt,4535const char*arg,int unset)4536{4537struct apply_state *state = opt->value;4538add_name_limit(state, arg,1);4539return0;4540}45414542static intoption_parse_include(const struct option *opt,4543const char*arg,int unset)4544{4545struct apply_state *state = opt->value;4546add_name_limit(state, arg,0);4547 state->has_include =1;4548return0;4549}45504551static intoption_parse_p(const struct option *opt,4552const char*arg,4553int unset)4554{4555struct apply_state *state = opt->value;4556 state->p_value =atoi(arg);4557 state->p_value_known =1;4558return0;4559}45604561static intoption_parse_space_change(const struct option *opt,4562const char*arg,int unset)4563{4564struct apply_state *state = opt->value;4565if(unset)4566 state->ws_ignore_action = ignore_ws_none;4567else4568 state->ws_ignore_action = ignore_ws_change;4569return0;4570}45714572static intoption_parse_whitespace(const struct option *opt,4573const char*arg,int unset)4574{4575struct apply_state *state = opt->value;4576 state->whitespace_option = arg;4577parse_whitespace_option(state, arg);4578return0;4579}45804581static intoption_parse_directory(const struct option *opt,4582const char*arg,int unset)4583{4584struct apply_state *state = opt->value;4585strbuf_reset(&state->root);4586strbuf_addstr(&state->root, arg);4587strbuf_complete(&state->root,'/');4588return0;4589}45904591static voidinit_apply_state(struct apply_state *state,4592const char*prefix,4593struct lock_file *lock_file)4594{4595memset(state,0,sizeof(*state));4596 state->prefix = prefix;4597 state->prefix_length = state->prefix ?strlen(state->prefix) :0;4598 state->lock_file = lock_file;4599 state->newfd = -1;4600 state->apply =1;4601 state->line_termination ='\n';4602 state->p_value =1;4603 state->p_context = UINT_MAX;4604 state->squelch_whitespace_errors =5;4605 state->ws_error_action = warn_on_ws_error;4606 state->ws_ignore_action = ignore_ws_none;4607 state->linenr =1;4608string_list_init(&state->fn_table,0);4609string_list_init(&state->limit_by_name,0);4610string_list_init(&state->symlink_changes,0);4611strbuf_init(&state->root,0);46124613git_apply_config();4614if(apply_default_whitespace)4615parse_whitespace_option(state, apply_default_whitespace);4616if(apply_default_ignorewhitespace)4617parse_ignorewhitespace_option(state, apply_default_ignorewhitespace);4618}46194620static voidclear_apply_state(struct apply_state *state)4621{4622string_list_clear(&state->limit_by_name,0);4623string_list_clear(&state->symlink_changes,0);4624strbuf_release(&state->root);46254626/* &state->fn_table is cleared at the end of apply_patch() */4627}46284629static voidcheck_apply_state(struct apply_state *state,int force_apply)4630{4631int is_not_gitdir = !startup_info->have_repository;46324633if(state->apply_with_reject && state->threeway)4634die("--reject and --3way cannot be used together.");4635if(state->cached && state->threeway)4636die("--cached and --3way cannot be used together.");4637if(state->threeway) {4638if(is_not_gitdir)4639die(_("--3way outside a repository"));4640 state->check_index =1;4641}4642if(state->apply_with_reject)4643 state->apply = state->apply_verbosely =1;4644if(!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor))4645 state->apply =0;4646if(state->check_index && is_not_gitdir)4647die(_("--index outside a repository"));4648if(state->cached) {4649if(is_not_gitdir)4650die(_("--cached outside a repository"));4651 state->check_index =1;4652}4653if(state->check_index)4654 state->unsafe_paths =0;4655if(!state->lock_file)4656die("BUG: state->lock_file should not be NULL");4657}46584659static intapply_all_patches(struct apply_state *state,4660int argc,4661const char**argv,4662int options)4663{4664int i;4665int res;4666int errs =0;4667int read_stdin =1;46684669for(i =0; i < argc; i++) {4670const char*arg = argv[i];4671int fd;46724673if(!strcmp(arg,"-")) {4674 res =apply_patch(state,0,"<stdin>", options);4675if(res <0)4676goto end;4677 errs |= res;4678 read_stdin =0;4679continue;4680}else if(0< state->prefix_length)4681 arg =prefix_filename(state->prefix,4682 state->prefix_length,4683 arg);46844685 fd =open(arg, O_RDONLY);4686if(fd <0)4687die_errno(_("can't open patch '%s'"), arg);4688 read_stdin =0;4689set_default_whitespace_mode(state);4690 res =apply_patch(state, fd, arg, options);4691if(res <0)4692goto end;4693 errs |= res;4694close(fd);4695}4696set_default_whitespace_mode(state);4697if(read_stdin) {4698 res =apply_patch(state,0,"<stdin>", options);4699if(res <0)4700goto end;4701 errs |= res;4702}47034704if(state->whitespace_error) {4705if(state->squelch_whitespace_errors &&4706 state->squelch_whitespace_errors < state->whitespace_error) {4707int squelched =4708 state->whitespace_error - state->squelch_whitespace_errors;4709warning(Q_("squelched%dwhitespace error",4710"squelched%dwhitespace errors",4711 squelched),4712 squelched);4713}4714if(state->ws_error_action == die_on_ws_error)4715die(Q_("%dline adds whitespace errors.",4716"%dlines add whitespace errors.",4717 state->whitespace_error),4718 state->whitespace_error);4719if(state->applied_after_fixing_ws && state->apply)4720warning("%dline%sapplied after"4721" fixing whitespace errors.",4722 state->applied_after_fixing_ws,4723 state->applied_after_fixing_ws ==1?"":"s");4724else if(state->whitespace_error)4725warning(Q_("%dline adds whitespace errors.",4726"%dlines add whitespace errors.",4727 state->whitespace_error),4728 state->whitespace_error);4729}47304731if(state->update_index) {4732if(write_locked_index(&the_index, state->lock_file, COMMIT_LOCK))4733die(_("Unable to write new index file"));4734 state->newfd = -1;4735}47364737return!!errs;47384739end:4740exit(res == -1?1:128);4741}47424743intcmd_apply(int argc,const char**argv,const char*prefix)4744{4745int force_apply =0;4746int options =0;4747int ret;4748struct apply_state state;47494750struct option builtin_apply_options[] = {4751{ OPTION_CALLBACK,0,"exclude", &state,N_("path"),4752N_("don't apply changes matching the given path"),47530, option_parse_exclude },4754{ OPTION_CALLBACK,0,"include", &state,N_("path"),4755N_("apply changes matching the given path"),47560, option_parse_include },4757{ OPTION_CALLBACK,'p', NULL, &state,N_("num"),4758N_("remove <num> leading slashes from traditional diff paths"),47590, option_parse_p },4760OPT_BOOL(0,"no-add", &state.no_add,4761N_("ignore additions made by the patch")),4762OPT_BOOL(0,"stat", &state.diffstat,4763N_("instead of applying the patch, output diffstat for the input")),4764OPT_NOOP_NOARG(0,"allow-binary-replacement"),4765OPT_NOOP_NOARG(0,"binary"),4766OPT_BOOL(0,"numstat", &state.numstat,4767N_("show number of added and deleted lines in decimal notation")),4768OPT_BOOL(0,"summary", &state.summary,4769N_("instead of applying the patch, output a summary for the input")),4770OPT_BOOL(0,"check", &state.check,4771N_("instead of applying the patch, see if the patch is applicable")),4772OPT_BOOL(0,"index", &state.check_index,4773N_("make sure the patch is applicable to the current index")),4774OPT_BOOL(0,"cached", &state.cached,4775N_("apply a patch without touching the working tree")),4776OPT_BOOL(0,"unsafe-paths", &state.unsafe_paths,4777N_("accept a patch that touches outside the working area")),4778OPT_BOOL(0,"apply", &force_apply,4779N_("also apply the patch (use with --stat/--summary/--check)")),4780OPT_BOOL('3',"3way", &state.threeway,4781N_("attempt three-way merge if a patch does not apply")),4782OPT_FILENAME(0,"build-fake-ancestor", &state.fake_ancestor,4783N_("build a temporary index based on embedded index information")),4784/* Think twice before adding "--nul" synonym to this */4785OPT_SET_INT('z', NULL, &state.line_termination,4786N_("paths are separated with NUL character"),'\0'),4787OPT_INTEGER('C', NULL, &state.p_context,4788N_("ensure at least <n> lines of context match")),4789{ OPTION_CALLBACK,0,"whitespace", &state,N_("action"),4790N_("detect new or modified lines that have whitespace errors"),47910, option_parse_whitespace },4792{ OPTION_CALLBACK,0,"ignore-space-change", &state, NULL,4793N_("ignore changes in whitespace when finding context"),4794 PARSE_OPT_NOARG, option_parse_space_change },4795{ OPTION_CALLBACK,0,"ignore-whitespace", &state, NULL,4796N_("ignore changes in whitespace when finding context"),4797 PARSE_OPT_NOARG, option_parse_space_change },4798OPT_BOOL('R',"reverse", &state.apply_in_reverse,4799N_("apply the patch in reverse")),4800OPT_BOOL(0,"unidiff-zero", &state.unidiff_zero,4801N_("don't expect at least one line of context")),4802OPT_BOOL(0,"reject", &state.apply_with_reject,4803N_("leave the rejected hunks in corresponding *.rej files")),4804OPT_BOOL(0,"allow-overlap", &state.allow_overlap,4805N_("allow overlapping hunks")),4806OPT__VERBOSE(&state.apply_verbosely,N_("be verbose")),4807OPT_BIT(0,"inaccurate-eof", &options,4808N_("tolerate incorrectly detected missing new-line at the end of file"),4809 INACCURATE_EOF),4810OPT_BIT(0,"recount", &options,4811N_("do not trust the line counts in the hunk headers"),4812 RECOUNT),4813{ OPTION_CALLBACK,0,"directory", &state,N_("root"),4814N_("prepend <root> to all filenames"),48150, option_parse_directory },4816OPT_END()4817};48184819init_apply_state(&state, prefix, &lock_file);48204821 argc =parse_options(argc, argv, state.prefix, builtin_apply_options,4822 apply_usage,0);48234824check_apply_state(&state, force_apply);48254826 ret =apply_all_patches(&state, argc, argv, options);48274828clear_apply_state(&state);48294830return ret;4831}