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"parse-options.h" 18 19/* 20 * --check turns on checking that the working tree matches the 21 * files that are being modified, but doesn't apply the patch 22 * --stat does just a diffstat, and doesn't actually apply 23 * --numstat does numeric diffstat, and doesn't actually apply 24 * --index-info shows the old and new index info for paths if available. 25 * --index updates the cache as well. 26 * --cached updates only the cache without ever touching the working tree. 27 */ 28static const char*prefix; 29static int prefix_length = -1; 30static int newfd = -1; 31 32static int unidiff_zero; 33static int p_value =1; 34static int p_value_known; 35static int check_index; 36static int update_index; 37static int cached; 38static int diffstat; 39static int numstat; 40static int summary; 41static int check; 42static int apply =1; 43static int apply_in_reverse; 44static int apply_with_reject; 45static int apply_verbosely; 46static int no_add; 47static const char*fake_ancestor; 48static int line_termination ='\n'; 49static unsigned int p_context = UINT_MAX; 50static const char*const apply_usage[] = { 51"git apply [options] [<patch>...]", 52 NULL 53}; 54 55static enum ws_error_action { 56 nowarn_ws_error, 57 warn_on_ws_error, 58 die_on_ws_error, 59 correct_ws_error, 60} ws_error_action = warn_on_ws_error; 61static int whitespace_error; 62static int squelch_whitespace_errors =5; 63static int applied_after_fixing_ws; 64static const char*patch_input_file; 65static const char*root; 66static int root_len; 67static int read_stdin =1; 68static int options; 69 70static voidparse_whitespace_option(const char*option) 71{ 72if(!option) { 73 ws_error_action = warn_on_ws_error; 74return; 75} 76if(!strcmp(option,"warn")) { 77 ws_error_action = warn_on_ws_error; 78return; 79} 80if(!strcmp(option,"nowarn")) { 81 ws_error_action = nowarn_ws_error; 82return; 83} 84if(!strcmp(option,"error")) { 85 ws_error_action = die_on_ws_error; 86return; 87} 88if(!strcmp(option,"error-all")) { 89 ws_error_action = die_on_ws_error; 90 squelch_whitespace_errors =0; 91return; 92} 93if(!strcmp(option,"strip") || !strcmp(option,"fix")) { 94 ws_error_action = correct_ws_error; 95return; 96} 97die("unrecognized whitespace option '%s'", option); 98} 99 100static voidset_default_whitespace_mode(const char*whitespace_option) 101{ 102if(!whitespace_option && !apply_default_whitespace) 103 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); 104} 105 106/* 107 * For "diff-stat" like behaviour, we keep track of the biggest change 108 * we've seen, and the longest filename. That allows us to do simple 109 * scaling. 110 */ 111static int max_change, max_len; 112 113/* 114 * Various "current state", notably line numbers and what 115 * file (and how) we're patching right now.. The "is_xxxx" 116 * things are flags, where -1 means "don't know yet". 117 */ 118static int linenr =1; 119 120/* 121 * This represents one "hunk" from a patch, starting with 122 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 123 * patch text is pointed at by patch, and its byte length 124 * is stored in size. leading and trailing are the number 125 * of context lines. 126 */ 127struct fragment { 128unsigned long leading, trailing; 129unsigned long oldpos, oldlines; 130unsigned long newpos, newlines; 131const char*patch; 132int size; 133int rejected; 134struct fragment *next; 135}; 136 137/* 138 * When dealing with a binary patch, we reuse "leading" field 139 * to store the type of the binary hunk, either deflated "delta" 140 * or deflated "literal". 141 */ 142#define binary_patch_method leading 143#define BINARY_DELTA_DEFLATED 1 144#define BINARY_LITERAL_DEFLATED 2 145 146/* 147 * This represents a "patch" to a file, both metainfo changes 148 * such as creation/deletion, filemode and content changes represented 149 * as a series of fragments. 150 */ 151struct patch { 152char*new_name, *old_name, *def_name; 153unsigned int old_mode, new_mode; 154int is_new, is_delete;/* -1 = unknown, 0 = false, 1 = true */ 155int rejected; 156unsigned ws_rule; 157unsigned long deflate_origlen; 158int lines_added, lines_deleted; 159int score; 160unsigned int is_toplevel_relative:1; 161unsigned int inaccurate_eof:1; 162unsigned int is_binary:1; 163unsigned int is_copy:1; 164unsigned int is_rename:1; 165unsigned int recount:1; 166struct fragment *fragments; 167char*result; 168size_t resultsize; 169char old_sha1_prefix[41]; 170char new_sha1_prefix[41]; 171struct patch *next; 172}; 173 174/* 175 * A line in a file, len-bytes long (includes the terminating LF, 176 * except for an incomplete line at the end if the file ends with 177 * one), and its contents hashes to 'hash'. 178 */ 179struct line { 180size_t len; 181unsigned hash :24; 182unsigned flag :8; 183#define LINE_COMMON 1 184}; 185 186/* 187 * This represents a "file", which is an array of "lines". 188 */ 189struct image { 190char*buf; 191size_t len; 192size_t nr; 193size_t alloc; 194struct line *line_allocated; 195struct line *line; 196}; 197 198/* 199 * Records filenames that have been touched, in order to handle 200 * the case where more than one patches touch the same file. 201 */ 202 203static struct string_list fn_table; 204 205static uint32_thash_line(const char*cp,size_t len) 206{ 207size_t i; 208uint32_t h; 209for(i =0, h =0; i < len; i++) { 210if(!isspace(cp[i])) { 211 h = h *3+ (cp[i] &0xff); 212} 213} 214return h; 215} 216 217static voidadd_line_info(struct image *img,const char*bol,size_t len,unsigned flag) 218{ 219ALLOC_GROW(img->line_allocated, img->nr +1, img->alloc); 220 img->line_allocated[img->nr].len = len; 221 img->line_allocated[img->nr].hash =hash_line(bol, len); 222 img->line_allocated[img->nr].flag = flag; 223 img->nr++; 224} 225 226static voidprepare_image(struct image *image,char*buf,size_t len, 227int prepare_linetable) 228{ 229const char*cp, *ep; 230 231memset(image,0,sizeof(*image)); 232 image->buf = buf; 233 image->len = len; 234 235if(!prepare_linetable) 236return; 237 238 ep = image->buf + image->len; 239 cp = image->buf; 240while(cp < ep) { 241const char*next; 242for(next = cp; next < ep && *next !='\n'; next++) 243; 244if(next < ep) 245 next++; 246add_line_info(image, cp, next - cp,0); 247 cp = next; 248} 249 image->line = image->line_allocated; 250} 251 252static voidclear_image(struct image *image) 253{ 254free(image->buf); 255 image->buf = NULL; 256 image->len =0; 257} 258 259static voidsay_patch_name(FILE*output,const char*pre, 260struct patch *patch,const char*post) 261{ 262fputs(pre, output); 263if(patch->old_name && patch->new_name && 264strcmp(patch->old_name, patch->new_name)) { 265quote_c_style(patch->old_name, NULL, output,0); 266fputs(" => ", output); 267quote_c_style(patch->new_name, NULL, output,0); 268}else{ 269const char*n = patch->new_name; 270if(!n) 271 n = patch->old_name; 272quote_c_style(n, NULL, output,0); 273} 274fputs(post, output); 275} 276 277#define CHUNKSIZE (8192) 278#define SLOP (16) 279 280static voidread_patch_file(struct strbuf *sb,int fd) 281{ 282if(strbuf_read(sb, fd,0) <0) 283die("git apply: read returned%s",strerror(errno)); 284 285/* 286 * Make sure that we have some slop in the buffer 287 * so that we can do speculative "memcmp" etc, and 288 * see to it that it is NUL-filled. 289 */ 290strbuf_grow(sb, SLOP); 291memset(sb->buf + sb->len,0, SLOP); 292} 293 294static unsigned longlinelen(const char*buffer,unsigned long size) 295{ 296unsigned long len =0; 297while(size--) { 298 len++; 299if(*buffer++ =='\n') 300break; 301} 302return len; 303} 304 305static intis_dev_null(const char*str) 306{ 307return!memcmp("/dev/null", str,9) &&isspace(str[9]); 308} 309 310#define TERM_SPACE 1 311#define TERM_TAB 2 312 313static intname_terminate(const char*name,int namelen,int c,int terminate) 314{ 315if(c ==' '&& !(terminate & TERM_SPACE)) 316return0; 317if(c =='\t'&& !(terminate & TERM_TAB)) 318return0; 319 320return1; 321} 322 323static char*find_name(const char*line,char*def,int p_value,int terminate) 324{ 325int len; 326const char*start = line; 327 328if(*line =='"') { 329struct strbuf name = STRBUF_INIT; 330 331/* 332 * Proposed "new-style" GNU patch/diff format; see 333 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 334 */ 335if(!unquote_c_style(&name, line, NULL)) { 336char*cp; 337 338for(cp = name.buf; p_value; p_value--) { 339 cp =strchr(cp,'/'); 340if(!cp) 341break; 342 cp++; 343} 344if(cp) { 345/* name can later be freed, so we need 346 * to memmove, not just return cp 347 */ 348strbuf_remove(&name,0, cp - name.buf); 349free(def); 350if(root) 351strbuf_insert(&name,0, root, root_len); 352returnstrbuf_detach(&name, NULL); 353} 354} 355strbuf_release(&name); 356} 357 358for(;;) { 359char c = *line; 360 361if(isspace(c)) { 362if(c =='\n') 363break; 364if(name_terminate(start, line-start, c, terminate)) 365break; 366} 367 line++; 368if(c =='/'&& !--p_value) 369 start = line; 370} 371if(!start) 372return def; 373 len = line - start; 374if(!len) 375return def; 376 377/* 378 * Generally we prefer the shorter name, especially 379 * if the other one is just a variation of that with 380 * something else tacked on to the end (ie "file.orig" 381 * or "file~"). 382 */ 383if(def) { 384int deflen =strlen(def); 385if(deflen < len && !strncmp(start, def, deflen)) 386return def; 387free(def); 388} 389 390if(root) { 391char*ret =xmalloc(root_len + len +1); 392strcpy(ret, root); 393memcpy(ret + root_len, start, len); 394 ret[root_len + len] ='\0'; 395return ret; 396} 397 398returnxmemdupz(start, len); 399} 400 401static intcount_slashes(const char*cp) 402{ 403int cnt =0; 404char ch; 405 406while((ch = *cp++)) 407if(ch =='/') 408 cnt++; 409return cnt; 410} 411 412/* 413 * Given the string after "--- " or "+++ ", guess the appropriate 414 * p_value for the given patch. 415 */ 416static intguess_p_value(const char*nameline) 417{ 418char*name, *cp; 419int val = -1; 420 421if(is_dev_null(nameline)) 422return-1; 423 name =find_name(nameline, NULL,0, TERM_SPACE | TERM_TAB); 424if(!name) 425return-1; 426 cp =strchr(name,'/'); 427if(!cp) 428 val =0; 429else if(prefix) { 430/* 431 * Does it begin with "a/$our-prefix" and such? Then this is 432 * very likely to apply to our directory. 433 */ 434if(!strncmp(name, prefix, prefix_length)) 435 val =count_slashes(prefix); 436else{ 437 cp++; 438if(!strncmp(cp, prefix, prefix_length)) 439 val =count_slashes(prefix) +1; 440} 441} 442free(name); 443return val; 444} 445 446/* 447 * Get the name etc info from the ---/+++ lines of a traditional patch header 448 * 449 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 450 * files, we can happily check the index for a match, but for creating a 451 * new file we should try to match whatever "patch" does. I have no idea. 452 */ 453static voidparse_traditional_patch(const char*first,const char*second,struct patch *patch) 454{ 455char*name; 456 457 first +=4;/* skip "--- " */ 458 second +=4;/* skip "+++ " */ 459if(!p_value_known) { 460int p, q; 461 p =guess_p_value(first); 462 q =guess_p_value(second); 463if(p <0) p = q; 464if(0<= p && p == q) { 465 p_value = p; 466 p_value_known =1; 467} 468} 469if(is_dev_null(first)) { 470 patch->is_new =1; 471 patch->is_delete =0; 472 name =find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB); 473 patch->new_name = name; 474}else if(is_dev_null(second)) { 475 patch->is_new =0; 476 patch->is_delete =1; 477 name =find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB); 478 patch->old_name = name; 479}else{ 480 name =find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB); 481 name =find_name(second, name, p_value, TERM_SPACE | TERM_TAB); 482 patch->old_name = patch->new_name = name; 483} 484if(!name) 485die("unable to find filename in patch at line%d", linenr); 486} 487 488static intgitdiff_hdrend(const char*line,struct patch *patch) 489{ 490return-1; 491} 492 493/* 494 * We're anal about diff header consistency, to make 495 * sure that we don't end up having strange ambiguous 496 * patches floating around. 497 * 498 * As a result, gitdiff_{old|new}name() will check 499 * their names against any previous information, just 500 * to make sure.. 501 */ 502static char*gitdiff_verify_name(const char*line,int isnull,char*orig_name,const char*oldnew) 503{ 504if(!orig_name && !isnull) 505returnfind_name(line, NULL, p_value, TERM_TAB); 506 507if(orig_name) { 508int len; 509const char*name; 510char*another; 511 name = orig_name; 512 len =strlen(name); 513if(isnull) 514die("git apply: bad git-diff - expected /dev/null, got%son line%d", name, linenr); 515 another =find_name(line, NULL, p_value, TERM_TAB); 516if(!another ||memcmp(another, name, len)) 517die("git apply: bad git-diff - inconsistent%sfilename on line%d", oldnew, linenr); 518free(another); 519return orig_name; 520} 521else{ 522/* expect "/dev/null" */ 523if(memcmp("/dev/null", line,9) || line[9] !='\n') 524die("git apply: bad git-diff - expected /dev/null on line%d", linenr); 525return NULL; 526} 527} 528 529static intgitdiff_oldname(const char*line,struct patch *patch) 530{ 531 patch->old_name =gitdiff_verify_name(line, patch->is_new, patch->old_name,"old"); 532return0; 533} 534 535static intgitdiff_newname(const char*line,struct patch *patch) 536{ 537 patch->new_name =gitdiff_verify_name(line, patch->is_delete, patch->new_name,"new"); 538return0; 539} 540 541static intgitdiff_oldmode(const char*line,struct patch *patch) 542{ 543 patch->old_mode =strtoul(line, NULL,8); 544return0; 545} 546 547static intgitdiff_newmode(const char*line,struct patch *patch) 548{ 549 patch->new_mode =strtoul(line, NULL,8); 550return0; 551} 552 553static intgitdiff_delete(const char*line,struct patch *patch) 554{ 555 patch->is_delete =1; 556 patch->old_name = patch->def_name; 557returngitdiff_oldmode(line, patch); 558} 559 560static intgitdiff_newfile(const char*line,struct patch *patch) 561{ 562 patch->is_new =1; 563 patch->new_name = patch->def_name; 564returngitdiff_newmode(line, patch); 565} 566 567static intgitdiff_copysrc(const char*line,struct patch *patch) 568{ 569 patch->is_copy =1; 570 patch->old_name =find_name(line, NULL,0,0); 571return0; 572} 573 574static intgitdiff_copydst(const char*line,struct patch *patch) 575{ 576 patch->is_copy =1; 577 patch->new_name =find_name(line, NULL,0,0); 578return0; 579} 580 581static intgitdiff_renamesrc(const char*line,struct patch *patch) 582{ 583 patch->is_rename =1; 584 patch->old_name =find_name(line, NULL,0,0); 585return0; 586} 587 588static intgitdiff_renamedst(const char*line,struct patch *patch) 589{ 590 patch->is_rename =1; 591 patch->new_name =find_name(line, NULL,0,0); 592return0; 593} 594 595static intgitdiff_similarity(const char*line,struct patch *patch) 596{ 597if((patch->score =strtoul(line, NULL,10)) == ULONG_MAX) 598 patch->score =0; 599return0; 600} 601 602static intgitdiff_dissimilarity(const char*line,struct patch *patch) 603{ 604if((patch->score =strtoul(line, NULL,10)) == ULONG_MAX) 605 patch->score =0; 606return0; 607} 608 609static intgitdiff_index(const char*line,struct patch *patch) 610{ 611/* 612 * index line is N hexadecimal, "..", N hexadecimal, 613 * and optional space with octal mode. 614 */ 615const char*ptr, *eol; 616int len; 617 618 ptr =strchr(line,'.'); 619if(!ptr || ptr[1] !='.'||40< ptr - line) 620return0; 621 len = ptr - line; 622memcpy(patch->old_sha1_prefix, line, len); 623 patch->old_sha1_prefix[len] =0; 624 625 line = ptr +2; 626 ptr =strchr(line,' '); 627 eol =strchr(line,'\n'); 628 629if(!ptr || eol < ptr) 630 ptr = eol; 631 len = ptr - line; 632 633if(40< len) 634return0; 635memcpy(patch->new_sha1_prefix, line, len); 636 patch->new_sha1_prefix[len] =0; 637if(*ptr ==' ') 638 patch->old_mode =strtoul(ptr+1, NULL,8); 639return0; 640} 641 642/* 643 * This is normal for a diff that doesn't change anything: we'll fall through 644 * into the next diff. Tell the parser to break out. 645 */ 646static intgitdiff_unrecognized(const char*line,struct patch *patch) 647{ 648return-1; 649} 650 651static const char*stop_at_slash(const char*line,int llen) 652{ 653int i; 654 655for(i =0; i < llen; i++) { 656int ch = line[i]; 657if(ch =='/') 658return line + i; 659} 660return NULL; 661} 662 663/* 664 * This is to extract the same name that appears on "diff --git" 665 * line. We do not find and return anything if it is a rename 666 * patch, and it is OK because we will find the name elsewhere. 667 * We need to reliably find name only when it is mode-change only, 668 * creation or deletion of an empty file. In any of these cases, 669 * both sides are the same name under a/ and b/ respectively. 670 */ 671static char*git_header_name(char*line,int llen) 672{ 673const char*name; 674const char*second = NULL; 675size_t len; 676 677 line +=strlen("diff --git "); 678 llen -=strlen("diff --git "); 679 680if(*line =='"') { 681const char*cp; 682struct strbuf first = STRBUF_INIT; 683struct strbuf sp = STRBUF_INIT; 684 685if(unquote_c_style(&first, line, &second)) 686goto free_and_fail1; 687 688/* advance to the first slash */ 689 cp =stop_at_slash(first.buf, first.len); 690/* we do not accept absolute paths */ 691if(!cp || cp == first.buf) 692goto free_and_fail1; 693strbuf_remove(&first,0, cp +1- first.buf); 694 695/* 696 * second points at one past closing dq of name. 697 * find the second name. 698 */ 699while((second < line + llen) &&isspace(*second)) 700 second++; 701 702if(line + llen <= second) 703goto free_and_fail1; 704if(*second =='"') { 705if(unquote_c_style(&sp, second, NULL)) 706goto free_and_fail1; 707 cp =stop_at_slash(sp.buf, sp.len); 708if(!cp || cp == sp.buf) 709goto free_and_fail1; 710/* They must match, otherwise ignore */ 711if(strcmp(cp +1, first.buf)) 712goto free_and_fail1; 713strbuf_release(&sp); 714returnstrbuf_detach(&first, NULL); 715} 716 717/* unquoted second */ 718 cp =stop_at_slash(second, line + llen - second); 719if(!cp || cp == second) 720goto free_and_fail1; 721 cp++; 722if(line + llen - cp != first.len +1|| 723memcmp(first.buf, cp, first.len)) 724goto free_and_fail1; 725returnstrbuf_detach(&first, NULL); 726 727 free_and_fail1: 728strbuf_release(&first); 729strbuf_release(&sp); 730return NULL; 731} 732 733/* unquoted first name */ 734 name =stop_at_slash(line, llen); 735if(!name || name == line) 736return NULL; 737 name++; 738 739/* 740 * since the first name is unquoted, a dq if exists must be 741 * the beginning of the second name. 742 */ 743for(second = name; second < line + llen; second++) { 744if(*second =='"') { 745struct strbuf sp = STRBUF_INIT; 746const char*np; 747 748if(unquote_c_style(&sp, second, NULL)) 749goto free_and_fail2; 750 751 np =stop_at_slash(sp.buf, sp.len); 752if(!np || np == sp.buf) 753goto free_and_fail2; 754 np++; 755 756 len = sp.buf + sp.len - np; 757if(len < second - name && 758!strncmp(np, name, len) && 759isspace(name[len])) { 760/* Good */ 761strbuf_remove(&sp,0, np - sp.buf); 762returnstrbuf_detach(&sp, NULL); 763} 764 765 free_and_fail2: 766strbuf_release(&sp); 767return NULL; 768} 769} 770 771/* 772 * Accept a name only if it shows up twice, exactly the same 773 * form. 774 */ 775for(len =0; ; len++) { 776switch(name[len]) { 777default: 778continue; 779case'\n': 780return NULL; 781case'\t':case' ': 782 second = name+len; 783for(;;) { 784char c = *second++; 785if(c =='\n') 786return NULL; 787if(c =='/') 788break; 789} 790if(second[len] =='\n'&& !memcmp(name, second, len)) { 791returnxmemdupz(name, len); 792} 793} 794} 795} 796 797/* Verify that we recognize the lines following a git header */ 798static intparse_git_header(char*line,int len,unsigned int size,struct patch *patch) 799{ 800unsigned long offset; 801 802/* A git diff has explicit new/delete information, so we don't guess */ 803 patch->is_new =0; 804 patch->is_delete =0; 805 806/* 807 * Some things may not have the old name in the 808 * rest of the headers anywhere (pure mode changes, 809 * or removing or adding empty files), so we get 810 * the default name from the header. 811 */ 812 patch->def_name =git_header_name(line, len); 813if(patch->def_name && root) { 814char*s =xmalloc(root_len +strlen(patch->def_name) +1); 815strcpy(s, root); 816strcpy(s + root_len, patch->def_name); 817free(patch->def_name); 818 patch->def_name = s; 819} 820 821 line += len; 822 size -= len; 823 linenr++; 824for(offset = len ; size >0; offset += len, size -= len, line += len, linenr++) { 825static const struct opentry { 826const char*str; 827int(*fn)(const char*,struct patch *); 828} optable[] = { 829{"@@ -", gitdiff_hdrend }, 830{"--- ", gitdiff_oldname }, 831{"+++ ", gitdiff_newname }, 832{"old mode ", gitdiff_oldmode }, 833{"new mode ", gitdiff_newmode }, 834{"deleted file mode ", gitdiff_delete }, 835{"new file mode ", gitdiff_newfile }, 836{"copy from ", gitdiff_copysrc }, 837{"copy to ", gitdiff_copydst }, 838{"rename old ", gitdiff_renamesrc }, 839{"rename new ", gitdiff_renamedst }, 840{"rename from ", gitdiff_renamesrc }, 841{"rename to ", gitdiff_renamedst }, 842{"similarity index ", gitdiff_similarity }, 843{"dissimilarity index ", gitdiff_dissimilarity }, 844{"index ", gitdiff_index }, 845{"", gitdiff_unrecognized }, 846}; 847int i; 848 849 len =linelen(line, size); 850if(!len || line[len-1] !='\n') 851break; 852for(i =0; i <ARRAY_SIZE(optable); i++) { 853const struct opentry *p = optable + i; 854int oplen =strlen(p->str); 855if(len < oplen ||memcmp(p->str, line, oplen)) 856continue; 857if(p->fn(line + oplen, patch) <0) 858return offset; 859break; 860} 861} 862 863return offset; 864} 865 866static intparse_num(const char*line,unsigned long*p) 867{ 868char*ptr; 869 870if(!isdigit(*line)) 871return0; 872*p =strtoul(line, &ptr,10); 873return ptr - line; 874} 875 876static intparse_range(const char*line,int len,int offset,const char*expect, 877unsigned long*p1,unsigned long*p2) 878{ 879int digits, ex; 880 881if(offset <0|| offset >= len) 882return-1; 883 line += offset; 884 len -= offset; 885 886 digits =parse_num(line, p1); 887if(!digits) 888return-1; 889 890 offset += digits; 891 line += digits; 892 len -= digits; 893 894*p2 =1; 895if(*line ==',') { 896 digits =parse_num(line+1, p2); 897if(!digits) 898return-1; 899 900 offset += digits+1; 901 line += digits+1; 902 len -= digits+1; 903} 904 905 ex =strlen(expect); 906if(ex > len) 907return-1; 908if(memcmp(line, expect, ex)) 909return-1; 910 911return offset + ex; 912} 913 914static voidrecount_diff(char*line,int size,struct fragment *fragment) 915{ 916int oldlines =0, newlines =0, ret =0; 917 918if(size <1) { 919warning("recount: ignore empty hunk"); 920return; 921} 922 923for(;;) { 924int len =linelen(line, size); 925 size -= len; 926 line += len; 927 928if(size <1) 929break; 930 931switch(*line) { 932case' ':case'\n': 933 newlines++; 934/* fall through */ 935case'-': 936 oldlines++; 937continue; 938case'+': 939 newlines++; 940continue; 941case'\\': 942continue; 943case'@': 944 ret = size <3||prefixcmp(line,"@@ "); 945break; 946case'd': 947 ret = size <5||prefixcmp(line,"diff "); 948break; 949default: 950 ret = -1; 951break; 952} 953if(ret) { 954warning("recount: unexpected line: %.*s", 955(int)linelen(line, size), line); 956return; 957} 958break; 959} 960 fragment->oldlines = oldlines; 961 fragment->newlines = newlines; 962} 963 964/* 965 * Parse a unified diff fragment header of the 966 * form "@@ -a,b +c,d @@" 967 */ 968static intparse_fragment_header(char*line,int len,struct fragment *fragment) 969{ 970int offset; 971 972if(!len || line[len-1] !='\n') 973return-1; 974 975/* Figure out the number of lines in a fragment */ 976 offset =parse_range(line, len,4," +", &fragment->oldpos, &fragment->oldlines); 977 offset =parse_range(line, len, offset," @@", &fragment->newpos, &fragment->newlines); 978 979return offset; 980} 981 982static intfind_header(char*line,unsigned long size,int*hdrsize,struct patch *patch) 983{ 984unsigned long offset, len; 985 986 patch->is_toplevel_relative =0; 987 patch->is_rename = patch->is_copy =0; 988 patch->is_new = patch->is_delete = -1; 989 patch->old_mode = patch->new_mode =0; 990 patch->old_name = patch->new_name = NULL; 991for(offset =0; size >0; offset += len, size -= len, line += len, linenr++) { 992unsigned long nextlen; 993 994 len =linelen(line, size); 995if(!len) 996break; 997 998/* Testing this early allows us to take a few shortcuts.. */ 999if(len <6)1000continue;10011002/*1003 * Make sure we don't find any unconnected patch fragments.1004 * That's a sign that we didn't find a header, and that a1005 * patch has become corrupted/broken up.1006 */1007if(!memcmp("@@ -", line,4)) {1008struct fragment dummy;1009if(parse_fragment_header(line, len, &dummy) <0)1010continue;1011die("patch fragment without header at line%d: %.*s",1012 linenr, (int)len-1, line);1013}10141015if(size < len +6)1016break;10171018/*1019 * Git patch? It might not have a real patch, just a rename1020 * or mode change, so we handle that specially1021 */1022if(!memcmp("diff --git ", line,11)) {1023int git_hdr_len =parse_git_header(line, len, size, patch);1024if(git_hdr_len <= len)1025continue;1026if(!patch->old_name && !patch->new_name) {1027if(!patch->def_name)1028die("git diff header lacks filename information (line%d)", linenr);1029 patch->old_name = patch->new_name = patch->def_name;1030}1031 patch->is_toplevel_relative =1;1032*hdrsize = git_hdr_len;1033return offset;1034}10351036/* --- followed by +++ ? */1037if(memcmp("--- ", line,4) ||memcmp("+++ ", line + len,4))1038continue;10391040/*1041 * We only accept unified patches, so we want it to1042 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1043 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1044 */1045 nextlen =linelen(line + len, size - len);1046if(size < nextlen +14||memcmp("@@ -", line + len + nextlen,4))1047continue;10481049/* Ok, we'll consider it a patch */1050parse_traditional_patch(line, line+len, patch);1051*hdrsize = len + nextlen;1052 linenr +=2;1053return offset;1054}1055return-1;1056}10571058static voidcheck_whitespace(const char*line,int len,unsigned ws_rule)1059{1060char*err;1061unsigned result =ws_check(line +1, len -1, ws_rule);1062if(!result)1063return;10641065 whitespace_error++;1066if(squelch_whitespace_errors &&1067 squelch_whitespace_errors < whitespace_error)1068;1069else{1070 err =whitespace_error_string(result);1071fprintf(stderr,"%s:%d:%s.\n%.*s\n",1072 patch_input_file, linenr, err, len -2, line +1);1073free(err);1074}1075}10761077/*1078 * Parse a unified diff. Note that this really needs to parse each1079 * fragment separately, since the only way to know the difference1080 * between a "---" that is part of a patch, and a "---" that starts1081 * the next patch is to look at the line counts..1082 */1083static intparse_fragment(char*line,unsigned long size,1084struct patch *patch,struct fragment *fragment)1085{1086int added, deleted;1087int len =linelen(line, size), offset;1088unsigned long oldlines, newlines;1089unsigned long leading, trailing;10901091 offset =parse_fragment_header(line, len, fragment);1092if(offset <0)1093return-1;1094if(offset >0&& patch->recount)1095recount_diff(line + offset, size - offset, fragment);1096 oldlines = fragment->oldlines;1097 newlines = fragment->newlines;1098 leading =0;1099 trailing =0;11001101/* Parse the thing.. */1102 line += len;1103 size -= len;1104 linenr++;1105 added = deleted =0;1106for(offset = len;11070< size;1108 offset += len, size -= len, line += len, linenr++) {1109if(!oldlines && !newlines)1110break;1111 len =linelen(line, size);1112if(!len || line[len-1] !='\n')1113return-1;1114switch(*line) {1115default:1116return-1;1117case'\n':/* newer GNU diff, an empty context line */1118case' ':1119 oldlines--;1120 newlines--;1121if(!deleted && !added)1122 leading++;1123 trailing++;1124break;1125case'-':1126if(apply_in_reverse &&1127 ws_error_action != nowarn_ws_error)1128check_whitespace(line, len, patch->ws_rule);1129 deleted++;1130 oldlines--;1131 trailing =0;1132break;1133case'+':1134if(!apply_in_reverse &&1135 ws_error_action != nowarn_ws_error)1136check_whitespace(line, len, patch->ws_rule);1137 added++;1138 newlines--;1139 trailing =0;1140break;11411142/*1143 * We allow "\ No newline at end of file". Depending1144 * on locale settings when the patch was produced we1145 * don't know what this line looks like. The only1146 * thing we do know is that it begins with "\ ".1147 * Checking for 12 is just for sanity check -- any1148 * l10n of "\ No newline..." is at least that long.1149 */1150case'\\':1151if(len <12||memcmp(line,"\\",2))1152return-1;1153break;1154}1155}1156if(oldlines || newlines)1157return-1;1158 fragment->leading = leading;1159 fragment->trailing = trailing;11601161/*1162 * If a fragment ends with an incomplete line, we failed to include1163 * it in the above loop because we hit oldlines == newlines == 01164 * before seeing it.1165 */1166if(12< size && !memcmp(line,"\\",2))1167 offset +=linelen(line, size);11681169 patch->lines_added += added;1170 patch->lines_deleted += deleted;11711172if(0< patch->is_new && oldlines)1173returnerror("new file depends on old contents");1174if(0< patch->is_delete && newlines)1175returnerror("deleted file still has contents");1176return offset;1177}11781179static intparse_single_patch(char*line,unsigned long size,struct patch *patch)1180{1181unsigned long offset =0;1182unsigned long oldlines =0, newlines =0, context =0;1183struct fragment **fragp = &patch->fragments;11841185while(size >4&& !memcmp(line,"@@ -",4)) {1186struct fragment *fragment;1187int len;11881189 fragment =xcalloc(1,sizeof(*fragment));1190 len =parse_fragment(line, size, patch, fragment);1191if(len <=0)1192die("corrupt patch at line%d", linenr);1193 fragment->patch = line;1194 fragment->size = len;1195 oldlines += fragment->oldlines;1196 newlines += fragment->newlines;1197 context += fragment->leading + fragment->trailing;11981199*fragp = fragment;1200 fragp = &fragment->next;12011202 offset += len;1203 line += len;1204 size -= len;1205}12061207/*1208 * If something was removed (i.e. we have old-lines) it cannot1209 * be creation, and if something was added it cannot be1210 * deletion. However, the reverse is not true; --unified=01211 * patches that only add are not necessarily creation even1212 * though they do not have any old lines, and ones that only1213 * delete are not necessarily deletion.1214 *1215 * Unfortunately, a real creation/deletion patch do _not_ have1216 * any context line by definition, so we cannot safely tell it1217 * apart with --unified=0 insanity. At least if the patch has1218 * more than one hunk it is not creation or deletion.1219 */1220if(patch->is_new <0&&1221(oldlines || (patch->fragments && patch->fragments->next)))1222 patch->is_new =0;1223if(patch->is_delete <0&&1224(newlines || (patch->fragments && patch->fragments->next)))1225 patch->is_delete =0;12261227if(0< patch->is_new && oldlines)1228die("new file%sdepends on old contents", patch->new_name);1229if(0< patch->is_delete && newlines)1230die("deleted file%sstill has contents", patch->old_name);1231if(!patch->is_delete && !newlines && context)1232fprintf(stderr,"** warning: file%sbecomes empty but "1233"is not deleted\n", patch->new_name);12341235return offset;1236}12371238staticinlineintmetadata_changes(struct patch *patch)1239{1240return patch->is_rename >0||1241 patch->is_copy >0||1242 patch->is_new >0||1243 patch->is_delete ||1244(patch->old_mode && patch->new_mode &&1245 patch->old_mode != patch->new_mode);1246}12471248static char*inflate_it(const void*data,unsigned long size,1249unsigned long inflated_size)1250{1251 z_stream stream;1252void*out;1253int st;12541255memset(&stream,0,sizeof(stream));12561257 stream.next_in = (unsigned char*)data;1258 stream.avail_in = size;1259 stream.next_out = out =xmalloc(inflated_size);1260 stream.avail_out = inflated_size;1261git_inflate_init(&stream);1262 st =git_inflate(&stream, Z_FINISH);1263git_inflate_end(&stream);1264if((st != Z_STREAM_END) || stream.total_out != inflated_size) {1265free(out);1266return NULL;1267}1268return out;1269}12701271static struct fragment *parse_binary_hunk(char**buf_p,1272unsigned long*sz_p,1273int*status_p,1274int*used_p)1275{1276/*1277 * Expect a line that begins with binary patch method ("literal"1278 * or "delta"), followed by the length of data before deflating.1279 * a sequence of 'length-byte' followed by base-85 encoded data1280 * should follow, terminated by a newline.1281 *1282 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1283 * and we would limit the patch line to 66 characters,1284 * so one line can fit up to 13 groups that would decode1285 * to 52 bytes max. The length byte 'A'-'Z' corresponds1286 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1287 */1288int llen, used;1289unsigned long size = *sz_p;1290char*buffer = *buf_p;1291int patch_method;1292unsigned long origlen;1293char*data = NULL;1294int hunk_size =0;1295struct fragment *frag;12961297 llen =linelen(buffer, size);1298 used = llen;12991300*status_p =0;13011302if(!prefixcmp(buffer,"delta ")) {1303 patch_method = BINARY_DELTA_DEFLATED;1304 origlen =strtoul(buffer +6, NULL,10);1305}1306else if(!prefixcmp(buffer,"literal ")) {1307 patch_method = BINARY_LITERAL_DEFLATED;1308 origlen =strtoul(buffer +8, NULL,10);1309}1310else1311return NULL;13121313 linenr++;1314 buffer += llen;1315while(1) {1316int byte_length, max_byte_length, newsize;1317 llen =linelen(buffer, size);1318 used += llen;1319 linenr++;1320if(llen ==1) {1321/* consume the blank line */1322 buffer++;1323 size--;1324break;1325}1326/*1327 * Minimum line is "A00000\n" which is 7-byte long,1328 * and the line length must be multiple of 5 plus 2.1329 */1330if((llen <7) || (llen-2) %5)1331goto corrupt;1332 max_byte_length = (llen -2) /5*4;1333 byte_length = *buffer;1334if('A'<= byte_length && byte_length <='Z')1335 byte_length = byte_length -'A'+1;1336else if('a'<= byte_length && byte_length <='z')1337 byte_length = byte_length -'a'+27;1338else1339goto corrupt;1340/* if the input length was not multiple of 4, we would1341 * have filler at the end but the filler should never1342 * exceed 3 bytes1343 */1344if(max_byte_length < byte_length ||1345 byte_length <= max_byte_length -4)1346goto corrupt;1347 newsize = hunk_size + byte_length;1348 data =xrealloc(data, newsize);1349if(decode_85(data + hunk_size, buffer +1, byte_length))1350goto corrupt;1351 hunk_size = newsize;1352 buffer += llen;1353 size -= llen;1354}13551356 frag =xcalloc(1,sizeof(*frag));1357 frag->patch =inflate_it(data, hunk_size, origlen);1358if(!frag->patch)1359goto corrupt;1360free(data);1361 frag->size = origlen;1362*buf_p = buffer;1363*sz_p = size;1364*used_p = used;1365 frag->binary_patch_method = patch_method;1366return frag;13671368 corrupt:1369free(data);1370*status_p = -1;1371error("corrupt binary patch at line%d: %.*s",1372 linenr-1, llen-1, buffer);1373return NULL;1374}13751376static intparse_binary(char*buffer,unsigned long size,struct patch *patch)1377{1378/*1379 * We have read "GIT binary patch\n"; what follows is a line1380 * that says the patch method (currently, either "literal" or1381 * "delta") and the length of data before deflating; a1382 * sequence of 'length-byte' followed by base-85 encoded data1383 * follows.1384 *1385 * When a binary patch is reversible, there is another binary1386 * hunk in the same format, starting with patch method (either1387 * "literal" or "delta") with the length of data, and a sequence1388 * of length-byte + base-85 encoded data, terminated with another1389 * empty line. This data, when applied to the postimage, produces1390 * the preimage.1391 */1392struct fragment *forward;1393struct fragment *reverse;1394int status;1395int used, used_1;13961397 forward =parse_binary_hunk(&buffer, &size, &status, &used);1398if(!forward && !status)1399/* there has to be one hunk (forward hunk) */1400returnerror("unrecognized binary patch at line%d", linenr-1);1401if(status)1402/* otherwise we already gave an error message */1403return status;14041405 reverse =parse_binary_hunk(&buffer, &size, &status, &used_1);1406if(reverse)1407 used += used_1;1408else if(status) {1409/*1410 * Not having reverse hunk is not an error, but having1411 * a corrupt reverse hunk is.1412 */1413free((void*) forward->patch);1414free(forward);1415return status;1416}1417 forward->next = reverse;1418 patch->fragments = forward;1419 patch->is_binary =1;1420return used;1421}14221423static intparse_chunk(char*buffer,unsigned long size,struct patch *patch)1424{1425int hdrsize, patchsize;1426int offset =find_header(buffer, size, &hdrsize, patch);14271428if(offset <0)1429return offset;14301431 patch->ws_rule =whitespace_rule(patch->new_name1432? patch->new_name1433: patch->old_name);14341435 patchsize =parse_single_patch(buffer + offset + hdrsize,1436 size - offset - hdrsize, patch);14371438if(!patchsize) {1439static const char*binhdr[] = {1440"Binary files ",1441"Files ",1442 NULL,1443};1444static const char git_binary[] ="GIT binary patch\n";1445int i;1446int hd = hdrsize + offset;1447unsigned long llen =linelen(buffer + hd, size - hd);14481449if(llen ==sizeof(git_binary) -1&&1450!memcmp(git_binary, buffer + hd, llen)) {1451int used;1452 linenr++;1453 used =parse_binary(buffer + hd + llen,1454 size - hd - llen, patch);1455if(used)1456 patchsize = used + llen;1457else1458 patchsize =0;1459}1460else if(!memcmp(" differ\n", buffer + hd + llen -8,8)) {1461for(i =0; binhdr[i]; i++) {1462int len =strlen(binhdr[i]);1463if(len < size - hd &&1464!memcmp(binhdr[i], buffer + hd, len)) {1465 linenr++;1466 patch->is_binary =1;1467 patchsize = llen;1468break;1469}1470}1471}14721473/* Empty patch cannot be applied if it is a text patch1474 * without metadata change. A binary patch appears1475 * empty to us here.1476 */1477if((apply || check) &&1478(!patch->is_binary && !metadata_changes(patch)))1479die("patch with only garbage at line%d", linenr);1480}14811482return offset + hdrsize + patchsize;1483}14841485#define swap(a,b) myswap((a),(b),sizeof(a))14861487#define myswap(a, b, size) do { \1488 unsigned char mytmp[size]; \1489 memcpy(mytmp, &a, size); \1490 memcpy(&a, &b, size); \1491 memcpy(&b, mytmp, size); \1492} while (0)14931494static voidreverse_patches(struct patch *p)1495{1496for(; p; p = p->next) {1497struct fragment *frag = p->fragments;14981499swap(p->new_name, p->old_name);1500swap(p->new_mode, p->old_mode);1501swap(p->is_new, p->is_delete);1502swap(p->lines_added, p->lines_deleted);1503swap(p->old_sha1_prefix, p->new_sha1_prefix);15041505for(; frag; frag = frag->next) {1506swap(frag->newpos, frag->oldpos);1507swap(frag->newlines, frag->oldlines);1508}1509}1510}15111512static const char pluses[] =1513"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";1514static const char minuses[]=1515"----------------------------------------------------------------------";15161517static voidshow_stats(struct patch *patch)1518{1519struct strbuf qname = STRBUF_INIT;1520char*cp = patch->new_name ? patch->new_name : patch->old_name;1521int max, add, del;15221523quote_c_style(cp, &qname, NULL,0);15241525/*1526 * "scale" the filename1527 */1528 max = max_len;1529if(max >50)1530 max =50;15311532if(qname.len > max) {1533 cp =strchr(qname.buf + qname.len +3- max,'/');1534if(!cp)1535 cp = qname.buf + qname.len +3- max;1536strbuf_splice(&qname,0, cp - qname.buf,"...",3);1537}15381539if(patch->is_binary) {1540printf(" %-*s | Bin\n", max, qname.buf);1541strbuf_release(&qname);1542return;1543}15441545printf(" %-*s |", max, qname.buf);1546strbuf_release(&qname);15471548/*1549 * scale the add/delete1550 */1551 max = max + max_change >70?70- max : max_change;1552 add = patch->lines_added;1553 del = patch->lines_deleted;15541555if(max_change >0) {1556int total = ((add + del) * max + max_change /2) / max_change;1557 add = (add * max + max_change /2) / max_change;1558 del = total - add;1559}1560printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,1561 add, pluses, del, minuses);1562}15631564static intread_old_data(struct stat *st,const char*path,struct strbuf *buf)1565{1566switch(st->st_mode & S_IFMT) {1567case S_IFLNK:1568if(strbuf_readlink(buf, path, st->st_size) <0)1569returnerror("unable to read symlink%s", path);1570return0;1571case S_IFREG:1572if(strbuf_read_file(buf, path, st->st_size) != st->st_size)1573returnerror("unable to open or read%s", path);1574convert_to_git(path, buf->buf, buf->len, buf,0);1575return0;1576default:1577return-1;1578}1579}15801581static voidupdate_pre_post_images(struct image *preimage,1582struct image *postimage,1583char*buf,1584size_t len)1585{1586int i, ctx;1587char*new, *old, *fixed;1588struct image fixed_preimage;15891590/*1591 * Update the preimage with whitespace fixes. Note that we1592 * are not losing preimage->buf -- apply_one_fragment() will1593 * free "oldlines".1594 */1595prepare_image(&fixed_preimage, buf, len,1);1596assert(fixed_preimage.nr == preimage->nr);1597for(i =0; i < preimage->nr; i++)1598 fixed_preimage.line[i].flag = preimage->line[i].flag;1599free(preimage->line_allocated);1600*preimage = fixed_preimage;16011602/*1603 * Adjust the common context lines in postimage, in place.1604 * This is possible because whitespace fixing does not make1605 * the string grow.1606 */1607new= old = postimage->buf;1608 fixed = preimage->buf;1609for(i = ctx =0; i < postimage->nr; i++) {1610size_t len = postimage->line[i].len;1611if(!(postimage->line[i].flag & LINE_COMMON)) {1612/* an added line -- no counterparts in preimage */1613memmove(new, old, len);1614 old += len;1615new+= len;1616continue;1617}16181619/* a common context -- skip it in the original postimage */1620 old += len;16211622/* and find the corresponding one in the fixed preimage */1623while(ctx < preimage->nr &&1624!(preimage->line[ctx].flag & LINE_COMMON)) {1625 fixed += preimage->line[ctx].len;1626 ctx++;1627}1628if(preimage->nr <= ctx)1629die("oops");16301631/* and copy it in, while fixing the line length */1632 len = preimage->line[ctx].len;1633memcpy(new, fixed, len);1634new+= len;1635 fixed += len;1636 postimage->line[i].len = len;1637 ctx++;1638}16391640/* Fix the length of the whole thing */1641 postimage->len =new- postimage->buf;1642}16431644static intmatch_fragment(struct image *img,1645struct image *preimage,1646struct image *postimage,1647unsigned longtry,1648int try_lno,1649unsigned ws_rule,1650int match_beginning,int match_end)1651{1652int i;1653char*fixed_buf, *buf, *orig, *target;16541655if(preimage->nr + try_lno > img->nr)1656return0;16571658if(match_beginning && try_lno)1659return0;16601661if(match_end && preimage->nr + try_lno != img->nr)1662return0;16631664/* Quick hash check */1665for(i =0; i < preimage->nr; i++)1666if(preimage->line[i].hash != img->line[try_lno + i].hash)1667return0;16681669/*1670 * Do we have an exact match? If we were told to match1671 * at the end, size must be exactly at try+fragsize,1672 * otherwise try+fragsize must be still within the preimage,1673 * and either case, the old piece should match the preimage1674 * exactly.1675 */1676if((match_end1677? (try+ preimage->len == img->len)1678: (try+ preimage->len <= img->len)) &&1679!memcmp(img->buf +try, preimage->buf, preimage->len))1680return1;16811682if(ws_error_action != correct_ws_error)1683return0;16841685/*1686 * The hunk does not apply byte-by-byte, but the hash says1687 * it might with whitespace fuzz.1688 */1689 fixed_buf =xmalloc(preimage->len +1);1690 buf = fixed_buf;1691 orig = preimage->buf;1692 target = img->buf +try;1693for(i =0; i < preimage->nr; i++) {1694size_t fixlen;/* length after fixing the preimage */1695size_t oldlen = preimage->line[i].len;1696size_t tgtlen = img->line[try_lno + i].len;1697size_t tgtfixlen;/* length after fixing the target line */1698char tgtfixbuf[1024], *tgtfix;1699int match;17001701/* Try fixing the line in the preimage */1702 fixlen =ws_fix_copy(buf, orig, oldlen, ws_rule, NULL);17031704/* Try fixing the line in the target */1705if(sizeof(tgtfixbuf) > tgtlen)1706 tgtfix = tgtfixbuf;1707else1708 tgtfix =xmalloc(tgtlen);1709 tgtfixlen =ws_fix_copy(tgtfix, target, tgtlen, ws_rule, NULL);17101711/*1712 * If they match, either the preimage was based on1713 * a version before our tree fixed whitespace breakage,1714 * or we are lacking a whitespace-fix patch the tree1715 * the preimage was based on already had (i.e. target1716 * has whitespace breakage, the preimage doesn't).1717 * In either case, we are fixing the whitespace breakages1718 * so we might as well take the fix together with their1719 * real change.1720 */1721 match = (tgtfixlen == fixlen && !memcmp(tgtfix, buf, fixlen));17221723if(tgtfix != tgtfixbuf)1724free(tgtfix);1725if(!match)1726goto unmatch_exit;17271728 orig += oldlen;1729 buf += fixlen;1730 target += tgtlen;1731}17321733/*1734 * Yes, the preimage is based on an older version that still1735 * has whitespace breakages unfixed, and fixing them makes the1736 * hunk match. Update the context lines in the postimage.1737 */1738update_pre_post_images(preimage, postimage,1739 fixed_buf, buf - fixed_buf);1740return1;17411742 unmatch_exit:1743free(fixed_buf);1744return0;1745}17461747static intfind_pos(struct image *img,1748struct image *preimage,1749struct image *postimage,1750int line,1751unsigned ws_rule,1752int match_beginning,int match_end)1753{1754int i;1755unsigned long backwards, forwards,try;1756int backwards_lno, forwards_lno, try_lno;17571758if(preimage->nr > img->nr)1759return-1;17601761/*1762 * If match_begining or match_end is specified, there is no1763 * point starting from a wrong line that will never match and1764 * wander around and wait for a match at the specified end.1765 */1766if(match_beginning)1767 line =0;1768else if(match_end)1769 line = img->nr - preimage->nr;17701771if(line > img->nr)1772 line = img->nr;17731774try=0;1775for(i =0; i < line; i++)1776try+= img->line[i].len;17771778/*1779 * There's probably some smart way to do this, but I'll leave1780 * that to the smart and beautiful people. I'm simple and stupid.1781 */1782 backwards =try;1783 backwards_lno = line;1784 forwards =try;1785 forwards_lno = line;1786 try_lno = line;17871788for(i =0; ; i++) {1789if(match_fragment(img, preimage, postimage,1790try, try_lno, ws_rule,1791 match_beginning, match_end))1792return try_lno;17931794 again:1795if(backwards_lno ==0&& forwards_lno == img->nr)1796break;17971798if(i &1) {1799if(backwards_lno ==0) {1800 i++;1801goto again;1802}1803 backwards_lno--;1804 backwards -= img->line[backwards_lno].len;1805try= backwards;1806 try_lno = backwards_lno;1807}else{1808if(forwards_lno == img->nr) {1809 i++;1810goto again;1811}1812 forwards += img->line[forwards_lno].len;1813 forwards_lno++;1814try= forwards;1815 try_lno = forwards_lno;1816}18171818}1819return-1;1820}18211822static voidremove_first_line(struct image *img)1823{1824 img->buf += img->line[0].len;1825 img->len -= img->line[0].len;1826 img->line++;1827 img->nr--;1828}18291830static voidremove_last_line(struct image *img)1831{1832 img->len -= img->line[--img->nr].len;1833}18341835static voidupdate_image(struct image *img,1836int applied_pos,1837struct image *preimage,1838struct image *postimage)1839{1840/*1841 * remove the copy of preimage at offset in img1842 * and replace it with postimage1843 */1844int i, nr;1845size_t remove_count, insert_count, applied_at =0;1846char*result;18471848for(i =0; i < applied_pos; i++)1849 applied_at += img->line[i].len;18501851 remove_count =0;1852for(i =0; i < preimage->nr; i++)1853 remove_count += img->line[applied_pos + i].len;1854 insert_count = postimage->len;18551856/* Adjust the contents */1857 result =xmalloc(img->len + insert_count - remove_count +1);1858memcpy(result, img->buf, applied_at);1859memcpy(result + applied_at, postimage->buf, postimage->len);1860memcpy(result + applied_at + postimage->len,1861 img->buf + (applied_at + remove_count),1862 img->len - (applied_at + remove_count));1863free(img->buf);1864 img->buf = result;1865 img->len += insert_count - remove_count;1866 result[img->len] ='\0';18671868/* Adjust the line table */1869 nr = img->nr + postimage->nr - preimage->nr;1870if(preimage->nr < postimage->nr) {1871/*1872 * NOTE: this knows that we never call remove_first_line()1873 * on anything other than pre/post image.1874 */1875 img->line =xrealloc(img->line, nr *sizeof(*img->line));1876 img->line_allocated = img->line;1877}1878if(preimage->nr != postimage->nr)1879memmove(img->line + applied_pos + postimage->nr,1880 img->line + applied_pos + preimage->nr,1881(img->nr - (applied_pos + preimage->nr)) *1882sizeof(*img->line));1883memcpy(img->line + applied_pos,1884 postimage->line,1885 postimage->nr *sizeof(*img->line));1886 img->nr = nr;1887}18881889static intapply_one_fragment(struct image *img,struct fragment *frag,1890int inaccurate_eof,unsigned ws_rule)1891{1892int match_beginning, match_end;1893const char*patch = frag->patch;1894int size = frag->size;1895char*old, *new, *oldlines, *newlines;1896int new_blank_lines_at_end =0;1897unsigned long leading, trailing;1898int pos, applied_pos;1899struct image preimage;1900struct image postimage;19011902memset(&preimage,0,sizeof(preimage));1903memset(&postimage,0,sizeof(postimage));1904 oldlines =xmalloc(size);1905 newlines =xmalloc(size);19061907 old = oldlines;1908new= newlines;1909while(size >0) {1910char first;1911int len =linelen(patch, size);1912int plen, added;1913int added_blank_line =0;19141915if(!len)1916break;19171918/*1919 * "plen" is how much of the line we should use for1920 * the actual patch data. Normally we just remove the1921 * first character on the line, but if the line is1922 * followed by "\ No newline", then we also remove the1923 * last one (which is the newline, of course).1924 */1925 plen = len -1;1926if(len < size && patch[len] =='\\')1927 plen--;1928 first = *patch;1929if(apply_in_reverse) {1930if(first =='-')1931 first ='+';1932else if(first =='+')1933 first ='-';1934}19351936switch(first) {1937case'\n':1938/* Newer GNU diff, empty context line */1939if(plen <0)1940/* ... followed by '\No newline'; nothing */1941break;1942*old++ ='\n';1943*new++ ='\n';1944add_line_info(&preimage,"\n",1, LINE_COMMON);1945add_line_info(&postimage,"\n",1, LINE_COMMON);1946break;1947case' ':1948case'-':1949memcpy(old, patch +1, plen);1950add_line_info(&preimage, old, plen,1951(first ==' '? LINE_COMMON :0));1952 old += plen;1953if(first =='-')1954break;1955/* Fall-through for ' ' */1956case'+':1957/* --no-add does not add new lines */1958if(first =='+'&& no_add)1959break;19601961if(first !='+'||1962!whitespace_error ||1963 ws_error_action != correct_ws_error) {1964memcpy(new, patch +1, plen);1965 added = plen;1966}1967else{1968 added =ws_fix_copy(new, patch +1, plen, ws_rule, &applied_after_fixing_ws);1969}1970add_line_info(&postimage,new, added,1971(first =='+'?0: LINE_COMMON));1972new+= added;1973if(first =='+'&&1974 added ==1&&new[-1] =='\n')1975 added_blank_line =1;1976break;1977case'@':case'\\':1978/* Ignore it, we already handled it */1979break;1980default:1981if(apply_verbosely)1982error("invalid start of line: '%c'", first);1983return-1;1984}1985if(added_blank_line)1986 new_blank_lines_at_end++;1987else1988 new_blank_lines_at_end =0;1989 patch += len;1990 size -= len;1991}1992if(inaccurate_eof &&1993 old > oldlines && old[-1] =='\n'&&1994new> newlines &&new[-1] =='\n') {1995 old--;1996new--;1997}19981999 leading = frag->leading;2000 trailing = frag->trailing;20012002/*2003 * A hunk to change lines at the beginning would begin with2004 * @@ -1,L +N,M @@2005 * but we need to be careful. -U0 that inserts before the second2006 * line also has this pattern.2007 *2008 * And a hunk to add to an empty file would begin with2009 * @@ -0,0 +N,M @@2010 *2011 * In other words, a hunk that is (frag->oldpos <= 1) with or2012 * without leading context must match at the beginning.2013 */2014 match_beginning = (!frag->oldpos ||2015(frag->oldpos ==1&& !unidiff_zero));20162017/*2018 * A hunk without trailing lines must match at the end.2019 * However, we simply cannot tell if a hunk must match end2020 * from the lack of trailing lines if the patch was generated2021 * with unidiff without any context.2022 */2023 match_end = !unidiff_zero && !trailing;20242025 pos = frag->newpos ? (frag->newpos -1) :0;2026 preimage.buf = oldlines;2027 preimage.len = old - oldlines;2028 postimage.buf = newlines;2029 postimage.len =new- newlines;2030 preimage.line = preimage.line_allocated;2031 postimage.line = postimage.line_allocated;20322033for(;;) {20342035 applied_pos =find_pos(img, &preimage, &postimage, pos,2036 ws_rule, match_beginning, match_end);20372038if(applied_pos >=0)2039break;20402041/* Am I at my context limits? */2042if((leading <= p_context) && (trailing <= p_context))2043break;2044if(match_beginning || match_end) {2045 match_beginning = match_end =0;2046continue;2047}20482049/*2050 * Reduce the number of context lines; reduce both2051 * leading and trailing if they are equal otherwise2052 * just reduce the larger context.2053 */2054if(leading >= trailing) {2055remove_first_line(&preimage);2056remove_first_line(&postimage);2057 pos--;2058 leading--;2059}2060if(trailing > leading) {2061remove_last_line(&preimage);2062remove_last_line(&postimage);2063 trailing--;2064}2065}20662067if(applied_pos >=0) {2068if(ws_error_action == correct_ws_error &&2069 new_blank_lines_at_end &&2070 postimage.nr + applied_pos == img->nr) {2071/*2072 * If the patch application adds blank lines2073 * at the end, and if the patch applies at the2074 * end of the image, remove those added blank2075 * lines.2076 */2077while(new_blank_lines_at_end--)2078remove_last_line(&postimage);2079}20802081/*2082 * Warn if it was necessary to reduce the number2083 * of context lines.2084 */2085if((leading != frag->leading) ||2086(trailing != frag->trailing))2087fprintf(stderr,"Context reduced to (%ld/%ld)"2088" to apply fragment at%d\n",2089 leading, trailing, applied_pos+1);2090update_image(img, applied_pos, &preimage, &postimage);2091}else{2092if(apply_verbosely)2093error("while searching for:\n%.*s",2094(int)(old - oldlines), oldlines);2095}20962097free(oldlines);2098free(newlines);2099free(preimage.line_allocated);2100free(postimage.line_allocated);21012102return(applied_pos <0);2103}21042105static intapply_binary_fragment(struct image *img,struct patch *patch)2106{2107struct fragment *fragment = patch->fragments;2108unsigned long len;2109void*dst;21102111/* Binary patch is irreversible without the optional second hunk */2112if(apply_in_reverse) {2113if(!fragment->next)2114returnerror("cannot reverse-apply a binary patch "2115"without the reverse hunk to '%s'",2116 patch->new_name2117? patch->new_name : patch->old_name);2118 fragment = fragment->next;2119}2120switch(fragment->binary_patch_method) {2121case BINARY_DELTA_DEFLATED:2122 dst =patch_delta(img->buf, img->len, fragment->patch,2123 fragment->size, &len);2124if(!dst)2125return-1;2126clear_image(img);2127 img->buf = dst;2128 img->len = len;2129return0;2130case BINARY_LITERAL_DEFLATED:2131clear_image(img);2132 img->len = fragment->size;2133 img->buf =xmalloc(img->len+1);2134memcpy(img->buf, fragment->patch, img->len);2135 img->buf[img->len] ='\0';2136return0;2137}2138return-1;2139}21402141static intapply_binary(struct image *img,struct patch *patch)2142{2143const char*name = patch->old_name ? patch->old_name : patch->new_name;2144unsigned char sha1[20];21452146/*2147 * For safety, we require patch index line to contain2148 * full 40-byte textual SHA1 for old and new, at least for now.2149 */2150if(strlen(patch->old_sha1_prefix) !=40||2151strlen(patch->new_sha1_prefix) !=40||2152get_sha1_hex(patch->old_sha1_prefix, sha1) ||2153get_sha1_hex(patch->new_sha1_prefix, sha1))2154returnerror("cannot apply binary patch to '%s' "2155"without full index line", name);21562157if(patch->old_name) {2158/*2159 * See if the old one matches what the patch2160 * applies to.2161 */2162hash_sha1_file(img->buf, img->len, blob_type, sha1);2163if(strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2164returnerror("the patch applies to '%s' (%s), "2165"which does not match the "2166"current contents.",2167 name,sha1_to_hex(sha1));2168}2169else{2170/* Otherwise, the old one must be empty. */2171if(img->len)2172returnerror("the patch applies to an empty "2173"'%s' but it is not empty", name);2174}21752176get_sha1_hex(patch->new_sha1_prefix, sha1);2177if(is_null_sha1(sha1)) {2178clear_image(img);2179return0;/* deletion patch */2180}21812182if(has_sha1_file(sha1)) {2183/* We already have the postimage */2184enum object_type type;2185unsigned long size;2186char*result;21872188 result =read_sha1_file(sha1, &type, &size);2189if(!result)2190returnerror("the necessary postimage%sfor "2191"'%s' cannot be read",2192 patch->new_sha1_prefix, name);2193clear_image(img);2194 img->buf = result;2195 img->len = size;2196}else{2197/*2198 * We have verified buf matches the preimage;2199 * apply the patch data to it, which is stored2200 * in the patch->fragments->{patch,size}.2201 */2202if(apply_binary_fragment(img, patch))2203returnerror("binary patch does not apply to '%s'",2204 name);22052206/* verify that the result matches */2207hash_sha1_file(img->buf, img->len, blob_type, sha1);2208if(strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))2209returnerror("binary patch to '%s' creates incorrect result (expecting%s, got%s)",2210 name, patch->new_sha1_prefix,sha1_to_hex(sha1));2211}22122213return0;2214}22152216static intapply_fragments(struct image *img,struct patch *patch)2217{2218struct fragment *frag = patch->fragments;2219const char*name = patch->old_name ? patch->old_name : patch->new_name;2220unsigned ws_rule = patch->ws_rule;2221unsigned inaccurate_eof = patch->inaccurate_eof;22222223if(patch->is_binary)2224returnapply_binary(img, patch);22252226while(frag) {2227if(apply_one_fragment(img, frag, inaccurate_eof, ws_rule)) {2228error("patch failed:%s:%ld", name, frag->oldpos);2229if(!apply_with_reject)2230return-1;2231 frag->rejected =1;2232}2233 frag = frag->next;2234}2235return0;2236}22372238static intread_file_or_gitlink(struct cache_entry *ce,struct strbuf *buf)2239{2240if(!ce)2241return0;22422243if(S_ISGITLINK(ce->ce_mode)) {2244strbuf_grow(buf,100);2245strbuf_addf(buf,"Subproject commit%s\n",sha1_to_hex(ce->sha1));2246}else{2247enum object_type type;2248unsigned long sz;2249char*result;22502251 result =read_sha1_file(ce->sha1, &type, &sz);2252if(!result)2253return-1;2254/* XXX read_sha1_file NUL-terminates */2255strbuf_attach(buf, result, sz, sz +1);2256}2257return0;2258}22592260static struct patch *in_fn_table(const char*name)2261{2262struct string_list_item *item;22632264if(name == NULL)2265return NULL;22662267 item =string_list_lookup(name, &fn_table);2268if(item != NULL)2269return(struct patch *)item->util;22702271return NULL;2272}22732274static voidadd_to_fn_table(struct patch *patch)2275{2276struct string_list_item *item;22772278/*2279 * Always add new_name unless patch is a deletion2280 * This should cover the cases for normal diffs,2281 * file creations and copies2282 */2283if(patch->new_name != NULL) {2284 item =string_list_insert(patch->new_name, &fn_table);2285 item->util = patch;2286}22872288/*2289 * store a failure on rename/deletion cases because2290 * later chunks shouldn't patch old names2291 */2292if((patch->new_name == NULL) || (patch->is_rename)) {2293 item =string_list_insert(patch->old_name, &fn_table);2294 item->util = (struct patch *) -1;2295}2296}22972298static intapply_data(struct patch *patch,struct stat *st,struct cache_entry *ce)2299{2300struct strbuf buf = STRBUF_INIT;2301struct image image;2302size_t len;2303char*img;2304struct patch *tpatch;23052306if(!(patch->is_copy || patch->is_rename) &&2307((tpatch =in_fn_table(patch->old_name)) != NULL)) {2308if(tpatch == (struct patch *) -1) {2309returnerror("patch%shas been renamed/deleted",2310 patch->old_name);2311}2312/* We have a patched copy in memory use that */2313strbuf_add(&buf, tpatch->result, tpatch->resultsize);2314}else if(cached) {2315if(read_file_or_gitlink(ce, &buf))2316returnerror("read of%sfailed", patch->old_name);2317}else if(patch->old_name) {2318if(S_ISGITLINK(patch->old_mode)) {2319if(ce) {2320read_file_or_gitlink(ce, &buf);2321}else{2322/*2323 * There is no way to apply subproject2324 * patch without looking at the index.2325 */2326 patch->fragments = NULL;2327}2328}else{2329if(read_old_data(st, patch->old_name, &buf))2330returnerror("read of%sfailed", patch->old_name);2331}2332}23332334 img =strbuf_detach(&buf, &len);2335prepare_image(&image, img, len, !patch->is_binary);23362337if(apply_fragments(&image, patch) <0)2338return-1;/* note with --reject this succeeds. */2339 patch->result = image.buf;2340 patch->resultsize = image.len;2341add_to_fn_table(patch);2342free(image.line_allocated);23432344if(0< patch->is_delete && patch->resultsize)2345returnerror("removal patch leaves file contents");23462347return0;2348}23492350static intcheck_to_create_blob(const char*new_name,int ok_if_exists)2351{2352struct stat nst;2353if(!lstat(new_name, &nst)) {2354if(S_ISDIR(nst.st_mode) || ok_if_exists)2355return0;2356/*2357 * A leading component of new_name might be a symlink2358 * that is going to be removed with this patch, but2359 * still pointing at somewhere that has the path.2360 * In such a case, path "new_name" does not exist as2361 * far as git is concerned.2362 */2363if(has_symlink_leading_path(new_name,strlen(new_name)))2364return0;23652366returnerror("%s: already exists in working directory", new_name);2367}2368else if((errno != ENOENT) && (errno != ENOTDIR))2369returnerror("%s:%s", new_name,strerror(errno));2370return0;2371}23722373static intverify_index_match(struct cache_entry *ce,struct stat *st)2374{2375if(S_ISGITLINK(ce->ce_mode)) {2376if(!S_ISDIR(st->st_mode))2377return-1;2378return0;2379}2380returnce_match_stat(ce, st, CE_MATCH_IGNORE_VALID);2381}23822383static intcheck_preimage(struct patch *patch,struct cache_entry **ce,struct stat *st)2384{2385const char*old_name = patch->old_name;2386struct patch *tpatch = NULL;2387int stat_ret =0;2388unsigned st_mode =0;23892390/*2391 * Make sure that we do not have local modifications from the2392 * index when we are looking at the index. Also make sure2393 * we have the preimage file to be patched in the work tree,2394 * unless --cached, which tells git to apply only in the index.2395 */2396if(!old_name)2397return0;23982399assert(patch->is_new <=0);24002401if(!(patch->is_copy || patch->is_rename) &&2402(tpatch =in_fn_table(old_name)) != NULL) {2403if(tpatch == (struct patch *) -1) {2404returnerror("%s: has been deleted/renamed", old_name);2405}2406 st_mode = tpatch->new_mode;2407}else if(!cached) {2408 stat_ret =lstat(old_name, st);2409if(stat_ret && errno != ENOENT)2410returnerror("%s:%s", old_name,strerror(errno));2411}24122413if(check_index && !tpatch) {2414int pos =cache_name_pos(old_name,strlen(old_name));2415if(pos <0) {2416if(patch->is_new <0)2417goto is_new;2418returnerror("%s: does not exist in index", old_name);2419}2420*ce = active_cache[pos];2421if(stat_ret <0) {2422struct checkout costate;2423/* checkout */2424 costate.base_dir ="";2425 costate.base_dir_len =0;2426 costate.force =0;2427 costate.quiet =0;2428 costate.not_new =0;2429 costate.refresh_cache =1;2430if(checkout_entry(*ce, &costate, NULL) ||2431lstat(old_name, st))2432return-1;2433}2434if(!cached &&verify_index_match(*ce, st))2435returnerror("%s: does not match index", old_name);2436if(cached)2437 st_mode = (*ce)->ce_mode;2438}else if(stat_ret <0) {2439if(patch->is_new <0)2440goto is_new;2441returnerror("%s:%s", old_name,strerror(errno));2442}24432444if(!cached && !tpatch)2445 st_mode =ce_mode_from_stat(*ce, st->st_mode);24462447if(patch->is_new <0)2448 patch->is_new =0;2449if(!patch->old_mode)2450 patch->old_mode = st_mode;2451if((st_mode ^ patch->old_mode) & S_IFMT)2452returnerror("%s: wrong type", old_name);2453if(st_mode != patch->old_mode)2454warning("%shas type%o, expected%o",2455 old_name, st_mode, patch->old_mode);2456if(!patch->new_mode && !patch->is_delete)2457 patch->new_mode = st_mode;2458return0;24592460 is_new:2461 patch->is_new =1;2462 patch->is_delete =0;2463 patch->old_name = NULL;2464return0;2465}24662467static intcheck_patch(struct patch *patch)2468{2469struct stat st;2470const char*old_name = patch->old_name;2471const char*new_name = patch->new_name;2472const char*name = old_name ? old_name : new_name;2473struct cache_entry *ce = NULL;2474int ok_if_exists;2475int status;24762477 patch->rejected =1;/* we will drop this after we succeed */24782479 status =check_preimage(patch, &ce, &st);2480if(status)2481return status;2482 old_name = patch->old_name;24832484if(in_fn_table(new_name) == (struct patch *) -1)2485/*2486 * A type-change diff is always split into a patch to2487 * delete old, immediately followed by a patch to2488 * create new (see diff.c::run_diff()); in such a case2489 * it is Ok that the entry to be deleted by the2490 * previous patch is still in the working tree and in2491 * the index.2492 */2493 ok_if_exists =1;2494else2495 ok_if_exists =0;24962497if(new_name &&2498((0< patch->is_new) | (0< patch->is_rename) | patch->is_copy)) {2499if(check_index &&2500cache_name_pos(new_name,strlen(new_name)) >=0&&2501!ok_if_exists)2502returnerror("%s: already exists in index", new_name);2503if(!cached) {2504int err =check_to_create_blob(new_name, ok_if_exists);2505if(err)2506return err;2507}2508if(!patch->new_mode) {2509if(0< patch->is_new)2510 patch->new_mode = S_IFREG |0644;2511else2512 patch->new_mode = patch->old_mode;2513}2514}25152516if(new_name && old_name) {2517int same = !strcmp(old_name, new_name);2518if(!patch->new_mode)2519 patch->new_mode = patch->old_mode;2520if((patch->old_mode ^ patch->new_mode) & S_IFMT)2521returnerror("new mode (%o) of%sdoes not match old mode (%o)%s%s",2522 patch->new_mode, new_name, patch->old_mode,2523 same ?"":" of ", same ?"": old_name);2524}25252526if(apply_data(patch, &st, ce) <0)2527returnerror("%s: patch does not apply", name);2528 patch->rejected =0;2529return0;2530}25312532static intcheck_patch_list(struct patch *patch)2533{2534int err =0;25352536while(patch) {2537if(apply_verbosely)2538say_patch_name(stderr,2539"Checking patch ", patch,"...\n");2540 err |=check_patch(patch);2541 patch = patch->next;2542}2543return err;2544}25452546/* This function tries to read the sha1 from the current index */2547static intget_current_sha1(const char*path,unsigned char*sha1)2548{2549int pos;25502551if(read_cache() <0)2552return-1;2553 pos =cache_name_pos(path,strlen(path));2554if(pos <0)2555return-1;2556hashcpy(sha1, active_cache[pos]->sha1);2557return0;2558}25592560/* Build an index that contains the just the files needed for a 3way merge */2561static voidbuild_fake_ancestor(struct patch *list,const char*filename)2562{2563struct patch *patch;2564struct index_state result = {0};2565int fd;25662567/* Once we start supporting the reverse patch, it may be2568 * worth showing the new sha1 prefix, but until then...2569 */2570for(patch = list; patch; patch = patch->next) {2571const unsigned char*sha1_ptr;2572unsigned char sha1[20];2573struct cache_entry *ce;2574const char*name;25752576 name = patch->old_name ? patch->old_name : patch->new_name;2577if(0< patch->is_new)2578continue;2579else if(get_sha1(patch->old_sha1_prefix, sha1))2580/* git diff has no index line for mode/type changes */2581if(!patch->lines_added && !patch->lines_deleted) {2582if(get_current_sha1(patch->new_name, sha1) ||2583get_current_sha1(patch->old_name, sha1))2584die("mode change for%s, which is not "2585"in current HEAD", name);2586 sha1_ptr = sha1;2587}else2588die("sha1 information is lacking or useless "2589"(%s).", name);2590else2591 sha1_ptr = sha1;25922593 ce =make_cache_entry(patch->old_mode, sha1_ptr, name,0,0);2594if(!ce)2595die("make_cache_entry failed for path '%s'", name);2596if(add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))2597die("Could not add%sto temporary index", name);2598}25992600 fd =open(filename, O_WRONLY | O_CREAT,0666);2601if(fd <0||write_index(&result, fd) ||close(fd))2602die("Could not write temporary index to%s", filename);26032604discard_index(&result);2605}26062607static voidstat_patch_list(struct patch *patch)2608{2609int files, adds, dels;26102611for(files = adds = dels =0; patch ; patch = patch->next) {2612 files++;2613 adds += patch->lines_added;2614 dels += patch->lines_deleted;2615show_stats(patch);2616}26172618printf("%dfiles changed,%dinsertions(+),%ddeletions(-)\n", files, adds, dels);2619}26202621static voidnumstat_patch_list(struct patch *patch)2622{2623for( ; patch; patch = patch->next) {2624const char*name;2625 name = patch->new_name ? patch->new_name : patch->old_name;2626if(patch->is_binary)2627printf("-\t-\t");2628else2629printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);2630write_name_quoted(name, stdout, line_termination);2631}2632}26332634static voidshow_file_mode_name(const char*newdelete,unsigned int mode,const char*name)2635{2636if(mode)2637printf("%smode%06o%s\n", newdelete, mode, name);2638else2639printf("%s %s\n", newdelete, name);2640}26412642static voidshow_mode_change(struct patch *p,int show_name)2643{2644if(p->old_mode && p->new_mode && p->old_mode != p->new_mode) {2645if(show_name)2646printf(" mode change%06o =>%06o%s\n",2647 p->old_mode, p->new_mode, p->new_name);2648else2649printf(" mode change%06o =>%06o\n",2650 p->old_mode, p->new_mode);2651}2652}26532654static voidshow_rename_copy(struct patch *p)2655{2656const char*renamecopy = p->is_rename ?"rename":"copy";2657const char*old, *new;26582659/* Find common prefix */2660 old = p->old_name;2661new= p->new_name;2662while(1) {2663const char*slash_old, *slash_new;2664 slash_old =strchr(old,'/');2665 slash_new =strchr(new,'/');2666if(!slash_old ||2667!slash_new ||2668 slash_old - old != slash_new -new||2669memcmp(old,new, slash_new -new))2670break;2671 old = slash_old +1;2672new= slash_new +1;2673}2674/* p->old_name thru old is the common prefix, and old and new2675 * through the end of names are renames2676 */2677if(old != p->old_name)2678printf("%s%.*s{%s=>%s} (%d%%)\n", renamecopy,2679(int)(old - p->old_name), p->old_name,2680 old,new, p->score);2681else2682printf("%s %s=>%s(%d%%)\n", renamecopy,2683 p->old_name, p->new_name, p->score);2684show_mode_change(p,0);2685}26862687static voidsummary_patch_list(struct patch *patch)2688{2689struct patch *p;26902691for(p = patch; p; p = p->next) {2692if(p->is_new)2693show_file_mode_name("create", p->new_mode, p->new_name);2694else if(p->is_delete)2695show_file_mode_name("delete", p->old_mode, p->old_name);2696else{2697if(p->is_rename || p->is_copy)2698show_rename_copy(p);2699else{2700if(p->score) {2701printf(" rewrite%s(%d%%)\n",2702 p->new_name, p->score);2703show_mode_change(p,0);2704}2705else2706show_mode_change(p,1);2707}2708}2709}2710}27112712static voidpatch_stats(struct patch *patch)2713{2714int lines = patch->lines_added + patch->lines_deleted;27152716if(lines > max_change)2717 max_change = lines;2718if(patch->old_name) {2719int len =quote_c_style(patch->old_name, NULL, NULL,0);2720if(!len)2721 len =strlen(patch->old_name);2722if(len > max_len)2723 max_len = len;2724}2725if(patch->new_name) {2726int len =quote_c_style(patch->new_name, NULL, NULL,0);2727if(!len)2728 len =strlen(patch->new_name);2729if(len > max_len)2730 max_len = len;2731}2732}27332734static voidremove_file(struct patch *patch,int rmdir_empty)2735{2736if(update_index) {2737if(remove_file_from_cache(patch->old_name) <0)2738die("unable to remove%sfrom index", patch->old_name);2739}2740if(!cached) {2741if(S_ISGITLINK(patch->old_mode)) {2742if(rmdir(patch->old_name))2743warning("unable to remove submodule%s",2744 patch->old_name);2745}else if(!unlink(patch->old_name) && rmdir_empty) {2746remove_path(patch->old_name);2747}2748}2749}27502751static voidadd_index_file(const char*path,unsigned mode,void*buf,unsigned long size)2752{2753struct stat st;2754struct cache_entry *ce;2755int namelen =strlen(path);2756unsigned ce_size =cache_entry_size(namelen);27572758if(!update_index)2759return;27602761 ce =xcalloc(1, ce_size);2762memcpy(ce->name, path, namelen);2763 ce->ce_mode =create_ce_mode(mode);2764 ce->ce_flags = namelen;2765if(S_ISGITLINK(mode)) {2766const char*s = buf;27672768if(get_sha1_hex(s +strlen("Subproject commit "), ce->sha1))2769die("corrupt patch for subproject%s", path);2770}else{2771if(!cached) {2772if(lstat(path, &st) <0)2773die("unable to stat newly created file%s",2774 path);2775fill_stat_cache_info(ce, &st);2776}2777if(write_sha1_file(buf, size, blob_type, ce->sha1) <0)2778die("unable to create backing store for newly created file%s", path);2779}2780if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)2781die("unable to add cache entry for%s", path);2782}27832784static inttry_create_file(const char*path,unsigned int mode,const char*buf,unsigned long size)2785{2786int fd;2787struct strbuf nbuf = STRBUF_INIT;27882789if(S_ISGITLINK(mode)) {2790struct stat st;2791if(!lstat(path, &st) &&S_ISDIR(st.st_mode))2792return0;2793returnmkdir(path,0777);2794}27952796if(has_symlinks &&S_ISLNK(mode))2797/* Although buf:size is counted string, it also is NUL2798 * terminated.2799 */2800returnsymlink(buf, path);28012802 fd =open(path, O_CREAT | O_EXCL | O_WRONLY, (mode &0100) ?0777:0666);2803if(fd <0)2804return-1;28052806if(convert_to_working_tree(path, buf, size, &nbuf)) {2807 size = nbuf.len;2808 buf = nbuf.buf;2809}2810write_or_die(fd, buf, size);2811strbuf_release(&nbuf);28122813if(close(fd) <0)2814die("closing file%s:%s", path,strerror(errno));2815return0;2816}28172818/*2819 * We optimistically assume that the directories exist,2820 * which is true 99% of the time anyway. If they don't,2821 * we create them and try again.2822 */2823static voidcreate_one_file(char*path,unsigned mode,const char*buf,unsigned long size)2824{2825if(cached)2826return;2827if(!try_create_file(path, mode, buf, size))2828return;28292830if(errno == ENOENT) {2831if(safe_create_leading_directories(path))2832return;2833if(!try_create_file(path, mode, buf, size))2834return;2835}28362837if(errno == EEXIST || errno == EACCES) {2838/* We may be trying to create a file where a directory2839 * used to be.2840 */2841struct stat st;2842if(!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))2843 errno = EEXIST;2844}28452846if(errno == EEXIST) {2847unsigned int nr =getpid();28482849for(;;) {2850char newpath[PATH_MAX];2851mksnpath(newpath,sizeof(newpath),"%s~%u", path, nr);2852if(!try_create_file(newpath, mode, buf, size)) {2853if(!rename(newpath, path))2854return;2855unlink(newpath);2856break;2857}2858if(errno != EEXIST)2859break;2860++nr;2861}2862}2863die("unable to write file%smode%o", path, mode);2864}28652866static voidcreate_file(struct patch *patch)2867{2868char*path = patch->new_name;2869unsigned mode = patch->new_mode;2870unsigned long size = patch->resultsize;2871char*buf = patch->result;28722873if(!mode)2874 mode = S_IFREG |0644;2875create_one_file(path, mode, buf, size);2876add_index_file(path, mode, buf, size);2877}28782879/* phase zero is to remove, phase one is to create */2880static voidwrite_out_one_result(struct patch *patch,int phase)2881{2882if(patch->is_delete >0) {2883if(phase ==0)2884remove_file(patch,1);2885return;2886}2887if(patch->is_new >0|| patch->is_copy) {2888if(phase ==1)2889create_file(patch);2890return;2891}2892/*2893 * Rename or modification boils down to the same2894 * thing: remove the old, write the new2895 */2896if(phase ==0)2897remove_file(patch, patch->is_rename);2898if(phase ==1)2899create_file(patch);2900}29012902static intwrite_out_one_reject(struct patch *patch)2903{2904FILE*rej;2905char namebuf[PATH_MAX];2906struct fragment *frag;2907int cnt =0;29082909for(cnt =0, frag = patch->fragments; frag; frag = frag->next) {2910if(!frag->rejected)2911continue;2912 cnt++;2913}29142915if(!cnt) {2916if(apply_verbosely)2917say_patch_name(stderr,2918"Applied patch ", patch," cleanly.\n");2919return0;2920}29212922/* This should not happen, because a removal patch that leaves2923 * contents are marked "rejected" at the patch level.2924 */2925if(!patch->new_name)2926die("internal error");29272928/* Say this even without --verbose */2929say_patch_name(stderr,"Applying patch ", patch," with");2930fprintf(stderr,"%drejects...\n", cnt);29312932 cnt =strlen(patch->new_name);2933if(ARRAY_SIZE(namebuf) <= cnt +5) {2934 cnt =ARRAY_SIZE(namebuf) -5;2935warning("truncating .rej filename to %.*s.rej",2936 cnt -1, patch->new_name);2937}2938memcpy(namebuf, patch->new_name, cnt);2939memcpy(namebuf + cnt,".rej",5);29402941 rej =fopen(namebuf,"w");2942if(!rej)2943returnerror("cannot open%s:%s", namebuf,strerror(errno));29442945/* Normal git tools never deal with .rej, so do not pretend2946 * this is a git patch by saying --git nor give extended2947 * headers. While at it, maybe please "kompare" that wants2948 * the trailing TAB and some garbage at the end of line ;-).2949 */2950fprintf(rej,"diff a/%sb/%s\t(rejected hunks)\n",2951 patch->new_name, patch->new_name);2952for(cnt =1, frag = patch->fragments;2953 frag;2954 cnt++, frag = frag->next) {2955if(!frag->rejected) {2956fprintf(stderr,"Hunk #%dapplied cleanly.\n", cnt);2957continue;2958}2959fprintf(stderr,"Rejected hunk #%d.\n", cnt);2960fprintf(rej,"%.*s", frag->size, frag->patch);2961if(frag->patch[frag->size-1] !='\n')2962fputc('\n', rej);2963}2964fclose(rej);2965return-1;2966}29672968static intwrite_out_results(struct patch *list,int skipped_patch)2969{2970int phase;2971int errs =0;2972struct patch *l;29732974if(!list && !skipped_patch)2975returnerror("No changes");29762977for(phase =0; phase <2; phase++) {2978 l = list;2979while(l) {2980if(l->rejected)2981 errs =1;2982else{2983write_out_one_result(l, phase);2984if(phase ==1&&write_out_one_reject(l))2985 errs =1;2986}2987 l = l->next;2988}2989}2990return errs;2991}29922993static struct lock_file lock_file;29942995static struct string_list limit_by_name;2996static int has_include;2997static voidadd_name_limit(const char*name,int exclude)2998{2999struct string_list_item *it;30003001 it =string_list_append(name, &limit_by_name);3002 it->util = exclude ? NULL : (void*)1;3003}30043005static intuse_patch(struct patch *p)3006{3007const char*pathname = p->new_name ? p->new_name : p->old_name;3008int i;30093010/* Paths outside are not touched regardless of "--include" */3011if(0< prefix_length) {3012int pathlen =strlen(pathname);3013if(pathlen <= prefix_length ||3014memcmp(prefix, pathname, prefix_length))3015return0;3016}30173018/* See if it matches any of exclude/include rule */3019for(i =0; i < limit_by_name.nr; i++) {3020struct string_list_item *it = &limit_by_name.items[i];3021if(!fnmatch(it->string, pathname,0))3022return(it->util != NULL);3023}30243025/*3026 * If we had any include, a path that does not match any rule is3027 * not used. Otherwise, we saw bunch of exclude rules (or none)3028 * and such a path is used.3029 */3030return!has_include;3031}303230333034static voidprefix_one(char**name)3035{3036char*old_name = *name;3037if(!old_name)3038return;3039*name =xstrdup(prefix_filename(prefix, prefix_length, *name));3040free(old_name);3041}30423043static voidprefix_patches(struct patch *p)3044{3045if(!prefix || p->is_toplevel_relative)3046return;3047for( ; p; p = p->next) {3048if(p->new_name == p->old_name) {3049char*prefixed = p->new_name;3050prefix_one(&prefixed);3051 p->new_name = p->old_name = prefixed;3052}3053else{3054prefix_one(&p->new_name);3055prefix_one(&p->old_name);3056}3057}3058}30593060#define INACCURATE_EOF (1<<0)3061#define RECOUNT (1<<1)30623063static intapply_patch(int fd,const char*filename,int options)3064{3065size_t offset;3066struct strbuf buf = STRBUF_INIT;3067struct patch *list = NULL, **listp = &list;3068int skipped_patch =0;30693070/* FIXME - memory leak when using multiple patch files as inputs */3071memset(&fn_table,0,sizeof(struct string_list));3072 patch_input_file = filename;3073read_patch_file(&buf, fd);3074 offset =0;3075while(offset < buf.len) {3076struct patch *patch;3077int nr;30783079 patch =xcalloc(1,sizeof(*patch));3080 patch->inaccurate_eof = !!(options & INACCURATE_EOF);3081 patch->recount = !!(options & RECOUNT);3082 nr =parse_chunk(buf.buf + offset, buf.len - offset, patch);3083if(nr <0)3084break;3085if(apply_in_reverse)3086reverse_patches(patch);3087if(prefix)3088prefix_patches(patch);3089if(use_patch(patch)) {3090patch_stats(patch);3091*listp = patch;3092 listp = &patch->next;3093}3094else{3095/* perhaps free it a bit better? */3096free(patch);3097 skipped_patch++;3098}3099 offset += nr;3100}31013102if(whitespace_error && (ws_error_action == die_on_ws_error))3103 apply =0;31043105 update_index = check_index && apply;3106if(update_index && newfd <0)3107 newfd =hold_locked_index(&lock_file,1);31083109if(check_index) {3110if(read_cache() <0)3111die("unable to read index file");3112}31133114if((check || apply) &&3115check_patch_list(list) <0&&3116!apply_with_reject)3117exit(1);31183119if(apply &&write_out_results(list, skipped_patch))3120exit(1);31213122if(fake_ancestor)3123build_fake_ancestor(list, fake_ancestor);31243125if(diffstat)3126stat_patch_list(list);31273128if(numstat)3129numstat_patch_list(list);31303131if(summary)3132summary_patch_list(list);31333134strbuf_release(&buf);3135return0;3136}31373138static intgit_apply_config(const char*var,const char*value,void*cb)3139{3140if(!strcmp(var,"apply.whitespace"))3141returngit_config_string(&apply_default_whitespace, var, value);3142returngit_default_config(var, value, cb);3143}31443145static intoption_parse_exclude(const struct option *opt,3146const char*arg,int unset)3147{3148add_name_limit(arg,1);3149return0;3150}31513152static intoption_parse_include(const struct option *opt,3153const char*arg,int unset)3154{3155add_name_limit(arg,0);3156 has_include =1;3157return0;3158}31593160static intoption_parse_p(const struct option *opt,3161const char*arg,int unset)3162{3163 p_value =atoi(arg);3164 p_value_known =1;3165return0;3166}31673168static intoption_parse_z(const struct option *opt,3169const char*arg,int unset)3170{3171if(unset)3172 line_termination ='\n';3173else3174 line_termination =0;3175return0;3176}31773178static intoption_parse_whitespace(const struct option *opt,3179const char*arg,int unset)3180{3181const char**whitespace_option = opt->value;31823183*whitespace_option = arg;3184parse_whitespace_option(arg);3185return0;3186}31873188static intoption_parse_directory(const struct option *opt,3189const char*arg,int unset)3190{3191 root_len =strlen(arg);3192if(root_len && arg[root_len -1] !='/') {3193char*new_root;3194 root = new_root =xmalloc(root_len +2);3195strcpy(new_root, arg);3196strcpy(new_root + root_len++,"/");3197}else3198 root = arg;3199return0;3200}32013202intcmd_apply(int argc,const char**argv,const char*unused_prefix)3203{3204int i;3205int errs =0;3206int is_not_gitdir;3207int binary;3208int force_apply =0;32093210const char*whitespace_option = NULL;32113212struct option builtin_apply_options[] = {3213{ OPTION_CALLBACK,0,"exclude", NULL,"path",3214"don't apply changes matching the given path",32150, option_parse_exclude },3216{ OPTION_CALLBACK,0,"include", NULL,"path",3217"apply changes matching the given path",32180, option_parse_include },3219{ OPTION_CALLBACK,'p', NULL, NULL,"num",3220"remove <num> leading slashes from traditional diff paths",32210, option_parse_p },3222OPT_BOOLEAN(0,"no-add", &no_add,3223"ignore additions made by the patch"),3224OPT_BOOLEAN(0,"stat", &diffstat,3225"instead of applying the patch, output diffstat for the input"),3226{ OPTION_BOOLEAN,0,"allow-binary-replacement", &binary,3227 NULL,"old option, now no-op", PARSE_OPT_HIDDEN },3228{ OPTION_BOOLEAN,0,"binary", &binary,3229 NULL,"old option, now no-op", PARSE_OPT_HIDDEN },3230OPT_BOOLEAN(0,"numstat", &numstat,3231"shows number of added and deleted lines in decimal notation"),3232OPT_BOOLEAN(0,"summary", &summary,3233"instead of applying the patch, output a summary for the input"),3234OPT_BOOLEAN(0,"check", &check,3235"instead of applying the patch, see if the patch is applicable"),3236OPT_BOOLEAN(0,"index", &check_index,3237"make sure the patch is applicable to the current index"),3238OPT_BOOLEAN(0,"cached", &cached,3239"apply a patch without touching the working tree"),3240OPT_BOOLEAN(0,"apply", &force_apply,3241"also apply the patch (use with --stat/--summary/--check)"),3242OPT_STRING(0,"build-fake-ancestor", &fake_ancestor,"file",3243"build a temporary index based on embedded index information"),3244{ OPTION_CALLBACK,'z', NULL, NULL, NULL,3245"paths are separated with NUL character",3246 PARSE_OPT_NOARG, option_parse_z },3247OPT_INTEGER('C', NULL, &p_context,3248"ensure at least <n> lines of context match"),3249{ OPTION_CALLBACK,0,"whitespace", &whitespace_option,"action",3250"detect new or modified lines that have whitespace errors",32510, option_parse_whitespace },3252OPT_BOOLEAN('R',"reverse", &apply_in_reverse,3253"apply the patch in reverse"),3254OPT_BOOLEAN(0,"unidiff-zero", &unidiff_zero,3255"don't expect at least one line of context"),3256OPT_BOOLEAN(0,"reject", &apply_with_reject,3257"leave the rejected hunks in corresponding *.rej files"),3258OPT__VERBOSE(&apply_verbosely),3259OPT_BIT(0,"inaccurate-eof", &options,3260"tolerate incorrectly detected missing new-line at the end of file",3261 INACCURATE_EOF),3262OPT_BIT(0,"recount", &options,3263"do not trust the line counts in the hunk headers",3264 RECOUNT),3265{ OPTION_CALLBACK,0,"directory", NULL,"root",3266"prepend <root> to all filenames",32670, option_parse_directory },3268OPT_END()3269};32703271 prefix =setup_git_directory_gently(&is_not_gitdir);3272 prefix_length = prefix ?strlen(prefix) :0;3273git_config(git_apply_config, NULL);3274if(apply_default_whitespace)3275parse_whitespace_option(apply_default_whitespace);32763277 argc =parse_options(argc, argv, builtin_apply_options,3278 apply_usage,0);3279if(apply_with_reject)3280 apply = apply_verbosely =1;3281if(!force_apply && (diffstat || numstat || summary || check || fake_ancestor))3282 apply =0;3283if(check_index && is_not_gitdir)3284die("--index outside a repository");3285if(cached) {3286if(is_not_gitdir)3287die("--cached outside a repository");3288 check_index =1;3289}3290for(i =0; i < argc; i++) {3291const char*arg = argv[i];3292int fd;32933294if(!strcmp(arg,"-")) {3295 errs |=apply_patch(0,"<stdin>", options);3296 read_stdin =0;3297continue;3298}else if(0< prefix_length)3299 arg =prefix_filename(prefix, prefix_length, arg);33003301 fd =open(arg, O_RDONLY);3302if(fd <0)3303die("can't open patch '%s':%s", arg,strerror(errno));3304 read_stdin =0;3305set_default_whitespace_mode(whitespace_option);3306 errs |=apply_patch(fd, arg, options);3307close(fd);3308}3309set_default_whitespace_mode(whitespace_option);3310if(read_stdin)3311 errs |=apply_patch(0,"<stdin>", options);3312if(whitespace_error) {3313if(squelch_whitespace_errors &&3314 squelch_whitespace_errors < whitespace_error) {3315int squelched =3316 whitespace_error - squelch_whitespace_errors;3317warning("squelched%d"3318"whitespace error%s",3319 squelched,3320 squelched ==1?"":"s");3321}3322if(ws_error_action == die_on_ws_error)3323die("%dline%sadd%swhitespace errors.",3324 whitespace_error,3325 whitespace_error ==1?"":"s",3326 whitespace_error ==1?"s":"");3327if(applied_after_fixing_ws && apply)3328warning("%dline%sapplied after"3329" fixing whitespace errors.",3330 applied_after_fixing_ws,3331 applied_after_fixing_ws ==1?"":"s");3332else if(whitespace_error)3333warning("%dline%sadd%swhitespace errors.",3334 whitespace_error,3335 whitespace_error ==1?"":"s",3336 whitespace_error ==1?"s":"");3337}33383339if(update_index) {3340if(write_cache(newfd, active_cache, active_nr) ||3341commit_locked_index(&lock_file))3342die("Unable to write new index file");3343}33443345return!!errs;3346}