1/* 2 * apply.c 3 * 4 * Copyright (C) Linus Torvalds, 2005 5 * 6 * This applies patches on top of some (arbitrary) version of the SCM. 7 * 8 */ 9#include"cache.h" 10#include"cache-tree.h" 11#include"quote.h" 12#include"blob.h" 13#include"delta.h" 14#include"builtin.h" 15#include"string-list.h" 16#include"dir.h" 17#include"diff.h" 18#include"parse-options.h" 19#include"xdiff-interface.h" 20#include"ll-merge.h" 21#include"rerere.h" 22 23/* 24 * --check turns on checking that the working tree matches the 25 * files that are being modified, but doesn't apply the patch 26 * --stat does just a diffstat, and doesn't actually apply 27 * --numstat does numeric diffstat, and doesn't actually apply 28 * --index-info shows the old and new index info for paths if available. 29 * --index updates the cache as well. 30 * --cached updates only the cache without ever touching the working tree. 31 */ 32static const char*prefix; 33static int prefix_length = -1; 34static int newfd = -1; 35 36static int unidiff_zero; 37static int p_value =1; 38static int p_value_known; 39static int check_index; 40static int update_index; 41static int cached; 42static int diffstat; 43static int numstat; 44static int summary; 45static int check; 46static int apply =1; 47static int apply_in_reverse; 48static int apply_with_reject; 49static int apply_verbosely; 50static int allow_overlap; 51static int no_add; 52static int threeway; 53static const char*fake_ancestor; 54static int line_termination ='\n'; 55static unsigned int p_context = UINT_MAX; 56static const char*const apply_usage[] = { 57N_("git apply [options] [<patch>...]"), 58 NULL 59}; 60 61static enum ws_error_action { 62 nowarn_ws_error, 63 warn_on_ws_error, 64 die_on_ws_error, 65 correct_ws_error 66} ws_error_action = warn_on_ws_error; 67static int whitespace_error; 68static int squelch_whitespace_errors =5; 69static int applied_after_fixing_ws; 70 71static enum ws_ignore { 72 ignore_ws_none, 73 ignore_ws_change 74} ws_ignore_action = ignore_ws_none; 75 76 77static const char*patch_input_file; 78static const char*root; 79static int root_len; 80static int read_stdin =1; 81static int options; 82 83static voidparse_whitespace_option(const char*option) 84{ 85if(!option) { 86 ws_error_action = warn_on_ws_error; 87return; 88} 89if(!strcmp(option,"warn")) { 90 ws_error_action = warn_on_ws_error; 91return; 92} 93if(!strcmp(option,"nowarn")) { 94 ws_error_action = nowarn_ws_error; 95return; 96} 97if(!strcmp(option,"error")) { 98 ws_error_action = die_on_ws_error; 99return; 100} 101if(!strcmp(option,"error-all")) { 102 ws_error_action = die_on_ws_error; 103 squelch_whitespace_errors =0; 104return; 105} 106if(!strcmp(option,"strip") || !strcmp(option,"fix")) { 107 ws_error_action = correct_ws_error; 108return; 109} 110die(_("unrecognized whitespace option '%s'"), option); 111} 112 113static voidparse_ignorewhitespace_option(const char*option) 114{ 115if(!option || !strcmp(option,"no") || 116!strcmp(option,"false") || !strcmp(option,"never") || 117!strcmp(option,"none")) { 118 ws_ignore_action = ignore_ws_none; 119return; 120} 121if(!strcmp(option,"change")) { 122 ws_ignore_action = ignore_ws_change; 123return; 124} 125die(_("unrecognized whitespace ignore option '%s'"), option); 126} 127 128static voidset_default_whitespace_mode(const char*whitespace_option) 129{ 130if(!whitespace_option && !apply_default_whitespace) 131 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); 132} 133 134/* 135 * For "diff-stat" like behaviour, we keep track of the biggest change 136 * we've seen, and the longest filename. That allows us to do simple 137 * scaling. 138 */ 139static int max_change, max_len; 140 141/* 142 * Various "current state", notably line numbers and what 143 * file (and how) we're patching right now.. The "is_xxxx" 144 * things are flags, where -1 means "don't know yet". 145 */ 146static int linenr =1; 147 148/* 149 * This represents one "hunk" from a patch, starting with 150 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 151 * patch text is pointed at by patch, and its byte length 152 * is stored in size. leading and trailing are the number 153 * of context lines. 154 */ 155struct fragment { 156unsigned long leading, trailing; 157unsigned long oldpos, oldlines; 158unsigned long newpos, newlines; 159/* 160 * 'patch' is usually borrowed from buf in apply_patch(), 161 * but some codepaths store an allocated buffer. 162 */ 163const char*patch; 164unsigned free_patch:1, 165 rejected:1; 166int size; 167int linenr; 168struct fragment *next; 169}; 170 171/* 172 * When dealing with a binary patch, we reuse "leading" field 173 * to store the type of the binary hunk, either deflated "delta" 174 * or deflated "literal". 175 */ 176#define binary_patch_method leading 177#define BINARY_DELTA_DEFLATED 1 178#define BINARY_LITERAL_DEFLATED 2 179 180/* 181 * This represents a "patch" to a file, both metainfo changes 182 * such as creation/deletion, filemode and content changes represented 183 * as a series of fragments. 184 */ 185struct patch { 186char*new_name, *old_name, *def_name; 187unsigned int old_mode, new_mode; 188int is_new, is_delete;/* -1 = unknown, 0 = false, 1 = true */ 189int rejected; 190unsigned ws_rule; 191int lines_added, lines_deleted; 192int score; 193unsigned int is_toplevel_relative:1; 194unsigned int inaccurate_eof:1; 195unsigned int is_binary:1; 196unsigned int is_copy:1; 197unsigned int is_rename:1; 198unsigned int recount:1; 199unsigned int conflicted_threeway:1; 200unsigned int direct_to_threeway:1; 201struct fragment *fragments; 202char*result; 203size_t resultsize; 204char old_sha1_prefix[41]; 205char new_sha1_prefix[41]; 206struct patch *next; 207 208/* three-way fallback result */ 209unsigned char threeway_stage[3][20]; 210}; 211 212static voidfree_fragment_list(struct fragment *list) 213{ 214while(list) { 215struct fragment *next = list->next; 216if(list->free_patch) 217free((char*)list->patch); 218free(list); 219 list = next; 220} 221} 222 223static voidfree_patch(struct patch *patch) 224{ 225free_fragment_list(patch->fragments); 226free(patch->def_name); 227free(patch->old_name); 228free(patch->new_name); 229free(patch->result); 230free(patch); 231} 232 233static voidfree_patch_list(struct patch *list) 234{ 235while(list) { 236struct patch *next = list->next; 237free_patch(list); 238 list = next; 239} 240} 241 242/* 243 * A line in a file, len-bytes long (includes the terminating LF, 244 * except for an incomplete line at the end if the file ends with 245 * one), and its contents hashes to 'hash'. 246 */ 247struct line { 248size_t len; 249unsigned hash :24; 250unsigned flag :8; 251#define LINE_COMMON 1 252#define LINE_PATCHED 2 253}; 254 255/* 256 * This represents a "file", which is an array of "lines". 257 */ 258struct image { 259char*buf; 260size_t len; 261size_t nr; 262size_t alloc; 263struct line *line_allocated; 264struct line *line; 265}; 266 267/* 268 * Records filenames that have been touched, in order to handle 269 * the case where more than one patches touch the same file. 270 */ 271 272static struct string_list fn_table; 273 274static uint32_thash_line(const char*cp,size_t len) 275{ 276size_t i; 277uint32_t h; 278for(i =0, h =0; i < len; i++) { 279if(!isspace(cp[i])) { 280 h = h *3+ (cp[i] &0xff); 281} 282} 283return h; 284} 285 286/* 287 * Compare lines s1 of length n1 and s2 of length n2, ignoring 288 * whitespace difference. Returns 1 if they match, 0 otherwise 289 */ 290static intfuzzy_matchlines(const char*s1,size_t n1, 291const char*s2,size_t n2) 292{ 293const char*last1 = s1 + n1 -1; 294const char*last2 = s2 + n2 -1; 295int result =0; 296 297/* ignore line endings */ 298while((*last1 =='\r') || (*last1 =='\n')) 299 last1--; 300while((*last2 =='\r') || (*last2 =='\n')) 301 last2--; 302 303/* skip leading whitespace */ 304while(isspace(*s1) && (s1 <= last1)) 305 s1++; 306while(isspace(*s2) && (s2 <= last2)) 307 s2++; 308/* early return if both lines are empty */ 309if((s1 > last1) && (s2 > last2)) 310return1; 311while(!result) { 312 result = *s1++ - *s2++; 313/* 314 * Skip whitespace inside. We check for whitespace on 315 * both buffers because we don't want "a b" to match 316 * "ab" 317 */ 318if(isspace(*s1) &&isspace(*s2)) { 319while(isspace(*s1) && s1 <= last1) 320 s1++; 321while(isspace(*s2) && s2 <= last2) 322 s2++; 323} 324/* 325 * If we reached the end on one side only, 326 * lines don't match 327 */ 328if( 329((s2 > last2) && (s1 <= last1)) || 330((s1 > last1) && (s2 <= last2))) 331return0; 332if((s1 > last1) && (s2 > last2)) 333break; 334} 335 336return!result; 337} 338 339static voidadd_line_info(struct image *img,const char*bol,size_t len,unsigned flag) 340{ 341ALLOC_GROW(img->line_allocated, img->nr +1, img->alloc); 342 img->line_allocated[img->nr].len = len; 343 img->line_allocated[img->nr].hash =hash_line(bol, len); 344 img->line_allocated[img->nr].flag = flag; 345 img->nr++; 346} 347 348/* 349 * "buf" has the file contents to be patched (read from various sources). 350 * attach it to "image" and add line-based index to it. 351 * "image" now owns the "buf". 352 */ 353static voidprepare_image(struct image *image,char*buf,size_t len, 354int prepare_linetable) 355{ 356const char*cp, *ep; 357 358memset(image,0,sizeof(*image)); 359 image->buf = buf; 360 image->len = len; 361 362if(!prepare_linetable) 363return; 364 365 ep = image->buf + image->len; 366 cp = image->buf; 367while(cp < ep) { 368const char*next; 369for(next = cp; next < ep && *next !='\n'; next++) 370; 371if(next < ep) 372 next++; 373add_line_info(image, cp, next - cp,0); 374 cp = next; 375} 376 image->line = image->line_allocated; 377} 378 379static voidclear_image(struct image *image) 380{ 381free(image->buf); 382free(image->line_allocated); 383memset(image,0,sizeof(*image)); 384} 385 386/* fmt must contain _one_ %s and no other substitution */ 387static voidsay_patch_name(FILE*output,const char*fmt,struct patch *patch) 388{ 389struct strbuf sb = STRBUF_INIT; 390 391if(patch->old_name && patch->new_name && 392strcmp(patch->old_name, patch->new_name)) { 393quote_c_style(patch->old_name, &sb, NULL,0); 394strbuf_addstr(&sb," => "); 395quote_c_style(patch->new_name, &sb, NULL,0); 396}else{ 397const char*n = patch->new_name; 398if(!n) 399 n = patch->old_name; 400quote_c_style(n, &sb, NULL,0); 401} 402fprintf(output, fmt, sb.buf); 403fputc('\n', output); 404strbuf_release(&sb); 405} 406 407#define SLOP (16) 408 409static voidread_patch_file(struct strbuf *sb,int fd) 410{ 411if(strbuf_read(sb, fd,0) <0) 412die_errno("git apply: failed to read"); 413 414/* 415 * Make sure that we have some slop in the buffer 416 * so that we can do speculative "memcmp" etc, and 417 * see to it that it is NUL-filled. 418 */ 419strbuf_grow(sb, SLOP); 420memset(sb->buf + sb->len,0, SLOP); 421} 422 423static unsigned longlinelen(const char*buffer,unsigned long size) 424{ 425unsigned long len =0; 426while(size--) { 427 len++; 428if(*buffer++ =='\n') 429break; 430} 431return len; 432} 433 434static intis_dev_null(const char*str) 435{ 436return!memcmp("/dev/null", str,9) &&isspace(str[9]); 437} 438 439#define TERM_SPACE 1 440#define TERM_TAB 2 441 442static intname_terminate(const char*name,int namelen,int c,int terminate) 443{ 444if(c ==' '&& !(terminate & TERM_SPACE)) 445return0; 446if(c =='\t'&& !(terminate & TERM_TAB)) 447return0; 448 449return1; 450} 451 452/* remove double slashes to make --index work with such filenames */ 453static char*squash_slash(char*name) 454{ 455int i =0, j =0; 456 457if(!name) 458return NULL; 459 460while(name[i]) { 461if((name[j++] = name[i++]) =='/') 462while(name[i] =='/') 463 i++; 464} 465 name[j] ='\0'; 466return name; 467} 468 469static char*find_name_gnu(const char*line,const char*def,int p_value) 470{ 471struct strbuf name = STRBUF_INIT; 472char*cp; 473 474/* 475 * Proposed "new-style" GNU patch/diff format; see 476 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 477 */ 478if(unquote_c_style(&name, line, NULL)) { 479strbuf_release(&name); 480return NULL; 481} 482 483for(cp = name.buf; p_value; p_value--) { 484 cp =strchr(cp,'/'); 485if(!cp) { 486strbuf_release(&name); 487return NULL; 488} 489 cp++; 490} 491 492strbuf_remove(&name,0, cp - name.buf); 493if(root) 494strbuf_insert(&name,0, root, root_len); 495returnsquash_slash(strbuf_detach(&name, NULL)); 496} 497 498static size_tsane_tz_len(const char*line,size_t len) 499{ 500const char*tz, *p; 501 502if(len <strlen(" +0500") || line[len-strlen(" +0500")] !=' ') 503return0; 504 tz = line + len -strlen(" +0500"); 505 506if(tz[1] !='+'&& tz[1] !='-') 507return0; 508 509for(p = tz +2; p != line + len; p++) 510if(!isdigit(*p)) 511return0; 512 513return line + len - tz; 514} 515 516static size_ttz_with_colon_len(const char*line,size_t len) 517{ 518const char*tz, *p; 519 520if(len <strlen(" +08:00") || line[len -strlen(":00")] !=':') 521return0; 522 tz = line + len -strlen(" +08:00"); 523 524if(tz[0] !=' '|| (tz[1] !='+'&& tz[1] !='-')) 525return0; 526 p = tz +2; 527if(!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 528!isdigit(*p++) || !isdigit(*p++)) 529return0; 530 531return line + len - tz; 532} 533 534static size_tdate_len(const char*line,size_t len) 535{ 536const char*date, *p; 537 538if(len <strlen("72-02-05") || line[len-strlen("-05")] !='-') 539return0; 540 p = date = line + len -strlen("72-02-05"); 541 542if(!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 543!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 544!isdigit(*p++) || !isdigit(*p++))/* Not a date. */ 545return0; 546 547if(date - line >=strlen("19") && 548isdigit(date[-1]) &&isdigit(date[-2]))/* 4-digit year */ 549 date -=strlen("19"); 550 551return line + len - date; 552} 553 554static size_tshort_time_len(const char*line,size_t len) 555{ 556const char*time, *p; 557 558if(len <strlen(" 07:01:32") || line[len-strlen(":32")] !=':') 559return0; 560 p = time = line + len -strlen(" 07:01:32"); 561 562/* Permit 1-digit hours? */ 563if(*p++ !=' '|| 564!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 565!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 566!isdigit(*p++) || !isdigit(*p++))/* Not a time. */ 567return0; 568 569return line + len - time; 570} 571 572static size_tfractional_time_len(const char*line,size_t len) 573{ 574const char*p; 575size_t n; 576 577/* Expected format: 19:41:17.620000023 */ 578if(!len || !isdigit(line[len -1])) 579return0; 580 p = line + len -1; 581 582/* Fractional seconds. */ 583while(p > line &&isdigit(*p)) 584 p--; 585if(*p !='.') 586return0; 587 588/* Hours, minutes, and whole seconds. */ 589 n =short_time_len(line, p - line); 590if(!n) 591return0; 592 593return line + len - p + n; 594} 595 596static size_ttrailing_spaces_len(const char*line,size_t len) 597{ 598const char*p; 599 600/* Expected format: ' ' x (1 or more) */ 601if(!len || line[len -1] !=' ') 602return0; 603 604 p = line + len; 605while(p != line) { 606 p--; 607if(*p !=' ') 608return line + len - (p +1); 609} 610 611/* All spaces! */ 612return len; 613} 614 615static size_tdiff_timestamp_len(const char*line,size_t len) 616{ 617const char*end = line + len; 618size_t n; 619 620/* 621 * Posix: 2010-07-05 19:41:17 622 * GNU: 2010-07-05 19:41:17.620000023 -0500 623 */ 624 625if(!isdigit(end[-1])) 626return0; 627 628 n =sane_tz_len(line, end - line); 629if(!n) 630 n =tz_with_colon_len(line, end - line); 631 end -= n; 632 633 n =short_time_len(line, end - line); 634if(!n) 635 n =fractional_time_len(line, end - line); 636 end -= n; 637 638 n =date_len(line, end - line); 639if(!n)/* No date. Too bad. */ 640return0; 641 end -= n; 642 643if(end == line)/* No space before date. */ 644return0; 645if(end[-1] =='\t') {/* Success! */ 646 end--; 647return line + len - end; 648} 649if(end[-1] !=' ')/* No space before date. */ 650return0; 651 652/* Whitespace damage. */ 653 end -=trailing_spaces_len(line, end - line); 654return line + len - end; 655} 656 657static char*null_strdup(const char*s) 658{ 659return s ?xstrdup(s) : NULL; 660} 661 662static char*find_name_common(const char*line,const char*def, 663int p_value,const char*end,int terminate) 664{ 665int len; 666const char*start = NULL; 667 668if(p_value ==0) 669 start = line; 670while(line != end) { 671char c = *line; 672 673if(!end &&isspace(c)) { 674if(c =='\n') 675break; 676if(name_terminate(start, line-start, c, terminate)) 677break; 678} 679 line++; 680if(c =='/'&& !--p_value) 681 start = line; 682} 683if(!start) 684returnsquash_slash(null_strdup(def)); 685 len = line - start; 686if(!len) 687returnsquash_slash(null_strdup(def)); 688 689/* 690 * Generally we prefer the shorter name, especially 691 * if the other one is just a variation of that with 692 * something else tacked on to the end (ie "file.orig" 693 * or "file~"). 694 */ 695if(def) { 696int deflen =strlen(def); 697if(deflen < len && !strncmp(start, def, deflen)) 698returnsquash_slash(xstrdup(def)); 699} 700 701if(root) { 702char*ret =xmalloc(root_len + len +1); 703strcpy(ret, root); 704memcpy(ret + root_len, start, len); 705 ret[root_len + len] ='\0'; 706returnsquash_slash(ret); 707} 708 709returnsquash_slash(xmemdupz(start, len)); 710} 711 712static char*find_name(const char*line,char*def,int p_value,int terminate) 713{ 714if(*line =='"') { 715char*name =find_name_gnu(line, def, p_value); 716if(name) 717return name; 718} 719 720returnfind_name_common(line, def, p_value, NULL, terminate); 721} 722 723static char*find_name_traditional(const char*line,char*def,int p_value) 724{ 725size_t len =strlen(line); 726size_t date_len; 727 728if(*line =='"') { 729char*name =find_name_gnu(line, def, p_value); 730if(name) 731return name; 732} 733 734 len =strchrnul(line,'\n') - line; 735 date_len =diff_timestamp_len(line, len); 736if(!date_len) 737returnfind_name_common(line, def, p_value, NULL, TERM_TAB); 738 len -= date_len; 739 740returnfind_name_common(line, def, p_value, line + len,0); 741} 742 743static intcount_slashes(const char*cp) 744{ 745int cnt =0; 746char ch; 747 748while((ch = *cp++)) 749if(ch =='/') 750 cnt++; 751return cnt; 752} 753 754/* 755 * Given the string after "--- " or "+++ ", guess the appropriate 756 * p_value for the given patch. 757 */ 758static intguess_p_value(const char*nameline) 759{ 760char*name, *cp; 761int val = -1; 762 763if(is_dev_null(nameline)) 764return-1; 765 name =find_name_traditional(nameline, NULL,0); 766if(!name) 767return-1; 768 cp =strchr(name,'/'); 769if(!cp) 770 val =0; 771else if(prefix) { 772/* 773 * Does it begin with "a/$our-prefix" and such? Then this is 774 * very likely to apply to our directory. 775 */ 776if(!strncmp(name, prefix, prefix_length)) 777 val =count_slashes(prefix); 778else{ 779 cp++; 780if(!strncmp(cp, prefix, prefix_length)) 781 val =count_slashes(prefix) +1; 782} 783} 784free(name); 785return val; 786} 787 788/* 789 * Does the ---/+++ line has the POSIX timestamp after the last HT? 790 * GNU diff puts epoch there to signal a creation/deletion event. Is 791 * this such a timestamp? 792 */ 793static inthas_epoch_timestamp(const char*nameline) 794{ 795/* 796 * We are only interested in epoch timestamp; any non-zero 797 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 798 * For the same reason, the date must be either 1969-12-31 or 799 * 1970-01-01, and the seconds part must be "00". 800 */ 801const char stamp_regexp[] = 802"^(1969-12-31|1970-01-01)" 803" " 804"[0-2][0-9]:[0-5][0-9]:00(\\.0+)?" 805" " 806"([-+][0-2][0-9]:?[0-5][0-9])\n"; 807const char*timestamp = NULL, *cp, *colon; 808static regex_t *stamp; 809 regmatch_t m[10]; 810int zoneoffset; 811int hourminute; 812int status; 813 814for(cp = nameline; *cp !='\n'; cp++) { 815if(*cp =='\t') 816 timestamp = cp +1; 817} 818if(!timestamp) 819return0; 820if(!stamp) { 821 stamp =xmalloc(sizeof(*stamp)); 822if(regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 823warning(_("Cannot prepare timestamp regexp%s"), 824 stamp_regexp); 825return0; 826} 827} 828 829 status =regexec(stamp, timestamp,ARRAY_SIZE(m), m,0); 830if(status) { 831if(status != REG_NOMATCH) 832warning(_("regexec returned%dfor input:%s"), 833 status, timestamp); 834return0; 835} 836 837 zoneoffset =strtol(timestamp + m[3].rm_so +1, (char**) &colon,10); 838if(*colon ==':') 839 zoneoffset = zoneoffset *60+strtol(colon +1, NULL,10); 840else 841 zoneoffset = (zoneoffset /100) *60+ (zoneoffset %100); 842if(timestamp[m[3].rm_so] =='-') 843 zoneoffset = -zoneoffset; 844 845/* 846 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 847 * (west of GMT) or 1970-01-01 (east of GMT) 848 */ 849if((zoneoffset <0&&memcmp(timestamp,"1969-12-31",10)) || 850(0<= zoneoffset &&memcmp(timestamp,"1970-01-01",10))) 851return0; 852 853 hourminute = (strtol(timestamp +11, NULL,10) *60+ 854strtol(timestamp +14, NULL,10) - 855 zoneoffset); 856 857return((zoneoffset <0&& hourminute ==1440) || 858(0<= zoneoffset && !hourminute)); 859} 860 861/* 862 * Get the name etc info from the ---/+++ lines of a traditional patch header 863 * 864 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 865 * files, we can happily check the index for a match, but for creating a 866 * new file we should try to match whatever "patch" does. I have no idea. 867 */ 868static voidparse_traditional_patch(const char*first,const char*second,struct patch *patch) 869{ 870char*name; 871 872 first +=4;/* skip "--- " */ 873 second +=4;/* skip "+++ " */ 874if(!p_value_known) { 875int p, q; 876 p =guess_p_value(first); 877 q =guess_p_value(second); 878if(p <0) p = q; 879if(0<= p && p == q) { 880 p_value = p; 881 p_value_known =1; 882} 883} 884if(is_dev_null(first)) { 885 patch->is_new =1; 886 patch->is_delete =0; 887 name =find_name_traditional(second, NULL, p_value); 888 patch->new_name = name; 889}else if(is_dev_null(second)) { 890 patch->is_new =0; 891 patch->is_delete =1; 892 name =find_name_traditional(first, NULL, p_value); 893 patch->old_name = name; 894}else{ 895char*first_name; 896 first_name =find_name_traditional(first, NULL, p_value); 897 name =find_name_traditional(second, first_name, p_value); 898free(first_name); 899if(has_epoch_timestamp(first)) { 900 patch->is_new =1; 901 patch->is_delete =0; 902 patch->new_name = name; 903}else if(has_epoch_timestamp(second)) { 904 patch->is_new =0; 905 patch->is_delete =1; 906 patch->old_name = name; 907}else{ 908 patch->old_name = name; 909 patch->new_name =xstrdup(name); 910} 911} 912if(!name) 913die(_("unable to find filename in patch at line%d"), linenr); 914} 915 916static intgitdiff_hdrend(const char*line,struct patch *patch) 917{ 918return-1; 919} 920 921/* 922 * We're anal about diff header consistency, to make 923 * sure that we don't end up having strange ambiguous 924 * patches floating around. 925 * 926 * As a result, gitdiff_{old|new}name() will check 927 * their names against any previous information, just 928 * to make sure.. 929 */ 930#define DIFF_OLD_NAME 0 931#define DIFF_NEW_NAME 1 932 933static char*gitdiff_verify_name(const char*line,int isnull,char*orig_name,int side) 934{ 935if(!orig_name && !isnull) 936returnfind_name(line, NULL, p_value, TERM_TAB); 937 938if(orig_name) { 939int len; 940const char*name; 941char*another; 942 name = orig_name; 943 len =strlen(name); 944if(isnull) 945die(_("git apply: bad git-diff - expected /dev/null, got%son line%d"), name, linenr); 946 another =find_name(line, NULL, p_value, TERM_TAB); 947if(!another ||memcmp(another, name, len +1)) 948die((side == DIFF_NEW_NAME) ? 949_("git apply: bad git-diff - inconsistent new filename on line%d") : 950_("git apply: bad git-diff - inconsistent old filename on line%d"), linenr); 951free(another); 952return orig_name; 953} 954else{ 955/* expect "/dev/null" */ 956if(memcmp("/dev/null", line,9) || line[9] !='\n') 957die(_("git apply: bad git-diff - expected /dev/null on line%d"), linenr); 958return NULL; 959} 960} 961 962static intgitdiff_oldname(const char*line,struct patch *patch) 963{ 964char*orig = patch->old_name; 965 patch->old_name =gitdiff_verify_name(line, patch->is_new, patch->old_name, 966 DIFF_OLD_NAME); 967if(orig != patch->old_name) 968free(orig); 969return0; 970} 971 972static intgitdiff_newname(const char*line,struct patch *patch) 973{ 974char*orig = patch->new_name; 975 patch->new_name =gitdiff_verify_name(line, patch->is_delete, patch->new_name, 976 DIFF_NEW_NAME); 977if(orig != patch->new_name) 978free(orig); 979return0; 980} 981 982static intgitdiff_oldmode(const char*line,struct patch *patch) 983{ 984 patch->old_mode =strtoul(line, NULL,8); 985return0; 986} 987 988static intgitdiff_newmode(const char*line,struct patch *patch) 989{ 990 patch->new_mode =strtoul(line, NULL,8); 991return0; 992} 993 994static intgitdiff_delete(const char*line,struct patch *patch) 995{ 996 patch->is_delete =1; 997free(patch->old_name); 998 patch->old_name =null_strdup(patch->def_name); 999returngitdiff_oldmode(line, patch);1000}10011002static intgitdiff_newfile(const char*line,struct patch *patch)1003{1004 patch->is_new =1;1005free(patch->new_name);1006 patch->new_name =null_strdup(patch->def_name);1007returngitdiff_newmode(line, patch);1008}10091010static intgitdiff_copysrc(const char*line,struct patch *patch)1011{1012 patch->is_copy =1;1013free(patch->old_name);1014 patch->old_name =find_name(line, NULL, p_value ? p_value -1:0,0);1015return0;1016}10171018static intgitdiff_copydst(const char*line,struct patch *patch)1019{1020 patch->is_copy =1;1021free(patch->new_name);1022 patch->new_name =find_name(line, NULL, p_value ? p_value -1:0,0);1023return0;1024}10251026static intgitdiff_renamesrc(const char*line,struct patch *patch)1027{1028 patch->is_rename =1;1029free(patch->old_name);1030 patch->old_name =find_name(line, NULL, p_value ? p_value -1:0,0);1031return0;1032}10331034static intgitdiff_renamedst(const char*line,struct patch *patch)1035{1036 patch->is_rename =1;1037free(patch->new_name);1038 patch->new_name =find_name(line, NULL, p_value ? p_value -1:0,0);1039return0;1040}10411042static intgitdiff_similarity(const char*line,struct patch *patch)1043{1044unsigned long val =strtoul(line, NULL,10);1045if(val <=100)1046 patch->score = val;1047return0;1048}10491050static intgitdiff_dissimilarity(const char*line,struct patch *patch)1051{1052unsigned long val =strtoul(line, NULL,10);1053if(val <=100)1054 patch->score = val;1055return0;1056}10571058static intgitdiff_index(const char*line,struct patch *patch)1059{1060/*1061 * index line is N hexadecimal, "..", N hexadecimal,1062 * and optional space with octal mode.1063 */1064const char*ptr, *eol;1065int len;10661067 ptr =strchr(line,'.');1068if(!ptr || ptr[1] !='.'||40< ptr - line)1069return0;1070 len = ptr - line;1071memcpy(patch->old_sha1_prefix, line, len);1072 patch->old_sha1_prefix[len] =0;10731074 line = ptr +2;1075 ptr =strchr(line,' ');1076 eol =strchr(line,'\n');10771078if(!ptr || eol < ptr)1079 ptr = eol;1080 len = ptr - line;10811082if(40< len)1083return0;1084memcpy(patch->new_sha1_prefix, line, len);1085 patch->new_sha1_prefix[len] =0;1086if(*ptr ==' ')1087 patch->old_mode =strtoul(ptr+1, NULL,8);1088return0;1089}10901091/*1092 * This is normal for a diff that doesn't change anything: we'll fall through1093 * into the next diff. Tell the parser to break out.1094 */1095static intgitdiff_unrecognized(const char*line,struct patch *patch)1096{1097return-1;1098}10991100/*1101 * Skip p_value leading components from "line"; as we do not accept1102 * absolute paths, return NULL in that case.1103 */1104static const char*skip_tree_prefix(const char*line,int llen)1105{1106int nslash;1107int i;11081109if(!p_value)1110return(llen && line[0] =='/') ? NULL : line;11111112 nslash = p_value;1113for(i =0; i < llen; i++) {1114int ch = line[i];1115if(ch =='/'&& --nslash <=0)1116return(i ==0) ? NULL : &line[i +1];1117}1118return NULL;1119}11201121/*1122 * This is to extract the same name that appears on "diff --git"1123 * line. We do not find and return anything if it is a rename1124 * patch, and it is OK because we will find the name elsewhere.1125 * We need to reliably find name only when it is mode-change only,1126 * creation or deletion of an empty file. In any of these cases,1127 * both sides are the same name under a/ and b/ respectively.1128 */1129static char*git_header_name(const char*line,int llen)1130{1131const char*name;1132const char*second = NULL;1133size_t len, line_len;11341135 line +=strlen("diff --git ");1136 llen -=strlen("diff --git ");11371138if(*line =='"') {1139const char*cp;1140struct strbuf first = STRBUF_INIT;1141struct strbuf sp = STRBUF_INIT;11421143if(unquote_c_style(&first, line, &second))1144goto free_and_fail1;11451146/* strip the a/b prefix including trailing slash */1147 cp =skip_tree_prefix(first.buf, first.len);1148if(!cp)1149goto free_and_fail1;1150strbuf_remove(&first,0, cp - first.buf);11511152/*1153 * second points at one past closing dq of name.1154 * find the second name.1155 */1156while((second < line + llen) &&isspace(*second))1157 second++;11581159if(line + llen <= second)1160goto free_and_fail1;1161if(*second =='"') {1162if(unquote_c_style(&sp, second, NULL))1163goto free_and_fail1;1164 cp =skip_tree_prefix(sp.buf, sp.len);1165if(!cp)1166goto free_and_fail1;1167/* They must match, otherwise ignore */1168if(strcmp(cp, first.buf))1169goto free_and_fail1;1170strbuf_release(&sp);1171returnstrbuf_detach(&first, NULL);1172}11731174/* unquoted second */1175 cp =skip_tree_prefix(second, line + llen - second);1176if(!cp)1177goto free_and_fail1;1178if(line + llen - cp != first.len ||1179memcmp(first.buf, cp, first.len))1180goto free_and_fail1;1181returnstrbuf_detach(&first, NULL);11821183 free_and_fail1:1184strbuf_release(&first);1185strbuf_release(&sp);1186return NULL;1187}11881189/* unquoted first name */1190 name =skip_tree_prefix(line, llen);1191if(!name)1192return NULL;11931194/*1195 * since the first name is unquoted, a dq if exists must be1196 * the beginning of the second name.1197 */1198for(second = name; second < line + llen; second++) {1199if(*second =='"') {1200struct strbuf sp = STRBUF_INIT;1201const char*np;12021203if(unquote_c_style(&sp, second, NULL))1204goto free_and_fail2;12051206 np =skip_tree_prefix(sp.buf, sp.len);1207if(!np)1208goto free_and_fail2;12091210 len = sp.buf + sp.len - np;1211if(len < second - name &&1212!strncmp(np, name, len) &&1213isspace(name[len])) {1214/* Good */1215strbuf_remove(&sp,0, np - sp.buf);1216returnstrbuf_detach(&sp, NULL);1217}12181219 free_and_fail2:1220strbuf_release(&sp);1221return NULL;1222}1223}12241225/*1226 * Accept a name only if it shows up twice, exactly the same1227 * form.1228 */1229 second =strchr(name,'\n');1230if(!second)1231return NULL;1232 line_len = second - name;1233for(len =0; ; len++) {1234switch(name[len]) {1235default:1236continue;1237case'\n':1238return NULL;1239case'\t':case' ':1240/*1241 * Is this the separator between the preimage1242 * and the postimage pathname? Again, we are1243 * only interested in the case where there is1244 * no rename, as this is only to set def_name1245 * and a rename patch has the names elsewhere1246 * in an unambiguous form.1247 */1248if(!name[len +1])1249return NULL;/* no postimage name */1250 second =skip_tree_prefix(name + len +1,1251 line_len - (len +1));1252if(!second)1253return NULL;1254/*1255 * Does len bytes starting at "name" and "second"1256 * (that are separated by one HT or SP we just1257 * found) exactly match?1258 */1259if(second[len] =='\n'&& !strncmp(name, second, len))1260returnxmemdupz(name, len);1261}1262}1263}12641265/* Verify that we recognize the lines following a git header */1266static intparse_git_header(const char*line,int len,unsigned int size,struct patch *patch)1267{1268unsigned long offset;12691270/* A git diff has explicit new/delete information, so we don't guess */1271 patch->is_new =0;1272 patch->is_delete =0;12731274/*1275 * Some things may not have the old name in the1276 * rest of the headers anywhere (pure mode changes,1277 * or removing or adding empty files), so we get1278 * the default name from the header.1279 */1280 patch->def_name =git_header_name(line, len);1281if(patch->def_name && root) {1282char*s =xmalloc(root_len +strlen(patch->def_name) +1);1283strcpy(s, root);1284strcpy(s + root_len, patch->def_name);1285free(patch->def_name);1286 patch->def_name = s;1287}12881289 line += len;1290 size -= len;1291 linenr++;1292for(offset = len ; size >0; offset += len, size -= len, line += len, linenr++) {1293static const struct opentry {1294const char*str;1295int(*fn)(const char*,struct patch *);1296} optable[] = {1297{"@@ -", gitdiff_hdrend },1298{"--- ", gitdiff_oldname },1299{"+++ ", gitdiff_newname },1300{"old mode ", gitdiff_oldmode },1301{"new mode ", gitdiff_newmode },1302{"deleted file mode ", gitdiff_delete },1303{"new file mode ", gitdiff_newfile },1304{"copy from ", gitdiff_copysrc },1305{"copy to ", gitdiff_copydst },1306{"rename old ", gitdiff_renamesrc },1307{"rename new ", gitdiff_renamedst },1308{"rename from ", gitdiff_renamesrc },1309{"rename to ", gitdiff_renamedst },1310{"similarity index ", gitdiff_similarity },1311{"dissimilarity index ", gitdiff_dissimilarity },1312{"index ", gitdiff_index },1313{"", gitdiff_unrecognized },1314};1315int i;13161317 len =linelen(line, size);1318if(!len || line[len-1] !='\n')1319break;1320for(i =0; i <ARRAY_SIZE(optable); i++) {1321const struct opentry *p = optable + i;1322int oplen =strlen(p->str);1323if(len < oplen ||memcmp(p->str, line, oplen))1324continue;1325if(p->fn(line + oplen, patch) <0)1326return offset;1327break;1328}1329}13301331return offset;1332}13331334static intparse_num(const char*line,unsigned long*p)1335{1336char*ptr;13371338if(!isdigit(*line))1339return0;1340*p =strtoul(line, &ptr,10);1341return ptr - line;1342}13431344static intparse_range(const char*line,int len,int offset,const char*expect,1345unsigned long*p1,unsigned long*p2)1346{1347int digits, ex;13481349if(offset <0|| offset >= len)1350return-1;1351 line += offset;1352 len -= offset;13531354 digits =parse_num(line, p1);1355if(!digits)1356return-1;13571358 offset += digits;1359 line += digits;1360 len -= digits;13611362*p2 =1;1363if(*line ==',') {1364 digits =parse_num(line+1, p2);1365if(!digits)1366return-1;13671368 offset += digits+1;1369 line += digits+1;1370 len -= digits+1;1371}13721373 ex =strlen(expect);1374if(ex > len)1375return-1;1376if(memcmp(line, expect, ex))1377return-1;13781379return offset + ex;1380}13811382static voidrecount_diff(const char*line,int size,struct fragment *fragment)1383{1384int oldlines =0, newlines =0, ret =0;13851386if(size <1) {1387warning("recount: ignore empty hunk");1388return;1389}13901391for(;;) {1392int len =linelen(line, size);1393 size -= len;1394 line += len;13951396if(size <1)1397break;13981399switch(*line) {1400case' ':case'\n':1401 newlines++;1402/* fall through */1403case'-':1404 oldlines++;1405continue;1406case'+':1407 newlines++;1408continue;1409case'\\':1410continue;1411case'@':1412 ret = size <3||prefixcmp(line,"@@ ");1413break;1414case'd':1415 ret = size <5||prefixcmp(line,"diff ");1416break;1417default:1418 ret = -1;1419break;1420}1421if(ret) {1422warning(_("recount: unexpected line: %.*s"),1423(int)linelen(line, size), line);1424return;1425}1426break;1427}1428 fragment->oldlines = oldlines;1429 fragment->newlines = newlines;1430}14311432/*1433 * Parse a unified diff fragment header of the1434 * form "@@ -a,b +c,d @@"1435 */1436static intparse_fragment_header(const char*line,int len,struct fragment *fragment)1437{1438int offset;14391440if(!len || line[len-1] !='\n')1441return-1;14421443/* Figure out the number of lines in a fragment */1444 offset =parse_range(line, len,4," +", &fragment->oldpos, &fragment->oldlines);1445 offset =parse_range(line, len, offset," @@", &fragment->newpos, &fragment->newlines);14461447return offset;1448}14491450static intfind_header(const char*line,unsigned long size,int*hdrsize,struct patch *patch)1451{1452unsigned long offset, len;14531454 patch->is_toplevel_relative =0;1455 patch->is_rename = patch->is_copy =0;1456 patch->is_new = patch->is_delete = -1;1457 patch->old_mode = patch->new_mode =0;1458 patch->old_name = patch->new_name = NULL;1459for(offset =0; size >0; offset += len, size -= len, line += len, linenr++) {1460unsigned long nextlen;14611462 len =linelen(line, size);1463if(!len)1464break;14651466/* Testing this early allows us to take a few shortcuts.. */1467if(len <6)1468continue;14691470/*1471 * Make sure we don't find any unconnected patch fragments.1472 * That's a sign that we didn't find a header, and that a1473 * patch has become corrupted/broken up.1474 */1475if(!memcmp("@@ -", line,4)) {1476struct fragment dummy;1477if(parse_fragment_header(line, len, &dummy) <0)1478continue;1479die(_("patch fragment without header at line%d: %.*s"),1480 linenr, (int)len-1, line);1481}14821483if(size < len +6)1484break;14851486/*1487 * Git patch? It might not have a real patch, just a rename1488 * or mode change, so we handle that specially1489 */1490if(!memcmp("diff --git ", line,11)) {1491int git_hdr_len =parse_git_header(line, len, size, patch);1492if(git_hdr_len <= len)1493continue;1494if(!patch->old_name && !patch->new_name) {1495if(!patch->def_name)1496die(Q_("git diff header lacks filename information when removing "1497"%dleading pathname component (line%d)",1498"git diff header lacks filename information when removing "1499"%dleading pathname components (line%d)",1500 p_value),1501 p_value, linenr);1502 patch->old_name =xstrdup(patch->def_name);1503 patch->new_name =xstrdup(patch->def_name);1504}1505if(!patch->is_delete && !patch->new_name)1506die("git diff header lacks filename information "1507"(line%d)", linenr);1508 patch->is_toplevel_relative =1;1509*hdrsize = git_hdr_len;1510return offset;1511}15121513/* --- followed by +++ ? */1514if(memcmp("--- ", line,4) ||memcmp("+++ ", line + len,4))1515continue;15161517/*1518 * We only accept unified patches, so we want it to1519 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1520 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1521 */1522 nextlen =linelen(line + len, size - len);1523if(size < nextlen +14||memcmp("@@ -", line + len + nextlen,4))1524continue;15251526/* Ok, we'll consider it a patch */1527parse_traditional_patch(line, line+len, patch);1528*hdrsize = len + nextlen;1529 linenr +=2;1530return offset;1531}1532return-1;1533}15341535static voidrecord_ws_error(unsigned result,const char*line,int len,int linenr)1536{1537char*err;15381539if(!result)1540return;15411542 whitespace_error++;1543if(squelch_whitespace_errors &&1544 squelch_whitespace_errors < whitespace_error)1545return;15461547 err =whitespace_error_string(result);1548fprintf(stderr,"%s:%d:%s.\n%.*s\n",1549 patch_input_file, linenr, err, len, line);1550free(err);1551}15521553static voidcheck_whitespace(const char*line,int len,unsigned ws_rule)1554{1555unsigned result =ws_check(line +1, len -1, ws_rule);15561557record_ws_error(result, line +1, len -2, linenr);1558}15591560/*1561 * Parse a unified diff. Note that this really needs to parse each1562 * fragment separately, since the only way to know the difference1563 * between a "---" that is part of a patch, and a "---" that starts1564 * the next patch is to look at the line counts..1565 */1566static intparse_fragment(const char*line,unsigned long size,1567struct patch *patch,struct fragment *fragment)1568{1569int added, deleted;1570int len =linelen(line, size), offset;1571unsigned long oldlines, newlines;1572unsigned long leading, trailing;15731574 offset =parse_fragment_header(line, len, fragment);1575if(offset <0)1576return-1;1577if(offset >0&& patch->recount)1578recount_diff(line + offset, size - offset, fragment);1579 oldlines = fragment->oldlines;1580 newlines = fragment->newlines;1581 leading =0;1582 trailing =0;15831584/* Parse the thing.. */1585 line += len;1586 size -= len;1587 linenr++;1588 added = deleted =0;1589for(offset = len;15900< size;1591 offset += len, size -= len, line += len, linenr++) {1592if(!oldlines && !newlines)1593break;1594 len =linelen(line, size);1595if(!len || line[len-1] !='\n')1596return-1;1597switch(*line) {1598default:1599return-1;1600case'\n':/* newer GNU diff, an empty context line */1601case' ':1602 oldlines--;1603 newlines--;1604if(!deleted && !added)1605 leading++;1606 trailing++;1607break;1608case'-':1609if(apply_in_reverse &&1610 ws_error_action != nowarn_ws_error)1611check_whitespace(line, len, patch->ws_rule);1612 deleted++;1613 oldlines--;1614 trailing =0;1615break;1616case'+':1617if(!apply_in_reverse &&1618 ws_error_action != nowarn_ws_error)1619check_whitespace(line, len, patch->ws_rule);1620 added++;1621 newlines--;1622 trailing =0;1623break;16241625/*1626 * We allow "\ No newline at end of file". Depending1627 * on locale settings when the patch was produced we1628 * don't know what this line looks like. The only1629 * thing we do know is that it begins with "\ ".1630 * Checking for 12 is just for sanity check -- any1631 * l10n of "\ No newline..." is at least that long.1632 */1633case'\\':1634if(len <12||memcmp(line,"\\",2))1635return-1;1636break;1637}1638}1639if(oldlines || newlines)1640return-1;1641 fragment->leading = leading;1642 fragment->trailing = trailing;16431644/*1645 * If a fragment ends with an incomplete line, we failed to include1646 * it in the above loop because we hit oldlines == newlines == 01647 * before seeing it.1648 */1649if(12< size && !memcmp(line,"\\",2))1650 offset +=linelen(line, size);16511652 patch->lines_added += added;1653 patch->lines_deleted += deleted;16541655if(0< patch->is_new && oldlines)1656returnerror(_("new file depends on old contents"));1657if(0< patch->is_delete && newlines)1658returnerror(_("deleted file still has contents"));1659return offset;1660}16611662/*1663 * We have seen "diff --git a/... b/..." header (or a traditional patch1664 * header). Read hunks that belong to this patch into fragments and hang1665 * them to the given patch structure.1666 *1667 * The (fragment->patch, fragment->size) pair points into the memory given1668 * by the caller, not a copy, when we return.1669 */1670static intparse_single_patch(const char*line,unsigned long size,struct patch *patch)1671{1672unsigned long offset =0;1673unsigned long oldlines =0, newlines =0, context =0;1674struct fragment **fragp = &patch->fragments;16751676while(size >4&& !memcmp(line,"@@ -",4)) {1677struct fragment *fragment;1678int len;16791680 fragment =xcalloc(1,sizeof(*fragment));1681 fragment->linenr = linenr;1682 len =parse_fragment(line, size, patch, fragment);1683if(len <=0)1684die(_("corrupt patch at line%d"), linenr);1685 fragment->patch = line;1686 fragment->size = len;1687 oldlines += fragment->oldlines;1688 newlines += fragment->newlines;1689 context += fragment->leading + fragment->trailing;16901691*fragp = fragment;1692 fragp = &fragment->next;16931694 offset += len;1695 line += len;1696 size -= len;1697}16981699/*1700 * If something was removed (i.e. we have old-lines) it cannot1701 * be creation, and if something was added it cannot be1702 * deletion. However, the reverse is not true; --unified=01703 * patches that only add are not necessarily creation even1704 * though they do not have any old lines, and ones that only1705 * delete are not necessarily deletion.1706 *1707 * Unfortunately, a real creation/deletion patch do _not_ have1708 * any context line by definition, so we cannot safely tell it1709 * apart with --unified=0 insanity. At least if the patch has1710 * more than one hunk it is not creation or deletion.1711 */1712if(patch->is_new <0&&1713(oldlines || (patch->fragments && patch->fragments->next)))1714 patch->is_new =0;1715if(patch->is_delete <0&&1716(newlines || (patch->fragments && patch->fragments->next)))1717 patch->is_delete =0;17181719if(0< patch->is_new && oldlines)1720die(_("new file%sdepends on old contents"), patch->new_name);1721if(0< patch->is_delete && newlines)1722die(_("deleted file%sstill has contents"), patch->old_name);1723if(!patch->is_delete && !newlines && context)1724fprintf_ln(stderr,1725_("** warning: "1726"file%sbecomes empty but is not deleted"),1727 patch->new_name);17281729return offset;1730}17311732staticinlineintmetadata_changes(struct patch *patch)1733{1734return patch->is_rename >0||1735 patch->is_copy >0||1736 patch->is_new >0||1737 patch->is_delete ||1738(patch->old_mode && patch->new_mode &&1739 patch->old_mode != patch->new_mode);1740}17411742static char*inflate_it(const void*data,unsigned long size,1743unsigned long inflated_size)1744{1745 git_zstream stream;1746void*out;1747int st;17481749memset(&stream,0,sizeof(stream));17501751 stream.next_in = (unsigned char*)data;1752 stream.avail_in = size;1753 stream.next_out = out =xmalloc(inflated_size);1754 stream.avail_out = inflated_size;1755git_inflate_init(&stream);1756 st =git_inflate(&stream, Z_FINISH);1757git_inflate_end(&stream);1758if((st != Z_STREAM_END) || stream.total_out != inflated_size) {1759free(out);1760return NULL;1761}1762return out;1763}17641765/*1766 * Read a binary hunk and return a new fragment; fragment->patch1767 * points at an allocated memory that the caller must free, so1768 * it is marked as "->free_patch = 1".1769 */1770static struct fragment *parse_binary_hunk(char**buf_p,1771unsigned long*sz_p,1772int*status_p,1773int*used_p)1774{1775/*1776 * Expect a line that begins with binary patch method ("literal"1777 * or "delta"), followed by the length of data before deflating.1778 * a sequence of 'length-byte' followed by base-85 encoded data1779 * should follow, terminated by a newline.1780 *1781 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1782 * and we would limit the patch line to 66 characters,1783 * so one line can fit up to 13 groups that would decode1784 * to 52 bytes max. The length byte 'A'-'Z' corresponds1785 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1786 */1787int llen, used;1788unsigned long size = *sz_p;1789char*buffer = *buf_p;1790int patch_method;1791unsigned long origlen;1792char*data = NULL;1793int hunk_size =0;1794struct fragment *frag;17951796 llen =linelen(buffer, size);1797 used = llen;17981799*status_p =0;18001801if(!prefixcmp(buffer,"delta ")) {1802 patch_method = BINARY_DELTA_DEFLATED;1803 origlen =strtoul(buffer +6, NULL,10);1804}1805else if(!prefixcmp(buffer,"literal ")) {1806 patch_method = BINARY_LITERAL_DEFLATED;1807 origlen =strtoul(buffer +8, NULL,10);1808}1809else1810return NULL;18111812 linenr++;1813 buffer += llen;1814while(1) {1815int byte_length, max_byte_length, newsize;1816 llen =linelen(buffer, size);1817 used += llen;1818 linenr++;1819if(llen ==1) {1820/* consume the blank line */1821 buffer++;1822 size--;1823break;1824}1825/*1826 * Minimum line is "A00000\n" which is 7-byte long,1827 * and the line length must be multiple of 5 plus 2.1828 */1829if((llen <7) || (llen-2) %5)1830goto corrupt;1831 max_byte_length = (llen -2) /5*4;1832 byte_length = *buffer;1833if('A'<= byte_length && byte_length <='Z')1834 byte_length = byte_length -'A'+1;1835else if('a'<= byte_length && byte_length <='z')1836 byte_length = byte_length -'a'+27;1837else1838goto corrupt;1839/* if the input length was not multiple of 4, we would1840 * have filler at the end but the filler should never1841 * exceed 3 bytes1842 */1843if(max_byte_length < byte_length ||1844 byte_length <= max_byte_length -4)1845goto corrupt;1846 newsize = hunk_size + byte_length;1847 data =xrealloc(data, newsize);1848if(decode_85(data + hunk_size, buffer +1, byte_length))1849goto corrupt;1850 hunk_size = newsize;1851 buffer += llen;1852 size -= llen;1853}18541855 frag =xcalloc(1,sizeof(*frag));1856 frag->patch =inflate_it(data, hunk_size, origlen);1857 frag->free_patch =1;1858if(!frag->patch)1859goto corrupt;1860free(data);1861 frag->size = origlen;1862*buf_p = buffer;1863*sz_p = size;1864*used_p = used;1865 frag->binary_patch_method = patch_method;1866return frag;18671868 corrupt:1869free(data);1870*status_p = -1;1871error(_("corrupt binary patch at line%d: %.*s"),1872 linenr-1, llen-1, buffer);1873return NULL;1874}18751876static intparse_binary(char*buffer,unsigned long size,struct patch *patch)1877{1878/*1879 * We have read "GIT binary patch\n"; what follows is a line1880 * that says the patch method (currently, either "literal" or1881 * "delta") and the length of data before deflating; a1882 * sequence of 'length-byte' followed by base-85 encoded data1883 * follows.1884 *1885 * When a binary patch is reversible, there is another binary1886 * hunk in the same format, starting with patch method (either1887 * "literal" or "delta") with the length of data, and a sequence1888 * of length-byte + base-85 encoded data, terminated with another1889 * empty line. This data, when applied to the postimage, produces1890 * the preimage.1891 */1892struct fragment *forward;1893struct fragment *reverse;1894int status;1895int used, used_1;18961897 forward =parse_binary_hunk(&buffer, &size, &status, &used);1898if(!forward && !status)1899/* there has to be one hunk (forward hunk) */1900returnerror(_("unrecognized binary patch at line%d"), linenr-1);1901if(status)1902/* otherwise we already gave an error message */1903return status;19041905 reverse =parse_binary_hunk(&buffer, &size, &status, &used_1);1906if(reverse)1907 used += used_1;1908else if(status) {1909/*1910 * Not having reverse hunk is not an error, but having1911 * a corrupt reverse hunk is.1912 */1913free((void*) forward->patch);1914free(forward);1915return status;1916}1917 forward->next = reverse;1918 patch->fragments = forward;1919 patch->is_binary =1;1920return used;1921}19221923/*1924 * Read the patch text in "buffer" taht extends for "size" bytes; stop1925 * reading after seeing a single patch (i.e. changes to a single file).1926 * Create fragments (i.e. patch hunks) and hang them to the given patch.1927 * Return the number of bytes consumed, so that the caller can call us1928 * again for the next patch.1929 */1930static intparse_chunk(char*buffer,unsigned long size,struct patch *patch)1931{1932int hdrsize, patchsize;1933int offset =find_header(buffer, size, &hdrsize, patch);19341935if(offset <0)1936return offset;19371938 patch->ws_rule =whitespace_rule(patch->new_name1939? patch->new_name1940: patch->old_name);19411942 patchsize =parse_single_patch(buffer + offset + hdrsize,1943 size - offset - hdrsize, patch);19441945if(!patchsize) {1946static const char*binhdr[] = {1947"Binary files ",1948"Files ",1949 NULL,1950};1951static const char git_binary[] ="GIT binary patch\n";1952int i;1953int hd = hdrsize + offset;1954unsigned long llen =linelen(buffer + hd, size - hd);19551956if(llen ==sizeof(git_binary) -1&&1957!memcmp(git_binary, buffer + hd, llen)) {1958int used;1959 linenr++;1960 used =parse_binary(buffer + hd + llen,1961 size - hd - llen, patch);1962if(used)1963 patchsize = used + llen;1964else1965 patchsize =0;1966}1967else if(!memcmp(" differ\n", buffer + hd + llen -8,8)) {1968for(i =0; binhdr[i]; i++) {1969int len =strlen(binhdr[i]);1970if(len < size - hd &&1971!memcmp(binhdr[i], buffer + hd, len)) {1972 linenr++;1973 patch->is_binary =1;1974 patchsize = llen;1975break;1976}1977}1978}19791980/* Empty patch cannot be applied if it is a text patch1981 * without metadata change. A binary patch appears1982 * empty to us here.1983 */1984if((apply || check) &&1985(!patch->is_binary && !metadata_changes(patch)))1986die(_("patch with only garbage at line%d"), linenr);1987}19881989return offset + hdrsize + patchsize;1990}19911992#define swap(a,b) myswap((a),(b),sizeof(a))19931994#define myswap(a, b, size) do { \1995 unsigned char mytmp[size]; \1996 memcpy(mytmp, &a, size); \1997 memcpy(&a, &b, size); \1998 memcpy(&b, mytmp, size); \1999} while (0)20002001static voidreverse_patches(struct patch *p)2002{2003for(; p; p = p->next) {2004struct fragment *frag = p->fragments;20052006swap(p->new_name, p->old_name);2007swap(p->new_mode, p->old_mode);2008swap(p->is_new, p->is_delete);2009swap(p->lines_added, p->lines_deleted);2010swap(p->old_sha1_prefix, p->new_sha1_prefix);20112012for(; frag; frag = frag->next) {2013swap(frag->newpos, frag->oldpos);2014swap(frag->newlines, frag->oldlines);2015}2016}2017}20182019static const char pluses[] =2020"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2021static const char minuses[]=2022"----------------------------------------------------------------------";20232024static voidshow_stats(struct patch *patch)2025{2026struct strbuf qname = STRBUF_INIT;2027char*cp = patch->new_name ? patch->new_name : patch->old_name;2028int max, add, del;20292030quote_c_style(cp, &qname, NULL,0);20312032/*2033 * "scale" the filename2034 */2035 max = max_len;2036if(max >50)2037 max =50;20382039if(qname.len > max) {2040 cp =strchr(qname.buf + qname.len +3- max,'/');2041if(!cp)2042 cp = qname.buf + qname.len +3- max;2043strbuf_splice(&qname,0, cp - qname.buf,"...",3);2044}20452046if(patch->is_binary) {2047printf(" %-*s | Bin\n", max, qname.buf);2048strbuf_release(&qname);2049return;2050}20512052printf(" %-*s |", max, qname.buf);2053strbuf_release(&qname);20542055/*2056 * scale the add/delete2057 */2058 max = max + max_change >70?70- max : max_change;2059 add = patch->lines_added;2060 del = patch->lines_deleted;20612062if(max_change >0) {2063int total = ((add + del) * max + max_change /2) / max_change;2064 add = (add * max + max_change /2) / max_change;2065 del = total - add;2066}2067printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2068 add, pluses, del, minuses);2069}20702071static intread_old_data(struct stat *st,const char*path,struct strbuf *buf)2072{2073switch(st->st_mode & S_IFMT) {2074case S_IFLNK:2075if(strbuf_readlink(buf, path, st->st_size) <0)2076returnerror(_("unable to read symlink%s"), path);2077return0;2078case S_IFREG:2079if(strbuf_read_file(buf, path, st->st_size) != st->st_size)2080returnerror(_("unable to open or read%s"), path);2081convert_to_git(path, buf->buf, buf->len, buf,0);2082return0;2083default:2084return-1;2085}2086}20872088/*2089 * Update the preimage, and the common lines in postimage,2090 * from buffer buf of length len. If postlen is 0 the postimage2091 * is updated in place, otherwise it's updated on a new buffer2092 * of length postlen2093 */20942095static voidupdate_pre_post_images(struct image *preimage,2096struct image *postimage,2097char*buf,2098size_t len,size_t postlen)2099{2100int i, ctx;2101char*new, *old, *fixed;2102struct image fixed_preimage;21032104/*2105 * Update the preimage with whitespace fixes. Note that we2106 * are not losing preimage->buf -- apply_one_fragment() will2107 * free "oldlines".2108 */2109prepare_image(&fixed_preimage, buf, len,1);2110assert(fixed_preimage.nr == preimage->nr);2111for(i =0; i < preimage->nr; i++)2112 fixed_preimage.line[i].flag = preimage->line[i].flag;2113free(preimage->line_allocated);2114*preimage = fixed_preimage;21152116/*2117 * Adjust the common context lines in postimage. This can be2118 * done in-place when we are just doing whitespace fixing,2119 * which does not make the string grow, but needs a new buffer2120 * when ignoring whitespace causes the update, since in this case2121 * we could have e.g. tabs converted to multiple spaces.2122 * We trust the caller to tell us if the update can be done2123 * in place (postlen==0) or not.2124 */2125 old = postimage->buf;2126if(postlen)2127new= postimage->buf =xmalloc(postlen);2128else2129new= old;2130 fixed = preimage->buf;2131for(i = ctx =0; i < postimage->nr; i++) {2132size_t len = postimage->line[i].len;2133if(!(postimage->line[i].flag & LINE_COMMON)) {2134/* an added line -- no counterparts in preimage */2135memmove(new, old, len);2136 old += len;2137new+= len;2138continue;2139}21402141/* a common context -- skip it in the original postimage */2142 old += len;21432144/* and find the corresponding one in the fixed preimage */2145while(ctx < preimage->nr &&2146!(preimage->line[ctx].flag & LINE_COMMON)) {2147 fixed += preimage->line[ctx].len;2148 ctx++;2149}2150if(preimage->nr <= ctx)2151die(_("oops"));21522153/* and copy it in, while fixing the line length */2154 len = preimage->line[ctx].len;2155memcpy(new, fixed, len);2156new+= len;2157 fixed += len;2158 postimage->line[i].len = len;2159 ctx++;2160}21612162/* Fix the length of the whole thing */2163 postimage->len =new- postimage->buf;2164}21652166static intmatch_fragment(struct image *img,2167struct image *preimage,2168struct image *postimage,2169unsigned longtry,2170int try_lno,2171unsigned ws_rule,2172int match_beginning,int match_end)2173{2174int i;2175char*fixed_buf, *buf, *orig, *target;2176struct strbuf fixed;2177size_t fixed_len;2178int preimage_limit;21792180if(preimage->nr + try_lno <= img->nr) {2181/*2182 * The hunk falls within the boundaries of img.2183 */2184 preimage_limit = preimage->nr;2185if(match_end && (preimage->nr + try_lno != img->nr))2186return0;2187}else if(ws_error_action == correct_ws_error &&2188(ws_rule & WS_BLANK_AT_EOF)) {2189/*2190 * This hunk extends beyond the end of img, and we are2191 * removing blank lines at the end of the file. This2192 * many lines from the beginning of the preimage must2193 * match with img, and the remainder of the preimage2194 * must be blank.2195 */2196 preimage_limit = img->nr - try_lno;2197}else{2198/*2199 * The hunk extends beyond the end of the img and2200 * we are not removing blanks at the end, so we2201 * should reject the hunk at this position.2202 */2203return0;2204}22052206if(match_beginning && try_lno)2207return0;22082209/* Quick hash check */2210for(i =0; i < preimage_limit; i++)2211if((img->line[try_lno + i].flag & LINE_PATCHED) ||2212(preimage->line[i].hash != img->line[try_lno + i].hash))2213return0;22142215if(preimage_limit == preimage->nr) {2216/*2217 * Do we have an exact match? If we were told to match2218 * at the end, size must be exactly at try+fragsize,2219 * otherwise try+fragsize must be still within the preimage,2220 * and either case, the old piece should match the preimage2221 * exactly.2222 */2223if((match_end2224? (try+ preimage->len == img->len)2225: (try+ preimage->len <= img->len)) &&2226!memcmp(img->buf +try, preimage->buf, preimage->len))2227return1;2228}else{2229/*2230 * The preimage extends beyond the end of img, so2231 * there cannot be an exact match.2232 *2233 * There must be one non-blank context line that match2234 * a line before the end of img.2235 */2236char*buf_end;22372238 buf = preimage->buf;2239 buf_end = buf;2240for(i =0; i < preimage_limit; i++)2241 buf_end += preimage->line[i].len;22422243for( ; buf < buf_end; buf++)2244if(!isspace(*buf))2245break;2246if(buf == buf_end)2247return0;2248}22492250/*2251 * No exact match. If we are ignoring whitespace, run a line-by-line2252 * fuzzy matching. We collect all the line length information because2253 * we need it to adjust whitespace if we match.2254 */2255if(ws_ignore_action == ignore_ws_change) {2256size_t imgoff =0;2257size_t preoff =0;2258size_t postlen = postimage->len;2259size_t extra_chars;2260char*preimage_eof;2261char*preimage_end;2262for(i =0; i < preimage_limit; i++) {2263size_t prelen = preimage->line[i].len;2264size_t imglen = img->line[try_lno+i].len;22652266if(!fuzzy_matchlines(img->buf +try+ imgoff, imglen,2267 preimage->buf + preoff, prelen))2268return0;2269if(preimage->line[i].flag & LINE_COMMON)2270 postlen += imglen - prelen;2271 imgoff += imglen;2272 preoff += prelen;2273}22742275/*2276 * Ok, the preimage matches with whitespace fuzz.2277 *2278 * imgoff now holds the true length of the target that2279 * matches the preimage before the end of the file.2280 *2281 * Count the number of characters in the preimage that fall2282 * beyond the end of the file and make sure that all of them2283 * are whitespace characters. (This can only happen if2284 * we are removing blank lines at the end of the file.)2285 */2286 buf = preimage_eof = preimage->buf + preoff;2287for( ; i < preimage->nr; i++)2288 preoff += preimage->line[i].len;2289 preimage_end = preimage->buf + preoff;2290for( ; buf < preimage_end; buf++)2291if(!isspace(*buf))2292return0;22932294/*2295 * Update the preimage and the common postimage context2296 * lines to use the same whitespace as the target.2297 * If whitespace is missing in the target (i.e.2298 * if the preimage extends beyond the end of the file),2299 * use the whitespace from the preimage.2300 */2301 extra_chars = preimage_end - preimage_eof;2302strbuf_init(&fixed, imgoff + extra_chars);2303strbuf_add(&fixed, img->buf +try, imgoff);2304strbuf_add(&fixed, preimage_eof, extra_chars);2305 fixed_buf =strbuf_detach(&fixed, &fixed_len);2306update_pre_post_images(preimage, postimage,2307 fixed_buf, fixed_len, postlen);2308return1;2309}23102311if(ws_error_action != correct_ws_error)2312return0;23132314/*2315 * The hunk does not apply byte-by-byte, but the hash says2316 * it might with whitespace fuzz. We haven't been asked to2317 * ignore whitespace, we were asked to correct whitespace2318 * errors, so let's try matching after whitespace correction.2319 *2320 * The preimage may extend beyond the end of the file,2321 * but in this loop we will only handle the part of the2322 * preimage that falls within the file.2323 */2324strbuf_init(&fixed, preimage->len +1);2325 orig = preimage->buf;2326 target = img->buf +try;2327for(i =0; i < preimage_limit; i++) {2328size_t oldlen = preimage->line[i].len;2329size_t tgtlen = img->line[try_lno + i].len;2330size_t fixstart = fixed.len;2331struct strbuf tgtfix;2332int match;23332334/* Try fixing the line in the preimage */2335ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);23362337/* Try fixing the line in the target */2338strbuf_init(&tgtfix, tgtlen);2339ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);23402341/*2342 * If they match, either the preimage was based on2343 * a version before our tree fixed whitespace breakage,2344 * or we are lacking a whitespace-fix patch the tree2345 * the preimage was based on already had (i.e. target2346 * has whitespace breakage, the preimage doesn't).2347 * In either case, we are fixing the whitespace breakages2348 * so we might as well take the fix together with their2349 * real change.2350 */2351 match = (tgtfix.len == fixed.len - fixstart &&2352!memcmp(tgtfix.buf, fixed.buf + fixstart,2353 fixed.len - fixstart));23542355strbuf_release(&tgtfix);2356if(!match)2357goto unmatch_exit;23582359 orig += oldlen;2360 target += tgtlen;2361}236223632364/*2365 * Now handle the lines in the preimage that falls beyond the2366 * end of the file (if any). They will only match if they are2367 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2368 * false).2369 */2370for( ; i < preimage->nr; i++) {2371size_t fixstart = fixed.len;/* start of the fixed preimage */2372size_t oldlen = preimage->line[i].len;2373int j;23742375/* Try fixing the line in the preimage */2376ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);23772378for(j = fixstart; j < fixed.len; j++)2379if(!isspace(fixed.buf[j]))2380goto unmatch_exit;23812382 orig += oldlen;2383}23842385/*2386 * Yes, the preimage is based on an older version that still2387 * has whitespace breakages unfixed, and fixing them makes the2388 * hunk match. Update the context lines in the postimage.2389 */2390 fixed_buf =strbuf_detach(&fixed, &fixed_len);2391update_pre_post_images(preimage, postimage,2392 fixed_buf, fixed_len,0);2393return1;23942395 unmatch_exit:2396strbuf_release(&fixed);2397return0;2398}23992400static intfind_pos(struct image *img,2401struct image *preimage,2402struct image *postimage,2403int line,2404unsigned ws_rule,2405int match_beginning,int match_end)2406{2407int i;2408unsigned long backwards, forwards,try;2409int backwards_lno, forwards_lno, try_lno;24102411/*2412 * If match_beginning or match_end is specified, there is no2413 * point starting from a wrong line that will never match and2414 * wander around and wait for a match at the specified end.2415 */2416if(match_beginning)2417 line =0;2418else if(match_end)2419 line = img->nr - preimage->nr;24202421/*2422 * Because the comparison is unsigned, the following test2423 * will also take care of a negative line number that can2424 * result when match_end and preimage is larger than the target.2425 */2426if((size_t) line > img->nr)2427 line = img->nr;24282429try=0;2430for(i =0; i < line; i++)2431try+= img->line[i].len;24322433/*2434 * There's probably some smart way to do this, but I'll leave2435 * that to the smart and beautiful people. I'm simple and stupid.2436 */2437 backwards =try;2438 backwards_lno = line;2439 forwards =try;2440 forwards_lno = line;2441 try_lno = line;24422443for(i =0; ; i++) {2444if(match_fragment(img, preimage, postimage,2445try, try_lno, ws_rule,2446 match_beginning, match_end))2447return try_lno;24482449 again:2450if(backwards_lno ==0&& forwards_lno == img->nr)2451break;24522453if(i &1) {2454if(backwards_lno ==0) {2455 i++;2456goto again;2457}2458 backwards_lno--;2459 backwards -= img->line[backwards_lno].len;2460try= backwards;2461 try_lno = backwards_lno;2462}else{2463if(forwards_lno == img->nr) {2464 i++;2465goto again;2466}2467 forwards += img->line[forwards_lno].len;2468 forwards_lno++;2469try= forwards;2470 try_lno = forwards_lno;2471}24722473}2474return-1;2475}24762477static voidremove_first_line(struct image *img)2478{2479 img->buf += img->line[0].len;2480 img->len -= img->line[0].len;2481 img->line++;2482 img->nr--;2483}24842485static voidremove_last_line(struct image *img)2486{2487 img->len -= img->line[--img->nr].len;2488}24892490/*2491 * The change from "preimage" and "postimage" has been found to2492 * apply at applied_pos (counts in line numbers) in "img".2493 * Update "img" to remove "preimage" and replace it with "postimage".2494 */2495static voidupdate_image(struct image *img,2496int applied_pos,2497struct image *preimage,2498struct image *postimage)2499{2500/*2501 * remove the copy of preimage at offset in img2502 * and replace it with postimage2503 */2504int i, nr;2505size_t remove_count, insert_count, applied_at =0;2506char*result;2507int preimage_limit;25082509/*2510 * If we are removing blank lines at the end of img,2511 * the preimage may extend beyond the end.2512 * If that is the case, we must be careful only to2513 * remove the part of the preimage that falls within2514 * the boundaries of img. Initialize preimage_limit2515 * to the number of lines in the preimage that falls2516 * within the boundaries.2517 */2518 preimage_limit = preimage->nr;2519if(preimage_limit > img->nr - applied_pos)2520 preimage_limit = img->nr - applied_pos;25212522for(i =0; i < applied_pos; i++)2523 applied_at += img->line[i].len;25242525 remove_count =0;2526for(i =0; i < preimage_limit; i++)2527 remove_count += img->line[applied_pos + i].len;2528 insert_count = postimage->len;25292530/* Adjust the contents */2531 result =xmalloc(img->len + insert_count - remove_count +1);2532memcpy(result, img->buf, applied_at);2533memcpy(result + applied_at, postimage->buf, postimage->len);2534memcpy(result + applied_at + postimage->len,2535 img->buf + (applied_at + remove_count),2536 img->len - (applied_at + remove_count));2537free(img->buf);2538 img->buf = result;2539 img->len += insert_count - remove_count;2540 result[img->len] ='\0';25412542/* Adjust the line table */2543 nr = img->nr + postimage->nr - preimage_limit;2544if(preimage_limit < postimage->nr) {2545/*2546 * NOTE: this knows that we never call remove_first_line()2547 * on anything other than pre/post image.2548 */2549 img->line =xrealloc(img->line, nr *sizeof(*img->line));2550 img->line_allocated = img->line;2551}2552if(preimage_limit != postimage->nr)2553memmove(img->line + applied_pos + postimage->nr,2554 img->line + applied_pos + preimage_limit,2555(img->nr - (applied_pos + preimage_limit)) *2556sizeof(*img->line));2557memcpy(img->line + applied_pos,2558 postimage->line,2559 postimage->nr *sizeof(*img->line));2560if(!allow_overlap)2561for(i =0; i < postimage->nr; i++)2562 img->line[applied_pos + i].flag |= LINE_PATCHED;2563 img->nr = nr;2564}25652566/*2567 * Use the patch-hunk text in "frag" to prepare two images (preimage and2568 * postimage) for the hunk. Find lines that match "preimage" in "img" and2569 * replace the part of "img" with "postimage" text.2570 */2571static intapply_one_fragment(struct image *img,struct fragment *frag,2572int inaccurate_eof,unsigned ws_rule,2573int nth_fragment)2574{2575int match_beginning, match_end;2576const char*patch = frag->patch;2577int size = frag->size;2578char*old, *oldlines;2579struct strbuf newlines;2580int new_blank_lines_at_end =0;2581int found_new_blank_lines_at_end =0;2582int hunk_linenr = frag->linenr;2583unsigned long leading, trailing;2584int pos, applied_pos;2585struct image preimage;2586struct image postimage;25872588memset(&preimage,0,sizeof(preimage));2589memset(&postimage,0,sizeof(postimage));2590 oldlines =xmalloc(size);2591strbuf_init(&newlines, size);25922593 old = oldlines;2594while(size >0) {2595char first;2596int len =linelen(patch, size);2597int plen;2598int added_blank_line =0;2599int is_blank_context =0;2600size_t start;26012602if(!len)2603break;26042605/*2606 * "plen" is how much of the line we should use for2607 * the actual patch data. Normally we just remove the2608 * first character on the line, but if the line is2609 * followed by "\ No newline", then we also remove the2610 * last one (which is the newline, of course).2611 */2612 plen = len -1;2613if(len < size && patch[len] =='\\')2614 plen--;2615 first = *patch;2616if(apply_in_reverse) {2617if(first =='-')2618 first ='+';2619else if(first =='+')2620 first ='-';2621}26222623switch(first) {2624case'\n':2625/* Newer GNU diff, empty context line */2626if(plen <0)2627/* ... followed by '\No newline'; nothing */2628break;2629*old++ ='\n';2630strbuf_addch(&newlines,'\n');2631add_line_info(&preimage,"\n",1, LINE_COMMON);2632add_line_info(&postimage,"\n",1, LINE_COMMON);2633 is_blank_context =1;2634break;2635case' ':2636if(plen && (ws_rule & WS_BLANK_AT_EOF) &&2637ws_blank_line(patch +1, plen, ws_rule))2638 is_blank_context =1;2639case'-':2640memcpy(old, patch +1, plen);2641add_line_info(&preimage, old, plen,2642(first ==' '? LINE_COMMON :0));2643 old += plen;2644if(first =='-')2645break;2646/* Fall-through for ' ' */2647case'+':2648/* --no-add does not add new lines */2649if(first =='+'&& no_add)2650break;26512652 start = newlines.len;2653if(first !='+'||2654!whitespace_error ||2655 ws_error_action != correct_ws_error) {2656strbuf_add(&newlines, patch +1, plen);2657}2658else{2659ws_fix_copy(&newlines, patch +1, plen, ws_rule, &applied_after_fixing_ws);2660}2661add_line_info(&postimage, newlines.buf + start, newlines.len - start,2662(first =='+'?0: LINE_COMMON));2663if(first =='+'&&2664(ws_rule & WS_BLANK_AT_EOF) &&2665ws_blank_line(patch +1, plen, ws_rule))2666 added_blank_line =1;2667break;2668case'@':case'\\':2669/* Ignore it, we already handled it */2670break;2671default:2672if(apply_verbosely)2673error(_("invalid start of line: '%c'"), first);2674return-1;2675}2676if(added_blank_line) {2677if(!new_blank_lines_at_end)2678 found_new_blank_lines_at_end = hunk_linenr;2679 new_blank_lines_at_end++;2680}2681else if(is_blank_context)2682;2683else2684 new_blank_lines_at_end =0;2685 patch += len;2686 size -= len;2687 hunk_linenr++;2688}2689if(inaccurate_eof &&2690 old > oldlines && old[-1] =='\n'&&2691 newlines.len >0&& newlines.buf[newlines.len -1] =='\n') {2692 old--;2693strbuf_setlen(&newlines, newlines.len -1);2694}26952696 leading = frag->leading;2697 trailing = frag->trailing;26982699/*2700 * A hunk to change lines at the beginning would begin with2701 * @@ -1,L +N,M @@2702 * but we need to be careful. -U0 that inserts before the second2703 * line also has this pattern.2704 *2705 * And a hunk to add to an empty file would begin with2706 * @@ -0,0 +N,M @@2707 *2708 * In other words, a hunk that is (frag->oldpos <= 1) with or2709 * without leading context must match at the beginning.2710 */2711 match_beginning = (!frag->oldpos ||2712(frag->oldpos ==1&& !unidiff_zero));27132714/*2715 * A hunk without trailing lines must match at the end.2716 * However, we simply cannot tell if a hunk must match end2717 * from the lack of trailing lines if the patch was generated2718 * with unidiff without any context.2719 */2720 match_end = !unidiff_zero && !trailing;27212722 pos = frag->newpos ? (frag->newpos -1) :0;2723 preimage.buf = oldlines;2724 preimage.len = old - oldlines;2725 postimage.buf = newlines.buf;2726 postimage.len = newlines.len;2727 preimage.line = preimage.line_allocated;2728 postimage.line = postimage.line_allocated;27292730for(;;) {27312732 applied_pos =find_pos(img, &preimage, &postimage, pos,2733 ws_rule, match_beginning, match_end);27342735if(applied_pos >=0)2736break;27372738/* Am I at my context limits? */2739if((leading <= p_context) && (trailing <= p_context))2740break;2741if(match_beginning || match_end) {2742 match_beginning = match_end =0;2743continue;2744}27452746/*2747 * Reduce the number of context lines; reduce both2748 * leading and trailing if they are equal otherwise2749 * just reduce the larger context.2750 */2751if(leading >= trailing) {2752remove_first_line(&preimage);2753remove_first_line(&postimage);2754 pos--;2755 leading--;2756}2757if(trailing > leading) {2758remove_last_line(&preimage);2759remove_last_line(&postimage);2760 trailing--;2761}2762}27632764if(applied_pos >=0) {2765if(new_blank_lines_at_end &&2766 preimage.nr + applied_pos >= img->nr &&2767(ws_rule & WS_BLANK_AT_EOF) &&2768 ws_error_action != nowarn_ws_error) {2769record_ws_error(WS_BLANK_AT_EOF,"+",1,2770 found_new_blank_lines_at_end);2771if(ws_error_action == correct_ws_error) {2772while(new_blank_lines_at_end--)2773remove_last_line(&postimage);2774}2775/*2776 * We would want to prevent write_out_results()2777 * from taking place in apply_patch() that follows2778 * the callchain led us here, which is:2779 * apply_patch->check_patch_list->check_patch->2780 * apply_data->apply_fragments->apply_one_fragment2781 */2782if(ws_error_action == die_on_ws_error)2783 apply =0;2784}27852786if(apply_verbosely && applied_pos != pos) {2787int offset = applied_pos - pos;2788if(apply_in_reverse)2789 offset =0- offset;2790fprintf_ln(stderr,2791Q_("Hunk #%dsucceeded at%d(offset%dline).",2792"Hunk #%dsucceeded at%d(offset%dlines).",2793 offset),2794 nth_fragment, applied_pos +1, offset);2795}27962797/*2798 * Warn if it was necessary to reduce the number2799 * of context lines.2800 */2801if((leading != frag->leading) ||2802(trailing != frag->trailing))2803fprintf_ln(stderr,_("Context reduced to (%ld/%ld)"2804" to apply fragment at%d"),2805 leading, trailing, applied_pos+1);2806update_image(img, applied_pos, &preimage, &postimage);2807}else{2808if(apply_verbosely)2809error(_("while searching for:\n%.*s"),2810(int)(old - oldlines), oldlines);2811}28122813free(oldlines);2814strbuf_release(&newlines);2815free(preimage.line_allocated);2816free(postimage.line_allocated);28172818return(applied_pos <0);2819}28202821static intapply_binary_fragment(struct image *img,struct patch *patch)2822{2823struct fragment *fragment = patch->fragments;2824unsigned long len;2825void*dst;28262827if(!fragment)2828returnerror(_("missing binary patch data for '%s'"),2829 patch->new_name ?2830 patch->new_name :2831 patch->old_name);28322833/* Binary patch is irreversible without the optional second hunk */2834if(apply_in_reverse) {2835if(!fragment->next)2836returnerror("cannot reverse-apply a binary patch "2837"without the reverse hunk to '%s'",2838 patch->new_name2839? patch->new_name : patch->old_name);2840 fragment = fragment->next;2841}2842switch(fragment->binary_patch_method) {2843case BINARY_DELTA_DEFLATED:2844 dst =patch_delta(img->buf, img->len, fragment->patch,2845 fragment->size, &len);2846if(!dst)2847return-1;2848clear_image(img);2849 img->buf = dst;2850 img->len = len;2851return0;2852case BINARY_LITERAL_DEFLATED:2853clear_image(img);2854 img->len = fragment->size;2855 img->buf =xmalloc(img->len+1);2856memcpy(img->buf, fragment->patch, img->len);2857 img->buf[img->len] ='\0';2858return0;2859}2860return-1;2861}28622863/*2864 * Replace "img" with the result of applying the binary patch.2865 * The binary patch data itself in patch->fragment is still kept2866 * but the preimage prepared by the caller in "img" is freed here2867 * or in the helper function apply_binary_fragment() this calls.2868 */2869static intapply_binary(struct image *img,struct patch *patch)2870{2871const char*name = patch->old_name ? patch->old_name : patch->new_name;2872unsigned char sha1[20];28732874/*2875 * For safety, we require patch index line to contain2876 * full 40-byte textual SHA1 for old and new, at least for now.2877 */2878if(strlen(patch->old_sha1_prefix) !=40||2879strlen(patch->new_sha1_prefix) !=40||2880get_sha1_hex(patch->old_sha1_prefix, sha1) ||2881get_sha1_hex(patch->new_sha1_prefix, sha1))2882returnerror("cannot apply binary patch to '%s' "2883"without full index line", name);28842885if(patch->old_name) {2886/*2887 * See if the old one matches what the patch2888 * applies to.2889 */2890hash_sha1_file(img->buf, img->len, blob_type, sha1);2891if(strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2892returnerror("the patch applies to '%s' (%s), "2893"which does not match the "2894"current contents.",2895 name,sha1_to_hex(sha1));2896}2897else{2898/* Otherwise, the old one must be empty. */2899if(img->len)2900returnerror("the patch applies to an empty "2901"'%s' but it is not empty", name);2902}29032904get_sha1_hex(patch->new_sha1_prefix, sha1);2905if(is_null_sha1(sha1)) {2906clear_image(img);2907return0;/* deletion patch */2908}29092910if(has_sha1_file(sha1)) {2911/* We already have the postimage */2912enum object_type type;2913unsigned long size;2914char*result;29152916 result =read_sha1_file(sha1, &type, &size);2917if(!result)2918returnerror("the necessary postimage%sfor "2919"'%s' cannot be read",2920 patch->new_sha1_prefix, name);2921clear_image(img);2922 img->buf = result;2923 img->len = size;2924}else{2925/*2926 * We have verified buf matches the preimage;2927 * apply the patch data to it, which is stored2928 * in the patch->fragments->{patch,size}.2929 */2930if(apply_binary_fragment(img, patch))2931returnerror(_("binary patch does not apply to '%s'"),2932 name);29332934/* verify that the result matches */2935hash_sha1_file(img->buf, img->len, blob_type, sha1);2936if(strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))2937returnerror(_("binary patch to '%s' creates incorrect result (expecting%s, got%s)"),2938 name, patch->new_sha1_prefix,sha1_to_hex(sha1));2939}29402941return0;2942}29432944static intapply_fragments(struct image *img,struct patch *patch)2945{2946struct fragment *frag = patch->fragments;2947const char*name = patch->old_name ? patch->old_name : patch->new_name;2948unsigned ws_rule = patch->ws_rule;2949unsigned inaccurate_eof = patch->inaccurate_eof;2950int nth =0;29512952if(patch->is_binary)2953returnapply_binary(img, patch);29542955while(frag) {2956 nth++;2957if(apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {2958error(_("patch failed:%s:%ld"), name, frag->oldpos);2959if(!apply_with_reject)2960return-1;2961 frag->rejected =1;2962}2963 frag = frag->next;2964}2965return0;2966}29672968static intread_blob_object(struct strbuf *buf,const unsigned char*sha1,unsigned mode)2969{2970if(S_ISGITLINK(mode)) {2971strbuf_grow(buf,100);2972strbuf_addf(buf,"Subproject commit%s\n",sha1_to_hex(sha1));2973}else{2974enum object_type type;2975unsigned long sz;2976char*result;29772978 result =read_sha1_file(sha1, &type, &sz);2979if(!result)2980return-1;2981/* XXX read_sha1_file NUL-terminates */2982strbuf_attach(buf, result, sz, sz +1);2983}2984return0;2985}29862987static intread_file_or_gitlink(struct cache_entry *ce,struct strbuf *buf)2988{2989if(!ce)2990return0;2991returnread_blob_object(buf, ce->sha1, ce->ce_mode);2992}29932994static struct patch *in_fn_table(const char*name)2995{2996struct string_list_item *item;29972998if(name == NULL)2999return NULL;30003001 item =string_list_lookup(&fn_table, name);3002if(item != NULL)3003return(struct patch *)item->util;30043005return NULL;3006}30073008/*3009 * item->util in the filename table records the status of the path.3010 * Usually it points at a patch (whose result records the contents3011 * of it after applying it), but it could be PATH_WAS_DELETED for a3012 * path that a previously applied patch has already removed, or3013 * PATH_TO_BE_DELETED for a path that a later patch would remove.3014 *3015 * The latter is needed to deal with a case where two paths A and B3016 * are swapped by first renaming A to B and then renaming B to A;3017 * moving A to B should not be prevented due to presense of B as we3018 * will remove it in a later patch.3019 */3020#define PATH_TO_BE_DELETED ((struct patch *) -2)3021#define PATH_WAS_DELETED ((struct patch *) -1)30223023static intto_be_deleted(struct patch *patch)3024{3025return patch == PATH_TO_BE_DELETED;3026}30273028static intwas_deleted(struct patch *patch)3029{3030return patch == PATH_WAS_DELETED;3031}30323033static voidadd_to_fn_table(struct patch *patch)3034{3035struct string_list_item *item;30363037/*3038 * Always add new_name unless patch is a deletion3039 * This should cover the cases for normal diffs,3040 * file creations and copies3041 */3042if(patch->new_name != NULL) {3043 item =string_list_insert(&fn_table, patch->new_name);3044 item->util = patch;3045}30463047/*3048 * store a failure on rename/deletion cases because3049 * later chunks shouldn't patch old names3050 */3051if((patch->new_name == NULL) || (patch->is_rename)) {3052 item =string_list_insert(&fn_table, patch->old_name);3053 item->util = PATH_WAS_DELETED;3054}3055}30563057static voidprepare_fn_table(struct patch *patch)3058{3059/*3060 * store information about incoming file deletion3061 */3062while(patch) {3063if((patch->new_name == NULL) || (patch->is_rename)) {3064struct string_list_item *item;3065 item =string_list_insert(&fn_table, patch->old_name);3066 item->util = PATH_TO_BE_DELETED;3067}3068 patch = patch->next;3069}3070}30713072static intcheckout_target(struct cache_entry *ce,struct stat *st)3073{3074struct checkout costate;30753076memset(&costate,0,sizeof(costate));3077 costate.base_dir ="";3078 costate.refresh_cache =1;3079if(checkout_entry(ce, &costate, NULL) ||lstat(ce->name, st))3080returnerror(_("cannot checkout%s"), ce->name);3081return0;3082}30833084static struct patch *previous_patch(struct patch *patch,int*gone)3085{3086struct patch *previous;30873088*gone =0;3089if(patch->is_copy || patch->is_rename)3090return NULL;/* "git" patches do not depend on the order */30913092 previous =in_fn_table(patch->old_name);3093if(!previous)3094return NULL;30953096if(to_be_deleted(previous))3097return NULL;/* the deletion hasn't happened yet */30983099if(was_deleted(previous))3100*gone =1;31013102return previous;3103}31043105static intverify_index_match(struct cache_entry *ce,struct stat *st)3106{3107if(S_ISGITLINK(ce->ce_mode)) {3108if(!S_ISDIR(st->st_mode))3109return-1;3110return0;3111}3112returnce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3113}31143115#define SUBMODULE_PATCH_WITHOUT_INDEX 131163117static intload_patch_target(struct strbuf *buf,3118struct cache_entry *ce,3119struct stat *st,3120const char*name,3121unsigned expected_mode)3122{3123if(cached) {3124if(read_file_or_gitlink(ce, buf))3125returnerror(_("read of%sfailed"), name);3126}else if(name) {3127if(S_ISGITLINK(expected_mode)) {3128if(ce)3129returnread_file_or_gitlink(ce, buf);3130else3131return SUBMODULE_PATCH_WITHOUT_INDEX;3132}else{3133if(read_old_data(st, name, buf))3134returnerror(_("read of%sfailed"), name);3135}3136}3137return0;3138}31393140/*3141 * We are about to apply "patch"; populate the "image" with the3142 * current version we have, from the working tree or from the index,3143 * depending on the situation e.g. --cached/--index. If we are3144 * applying a non-git patch that incrementally updates the tree,3145 * we read from the result of a previous diff.3146 */3147static intload_preimage(struct image *image,3148struct patch *patch,struct stat *st,struct cache_entry *ce)3149{3150struct strbuf buf = STRBUF_INIT;3151size_t len;3152char*img;3153struct patch *previous;3154int status;31553156 previous =previous_patch(patch, &status);3157if(status)3158returnerror(_("path%shas been renamed/deleted"),3159 patch->old_name);3160if(previous) {3161/* We have a patched copy in memory; use that. */3162strbuf_add(&buf, previous->result, previous->resultsize);3163}else{3164 status =load_patch_target(&buf, ce, st,3165 patch->old_name, patch->old_mode);3166if(status <0)3167return status;3168else if(status == SUBMODULE_PATCH_WITHOUT_INDEX) {3169/*3170 * There is no way to apply subproject3171 * patch without looking at the index.3172 * NEEDSWORK: shouldn't this be flagged3173 * as an error???3174 */3175free_fragment_list(patch->fragments);3176 patch->fragments = NULL;3177}else if(status) {3178returnerror(_("read of%sfailed"), patch->old_name);3179}3180}31813182 img =strbuf_detach(&buf, &len);3183prepare_image(image, img, len, !patch->is_binary);3184return0;3185}31863187static intthree_way_merge(struct image *image,3188char*path,3189const unsigned char*base,3190const unsigned char*ours,3191const unsigned char*theirs)3192{3193 mmfile_t base_file, our_file, their_file;3194 mmbuffer_t result = { NULL };3195int status;31963197read_mmblob(&base_file, base);3198read_mmblob(&our_file, ours);3199read_mmblob(&their_file, theirs);3200 status =ll_merge(&result, path,3201&base_file,"base",3202&our_file,"ours",3203&their_file,"theirs", NULL);3204free(base_file.ptr);3205free(our_file.ptr);3206free(their_file.ptr);3207if(status <0|| !result.ptr) {3208free(result.ptr);3209return-1;3210}3211clear_image(image);3212 image->buf = result.ptr;3213 image->len = result.size;32143215return status;3216}32173218/*3219 * When directly falling back to add/add three-way merge, we read from3220 * the current contents of the new_name. In no cases other than that3221 * this function will be called.3222 */3223static intload_current(struct image *image,struct patch *patch)3224{3225struct strbuf buf = STRBUF_INIT;3226int status, pos;3227size_t len;3228char*img;3229struct stat st;3230struct cache_entry *ce;3231char*name = patch->new_name;3232unsigned mode = patch->new_mode;32333234if(!patch->is_new)3235die("BUG: patch to%sis not a creation", patch->old_name);32363237 pos =cache_name_pos(name,strlen(name));3238if(pos <0)3239returnerror(_("%s: does not exist in index"), name);3240 ce = active_cache[pos];3241if(lstat(name, &st)) {3242if(errno != ENOENT)3243returnerror(_("%s:%s"), name,strerror(errno));3244if(checkout_target(ce, &st))3245return-1;3246}3247if(verify_index_match(ce, &st))3248returnerror(_("%s: does not match index"), name);32493250 status =load_patch_target(&buf, ce, &st, name, mode);3251if(status <0)3252return status;3253else if(status)3254return-1;3255 img =strbuf_detach(&buf, &len);3256prepare_image(image, img, len, !patch->is_binary);3257return0;3258}32593260static inttry_threeway(struct image *image,struct patch *patch,3261struct stat *st,struct cache_entry *ce)3262{3263unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];3264struct strbuf buf = STRBUF_INIT;3265size_t len;3266int status;3267char*img;3268struct image tmp_image;32693270/* No point falling back to 3-way merge in these cases */3271if(patch->is_delete ||3272S_ISGITLINK(patch->old_mode) ||S_ISGITLINK(patch->new_mode))3273return-1;32743275/* Preimage the patch was prepared for */3276if(patch->is_new)3277write_sha1_file("",0, blob_type, pre_sha1);3278else if(get_sha1(patch->old_sha1_prefix, pre_sha1) ||3279read_blob_object(&buf, pre_sha1, patch->old_mode))3280returnerror("repository lacks the necessary blob to fall back on 3-way merge.");32813282fprintf(stderr,"Falling back to three-way merge...\n");32833284 img =strbuf_detach(&buf, &len);3285prepare_image(&tmp_image, img, len,1);3286/* Apply the patch to get the post image */3287if(apply_fragments(&tmp_image, patch) <0) {3288clear_image(&tmp_image);3289return-1;3290}3291/* post_sha1[] is theirs */3292write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_sha1);3293clear_image(&tmp_image);32943295/* our_sha1[] is ours */3296if(patch->is_new) {3297if(load_current(&tmp_image, patch))3298returnerror("cannot read the current contents of '%s'",3299 patch->new_name);3300}else{3301if(load_preimage(&tmp_image, patch, st, ce))3302returnerror("cannot read the current contents of '%s'",3303 patch->old_name);3304}3305write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);3306clear_image(&tmp_image);33073308/* in-core three-way merge between post and our using pre as base */3309 status =three_way_merge(image, patch->new_name,3310 pre_sha1, our_sha1, post_sha1);3311if(status <0) {3312fprintf(stderr,"Failed to fall back on three-way merge...\n");3313return status;3314}33153316if(status) {3317 patch->conflicted_threeway =1;3318if(patch->is_new)3319hashclr(patch->threeway_stage[0]);3320else3321hashcpy(patch->threeway_stage[0], pre_sha1);3322hashcpy(patch->threeway_stage[1], our_sha1);3323hashcpy(patch->threeway_stage[2], post_sha1);3324fprintf(stderr,"Applied patch to '%s' with conflicts.\n", patch->new_name);3325}else{3326fprintf(stderr,"Applied patch to '%s' cleanly.\n", patch->new_name);3327}3328return0;3329}33303331static intapply_data(struct patch *patch,struct stat *st,struct cache_entry *ce)3332{3333struct image image;33343335if(load_preimage(&image, patch, st, ce) <0)3336return-1;33373338if(patch->direct_to_threeway ||3339apply_fragments(&image, patch) <0) {3340/* Note: with --reject, apply_fragments() returns 0 */3341if(!threeway ||try_threeway(&image, patch, st, ce) <0)3342return-1;3343}3344 patch->result = image.buf;3345 patch->resultsize = image.len;3346add_to_fn_table(patch);3347free(image.line_allocated);33483349if(0< patch->is_delete && patch->resultsize)3350returnerror(_("removal patch leaves file contents"));33513352return0;3353}33543355/*3356 * If "patch" that we are looking at modifies or deletes what we have,3357 * we would want it not to lose any local modification we have, either3358 * in the working tree or in the index.3359 *3360 * This also decides if a non-git patch is a creation patch or a3361 * modification to an existing empty file. We do not check the state3362 * of the current tree for a creation patch in this function; the caller3363 * check_patch() separately makes sure (and errors out otherwise) that3364 * the path the patch creates does not exist in the current tree.3365 */3366static intcheck_preimage(struct patch *patch,struct cache_entry **ce,struct stat *st)3367{3368const char*old_name = patch->old_name;3369struct patch *previous = NULL;3370int stat_ret =0, status;3371unsigned st_mode =0;33723373if(!old_name)3374return0;33753376assert(patch->is_new <=0);3377 previous =previous_patch(patch, &status);33783379if(status)3380returnerror(_("path%shas been renamed/deleted"), old_name);3381if(previous) {3382 st_mode = previous->new_mode;3383}else if(!cached) {3384 stat_ret =lstat(old_name, st);3385if(stat_ret && errno != ENOENT)3386returnerror(_("%s:%s"), old_name,strerror(errno));3387}33883389if(check_index && !previous) {3390int pos =cache_name_pos(old_name,strlen(old_name));3391if(pos <0) {3392if(patch->is_new <0)3393goto is_new;3394returnerror(_("%s: does not exist in index"), old_name);3395}3396*ce = active_cache[pos];3397if(stat_ret <0) {3398if(checkout_target(*ce, st))3399return-1;3400}3401if(!cached &&verify_index_match(*ce, st))3402returnerror(_("%s: does not match index"), old_name);3403if(cached)3404 st_mode = (*ce)->ce_mode;3405}else if(stat_ret <0) {3406if(patch->is_new <0)3407goto is_new;3408returnerror(_("%s:%s"), old_name,strerror(errno));3409}34103411if(!cached && !previous)3412 st_mode =ce_mode_from_stat(*ce, st->st_mode);34133414if(patch->is_new <0)3415 patch->is_new =0;3416if(!patch->old_mode)3417 patch->old_mode = st_mode;3418if((st_mode ^ patch->old_mode) & S_IFMT)3419returnerror(_("%s: wrong type"), old_name);3420if(st_mode != patch->old_mode)3421warning(_("%shas type%o, expected%o"),3422 old_name, st_mode, patch->old_mode);3423if(!patch->new_mode && !patch->is_delete)3424 patch->new_mode = st_mode;3425return0;34263427 is_new:3428 patch->is_new =1;3429 patch->is_delete =0;3430free(patch->old_name);3431 patch->old_name = NULL;3432return0;3433}343434353436#define EXISTS_IN_INDEX 13437#define EXISTS_IN_WORKTREE 234383439static intcheck_to_create(const char*new_name,int ok_if_exists)3440{3441struct stat nst;34423443if(check_index &&3444cache_name_pos(new_name,strlen(new_name)) >=0&&3445!ok_if_exists)3446return EXISTS_IN_INDEX;3447if(cached)3448return0;34493450if(!lstat(new_name, &nst)) {3451if(S_ISDIR(nst.st_mode) || ok_if_exists)3452return0;3453/*3454 * A leading component of new_name might be a symlink3455 * that is going to be removed with this patch, but3456 * still pointing at somewhere that has the path.3457 * In such a case, path "new_name" does not exist as3458 * far as git is concerned.3459 */3460if(has_symlink_leading_path(new_name,strlen(new_name)))3461return0;34623463return EXISTS_IN_WORKTREE;3464}else if((errno != ENOENT) && (errno != ENOTDIR)) {3465returnerror("%s:%s", new_name,strerror(errno));3466}3467return0;3468}34693470/*3471 * Check and apply the patch in-core; leave the result in patch->result3472 * for the caller to write it out to the final destination.3473 */3474static intcheck_patch(struct patch *patch)3475{3476struct stat st;3477const char*old_name = patch->old_name;3478const char*new_name = patch->new_name;3479const char*name = old_name ? old_name : new_name;3480struct cache_entry *ce = NULL;3481struct patch *tpatch;3482int ok_if_exists;3483int status;34843485 patch->rejected =1;/* we will drop this after we succeed */34863487 status =check_preimage(patch, &ce, &st);3488if(status)3489return status;3490 old_name = patch->old_name;34913492/*3493 * A type-change diff is always split into a patch to delete3494 * old, immediately followed by a patch to create new (see3495 * diff.c::run_diff()); in such a case it is Ok that the entry3496 * to be deleted by the previous patch is still in the working3497 * tree and in the index.3498 *3499 * A patch to swap-rename between A and B would first rename A3500 * to B and then rename B to A. While applying the first one,3501 * the presense of B should not stop A from getting renamed to3502 * B; ask to_be_deleted() about the later rename. Removal of3503 * B and rename from A to B is handled the same way by asking3504 * was_deleted().3505 */3506if((tpatch =in_fn_table(new_name)) &&3507(was_deleted(tpatch) ||to_be_deleted(tpatch)))3508 ok_if_exists =1;3509else3510 ok_if_exists =0;35113512if(new_name &&3513((0< patch->is_new) | (0< patch->is_rename) | patch->is_copy)) {3514int err =check_to_create(new_name, ok_if_exists);35153516if(err && threeway) {3517 patch->direct_to_threeway =1;3518}else switch(err) {3519case0:3520break;/* happy */3521case EXISTS_IN_INDEX:3522returnerror(_("%s: already exists in index"), new_name);3523break;3524case EXISTS_IN_WORKTREE:3525returnerror(_("%s: already exists in working directory"),3526 new_name);3527default:3528return err;3529}35303531if(!patch->new_mode) {3532if(0< patch->is_new)3533 patch->new_mode = S_IFREG |0644;3534else3535 patch->new_mode = patch->old_mode;3536}3537}35383539if(new_name && old_name) {3540int same = !strcmp(old_name, new_name);3541if(!patch->new_mode)3542 patch->new_mode = patch->old_mode;3543if((patch->old_mode ^ patch->new_mode) & S_IFMT) {3544if(same)3545returnerror(_("new mode (%o) of%sdoes not "3546"match old mode (%o)"),3547 patch->new_mode, new_name,3548 patch->old_mode);3549else3550returnerror(_("new mode (%o) of%sdoes not "3551"match old mode (%o) of%s"),3552 patch->new_mode, new_name,3553 patch->old_mode, old_name);3554}3555}35563557if(apply_data(patch, &st, ce) <0)3558returnerror(_("%s: patch does not apply"), name);3559 patch->rejected =0;3560return0;3561}35623563static intcheck_patch_list(struct patch *patch)3564{3565int err =0;35663567prepare_fn_table(patch);3568while(patch) {3569if(apply_verbosely)3570say_patch_name(stderr,3571_("Checking patch%s..."), patch);3572 err |=check_patch(patch);3573 patch = patch->next;3574}3575return err;3576}35773578/* This function tries to read the sha1 from the current index */3579static intget_current_sha1(const char*path,unsigned char*sha1)3580{3581int pos;35823583if(read_cache() <0)3584return-1;3585 pos =cache_name_pos(path,strlen(path));3586if(pos <0)3587return-1;3588hashcpy(sha1, active_cache[pos]->sha1);3589return0;3590}35913592/* Build an index that contains the just the files needed for a 3way merge */3593static voidbuild_fake_ancestor(struct patch *list,const char*filename)3594{3595struct patch *patch;3596struct index_state result = { NULL };3597int fd;35983599/* Once we start supporting the reverse patch, it may be3600 * worth showing the new sha1 prefix, but until then...3601 */3602for(patch = list; patch; patch = patch->next) {3603const unsigned char*sha1_ptr;3604unsigned char sha1[20];3605struct cache_entry *ce;3606const char*name;36073608 name = patch->old_name ? patch->old_name : patch->new_name;3609if(0< patch->is_new)3610continue;3611else if(get_sha1_blob(patch->old_sha1_prefix, sha1))3612/* git diff has no index line for mode/type changes */3613if(!patch->lines_added && !patch->lines_deleted) {3614if(get_current_sha1(patch->old_name, sha1))3615die("mode change for%s, which is not "3616"in current HEAD", name);3617 sha1_ptr = sha1;3618}else3619die("sha1 information is lacking or useless "3620"(%s).", name);3621else3622 sha1_ptr = sha1;36233624 ce =make_cache_entry(patch->old_mode, sha1_ptr, name,0,0);3625if(!ce)3626die(_("make_cache_entry failed for path '%s'"), name);3627if(add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))3628die("Could not add%sto temporary index", name);3629}36303631 fd =open(filename, O_WRONLY | O_CREAT,0666);3632if(fd <0||write_index(&result, fd) ||close(fd))3633die("Could not write temporary index to%s", filename);36343635discard_index(&result);3636}36373638static voidstat_patch_list(struct patch *patch)3639{3640int files, adds, dels;36413642for(files = adds = dels =0; patch ; patch = patch->next) {3643 files++;3644 adds += patch->lines_added;3645 dels += patch->lines_deleted;3646show_stats(patch);3647}36483649print_stat_summary(stdout, files, adds, dels);3650}36513652static voidnumstat_patch_list(struct patch *patch)3653{3654for( ; patch; patch = patch->next) {3655const char*name;3656 name = patch->new_name ? patch->new_name : patch->old_name;3657if(patch->is_binary)3658printf("-\t-\t");3659else3660printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);3661write_name_quoted(name, stdout, line_termination);3662}3663}36643665static voidshow_file_mode_name(const char*newdelete,unsigned int mode,const char*name)3666{3667if(mode)3668printf("%smode%06o%s\n", newdelete, mode, name);3669else3670printf("%s %s\n", newdelete, name);3671}36723673static voidshow_mode_change(struct patch *p,int show_name)3674{3675if(p->old_mode && p->new_mode && p->old_mode != p->new_mode) {3676if(show_name)3677printf(" mode change%06o =>%06o%s\n",3678 p->old_mode, p->new_mode, p->new_name);3679else3680printf(" mode change%06o =>%06o\n",3681 p->old_mode, p->new_mode);3682}3683}36843685static voidshow_rename_copy(struct patch *p)3686{3687const char*renamecopy = p->is_rename ?"rename":"copy";3688const char*old, *new;36893690/* Find common prefix */3691 old = p->old_name;3692new= p->new_name;3693while(1) {3694const char*slash_old, *slash_new;3695 slash_old =strchr(old,'/');3696 slash_new =strchr(new,'/');3697if(!slash_old ||3698!slash_new ||3699 slash_old - old != slash_new -new||3700memcmp(old,new, slash_new -new))3701break;3702 old = slash_old +1;3703new= slash_new +1;3704}3705/* p->old_name thru old is the common prefix, and old and new3706 * through the end of names are renames3707 */3708if(old != p->old_name)3709printf("%s%.*s{%s=>%s} (%d%%)\n", renamecopy,3710(int)(old - p->old_name), p->old_name,3711 old,new, p->score);3712else3713printf("%s %s=>%s(%d%%)\n", renamecopy,3714 p->old_name, p->new_name, p->score);3715show_mode_change(p,0);3716}37173718static voidsummary_patch_list(struct patch *patch)3719{3720struct patch *p;37213722for(p = patch; p; p = p->next) {3723if(p->is_new)3724show_file_mode_name("create", p->new_mode, p->new_name);3725else if(p->is_delete)3726show_file_mode_name("delete", p->old_mode, p->old_name);3727else{3728if(p->is_rename || p->is_copy)3729show_rename_copy(p);3730else{3731if(p->score) {3732printf(" rewrite%s(%d%%)\n",3733 p->new_name, p->score);3734show_mode_change(p,0);3735}3736else3737show_mode_change(p,1);3738}3739}3740}3741}37423743static voidpatch_stats(struct patch *patch)3744{3745int lines = patch->lines_added + patch->lines_deleted;37463747if(lines > max_change)3748 max_change = lines;3749if(patch->old_name) {3750int len =quote_c_style(patch->old_name, NULL, NULL,0);3751if(!len)3752 len =strlen(patch->old_name);3753if(len > max_len)3754 max_len = len;3755}3756if(patch->new_name) {3757int len =quote_c_style(patch->new_name, NULL, NULL,0);3758if(!len)3759 len =strlen(patch->new_name);3760if(len > max_len)3761 max_len = len;3762}3763}37643765static voidremove_file(struct patch *patch,int rmdir_empty)3766{3767if(update_index) {3768if(remove_file_from_cache(patch->old_name) <0)3769die(_("unable to remove%sfrom index"), patch->old_name);3770}3771if(!cached) {3772if(!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {3773remove_path(patch->old_name);3774}3775}3776}37773778static voidadd_index_file(const char*path,unsigned mode,void*buf,unsigned long size)3779{3780struct stat st;3781struct cache_entry *ce;3782int namelen =strlen(path);3783unsigned ce_size =cache_entry_size(namelen);37843785if(!update_index)3786return;37873788 ce =xcalloc(1, ce_size);3789memcpy(ce->name, path, namelen);3790 ce->ce_mode =create_ce_mode(mode);3791 ce->ce_flags =create_ce_flags(0);3792 ce->ce_namelen = namelen;3793if(S_ISGITLINK(mode)) {3794const char*s = buf;37953796if(get_sha1_hex(s +strlen("Subproject commit "), ce->sha1))3797die(_("corrupt patch for subproject%s"), path);3798}else{3799if(!cached) {3800if(lstat(path, &st) <0)3801die_errno(_("unable to stat newly created file '%s'"),3802 path);3803fill_stat_cache_info(ce, &st);3804}3805if(write_sha1_file(buf, size, blob_type, ce->sha1) <0)3806die(_("unable to create backing store for newly created file%s"), path);3807}3808if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)3809die(_("unable to add cache entry for%s"), path);3810}38113812static inttry_create_file(const char*path,unsigned int mode,const char*buf,unsigned long size)3813{3814int fd;3815struct strbuf nbuf = STRBUF_INIT;38163817if(S_ISGITLINK(mode)) {3818struct stat st;3819if(!lstat(path, &st) &&S_ISDIR(st.st_mode))3820return0;3821returnmkdir(path,0777);3822}38233824if(has_symlinks &&S_ISLNK(mode))3825/* Although buf:size is counted string, it also is NUL3826 * terminated.3827 */3828returnsymlink(buf, path);38293830 fd =open(path, O_CREAT | O_EXCL | O_WRONLY, (mode &0100) ?0777:0666);3831if(fd <0)3832return-1;38333834if(convert_to_working_tree(path, buf, size, &nbuf)) {3835 size = nbuf.len;3836 buf = nbuf.buf;3837}3838write_or_die(fd, buf, size);3839strbuf_release(&nbuf);38403841if(close(fd) <0)3842die_errno(_("closing file '%s'"), path);3843return0;3844}38453846/*3847 * We optimistically assume that the directories exist,3848 * which is true 99% of the time anyway. If they don't,3849 * we create them and try again.3850 */3851static voidcreate_one_file(char*path,unsigned mode,const char*buf,unsigned long size)3852{3853if(cached)3854return;3855if(!try_create_file(path, mode, buf, size))3856return;38573858if(errno == ENOENT) {3859if(safe_create_leading_directories(path))3860return;3861if(!try_create_file(path, mode, buf, size))3862return;3863}38643865if(errno == EEXIST || errno == EACCES) {3866/* We may be trying to create a file where a directory3867 * used to be.3868 */3869struct stat st;3870if(!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))3871 errno = EEXIST;3872}38733874if(errno == EEXIST) {3875unsigned int nr =getpid();38763877for(;;) {3878char newpath[PATH_MAX];3879mksnpath(newpath,sizeof(newpath),"%s~%u", path, nr);3880if(!try_create_file(newpath, mode, buf, size)) {3881if(!rename(newpath, path))3882return;3883unlink_or_warn(newpath);3884break;3885}3886if(errno != EEXIST)3887break;3888++nr;3889}3890}3891die_errno(_("unable to write file '%s' mode%o"), path, mode);3892}38933894static voidadd_conflicted_stages_file(struct patch *patch)3895{3896int stage, namelen;3897unsigned ce_size, mode;3898struct cache_entry *ce;38993900if(!update_index)3901return;3902 namelen =strlen(patch->new_name);3903 ce_size =cache_entry_size(namelen);3904 mode = patch->new_mode ? patch->new_mode : (S_IFREG |0644);39053906remove_file_from_cache(patch->new_name);3907for(stage =1; stage <4; stage++) {3908if(is_null_sha1(patch->threeway_stage[stage -1]))3909continue;3910 ce =xcalloc(1, ce_size);3911memcpy(ce->name, patch->new_name, namelen);3912 ce->ce_mode =create_ce_mode(mode);3913 ce->ce_flags =create_ce_flags(stage);3914 ce->ce_namelen = namelen;3915hashcpy(ce->sha1, patch->threeway_stage[stage -1]);3916if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)3917die(_("unable to add cache entry for%s"), patch->new_name);3918}3919}39203921static voidcreate_file(struct patch *patch)3922{3923char*path = patch->new_name;3924unsigned mode = patch->new_mode;3925unsigned long size = patch->resultsize;3926char*buf = patch->result;39273928if(!mode)3929 mode = S_IFREG |0644;3930create_one_file(path, mode, buf, size);39313932if(patch->conflicted_threeway)3933add_conflicted_stages_file(patch);3934else3935add_index_file(path, mode, buf, size);3936}39373938/* phase zero is to remove, phase one is to create */3939static voidwrite_out_one_result(struct patch *patch,int phase)3940{3941if(patch->is_delete >0) {3942if(phase ==0)3943remove_file(patch,1);3944return;3945}3946if(patch->is_new >0|| patch->is_copy) {3947if(phase ==1)3948create_file(patch);3949return;3950}3951/*3952 * Rename or modification boils down to the same3953 * thing: remove the old, write the new3954 */3955if(phase ==0)3956remove_file(patch, patch->is_rename);3957if(phase ==1)3958create_file(patch);3959}39603961static intwrite_out_one_reject(struct patch *patch)3962{3963FILE*rej;3964char namebuf[PATH_MAX];3965struct fragment *frag;3966int cnt =0;3967struct strbuf sb = STRBUF_INIT;39683969for(cnt =0, frag = patch->fragments; frag; frag = frag->next) {3970if(!frag->rejected)3971continue;3972 cnt++;3973}39743975if(!cnt) {3976if(apply_verbosely)3977say_patch_name(stderr,3978_("Applied patch%scleanly."), patch);3979return0;3980}39813982/* This should not happen, because a removal patch that leaves3983 * contents are marked "rejected" at the patch level.3984 */3985if(!patch->new_name)3986die(_("internal error"));39873988/* Say this even without --verbose */3989strbuf_addf(&sb,Q_("Applying patch %%swith%dreject...",3990"Applying patch %%swith%drejects...",3991 cnt),3992 cnt);3993say_patch_name(stderr, sb.buf, patch);3994strbuf_release(&sb);39953996 cnt =strlen(patch->new_name);3997if(ARRAY_SIZE(namebuf) <= cnt +5) {3998 cnt =ARRAY_SIZE(namebuf) -5;3999warning(_("truncating .rej filename to %.*s.rej"),4000 cnt -1, patch->new_name);4001}4002memcpy(namebuf, patch->new_name, cnt);4003memcpy(namebuf + cnt,".rej",5);40044005 rej =fopen(namebuf,"w");4006if(!rej)4007returnerror(_("cannot open%s:%s"), namebuf,strerror(errno));40084009/* Normal git tools never deal with .rej, so do not pretend4010 * this is a git patch by saying --git nor give extended4011 * headers. While at it, maybe please "kompare" that wants4012 * the trailing TAB and some garbage at the end of line ;-).4013 */4014fprintf(rej,"diff a/%sb/%s\t(rejected hunks)\n",4015 patch->new_name, patch->new_name);4016for(cnt =1, frag = patch->fragments;4017 frag;4018 cnt++, frag = frag->next) {4019if(!frag->rejected) {4020fprintf_ln(stderr,_("Hunk #%dapplied cleanly."), cnt);4021continue;4022}4023fprintf_ln(stderr,_("Rejected hunk #%d."), cnt);4024fprintf(rej,"%.*s", frag->size, frag->patch);4025if(frag->patch[frag->size-1] !='\n')4026fputc('\n', rej);4027}4028fclose(rej);4029return-1;4030}40314032static intwrite_out_results(struct patch *list)4033{4034int phase;4035int errs =0;4036struct patch *l;4037struct string_list cpath = STRING_LIST_INIT_DUP;40384039for(phase =0; phase <2; phase++) {4040 l = list;4041while(l) {4042if(l->rejected)4043 errs =1;4044else{4045write_out_one_result(l, phase);4046if(phase ==1) {4047if(write_out_one_reject(l))4048 errs =1;4049if(l->conflicted_threeway) {4050string_list_append(&cpath, l->new_name);4051 errs =1;4052}4053}4054}4055 l = l->next;4056}4057}40584059if(cpath.nr) {4060struct string_list_item *item;40614062sort_string_list(&cpath);4063for_each_string_list_item(item, &cpath)4064fprintf(stderr,"U%s\n", item->string);4065string_list_clear(&cpath,0);40664067rerere(0);4068}40694070return errs;4071}40724073static struct lock_file lock_file;40744075static struct string_list limit_by_name;4076static int has_include;4077static voidadd_name_limit(const char*name,int exclude)4078{4079struct string_list_item *it;40804081 it =string_list_append(&limit_by_name, name);4082 it->util = exclude ? NULL : (void*)1;4083}40844085static intuse_patch(struct patch *p)4086{4087const char*pathname = p->new_name ? p->new_name : p->old_name;4088int i;40894090/* Paths outside are not touched regardless of "--include" */4091if(0< prefix_length) {4092int pathlen =strlen(pathname);4093if(pathlen <= prefix_length ||4094memcmp(prefix, pathname, prefix_length))4095return0;4096}40974098/* See if it matches any of exclude/include rule */4099for(i =0; i < limit_by_name.nr; i++) {4100struct string_list_item *it = &limit_by_name.items[i];4101if(!fnmatch(it->string, pathname,0))4102return(it->util != NULL);4103}41044105/*4106 * If we had any include, a path that does not match any rule is4107 * not used. Otherwise, we saw bunch of exclude rules (or none)4108 * and such a path is used.4109 */4110return!has_include;4111}411241134114static voidprefix_one(char**name)4115{4116char*old_name = *name;4117if(!old_name)4118return;4119*name =xstrdup(prefix_filename(prefix, prefix_length, *name));4120free(old_name);4121}41224123static voidprefix_patches(struct patch *p)4124{4125if(!prefix || p->is_toplevel_relative)4126return;4127for( ; p; p = p->next) {4128prefix_one(&p->new_name);4129prefix_one(&p->old_name);4130}4131}41324133#define INACCURATE_EOF (1<<0)4134#define RECOUNT (1<<1)41354136static intapply_patch(int fd,const char*filename,int options)4137{4138size_t offset;4139struct strbuf buf = STRBUF_INIT;/* owns the patch text */4140struct patch *list = NULL, **listp = &list;4141int skipped_patch =0;41424143 patch_input_file = filename;4144read_patch_file(&buf, fd);4145 offset =0;4146while(offset < buf.len) {4147struct patch *patch;4148int nr;41494150 patch =xcalloc(1,sizeof(*patch));4151 patch->inaccurate_eof = !!(options & INACCURATE_EOF);4152 patch->recount = !!(options & RECOUNT);4153 nr =parse_chunk(buf.buf + offset, buf.len - offset, patch);4154if(nr <0)4155break;4156if(apply_in_reverse)4157reverse_patches(patch);4158if(prefix)4159prefix_patches(patch);4160if(use_patch(patch)) {4161patch_stats(patch);4162*listp = patch;4163 listp = &patch->next;4164}4165else{4166free_patch(patch);4167 skipped_patch++;4168}4169 offset += nr;4170}41714172if(!list && !skipped_patch)4173die(_("unrecognized input"));41744175if(whitespace_error && (ws_error_action == die_on_ws_error))4176 apply =0;41774178 update_index = check_index && apply;4179if(update_index && newfd <0)4180 newfd =hold_locked_index(&lock_file,1);41814182if(check_index) {4183if(read_cache() <0)4184die(_("unable to read index file"));4185}41864187if((check || apply) &&4188check_patch_list(list) <0&&4189!apply_with_reject)4190exit(1);41914192if(apply &&write_out_results(list)) {4193if(apply_with_reject)4194exit(1);4195/* with --3way, we still need to write the index out */4196return1;4197}41984199if(fake_ancestor)4200build_fake_ancestor(list, fake_ancestor);42014202if(diffstat)4203stat_patch_list(list);42044205if(numstat)4206numstat_patch_list(list);42074208if(summary)4209summary_patch_list(list);42104211free_patch_list(list);4212strbuf_release(&buf);4213string_list_clear(&fn_table,0);4214return0;4215}42164217static intgit_apply_config(const char*var,const char*value,void*cb)4218{4219if(!strcmp(var,"apply.whitespace"))4220returngit_config_string(&apply_default_whitespace, var, value);4221else if(!strcmp(var,"apply.ignorewhitespace"))4222returngit_config_string(&apply_default_ignorewhitespace, var, value);4223returngit_default_config(var, value, cb);4224}42254226static intoption_parse_exclude(const struct option *opt,4227const char*arg,int unset)4228{4229add_name_limit(arg,1);4230return0;4231}42324233static intoption_parse_include(const struct option *opt,4234const char*arg,int unset)4235{4236add_name_limit(arg,0);4237 has_include =1;4238return0;4239}42404241static intoption_parse_p(const struct option *opt,4242const char*arg,int unset)4243{4244 p_value =atoi(arg);4245 p_value_known =1;4246return0;4247}42484249static intoption_parse_z(const struct option *opt,4250const char*arg,int unset)4251{4252if(unset)4253 line_termination ='\n';4254else4255 line_termination =0;4256return0;4257}42584259static intoption_parse_space_change(const struct option *opt,4260const char*arg,int unset)4261{4262if(unset)4263 ws_ignore_action = ignore_ws_none;4264else4265 ws_ignore_action = ignore_ws_change;4266return0;4267}42684269static intoption_parse_whitespace(const struct option *opt,4270const char*arg,int unset)4271{4272const char**whitespace_option = opt->value;42734274*whitespace_option = arg;4275parse_whitespace_option(arg);4276return0;4277}42784279static intoption_parse_directory(const struct option *opt,4280const char*arg,int unset)4281{4282 root_len =strlen(arg);4283if(root_len && arg[root_len -1] !='/') {4284char*new_root;4285 root = new_root =xmalloc(root_len +2);4286strcpy(new_root, arg);4287strcpy(new_root + root_len++,"/");4288}else4289 root = arg;4290return0;4291}42924293intcmd_apply(int argc,const char**argv,const char*prefix_)4294{4295int i;4296int errs =0;4297int is_not_gitdir = !startup_info->have_repository;4298int force_apply =0;42994300const char*whitespace_option = NULL;43014302struct option builtin_apply_options[] = {4303{ OPTION_CALLBACK,0,"exclude", NULL,N_("path"),4304N_("don't apply changes matching the given path"),43050, option_parse_exclude },4306{ OPTION_CALLBACK,0,"include", NULL,N_("path"),4307N_("apply changes matching the given path"),43080, option_parse_include },4309{ OPTION_CALLBACK,'p', NULL, NULL,N_("num"),4310N_("remove <num> leading slashes from traditional diff paths"),43110, option_parse_p },4312OPT_BOOLEAN(0,"no-add", &no_add,4313N_("ignore additions made by the patch")),4314OPT_BOOLEAN(0,"stat", &diffstat,4315N_("instead of applying the patch, output diffstat for the input")),4316OPT_NOOP_NOARG(0,"allow-binary-replacement"),4317OPT_NOOP_NOARG(0,"binary"),4318OPT_BOOLEAN(0,"numstat", &numstat,4319N_("shows number of added and deleted lines in decimal notation")),4320OPT_BOOLEAN(0,"summary", &summary,4321N_("instead of applying the patch, output a summary for the input")),4322OPT_BOOLEAN(0,"check", &check,4323N_("instead of applying the patch, see if the patch is applicable")),4324OPT_BOOLEAN(0,"index", &check_index,4325N_("make sure the patch is applicable to the current index")),4326OPT_BOOLEAN(0,"cached", &cached,4327N_("apply a patch without touching the working tree")),4328OPT_BOOLEAN(0,"apply", &force_apply,4329N_("also apply the patch (use with --stat/--summary/--check)")),4330OPT_BOOL('3',"3way", &threeway,4331N_("attempt three-way merge if a patch does not apply")),4332OPT_FILENAME(0,"build-fake-ancestor", &fake_ancestor,4333N_("build a temporary index based on embedded index information")),4334{ OPTION_CALLBACK,'z', NULL, NULL, NULL,4335N_("paths are separated with NUL character"),4336 PARSE_OPT_NOARG, option_parse_z },4337OPT_INTEGER('C', NULL, &p_context,4338N_("ensure at least <n> lines of context match")),4339{ OPTION_CALLBACK,0,"whitespace", &whitespace_option,N_("action"),4340N_("detect new or modified lines that have whitespace errors"),43410, option_parse_whitespace },4342{ OPTION_CALLBACK,0,"ignore-space-change", NULL, NULL,4343N_("ignore changes in whitespace when finding context"),4344 PARSE_OPT_NOARG, option_parse_space_change },4345{ OPTION_CALLBACK,0,"ignore-whitespace", NULL, NULL,4346N_("ignore changes in whitespace when finding context"),4347 PARSE_OPT_NOARG, option_parse_space_change },4348OPT_BOOLEAN('R',"reverse", &apply_in_reverse,4349N_("apply the patch in reverse")),4350OPT_BOOLEAN(0,"unidiff-zero", &unidiff_zero,4351N_("don't expect at least one line of context")),4352OPT_BOOLEAN(0,"reject", &apply_with_reject,4353N_("leave the rejected hunks in corresponding *.rej files")),4354OPT_BOOLEAN(0,"allow-overlap", &allow_overlap,4355N_("allow overlapping hunks")),4356OPT__VERBOSE(&apply_verbosely,N_("be verbose")),4357OPT_BIT(0,"inaccurate-eof", &options,4358N_("tolerate incorrectly detected missing new-line at the end of file"),4359 INACCURATE_EOF),4360OPT_BIT(0,"recount", &options,4361N_("do not trust the line counts in the hunk headers"),4362 RECOUNT),4363{ OPTION_CALLBACK,0,"directory", NULL,N_("root"),4364N_("prepend <root> to all filenames"),43650, option_parse_directory },4366OPT_END()4367};43684369 prefix = prefix_;4370 prefix_length = prefix ?strlen(prefix) :0;4371git_config(git_apply_config, NULL);4372if(apply_default_whitespace)4373parse_whitespace_option(apply_default_whitespace);4374if(apply_default_ignorewhitespace)4375parse_ignorewhitespace_option(apply_default_ignorewhitespace);43764377 argc =parse_options(argc, argv, prefix, builtin_apply_options,4378 apply_usage,0);43794380if(apply_with_reject && threeway)4381die("--reject and --3way cannot be used together.");4382if(cached && threeway)4383die("--cached and --3way cannot be used together.");4384if(threeway) {4385if(is_not_gitdir)4386die(_("--3way outside a repository"));4387 check_index =1;4388}4389if(apply_with_reject)4390 apply = apply_verbosely =1;4391if(!force_apply && (diffstat || numstat || summary || check || fake_ancestor))4392 apply =0;4393if(check_index && is_not_gitdir)4394die(_("--index outside a repository"));4395if(cached) {4396if(is_not_gitdir)4397die(_("--cached outside a repository"));4398 check_index =1;4399}4400for(i =0; i < argc; i++) {4401const char*arg = argv[i];4402int fd;44034404if(!strcmp(arg,"-")) {4405 errs |=apply_patch(0,"<stdin>", options);4406 read_stdin =0;4407continue;4408}else if(0< prefix_length)4409 arg =prefix_filename(prefix, prefix_length, arg);44104411 fd =open(arg, O_RDONLY);4412if(fd <0)4413die_errno(_("can't open patch '%s'"), arg);4414 read_stdin =0;4415set_default_whitespace_mode(whitespace_option);4416 errs |=apply_patch(fd, arg, options);4417close(fd);4418}4419set_default_whitespace_mode(whitespace_option);4420if(read_stdin)4421 errs |=apply_patch(0,"<stdin>", options);4422if(whitespace_error) {4423if(squelch_whitespace_errors &&4424 squelch_whitespace_errors < whitespace_error) {4425int squelched =4426 whitespace_error - squelch_whitespace_errors;4427warning(Q_("squelched%dwhitespace error",4428"squelched%dwhitespace errors",4429 squelched),4430 squelched);4431}4432if(ws_error_action == die_on_ws_error)4433die(Q_("%dline adds whitespace errors.",4434"%dlines add whitespace errors.",4435 whitespace_error),4436 whitespace_error);4437if(applied_after_fixing_ws && apply)4438warning("%dline%sapplied after"4439" fixing whitespace errors.",4440 applied_after_fixing_ws,4441 applied_after_fixing_ws ==1?"":"s");4442else if(whitespace_error)4443warning(Q_("%dline adds whitespace errors.",4444"%dlines add whitespace errors.",4445 whitespace_error),4446 whitespace_error);4447}44484449if(update_index) {4450if(write_cache(newfd, active_cache, active_nr) ||4451commit_locked_index(&lock_file))4452die(_("Unable to write new index file"));4453}44544455return!!errs;4456}