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 18/* 19 * --check turns on checking that the working tree matches the 20 * files that are being modified, but doesn't apply the patch 21 * --stat does just a diffstat, and doesn't actually apply 22 * --numstat does numeric diffstat, and doesn't actually apply 23 * --index-info shows the old and new index info for paths if available. 24 * --index updates the cache as well. 25 * --cached updates only the cache without ever touching the working tree. 26 */ 27static const char*prefix; 28static int prefix_length = -1; 29static int newfd = -1; 30 31static int unidiff_zero; 32static int p_value =1; 33static int p_value_known; 34static int check_index; 35static int update_index; 36static int cached; 37static int diffstat; 38static int numstat; 39static int summary; 40static int check; 41static int apply =1; 42static int apply_in_reverse; 43static int apply_with_reject; 44static int apply_verbosely; 45static int no_add; 46static const char*fake_ancestor; 47static int line_termination ='\n'; 48static unsigned long p_context = ULONG_MAX; 49static const char apply_usage[] = 50"git apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|fix|error|error-all>] <patch>..."; 51 52static enum ws_error_action { 53 nowarn_ws_error, 54 warn_on_ws_error, 55 die_on_ws_error, 56 correct_ws_error, 57} ws_error_action = warn_on_ws_error; 58static int whitespace_error; 59static int squelch_whitespace_errors =5; 60static int applied_after_fixing_ws; 61static const char*patch_input_file; 62static const char*root; 63static int root_len; 64 65static voidparse_whitespace_option(const char*option) 66{ 67if(!option) { 68 ws_error_action = warn_on_ws_error; 69return; 70} 71if(!strcmp(option,"warn")) { 72 ws_error_action = warn_on_ws_error; 73return; 74} 75if(!strcmp(option,"nowarn")) { 76 ws_error_action = nowarn_ws_error; 77return; 78} 79if(!strcmp(option,"error")) { 80 ws_error_action = die_on_ws_error; 81return; 82} 83if(!strcmp(option,"error-all")) { 84 ws_error_action = die_on_ws_error; 85 squelch_whitespace_errors =0; 86return; 87} 88if(!strcmp(option,"strip") || !strcmp(option,"fix")) { 89 ws_error_action = correct_ws_error; 90return; 91} 92die("unrecognized whitespace option '%s'", option); 93} 94 95static voidset_default_whitespace_mode(const char*whitespace_option) 96{ 97if(!whitespace_option && !apply_default_whitespace) 98 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); 99} 100 101/* 102 * For "diff-stat" like behaviour, we keep track of the biggest change 103 * we've seen, and the longest filename. That allows us to do simple 104 * scaling. 105 */ 106static int max_change, max_len; 107 108/* 109 * Various "current state", notably line numbers and what 110 * file (and how) we're patching right now.. The "is_xxxx" 111 * things are flags, where -1 means "don't know yet". 112 */ 113static int linenr =1; 114 115/* 116 * This represents one "hunk" from a patch, starting with 117 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 118 * patch text is pointed at by patch, and its byte length 119 * is stored in size. leading and trailing are the number 120 * of context lines. 121 */ 122struct fragment { 123unsigned long leading, trailing; 124unsigned long oldpos, oldlines; 125unsigned long newpos, newlines; 126const char*patch; 127int size; 128int rejected; 129struct fragment *next; 130}; 131 132/* 133 * When dealing with a binary patch, we reuse "leading" field 134 * to store the type of the binary hunk, either deflated "delta" 135 * or deflated "literal". 136 */ 137#define binary_patch_method leading 138#define BINARY_DELTA_DEFLATED 1 139#define BINARY_LITERAL_DEFLATED 2 140 141/* 142 * This represents a "patch" to a file, both metainfo changes 143 * such as creation/deletion, filemode and content changes represented 144 * as a series of fragments. 145 */ 146struct patch { 147char*new_name, *old_name, *def_name; 148unsigned int old_mode, new_mode; 149int is_new, is_delete;/* -1 = unknown, 0 = false, 1 = true */ 150int rejected; 151unsigned ws_rule; 152unsigned long deflate_origlen; 153int lines_added, lines_deleted; 154int score; 155unsigned int is_toplevel_relative:1; 156unsigned int inaccurate_eof:1; 157unsigned int is_binary:1; 158unsigned int is_copy:1; 159unsigned int is_rename:1; 160unsigned int recount:1; 161struct fragment *fragments; 162char*result; 163size_t resultsize; 164char old_sha1_prefix[41]; 165char new_sha1_prefix[41]; 166struct patch *next; 167}; 168 169/* 170 * A line in a file, len-bytes long (includes the terminating LF, 171 * except for an incomplete line at the end if the file ends with 172 * one), and its contents hashes to 'hash'. 173 */ 174struct line { 175size_t len; 176unsigned hash :24; 177unsigned flag :8; 178#define LINE_COMMON 1 179}; 180 181/* 182 * This represents a "file", which is an array of "lines". 183 */ 184struct image { 185char*buf; 186size_t len; 187size_t nr; 188size_t alloc; 189struct line *line_allocated; 190struct line *line; 191}; 192 193/* 194 * Records filenames that have been touched, in order to handle 195 * the case where more than one patches touch the same file. 196 */ 197 198static struct string_list fn_table; 199 200static uint32_thash_line(const char*cp,size_t len) 201{ 202size_t i; 203uint32_t h; 204for(i =0, h =0; i < len; i++) { 205if(!isspace(cp[i])) { 206 h = h *3+ (cp[i] &0xff); 207} 208} 209return h; 210} 211 212static voidadd_line_info(struct image *img,const char*bol,size_t len,unsigned flag) 213{ 214ALLOC_GROW(img->line_allocated, img->nr +1, img->alloc); 215 img->line_allocated[img->nr].len = len; 216 img->line_allocated[img->nr].hash =hash_line(bol, len); 217 img->line_allocated[img->nr].flag = flag; 218 img->nr++; 219} 220 221static voidprepare_image(struct image *image,char*buf,size_t len, 222int prepare_linetable) 223{ 224const char*cp, *ep; 225 226memset(image,0,sizeof(*image)); 227 image->buf = buf; 228 image->len = len; 229 230if(!prepare_linetable) 231return; 232 233 ep = image->buf + image->len; 234 cp = image->buf; 235while(cp < ep) { 236const char*next; 237for(next = cp; next < ep && *next !='\n'; next++) 238; 239if(next < ep) 240 next++; 241add_line_info(image, cp, next - cp,0); 242 cp = next; 243} 244 image->line = image->line_allocated; 245} 246 247static voidclear_image(struct image *image) 248{ 249free(image->buf); 250 image->buf = NULL; 251 image->len =0; 252} 253 254static voidsay_patch_name(FILE*output,const char*pre, 255struct patch *patch,const char*post) 256{ 257fputs(pre, output); 258if(patch->old_name && patch->new_name && 259strcmp(patch->old_name, patch->new_name)) { 260quote_c_style(patch->old_name, NULL, output,0); 261fputs(" => ", output); 262quote_c_style(patch->new_name, NULL, output,0); 263}else{ 264const char*n = patch->new_name; 265if(!n) 266 n = patch->old_name; 267quote_c_style(n, NULL, output,0); 268} 269fputs(post, output); 270} 271 272#define CHUNKSIZE (8192) 273#define SLOP (16) 274 275static voidread_patch_file(struct strbuf *sb,int fd) 276{ 277if(strbuf_read(sb, fd,0) <0) 278die("git apply: read returned%s",strerror(errno)); 279 280/* 281 * Make sure that we have some slop in the buffer 282 * so that we can do speculative "memcmp" etc, and 283 * see to it that it is NUL-filled. 284 */ 285strbuf_grow(sb, SLOP); 286memset(sb->buf + sb->len,0, SLOP); 287} 288 289static unsigned longlinelen(const char*buffer,unsigned long size) 290{ 291unsigned long len =0; 292while(size--) { 293 len++; 294if(*buffer++ =='\n') 295break; 296} 297return len; 298} 299 300static intis_dev_null(const char*str) 301{ 302return!memcmp("/dev/null", str,9) &&isspace(str[9]); 303} 304 305#define TERM_SPACE 1 306#define TERM_TAB 2 307 308static intname_terminate(const char*name,int namelen,int c,int terminate) 309{ 310if(c ==' '&& !(terminate & TERM_SPACE)) 311return0; 312if(c =='\t'&& !(terminate & TERM_TAB)) 313return0; 314 315return1; 316} 317 318static char*find_name(const char*line,char*def,int p_value,int terminate) 319{ 320int len; 321const char*start = line; 322 323if(*line =='"') { 324struct strbuf name = STRBUF_INIT; 325 326/* 327 * Proposed "new-style" GNU patch/diff format; see 328 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 329 */ 330if(!unquote_c_style(&name, line, NULL)) { 331char*cp; 332 333for(cp = name.buf; p_value; p_value--) { 334 cp =strchr(cp,'/'); 335if(!cp) 336break; 337 cp++; 338} 339if(cp) { 340/* name can later be freed, so we need 341 * to memmove, not just return cp 342 */ 343strbuf_remove(&name,0, cp - name.buf); 344free(def); 345if(root) 346strbuf_insert(&name,0, root, root_len); 347returnstrbuf_detach(&name, NULL); 348} 349} 350strbuf_release(&name); 351} 352 353for(;;) { 354char c = *line; 355 356if(isspace(c)) { 357if(c =='\n') 358break; 359if(name_terminate(start, line-start, c, terminate)) 360break; 361} 362 line++; 363if(c =='/'&& !--p_value) 364 start = line; 365} 366if(!start) 367return def; 368 len = line - start; 369if(!len) 370return def; 371 372/* 373 * Generally we prefer the shorter name, especially 374 * if the other one is just a variation of that with 375 * something else tacked on to the end (ie "file.orig" 376 * or "file~"). 377 */ 378if(def) { 379int deflen =strlen(def); 380if(deflen < len && !strncmp(start, def, deflen)) 381return def; 382free(def); 383} 384 385if(root) { 386char*ret =xmalloc(root_len + len +1); 387strcpy(ret, root); 388memcpy(ret + root_len, start, len); 389 ret[root_len + len] ='\0'; 390return ret; 391} 392 393returnxmemdupz(start, len); 394} 395 396static intcount_slashes(const char*cp) 397{ 398int cnt =0; 399char ch; 400 401while((ch = *cp++)) 402if(ch =='/') 403 cnt++; 404return cnt; 405} 406 407/* 408 * Given the string after "--- " or "+++ ", guess the appropriate 409 * p_value for the given patch. 410 */ 411static intguess_p_value(const char*nameline) 412{ 413char*name, *cp; 414int val = -1; 415 416if(is_dev_null(nameline)) 417return-1; 418 name =find_name(nameline, NULL,0, TERM_SPACE | TERM_TAB); 419if(!name) 420return-1; 421 cp =strchr(name,'/'); 422if(!cp) 423 val =0; 424else if(prefix) { 425/* 426 * Does it begin with "a/$our-prefix" and such? Then this is 427 * very likely to apply to our directory. 428 */ 429if(!strncmp(name, prefix, prefix_length)) 430 val =count_slashes(prefix); 431else{ 432 cp++; 433if(!strncmp(cp, prefix, prefix_length)) 434 val =count_slashes(prefix) +1; 435} 436} 437free(name); 438return val; 439} 440 441/* 442 * Get the name etc info from the ---/+++ lines of a traditional patch header 443 * 444 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 445 * files, we can happily check the index for a match, but for creating a 446 * new file we should try to match whatever "patch" does. I have no idea. 447 */ 448static voidparse_traditional_patch(const char*first,const char*second,struct patch *patch) 449{ 450char*name; 451 452 first +=4;/* skip "--- " */ 453 second +=4;/* skip "+++ " */ 454if(!p_value_known) { 455int p, q; 456 p =guess_p_value(first); 457 q =guess_p_value(second); 458if(p <0) p = q; 459if(0<= p && p == q) { 460 p_value = p; 461 p_value_known =1; 462} 463} 464if(is_dev_null(first)) { 465 patch->is_new =1; 466 patch->is_delete =0; 467 name =find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB); 468 patch->new_name = name; 469}else if(is_dev_null(second)) { 470 patch->is_new =0; 471 patch->is_delete =1; 472 name =find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB); 473 patch->old_name = name; 474}else{ 475 name =find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB); 476 name =find_name(second, name, p_value, TERM_SPACE | TERM_TAB); 477 patch->old_name = patch->new_name = name; 478} 479if(!name) 480die("unable to find filename in patch at line%d", linenr); 481} 482 483static intgitdiff_hdrend(const char*line,struct patch *patch) 484{ 485return-1; 486} 487 488/* 489 * We're anal about diff header consistency, to make 490 * sure that we don't end up having strange ambiguous 491 * patches floating around. 492 * 493 * As a result, gitdiff_{old|new}name() will check 494 * their names against any previous information, just 495 * to make sure.. 496 */ 497static char*gitdiff_verify_name(const char*line,int isnull,char*orig_name,const char*oldnew) 498{ 499if(!orig_name && !isnull) 500returnfind_name(line, NULL, p_value, TERM_TAB); 501 502if(orig_name) { 503int len; 504const char*name; 505char*another; 506 name = orig_name; 507 len =strlen(name); 508if(isnull) 509die("git apply: bad git-diff - expected /dev/null, got%son line%d", name, linenr); 510 another =find_name(line, NULL, p_value, TERM_TAB); 511if(!another ||memcmp(another, name, len)) 512die("git apply: bad git-diff - inconsistent%sfilename on line%d", oldnew, linenr); 513free(another); 514return orig_name; 515} 516else{ 517/* expect "/dev/null" */ 518if(memcmp("/dev/null", line,9) || line[9] !='\n') 519die("git apply: bad git-diff - expected /dev/null on line%d", linenr); 520return NULL; 521} 522} 523 524static intgitdiff_oldname(const char*line,struct patch *patch) 525{ 526 patch->old_name =gitdiff_verify_name(line, patch->is_new, patch->old_name,"old"); 527return0; 528} 529 530static intgitdiff_newname(const char*line,struct patch *patch) 531{ 532 patch->new_name =gitdiff_verify_name(line, patch->is_delete, patch->new_name,"new"); 533return0; 534} 535 536static intgitdiff_oldmode(const char*line,struct patch *patch) 537{ 538 patch->old_mode =strtoul(line, NULL,8); 539return0; 540} 541 542static intgitdiff_newmode(const char*line,struct patch *patch) 543{ 544 patch->new_mode =strtoul(line, NULL,8); 545return0; 546} 547 548static intgitdiff_delete(const char*line,struct patch *patch) 549{ 550 patch->is_delete =1; 551 patch->old_name = patch->def_name; 552returngitdiff_oldmode(line, patch); 553} 554 555static intgitdiff_newfile(const char*line,struct patch *patch) 556{ 557 patch->is_new =1; 558 patch->new_name = patch->def_name; 559returngitdiff_newmode(line, patch); 560} 561 562static intgitdiff_copysrc(const char*line,struct patch *patch) 563{ 564 patch->is_copy =1; 565 patch->old_name =find_name(line, NULL,0,0); 566return0; 567} 568 569static intgitdiff_copydst(const char*line,struct patch *patch) 570{ 571 patch->is_copy =1; 572 patch->new_name =find_name(line, NULL,0,0); 573return0; 574} 575 576static intgitdiff_renamesrc(const char*line,struct patch *patch) 577{ 578 patch->is_rename =1; 579 patch->old_name =find_name(line, NULL,0,0); 580return0; 581} 582 583static intgitdiff_renamedst(const char*line,struct patch *patch) 584{ 585 patch->is_rename =1; 586 patch->new_name =find_name(line, NULL,0,0); 587return0; 588} 589 590static intgitdiff_similarity(const char*line,struct patch *patch) 591{ 592if((patch->score =strtoul(line, NULL,10)) == ULONG_MAX) 593 patch->score =0; 594return0; 595} 596 597static intgitdiff_dissimilarity(const char*line,struct patch *patch) 598{ 599if((patch->score =strtoul(line, NULL,10)) == ULONG_MAX) 600 patch->score =0; 601return0; 602} 603 604static intgitdiff_index(const char*line,struct patch *patch) 605{ 606/* 607 * index line is N hexadecimal, "..", N hexadecimal, 608 * and optional space with octal mode. 609 */ 610const char*ptr, *eol; 611int len; 612 613 ptr =strchr(line,'.'); 614if(!ptr || ptr[1] !='.'||40< ptr - line) 615return0; 616 len = ptr - line; 617memcpy(patch->old_sha1_prefix, line, len); 618 patch->old_sha1_prefix[len] =0; 619 620 line = ptr +2; 621 ptr =strchr(line,' '); 622 eol =strchr(line,'\n'); 623 624if(!ptr || eol < ptr) 625 ptr = eol; 626 len = ptr - line; 627 628if(40< len) 629return0; 630memcpy(patch->new_sha1_prefix, line, len); 631 patch->new_sha1_prefix[len] =0; 632if(*ptr ==' ') 633 patch->new_mode = patch->old_mode =strtoul(ptr+1, NULL,8); 634return0; 635} 636 637/* 638 * This is normal for a diff that doesn't change anything: we'll fall through 639 * into the next diff. Tell the parser to break out. 640 */ 641static intgitdiff_unrecognized(const char*line,struct patch *patch) 642{ 643return-1; 644} 645 646static const char*stop_at_slash(const char*line,int llen) 647{ 648int i; 649 650for(i =0; i < llen; i++) { 651int ch = line[i]; 652if(ch =='/') 653return line + i; 654} 655return NULL; 656} 657 658/* 659 * This is to extract the same name that appears on "diff --git" 660 * line. We do not find and return anything if it is a rename 661 * patch, and it is OK because we will find the name elsewhere. 662 * We need to reliably find name only when it is mode-change only, 663 * creation or deletion of an empty file. In any of these cases, 664 * both sides are the same name under a/ and b/ respectively. 665 */ 666static char*git_header_name(char*line,int llen) 667{ 668const char*name; 669const char*second = NULL; 670size_t len; 671 672 line +=strlen("diff --git "); 673 llen -=strlen("diff --git "); 674 675if(*line =='"') { 676const char*cp; 677struct strbuf first = STRBUF_INIT; 678struct strbuf sp = STRBUF_INIT; 679 680if(unquote_c_style(&first, line, &second)) 681goto free_and_fail1; 682 683/* advance to the first slash */ 684 cp =stop_at_slash(first.buf, first.len); 685/* we do not accept absolute paths */ 686if(!cp || cp == first.buf) 687goto free_and_fail1; 688strbuf_remove(&first,0, cp +1- first.buf); 689 690/* 691 * second points at one past closing dq of name. 692 * find the second name. 693 */ 694while((second < line + llen) &&isspace(*second)) 695 second++; 696 697if(line + llen <= second) 698goto free_and_fail1; 699if(*second =='"') { 700if(unquote_c_style(&sp, second, NULL)) 701goto free_and_fail1; 702 cp =stop_at_slash(sp.buf, sp.len); 703if(!cp || cp == sp.buf) 704goto free_and_fail1; 705/* They must match, otherwise ignore */ 706if(strcmp(cp +1, first.buf)) 707goto free_and_fail1; 708strbuf_release(&sp); 709returnstrbuf_detach(&first, NULL); 710} 711 712/* unquoted second */ 713 cp =stop_at_slash(second, line + llen - second); 714if(!cp || cp == second) 715goto free_and_fail1; 716 cp++; 717if(line + llen - cp != first.len +1|| 718memcmp(first.buf, cp, first.len)) 719goto free_and_fail1; 720returnstrbuf_detach(&first, NULL); 721 722 free_and_fail1: 723strbuf_release(&first); 724strbuf_release(&sp); 725return NULL; 726} 727 728/* unquoted first name */ 729 name =stop_at_slash(line, llen); 730if(!name || name == line) 731return NULL; 732 name++; 733 734/* 735 * since the first name is unquoted, a dq if exists must be 736 * the beginning of the second name. 737 */ 738for(second = name; second < line + llen; second++) { 739if(*second =='"') { 740struct strbuf sp = STRBUF_INIT; 741const char*np; 742 743if(unquote_c_style(&sp, second, NULL)) 744goto free_and_fail2; 745 746 np =stop_at_slash(sp.buf, sp.len); 747if(!np || np == sp.buf) 748goto free_and_fail2; 749 np++; 750 751 len = sp.buf + sp.len - np; 752if(len < second - name && 753!strncmp(np, name, len) && 754isspace(name[len])) { 755/* Good */ 756strbuf_remove(&sp,0, np - sp.buf); 757returnstrbuf_detach(&sp, NULL); 758} 759 760 free_and_fail2: 761strbuf_release(&sp); 762return NULL; 763} 764} 765 766/* 767 * Accept a name only if it shows up twice, exactly the same 768 * form. 769 */ 770for(len =0; ; len++) { 771switch(name[len]) { 772default: 773continue; 774case'\n': 775return NULL; 776case'\t':case' ': 777 second = name+len; 778for(;;) { 779char c = *second++; 780if(c =='\n') 781return NULL; 782if(c =='/') 783break; 784} 785if(second[len] =='\n'&& !memcmp(name, second, len)) { 786returnxmemdupz(name, len); 787} 788} 789} 790} 791 792/* Verify that we recognize the lines following a git header */ 793static intparse_git_header(char*line,int len,unsigned int size,struct patch *patch) 794{ 795unsigned long offset; 796 797/* A git diff has explicit new/delete information, so we don't guess */ 798 patch->is_new =0; 799 patch->is_delete =0; 800 801/* 802 * Some things may not have the old name in the 803 * rest of the headers anywhere (pure mode changes, 804 * or removing or adding empty files), so we get 805 * the default name from the header. 806 */ 807 patch->def_name =git_header_name(line, len); 808if(patch->def_name && root) { 809char*s =xmalloc(root_len +strlen(patch->def_name) +1); 810strcpy(s, root); 811strcpy(s + root_len, patch->def_name); 812free(patch->def_name); 813 patch->def_name = s; 814} 815 816 line += len; 817 size -= len; 818 linenr++; 819for(offset = len ; size >0; offset += len, size -= len, line += len, linenr++) { 820static const struct opentry { 821const char*str; 822int(*fn)(const char*,struct patch *); 823} optable[] = { 824{"@@ -", gitdiff_hdrend }, 825{"--- ", gitdiff_oldname }, 826{"+++ ", gitdiff_newname }, 827{"old mode ", gitdiff_oldmode }, 828{"new mode ", gitdiff_newmode }, 829{"deleted file mode ", gitdiff_delete }, 830{"new file mode ", gitdiff_newfile }, 831{"copy from ", gitdiff_copysrc }, 832{"copy to ", gitdiff_copydst }, 833{"rename old ", gitdiff_renamesrc }, 834{"rename new ", gitdiff_renamedst }, 835{"rename from ", gitdiff_renamesrc }, 836{"rename to ", gitdiff_renamedst }, 837{"similarity index ", gitdiff_similarity }, 838{"dissimilarity index ", gitdiff_dissimilarity }, 839{"index ", gitdiff_index }, 840{"", gitdiff_unrecognized }, 841}; 842int i; 843 844 len =linelen(line, size); 845if(!len || line[len-1] !='\n') 846break; 847for(i =0; i <ARRAY_SIZE(optable); i++) { 848const struct opentry *p = optable + i; 849int oplen =strlen(p->str); 850if(len < oplen ||memcmp(p->str, line, oplen)) 851continue; 852if(p->fn(line + oplen, patch) <0) 853return offset; 854break; 855} 856} 857 858return offset; 859} 860 861static intparse_num(const char*line,unsigned long*p) 862{ 863char*ptr; 864 865if(!isdigit(*line)) 866return0; 867*p =strtoul(line, &ptr,10); 868return ptr - line; 869} 870 871static intparse_range(const char*line,int len,int offset,const char*expect, 872unsigned long*p1,unsigned long*p2) 873{ 874int digits, ex; 875 876if(offset <0|| offset >= len) 877return-1; 878 line += offset; 879 len -= offset; 880 881 digits =parse_num(line, p1); 882if(!digits) 883return-1; 884 885 offset += digits; 886 line += digits; 887 len -= digits; 888 889*p2 =1; 890if(*line ==',') { 891 digits =parse_num(line+1, p2); 892if(!digits) 893return-1; 894 895 offset += digits+1; 896 line += digits+1; 897 len -= digits+1; 898} 899 900 ex =strlen(expect); 901if(ex > len) 902return-1; 903if(memcmp(line, expect, ex)) 904return-1; 905 906return offset + ex; 907} 908 909static voidrecount_diff(char*line,int size,struct fragment *fragment) 910{ 911int oldlines =0, newlines =0, ret =0; 912 913if(size <1) { 914warning("recount: ignore empty hunk"); 915return; 916} 917 918for(;;) { 919int len =linelen(line, size); 920 size -= len; 921 line += len; 922 923if(size <1) 924break; 925 926switch(*line) { 927case' ':case'\n': 928 newlines++; 929/* fall through */ 930case'-': 931 oldlines++; 932continue; 933case'+': 934 newlines++; 935continue; 936case'\\': 937continue; 938case'@': 939 ret = size <3||prefixcmp(line,"@@ "); 940break; 941case'd': 942 ret = size <5||prefixcmp(line,"diff "); 943break; 944default: 945 ret = -1; 946break; 947} 948if(ret) { 949warning("recount: unexpected line: %.*s", 950(int)linelen(line, size), line); 951return; 952} 953break; 954} 955 fragment->oldlines = oldlines; 956 fragment->newlines = newlines; 957} 958 959/* 960 * Parse a unified diff fragment header of the 961 * form "@@ -a,b +c,d @@" 962 */ 963static intparse_fragment_header(char*line,int len,struct fragment *fragment) 964{ 965int offset; 966 967if(!len || line[len-1] !='\n') 968return-1; 969 970/* Figure out the number of lines in a fragment */ 971 offset =parse_range(line, len,4," +", &fragment->oldpos, &fragment->oldlines); 972 offset =parse_range(line, len, offset," @@", &fragment->newpos, &fragment->newlines); 973 974return offset; 975} 976 977static intfind_header(char*line,unsigned long size,int*hdrsize,struct patch *patch) 978{ 979unsigned long offset, len; 980 981 patch->is_toplevel_relative =0; 982 patch->is_rename = patch->is_copy =0; 983 patch->is_new = patch->is_delete = -1; 984 patch->old_mode = patch->new_mode =0; 985 patch->old_name = patch->new_name = NULL; 986for(offset =0; size >0; offset += len, size -= len, line += len, linenr++) { 987unsigned long nextlen; 988 989 len =linelen(line, size); 990if(!len) 991break; 992 993/* Testing this early allows us to take a few shortcuts.. */ 994if(len <6) 995continue; 996 997/* 998 * Make sure we don't find any unconnected patch fragments. 999 * That's a sign that we didn't find a header, and that a1000 * patch has become corrupted/broken up.1001 */1002if(!memcmp("@@ -", line,4)) {1003struct fragment dummy;1004if(parse_fragment_header(line, len, &dummy) <0)1005continue;1006die("patch fragment without header at line%d: %.*s",1007 linenr, (int)len-1, line);1008}10091010if(size < len +6)1011break;10121013/*1014 * Git patch? It might not have a real patch, just a rename1015 * or mode change, so we handle that specially1016 */1017if(!memcmp("diff --git ", line,11)) {1018int git_hdr_len =parse_git_header(line, len, size, patch);1019if(git_hdr_len <= len)1020continue;1021if(!patch->old_name && !patch->new_name) {1022if(!patch->def_name)1023die("git diff header lacks filename information (line%d)", linenr);1024 patch->old_name = patch->new_name = patch->def_name;1025}1026 patch->is_toplevel_relative =1;1027*hdrsize = git_hdr_len;1028return offset;1029}10301031/* --- followed by +++ ? */1032if(memcmp("--- ", line,4) ||memcmp("+++ ", line + len,4))1033continue;10341035/*1036 * We only accept unified patches, so we want it to1037 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1038 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1039 */1040 nextlen =linelen(line + len, size - len);1041if(size < nextlen +14||memcmp("@@ -", line + len + nextlen,4))1042continue;10431044/* Ok, we'll consider it a patch */1045parse_traditional_patch(line, line+len, patch);1046*hdrsize = len + nextlen;1047 linenr +=2;1048return offset;1049}1050return-1;1051}10521053static voidcheck_whitespace(const char*line,int len,unsigned ws_rule)1054{1055char*err;1056unsigned result =ws_check(line +1, len -1, ws_rule);1057if(!result)1058return;10591060 whitespace_error++;1061if(squelch_whitespace_errors &&1062 squelch_whitespace_errors < whitespace_error)1063;1064else{1065 err =whitespace_error_string(result);1066fprintf(stderr,"%s:%d:%s.\n%.*s\n",1067 patch_input_file, linenr, err, len -2, line +1);1068free(err);1069}1070}10711072/*1073 * Parse a unified diff. Note that this really needs to parse each1074 * fragment separately, since the only way to know the difference1075 * between a "---" that is part of a patch, and a "---" that starts1076 * the next patch is to look at the line counts..1077 */1078static intparse_fragment(char*line,unsigned long size,1079struct patch *patch,struct fragment *fragment)1080{1081int added, deleted;1082int len =linelen(line, size), offset;1083unsigned long oldlines, newlines;1084unsigned long leading, trailing;10851086 offset =parse_fragment_header(line, len, fragment);1087if(offset <0)1088return-1;1089if(offset >0&& patch->recount)1090recount_diff(line + offset, size - offset, fragment);1091 oldlines = fragment->oldlines;1092 newlines = fragment->newlines;1093 leading =0;1094 trailing =0;10951096/* Parse the thing.. */1097 line += len;1098 size -= len;1099 linenr++;1100 added = deleted =0;1101for(offset = len;11020< size;1103 offset += len, size -= len, line += len, linenr++) {1104if(!oldlines && !newlines)1105break;1106 len =linelen(line, size);1107if(!len || line[len-1] !='\n')1108return-1;1109switch(*line) {1110default:1111return-1;1112case'\n':/* newer GNU diff, an empty context line */1113case' ':1114 oldlines--;1115 newlines--;1116if(!deleted && !added)1117 leading++;1118 trailing++;1119break;1120case'-':1121if(apply_in_reverse &&1122 ws_error_action != nowarn_ws_error)1123check_whitespace(line, len, patch->ws_rule);1124 deleted++;1125 oldlines--;1126 trailing =0;1127break;1128case'+':1129if(!apply_in_reverse &&1130 ws_error_action != nowarn_ws_error)1131check_whitespace(line, len, patch->ws_rule);1132 added++;1133 newlines--;1134 trailing =0;1135break;11361137/*1138 * We allow "\ No newline at end of file". Depending1139 * on locale settings when the patch was produced we1140 * don't know what this line looks like. The only1141 * thing we do know is that it begins with "\ ".1142 * Checking for 12 is just for sanity check -- any1143 * l10n of "\ No newline..." is at least that long.1144 */1145case'\\':1146if(len <12||memcmp(line,"\\",2))1147return-1;1148break;1149}1150}1151if(oldlines || newlines)1152return-1;1153 fragment->leading = leading;1154 fragment->trailing = trailing;11551156/*1157 * If a fragment ends with an incomplete line, we failed to include1158 * it in the above loop because we hit oldlines == newlines == 01159 * before seeing it.1160 */1161if(12< size && !memcmp(line,"\\",2))1162 offset +=linelen(line, size);11631164 patch->lines_added += added;1165 patch->lines_deleted += deleted;11661167if(0< patch->is_new && oldlines)1168returnerror("new file depends on old contents");1169if(0< patch->is_delete && newlines)1170returnerror("deleted file still has contents");1171return offset;1172}11731174static intparse_single_patch(char*line,unsigned long size,struct patch *patch)1175{1176unsigned long offset =0;1177unsigned long oldlines =0, newlines =0, context =0;1178struct fragment **fragp = &patch->fragments;11791180while(size >4&& !memcmp(line,"@@ -",4)) {1181struct fragment *fragment;1182int len;11831184 fragment =xcalloc(1,sizeof(*fragment));1185 len =parse_fragment(line, size, patch, fragment);1186if(len <=0)1187die("corrupt patch at line%d", linenr);1188 fragment->patch = line;1189 fragment->size = len;1190 oldlines += fragment->oldlines;1191 newlines += fragment->newlines;1192 context += fragment->leading + fragment->trailing;11931194*fragp = fragment;1195 fragp = &fragment->next;11961197 offset += len;1198 line += len;1199 size -= len;1200}12011202/*1203 * If something was removed (i.e. we have old-lines) it cannot1204 * be creation, and if something was added it cannot be1205 * deletion. However, the reverse is not true; --unified=01206 * patches that only add are not necessarily creation even1207 * though they do not have any old lines, and ones that only1208 * delete are not necessarily deletion.1209 *1210 * Unfortunately, a real creation/deletion patch do _not_ have1211 * any context line by definition, so we cannot safely tell it1212 * apart with --unified=0 insanity. At least if the patch has1213 * more than one hunk it is not creation or deletion.1214 */1215if(patch->is_new <0&&1216(oldlines || (patch->fragments && patch->fragments->next)))1217 patch->is_new =0;1218if(patch->is_delete <0&&1219(newlines || (patch->fragments && patch->fragments->next)))1220 patch->is_delete =0;12211222if(0< patch->is_new && oldlines)1223die("new file%sdepends on old contents", patch->new_name);1224if(0< patch->is_delete && newlines)1225die("deleted file%sstill has contents", patch->old_name);1226if(!patch->is_delete && !newlines && context)1227fprintf(stderr,"** warning: file%sbecomes empty but "1228"is not deleted\n", patch->new_name);12291230return offset;1231}12321233staticinlineintmetadata_changes(struct patch *patch)1234{1235return patch->is_rename >0||1236 patch->is_copy >0||1237 patch->is_new >0||1238 patch->is_delete ||1239(patch->old_mode && patch->new_mode &&1240 patch->old_mode != patch->new_mode);1241}12421243static char*inflate_it(const void*data,unsigned long size,1244unsigned long inflated_size)1245{1246 z_stream stream;1247void*out;1248int st;12491250memset(&stream,0,sizeof(stream));12511252 stream.next_in = (unsigned char*)data;1253 stream.avail_in = size;1254 stream.next_out = out =xmalloc(inflated_size);1255 stream.avail_out = inflated_size;1256inflateInit(&stream);1257 st =inflate(&stream, Z_FINISH);1258if((st != Z_STREAM_END) || stream.total_out != inflated_size) {1259free(out);1260return NULL;1261}1262return out;1263}12641265static struct fragment *parse_binary_hunk(char**buf_p,1266unsigned long*sz_p,1267int*status_p,1268int*used_p)1269{1270/*1271 * Expect a line that begins with binary patch method ("literal"1272 * or "delta"), followed by the length of data before deflating.1273 * a sequence of 'length-byte' followed by base-85 encoded data1274 * should follow, terminated by a newline.1275 *1276 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1277 * and we would limit the patch line to 66 characters,1278 * so one line can fit up to 13 groups that would decode1279 * to 52 bytes max. The length byte 'A'-'Z' corresponds1280 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1281 */1282int llen, used;1283unsigned long size = *sz_p;1284char*buffer = *buf_p;1285int patch_method;1286unsigned long origlen;1287char*data = NULL;1288int hunk_size =0;1289struct fragment *frag;12901291 llen =linelen(buffer, size);1292 used = llen;12931294*status_p =0;12951296if(!prefixcmp(buffer,"delta ")) {1297 patch_method = BINARY_DELTA_DEFLATED;1298 origlen =strtoul(buffer +6, NULL,10);1299}1300else if(!prefixcmp(buffer,"literal ")) {1301 patch_method = BINARY_LITERAL_DEFLATED;1302 origlen =strtoul(buffer +8, NULL,10);1303}1304else1305return NULL;13061307 linenr++;1308 buffer += llen;1309while(1) {1310int byte_length, max_byte_length, newsize;1311 llen =linelen(buffer, size);1312 used += llen;1313 linenr++;1314if(llen ==1) {1315/* consume the blank line */1316 buffer++;1317 size--;1318break;1319}1320/*1321 * Minimum line is "A00000\n" which is 7-byte long,1322 * and the line length must be multiple of 5 plus 2.1323 */1324if((llen <7) || (llen-2) %5)1325goto corrupt;1326 max_byte_length = (llen -2) /5*4;1327 byte_length = *buffer;1328if('A'<= byte_length && byte_length <='Z')1329 byte_length = byte_length -'A'+1;1330else if('a'<= byte_length && byte_length <='z')1331 byte_length = byte_length -'a'+27;1332else1333goto corrupt;1334/* if the input length was not multiple of 4, we would1335 * have filler at the end but the filler should never1336 * exceed 3 bytes1337 */1338if(max_byte_length < byte_length ||1339 byte_length <= max_byte_length -4)1340goto corrupt;1341 newsize = hunk_size + byte_length;1342 data =xrealloc(data, newsize);1343if(decode_85(data + hunk_size, buffer +1, byte_length))1344goto corrupt;1345 hunk_size = newsize;1346 buffer += llen;1347 size -= llen;1348}13491350 frag =xcalloc(1,sizeof(*frag));1351 frag->patch =inflate_it(data, hunk_size, origlen);1352if(!frag->patch)1353goto corrupt;1354free(data);1355 frag->size = origlen;1356*buf_p = buffer;1357*sz_p = size;1358*used_p = used;1359 frag->binary_patch_method = patch_method;1360return frag;13611362 corrupt:1363free(data);1364*status_p = -1;1365error("corrupt binary patch at line%d: %.*s",1366 linenr-1, llen-1, buffer);1367return NULL;1368}13691370static intparse_binary(char*buffer,unsigned long size,struct patch *patch)1371{1372/*1373 * We have read "GIT binary patch\n"; what follows is a line1374 * that says the patch method (currently, either "literal" or1375 * "delta") and the length of data before deflating; a1376 * sequence of 'length-byte' followed by base-85 encoded data1377 * follows.1378 *1379 * When a binary patch is reversible, there is another binary1380 * hunk in the same format, starting with patch method (either1381 * "literal" or "delta") with the length of data, and a sequence1382 * of length-byte + base-85 encoded data, terminated with another1383 * empty line. This data, when applied to the postimage, produces1384 * the preimage.1385 */1386struct fragment *forward;1387struct fragment *reverse;1388int status;1389int used, used_1;13901391 forward =parse_binary_hunk(&buffer, &size, &status, &used);1392if(!forward && !status)1393/* there has to be one hunk (forward hunk) */1394returnerror("unrecognized binary patch at line%d", linenr-1);1395if(status)1396/* otherwise we already gave an error message */1397return status;13981399 reverse =parse_binary_hunk(&buffer, &size, &status, &used_1);1400if(reverse)1401 used += used_1;1402else if(status) {1403/*1404 * Not having reverse hunk is not an error, but having1405 * a corrupt reverse hunk is.1406 */1407free((void*) forward->patch);1408free(forward);1409return status;1410}1411 forward->next = reverse;1412 patch->fragments = forward;1413 patch->is_binary =1;1414return used;1415}14161417static intparse_chunk(char*buffer,unsigned long size,struct patch *patch)1418{1419int hdrsize, patchsize;1420int offset =find_header(buffer, size, &hdrsize, patch);14211422if(offset <0)1423return offset;14241425 patch->ws_rule =whitespace_rule(patch->new_name1426? patch->new_name1427: patch->old_name);14281429 patchsize =parse_single_patch(buffer + offset + hdrsize,1430 size - offset - hdrsize, patch);14311432if(!patchsize) {1433static const char*binhdr[] = {1434"Binary files ",1435"Files ",1436 NULL,1437};1438static const char git_binary[] ="GIT binary patch\n";1439int i;1440int hd = hdrsize + offset;1441unsigned long llen =linelen(buffer + hd, size - hd);14421443if(llen ==sizeof(git_binary) -1&&1444!memcmp(git_binary, buffer + hd, llen)) {1445int used;1446 linenr++;1447 used =parse_binary(buffer + hd + llen,1448 size - hd - llen, patch);1449if(used)1450 patchsize = used + llen;1451else1452 patchsize =0;1453}1454else if(!memcmp(" differ\n", buffer + hd + llen -8,8)) {1455for(i =0; binhdr[i]; i++) {1456int len =strlen(binhdr[i]);1457if(len < size - hd &&1458!memcmp(binhdr[i], buffer + hd, len)) {1459 linenr++;1460 patch->is_binary =1;1461 patchsize = llen;1462break;1463}1464}1465}14661467/* Empty patch cannot be applied if it is a text patch1468 * without metadata change. A binary patch appears1469 * empty to us here.1470 */1471if((apply || check) &&1472(!patch->is_binary && !metadata_changes(patch)))1473die("patch with only garbage at line%d", linenr);1474}14751476return offset + hdrsize + patchsize;1477}14781479#define swap(a,b) myswap((a),(b),sizeof(a))14801481#define myswap(a, b, size) do { \1482 unsigned char mytmp[size]; \1483 memcpy(mytmp, &a, size); \1484 memcpy(&a, &b, size); \1485 memcpy(&b, mytmp, size); \1486} while (0)14871488static voidreverse_patches(struct patch *p)1489{1490for(; p; p = p->next) {1491struct fragment *frag = p->fragments;14921493swap(p->new_name, p->old_name);1494swap(p->new_mode, p->old_mode);1495swap(p->is_new, p->is_delete);1496swap(p->lines_added, p->lines_deleted);1497swap(p->old_sha1_prefix, p->new_sha1_prefix);14981499for(; frag; frag = frag->next) {1500swap(frag->newpos, frag->oldpos);1501swap(frag->newlines, frag->oldlines);1502}1503}1504}15051506static const char pluses[] =1507"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";1508static const char minuses[]=1509"----------------------------------------------------------------------";15101511static voidshow_stats(struct patch *patch)1512{1513struct strbuf qname = STRBUF_INIT;1514char*cp = patch->new_name ? patch->new_name : patch->old_name;1515int max, add, del;15161517quote_c_style(cp, &qname, NULL,0);15181519/*1520 * "scale" the filename1521 */1522 max = max_len;1523if(max >50)1524 max =50;15251526if(qname.len > max) {1527 cp =strchr(qname.buf + qname.len +3- max,'/');1528if(!cp)1529 cp = qname.buf + qname.len +3- max;1530strbuf_splice(&qname,0, cp - qname.buf,"...",3);1531}15321533if(patch->is_binary) {1534printf(" %-*s | Bin\n", max, qname.buf);1535strbuf_release(&qname);1536return;1537}15381539printf(" %-*s |", max, qname.buf);1540strbuf_release(&qname);15411542/*1543 * scale the add/delete1544 */1545 max = max + max_change >70?70- max : max_change;1546 add = patch->lines_added;1547 del = patch->lines_deleted;15481549if(max_change >0) {1550int total = ((add + del) * max + max_change /2) / max_change;1551 add = (add * max + max_change /2) / max_change;1552 del = total - add;1553}1554printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,1555 add, pluses, del, minuses);1556}15571558static intread_old_data(struct stat *st,const char*path,struct strbuf *buf)1559{1560switch(st->st_mode & S_IFMT) {1561case S_IFLNK:1562if(strbuf_readlink(buf, path, st->st_size) <0)1563returnerror("unable to read symlink%s", path);1564return0;1565case S_IFREG:1566if(strbuf_read_file(buf, path, st->st_size) != st->st_size)1567returnerror("unable to open or read%s", path);1568convert_to_git(path, buf->buf, buf->len, buf,0);1569return0;1570default:1571return-1;1572}1573}15741575static voidupdate_pre_post_images(struct image *preimage,1576struct image *postimage,1577char*buf,1578size_t len)1579{1580int i, ctx;1581char*new, *old, *fixed;1582struct image fixed_preimage;15831584/*1585 * Update the preimage with whitespace fixes. Note that we1586 * are not losing preimage->buf -- apply_one_fragment() will1587 * free "oldlines".1588 */1589prepare_image(&fixed_preimage, buf, len,1);1590assert(fixed_preimage.nr == preimage->nr);1591for(i =0; i < preimage->nr; i++)1592 fixed_preimage.line[i].flag = preimage->line[i].flag;1593free(preimage->line_allocated);1594*preimage = fixed_preimage;15951596/*1597 * Adjust the common context lines in postimage, in place.1598 * This is possible because whitespace fixing does not make1599 * the string grow.1600 */1601new= old = postimage->buf;1602 fixed = preimage->buf;1603for(i = ctx =0; i < postimage->nr; i++) {1604size_t len = postimage->line[i].len;1605if(!(postimage->line[i].flag & LINE_COMMON)) {1606/* an added line -- no counterparts in preimage */1607memmove(new, old, len);1608 old += len;1609new+= len;1610continue;1611}16121613/* a common context -- skip it in the original postimage */1614 old += len;16151616/* and find the corresponding one in the fixed preimage */1617while(ctx < preimage->nr &&1618!(preimage->line[ctx].flag & LINE_COMMON)) {1619 fixed += preimage->line[ctx].len;1620 ctx++;1621}1622if(preimage->nr <= ctx)1623die("oops");16241625/* and copy it in, while fixing the line length */1626 len = preimage->line[ctx].len;1627memcpy(new, fixed, len);1628new+= len;1629 fixed += len;1630 postimage->line[i].len = len;1631 ctx++;1632}16331634/* Fix the length of the whole thing */1635 postimage->len =new- postimage->buf;1636}16371638static intmatch_fragment(struct image *img,1639struct image *preimage,1640struct image *postimage,1641unsigned longtry,1642int try_lno,1643unsigned ws_rule,1644int match_beginning,int match_end)1645{1646int i;1647char*fixed_buf, *buf, *orig, *target;16481649if(preimage->nr + try_lno > img->nr)1650return0;16511652if(match_beginning && try_lno)1653return0;16541655if(match_end && preimage->nr + try_lno != img->nr)1656return0;16571658/* Quick hash check */1659for(i =0; i < preimage->nr; i++)1660if(preimage->line[i].hash != img->line[try_lno + i].hash)1661return0;16621663/*1664 * Do we have an exact match? If we were told to match1665 * at the end, size must be exactly at try+fragsize,1666 * otherwise try+fragsize must be still within the preimage,1667 * and either case, the old piece should match the preimage1668 * exactly.1669 */1670if((match_end1671? (try+ preimage->len == img->len)1672: (try+ preimage->len <= img->len)) &&1673!memcmp(img->buf +try, preimage->buf, preimage->len))1674return1;16751676if(ws_error_action != correct_ws_error)1677return0;16781679/*1680 * The hunk does not apply byte-by-byte, but the hash says1681 * it might with whitespace fuzz.1682 */1683 fixed_buf =xmalloc(preimage->len +1);1684 buf = fixed_buf;1685 orig = preimage->buf;1686 target = img->buf +try;1687for(i =0; i < preimage->nr; i++) {1688size_t fixlen;/* length after fixing the preimage */1689size_t oldlen = preimage->line[i].len;1690size_t tgtlen = img->line[try_lno + i].len;1691size_t tgtfixlen;/* length after fixing the target line */1692char tgtfixbuf[1024], *tgtfix;1693int match;16941695/* Try fixing the line in the preimage */1696 fixlen =ws_fix_copy(buf, orig, oldlen, ws_rule, NULL);16971698/* Try fixing the line in the target */1699if(sizeof(tgtfixbuf) > tgtlen)1700 tgtfix = tgtfixbuf;1701else1702 tgtfix =xmalloc(tgtlen);1703 tgtfixlen =ws_fix_copy(tgtfix, target, tgtlen, ws_rule, NULL);17041705/*1706 * If they match, either the preimage was based on1707 * a version before our tree fixed whitespace breakage,1708 * or we are lacking a whitespace-fix patch the tree1709 * the preimage was based on already had (i.e. target1710 * has whitespace breakage, the preimage doesn't).1711 * In either case, we are fixing the whitespace breakages1712 * so we might as well take the fix together with their1713 * real change.1714 */1715 match = (tgtfixlen == fixlen && !memcmp(tgtfix, buf, fixlen));17161717if(tgtfix != tgtfixbuf)1718free(tgtfix);1719if(!match)1720goto unmatch_exit;17211722 orig += oldlen;1723 buf += fixlen;1724 target += tgtlen;1725}17261727/*1728 * Yes, the preimage is based on an older version that still1729 * has whitespace breakages unfixed, and fixing them makes the1730 * hunk match. Update the context lines in the postimage.1731 */1732update_pre_post_images(preimage, postimage,1733 fixed_buf, buf - fixed_buf);1734return1;17351736 unmatch_exit:1737free(fixed_buf);1738return0;1739}17401741static intfind_pos(struct image *img,1742struct image *preimage,1743struct image *postimage,1744int line,1745unsigned ws_rule,1746int match_beginning,int match_end)1747{1748int i;1749unsigned long backwards, forwards,try;1750int backwards_lno, forwards_lno, try_lno;17511752if(preimage->nr > img->nr)1753return-1;17541755/*1756 * If match_begining or match_end is specified, there is no1757 * point starting from a wrong line that will never match and1758 * wander around and wait for a match at the specified end.1759 */1760if(match_beginning)1761 line =0;1762else if(match_end)1763 line = img->nr - preimage->nr;17641765if(line > img->nr)1766 line = img->nr;17671768try=0;1769for(i =0; i < line; i++)1770try+= img->line[i].len;17711772/*1773 * There's probably some smart way to do this, but I'll leave1774 * that to the smart and beautiful people. I'm simple and stupid.1775 */1776 backwards =try;1777 backwards_lno = line;1778 forwards =try;1779 forwards_lno = line;1780 try_lno = line;17811782for(i =0; ; i++) {1783if(match_fragment(img, preimage, postimage,1784try, try_lno, ws_rule,1785 match_beginning, match_end))1786return try_lno;17871788 again:1789if(backwards_lno ==0&& forwards_lno == img->nr)1790break;17911792if(i &1) {1793if(backwards_lno ==0) {1794 i++;1795goto again;1796}1797 backwards_lno--;1798 backwards -= img->line[backwards_lno].len;1799try= backwards;1800 try_lno = backwards_lno;1801}else{1802if(forwards_lno == img->nr) {1803 i++;1804goto again;1805}1806 forwards += img->line[forwards_lno].len;1807 forwards_lno++;1808try= forwards;1809 try_lno = forwards_lno;1810}18111812}1813return-1;1814}18151816static voidremove_first_line(struct image *img)1817{1818 img->buf += img->line[0].len;1819 img->len -= img->line[0].len;1820 img->line++;1821 img->nr--;1822}18231824static voidremove_last_line(struct image *img)1825{1826 img->len -= img->line[--img->nr].len;1827}18281829static voidupdate_image(struct image *img,1830int applied_pos,1831struct image *preimage,1832struct image *postimage)1833{1834/*1835 * remove the copy of preimage at offset in img1836 * and replace it with postimage1837 */1838int i, nr;1839size_t remove_count, insert_count, applied_at =0;1840char*result;18411842for(i =0; i < applied_pos; i++)1843 applied_at += img->line[i].len;18441845 remove_count =0;1846for(i =0; i < preimage->nr; i++)1847 remove_count += img->line[applied_pos + i].len;1848 insert_count = postimage->len;18491850/* Adjust the contents */1851 result =xmalloc(img->len + insert_count - remove_count +1);1852memcpy(result, img->buf, applied_at);1853memcpy(result + applied_at, postimage->buf, postimage->len);1854memcpy(result + applied_at + postimage->len,1855 img->buf + (applied_at + remove_count),1856 img->len - (applied_at + remove_count));1857free(img->buf);1858 img->buf = result;1859 img->len += insert_count - remove_count;1860 result[img->len] ='\0';18611862/* Adjust the line table */1863 nr = img->nr + postimage->nr - preimage->nr;1864if(preimage->nr < postimage->nr) {1865/*1866 * NOTE: this knows that we never call remove_first_line()1867 * on anything other than pre/post image.1868 */1869 img->line =xrealloc(img->line, nr *sizeof(*img->line));1870 img->line_allocated = img->line;1871}1872if(preimage->nr != postimage->nr)1873memmove(img->line + applied_pos + postimage->nr,1874 img->line + applied_pos + preimage->nr,1875(img->nr - (applied_pos + preimage->nr)) *1876sizeof(*img->line));1877memcpy(img->line + applied_pos,1878 postimage->line,1879 postimage->nr *sizeof(*img->line));1880 img->nr = nr;1881}18821883static intapply_one_fragment(struct image *img,struct fragment *frag,1884int inaccurate_eof,unsigned ws_rule)1885{1886int match_beginning, match_end;1887const char*patch = frag->patch;1888int size = frag->size;1889char*old, *new, *oldlines, *newlines;1890int new_blank_lines_at_end =0;1891unsigned long leading, trailing;1892int pos, applied_pos;1893struct image preimage;1894struct image postimage;18951896memset(&preimage,0,sizeof(preimage));1897memset(&postimage,0,sizeof(postimage));1898 oldlines =xmalloc(size);1899 newlines =xmalloc(size);19001901 old = oldlines;1902new= newlines;1903while(size >0) {1904char first;1905int len =linelen(patch, size);1906int plen, added;1907int added_blank_line =0;19081909if(!len)1910break;19111912/*1913 * "plen" is how much of the line we should use for1914 * the actual patch data. Normally we just remove the1915 * first character on the line, but if the line is1916 * followed by "\ No newline", then we also remove the1917 * last one (which is the newline, of course).1918 */1919 plen = len -1;1920if(len < size && patch[len] =='\\')1921 plen--;1922 first = *patch;1923if(apply_in_reverse) {1924if(first =='-')1925 first ='+';1926else if(first =='+')1927 first ='-';1928}19291930switch(first) {1931case'\n':1932/* Newer GNU diff, empty context line */1933if(plen <0)1934/* ... followed by '\No newline'; nothing */1935break;1936*old++ ='\n';1937*new++ ='\n';1938add_line_info(&preimage,"\n",1, LINE_COMMON);1939add_line_info(&postimage,"\n",1, LINE_COMMON);1940break;1941case' ':1942case'-':1943memcpy(old, patch +1, plen);1944add_line_info(&preimage, old, plen,1945(first ==' '? LINE_COMMON :0));1946 old += plen;1947if(first =='-')1948break;1949/* Fall-through for ' ' */1950case'+':1951/* --no-add does not add new lines */1952if(first =='+'&& no_add)1953break;19541955if(first !='+'||1956!whitespace_error ||1957 ws_error_action != correct_ws_error) {1958memcpy(new, patch +1, plen);1959 added = plen;1960}1961else{1962 added =ws_fix_copy(new, patch +1, plen, ws_rule, &applied_after_fixing_ws);1963}1964add_line_info(&postimage,new, added,1965(first =='+'?0: LINE_COMMON));1966new+= added;1967if(first =='+'&&1968 added ==1&&new[-1] =='\n')1969 added_blank_line =1;1970break;1971case'@':case'\\':1972/* Ignore it, we already handled it */1973break;1974default:1975if(apply_verbosely)1976error("invalid start of line: '%c'", first);1977return-1;1978}1979if(added_blank_line)1980 new_blank_lines_at_end++;1981else1982 new_blank_lines_at_end =0;1983 patch += len;1984 size -= len;1985}1986if(inaccurate_eof &&1987 old > oldlines && old[-1] =='\n'&&1988new> newlines &&new[-1] =='\n') {1989 old--;1990new--;1991}19921993 leading = frag->leading;1994 trailing = frag->trailing;19951996/*1997 * A hunk to change lines at the beginning would begin with1998 * @@ -1,L +N,M @@1999 * but we need to be careful. -U0 that inserts before the second2000 * line also has this pattern.2001 *2002 * And a hunk to add to an empty file would begin with2003 * @@ -0,0 +N,M @@2004 *2005 * In other words, a hunk that is (frag->oldpos <= 1) with or2006 * without leading context must match at the beginning.2007 */2008 match_beginning = (!frag->oldpos ||2009(frag->oldpos ==1&& !unidiff_zero));20102011/*2012 * A hunk without trailing lines must match at the end.2013 * However, we simply cannot tell if a hunk must match end2014 * from the lack of trailing lines if the patch was generated2015 * with unidiff without any context.2016 */2017 match_end = !unidiff_zero && !trailing;20182019 pos = frag->newpos ? (frag->newpos -1) :0;2020 preimage.buf = oldlines;2021 preimage.len = old - oldlines;2022 postimage.buf = newlines;2023 postimage.len =new- newlines;2024 preimage.line = preimage.line_allocated;2025 postimage.line = postimage.line_allocated;20262027for(;;) {20282029 applied_pos =find_pos(img, &preimage, &postimage, pos,2030 ws_rule, match_beginning, match_end);20312032if(applied_pos >=0)2033break;20342035/* Am I at my context limits? */2036if((leading <= p_context) && (trailing <= p_context))2037break;2038if(match_beginning || match_end) {2039 match_beginning = match_end =0;2040continue;2041}20422043/*2044 * Reduce the number of context lines; reduce both2045 * leading and trailing if they are equal otherwise2046 * just reduce the larger context.2047 */2048if(leading >= trailing) {2049remove_first_line(&preimage);2050remove_first_line(&postimage);2051 pos--;2052 leading--;2053}2054if(trailing > leading) {2055remove_last_line(&preimage);2056remove_last_line(&postimage);2057 trailing--;2058}2059}20602061if(applied_pos >=0) {2062if(ws_error_action == correct_ws_error &&2063 new_blank_lines_at_end &&2064 postimage.nr + applied_pos == img->nr) {2065/*2066 * If the patch application adds blank lines2067 * at the end, and if the patch applies at the2068 * end of the image, remove those added blank2069 * lines.2070 */2071while(new_blank_lines_at_end--)2072remove_last_line(&postimage);2073}20742075/*2076 * Warn if it was necessary to reduce the number2077 * of context lines.2078 */2079if((leading != frag->leading) ||2080(trailing != frag->trailing))2081fprintf(stderr,"Context reduced to (%ld/%ld)"2082" to apply fragment at%d\n",2083 leading, trailing, applied_pos+1);2084update_image(img, applied_pos, &preimage, &postimage);2085}else{2086if(apply_verbosely)2087error("while searching for:\n%.*s",2088(int)(old - oldlines), oldlines);2089}20902091free(oldlines);2092free(newlines);2093free(preimage.line_allocated);2094free(postimage.line_allocated);20952096return(applied_pos <0);2097}20982099static intapply_binary_fragment(struct image *img,struct patch *patch)2100{2101struct fragment *fragment = patch->fragments;2102unsigned long len;2103void*dst;21042105/* Binary patch is irreversible without the optional second hunk */2106if(apply_in_reverse) {2107if(!fragment->next)2108returnerror("cannot reverse-apply a binary patch "2109"without the reverse hunk to '%s'",2110 patch->new_name2111? patch->new_name : patch->old_name);2112 fragment = fragment->next;2113}2114switch(fragment->binary_patch_method) {2115case BINARY_DELTA_DEFLATED:2116 dst =patch_delta(img->buf, img->len, fragment->patch,2117 fragment->size, &len);2118if(!dst)2119return-1;2120clear_image(img);2121 img->buf = dst;2122 img->len = len;2123return0;2124case BINARY_LITERAL_DEFLATED:2125clear_image(img);2126 img->len = fragment->size;2127 img->buf =xmalloc(img->len+1);2128memcpy(img->buf, fragment->patch, img->len);2129 img->buf[img->len] ='\0';2130return0;2131}2132return-1;2133}21342135static intapply_binary(struct image *img,struct patch *patch)2136{2137const char*name = patch->old_name ? patch->old_name : patch->new_name;2138unsigned char sha1[20];21392140/*2141 * For safety, we require patch index line to contain2142 * full 40-byte textual SHA1 for old and new, at least for now.2143 */2144if(strlen(patch->old_sha1_prefix) !=40||2145strlen(patch->new_sha1_prefix) !=40||2146get_sha1_hex(patch->old_sha1_prefix, sha1) ||2147get_sha1_hex(patch->new_sha1_prefix, sha1))2148returnerror("cannot apply binary patch to '%s' "2149"without full index line", name);21502151if(patch->old_name) {2152/*2153 * See if the old one matches what the patch2154 * applies to.2155 */2156hash_sha1_file(img->buf, img->len, blob_type, sha1);2157if(strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2158returnerror("the patch applies to '%s' (%s), "2159"which does not match the "2160"current contents.",2161 name,sha1_to_hex(sha1));2162}2163else{2164/* Otherwise, the old one must be empty. */2165if(img->len)2166returnerror("the patch applies to an empty "2167"'%s' but it is not empty", name);2168}21692170get_sha1_hex(patch->new_sha1_prefix, sha1);2171if(is_null_sha1(sha1)) {2172clear_image(img);2173return0;/* deletion patch */2174}21752176if(has_sha1_file(sha1)) {2177/* We already have the postimage */2178enum object_type type;2179unsigned long size;2180char*result;21812182 result =read_sha1_file(sha1, &type, &size);2183if(!result)2184returnerror("the necessary postimage%sfor "2185"'%s' cannot be read",2186 patch->new_sha1_prefix, name);2187clear_image(img);2188 img->buf = result;2189 img->len = size;2190}else{2191/*2192 * We have verified buf matches the preimage;2193 * apply the patch data to it, which is stored2194 * in the patch->fragments->{patch,size}.2195 */2196if(apply_binary_fragment(img, patch))2197returnerror("binary patch does not apply to '%s'",2198 name);21992200/* verify that the result matches */2201hash_sha1_file(img->buf, img->len, blob_type, sha1);2202if(strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))2203returnerror("binary patch to '%s' creates incorrect result (expecting%s, got%s)",2204 name, patch->new_sha1_prefix,sha1_to_hex(sha1));2205}22062207return0;2208}22092210static intapply_fragments(struct image *img,struct patch *patch)2211{2212struct fragment *frag = patch->fragments;2213const char*name = patch->old_name ? patch->old_name : patch->new_name;2214unsigned ws_rule = patch->ws_rule;2215unsigned inaccurate_eof = patch->inaccurate_eof;22162217if(patch->is_binary)2218returnapply_binary(img, patch);22192220while(frag) {2221if(apply_one_fragment(img, frag, inaccurate_eof, ws_rule)) {2222error("patch failed:%s:%ld", name, frag->oldpos);2223if(!apply_with_reject)2224return-1;2225 frag->rejected =1;2226}2227 frag = frag->next;2228}2229return0;2230}22312232static intread_file_or_gitlink(struct cache_entry *ce,struct strbuf *buf)2233{2234if(!ce)2235return0;22362237if(S_ISGITLINK(ce->ce_mode)) {2238strbuf_grow(buf,100);2239strbuf_addf(buf,"Subproject commit%s\n",sha1_to_hex(ce->sha1));2240}else{2241enum object_type type;2242unsigned long sz;2243char*result;22442245 result =read_sha1_file(ce->sha1, &type, &sz);2246if(!result)2247return-1;2248/* XXX read_sha1_file NUL-terminates */2249strbuf_attach(buf, result, sz, sz +1);2250}2251return0;2252}22532254static struct patch *in_fn_table(const char*name)2255{2256struct string_list_item *item;22572258if(name == NULL)2259return NULL;22602261 item =string_list_lookup(name, &fn_table);2262if(item != NULL)2263return(struct patch *)item->util;22642265return NULL;2266}22672268static voidadd_to_fn_table(struct patch *patch)2269{2270struct string_list_item *item;22712272/*2273 * Always add new_name unless patch is a deletion2274 * This should cover the cases for normal diffs,2275 * file creations and copies2276 */2277if(patch->new_name != NULL) {2278 item =string_list_insert(patch->new_name, &fn_table);2279 item->util = patch;2280}22812282/*2283 * store a failure on rename/deletion cases because2284 * later chunks shouldn't patch old names2285 */2286if((patch->new_name == NULL) || (patch->is_rename)) {2287 item =string_list_insert(patch->old_name, &fn_table);2288 item->util = (struct patch *) -1;2289}2290}22912292static intapply_data(struct patch *patch,struct stat *st,struct cache_entry *ce)2293{2294struct strbuf buf = STRBUF_INIT;2295struct image image;2296size_t len;2297char*img;2298struct patch *tpatch;22992300if(!(patch->is_copy || patch->is_rename) &&2301((tpatch =in_fn_table(patch->old_name)) != NULL)) {2302if(tpatch == (struct patch *) -1) {2303returnerror("patch%shas been renamed/deleted",2304 patch->old_name);2305}2306/* We have a patched copy in memory use that */2307strbuf_add(&buf, tpatch->result, tpatch->resultsize);2308}else if(cached) {2309if(read_file_or_gitlink(ce, &buf))2310returnerror("read of%sfailed", patch->old_name);2311}else if(patch->old_name) {2312if(S_ISGITLINK(patch->old_mode)) {2313if(ce) {2314read_file_or_gitlink(ce, &buf);2315}else{2316/*2317 * There is no way to apply subproject2318 * patch without looking at the index.2319 */2320 patch->fragments = NULL;2321}2322}else{2323if(read_old_data(st, patch->old_name, &buf))2324returnerror("read of%sfailed", patch->old_name);2325}2326}23272328 img =strbuf_detach(&buf, &len);2329prepare_image(&image, img, len, !patch->is_binary);23302331if(apply_fragments(&image, patch) <0)2332return-1;/* note with --reject this succeeds. */2333 patch->result = image.buf;2334 patch->resultsize = image.len;2335add_to_fn_table(patch);2336free(image.line_allocated);23372338if(0< patch->is_delete && patch->resultsize)2339returnerror("removal patch leaves file contents");23402341return0;2342}23432344static intcheck_to_create_blob(const char*new_name,int ok_if_exists)2345{2346struct stat nst;2347if(!lstat(new_name, &nst)) {2348if(S_ISDIR(nst.st_mode) || ok_if_exists)2349return0;2350/*2351 * A leading component of new_name might be a symlink2352 * that is going to be removed with this patch, but2353 * still pointing at somewhere that has the path.2354 * In such a case, path "new_name" does not exist as2355 * far as git is concerned.2356 */2357if(has_symlink_leading_path(strlen(new_name), new_name))2358return0;23592360returnerror("%s: already exists in working directory", new_name);2361}2362else if((errno != ENOENT) && (errno != ENOTDIR))2363returnerror("%s:%s", new_name,strerror(errno));2364return0;2365}23662367static intverify_index_match(struct cache_entry *ce,struct stat *st)2368{2369if(S_ISGITLINK(ce->ce_mode)) {2370if(!S_ISDIR(st->st_mode))2371return-1;2372return0;2373}2374returnce_match_stat(ce, st, CE_MATCH_IGNORE_VALID);2375}23762377static intcheck_preimage(struct patch *patch,struct cache_entry **ce,struct stat *st)2378{2379const char*old_name = patch->old_name;2380struct patch *tpatch = NULL;2381int stat_ret =0;2382unsigned st_mode =0;23832384/*2385 * Make sure that we do not have local modifications from the2386 * index when we are looking at the index. Also make sure2387 * we have the preimage file to be patched in the work tree,2388 * unless --cached, which tells git to apply only in the index.2389 */2390if(!old_name)2391return0;23922393assert(patch->is_new <=0);23942395if(!(patch->is_copy || patch->is_rename) &&2396(tpatch =in_fn_table(old_name)) != NULL) {2397if(tpatch == (struct patch *) -1) {2398returnerror("%s: has been deleted/renamed", old_name);2399}2400 st_mode = tpatch->new_mode;2401}else if(!cached) {2402 stat_ret =lstat(old_name, st);2403if(stat_ret && errno != ENOENT)2404returnerror("%s:%s", old_name,strerror(errno));2405}24062407if(check_index && !tpatch) {2408int pos =cache_name_pos(old_name,strlen(old_name));2409if(pos <0) {2410if(patch->is_new <0)2411goto is_new;2412returnerror("%s: does not exist in index", old_name);2413}2414*ce = active_cache[pos];2415if(stat_ret <0) {2416struct checkout costate;2417/* checkout */2418 costate.base_dir ="";2419 costate.base_dir_len =0;2420 costate.force =0;2421 costate.quiet =0;2422 costate.not_new =0;2423 costate.refresh_cache =1;2424if(checkout_entry(*ce, &costate, NULL) ||2425lstat(old_name, st))2426return-1;2427}2428if(!cached &&verify_index_match(*ce, st))2429returnerror("%s: does not match index", old_name);2430if(cached)2431 st_mode = (*ce)->ce_mode;2432}else if(stat_ret <0) {2433if(patch->is_new <0)2434goto is_new;2435returnerror("%s:%s", old_name,strerror(errno));2436}24372438if(!cached)2439 st_mode =ce_mode_from_stat(*ce, st->st_mode);24402441if(patch->is_new <0)2442 patch->is_new =0;2443if(!patch->old_mode)2444 patch->old_mode = st_mode;2445if((st_mode ^ patch->old_mode) & S_IFMT)2446returnerror("%s: wrong type", old_name);2447if(st_mode != patch->old_mode)2448fprintf(stderr,"warning:%shas type%o, expected%o\n",2449 old_name, st_mode, patch->old_mode);2450return0;24512452 is_new:2453 patch->is_new =1;2454 patch->is_delete =0;2455 patch->old_name = NULL;2456return0;2457}24582459static intcheck_patch(struct patch *patch)2460{2461struct stat st;2462const char*old_name = patch->old_name;2463const char*new_name = patch->new_name;2464const char*name = old_name ? old_name : new_name;2465struct cache_entry *ce = NULL;2466int ok_if_exists;2467int status;24682469 patch->rejected =1;/* we will drop this after we succeed */24702471 status =check_preimage(patch, &ce, &st);2472if(status)2473return status;2474 old_name = patch->old_name;24752476if(in_fn_table(new_name) == (struct patch *) -1)2477/*2478 * A type-change diff is always split into a patch to2479 * delete old, immediately followed by a patch to2480 * create new (see diff.c::run_diff()); in such a case2481 * it is Ok that the entry to be deleted by the2482 * previous patch is still in the working tree and in2483 * the index.2484 */2485 ok_if_exists =1;2486else2487 ok_if_exists =0;24882489if(new_name &&2490((0< patch->is_new) | (0< patch->is_rename) | patch->is_copy)) {2491if(check_index &&2492cache_name_pos(new_name,strlen(new_name)) >=0&&2493!ok_if_exists)2494returnerror("%s: already exists in index", new_name);2495if(!cached) {2496int err =check_to_create_blob(new_name, ok_if_exists);2497if(err)2498return err;2499}2500if(!patch->new_mode) {2501if(0< patch->is_new)2502 patch->new_mode = S_IFREG |0644;2503else2504 patch->new_mode = patch->old_mode;2505}2506}25072508if(new_name && old_name) {2509int same = !strcmp(old_name, new_name);2510if(!patch->new_mode)2511 patch->new_mode = patch->old_mode;2512if((patch->old_mode ^ patch->new_mode) & S_IFMT)2513returnerror("new mode (%o) of%sdoes not match old mode (%o)%s%s",2514 patch->new_mode, new_name, patch->old_mode,2515 same ?"":" of ", same ?"": old_name);2516}25172518if(apply_data(patch, &st, ce) <0)2519returnerror("%s: patch does not apply", name);2520 patch->rejected =0;2521return0;2522}25232524static intcheck_patch_list(struct patch *patch)2525{2526int err =0;25272528while(patch) {2529if(apply_verbosely)2530say_patch_name(stderr,2531"Checking patch ", patch,"...\n");2532 err |=check_patch(patch);2533 patch = patch->next;2534}2535return err;2536}25372538/* This function tries to read the sha1 from the current index */2539static intget_current_sha1(const char*path,unsigned char*sha1)2540{2541int pos;25422543if(read_cache() <0)2544return-1;2545 pos =cache_name_pos(path,strlen(path));2546if(pos <0)2547return-1;2548hashcpy(sha1, active_cache[pos]->sha1);2549return0;2550}25512552/* Build an index that contains the just the files needed for a 3way merge */2553static voidbuild_fake_ancestor(struct patch *list,const char*filename)2554{2555struct patch *patch;2556struct index_state result = {0};2557int fd;25582559/* Once we start supporting the reverse patch, it may be2560 * worth showing the new sha1 prefix, but until then...2561 */2562for(patch = list; patch; patch = patch->next) {2563const unsigned char*sha1_ptr;2564unsigned char sha1[20];2565struct cache_entry *ce;2566const char*name;25672568 name = patch->old_name ? patch->old_name : patch->new_name;2569if(0< patch->is_new)2570continue;2571else if(get_sha1(patch->old_sha1_prefix, sha1))2572/* git diff has no index line for mode/type changes */2573if(!patch->lines_added && !patch->lines_deleted) {2574if(get_current_sha1(patch->new_name, sha1) ||2575get_current_sha1(patch->old_name, sha1))2576die("mode change for%s, which is not "2577"in current HEAD", name);2578 sha1_ptr = sha1;2579}else2580die("sha1 information is lacking or useless "2581"(%s).", name);2582else2583 sha1_ptr = sha1;25842585 ce =make_cache_entry(patch->old_mode, sha1_ptr, name,0,0);2586if(!ce)2587die("make_cache_entry failed for path '%s'", name);2588if(add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))2589die("Could not add%sto temporary index", name);2590}25912592 fd =open(filename, O_WRONLY | O_CREAT,0666);2593if(fd <0||write_index(&result, fd) ||close(fd))2594die("Could not write temporary index to%s", filename);25952596discard_index(&result);2597}25982599static voidstat_patch_list(struct patch *patch)2600{2601int files, adds, dels;26022603for(files = adds = dels =0; patch ; patch = patch->next) {2604 files++;2605 adds += patch->lines_added;2606 dels += patch->lines_deleted;2607show_stats(patch);2608}26092610printf("%dfiles changed,%dinsertions(+),%ddeletions(-)\n", files, adds, dels);2611}26122613static voidnumstat_patch_list(struct patch *patch)2614{2615for( ; patch; patch = patch->next) {2616const char*name;2617 name = patch->new_name ? patch->new_name : patch->old_name;2618if(patch->is_binary)2619printf("-\t-\t");2620else2621printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);2622write_name_quoted(name, stdout, line_termination);2623}2624}26252626static voidshow_file_mode_name(const char*newdelete,unsigned int mode,const char*name)2627{2628if(mode)2629printf("%smode%06o%s\n", newdelete, mode, name);2630else2631printf("%s %s\n", newdelete, name);2632}26332634static voidshow_mode_change(struct patch *p,int show_name)2635{2636if(p->old_mode && p->new_mode && p->old_mode != p->new_mode) {2637if(show_name)2638printf(" mode change%06o =>%06o%s\n",2639 p->old_mode, p->new_mode, p->new_name);2640else2641printf(" mode change%06o =>%06o\n",2642 p->old_mode, p->new_mode);2643}2644}26452646static voidshow_rename_copy(struct patch *p)2647{2648const char*renamecopy = p->is_rename ?"rename":"copy";2649const char*old, *new;26502651/* Find common prefix */2652 old = p->old_name;2653new= p->new_name;2654while(1) {2655const char*slash_old, *slash_new;2656 slash_old =strchr(old,'/');2657 slash_new =strchr(new,'/');2658if(!slash_old ||2659!slash_new ||2660 slash_old - old != slash_new -new||2661memcmp(old,new, slash_new -new))2662break;2663 old = slash_old +1;2664new= slash_new +1;2665}2666/* p->old_name thru old is the common prefix, and old and new2667 * through the end of names are renames2668 */2669if(old != p->old_name)2670printf("%s%.*s{%s=>%s} (%d%%)\n", renamecopy,2671(int)(old - p->old_name), p->old_name,2672 old,new, p->score);2673else2674printf("%s %s=>%s(%d%%)\n", renamecopy,2675 p->old_name, p->new_name, p->score);2676show_mode_change(p,0);2677}26782679static voidsummary_patch_list(struct patch *patch)2680{2681struct patch *p;26822683for(p = patch; p; p = p->next) {2684if(p->is_new)2685show_file_mode_name("create", p->new_mode, p->new_name);2686else if(p->is_delete)2687show_file_mode_name("delete", p->old_mode, p->old_name);2688else{2689if(p->is_rename || p->is_copy)2690show_rename_copy(p);2691else{2692if(p->score) {2693printf(" rewrite%s(%d%%)\n",2694 p->new_name, p->score);2695show_mode_change(p,0);2696}2697else2698show_mode_change(p,1);2699}2700}2701}2702}27032704static voidpatch_stats(struct patch *patch)2705{2706int lines = patch->lines_added + patch->lines_deleted;27072708if(lines > max_change)2709 max_change = lines;2710if(patch->old_name) {2711int len =quote_c_style(patch->old_name, NULL, NULL,0);2712if(!len)2713 len =strlen(patch->old_name);2714if(len > max_len)2715 max_len = len;2716}2717if(patch->new_name) {2718int len =quote_c_style(patch->new_name, NULL, NULL,0);2719if(!len)2720 len =strlen(patch->new_name);2721if(len > max_len)2722 max_len = len;2723}2724}27252726static voidremove_file(struct patch *patch,int rmdir_empty)2727{2728if(update_index) {2729if(remove_file_from_cache(patch->old_name) <0)2730die("unable to remove%sfrom index", patch->old_name);2731}2732if(!cached) {2733if(S_ISGITLINK(patch->old_mode)) {2734if(rmdir(patch->old_name))2735warning("unable to remove submodule%s",2736 patch->old_name);2737}else if(!unlink(patch->old_name) && rmdir_empty) {2738remove_path(patch->old_name);2739}2740}2741}27422743static voidadd_index_file(const char*path,unsigned mode,void*buf,unsigned long size)2744{2745struct stat st;2746struct cache_entry *ce;2747int namelen =strlen(path);2748unsigned ce_size =cache_entry_size(namelen);27492750if(!update_index)2751return;27522753 ce =xcalloc(1, ce_size);2754memcpy(ce->name, path, namelen);2755 ce->ce_mode =create_ce_mode(mode);2756 ce->ce_flags = namelen;2757if(S_ISGITLINK(mode)) {2758const char*s = buf;27592760if(get_sha1_hex(s +strlen("Subproject commit "), ce->sha1))2761die("corrupt patch for subproject%s", path);2762}else{2763if(!cached) {2764if(lstat(path, &st) <0)2765die("unable to stat newly created file%s",2766 path);2767fill_stat_cache_info(ce, &st);2768}2769if(write_sha1_file(buf, size, blob_type, ce->sha1) <0)2770die("unable to create backing store for newly created file%s", path);2771}2772if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)2773die("unable to add cache entry for%s", path);2774}27752776static inttry_create_file(const char*path,unsigned int mode,const char*buf,unsigned long size)2777{2778int fd;2779struct strbuf nbuf = STRBUF_INIT;27802781if(S_ISGITLINK(mode)) {2782struct stat st;2783if(!lstat(path, &st) &&S_ISDIR(st.st_mode))2784return0;2785returnmkdir(path,0777);2786}27872788if(has_symlinks &&S_ISLNK(mode))2789/* Although buf:size is counted string, it also is NUL2790 * terminated.2791 */2792returnsymlink(buf, path);27932794 fd =open(path, O_CREAT | O_EXCL | O_WRONLY, (mode &0100) ?0777:0666);2795if(fd <0)2796return-1;27972798if(convert_to_working_tree(path, buf, size, &nbuf)) {2799 size = nbuf.len;2800 buf = nbuf.buf;2801}2802write_or_die(fd, buf, size);2803strbuf_release(&nbuf);28042805if(close(fd) <0)2806die("closing file%s:%s", path,strerror(errno));2807return0;2808}28092810/*2811 * We optimistically assume that the directories exist,2812 * which is true 99% of the time anyway. If they don't,2813 * we create them and try again.2814 */2815static voidcreate_one_file(char*path,unsigned mode,const char*buf,unsigned long size)2816{2817if(cached)2818return;2819if(!try_create_file(path, mode, buf, size))2820return;28212822if(errno == ENOENT) {2823if(safe_create_leading_directories(path))2824return;2825if(!try_create_file(path, mode, buf, size))2826return;2827}28282829if(errno == EEXIST || errno == EACCES) {2830/* We may be trying to create a file where a directory2831 * used to be.2832 */2833struct stat st;2834if(!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))2835 errno = EEXIST;2836}28372838if(errno == EEXIST) {2839unsigned int nr =getpid();28402841for(;;) {2842char newpath[PATH_MAX];2843mksnpath(newpath,sizeof(newpath),"%s~%u", path, nr);2844if(!try_create_file(newpath, mode, buf, size)) {2845if(!rename(newpath, path))2846return;2847unlink(newpath);2848break;2849}2850if(errno != EEXIST)2851break;2852++nr;2853}2854}2855die("unable to write file%smode%o", path, mode);2856}28572858static voidcreate_file(struct patch *patch)2859{2860char*path = patch->new_name;2861unsigned mode = patch->new_mode;2862unsigned long size = patch->resultsize;2863char*buf = patch->result;28642865if(!mode)2866 mode = S_IFREG |0644;2867create_one_file(path, mode, buf, size);2868add_index_file(path, mode, buf, size);2869}28702871/* phase zero is to remove, phase one is to create */2872static voidwrite_out_one_result(struct patch *patch,int phase)2873{2874if(patch->is_delete >0) {2875if(phase ==0)2876remove_file(patch,1);2877return;2878}2879if(patch->is_new >0|| patch->is_copy) {2880if(phase ==1)2881create_file(patch);2882return;2883}2884/*2885 * Rename or modification boils down to the same2886 * thing: remove the old, write the new2887 */2888if(phase ==0)2889remove_file(patch, patch->is_rename);2890if(phase ==1)2891create_file(patch);2892}28932894static intwrite_out_one_reject(struct patch *patch)2895{2896FILE*rej;2897char namebuf[PATH_MAX];2898struct fragment *frag;2899int cnt =0;29002901for(cnt =0, frag = patch->fragments; frag; frag = frag->next) {2902if(!frag->rejected)2903continue;2904 cnt++;2905}29062907if(!cnt) {2908if(apply_verbosely)2909say_patch_name(stderr,2910"Applied patch ", patch," cleanly.\n");2911return0;2912}29132914/* This should not happen, because a removal patch that leaves2915 * contents are marked "rejected" at the patch level.2916 */2917if(!patch->new_name)2918die("internal error");29192920/* Say this even without --verbose */2921say_patch_name(stderr,"Applying patch ", patch," with");2922fprintf(stderr,"%drejects...\n", cnt);29232924 cnt =strlen(patch->new_name);2925if(ARRAY_SIZE(namebuf) <= cnt +5) {2926 cnt =ARRAY_SIZE(namebuf) -5;2927fprintf(stderr,2928"warning: truncating .rej filename to %.*s.rej",2929 cnt -1, patch->new_name);2930}2931memcpy(namebuf, patch->new_name, cnt);2932memcpy(namebuf + cnt,".rej",5);29332934 rej =fopen(namebuf,"w");2935if(!rej)2936returnerror("cannot open%s:%s", namebuf,strerror(errno));29372938/* Normal git tools never deal with .rej, so do not pretend2939 * this is a git patch by saying --git nor give extended2940 * headers. While at it, maybe please "kompare" that wants2941 * the trailing TAB and some garbage at the end of line ;-).2942 */2943fprintf(rej,"diff a/%sb/%s\t(rejected hunks)\n",2944 patch->new_name, patch->new_name);2945for(cnt =1, frag = patch->fragments;2946 frag;2947 cnt++, frag = frag->next) {2948if(!frag->rejected) {2949fprintf(stderr,"Hunk #%dapplied cleanly.\n", cnt);2950continue;2951}2952fprintf(stderr,"Rejected hunk #%d.\n", cnt);2953fprintf(rej,"%.*s", frag->size, frag->patch);2954if(frag->patch[frag->size-1] !='\n')2955fputc('\n', rej);2956}2957fclose(rej);2958return-1;2959}29602961static intwrite_out_results(struct patch *list,int skipped_patch)2962{2963int phase;2964int errs =0;2965struct patch *l;29662967if(!list && !skipped_patch)2968returnerror("No changes");29692970for(phase =0; phase <2; phase++) {2971 l = list;2972while(l) {2973if(l->rejected)2974 errs =1;2975else{2976write_out_one_result(l, phase);2977if(phase ==1&&write_out_one_reject(l))2978 errs =1;2979}2980 l = l->next;2981}2982}2983return errs;2984}29852986static struct lock_file lock_file;29872988static struct string_list limit_by_name;2989static int has_include;2990static voidadd_name_limit(const char*name,int exclude)2991{2992struct string_list_item *it;29932994 it =string_list_append(name, &limit_by_name);2995 it->util = exclude ? NULL : (void*)1;2996}29972998static intuse_patch(struct patch *p)2999{3000const char*pathname = p->new_name ? p->new_name : p->old_name;3001int i;30023003/* Paths outside are not touched regardless of "--include" */3004if(0< prefix_length) {3005int pathlen =strlen(pathname);3006if(pathlen <= prefix_length ||3007memcmp(prefix, pathname, prefix_length))3008return0;3009}30103011/* See if it matches any of exclude/include rule */3012for(i =0; i < limit_by_name.nr; i++) {3013struct string_list_item *it = &limit_by_name.items[i];3014if(!fnmatch(it->string, pathname,0))3015return(it->util != NULL);3016}30173018/*3019 * If we had any include, a path that does not match any rule is3020 * not used. Otherwise, we saw bunch of exclude rules (or none)3021 * and such a path is used.3022 */3023return!has_include;3024}302530263027static voidprefix_one(char**name)3028{3029char*old_name = *name;3030if(!old_name)3031return;3032*name =xstrdup(prefix_filename(prefix, prefix_length, *name));3033free(old_name);3034}30353036static voidprefix_patches(struct patch *p)3037{3038if(!prefix || p->is_toplevel_relative)3039return;3040for( ; p; p = p->next) {3041if(p->new_name == p->old_name) {3042char*prefixed = p->new_name;3043prefix_one(&prefixed);3044 p->new_name = p->old_name = prefixed;3045}3046else{3047prefix_one(&p->new_name);3048prefix_one(&p->old_name);3049}3050}3051}30523053#define INACCURATE_EOF (1<<0)3054#define RECOUNT (1<<1)30553056static intapply_patch(int fd,const char*filename,int options)3057{3058size_t offset;3059struct strbuf buf = STRBUF_INIT;3060struct patch *list = NULL, **listp = &list;3061int skipped_patch =0;30623063/* FIXME - memory leak when using multiple patch files as inputs */3064memset(&fn_table,0,sizeof(struct string_list));3065 patch_input_file = filename;3066read_patch_file(&buf, fd);3067 offset =0;3068while(offset < buf.len) {3069struct patch *patch;3070int nr;30713072 patch =xcalloc(1,sizeof(*patch));3073 patch->inaccurate_eof = !!(options & INACCURATE_EOF);3074 patch->recount = !!(options & RECOUNT);3075 nr =parse_chunk(buf.buf + offset, buf.len - offset, patch);3076if(nr <0)3077break;3078if(apply_in_reverse)3079reverse_patches(patch);3080if(prefix)3081prefix_patches(patch);3082if(use_patch(patch)) {3083patch_stats(patch);3084*listp = patch;3085 listp = &patch->next;3086}3087else{3088/* perhaps free it a bit better? */3089free(patch);3090 skipped_patch++;3091}3092 offset += nr;3093}30943095if(whitespace_error && (ws_error_action == die_on_ws_error))3096 apply =0;30973098 update_index = check_index && apply;3099if(update_index && newfd <0)3100 newfd =hold_locked_index(&lock_file,1);31013102if(check_index) {3103if(read_cache() <0)3104die("unable to read index file");3105}31063107if((check || apply) &&3108check_patch_list(list) <0&&3109!apply_with_reject)3110exit(1);31113112if(apply &&write_out_results(list, skipped_patch))3113exit(1);31143115if(fake_ancestor)3116build_fake_ancestor(list, fake_ancestor);31173118if(diffstat)3119stat_patch_list(list);31203121if(numstat)3122numstat_patch_list(list);31233124if(summary)3125summary_patch_list(list);31263127strbuf_release(&buf);3128return0;3129}31303131static intgit_apply_config(const char*var,const char*value,void*cb)3132{3133if(!strcmp(var,"apply.whitespace"))3134returngit_config_string(&apply_default_whitespace, var, value);3135returngit_default_config(var, value, cb);3136}313731383139intcmd_apply(int argc,const char**argv,const char*unused_prefix)3140{3141int i;3142int read_stdin =1;3143int options =0;3144int errs =0;3145int is_not_gitdir;31463147const char*whitespace_option = NULL;31483149 prefix =setup_git_directory_gently(&is_not_gitdir);3150 prefix_length = prefix ?strlen(prefix) :0;3151git_config(git_apply_config, NULL);3152if(apply_default_whitespace)3153parse_whitespace_option(apply_default_whitespace);31543155for(i =1; i < argc; i++) {3156const char*arg = argv[i];3157char*end;3158int fd;31593160if(!strcmp(arg,"-")) {3161 errs |=apply_patch(0,"<stdin>", options);3162 read_stdin =0;3163continue;3164}3165if(!prefixcmp(arg,"--exclude=")) {3166add_name_limit(arg +10,1);3167continue;3168}3169if(!prefixcmp(arg,"--include=")) {3170add_name_limit(arg +10,0);3171 has_include =1;3172continue;3173}3174if(!prefixcmp(arg,"-p")) {3175 p_value =atoi(arg +2);3176 p_value_known =1;3177continue;3178}3179if(!strcmp(arg,"--no-add")) {3180 no_add =1;3181continue;3182}3183if(!strcmp(arg,"--stat")) {3184 apply =0;3185 diffstat =1;3186continue;3187}3188if(!strcmp(arg,"--allow-binary-replacement") ||3189!strcmp(arg,"--binary")) {3190continue;/* now no-op */3191}3192if(!strcmp(arg,"--numstat")) {3193 apply =0;3194 numstat =1;3195continue;3196}3197if(!strcmp(arg,"--summary")) {3198 apply =0;3199 summary =1;3200continue;3201}3202if(!strcmp(arg,"--check")) {3203 apply =0;3204 check =1;3205continue;3206}3207if(!strcmp(arg,"--index")) {3208if(is_not_gitdir)3209die("--index outside a repository");3210 check_index =1;3211continue;3212}3213if(!strcmp(arg,"--cached")) {3214if(is_not_gitdir)3215die("--cached outside a repository");3216 check_index =1;3217 cached =1;3218continue;3219}3220if(!strcmp(arg,"--apply")) {3221 apply =1;3222continue;3223}3224if(!strcmp(arg,"--build-fake-ancestor")) {3225 apply =0;3226if(++i >= argc)3227die("need a filename");3228 fake_ancestor = argv[i];3229continue;3230}3231if(!strcmp(arg,"-z")) {3232 line_termination =0;3233continue;3234}3235if(!prefixcmp(arg,"-C")) {3236 p_context =strtoul(arg +2, &end,0);3237if(*end !='\0')3238die("unrecognized context count '%s'", arg +2);3239continue;3240}3241if(!prefixcmp(arg,"--whitespace=")) {3242 whitespace_option = arg +13;3243parse_whitespace_option(arg +13);3244continue;3245}3246if(!strcmp(arg,"-R") || !strcmp(arg,"--reverse")) {3247 apply_in_reverse =1;3248continue;3249}3250if(!strcmp(arg,"--unidiff-zero")) {3251 unidiff_zero =1;3252continue;3253}3254if(!strcmp(arg,"--reject")) {3255 apply = apply_with_reject = apply_verbosely =1;3256continue;3257}3258if(!strcmp(arg,"-v") || !strcmp(arg,"--verbose")) {3259 apply_verbosely =1;3260continue;3261}3262if(!strcmp(arg,"--inaccurate-eof")) {3263 options |= INACCURATE_EOF;3264continue;3265}3266if(!strcmp(arg,"--recount")) {3267 options |= RECOUNT;3268continue;3269}3270if(!prefixcmp(arg,"--directory=")) {3271 arg +=strlen("--directory=");3272 root_len =strlen(arg);3273if(root_len && arg[root_len -1] !='/') {3274char*new_root;3275 root = new_root =xmalloc(root_len +2);3276strcpy(new_root, arg);3277strcpy(new_root + root_len++,"/");3278}else3279 root = arg;3280continue;3281}3282if(0< prefix_length)3283 arg =prefix_filename(prefix, prefix_length, arg);32843285 fd =open(arg, O_RDONLY);3286if(fd <0)3287die("can't open patch '%s':%s", arg,strerror(errno));3288 read_stdin =0;3289set_default_whitespace_mode(whitespace_option);3290 errs |=apply_patch(fd, arg, options);3291close(fd);3292}3293set_default_whitespace_mode(whitespace_option);3294if(read_stdin)3295 errs |=apply_patch(0,"<stdin>", options);3296if(whitespace_error) {3297if(squelch_whitespace_errors &&3298 squelch_whitespace_errors < whitespace_error) {3299int squelched =3300 whitespace_error - squelch_whitespace_errors;3301fprintf(stderr,"warning: squelched%d"3302"whitespace error%s\n",3303 squelched,3304 squelched ==1?"":"s");3305}3306if(ws_error_action == die_on_ws_error)3307die("%dline%sadd%swhitespace errors.",3308 whitespace_error,3309 whitespace_error ==1?"":"s",3310 whitespace_error ==1?"s":"");3311if(applied_after_fixing_ws && apply)3312fprintf(stderr,"warning:%dline%sapplied after"3313" fixing whitespace errors.\n",3314 applied_after_fixing_ws,3315 applied_after_fixing_ws ==1?"":"s");3316else if(whitespace_error)3317fprintf(stderr,"warning:%dline%sadd%swhitespace errors.\n",3318 whitespace_error,3319 whitespace_error ==1?"":"s",3320 whitespace_error ==1?"s":"");3321}33223323if(update_index) {3324if(write_cache(newfd, active_cache, active_nr) ||3325commit_locked_index(&lock_file))3326die("Unable to write new index file");3327}33283329return!!errs;3330}