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{1044if((patch->score =strtoul(line, NULL,10)) == ULONG_MAX)1045 patch->score =0;1046return0;1047}10481049static intgitdiff_dissimilarity(const char*line,struct patch *patch)1050{1051if((patch->score =strtoul(line, NULL,10)) == ULONG_MAX)1052 patch->score =0;1053return0;1054}10551056static intgitdiff_index(const char*line,struct patch *patch)1057{1058/*1059 * index line is N hexadecimal, "..", N hexadecimal,1060 * and optional space with octal mode.1061 */1062const char*ptr, *eol;1063int len;10641065 ptr =strchr(line,'.');1066if(!ptr || ptr[1] !='.'||40< ptr - line)1067return0;1068 len = ptr - line;1069memcpy(patch->old_sha1_prefix, line, len);1070 patch->old_sha1_prefix[len] =0;10711072 line = ptr +2;1073 ptr =strchr(line,' ');1074 eol =strchr(line,'\n');10751076if(!ptr || eol < ptr)1077 ptr = eol;1078 len = ptr - line;10791080if(40< len)1081return0;1082memcpy(patch->new_sha1_prefix, line, len);1083 patch->new_sha1_prefix[len] =0;1084if(*ptr ==' ')1085 patch->old_mode =strtoul(ptr+1, NULL,8);1086return0;1087}10881089/*1090 * This is normal for a diff that doesn't change anything: we'll fall through1091 * into the next diff. Tell the parser to break out.1092 */1093static intgitdiff_unrecognized(const char*line,struct patch *patch)1094{1095return-1;1096}10971098/*1099 * Skip p_value leading components from "line"; as we do not accept1100 * absolute paths, return NULL in that case.1101 */1102static const char*skip_tree_prefix(const char*line,int llen)1103{1104int nslash;1105int i;11061107if(!p_value)1108return(llen && line[0] =='/') ? NULL : line;11091110 nslash = p_value;1111for(i =0; i < llen; i++) {1112int ch = line[i];1113if(ch =='/'&& --nslash <=0)1114return(i ==0) ? NULL : &line[i +1];1115}1116return NULL;1117}11181119/*1120 * This is to extract the same name that appears on "diff --git"1121 * line. We do not find and return anything if it is a rename1122 * patch, and it is OK because we will find the name elsewhere.1123 * We need to reliably find name only when it is mode-change only,1124 * creation or deletion of an empty file. In any of these cases,1125 * both sides are the same name under a/ and b/ respectively.1126 */1127static char*git_header_name(const char*line,int llen)1128{1129const char*name;1130const char*second = NULL;1131size_t len, line_len;11321133 line +=strlen("diff --git ");1134 llen -=strlen("diff --git ");11351136if(*line =='"') {1137const char*cp;1138struct strbuf first = STRBUF_INIT;1139struct strbuf sp = STRBUF_INIT;11401141if(unquote_c_style(&first, line, &second))1142goto free_and_fail1;11431144/* strip the a/b prefix including trailing slash */1145 cp =skip_tree_prefix(first.buf, first.len);1146if(!cp)1147goto free_and_fail1;1148strbuf_remove(&first,0, cp - first.buf);11491150/*1151 * second points at one past closing dq of name.1152 * find the second name.1153 */1154while((second < line + llen) &&isspace(*second))1155 second++;11561157if(line + llen <= second)1158goto free_and_fail1;1159if(*second =='"') {1160if(unquote_c_style(&sp, second, NULL))1161goto free_and_fail1;1162 cp =skip_tree_prefix(sp.buf, sp.len);1163if(!cp)1164goto free_and_fail1;1165/* They must match, otherwise ignore */1166if(strcmp(cp, first.buf))1167goto free_and_fail1;1168strbuf_release(&sp);1169returnstrbuf_detach(&first, NULL);1170}11711172/* unquoted second */1173 cp =skip_tree_prefix(second, line + llen - second);1174if(!cp)1175goto free_and_fail1;1176if(line + llen - cp != first.len ||1177memcmp(first.buf, cp, first.len))1178goto free_and_fail1;1179returnstrbuf_detach(&first, NULL);11801181 free_and_fail1:1182strbuf_release(&first);1183strbuf_release(&sp);1184return NULL;1185}11861187/* unquoted first name */1188 name =skip_tree_prefix(line, llen);1189if(!name)1190return NULL;11911192/*1193 * since the first name is unquoted, a dq if exists must be1194 * the beginning of the second name.1195 */1196for(second = name; second < line + llen; second++) {1197if(*second =='"') {1198struct strbuf sp = STRBUF_INIT;1199const char*np;12001201if(unquote_c_style(&sp, second, NULL))1202goto free_and_fail2;12031204 np =skip_tree_prefix(sp.buf, sp.len);1205if(!np)1206goto free_and_fail2;12071208 len = sp.buf + sp.len - np;1209if(len < second - name &&1210!strncmp(np, name, len) &&1211isspace(name[len])) {1212/* Good */1213strbuf_remove(&sp,0, np - sp.buf);1214returnstrbuf_detach(&sp, NULL);1215}12161217 free_and_fail2:1218strbuf_release(&sp);1219return NULL;1220}1221}12221223/*1224 * Accept a name only if it shows up twice, exactly the same1225 * form.1226 */1227 second =strchr(name,'\n');1228if(!second)1229return NULL;1230 line_len = second - name;1231for(len =0; ; len++) {1232switch(name[len]) {1233default:1234continue;1235case'\n':1236return NULL;1237case'\t':case' ':1238/*1239 * Is this the separator between the preimage1240 * and the postimage pathname? Again, we are1241 * only interested in the case where there is1242 * no rename, as this is only to set def_name1243 * and a rename patch has the names elsewhere1244 * in an unambiguous form.1245 */1246if(!name[len +1])1247return NULL;/* no postimage name */1248 second =skip_tree_prefix(name + len +1,1249 line_len - (len +1));1250if(!second)1251return NULL;1252/*1253 * Does len bytes starting at "name" and "second"1254 * (that are separated by one HT or SP we just1255 * found) exactly match?1256 */1257if(second[len] =='\n'&& !strncmp(name, second, len))1258returnxmemdupz(name, len);1259}1260}1261}12621263/* Verify that we recognize the lines following a git header */1264static intparse_git_header(const char*line,int len,unsigned int size,struct patch *patch)1265{1266unsigned long offset;12671268/* A git diff has explicit new/delete information, so we don't guess */1269 patch->is_new =0;1270 patch->is_delete =0;12711272/*1273 * Some things may not have the old name in the1274 * rest of the headers anywhere (pure mode changes,1275 * or removing or adding empty files), so we get1276 * the default name from the header.1277 */1278 patch->def_name =git_header_name(line, len);1279if(patch->def_name && root) {1280char*s =xmalloc(root_len +strlen(patch->def_name) +1);1281strcpy(s, root);1282strcpy(s + root_len, patch->def_name);1283free(patch->def_name);1284 patch->def_name = s;1285}12861287 line += len;1288 size -= len;1289 linenr++;1290for(offset = len ; size >0; offset += len, size -= len, line += len, linenr++) {1291static const struct opentry {1292const char*str;1293int(*fn)(const char*,struct patch *);1294} optable[] = {1295{"@@ -", gitdiff_hdrend },1296{"--- ", gitdiff_oldname },1297{"+++ ", gitdiff_newname },1298{"old mode ", gitdiff_oldmode },1299{"new mode ", gitdiff_newmode },1300{"deleted file mode ", gitdiff_delete },1301{"new file mode ", gitdiff_newfile },1302{"copy from ", gitdiff_copysrc },1303{"copy to ", gitdiff_copydst },1304{"rename old ", gitdiff_renamesrc },1305{"rename new ", gitdiff_renamedst },1306{"rename from ", gitdiff_renamesrc },1307{"rename to ", gitdiff_renamedst },1308{"similarity index ", gitdiff_similarity },1309{"dissimilarity index ", gitdiff_dissimilarity },1310{"index ", gitdiff_index },1311{"", gitdiff_unrecognized },1312};1313int i;13141315 len =linelen(line, size);1316if(!len || line[len-1] !='\n')1317break;1318for(i =0; i <ARRAY_SIZE(optable); i++) {1319const struct opentry *p = optable + i;1320int oplen =strlen(p->str);1321if(len < oplen ||memcmp(p->str, line, oplen))1322continue;1323if(p->fn(line + oplen, patch) <0)1324return offset;1325break;1326}1327}13281329return offset;1330}13311332static intparse_num(const char*line,unsigned long*p)1333{1334char*ptr;13351336if(!isdigit(*line))1337return0;1338*p =strtoul(line, &ptr,10);1339return ptr - line;1340}13411342static intparse_range(const char*line,int len,int offset,const char*expect,1343unsigned long*p1,unsigned long*p2)1344{1345int digits, ex;13461347if(offset <0|| offset >= len)1348return-1;1349 line += offset;1350 len -= offset;13511352 digits =parse_num(line, p1);1353if(!digits)1354return-1;13551356 offset += digits;1357 line += digits;1358 len -= digits;13591360*p2 =1;1361if(*line ==',') {1362 digits =parse_num(line+1, p2);1363if(!digits)1364return-1;13651366 offset += digits+1;1367 line += digits+1;1368 len -= digits+1;1369}13701371 ex =strlen(expect);1372if(ex > len)1373return-1;1374if(memcmp(line, expect, ex))1375return-1;13761377return offset + ex;1378}13791380static voidrecount_diff(const char*line,int size,struct fragment *fragment)1381{1382int oldlines =0, newlines =0, ret =0;13831384if(size <1) {1385warning("recount: ignore empty hunk");1386return;1387}13881389for(;;) {1390int len =linelen(line, size);1391 size -= len;1392 line += len;13931394if(size <1)1395break;13961397switch(*line) {1398case' ':case'\n':1399 newlines++;1400/* fall through */1401case'-':1402 oldlines++;1403continue;1404case'+':1405 newlines++;1406continue;1407case'\\':1408continue;1409case'@':1410 ret = size <3||prefixcmp(line,"@@ ");1411break;1412case'd':1413 ret = size <5||prefixcmp(line,"diff ");1414break;1415default:1416 ret = -1;1417break;1418}1419if(ret) {1420warning(_("recount: unexpected line: %.*s"),1421(int)linelen(line, size), line);1422return;1423}1424break;1425}1426 fragment->oldlines = oldlines;1427 fragment->newlines = newlines;1428}14291430/*1431 * Parse a unified diff fragment header of the1432 * form "@@ -a,b +c,d @@"1433 */1434static intparse_fragment_header(const char*line,int len,struct fragment *fragment)1435{1436int offset;14371438if(!len || line[len-1] !='\n')1439return-1;14401441/* Figure out the number of lines in a fragment */1442 offset =parse_range(line, len,4," +", &fragment->oldpos, &fragment->oldlines);1443 offset =parse_range(line, len, offset," @@", &fragment->newpos, &fragment->newlines);14441445return offset;1446}14471448static intfind_header(const char*line,unsigned long size,int*hdrsize,struct patch *patch)1449{1450unsigned long offset, len;14511452 patch->is_toplevel_relative =0;1453 patch->is_rename = patch->is_copy =0;1454 patch->is_new = patch->is_delete = -1;1455 patch->old_mode = patch->new_mode =0;1456 patch->old_name = patch->new_name = NULL;1457for(offset =0; size >0; offset += len, size -= len, line += len, linenr++) {1458unsigned long nextlen;14591460 len =linelen(line, size);1461if(!len)1462break;14631464/* Testing this early allows us to take a few shortcuts.. */1465if(len <6)1466continue;14671468/*1469 * Make sure we don't find any unconnected patch fragments.1470 * That's a sign that we didn't find a header, and that a1471 * patch has become corrupted/broken up.1472 */1473if(!memcmp("@@ -", line,4)) {1474struct fragment dummy;1475if(parse_fragment_header(line, len, &dummy) <0)1476continue;1477die(_("patch fragment without header at line%d: %.*s"),1478 linenr, (int)len-1, line);1479}14801481if(size < len +6)1482break;14831484/*1485 * Git patch? It might not have a real patch, just a rename1486 * or mode change, so we handle that specially1487 */1488if(!memcmp("diff --git ", line,11)) {1489int git_hdr_len =parse_git_header(line, len, size, patch);1490if(git_hdr_len <= len)1491continue;1492if(!patch->old_name && !patch->new_name) {1493if(!patch->def_name)1494die(Q_("git diff header lacks filename information when removing "1495"%dleading pathname component (line%d)",1496"git diff header lacks filename information when removing "1497"%dleading pathname components (line%d)",1498 p_value),1499 p_value, linenr);1500 patch->old_name =xstrdup(patch->def_name);1501 patch->new_name =xstrdup(patch->def_name);1502}1503if(!patch->is_delete && !patch->new_name)1504die("git diff header lacks filename information "1505"(line%d)", linenr);1506 patch->is_toplevel_relative =1;1507*hdrsize = git_hdr_len;1508return offset;1509}15101511/* --- followed by +++ ? */1512if(memcmp("--- ", line,4) ||memcmp("+++ ", line + len,4))1513continue;15141515/*1516 * We only accept unified patches, so we want it to1517 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1518 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1519 */1520 nextlen =linelen(line + len, size - len);1521if(size < nextlen +14||memcmp("@@ -", line + len + nextlen,4))1522continue;15231524/* Ok, we'll consider it a patch */1525parse_traditional_patch(line, line+len, patch);1526*hdrsize = len + nextlen;1527 linenr +=2;1528return offset;1529}1530return-1;1531}15321533static voidrecord_ws_error(unsigned result,const char*line,int len,int linenr)1534{1535char*err;15361537if(!result)1538return;15391540 whitespace_error++;1541if(squelch_whitespace_errors &&1542 squelch_whitespace_errors < whitespace_error)1543return;15441545 err =whitespace_error_string(result);1546fprintf(stderr,"%s:%d:%s.\n%.*s\n",1547 patch_input_file, linenr, err, len, line);1548free(err);1549}15501551static voidcheck_whitespace(const char*line,int len,unsigned ws_rule)1552{1553unsigned result =ws_check(line +1, len -1, ws_rule);15541555record_ws_error(result, line +1, len -2, linenr);1556}15571558/*1559 * Parse a unified diff. Note that this really needs to parse each1560 * fragment separately, since the only way to know the difference1561 * between a "---" that is part of a patch, and a "---" that starts1562 * the next patch is to look at the line counts..1563 */1564static intparse_fragment(const char*line,unsigned long size,1565struct patch *patch,struct fragment *fragment)1566{1567int added, deleted;1568int len =linelen(line, size), offset;1569unsigned long oldlines, newlines;1570unsigned long leading, trailing;15711572 offset =parse_fragment_header(line, len, fragment);1573if(offset <0)1574return-1;1575if(offset >0&& patch->recount)1576recount_diff(line + offset, size - offset, fragment);1577 oldlines = fragment->oldlines;1578 newlines = fragment->newlines;1579 leading =0;1580 trailing =0;15811582/* Parse the thing.. */1583 line += len;1584 size -= len;1585 linenr++;1586 added = deleted =0;1587for(offset = len;15880< size;1589 offset += len, size -= len, line += len, linenr++) {1590if(!oldlines && !newlines)1591break;1592 len =linelen(line, size);1593if(!len || line[len-1] !='\n')1594return-1;1595switch(*line) {1596default:1597return-1;1598case'\n':/* newer GNU diff, an empty context line */1599case' ':1600 oldlines--;1601 newlines--;1602if(!deleted && !added)1603 leading++;1604 trailing++;1605break;1606case'-':1607if(apply_in_reverse &&1608 ws_error_action != nowarn_ws_error)1609check_whitespace(line, len, patch->ws_rule);1610 deleted++;1611 oldlines--;1612 trailing =0;1613break;1614case'+':1615if(!apply_in_reverse &&1616 ws_error_action != nowarn_ws_error)1617check_whitespace(line, len, patch->ws_rule);1618 added++;1619 newlines--;1620 trailing =0;1621break;16221623/*1624 * We allow "\ No newline at end of file". Depending1625 * on locale settings when the patch was produced we1626 * don't know what this line looks like. The only1627 * thing we do know is that it begins with "\ ".1628 * Checking for 12 is just for sanity check -- any1629 * l10n of "\ No newline..." is at least that long.1630 */1631case'\\':1632if(len <12||memcmp(line,"\\",2))1633return-1;1634break;1635}1636}1637if(oldlines || newlines)1638return-1;1639 fragment->leading = leading;1640 fragment->trailing = trailing;16411642/*1643 * If a fragment ends with an incomplete line, we failed to include1644 * it in the above loop because we hit oldlines == newlines == 01645 * before seeing it.1646 */1647if(12< size && !memcmp(line,"\\",2))1648 offset +=linelen(line, size);16491650 patch->lines_added += added;1651 patch->lines_deleted += deleted;16521653if(0< patch->is_new && oldlines)1654returnerror(_("new file depends on old contents"));1655if(0< patch->is_delete && newlines)1656returnerror(_("deleted file still has contents"));1657return offset;1658}16591660/*1661 * We have seen "diff --git a/... b/..." header (or a traditional patch1662 * header). Read hunks that belong to this patch into fragments and hang1663 * them to the given patch structure.1664 *1665 * The (fragment->patch, fragment->size) pair points into the memory given1666 * by the caller, not a copy, when we return.1667 */1668static intparse_single_patch(const char*line,unsigned long size,struct patch *patch)1669{1670unsigned long offset =0;1671unsigned long oldlines =0, newlines =0, context =0;1672struct fragment **fragp = &patch->fragments;16731674while(size >4&& !memcmp(line,"@@ -",4)) {1675struct fragment *fragment;1676int len;16771678 fragment =xcalloc(1,sizeof(*fragment));1679 fragment->linenr = linenr;1680 len =parse_fragment(line, size, patch, fragment);1681if(len <=0)1682die(_("corrupt patch at line%d"), linenr);1683 fragment->patch = line;1684 fragment->size = len;1685 oldlines += fragment->oldlines;1686 newlines += fragment->newlines;1687 context += fragment->leading + fragment->trailing;16881689*fragp = fragment;1690 fragp = &fragment->next;16911692 offset += len;1693 line += len;1694 size -= len;1695}16961697/*1698 * If something was removed (i.e. we have old-lines) it cannot1699 * be creation, and if something was added it cannot be1700 * deletion. However, the reverse is not true; --unified=01701 * patches that only add are not necessarily creation even1702 * though they do not have any old lines, and ones that only1703 * delete are not necessarily deletion.1704 *1705 * Unfortunately, a real creation/deletion patch do _not_ have1706 * any context line by definition, so we cannot safely tell it1707 * apart with --unified=0 insanity. At least if the patch has1708 * more than one hunk it is not creation or deletion.1709 */1710if(patch->is_new <0&&1711(oldlines || (patch->fragments && patch->fragments->next)))1712 patch->is_new =0;1713if(patch->is_delete <0&&1714(newlines || (patch->fragments && patch->fragments->next)))1715 patch->is_delete =0;17161717if(0< patch->is_new && oldlines)1718die(_("new file%sdepends on old contents"), patch->new_name);1719if(0< patch->is_delete && newlines)1720die(_("deleted file%sstill has contents"), patch->old_name);1721if(!patch->is_delete && !newlines && context)1722fprintf_ln(stderr,1723_("** warning: "1724"file%sbecomes empty but is not deleted"),1725 patch->new_name);17261727return offset;1728}17291730staticinlineintmetadata_changes(struct patch *patch)1731{1732return patch->is_rename >0||1733 patch->is_copy >0||1734 patch->is_new >0||1735 patch->is_delete ||1736(patch->old_mode && patch->new_mode &&1737 patch->old_mode != patch->new_mode);1738}17391740static char*inflate_it(const void*data,unsigned long size,1741unsigned long inflated_size)1742{1743 git_zstream stream;1744void*out;1745int st;17461747memset(&stream,0,sizeof(stream));17481749 stream.next_in = (unsigned char*)data;1750 stream.avail_in = size;1751 stream.next_out = out =xmalloc(inflated_size);1752 stream.avail_out = inflated_size;1753git_inflate_init(&stream);1754 st =git_inflate(&stream, Z_FINISH);1755git_inflate_end(&stream);1756if((st != Z_STREAM_END) || stream.total_out != inflated_size) {1757free(out);1758return NULL;1759}1760return out;1761}17621763/*1764 * Read a binary hunk and return a new fragment; fragment->patch1765 * points at an allocated memory that the caller must free, so1766 * it is marked as "->free_patch = 1".1767 */1768static struct fragment *parse_binary_hunk(char**buf_p,1769unsigned long*sz_p,1770int*status_p,1771int*used_p)1772{1773/*1774 * Expect a line that begins with binary patch method ("literal"1775 * or "delta"), followed by the length of data before deflating.1776 * a sequence of 'length-byte' followed by base-85 encoded data1777 * should follow, terminated by a newline.1778 *1779 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1780 * and we would limit the patch line to 66 characters,1781 * so one line can fit up to 13 groups that would decode1782 * to 52 bytes max. The length byte 'A'-'Z' corresponds1783 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1784 */1785int llen, used;1786unsigned long size = *sz_p;1787char*buffer = *buf_p;1788int patch_method;1789unsigned long origlen;1790char*data = NULL;1791int hunk_size =0;1792struct fragment *frag;17931794 llen =linelen(buffer, size);1795 used = llen;17961797*status_p =0;17981799if(!prefixcmp(buffer,"delta ")) {1800 patch_method = BINARY_DELTA_DEFLATED;1801 origlen =strtoul(buffer +6, NULL,10);1802}1803else if(!prefixcmp(buffer,"literal ")) {1804 patch_method = BINARY_LITERAL_DEFLATED;1805 origlen =strtoul(buffer +8, NULL,10);1806}1807else1808return NULL;18091810 linenr++;1811 buffer += llen;1812while(1) {1813int byte_length, max_byte_length, newsize;1814 llen =linelen(buffer, size);1815 used += llen;1816 linenr++;1817if(llen ==1) {1818/* consume the blank line */1819 buffer++;1820 size--;1821break;1822}1823/*1824 * Minimum line is "A00000\n" which is 7-byte long,1825 * and the line length must be multiple of 5 plus 2.1826 */1827if((llen <7) || (llen-2) %5)1828goto corrupt;1829 max_byte_length = (llen -2) /5*4;1830 byte_length = *buffer;1831if('A'<= byte_length && byte_length <='Z')1832 byte_length = byte_length -'A'+1;1833else if('a'<= byte_length && byte_length <='z')1834 byte_length = byte_length -'a'+27;1835else1836goto corrupt;1837/* if the input length was not multiple of 4, we would1838 * have filler at the end but the filler should never1839 * exceed 3 bytes1840 */1841if(max_byte_length < byte_length ||1842 byte_length <= max_byte_length -4)1843goto corrupt;1844 newsize = hunk_size + byte_length;1845 data =xrealloc(data, newsize);1846if(decode_85(data + hunk_size, buffer +1, byte_length))1847goto corrupt;1848 hunk_size = newsize;1849 buffer += llen;1850 size -= llen;1851}18521853 frag =xcalloc(1,sizeof(*frag));1854 frag->patch =inflate_it(data, hunk_size, origlen);1855 frag->free_patch =1;1856if(!frag->patch)1857goto corrupt;1858free(data);1859 frag->size = origlen;1860*buf_p = buffer;1861*sz_p = size;1862*used_p = used;1863 frag->binary_patch_method = patch_method;1864return frag;18651866 corrupt:1867free(data);1868*status_p = -1;1869error(_("corrupt binary patch at line%d: %.*s"),1870 linenr-1, llen-1, buffer);1871return NULL;1872}18731874static intparse_binary(char*buffer,unsigned long size,struct patch *patch)1875{1876/*1877 * We have read "GIT binary patch\n"; what follows is a line1878 * that says the patch method (currently, either "literal" or1879 * "delta") and the length of data before deflating; a1880 * sequence of 'length-byte' followed by base-85 encoded data1881 * follows.1882 *1883 * When a binary patch is reversible, there is another binary1884 * hunk in the same format, starting with patch method (either1885 * "literal" or "delta") with the length of data, and a sequence1886 * of length-byte + base-85 encoded data, terminated with another1887 * empty line. This data, when applied to the postimage, produces1888 * the preimage.1889 */1890struct fragment *forward;1891struct fragment *reverse;1892int status;1893int used, used_1;18941895 forward =parse_binary_hunk(&buffer, &size, &status, &used);1896if(!forward && !status)1897/* there has to be one hunk (forward hunk) */1898returnerror(_("unrecognized binary patch at line%d"), linenr-1);1899if(status)1900/* otherwise we already gave an error message */1901return status;19021903 reverse =parse_binary_hunk(&buffer, &size, &status, &used_1);1904if(reverse)1905 used += used_1;1906else if(status) {1907/*1908 * Not having reverse hunk is not an error, but having1909 * a corrupt reverse hunk is.1910 */1911free((void*) forward->patch);1912free(forward);1913return status;1914}1915 forward->next = reverse;1916 patch->fragments = forward;1917 patch->is_binary =1;1918return used;1919}19201921/*1922 * Read the patch text in "buffer" taht extends for "size" bytes; stop1923 * reading after seeing a single patch (i.e. changes to a single file).1924 * Create fragments (i.e. patch hunks) and hang them to the given patch.1925 * Return the number of bytes consumed, so that the caller can call us1926 * again for the next patch.1927 */1928static intparse_chunk(char*buffer,unsigned long size,struct patch *patch)1929{1930int hdrsize, patchsize;1931int offset =find_header(buffer, size, &hdrsize, patch);19321933if(offset <0)1934return offset;19351936 patch->ws_rule =whitespace_rule(patch->new_name1937? patch->new_name1938: patch->old_name);19391940 patchsize =parse_single_patch(buffer + offset + hdrsize,1941 size - offset - hdrsize, patch);19421943if(!patchsize) {1944static const char*binhdr[] = {1945"Binary files ",1946"Files ",1947 NULL,1948};1949static const char git_binary[] ="GIT binary patch\n";1950int i;1951int hd = hdrsize + offset;1952unsigned long llen =linelen(buffer + hd, size - hd);19531954if(llen ==sizeof(git_binary) -1&&1955!memcmp(git_binary, buffer + hd, llen)) {1956int used;1957 linenr++;1958 used =parse_binary(buffer + hd + llen,1959 size - hd - llen, patch);1960if(used)1961 patchsize = used + llen;1962else1963 patchsize =0;1964}1965else if(!memcmp(" differ\n", buffer + hd + llen -8,8)) {1966for(i =0; binhdr[i]; i++) {1967int len =strlen(binhdr[i]);1968if(len < size - hd &&1969!memcmp(binhdr[i], buffer + hd, len)) {1970 linenr++;1971 patch->is_binary =1;1972 patchsize = llen;1973break;1974}1975}1976}19771978/* Empty patch cannot be applied if it is a text patch1979 * without metadata change. A binary patch appears1980 * empty to us here.1981 */1982if((apply || check) &&1983(!patch->is_binary && !metadata_changes(patch)))1984die(_("patch with only garbage at line%d"), linenr);1985}19861987return offset + hdrsize + patchsize;1988}19891990#define swap(a,b) myswap((a),(b),sizeof(a))19911992#define myswap(a, b, size) do { \1993 unsigned char mytmp[size]; \1994 memcpy(mytmp, &a, size); \1995 memcpy(&a, &b, size); \1996 memcpy(&b, mytmp, size); \1997} while (0)19981999static voidreverse_patches(struct patch *p)2000{2001for(; p; p = p->next) {2002struct fragment *frag = p->fragments;20032004swap(p->new_name, p->old_name);2005swap(p->new_mode, p->old_mode);2006swap(p->is_new, p->is_delete);2007swap(p->lines_added, p->lines_deleted);2008swap(p->old_sha1_prefix, p->new_sha1_prefix);20092010for(; frag; frag = frag->next) {2011swap(frag->newpos, frag->oldpos);2012swap(frag->newlines, frag->oldlines);2013}2014}2015}20162017static const char pluses[] =2018"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2019static const char minuses[]=2020"----------------------------------------------------------------------";20212022static voidshow_stats(struct patch *patch)2023{2024struct strbuf qname = STRBUF_INIT;2025char*cp = patch->new_name ? patch->new_name : patch->old_name;2026int max, add, del;20272028quote_c_style(cp, &qname, NULL,0);20292030/*2031 * "scale" the filename2032 */2033 max = max_len;2034if(max >50)2035 max =50;20362037if(qname.len > max) {2038 cp =strchr(qname.buf + qname.len +3- max,'/');2039if(!cp)2040 cp = qname.buf + qname.len +3- max;2041strbuf_splice(&qname,0, cp - qname.buf,"...",3);2042}20432044if(patch->is_binary) {2045printf(" %-*s | Bin\n", max, qname.buf);2046strbuf_release(&qname);2047return;2048}20492050printf(" %-*s |", max, qname.buf);2051strbuf_release(&qname);20522053/*2054 * scale the add/delete2055 */2056 max = max + max_change >70?70- max : max_change;2057 add = patch->lines_added;2058 del = patch->lines_deleted;20592060if(max_change >0) {2061int total = ((add + del) * max + max_change /2) / max_change;2062 add = (add * max + max_change /2) / max_change;2063 del = total - add;2064}2065printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2066 add, pluses, del, minuses);2067}20682069static intread_old_data(struct stat *st,const char*path,struct strbuf *buf)2070{2071switch(st->st_mode & S_IFMT) {2072case S_IFLNK:2073if(strbuf_readlink(buf, path, st->st_size) <0)2074returnerror(_("unable to read symlink%s"), path);2075return0;2076case S_IFREG:2077if(strbuf_read_file(buf, path, st->st_size) != st->st_size)2078returnerror(_("unable to open or read%s"), path);2079convert_to_git(path, buf->buf, buf->len, buf,0);2080return0;2081default:2082return-1;2083}2084}20852086/*2087 * Update the preimage, and the common lines in postimage,2088 * from buffer buf of length len. If postlen is 0 the postimage2089 * is updated in place, otherwise it's updated on a new buffer2090 * of length postlen2091 */20922093static voidupdate_pre_post_images(struct image *preimage,2094struct image *postimage,2095char*buf,2096size_t len,size_t postlen)2097{2098int i, ctx, reduced;2099char*new, *old, *fixed;2100struct image fixed_preimage;21012102/*2103 * Update the preimage with whitespace fixes. Note that we2104 * are not losing preimage->buf -- apply_one_fragment() will2105 * free "oldlines".2106 */2107prepare_image(&fixed_preimage, buf, len,1);2108assert(postlen2109? fixed_preimage.nr == preimage->nr2110: fixed_preimage.nr <= preimage->nr);2111for(i =0; i < fixed_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;21312132for(i = reduced = ctx =0; i < postimage->nr; i++) {2133size_t len = postimage->line[i].len;2134if(!(postimage->line[i].flag & LINE_COMMON)) {2135/* an added line -- no counterparts in preimage */2136memmove(new, old, len);2137 old += len;2138new+= len;2139continue;2140}21412142/* a common context -- skip it in the original postimage */2143 old += len;21442145/* and find the corresponding one in the fixed preimage */2146while(ctx < preimage->nr &&2147!(preimage->line[ctx].flag & LINE_COMMON)) {2148 fixed += preimage->line[ctx].len;2149 ctx++;2150}21512152/*2153 * preimage is expected to run out, if the caller2154 * fixed addition of trailing blank lines.2155 */2156if(preimage->nr <= ctx) {2157 reduced++;2158continue;2159}21602161/* and copy it in, while fixing the line length */2162 len = preimage->line[ctx].len;2163memcpy(new, fixed, len);2164new+= len;2165 fixed += len;2166 postimage->line[i].len = len;2167 ctx++;2168}21692170/* Fix the length of the whole thing */2171 postimage->len =new- postimage->buf;2172 postimage->nr -= reduced;2173}21742175static intmatch_fragment(struct image *img,2176struct image *preimage,2177struct image *postimage,2178unsigned longtry,2179int try_lno,2180unsigned ws_rule,2181int match_beginning,int match_end)2182{2183int i;2184char*fixed_buf, *buf, *orig, *target;2185struct strbuf fixed;2186size_t fixed_len;2187int preimage_limit;21882189if(preimage->nr + try_lno <= img->nr) {2190/*2191 * The hunk falls within the boundaries of img.2192 */2193 preimage_limit = preimage->nr;2194if(match_end && (preimage->nr + try_lno != img->nr))2195return0;2196}else if(ws_error_action == correct_ws_error &&2197(ws_rule & WS_BLANK_AT_EOF)) {2198/*2199 * This hunk extends beyond the end of img, and we are2200 * removing blank lines at the end of the file. This2201 * many lines from the beginning of the preimage must2202 * match with img, and the remainder of the preimage2203 * must be blank.2204 */2205 preimage_limit = img->nr - try_lno;2206}else{2207/*2208 * The hunk extends beyond the end of the img and2209 * we are not removing blanks at the end, so we2210 * should reject the hunk at this position.2211 */2212return0;2213}22142215if(match_beginning && try_lno)2216return0;22172218/* Quick hash check */2219for(i =0; i < preimage_limit; i++)2220if((img->line[try_lno + i].flag & LINE_PATCHED) ||2221(preimage->line[i].hash != img->line[try_lno + i].hash))2222return0;22232224if(preimage_limit == preimage->nr) {2225/*2226 * Do we have an exact match? If we were told to match2227 * at the end, size must be exactly at try+fragsize,2228 * otherwise try+fragsize must be still within the preimage,2229 * and either case, the old piece should match the preimage2230 * exactly.2231 */2232if((match_end2233? (try+ preimage->len == img->len)2234: (try+ preimage->len <= img->len)) &&2235!memcmp(img->buf +try, preimage->buf, preimage->len))2236return1;2237}else{2238/*2239 * The preimage extends beyond the end of img, so2240 * there cannot be an exact match.2241 *2242 * There must be one non-blank context line that match2243 * a line before the end of img.2244 */2245char*buf_end;22462247 buf = preimage->buf;2248 buf_end = buf;2249for(i =0; i < preimage_limit; i++)2250 buf_end += preimage->line[i].len;22512252for( ; buf < buf_end; buf++)2253if(!isspace(*buf))2254break;2255if(buf == buf_end)2256return0;2257}22582259/*2260 * No exact match. If we are ignoring whitespace, run a line-by-line2261 * fuzzy matching. We collect all the line length information because2262 * we need it to adjust whitespace if we match.2263 */2264if(ws_ignore_action == ignore_ws_change) {2265size_t imgoff =0;2266size_t preoff =0;2267size_t postlen = postimage->len;2268size_t extra_chars;2269char*preimage_eof;2270char*preimage_end;2271for(i =0; i < preimage_limit; i++) {2272size_t prelen = preimage->line[i].len;2273size_t imglen = img->line[try_lno+i].len;22742275if(!fuzzy_matchlines(img->buf +try+ imgoff, imglen,2276 preimage->buf + preoff, prelen))2277return0;2278if(preimage->line[i].flag & LINE_COMMON)2279 postlen += imglen - prelen;2280 imgoff += imglen;2281 preoff += prelen;2282}22832284/*2285 * Ok, the preimage matches with whitespace fuzz.2286 *2287 * imgoff now holds the true length of the target that2288 * matches the preimage before the end of the file.2289 *2290 * Count the number of characters in the preimage that fall2291 * beyond the end of the file and make sure that all of them2292 * are whitespace characters. (This can only happen if2293 * we are removing blank lines at the end of the file.)2294 */2295 buf = preimage_eof = preimage->buf + preoff;2296for( ; i < preimage->nr; i++)2297 preoff += preimage->line[i].len;2298 preimage_end = preimage->buf + preoff;2299for( ; buf < preimage_end; buf++)2300if(!isspace(*buf))2301return0;23022303/*2304 * Update the preimage and the common postimage context2305 * lines to use the same whitespace as the target.2306 * If whitespace is missing in the target (i.e.2307 * if the preimage extends beyond the end of the file),2308 * use the whitespace from the preimage.2309 */2310 extra_chars = preimage_end - preimage_eof;2311strbuf_init(&fixed, imgoff + extra_chars);2312strbuf_add(&fixed, img->buf +try, imgoff);2313strbuf_add(&fixed, preimage_eof, extra_chars);2314 fixed_buf =strbuf_detach(&fixed, &fixed_len);2315update_pre_post_images(preimage, postimage,2316 fixed_buf, fixed_len, postlen);2317return1;2318}23192320if(ws_error_action != correct_ws_error)2321return0;23222323/*2324 * The hunk does not apply byte-by-byte, but the hash says2325 * it might with whitespace fuzz. We haven't been asked to2326 * ignore whitespace, we were asked to correct whitespace2327 * errors, so let's try matching after whitespace correction.2328 *2329 * The preimage may extend beyond the end of the file,2330 * but in this loop we will only handle the part of the2331 * preimage that falls within the file.2332 */2333strbuf_init(&fixed, preimage->len +1);2334 orig = preimage->buf;2335 target = img->buf +try;2336for(i =0; i < preimage_limit; i++) {2337size_t oldlen = preimage->line[i].len;2338size_t tgtlen = img->line[try_lno + i].len;2339size_t fixstart = fixed.len;2340struct strbuf tgtfix;2341int match;23422343/* Try fixing the line in the preimage */2344ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);23452346/* Try fixing the line in the target */2347strbuf_init(&tgtfix, tgtlen);2348ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);23492350/*2351 * If they match, either the preimage was based on2352 * a version before our tree fixed whitespace breakage,2353 * or we are lacking a whitespace-fix patch the tree2354 * the preimage was based on already had (i.e. target2355 * has whitespace breakage, the preimage doesn't).2356 * In either case, we are fixing the whitespace breakages2357 * so we might as well take the fix together with their2358 * real change.2359 */2360 match = (tgtfix.len == fixed.len - fixstart &&2361!memcmp(tgtfix.buf, fixed.buf + fixstart,2362 fixed.len - fixstart));23632364strbuf_release(&tgtfix);2365if(!match)2366goto unmatch_exit;23672368 orig += oldlen;2369 target += tgtlen;2370}237123722373/*2374 * Now handle the lines in the preimage that falls beyond the2375 * end of the file (if any). They will only match if they are2376 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2377 * false).2378 */2379for( ; i < preimage->nr; i++) {2380size_t fixstart = fixed.len;/* start of the fixed preimage */2381size_t oldlen = preimage->line[i].len;2382int j;23832384/* Try fixing the line in the preimage */2385ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);23862387for(j = fixstart; j < fixed.len; j++)2388if(!isspace(fixed.buf[j]))2389goto unmatch_exit;23902391 orig += oldlen;2392}23932394/*2395 * Yes, the preimage is based on an older version that still2396 * has whitespace breakages unfixed, and fixing them makes the2397 * hunk match. Update the context lines in the postimage.2398 */2399 fixed_buf =strbuf_detach(&fixed, &fixed_len);2400update_pre_post_images(preimage, postimage,2401 fixed_buf, fixed_len,0);2402return1;24032404 unmatch_exit:2405strbuf_release(&fixed);2406return0;2407}24082409static intfind_pos(struct image *img,2410struct image *preimage,2411struct image *postimage,2412int line,2413unsigned ws_rule,2414int match_beginning,int match_end)2415{2416int i;2417unsigned long backwards, forwards,try;2418int backwards_lno, forwards_lno, try_lno;24192420/*2421 * If match_beginning or match_end is specified, there is no2422 * point starting from a wrong line that will never match and2423 * wander around and wait for a match at the specified end.2424 */2425if(match_beginning)2426 line =0;2427else if(match_end)2428 line = img->nr - preimage->nr;24292430/*2431 * Because the comparison is unsigned, the following test2432 * will also take care of a negative line number that can2433 * result when match_end and preimage is larger than the target.2434 */2435if((size_t) line > img->nr)2436 line = img->nr;24372438try=0;2439for(i =0; i < line; i++)2440try+= img->line[i].len;24412442/*2443 * There's probably some smart way to do this, but I'll leave2444 * that to the smart and beautiful people. I'm simple and stupid.2445 */2446 backwards =try;2447 backwards_lno = line;2448 forwards =try;2449 forwards_lno = line;2450 try_lno = line;24512452for(i =0; ; i++) {2453if(match_fragment(img, preimage, postimage,2454try, try_lno, ws_rule,2455 match_beginning, match_end))2456return try_lno;24572458 again:2459if(backwards_lno ==0&& forwards_lno == img->nr)2460break;24612462if(i &1) {2463if(backwards_lno ==0) {2464 i++;2465goto again;2466}2467 backwards_lno--;2468 backwards -= img->line[backwards_lno].len;2469try= backwards;2470 try_lno = backwards_lno;2471}else{2472if(forwards_lno == img->nr) {2473 i++;2474goto again;2475}2476 forwards += img->line[forwards_lno].len;2477 forwards_lno++;2478try= forwards;2479 try_lno = forwards_lno;2480}24812482}2483return-1;2484}24852486static voidremove_first_line(struct image *img)2487{2488 img->buf += img->line[0].len;2489 img->len -= img->line[0].len;2490 img->line++;2491 img->nr--;2492}24932494static voidremove_last_line(struct image *img)2495{2496 img->len -= img->line[--img->nr].len;2497}24982499/*2500 * The change from "preimage" and "postimage" has been found to2501 * apply at applied_pos (counts in line numbers) in "img".2502 * Update "img" to remove "preimage" and replace it with "postimage".2503 */2504static voidupdate_image(struct image *img,2505int applied_pos,2506struct image *preimage,2507struct image *postimage)2508{2509/*2510 * remove the copy of preimage at offset in img2511 * and replace it with postimage2512 */2513int i, nr;2514size_t remove_count, insert_count, applied_at =0;2515char*result;2516int preimage_limit;25172518/*2519 * If we are removing blank lines at the end of img,2520 * the preimage may extend beyond the end.2521 * If that is the case, we must be careful only to2522 * remove the part of the preimage that falls within2523 * the boundaries of img. Initialize preimage_limit2524 * to the number of lines in the preimage that falls2525 * within the boundaries.2526 */2527 preimage_limit = preimage->nr;2528if(preimage_limit > img->nr - applied_pos)2529 preimage_limit = img->nr - applied_pos;25302531for(i =0; i < applied_pos; i++)2532 applied_at += img->line[i].len;25332534 remove_count =0;2535for(i =0; i < preimage_limit; i++)2536 remove_count += img->line[applied_pos + i].len;2537 insert_count = postimage->len;25382539/* Adjust the contents */2540 result =xmalloc(img->len + insert_count - remove_count +1);2541memcpy(result, img->buf, applied_at);2542memcpy(result + applied_at, postimage->buf, postimage->len);2543memcpy(result + applied_at + postimage->len,2544 img->buf + (applied_at + remove_count),2545 img->len - (applied_at + remove_count));2546free(img->buf);2547 img->buf = result;2548 img->len += insert_count - remove_count;2549 result[img->len] ='\0';25502551/* Adjust the line table */2552 nr = img->nr + postimage->nr - preimage_limit;2553if(preimage_limit < postimage->nr) {2554/*2555 * NOTE: this knows that we never call remove_first_line()2556 * on anything other than pre/post image.2557 */2558 img->line =xrealloc(img->line, nr *sizeof(*img->line));2559 img->line_allocated = img->line;2560}2561if(preimage_limit != postimage->nr)2562memmove(img->line + applied_pos + postimage->nr,2563 img->line + applied_pos + preimage_limit,2564(img->nr - (applied_pos + preimage_limit)) *2565sizeof(*img->line));2566memcpy(img->line + applied_pos,2567 postimage->line,2568 postimage->nr *sizeof(*img->line));2569if(!allow_overlap)2570for(i =0; i < postimage->nr; i++)2571 img->line[applied_pos + i].flag |= LINE_PATCHED;2572 img->nr = nr;2573}25742575/*2576 * Use the patch-hunk text in "frag" to prepare two images (preimage and2577 * postimage) for the hunk. Find lines that match "preimage" in "img" and2578 * replace the part of "img" with "postimage" text.2579 */2580static intapply_one_fragment(struct image *img,struct fragment *frag,2581int inaccurate_eof,unsigned ws_rule,2582int nth_fragment)2583{2584int match_beginning, match_end;2585const char*patch = frag->patch;2586int size = frag->size;2587char*old, *oldlines;2588struct strbuf newlines;2589int new_blank_lines_at_end =0;2590int found_new_blank_lines_at_end =0;2591int hunk_linenr = frag->linenr;2592unsigned long leading, trailing;2593int pos, applied_pos;2594struct image preimage;2595struct image postimage;25962597memset(&preimage,0,sizeof(preimage));2598memset(&postimage,0,sizeof(postimage));2599 oldlines =xmalloc(size);2600strbuf_init(&newlines, size);26012602 old = oldlines;2603while(size >0) {2604char first;2605int len =linelen(patch, size);2606int plen;2607int added_blank_line =0;2608int is_blank_context =0;2609size_t start;26102611if(!len)2612break;26132614/*2615 * "plen" is how much of the line we should use for2616 * the actual patch data. Normally we just remove the2617 * first character on the line, but if the line is2618 * followed by "\ No newline", then we also remove the2619 * last one (which is the newline, of course).2620 */2621 plen = len -1;2622if(len < size && patch[len] =='\\')2623 plen--;2624 first = *patch;2625if(apply_in_reverse) {2626if(first =='-')2627 first ='+';2628else if(first =='+')2629 first ='-';2630}26312632switch(first) {2633case'\n':2634/* Newer GNU diff, empty context line */2635if(plen <0)2636/* ... followed by '\No newline'; nothing */2637break;2638*old++ ='\n';2639strbuf_addch(&newlines,'\n');2640add_line_info(&preimage,"\n",1, LINE_COMMON);2641add_line_info(&postimage,"\n",1, LINE_COMMON);2642 is_blank_context =1;2643break;2644case' ':2645if(plen && (ws_rule & WS_BLANK_AT_EOF) &&2646ws_blank_line(patch +1, plen, ws_rule))2647 is_blank_context =1;2648case'-':2649memcpy(old, patch +1, plen);2650add_line_info(&preimage, old, plen,2651(first ==' '? LINE_COMMON :0));2652 old += plen;2653if(first =='-')2654break;2655/* Fall-through for ' ' */2656case'+':2657/* --no-add does not add new lines */2658if(first =='+'&& no_add)2659break;26602661 start = newlines.len;2662if(first !='+'||2663!whitespace_error ||2664 ws_error_action != correct_ws_error) {2665strbuf_add(&newlines, patch +1, plen);2666}2667else{2668ws_fix_copy(&newlines, patch +1, plen, ws_rule, &applied_after_fixing_ws);2669}2670add_line_info(&postimage, newlines.buf + start, newlines.len - start,2671(first =='+'?0: LINE_COMMON));2672if(first =='+'&&2673(ws_rule & WS_BLANK_AT_EOF) &&2674ws_blank_line(patch +1, plen, ws_rule))2675 added_blank_line =1;2676break;2677case'@':case'\\':2678/* Ignore it, we already handled it */2679break;2680default:2681if(apply_verbosely)2682error(_("invalid start of line: '%c'"), first);2683return-1;2684}2685if(added_blank_line) {2686if(!new_blank_lines_at_end)2687 found_new_blank_lines_at_end = hunk_linenr;2688 new_blank_lines_at_end++;2689}2690else if(is_blank_context)2691;2692else2693 new_blank_lines_at_end =0;2694 patch += len;2695 size -= len;2696 hunk_linenr++;2697}2698if(inaccurate_eof &&2699 old > oldlines && old[-1] =='\n'&&2700 newlines.len >0&& newlines.buf[newlines.len -1] =='\n') {2701 old--;2702strbuf_setlen(&newlines, newlines.len -1);2703}27042705 leading = frag->leading;2706 trailing = frag->trailing;27072708/*2709 * A hunk to change lines at the beginning would begin with2710 * @@ -1,L +N,M @@2711 * but we need to be careful. -U0 that inserts before the second2712 * line also has this pattern.2713 *2714 * And a hunk to add to an empty file would begin with2715 * @@ -0,0 +N,M @@2716 *2717 * In other words, a hunk that is (frag->oldpos <= 1) with or2718 * without leading context must match at the beginning.2719 */2720 match_beginning = (!frag->oldpos ||2721(frag->oldpos ==1&& !unidiff_zero));27222723/*2724 * A hunk without trailing lines must match at the end.2725 * However, we simply cannot tell if a hunk must match end2726 * from the lack of trailing lines if the patch was generated2727 * with unidiff without any context.2728 */2729 match_end = !unidiff_zero && !trailing;27302731 pos = frag->newpos ? (frag->newpos -1) :0;2732 preimage.buf = oldlines;2733 preimage.len = old - oldlines;2734 postimage.buf = newlines.buf;2735 postimage.len = newlines.len;2736 preimage.line = preimage.line_allocated;2737 postimage.line = postimage.line_allocated;27382739for(;;) {27402741 applied_pos =find_pos(img, &preimage, &postimage, pos,2742 ws_rule, match_beginning, match_end);27432744if(applied_pos >=0)2745break;27462747/* Am I at my context limits? */2748if((leading <= p_context) && (trailing <= p_context))2749break;2750if(match_beginning || match_end) {2751 match_beginning = match_end =0;2752continue;2753}27542755/*2756 * Reduce the number of context lines; reduce both2757 * leading and trailing if they are equal otherwise2758 * just reduce the larger context.2759 */2760if(leading >= trailing) {2761remove_first_line(&preimage);2762remove_first_line(&postimage);2763 pos--;2764 leading--;2765}2766if(trailing > leading) {2767remove_last_line(&preimage);2768remove_last_line(&postimage);2769 trailing--;2770}2771}27722773if(applied_pos >=0) {2774if(new_blank_lines_at_end &&2775 preimage.nr + applied_pos >= img->nr &&2776(ws_rule & WS_BLANK_AT_EOF) &&2777 ws_error_action != nowarn_ws_error) {2778record_ws_error(WS_BLANK_AT_EOF,"+",1,2779 found_new_blank_lines_at_end);2780if(ws_error_action == correct_ws_error) {2781while(new_blank_lines_at_end--)2782remove_last_line(&postimage);2783}2784/*2785 * We would want to prevent write_out_results()2786 * from taking place in apply_patch() that follows2787 * the callchain led us here, which is:2788 * apply_patch->check_patch_list->check_patch->2789 * apply_data->apply_fragments->apply_one_fragment2790 */2791if(ws_error_action == die_on_ws_error)2792 apply =0;2793}27942795if(apply_verbosely && applied_pos != pos) {2796int offset = applied_pos - pos;2797if(apply_in_reverse)2798 offset =0- offset;2799fprintf_ln(stderr,2800Q_("Hunk #%dsucceeded at%d(offset%dline).",2801"Hunk #%dsucceeded at%d(offset%dlines).",2802 offset),2803 nth_fragment, applied_pos +1, offset);2804}28052806/*2807 * Warn if it was necessary to reduce the number2808 * of context lines.2809 */2810if((leading != frag->leading) ||2811(trailing != frag->trailing))2812fprintf_ln(stderr,_("Context reduced to (%ld/%ld)"2813" to apply fragment at%d"),2814 leading, trailing, applied_pos+1);2815update_image(img, applied_pos, &preimage, &postimage);2816}else{2817if(apply_verbosely)2818error(_("while searching for:\n%.*s"),2819(int)(old - oldlines), oldlines);2820}28212822free(oldlines);2823strbuf_release(&newlines);2824free(preimage.line_allocated);2825free(postimage.line_allocated);28262827return(applied_pos <0);2828}28292830static intapply_binary_fragment(struct image *img,struct patch *patch)2831{2832struct fragment *fragment = patch->fragments;2833unsigned long len;2834void*dst;28352836if(!fragment)2837returnerror(_("missing binary patch data for '%s'"),2838 patch->new_name ?2839 patch->new_name :2840 patch->old_name);28412842/* Binary patch is irreversible without the optional second hunk */2843if(apply_in_reverse) {2844if(!fragment->next)2845returnerror("cannot reverse-apply a binary patch "2846"without the reverse hunk to '%s'",2847 patch->new_name2848? patch->new_name : patch->old_name);2849 fragment = fragment->next;2850}2851switch(fragment->binary_patch_method) {2852case BINARY_DELTA_DEFLATED:2853 dst =patch_delta(img->buf, img->len, fragment->patch,2854 fragment->size, &len);2855if(!dst)2856return-1;2857clear_image(img);2858 img->buf = dst;2859 img->len = len;2860return0;2861case BINARY_LITERAL_DEFLATED:2862clear_image(img);2863 img->len = fragment->size;2864 img->buf =xmalloc(img->len+1);2865memcpy(img->buf, fragment->patch, img->len);2866 img->buf[img->len] ='\0';2867return0;2868}2869return-1;2870}28712872/*2873 * Replace "img" with the result of applying the binary patch.2874 * The binary patch data itself in patch->fragment is still kept2875 * but the preimage prepared by the caller in "img" is freed here2876 * or in the helper function apply_binary_fragment() this calls.2877 */2878static intapply_binary(struct image *img,struct patch *patch)2879{2880const char*name = patch->old_name ? patch->old_name : patch->new_name;2881unsigned char sha1[20];28822883/*2884 * For safety, we require patch index line to contain2885 * full 40-byte textual SHA1 for old and new, at least for now.2886 */2887if(strlen(patch->old_sha1_prefix) !=40||2888strlen(patch->new_sha1_prefix) !=40||2889get_sha1_hex(patch->old_sha1_prefix, sha1) ||2890get_sha1_hex(patch->new_sha1_prefix, sha1))2891returnerror("cannot apply binary patch to '%s' "2892"without full index line", name);28932894if(patch->old_name) {2895/*2896 * See if the old one matches what the patch2897 * applies to.2898 */2899hash_sha1_file(img->buf, img->len, blob_type, sha1);2900if(strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2901returnerror("the patch applies to '%s' (%s), "2902"which does not match the "2903"current contents.",2904 name,sha1_to_hex(sha1));2905}2906else{2907/* Otherwise, the old one must be empty. */2908if(img->len)2909returnerror("the patch applies to an empty "2910"'%s' but it is not empty", name);2911}29122913get_sha1_hex(patch->new_sha1_prefix, sha1);2914if(is_null_sha1(sha1)) {2915clear_image(img);2916return0;/* deletion patch */2917}29182919if(has_sha1_file(sha1)) {2920/* We already have the postimage */2921enum object_type type;2922unsigned long size;2923char*result;29242925 result =read_sha1_file(sha1, &type, &size);2926if(!result)2927returnerror("the necessary postimage%sfor "2928"'%s' cannot be read",2929 patch->new_sha1_prefix, name);2930clear_image(img);2931 img->buf = result;2932 img->len = size;2933}else{2934/*2935 * We have verified buf matches the preimage;2936 * apply the patch data to it, which is stored2937 * in the patch->fragments->{patch,size}.2938 */2939if(apply_binary_fragment(img, patch))2940returnerror(_("binary patch does not apply to '%s'"),2941 name);29422943/* verify that the result matches */2944hash_sha1_file(img->buf, img->len, blob_type, sha1);2945if(strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))2946returnerror(_("binary patch to '%s' creates incorrect result (expecting%s, got%s)"),2947 name, patch->new_sha1_prefix,sha1_to_hex(sha1));2948}29492950return0;2951}29522953static intapply_fragments(struct image *img,struct patch *patch)2954{2955struct fragment *frag = patch->fragments;2956const char*name = patch->old_name ? patch->old_name : patch->new_name;2957unsigned ws_rule = patch->ws_rule;2958unsigned inaccurate_eof = patch->inaccurate_eof;2959int nth =0;29602961if(patch->is_binary)2962returnapply_binary(img, patch);29632964while(frag) {2965 nth++;2966if(apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {2967error(_("patch failed:%s:%ld"), name, frag->oldpos);2968if(!apply_with_reject)2969return-1;2970 frag->rejected =1;2971}2972 frag = frag->next;2973}2974return0;2975}29762977static intread_blob_object(struct strbuf *buf,const unsigned char*sha1,unsigned mode)2978{2979if(S_ISGITLINK(mode)) {2980strbuf_grow(buf,100);2981strbuf_addf(buf,"Subproject commit%s\n",sha1_to_hex(sha1));2982}else{2983enum object_type type;2984unsigned long sz;2985char*result;29862987 result =read_sha1_file(sha1, &type, &sz);2988if(!result)2989return-1;2990/* XXX read_sha1_file NUL-terminates */2991strbuf_attach(buf, result, sz, sz +1);2992}2993return0;2994}29952996static intread_file_or_gitlink(struct cache_entry *ce,struct strbuf *buf)2997{2998if(!ce)2999return0;3000returnread_blob_object(buf, ce->sha1, ce->ce_mode);3001}30023003static struct patch *in_fn_table(const char*name)3004{3005struct string_list_item *item;30063007if(name == NULL)3008return NULL;30093010 item =string_list_lookup(&fn_table, name);3011if(item != NULL)3012return(struct patch *)item->util;30133014return NULL;3015}30163017/*3018 * item->util in the filename table records the status of the path.3019 * Usually it points at a patch (whose result records the contents3020 * of it after applying it), but it could be PATH_WAS_DELETED for a3021 * path that a previously applied patch has already removed, or3022 * PATH_TO_BE_DELETED for a path that a later patch would remove.3023 *3024 * The latter is needed to deal with a case where two paths A and B3025 * are swapped by first renaming A to B and then renaming B to A;3026 * moving A to B should not be prevented due to presense of B as we3027 * will remove it in a later patch.3028 */3029#define PATH_TO_BE_DELETED ((struct patch *) -2)3030#define PATH_WAS_DELETED ((struct patch *) -1)30313032static intto_be_deleted(struct patch *patch)3033{3034return patch == PATH_TO_BE_DELETED;3035}30363037static intwas_deleted(struct patch *patch)3038{3039return patch == PATH_WAS_DELETED;3040}30413042static voidadd_to_fn_table(struct patch *patch)3043{3044struct string_list_item *item;30453046/*3047 * Always add new_name unless patch is a deletion3048 * This should cover the cases for normal diffs,3049 * file creations and copies3050 */3051if(patch->new_name != NULL) {3052 item =string_list_insert(&fn_table, patch->new_name);3053 item->util = patch;3054}30553056/*3057 * store a failure on rename/deletion cases because3058 * later chunks shouldn't patch old names3059 */3060if((patch->new_name == NULL) || (patch->is_rename)) {3061 item =string_list_insert(&fn_table, patch->old_name);3062 item->util = PATH_WAS_DELETED;3063}3064}30653066static voidprepare_fn_table(struct patch *patch)3067{3068/*3069 * store information about incoming file deletion3070 */3071while(patch) {3072if((patch->new_name == NULL) || (patch->is_rename)) {3073struct string_list_item *item;3074 item =string_list_insert(&fn_table, patch->old_name);3075 item->util = PATH_TO_BE_DELETED;3076}3077 patch = patch->next;3078}3079}30803081static intcheckout_target(struct cache_entry *ce,struct stat *st)3082{3083struct checkout costate;30843085memset(&costate,0,sizeof(costate));3086 costate.base_dir ="";3087 costate.refresh_cache =1;3088if(checkout_entry(ce, &costate, NULL) ||lstat(ce->name, st))3089returnerror(_("cannot checkout%s"), ce->name);3090return0;3091}30923093static struct patch *previous_patch(struct patch *patch,int*gone)3094{3095struct patch *previous;30963097*gone =0;3098if(patch->is_copy || patch->is_rename)3099return NULL;/* "git" patches do not depend on the order */31003101 previous =in_fn_table(patch->old_name);3102if(!previous)3103return NULL;31043105if(to_be_deleted(previous))3106return NULL;/* the deletion hasn't happened yet */31073108if(was_deleted(previous))3109*gone =1;31103111return previous;3112}31133114static intverify_index_match(struct cache_entry *ce,struct stat *st)3115{3116if(S_ISGITLINK(ce->ce_mode)) {3117if(!S_ISDIR(st->st_mode))3118return-1;3119return0;3120}3121returnce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3122}31233124#define SUBMODULE_PATCH_WITHOUT_INDEX 131253126static intload_patch_target(struct strbuf *buf,3127struct cache_entry *ce,3128struct stat *st,3129const char*name,3130unsigned expected_mode)3131{3132if(cached) {3133if(read_file_or_gitlink(ce, buf))3134returnerror(_("read of%sfailed"), name);3135}else if(name) {3136if(S_ISGITLINK(expected_mode)) {3137if(ce)3138returnread_file_or_gitlink(ce, buf);3139else3140return SUBMODULE_PATCH_WITHOUT_INDEX;3141}else{3142if(read_old_data(st, name, buf))3143returnerror(_("read of%sfailed"), name);3144}3145}3146return0;3147}31483149/*3150 * We are about to apply "patch"; populate the "image" with the3151 * current version we have, from the working tree or from the index,3152 * depending on the situation e.g. --cached/--index. If we are3153 * applying a non-git patch that incrementally updates the tree,3154 * we read from the result of a previous diff.3155 */3156static intload_preimage(struct image *image,3157struct patch *patch,struct stat *st,struct cache_entry *ce)3158{3159struct strbuf buf = STRBUF_INIT;3160size_t len;3161char*img;3162struct patch *previous;3163int status;31643165 previous =previous_patch(patch, &status);3166if(status)3167returnerror(_("path%shas been renamed/deleted"),3168 patch->old_name);3169if(previous) {3170/* We have a patched copy in memory; use that. */3171strbuf_add(&buf, previous->result, previous->resultsize);3172}else{3173 status =load_patch_target(&buf, ce, st,3174 patch->old_name, patch->old_mode);3175if(status <0)3176return status;3177else if(status == SUBMODULE_PATCH_WITHOUT_INDEX) {3178/*3179 * There is no way to apply subproject3180 * patch without looking at the index.3181 * NEEDSWORK: shouldn't this be flagged3182 * as an error???3183 */3184free_fragment_list(patch->fragments);3185 patch->fragments = NULL;3186}else if(status) {3187returnerror(_("read of%sfailed"), patch->old_name);3188}3189}31903191 img =strbuf_detach(&buf, &len);3192prepare_image(image, img, len, !patch->is_binary);3193return0;3194}31953196static intthree_way_merge(struct image *image,3197char*path,3198const unsigned char*base,3199const unsigned char*ours,3200const unsigned char*theirs)3201{3202 mmfile_t base_file, our_file, their_file;3203 mmbuffer_t result = { NULL };3204int status;32053206read_mmblob(&base_file, base);3207read_mmblob(&our_file, ours);3208read_mmblob(&their_file, theirs);3209 status =ll_merge(&result, path,3210&base_file,"base",3211&our_file,"ours",3212&their_file,"theirs", NULL);3213free(base_file.ptr);3214free(our_file.ptr);3215free(their_file.ptr);3216if(status <0|| !result.ptr) {3217free(result.ptr);3218return-1;3219}3220clear_image(image);3221 image->buf = result.ptr;3222 image->len = result.size;32233224return status;3225}32263227/*3228 * When directly falling back to add/add three-way merge, we read from3229 * the current contents of the new_name. In no cases other than that3230 * this function will be called.3231 */3232static intload_current(struct image *image,struct patch *patch)3233{3234struct strbuf buf = STRBUF_INIT;3235int status, pos;3236size_t len;3237char*img;3238struct stat st;3239struct cache_entry *ce;3240char*name = patch->new_name;3241unsigned mode = patch->new_mode;32423243if(!patch->is_new)3244die("BUG: patch to%sis not a creation", patch->old_name);32453246 pos =cache_name_pos(name,strlen(name));3247if(pos <0)3248returnerror(_("%s: does not exist in index"), name);3249 ce = active_cache[pos];3250if(lstat(name, &st)) {3251if(errno != ENOENT)3252returnerror(_("%s:%s"), name,strerror(errno));3253if(checkout_target(ce, &st))3254return-1;3255}3256if(verify_index_match(ce, &st))3257returnerror(_("%s: does not match index"), name);32583259 status =load_patch_target(&buf, ce, &st, name, mode);3260if(status <0)3261return status;3262else if(status)3263return-1;3264 img =strbuf_detach(&buf, &len);3265prepare_image(image, img, len, !patch->is_binary);3266return0;3267}32683269static inttry_threeway(struct image *image,struct patch *patch,3270struct stat *st,struct cache_entry *ce)3271{3272unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];3273struct strbuf buf = STRBUF_INIT;3274size_t len;3275int status;3276char*img;3277struct image tmp_image;32783279/* No point falling back to 3-way merge in these cases */3280if(patch->is_delete ||3281S_ISGITLINK(patch->old_mode) ||S_ISGITLINK(patch->new_mode))3282return-1;32833284/* Preimage the patch was prepared for */3285if(patch->is_new)3286write_sha1_file("",0, blob_type, pre_sha1);3287else if(get_sha1(patch->old_sha1_prefix, pre_sha1) ||3288read_blob_object(&buf, pre_sha1, patch->old_mode))3289returnerror("repository lacks the necessary blob to fall back on 3-way merge.");32903291fprintf(stderr,"Falling back to three-way merge...\n");32923293 img =strbuf_detach(&buf, &len);3294prepare_image(&tmp_image, img, len,1);3295/* Apply the patch to get the post image */3296if(apply_fragments(&tmp_image, patch) <0) {3297clear_image(&tmp_image);3298return-1;3299}3300/* post_sha1[] is theirs */3301write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_sha1);3302clear_image(&tmp_image);33033304/* our_sha1[] is ours */3305if(patch->is_new) {3306if(load_current(&tmp_image, patch))3307returnerror("cannot read the current contents of '%s'",3308 patch->new_name);3309}else{3310if(load_preimage(&tmp_image, patch, st, ce))3311returnerror("cannot read the current contents of '%s'",3312 patch->old_name);3313}3314write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);3315clear_image(&tmp_image);33163317/* in-core three-way merge between post and our using pre as base */3318 status =three_way_merge(image, patch->new_name,3319 pre_sha1, our_sha1, post_sha1);3320if(status <0) {3321fprintf(stderr,"Failed to fall back on three-way merge...\n");3322return status;3323}33243325if(status) {3326 patch->conflicted_threeway =1;3327if(patch->is_new)3328hashclr(patch->threeway_stage[0]);3329else3330hashcpy(patch->threeway_stage[0], pre_sha1);3331hashcpy(patch->threeway_stage[1], our_sha1);3332hashcpy(patch->threeway_stage[2], post_sha1);3333fprintf(stderr,"Applied patch to '%s' with conflicts.\n", patch->new_name);3334}else{3335fprintf(stderr,"Applied patch to '%s' cleanly.\n", patch->new_name);3336}3337return0;3338}33393340static intapply_data(struct patch *patch,struct stat *st,struct cache_entry *ce)3341{3342struct image image;33433344if(load_preimage(&image, patch, st, ce) <0)3345return-1;33463347if(patch->direct_to_threeway ||3348apply_fragments(&image, patch) <0) {3349/* Note: with --reject, apply_fragments() returns 0 */3350if(!threeway ||try_threeway(&image, patch, st, ce) <0)3351return-1;3352}3353 patch->result = image.buf;3354 patch->resultsize = image.len;3355add_to_fn_table(patch);3356free(image.line_allocated);33573358if(0< patch->is_delete && patch->resultsize)3359returnerror(_("removal patch leaves file contents"));33603361return0;3362}33633364/*3365 * If "patch" that we are looking at modifies or deletes what we have,3366 * we would want it not to lose any local modification we have, either3367 * in the working tree or in the index.3368 *3369 * This also decides if a non-git patch is a creation patch or a3370 * modification to an existing empty file. We do not check the state3371 * of the current tree for a creation patch in this function; the caller3372 * check_patch() separately makes sure (and errors out otherwise) that3373 * the path the patch creates does not exist in the current tree.3374 */3375static intcheck_preimage(struct patch *patch,struct cache_entry **ce,struct stat *st)3376{3377const char*old_name = patch->old_name;3378struct patch *previous = NULL;3379int stat_ret =0, status;3380unsigned st_mode =0;33813382if(!old_name)3383return0;33843385assert(patch->is_new <=0);3386 previous =previous_patch(patch, &status);33873388if(status)3389returnerror(_("path%shas been renamed/deleted"), old_name);3390if(previous) {3391 st_mode = previous->new_mode;3392}else if(!cached) {3393 stat_ret =lstat(old_name, st);3394if(stat_ret && errno != ENOENT)3395returnerror(_("%s:%s"), old_name,strerror(errno));3396}33973398if(check_index && !previous) {3399int pos =cache_name_pos(old_name,strlen(old_name));3400if(pos <0) {3401if(patch->is_new <0)3402goto is_new;3403returnerror(_("%s: does not exist in index"), old_name);3404}3405*ce = active_cache[pos];3406if(stat_ret <0) {3407if(checkout_target(*ce, st))3408return-1;3409}3410if(!cached &&verify_index_match(*ce, st))3411returnerror(_("%s: does not match index"), old_name);3412if(cached)3413 st_mode = (*ce)->ce_mode;3414}else if(stat_ret <0) {3415if(patch->is_new <0)3416goto is_new;3417returnerror(_("%s:%s"), old_name,strerror(errno));3418}34193420if(!cached && !previous)3421 st_mode =ce_mode_from_stat(*ce, st->st_mode);34223423if(patch->is_new <0)3424 patch->is_new =0;3425if(!patch->old_mode)3426 patch->old_mode = st_mode;3427if((st_mode ^ patch->old_mode) & S_IFMT)3428returnerror(_("%s: wrong type"), old_name);3429if(st_mode != patch->old_mode)3430warning(_("%shas type%o, expected%o"),3431 old_name, st_mode, patch->old_mode);3432if(!patch->new_mode && !patch->is_delete)3433 patch->new_mode = st_mode;3434return0;34353436 is_new:3437 patch->is_new =1;3438 patch->is_delete =0;3439free(patch->old_name);3440 patch->old_name = NULL;3441return0;3442}344334443445#define EXISTS_IN_INDEX 13446#define EXISTS_IN_WORKTREE 234473448static intcheck_to_create(const char*new_name,int ok_if_exists)3449{3450struct stat nst;34513452if(check_index &&3453cache_name_pos(new_name,strlen(new_name)) >=0&&3454!ok_if_exists)3455return EXISTS_IN_INDEX;3456if(cached)3457return0;34583459if(!lstat(new_name, &nst)) {3460if(S_ISDIR(nst.st_mode) || ok_if_exists)3461return0;3462/*3463 * A leading component of new_name might be a symlink3464 * that is going to be removed with this patch, but3465 * still pointing at somewhere that has the path.3466 * In such a case, path "new_name" does not exist as3467 * far as git is concerned.3468 */3469if(has_symlink_leading_path(new_name,strlen(new_name)))3470return0;34713472return EXISTS_IN_WORKTREE;3473}else if((errno != ENOENT) && (errno != ENOTDIR)) {3474returnerror("%s:%s", new_name,strerror(errno));3475}3476return0;3477}34783479/*3480 * Check and apply the patch in-core; leave the result in patch->result3481 * for the caller to write it out to the final destination.3482 */3483static intcheck_patch(struct patch *patch)3484{3485struct stat st;3486const char*old_name = patch->old_name;3487const char*new_name = patch->new_name;3488const char*name = old_name ? old_name : new_name;3489struct cache_entry *ce = NULL;3490struct patch *tpatch;3491int ok_if_exists;3492int status;34933494 patch->rejected =1;/* we will drop this after we succeed */34953496 status =check_preimage(patch, &ce, &st);3497if(status)3498return status;3499 old_name = patch->old_name;35003501/*3502 * A type-change diff is always split into a patch to delete3503 * old, immediately followed by a patch to create new (see3504 * diff.c::run_diff()); in such a case it is Ok that the entry3505 * to be deleted by the previous patch is still in the working3506 * tree and in the index.3507 *3508 * A patch to swap-rename between A and B would first rename A3509 * to B and then rename B to A. While applying the first one,3510 * the presense of B should not stop A from getting renamed to3511 * B; ask to_be_deleted() about the later rename. Removal of3512 * B and rename from A to B is handled the same way by asking3513 * was_deleted().3514 */3515if((tpatch =in_fn_table(new_name)) &&3516(was_deleted(tpatch) ||to_be_deleted(tpatch)))3517 ok_if_exists =1;3518else3519 ok_if_exists =0;35203521if(new_name &&3522((0< patch->is_new) | (0< patch->is_rename) | patch->is_copy)) {3523int err =check_to_create(new_name, ok_if_exists);35243525if(err && threeway) {3526 patch->direct_to_threeway =1;3527}else switch(err) {3528case0:3529break;/* happy */3530case EXISTS_IN_INDEX:3531returnerror(_("%s: already exists in index"), new_name);3532break;3533case EXISTS_IN_WORKTREE:3534returnerror(_("%s: already exists in working directory"),3535 new_name);3536default:3537return err;3538}35393540if(!patch->new_mode) {3541if(0< patch->is_new)3542 patch->new_mode = S_IFREG |0644;3543else3544 patch->new_mode = patch->old_mode;3545}3546}35473548if(new_name && old_name) {3549int same = !strcmp(old_name, new_name);3550if(!patch->new_mode)3551 patch->new_mode = patch->old_mode;3552if((patch->old_mode ^ patch->new_mode) & S_IFMT) {3553if(same)3554returnerror(_("new mode (%o) of%sdoes not "3555"match old mode (%o)"),3556 patch->new_mode, new_name,3557 patch->old_mode);3558else3559returnerror(_("new mode (%o) of%sdoes not "3560"match old mode (%o) of%s"),3561 patch->new_mode, new_name,3562 patch->old_mode, old_name);3563}3564}35653566if(apply_data(patch, &st, ce) <0)3567returnerror(_("%s: patch does not apply"), name);3568 patch->rejected =0;3569return0;3570}35713572static intcheck_patch_list(struct patch *patch)3573{3574int err =0;35753576prepare_fn_table(patch);3577while(patch) {3578if(apply_verbosely)3579say_patch_name(stderr,3580_("Checking patch%s..."), patch);3581 err |=check_patch(patch);3582 patch = patch->next;3583}3584return err;3585}35863587/* This function tries to read the sha1 from the current index */3588static intget_current_sha1(const char*path,unsigned char*sha1)3589{3590int pos;35913592if(read_cache() <0)3593return-1;3594 pos =cache_name_pos(path,strlen(path));3595if(pos <0)3596return-1;3597hashcpy(sha1, active_cache[pos]->sha1);3598return0;3599}36003601/* Build an index that contains the just the files needed for a 3way merge */3602static voidbuild_fake_ancestor(struct patch *list,const char*filename)3603{3604struct patch *patch;3605struct index_state result = { NULL };3606int fd;36073608/* Once we start supporting the reverse patch, it may be3609 * worth showing the new sha1 prefix, but until then...3610 */3611for(patch = list; patch; patch = patch->next) {3612const unsigned char*sha1_ptr;3613unsigned char sha1[20];3614struct cache_entry *ce;3615const char*name;36163617 name = patch->old_name ? patch->old_name : patch->new_name;3618if(0< patch->is_new)3619continue;3620else if(get_sha1_blob(patch->old_sha1_prefix, sha1))3621/* git diff has no index line for mode/type changes */3622if(!patch->lines_added && !patch->lines_deleted) {3623if(get_current_sha1(patch->old_name, sha1))3624die("mode change for%s, which is not "3625"in current HEAD", name);3626 sha1_ptr = sha1;3627}else3628die("sha1 information is lacking or useless "3629"(%s).", name);3630else3631 sha1_ptr = sha1;36323633 ce =make_cache_entry(patch->old_mode, sha1_ptr, name,0,0);3634if(!ce)3635die(_("make_cache_entry failed for path '%s'"), name);3636if(add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))3637die("Could not add%sto temporary index", name);3638}36393640 fd =open(filename, O_WRONLY | O_CREAT,0666);3641if(fd <0||write_index(&result, fd) ||close(fd))3642die("Could not write temporary index to%s", filename);36433644discard_index(&result);3645}36463647static voidstat_patch_list(struct patch *patch)3648{3649int files, adds, dels;36503651for(files = adds = dels =0; patch ; patch = patch->next) {3652 files++;3653 adds += patch->lines_added;3654 dels += patch->lines_deleted;3655show_stats(patch);3656}36573658print_stat_summary(stdout, files, adds, dels);3659}36603661static voidnumstat_patch_list(struct patch *patch)3662{3663for( ; patch; patch = patch->next) {3664const char*name;3665 name = patch->new_name ? patch->new_name : patch->old_name;3666if(patch->is_binary)3667printf("-\t-\t");3668else3669printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);3670write_name_quoted(name, stdout, line_termination);3671}3672}36733674static voidshow_file_mode_name(const char*newdelete,unsigned int mode,const char*name)3675{3676if(mode)3677printf("%smode%06o%s\n", newdelete, mode, name);3678else3679printf("%s %s\n", newdelete, name);3680}36813682static voidshow_mode_change(struct patch *p,int show_name)3683{3684if(p->old_mode && p->new_mode && p->old_mode != p->new_mode) {3685if(show_name)3686printf(" mode change%06o =>%06o%s\n",3687 p->old_mode, p->new_mode, p->new_name);3688else3689printf(" mode change%06o =>%06o\n",3690 p->old_mode, p->new_mode);3691}3692}36933694static voidshow_rename_copy(struct patch *p)3695{3696const char*renamecopy = p->is_rename ?"rename":"copy";3697const char*old, *new;36983699/* Find common prefix */3700 old = p->old_name;3701new= p->new_name;3702while(1) {3703const char*slash_old, *slash_new;3704 slash_old =strchr(old,'/');3705 slash_new =strchr(new,'/');3706if(!slash_old ||3707!slash_new ||3708 slash_old - old != slash_new -new||3709memcmp(old,new, slash_new -new))3710break;3711 old = slash_old +1;3712new= slash_new +1;3713}3714/* p->old_name thru old is the common prefix, and old and new3715 * through the end of names are renames3716 */3717if(old != p->old_name)3718printf("%s%.*s{%s=>%s} (%d%%)\n", renamecopy,3719(int)(old - p->old_name), p->old_name,3720 old,new, p->score);3721else3722printf("%s %s=>%s(%d%%)\n", renamecopy,3723 p->old_name, p->new_name, p->score);3724show_mode_change(p,0);3725}37263727static voidsummary_patch_list(struct patch *patch)3728{3729struct patch *p;37303731for(p = patch; p; p = p->next) {3732if(p->is_new)3733show_file_mode_name("create", p->new_mode, p->new_name);3734else if(p->is_delete)3735show_file_mode_name("delete", p->old_mode, p->old_name);3736else{3737if(p->is_rename || p->is_copy)3738show_rename_copy(p);3739else{3740if(p->score) {3741printf(" rewrite%s(%d%%)\n",3742 p->new_name, p->score);3743show_mode_change(p,0);3744}3745else3746show_mode_change(p,1);3747}3748}3749}3750}37513752static voidpatch_stats(struct patch *patch)3753{3754int lines = patch->lines_added + patch->lines_deleted;37553756if(lines > max_change)3757 max_change = lines;3758if(patch->old_name) {3759int len =quote_c_style(patch->old_name, NULL, NULL,0);3760if(!len)3761 len =strlen(patch->old_name);3762if(len > max_len)3763 max_len = len;3764}3765if(patch->new_name) {3766int len =quote_c_style(patch->new_name, NULL, NULL,0);3767if(!len)3768 len =strlen(patch->new_name);3769if(len > max_len)3770 max_len = len;3771}3772}37733774static voidremove_file(struct patch *patch,int rmdir_empty)3775{3776if(update_index) {3777if(remove_file_from_cache(patch->old_name) <0)3778die(_("unable to remove%sfrom index"), patch->old_name);3779}3780if(!cached) {3781if(!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {3782remove_path(patch->old_name);3783}3784}3785}37863787static voidadd_index_file(const char*path,unsigned mode,void*buf,unsigned long size)3788{3789struct stat st;3790struct cache_entry *ce;3791int namelen =strlen(path);3792unsigned ce_size =cache_entry_size(namelen);37933794if(!update_index)3795return;37963797 ce =xcalloc(1, ce_size);3798memcpy(ce->name, path, namelen);3799 ce->ce_mode =create_ce_mode(mode);3800 ce->ce_flags =create_ce_flags(0);3801 ce->ce_namelen = namelen;3802if(S_ISGITLINK(mode)) {3803const char*s = buf;38043805if(get_sha1_hex(s +strlen("Subproject commit "), ce->sha1))3806die(_("corrupt patch for subproject%s"), path);3807}else{3808if(!cached) {3809if(lstat(path, &st) <0)3810die_errno(_("unable to stat newly created file '%s'"),3811 path);3812fill_stat_cache_info(ce, &st);3813}3814if(write_sha1_file(buf, size, blob_type, ce->sha1) <0)3815die(_("unable to create backing store for newly created file%s"), path);3816}3817if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)3818die(_("unable to add cache entry for%s"), path);3819}38203821static inttry_create_file(const char*path,unsigned int mode,const char*buf,unsigned long size)3822{3823int fd;3824struct strbuf nbuf = STRBUF_INIT;38253826if(S_ISGITLINK(mode)) {3827struct stat st;3828if(!lstat(path, &st) &&S_ISDIR(st.st_mode))3829return0;3830returnmkdir(path,0777);3831}38323833if(has_symlinks &&S_ISLNK(mode))3834/* Although buf:size is counted string, it also is NUL3835 * terminated.3836 */3837returnsymlink(buf, path);38383839 fd =open(path, O_CREAT | O_EXCL | O_WRONLY, (mode &0100) ?0777:0666);3840if(fd <0)3841return-1;38423843if(convert_to_working_tree(path, buf, size, &nbuf)) {3844 size = nbuf.len;3845 buf = nbuf.buf;3846}3847write_or_die(fd, buf, size);3848strbuf_release(&nbuf);38493850if(close(fd) <0)3851die_errno(_("closing file '%s'"), path);3852return0;3853}38543855/*3856 * We optimistically assume that the directories exist,3857 * which is true 99% of the time anyway. If they don't,3858 * we create them and try again.3859 */3860static voidcreate_one_file(char*path,unsigned mode,const char*buf,unsigned long size)3861{3862if(cached)3863return;3864if(!try_create_file(path, mode, buf, size))3865return;38663867if(errno == ENOENT) {3868if(safe_create_leading_directories(path))3869return;3870if(!try_create_file(path, mode, buf, size))3871return;3872}38733874if(errno == EEXIST || errno == EACCES) {3875/* We may be trying to create a file where a directory3876 * used to be.3877 */3878struct stat st;3879if(!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))3880 errno = EEXIST;3881}38823883if(errno == EEXIST) {3884unsigned int nr =getpid();38853886for(;;) {3887char newpath[PATH_MAX];3888mksnpath(newpath,sizeof(newpath),"%s~%u", path, nr);3889if(!try_create_file(newpath, mode, buf, size)) {3890if(!rename(newpath, path))3891return;3892unlink_or_warn(newpath);3893break;3894}3895if(errno != EEXIST)3896break;3897++nr;3898}3899}3900die_errno(_("unable to write file '%s' mode%o"), path, mode);3901}39023903static voidadd_conflicted_stages_file(struct patch *patch)3904{3905int stage, namelen;3906unsigned ce_size, mode;3907struct cache_entry *ce;39083909if(!update_index)3910return;3911 namelen =strlen(patch->new_name);3912 ce_size =cache_entry_size(namelen);3913 mode = patch->new_mode ? patch->new_mode : (S_IFREG |0644);39143915remove_file_from_cache(patch->new_name);3916for(stage =1; stage <4; stage++) {3917if(is_null_sha1(patch->threeway_stage[stage -1]))3918continue;3919 ce =xcalloc(1, ce_size);3920memcpy(ce->name, patch->new_name, namelen);3921 ce->ce_mode =create_ce_mode(mode);3922 ce->ce_flags =create_ce_flags(stage);3923 ce->ce_namelen = namelen;3924hashcpy(ce->sha1, patch->threeway_stage[stage -1]);3925if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)3926die(_("unable to add cache entry for%s"), patch->new_name);3927}3928}39293930static voidcreate_file(struct patch *patch)3931{3932char*path = patch->new_name;3933unsigned mode = patch->new_mode;3934unsigned long size = patch->resultsize;3935char*buf = patch->result;39363937if(!mode)3938 mode = S_IFREG |0644;3939create_one_file(path, mode, buf, size);39403941if(patch->conflicted_threeway)3942add_conflicted_stages_file(patch);3943else3944add_index_file(path, mode, buf, size);3945}39463947/* phase zero is to remove, phase one is to create */3948static voidwrite_out_one_result(struct patch *patch,int phase)3949{3950if(patch->is_delete >0) {3951if(phase ==0)3952remove_file(patch,1);3953return;3954}3955if(patch->is_new >0|| patch->is_copy) {3956if(phase ==1)3957create_file(patch);3958return;3959}3960/*3961 * Rename or modification boils down to the same3962 * thing: remove the old, write the new3963 */3964if(phase ==0)3965remove_file(patch, patch->is_rename);3966if(phase ==1)3967create_file(patch);3968}39693970static intwrite_out_one_reject(struct patch *patch)3971{3972FILE*rej;3973char namebuf[PATH_MAX];3974struct fragment *frag;3975int cnt =0;3976struct strbuf sb = STRBUF_INIT;39773978for(cnt =0, frag = patch->fragments; frag; frag = frag->next) {3979if(!frag->rejected)3980continue;3981 cnt++;3982}39833984if(!cnt) {3985if(apply_verbosely)3986say_patch_name(stderr,3987_("Applied patch%scleanly."), patch);3988return0;3989}39903991/* This should not happen, because a removal patch that leaves3992 * contents are marked "rejected" at the patch level.3993 */3994if(!patch->new_name)3995die(_("internal error"));39963997/* Say this even without --verbose */3998strbuf_addf(&sb,Q_("Applying patch %%swith%dreject...",3999"Applying patch %%swith%drejects...",4000 cnt),4001 cnt);4002say_patch_name(stderr, sb.buf, patch);4003strbuf_release(&sb);40044005 cnt =strlen(patch->new_name);4006if(ARRAY_SIZE(namebuf) <= cnt +5) {4007 cnt =ARRAY_SIZE(namebuf) -5;4008warning(_("truncating .rej filename to %.*s.rej"),4009 cnt -1, patch->new_name);4010}4011memcpy(namebuf, patch->new_name, cnt);4012memcpy(namebuf + cnt,".rej",5);40134014 rej =fopen(namebuf,"w");4015if(!rej)4016returnerror(_("cannot open%s:%s"), namebuf,strerror(errno));40174018/* Normal git tools never deal with .rej, so do not pretend4019 * this is a git patch by saying --git nor give extended4020 * headers. While at it, maybe please "kompare" that wants4021 * the trailing TAB and some garbage at the end of line ;-).4022 */4023fprintf(rej,"diff a/%sb/%s\t(rejected hunks)\n",4024 patch->new_name, patch->new_name);4025for(cnt =1, frag = patch->fragments;4026 frag;4027 cnt++, frag = frag->next) {4028if(!frag->rejected) {4029fprintf_ln(stderr,_("Hunk #%dapplied cleanly."), cnt);4030continue;4031}4032fprintf_ln(stderr,_("Rejected hunk #%d."), cnt);4033fprintf(rej,"%.*s", frag->size, frag->patch);4034if(frag->patch[frag->size-1] !='\n')4035fputc('\n', rej);4036}4037fclose(rej);4038return-1;4039}40404041static intwrite_out_results(struct patch *list)4042{4043int phase;4044int errs =0;4045struct patch *l;4046struct string_list cpath = STRING_LIST_INIT_DUP;40474048for(phase =0; phase <2; phase++) {4049 l = list;4050while(l) {4051if(l->rejected)4052 errs =1;4053else{4054write_out_one_result(l, phase);4055if(phase ==1) {4056if(write_out_one_reject(l))4057 errs =1;4058if(l->conflicted_threeway) {4059string_list_append(&cpath, l->new_name);4060 errs =1;4061}4062}4063}4064 l = l->next;4065}4066}40674068if(cpath.nr) {4069struct string_list_item *item;40704071sort_string_list(&cpath);4072for_each_string_list_item(item, &cpath)4073fprintf(stderr,"U%s\n", item->string);4074string_list_clear(&cpath,0);40754076rerere(0);4077}40784079return errs;4080}40814082static struct lock_file lock_file;40834084static struct string_list limit_by_name;4085static int has_include;4086static voidadd_name_limit(const char*name,int exclude)4087{4088struct string_list_item *it;40894090 it =string_list_append(&limit_by_name, name);4091 it->util = exclude ? NULL : (void*)1;4092}40934094static intuse_patch(struct patch *p)4095{4096const char*pathname = p->new_name ? p->new_name : p->old_name;4097int i;40984099/* Paths outside are not touched regardless of "--include" */4100if(0< prefix_length) {4101int pathlen =strlen(pathname);4102if(pathlen <= prefix_length ||4103memcmp(prefix, pathname, prefix_length))4104return0;4105}41064107/* See if it matches any of exclude/include rule */4108for(i =0; i < limit_by_name.nr; i++) {4109struct string_list_item *it = &limit_by_name.items[i];4110if(!fnmatch(it->string, pathname,0))4111return(it->util != NULL);4112}41134114/*4115 * If we had any include, a path that does not match any rule is4116 * not used. Otherwise, we saw bunch of exclude rules (or none)4117 * and such a path is used.4118 */4119return!has_include;4120}412141224123static voidprefix_one(char**name)4124{4125char*old_name = *name;4126if(!old_name)4127return;4128*name =xstrdup(prefix_filename(prefix, prefix_length, *name));4129free(old_name);4130}41314132static voidprefix_patches(struct patch *p)4133{4134if(!prefix || p->is_toplevel_relative)4135return;4136for( ; p; p = p->next) {4137prefix_one(&p->new_name);4138prefix_one(&p->old_name);4139}4140}41414142#define INACCURATE_EOF (1<<0)4143#define RECOUNT (1<<1)41444145static intapply_patch(int fd,const char*filename,int options)4146{4147size_t offset;4148struct strbuf buf = STRBUF_INIT;/* owns the patch text */4149struct patch *list = NULL, **listp = &list;4150int skipped_patch =0;41514152 patch_input_file = filename;4153read_patch_file(&buf, fd);4154 offset =0;4155while(offset < buf.len) {4156struct patch *patch;4157int nr;41584159 patch =xcalloc(1,sizeof(*patch));4160 patch->inaccurate_eof = !!(options & INACCURATE_EOF);4161 patch->recount = !!(options & RECOUNT);4162 nr =parse_chunk(buf.buf + offset, buf.len - offset, patch);4163if(nr <0)4164break;4165if(apply_in_reverse)4166reverse_patches(patch);4167if(prefix)4168prefix_patches(patch);4169if(use_patch(patch)) {4170patch_stats(patch);4171*listp = patch;4172 listp = &patch->next;4173}4174else{4175free_patch(patch);4176 skipped_patch++;4177}4178 offset += nr;4179}41804181if(!list && !skipped_patch)4182die(_("unrecognized input"));41834184if(whitespace_error && (ws_error_action == die_on_ws_error))4185 apply =0;41864187 update_index = check_index && apply;4188if(update_index && newfd <0)4189 newfd =hold_locked_index(&lock_file,1);41904191if(check_index) {4192if(read_cache() <0)4193die(_("unable to read index file"));4194}41954196if((check || apply) &&4197check_patch_list(list) <0&&4198!apply_with_reject)4199exit(1);42004201if(apply &&write_out_results(list)) {4202if(apply_with_reject)4203exit(1);4204/* with --3way, we still need to write the index out */4205return1;4206}42074208if(fake_ancestor)4209build_fake_ancestor(list, fake_ancestor);42104211if(diffstat)4212stat_patch_list(list);42134214if(numstat)4215numstat_patch_list(list);42164217if(summary)4218summary_patch_list(list);42194220free_patch_list(list);4221strbuf_release(&buf);4222string_list_clear(&fn_table,0);4223return0;4224}42254226static intgit_apply_config(const char*var,const char*value,void*cb)4227{4228if(!strcmp(var,"apply.whitespace"))4229returngit_config_string(&apply_default_whitespace, var, value);4230else if(!strcmp(var,"apply.ignorewhitespace"))4231returngit_config_string(&apply_default_ignorewhitespace, var, value);4232returngit_default_config(var, value, cb);4233}42344235static intoption_parse_exclude(const struct option *opt,4236const char*arg,int unset)4237{4238add_name_limit(arg,1);4239return0;4240}42414242static intoption_parse_include(const struct option *opt,4243const char*arg,int unset)4244{4245add_name_limit(arg,0);4246 has_include =1;4247return0;4248}42494250static intoption_parse_p(const struct option *opt,4251const char*arg,int unset)4252{4253 p_value =atoi(arg);4254 p_value_known =1;4255return0;4256}42574258static intoption_parse_z(const struct option *opt,4259const char*arg,int unset)4260{4261if(unset)4262 line_termination ='\n';4263else4264 line_termination =0;4265return0;4266}42674268static intoption_parse_space_change(const struct option *opt,4269const char*arg,int unset)4270{4271if(unset)4272 ws_ignore_action = ignore_ws_none;4273else4274 ws_ignore_action = ignore_ws_change;4275return0;4276}42774278static intoption_parse_whitespace(const struct option *opt,4279const char*arg,int unset)4280{4281const char**whitespace_option = opt->value;42824283*whitespace_option = arg;4284parse_whitespace_option(arg);4285return0;4286}42874288static intoption_parse_directory(const struct option *opt,4289const char*arg,int unset)4290{4291 root_len =strlen(arg);4292if(root_len && arg[root_len -1] !='/') {4293char*new_root;4294 root = new_root =xmalloc(root_len +2);4295strcpy(new_root, arg);4296strcpy(new_root + root_len++,"/");4297}else4298 root = arg;4299return0;4300}43014302intcmd_apply(int argc,const char**argv,const char*prefix_)4303{4304int i;4305int errs =0;4306int is_not_gitdir = !startup_info->have_repository;4307int force_apply =0;43084309const char*whitespace_option = NULL;43104311struct option builtin_apply_options[] = {4312{ OPTION_CALLBACK,0,"exclude", NULL,N_("path"),4313N_("don't apply changes matching the given path"),43140, option_parse_exclude },4315{ OPTION_CALLBACK,0,"include", NULL,N_("path"),4316N_("apply changes matching the given path"),43170, option_parse_include },4318{ OPTION_CALLBACK,'p', NULL, NULL,N_("num"),4319N_("remove <num> leading slashes from traditional diff paths"),43200, option_parse_p },4321OPT_BOOLEAN(0,"no-add", &no_add,4322N_("ignore additions made by the patch")),4323OPT_BOOLEAN(0,"stat", &diffstat,4324N_("instead of applying the patch, output diffstat for the input")),4325OPT_NOOP_NOARG(0,"allow-binary-replacement"),4326OPT_NOOP_NOARG(0,"binary"),4327OPT_BOOLEAN(0,"numstat", &numstat,4328N_("show number of added and deleted lines in decimal notation")),4329OPT_BOOLEAN(0,"summary", &summary,4330N_("instead of applying the patch, output a summary for the input")),4331OPT_BOOLEAN(0,"check", &check,4332N_("instead of applying the patch, see if the patch is applicable")),4333OPT_BOOLEAN(0,"index", &check_index,4334N_("make sure the patch is applicable to the current index")),4335OPT_BOOLEAN(0,"cached", &cached,4336N_("apply a patch without touching the working tree")),4337OPT_BOOLEAN(0,"apply", &force_apply,4338N_("also apply the patch (use with --stat/--summary/--check)")),4339OPT_BOOL('3',"3way", &threeway,4340N_("attempt three-way merge if a patch does not apply")),4341OPT_FILENAME(0,"build-fake-ancestor", &fake_ancestor,4342N_("build a temporary index based on embedded index information")),4343{ OPTION_CALLBACK,'z', NULL, NULL, NULL,4344N_("paths are separated with NUL character"),4345 PARSE_OPT_NOARG, option_parse_z },4346OPT_INTEGER('C', NULL, &p_context,4347N_("ensure at least <n> lines of context match")),4348{ OPTION_CALLBACK,0,"whitespace", &whitespace_option,N_("action"),4349N_("detect new or modified lines that have whitespace errors"),43500, option_parse_whitespace },4351{ OPTION_CALLBACK,0,"ignore-space-change", NULL, NULL,4352N_("ignore changes in whitespace when finding context"),4353 PARSE_OPT_NOARG, option_parse_space_change },4354{ OPTION_CALLBACK,0,"ignore-whitespace", NULL, NULL,4355N_("ignore changes in whitespace when finding context"),4356 PARSE_OPT_NOARG, option_parse_space_change },4357OPT_BOOLEAN('R',"reverse", &apply_in_reverse,4358N_("apply the patch in reverse")),4359OPT_BOOLEAN(0,"unidiff-zero", &unidiff_zero,4360N_("don't expect at least one line of context")),4361OPT_BOOLEAN(0,"reject", &apply_with_reject,4362N_("leave the rejected hunks in corresponding *.rej files")),4363OPT_BOOLEAN(0,"allow-overlap", &allow_overlap,4364N_("allow overlapping hunks")),4365OPT__VERBOSE(&apply_verbosely,N_("be verbose")),4366OPT_BIT(0,"inaccurate-eof", &options,4367N_("tolerate incorrectly detected missing new-line at the end of file"),4368 INACCURATE_EOF),4369OPT_BIT(0,"recount", &options,4370N_("do not trust the line counts in the hunk headers"),4371 RECOUNT),4372{ OPTION_CALLBACK,0,"directory", NULL,N_("root"),4373N_("prepend <root> to all filenames"),43740, option_parse_directory },4375OPT_END()4376};43774378 prefix = prefix_;4379 prefix_length = prefix ?strlen(prefix) :0;4380git_config(git_apply_config, NULL);4381if(apply_default_whitespace)4382parse_whitespace_option(apply_default_whitespace);4383if(apply_default_ignorewhitespace)4384parse_ignorewhitespace_option(apply_default_ignorewhitespace);43854386 argc =parse_options(argc, argv, prefix, builtin_apply_options,4387 apply_usage,0);43884389if(apply_with_reject && threeway)4390die("--reject and --3way cannot be used together.");4391if(cached && threeway)4392die("--cached and --3way cannot be used together.");4393if(threeway) {4394if(is_not_gitdir)4395die(_("--3way outside a repository"));4396 check_index =1;4397}4398if(apply_with_reject)4399 apply = apply_verbosely =1;4400if(!force_apply && (diffstat || numstat || summary || check || fake_ancestor))4401 apply =0;4402if(check_index && is_not_gitdir)4403die(_("--index outside a repository"));4404if(cached) {4405if(is_not_gitdir)4406die(_("--cached outside a repository"));4407 check_index =1;4408}4409for(i =0; i < argc; i++) {4410const char*arg = argv[i];4411int fd;44124413if(!strcmp(arg,"-")) {4414 errs |=apply_patch(0,"<stdin>", options);4415 read_stdin =0;4416continue;4417}else if(0< prefix_length)4418 arg =prefix_filename(prefix, prefix_length, arg);44194420 fd =open(arg, O_RDONLY);4421if(fd <0)4422die_errno(_("can't open patch '%s'"), arg);4423 read_stdin =0;4424set_default_whitespace_mode(whitespace_option);4425 errs |=apply_patch(fd, arg, options);4426close(fd);4427}4428set_default_whitespace_mode(whitespace_option);4429if(read_stdin)4430 errs |=apply_patch(0,"<stdin>", options);4431if(whitespace_error) {4432if(squelch_whitespace_errors &&4433 squelch_whitespace_errors < whitespace_error) {4434int squelched =4435 whitespace_error - squelch_whitespace_errors;4436warning(Q_("squelched%dwhitespace error",4437"squelched%dwhitespace errors",4438 squelched),4439 squelched);4440}4441if(ws_error_action == die_on_ws_error)4442die(Q_("%dline adds whitespace errors.",4443"%dlines add whitespace errors.",4444 whitespace_error),4445 whitespace_error);4446if(applied_after_fixing_ws && apply)4447warning("%dline%sapplied after"4448" fixing whitespace errors.",4449 applied_after_fixing_ws,4450 applied_after_fixing_ws ==1?"":"s");4451else if(whitespace_error)4452warning(Q_("%dline adds whitespace errors.",4453"%dlines add whitespace errors.",4454 whitespace_error),4455 whitespace_error);4456}44574458if(update_index) {4459if(write_cache(newfd, active_cache, active_nr) ||4460commit_locked_index(&lock_file))4461die(_("Unable to write new index file"));4462}44634464return!!errs;4465}