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"path-list.h" 16 17/* 18 * --check turns on checking that the working tree matches the 19 * files that are being modified, but doesn't apply the patch 20 * --stat does just a diffstat, and doesn't actually apply 21 * --numstat does numeric diffstat, and doesn't actually apply 22 * --index-info shows the old and new index info for paths if available. 23 * --index updates the cache as well. 24 * --cached updates only the cache without ever touching the working tree. 25 */ 26static const char*prefix; 27static int prefix_length = -1; 28static int newfd = -1; 29 30static int unidiff_zero; 31static int p_value =1; 32static int p_value_known; 33static int check_index; 34static int update_index; 35static int cached; 36static int diffstat; 37static int numstat; 38static int summary; 39static int check; 40static int apply =1; 41static int apply_in_reverse; 42static int apply_with_reject; 43static int apply_verbosely; 44static int no_add; 45static const char*fake_ancestor; 46static int line_termination ='\n'; 47static unsigned long p_context = ULONG_MAX; 48static const char apply_usage[] = 49"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>..."; 50 51static enum ws_error_action { 52 nowarn_ws_error, 53 warn_on_ws_error, 54 die_on_ws_error, 55 correct_ws_error, 56} ws_error_action = warn_on_ws_error; 57static int whitespace_error; 58static int squelch_whitespace_errors =5; 59static int applied_after_fixing_ws; 60static const char*patch_input_file; 61 62static voidparse_whitespace_option(const char*option) 63{ 64if(!option) { 65 ws_error_action = warn_on_ws_error; 66return; 67} 68if(!strcmp(option,"warn")) { 69 ws_error_action = warn_on_ws_error; 70return; 71} 72if(!strcmp(option,"nowarn")) { 73 ws_error_action = nowarn_ws_error; 74return; 75} 76if(!strcmp(option,"error")) { 77 ws_error_action = die_on_ws_error; 78return; 79} 80if(!strcmp(option,"error-all")) { 81 ws_error_action = die_on_ws_error; 82 squelch_whitespace_errors =0; 83return; 84} 85if(!strcmp(option,"strip") || !strcmp(option,"fix")) { 86 ws_error_action = correct_ws_error; 87return; 88} 89die("unrecognized whitespace option '%s'", option); 90} 91 92static voidset_default_whitespace_mode(const char*whitespace_option) 93{ 94if(!whitespace_option && !apply_default_whitespace) 95 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); 96} 97 98/* 99 * For "diff-stat" like behaviour, we keep track of the biggest change 100 * we've seen, and the longest filename. That allows us to do simple 101 * scaling. 102 */ 103static int max_change, max_len; 104 105/* 106 * Various "current state", notably line numbers and what 107 * file (and how) we're patching right now.. The "is_xxxx" 108 * things are flags, where -1 means "don't know yet". 109 */ 110static int linenr =1; 111 112/* 113 * This represents one "hunk" from a patch, starting with 114 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 115 * patch text is pointed at by patch, and its byte length 116 * is stored in size. leading and trailing are the number 117 * of context lines. 118 */ 119struct fragment { 120unsigned long leading, trailing; 121unsigned long oldpos, oldlines; 122unsigned long newpos, newlines; 123const char*patch; 124int size; 125int rejected; 126struct fragment *next; 127}; 128 129/* 130 * When dealing with a binary patch, we reuse "leading" field 131 * to store the type of the binary hunk, either deflated "delta" 132 * or deflated "literal". 133 */ 134#define binary_patch_method leading 135#define BINARY_DELTA_DEFLATED 1 136#define BINARY_LITERAL_DEFLATED 2 137 138/* 139 * This represents a "patch" to a file, both metainfo changes 140 * such as creation/deletion, filemode and content changes represented 141 * as a series of fragments. 142 */ 143struct patch { 144char*new_name, *old_name, *def_name; 145unsigned int old_mode, new_mode; 146int is_new, is_delete;/* -1 = unknown, 0 = false, 1 = true */ 147int rejected; 148unsigned ws_rule; 149unsigned long deflate_origlen; 150int lines_added, lines_deleted; 151int score; 152unsigned int is_toplevel_relative:1; 153unsigned int inaccurate_eof:1; 154unsigned int is_binary:1; 155unsigned int is_copy:1; 156unsigned int is_rename:1; 157unsigned int recount:1; 158struct fragment *fragments; 159char*result; 160size_t resultsize; 161char old_sha1_prefix[41]; 162char new_sha1_prefix[41]; 163struct patch *next; 164}; 165 166/* 167 * A line in a file, len-bytes long (includes the terminating LF, 168 * except for an incomplete line at the end if the file ends with 169 * one), and its contents hashes to 'hash'. 170 */ 171struct line { 172size_t len; 173unsigned hash :24; 174unsigned flag :8; 175#define LINE_COMMON 1 176}; 177 178/* 179 * This represents a "file", which is an array of "lines". 180 */ 181struct image { 182char*buf; 183size_t len; 184size_t nr; 185size_t alloc; 186struct line *line_allocated; 187struct line *line; 188}; 189 190/* 191 * Records filenames that have been touched, in order to handle 192 * the case where more than one patches touch the same file. 193 */ 194 195static struct path_list fn_table; 196 197static uint32_thash_line(const char*cp,size_t len) 198{ 199size_t i; 200uint32_t h; 201for(i =0, h =0; i < len; i++) { 202if(!isspace(cp[i])) { 203 h = h *3+ (cp[i] &0xff); 204} 205} 206return h; 207} 208 209static voidadd_line_info(struct image *img,const char*bol,size_t len,unsigned flag) 210{ 211ALLOC_GROW(img->line_allocated, img->nr +1, img->alloc); 212 img->line_allocated[img->nr].len = len; 213 img->line_allocated[img->nr].hash =hash_line(bol, len); 214 img->line_allocated[img->nr].flag = flag; 215 img->nr++; 216} 217 218static voidprepare_image(struct image *image,char*buf,size_t len, 219int prepare_linetable) 220{ 221const char*cp, *ep; 222 223memset(image,0,sizeof(*image)); 224 image->buf = buf; 225 image->len = len; 226 227if(!prepare_linetable) 228return; 229 230 ep = image->buf + image->len; 231 cp = image->buf; 232while(cp < ep) { 233const char*next; 234for(next = cp; next < ep && *next !='\n'; next++) 235; 236if(next < ep) 237 next++; 238add_line_info(image, cp, next - cp,0); 239 cp = next; 240} 241 image->line = image->line_allocated; 242} 243 244static voidclear_image(struct image *image) 245{ 246free(image->buf); 247 image->buf = NULL; 248 image->len =0; 249} 250 251static voidsay_patch_name(FILE*output,const char*pre, 252struct patch *patch,const char*post) 253{ 254fputs(pre, output); 255if(patch->old_name && patch->new_name && 256strcmp(patch->old_name, patch->new_name)) { 257quote_c_style(patch->old_name, NULL, output,0); 258fputs(" => ", output); 259quote_c_style(patch->new_name, NULL, output,0); 260}else{ 261const char*n = patch->new_name; 262if(!n) 263 n = patch->old_name; 264quote_c_style(n, NULL, output,0); 265} 266fputs(post, output); 267} 268 269#define CHUNKSIZE (8192) 270#define SLOP (16) 271 272static voidread_patch_file(struct strbuf *sb,int fd) 273{ 274if(strbuf_read(sb, fd,0) <0) 275die("git-apply: read returned%s",strerror(errno)); 276 277/* 278 * Make sure that we have some slop in the buffer 279 * so that we can do speculative "memcmp" etc, and 280 * see to it that it is NUL-filled. 281 */ 282strbuf_grow(sb, SLOP); 283memset(sb->buf + sb->len,0, SLOP); 284} 285 286static unsigned longlinelen(const char*buffer,unsigned long size) 287{ 288unsigned long len =0; 289while(size--) { 290 len++; 291if(*buffer++ =='\n') 292break; 293} 294return len; 295} 296 297static intis_dev_null(const char*str) 298{ 299return!memcmp("/dev/null", str,9) &&isspace(str[9]); 300} 301 302#define TERM_SPACE 1 303#define TERM_TAB 2 304 305static intname_terminate(const char*name,int namelen,int c,int terminate) 306{ 307if(c ==' '&& !(terminate & TERM_SPACE)) 308return0; 309if(c =='\t'&& !(terminate & TERM_TAB)) 310return0; 311 312return1; 313} 314 315static char*find_name(const char*line,char*def,int p_value,int terminate) 316{ 317int len; 318const char*start = line; 319 320if(*line =='"') { 321struct strbuf name; 322 323/* 324 * Proposed "new-style" GNU patch/diff format; see 325 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 326 */ 327strbuf_init(&name,0); 328if(!unquote_c_style(&name, line, NULL)) { 329char*cp; 330 331for(cp = name.buf; p_value; p_value--) { 332 cp =strchr(cp,'/'); 333if(!cp) 334break; 335 cp++; 336} 337if(cp) { 338/* name can later be freed, so we need 339 * to memmove, not just return cp 340 */ 341strbuf_remove(&name,0, cp - name.buf); 342free(def); 343returnstrbuf_detach(&name, NULL); 344} 345} 346strbuf_release(&name); 347} 348 349for(;;) { 350char c = *line; 351 352if(isspace(c)) { 353if(c =='\n') 354break; 355if(name_terminate(start, line-start, c, terminate)) 356break; 357} 358 line++; 359if(c =='/'&& !--p_value) 360 start = line; 361} 362if(!start) 363return def; 364 len = line - start; 365if(!len) 366return def; 367 368/* 369 * Generally we prefer the shorter name, especially 370 * if the other one is just a variation of that with 371 * something else tacked on to the end (ie "file.orig" 372 * or "file~"). 373 */ 374if(def) { 375int deflen =strlen(def); 376if(deflen < len && !strncmp(start, def, deflen)) 377return def; 378free(def); 379} 380 381returnxmemdupz(start, len); 382} 383 384static intcount_slashes(const char*cp) 385{ 386int cnt =0; 387char ch; 388 389while((ch = *cp++)) 390if(ch =='/') 391 cnt++; 392return cnt; 393} 394 395/* 396 * Given the string after "--- " or "+++ ", guess the appropriate 397 * p_value for the given patch. 398 */ 399static intguess_p_value(const char*nameline) 400{ 401char*name, *cp; 402int val = -1; 403 404if(is_dev_null(nameline)) 405return-1; 406 name =find_name(nameline, NULL,0, TERM_SPACE | TERM_TAB); 407if(!name) 408return-1; 409 cp =strchr(name,'/'); 410if(!cp) 411 val =0; 412else if(prefix) { 413/* 414 * Does it begin with "a/$our-prefix" and such? Then this is 415 * very likely to apply to our directory. 416 */ 417if(!strncmp(name, prefix, prefix_length)) 418 val =count_slashes(prefix); 419else{ 420 cp++; 421if(!strncmp(cp, prefix, prefix_length)) 422 val =count_slashes(prefix) +1; 423} 424} 425free(name); 426return val; 427} 428 429/* 430 * Get the name etc info from the ---/+++ lines of a traditional patch header 431 * 432 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 433 * files, we can happily check the index for a match, but for creating a 434 * new file we should try to match whatever "patch" does. I have no idea. 435 */ 436static voidparse_traditional_patch(const char*first,const char*second,struct patch *patch) 437{ 438char*name; 439 440 first +=4;/* skip "--- " */ 441 second +=4;/* skip "+++ " */ 442if(!p_value_known) { 443int p, q; 444 p =guess_p_value(first); 445 q =guess_p_value(second); 446if(p <0) p = q; 447if(0<= p && p == q) { 448 p_value = p; 449 p_value_known =1; 450} 451} 452if(is_dev_null(first)) { 453 patch->is_new =1; 454 patch->is_delete =0; 455 name =find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB); 456 patch->new_name = name; 457}else if(is_dev_null(second)) { 458 patch->is_new =0; 459 patch->is_delete =1; 460 name =find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB); 461 patch->old_name = name; 462}else{ 463 name =find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB); 464 name =find_name(second, name, p_value, TERM_SPACE | TERM_TAB); 465 patch->old_name = patch->new_name = name; 466} 467if(!name) 468die("unable to find filename in patch at line%d", linenr); 469} 470 471static intgitdiff_hdrend(const char*line,struct patch *patch) 472{ 473return-1; 474} 475 476/* 477 * We're anal about diff header consistency, to make 478 * sure that we don't end up having strange ambiguous 479 * patches floating around. 480 * 481 * As a result, gitdiff_{old|new}name() will check 482 * their names against any previous information, just 483 * to make sure.. 484 */ 485static char*gitdiff_verify_name(const char*line,int isnull,char*orig_name,const char*oldnew) 486{ 487if(!orig_name && !isnull) 488returnfind_name(line, NULL, p_value, TERM_TAB); 489 490if(orig_name) { 491int len; 492const char*name; 493char*another; 494 name = orig_name; 495 len =strlen(name); 496if(isnull) 497die("git-apply: bad git-diff - expected /dev/null, got%son line%d", name, linenr); 498 another =find_name(line, NULL, p_value, TERM_TAB); 499if(!another ||memcmp(another, name, len)) 500die("git-apply: bad git-diff - inconsistent%sfilename on line%d", oldnew, linenr); 501free(another); 502return orig_name; 503} 504else{ 505/* expect "/dev/null" */ 506if(memcmp("/dev/null", line,9) || line[9] !='\n') 507die("git-apply: bad git-diff - expected /dev/null on line%d", linenr); 508return NULL; 509} 510} 511 512static intgitdiff_oldname(const char*line,struct patch *patch) 513{ 514 patch->old_name =gitdiff_verify_name(line, patch->is_new, patch->old_name,"old"); 515return0; 516} 517 518static intgitdiff_newname(const char*line,struct patch *patch) 519{ 520 patch->new_name =gitdiff_verify_name(line, patch->is_delete, patch->new_name,"new"); 521return0; 522} 523 524static intgitdiff_oldmode(const char*line,struct patch *patch) 525{ 526 patch->old_mode =strtoul(line, NULL,8); 527return0; 528} 529 530static intgitdiff_newmode(const char*line,struct patch *patch) 531{ 532 patch->new_mode =strtoul(line, NULL,8); 533return0; 534} 535 536static intgitdiff_delete(const char*line,struct patch *patch) 537{ 538 patch->is_delete =1; 539 patch->old_name = patch->def_name; 540returngitdiff_oldmode(line, patch); 541} 542 543static intgitdiff_newfile(const char*line,struct patch *patch) 544{ 545 patch->is_new =1; 546 patch->new_name = patch->def_name; 547returngitdiff_newmode(line, patch); 548} 549 550static intgitdiff_copysrc(const char*line,struct patch *patch) 551{ 552 patch->is_copy =1; 553 patch->old_name =find_name(line, NULL,0,0); 554return0; 555} 556 557static intgitdiff_copydst(const char*line,struct patch *patch) 558{ 559 patch->is_copy =1; 560 patch->new_name =find_name(line, NULL,0,0); 561return0; 562} 563 564static intgitdiff_renamesrc(const char*line,struct patch *patch) 565{ 566 patch->is_rename =1; 567 patch->old_name =find_name(line, NULL,0,0); 568return0; 569} 570 571static intgitdiff_renamedst(const char*line,struct patch *patch) 572{ 573 patch->is_rename =1; 574 patch->new_name =find_name(line, NULL,0,0); 575return0; 576} 577 578static intgitdiff_similarity(const char*line,struct patch *patch) 579{ 580if((patch->score =strtoul(line, NULL,10)) == ULONG_MAX) 581 patch->score =0; 582return0; 583} 584 585static intgitdiff_dissimilarity(const char*line,struct patch *patch) 586{ 587if((patch->score =strtoul(line, NULL,10)) == ULONG_MAX) 588 patch->score =0; 589return0; 590} 591 592static intgitdiff_index(const char*line,struct patch *patch) 593{ 594/* 595 * index line is N hexadecimal, "..", N hexadecimal, 596 * and optional space with octal mode. 597 */ 598const char*ptr, *eol; 599int len; 600 601 ptr =strchr(line,'.'); 602if(!ptr || ptr[1] !='.'||40< ptr - line) 603return0; 604 len = ptr - line; 605memcpy(patch->old_sha1_prefix, line, len); 606 patch->old_sha1_prefix[len] =0; 607 608 line = ptr +2; 609 ptr =strchr(line,' '); 610 eol =strchr(line,'\n'); 611 612if(!ptr || eol < ptr) 613 ptr = eol; 614 len = ptr - line; 615 616if(40< len) 617return0; 618memcpy(patch->new_sha1_prefix, line, len); 619 patch->new_sha1_prefix[len] =0; 620if(*ptr ==' ') 621 patch->new_mode = patch->old_mode =strtoul(ptr+1, NULL,8); 622return0; 623} 624 625/* 626 * This is normal for a diff that doesn't change anything: we'll fall through 627 * into the next diff. Tell the parser to break out. 628 */ 629static intgitdiff_unrecognized(const char*line,struct patch *patch) 630{ 631return-1; 632} 633 634static const char*stop_at_slash(const char*line,int llen) 635{ 636int i; 637 638for(i =0; i < llen; i++) { 639int ch = line[i]; 640if(ch =='/') 641return line + i; 642} 643return NULL; 644} 645 646/* 647 * This is to extract the same name that appears on "diff --git" 648 * line. We do not find and return anything if it is a rename 649 * patch, and it is OK because we will find the name elsewhere. 650 * We need to reliably find name only when it is mode-change only, 651 * creation or deletion of an empty file. In any of these cases, 652 * both sides are the same name under a/ and b/ respectively. 653 */ 654static char*git_header_name(char*line,int llen) 655{ 656const char*name; 657const char*second = NULL; 658size_t len; 659 660 line +=strlen("diff --git "); 661 llen -=strlen("diff --git "); 662 663if(*line =='"') { 664const char*cp; 665struct strbuf first; 666struct strbuf sp; 667 668strbuf_init(&first,0); 669strbuf_init(&sp,0); 670 671if(unquote_c_style(&first, line, &second)) 672goto free_and_fail1; 673 674/* advance to the first slash */ 675 cp =stop_at_slash(first.buf, first.len); 676/* we do not accept absolute paths */ 677if(!cp || cp == first.buf) 678goto free_and_fail1; 679strbuf_remove(&first,0, cp +1- first.buf); 680 681/* 682 * second points at one past closing dq of name. 683 * find the second name. 684 */ 685while((second < line + llen) &&isspace(*second)) 686 second++; 687 688if(line + llen <= second) 689goto free_and_fail1; 690if(*second =='"') { 691if(unquote_c_style(&sp, second, NULL)) 692goto free_and_fail1; 693 cp =stop_at_slash(sp.buf, sp.len); 694if(!cp || cp == sp.buf) 695goto free_and_fail1; 696/* They must match, otherwise ignore */ 697if(strcmp(cp +1, first.buf)) 698goto free_and_fail1; 699strbuf_release(&sp); 700returnstrbuf_detach(&first, NULL); 701} 702 703/* unquoted second */ 704 cp =stop_at_slash(second, line + llen - second); 705if(!cp || cp == second) 706goto free_and_fail1; 707 cp++; 708if(line + llen - cp != first.len +1|| 709memcmp(first.buf, cp, first.len)) 710goto free_and_fail1; 711returnstrbuf_detach(&first, NULL); 712 713 free_and_fail1: 714strbuf_release(&first); 715strbuf_release(&sp); 716return NULL; 717} 718 719/* unquoted first name */ 720 name =stop_at_slash(line, llen); 721if(!name || name == line) 722return NULL; 723 name++; 724 725/* 726 * since the first name is unquoted, a dq if exists must be 727 * the beginning of the second name. 728 */ 729for(second = name; second < line + llen; second++) { 730if(*second =='"') { 731struct strbuf sp; 732const char*np; 733 734strbuf_init(&sp,0); 735if(unquote_c_style(&sp, second, NULL)) 736goto free_and_fail2; 737 738 np =stop_at_slash(sp.buf, sp.len); 739if(!np || np == sp.buf) 740goto free_and_fail2; 741 np++; 742 743 len = sp.buf + sp.len - np; 744if(len < second - name && 745!strncmp(np, name, len) && 746isspace(name[len])) { 747/* Good */ 748strbuf_remove(&sp,0, np - sp.buf); 749returnstrbuf_detach(&sp, NULL); 750} 751 752 free_and_fail2: 753strbuf_release(&sp); 754return NULL; 755} 756} 757 758/* 759 * Accept a name only if it shows up twice, exactly the same 760 * form. 761 */ 762for(len =0; ; len++) { 763switch(name[len]) { 764default: 765continue; 766case'\n': 767return NULL; 768case'\t':case' ': 769 second = name+len; 770for(;;) { 771char c = *second++; 772if(c =='\n') 773return NULL; 774if(c =='/') 775break; 776} 777if(second[len] =='\n'&& !memcmp(name, second, len)) { 778returnxmemdupz(name, len); 779} 780} 781} 782} 783 784/* Verify that we recognize the lines following a git header */ 785static intparse_git_header(char*line,int len,unsigned int size,struct patch *patch) 786{ 787unsigned long offset; 788 789/* A git diff has explicit new/delete information, so we don't guess */ 790 patch->is_new =0; 791 patch->is_delete =0; 792 793/* 794 * Some things may not have the old name in the 795 * rest of the headers anywhere (pure mode changes, 796 * or removing or adding empty files), so we get 797 * the default name from the header. 798 */ 799 patch->def_name =git_header_name(line, len); 800 801 line += len; 802 size -= len; 803 linenr++; 804for(offset = len ; size >0; offset += len, size -= len, line += len, linenr++) { 805static const struct opentry { 806const char*str; 807int(*fn)(const char*,struct patch *); 808} optable[] = { 809{"@@ -", gitdiff_hdrend }, 810{"--- ", gitdiff_oldname }, 811{"+++ ", gitdiff_newname }, 812{"old mode ", gitdiff_oldmode }, 813{"new mode ", gitdiff_newmode }, 814{"deleted file mode ", gitdiff_delete }, 815{"new file mode ", gitdiff_newfile }, 816{"copy from ", gitdiff_copysrc }, 817{"copy to ", gitdiff_copydst }, 818{"rename old ", gitdiff_renamesrc }, 819{"rename new ", gitdiff_renamedst }, 820{"rename from ", gitdiff_renamesrc }, 821{"rename to ", gitdiff_renamedst }, 822{"similarity index ", gitdiff_similarity }, 823{"dissimilarity index ", gitdiff_dissimilarity }, 824{"index ", gitdiff_index }, 825{"", gitdiff_unrecognized }, 826}; 827int i; 828 829 len =linelen(line, size); 830if(!len || line[len-1] !='\n') 831break; 832for(i =0; i <ARRAY_SIZE(optable); i++) { 833const struct opentry *p = optable + i; 834int oplen =strlen(p->str); 835if(len < oplen ||memcmp(p->str, line, oplen)) 836continue; 837if(p->fn(line + oplen, patch) <0) 838return offset; 839break; 840} 841} 842 843return offset; 844} 845 846static intparse_num(const char*line,unsigned long*p) 847{ 848char*ptr; 849 850if(!isdigit(*line)) 851return0; 852*p =strtoul(line, &ptr,10); 853return ptr - line; 854} 855 856static intparse_range(const char*line,int len,int offset,const char*expect, 857unsigned long*p1,unsigned long*p2) 858{ 859int digits, ex; 860 861if(offset <0|| offset >= len) 862return-1; 863 line += offset; 864 len -= offset; 865 866 digits =parse_num(line, p1); 867if(!digits) 868return-1; 869 870 offset += digits; 871 line += digits; 872 len -= digits; 873 874*p2 =1; 875if(*line ==',') { 876 digits =parse_num(line+1, p2); 877if(!digits) 878return-1; 879 880 offset += digits+1; 881 line += digits+1; 882 len -= digits+1; 883} 884 885 ex =strlen(expect); 886if(ex > len) 887return-1; 888if(memcmp(line, expect, ex)) 889return-1; 890 891return offset + ex; 892} 893 894static voidrecount_diff(char*line,int size,struct fragment *fragment) 895{ 896int oldlines =0, newlines =0, ret =0; 897 898if(size <1) { 899warning("recount: ignore empty hunk"); 900return; 901} 902 903for(;;) { 904int len =linelen(line, size); 905 size -= len; 906 line += len; 907 908if(size <1) 909break; 910 911switch(*line) { 912case' ':case'\n': 913 newlines++; 914/* fall through */ 915case'-': 916 oldlines++; 917continue; 918case'+': 919 newlines++; 920continue; 921case'\\': 922continue; 923case'@': 924 ret = size <3||prefixcmp(line,"@@ "); 925break; 926case'd': 927 ret = size <5||prefixcmp(line,"diff "); 928break; 929default: 930 ret = -1; 931break; 932} 933if(ret) { 934warning("recount: unexpected line: %.*s", 935(int)linelen(line, size), line); 936return; 937} 938break; 939} 940 fragment->oldlines = oldlines; 941 fragment->newlines = newlines; 942} 943 944/* 945 * Parse a unified diff fragment header of the 946 * form "@@ -a,b +c,d @@" 947 */ 948static intparse_fragment_header(char*line,int len,struct fragment *fragment) 949{ 950int offset; 951 952if(!len || line[len-1] !='\n') 953return-1; 954 955/* Figure out the number of lines in a fragment */ 956 offset =parse_range(line, len,4," +", &fragment->oldpos, &fragment->oldlines); 957 offset =parse_range(line, len, offset," @@", &fragment->newpos, &fragment->newlines); 958 959return offset; 960} 961 962static intfind_header(char*line,unsigned long size,int*hdrsize,struct patch *patch) 963{ 964unsigned long offset, len; 965 966 patch->is_toplevel_relative =0; 967 patch->is_rename = patch->is_copy =0; 968 patch->is_new = patch->is_delete = -1; 969 patch->old_mode = patch->new_mode =0; 970 patch->old_name = patch->new_name = NULL; 971for(offset =0; size >0; offset += len, size -= len, line += len, linenr++) { 972unsigned long nextlen; 973 974 len =linelen(line, size); 975if(!len) 976break; 977 978/* Testing this early allows us to take a few shortcuts.. */ 979if(len <6) 980continue; 981 982/* 983 * Make sure we don't find any unconnected patch fragments. 984 * That's a sign that we didn't find a header, and that a 985 * patch has become corrupted/broken up. 986 */ 987if(!memcmp("@@ -", line,4)) { 988struct fragment dummy; 989if(parse_fragment_header(line, len, &dummy) <0) 990continue; 991die("patch fragment without header at line%d: %.*s", 992 linenr, (int)len-1, line); 993} 994 995if(size < len +6) 996break; 997 998/* 999 * Git patch? It might not have a real patch, just a rename1000 * or mode change, so we handle that specially1001 */1002if(!memcmp("diff --git ", line,11)) {1003int git_hdr_len =parse_git_header(line, len, size, patch);1004if(git_hdr_len <= len)1005continue;1006if(!patch->old_name && !patch->new_name) {1007if(!patch->def_name)1008die("git diff header lacks filename information (line%d)", linenr);1009 patch->old_name = patch->new_name = patch->def_name;1010}1011 patch->is_toplevel_relative =1;1012*hdrsize = git_hdr_len;1013return offset;1014}10151016/* --- followed by +++ ? */1017if(memcmp("--- ", line,4) ||memcmp("+++ ", line + len,4))1018continue;10191020/*1021 * We only accept unified patches, so we want it to1022 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1023 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1024 */1025 nextlen =linelen(line + len, size - len);1026if(size < nextlen +14||memcmp("@@ -", line + len + nextlen,4))1027continue;10281029/* Ok, we'll consider it a patch */1030parse_traditional_patch(line, line+len, patch);1031*hdrsize = len + nextlen;1032 linenr +=2;1033return offset;1034}1035return-1;1036}10371038static voidcheck_whitespace(const char*line,int len,unsigned ws_rule)1039{1040char*err;1041unsigned result =ws_check(line +1, len -1, ws_rule);1042if(!result)1043return;10441045 whitespace_error++;1046if(squelch_whitespace_errors &&1047 squelch_whitespace_errors < whitespace_error)1048;1049else{1050 err =whitespace_error_string(result);1051fprintf(stderr,"%s:%d:%s.\n%.*s\n",1052 patch_input_file, linenr, err, len -2, line +1);1053free(err);1054}1055}10561057/*1058 * Parse a unified diff. Note that this really needs to parse each1059 * fragment separately, since the only way to know the difference1060 * between a "---" that is part of a patch, and a "---" that starts1061 * the next patch is to look at the line counts..1062 */1063static intparse_fragment(char*line,unsigned long size,1064struct patch *patch,struct fragment *fragment)1065{1066int added, deleted;1067int len =linelen(line, size), offset;1068unsigned long oldlines, newlines;1069unsigned long leading, trailing;10701071 offset =parse_fragment_header(line, len, fragment);1072if(offset <0)1073return-1;1074if(offset >0&& patch->recount)1075recount_diff(line + offset, size - offset, fragment);1076 oldlines = fragment->oldlines;1077 newlines = fragment->newlines;1078 leading =0;1079 trailing =0;10801081/* Parse the thing.. */1082 line += len;1083 size -= len;1084 linenr++;1085 added = deleted =0;1086for(offset = len;10870< size;1088 offset += len, size -= len, line += len, linenr++) {1089if(!oldlines && !newlines)1090break;1091 len =linelen(line, size);1092if(!len || line[len-1] !='\n')1093return-1;1094switch(*line) {1095default:1096return-1;1097case'\n':/* newer GNU diff, an empty context line */1098case' ':1099 oldlines--;1100 newlines--;1101if(!deleted && !added)1102 leading++;1103 trailing++;1104break;1105case'-':1106if(apply_in_reverse &&1107 ws_error_action != nowarn_ws_error)1108check_whitespace(line, len, patch->ws_rule);1109 deleted++;1110 oldlines--;1111 trailing =0;1112break;1113case'+':1114if(!apply_in_reverse &&1115 ws_error_action != nowarn_ws_error)1116check_whitespace(line, len, patch->ws_rule);1117 added++;1118 newlines--;1119 trailing =0;1120break;11211122/*1123 * We allow "\ No newline at end of file". Depending1124 * on locale settings when the patch was produced we1125 * don't know what this line looks like. The only1126 * thing we do know is that it begins with "\ ".1127 * Checking for 12 is just for sanity check -- any1128 * l10n of "\ No newline..." is at least that long.1129 */1130case'\\':1131if(len <12||memcmp(line,"\\",2))1132return-1;1133break;1134}1135}1136if(oldlines || newlines)1137return-1;1138 fragment->leading = leading;1139 fragment->trailing = trailing;11401141/*1142 * If a fragment ends with an incomplete line, we failed to include1143 * it in the above loop because we hit oldlines == newlines == 01144 * before seeing it.1145 */1146if(12< size && !memcmp(line,"\\",2))1147 offset +=linelen(line, size);11481149 patch->lines_added += added;1150 patch->lines_deleted += deleted;11511152if(0< patch->is_new && oldlines)1153returnerror("new file depends on old contents");1154if(0< patch->is_delete && newlines)1155returnerror("deleted file still has contents");1156return offset;1157}11581159static intparse_single_patch(char*line,unsigned long size,struct patch *patch)1160{1161unsigned long offset =0;1162unsigned long oldlines =0, newlines =0, context =0;1163struct fragment **fragp = &patch->fragments;11641165while(size >4&& !memcmp(line,"@@ -",4)) {1166struct fragment *fragment;1167int len;11681169 fragment =xcalloc(1,sizeof(*fragment));1170 len =parse_fragment(line, size, patch, fragment);1171if(len <=0)1172die("corrupt patch at line%d", linenr);1173 fragment->patch = line;1174 fragment->size = len;1175 oldlines += fragment->oldlines;1176 newlines += fragment->newlines;1177 context += fragment->leading + fragment->trailing;11781179*fragp = fragment;1180 fragp = &fragment->next;11811182 offset += len;1183 line += len;1184 size -= len;1185}11861187/*1188 * If something was removed (i.e. we have old-lines) it cannot1189 * be creation, and if something was added it cannot be1190 * deletion. However, the reverse is not true; --unified=01191 * patches that only add are not necessarily creation even1192 * though they do not have any old lines, and ones that only1193 * delete are not necessarily deletion.1194 *1195 * Unfortunately, a real creation/deletion patch do _not_ have1196 * any context line by definition, so we cannot safely tell it1197 * apart with --unified=0 insanity. At least if the patch has1198 * more than one hunk it is not creation or deletion.1199 */1200if(patch->is_new <0&&1201(oldlines || (patch->fragments && patch->fragments->next)))1202 patch->is_new =0;1203if(patch->is_delete <0&&1204(newlines || (patch->fragments && patch->fragments->next)))1205 patch->is_delete =0;12061207if(0< patch->is_new && oldlines)1208die("new file%sdepends on old contents", patch->new_name);1209if(0< patch->is_delete && newlines)1210die("deleted file%sstill has contents", patch->old_name);1211if(!patch->is_delete && !newlines && context)1212fprintf(stderr,"** warning: file%sbecomes empty but "1213"is not deleted\n", patch->new_name);12141215return offset;1216}12171218staticinlineintmetadata_changes(struct patch *patch)1219{1220return patch->is_rename >0||1221 patch->is_copy >0||1222 patch->is_new >0||1223 patch->is_delete ||1224(patch->old_mode && patch->new_mode &&1225 patch->old_mode != patch->new_mode);1226}12271228static char*inflate_it(const void*data,unsigned long size,1229unsigned long inflated_size)1230{1231 z_stream stream;1232void*out;1233int st;12341235memset(&stream,0,sizeof(stream));12361237 stream.next_in = (unsigned char*)data;1238 stream.avail_in = size;1239 stream.next_out = out =xmalloc(inflated_size);1240 stream.avail_out = inflated_size;1241inflateInit(&stream);1242 st =inflate(&stream, Z_FINISH);1243if((st != Z_STREAM_END) || stream.total_out != inflated_size) {1244free(out);1245return NULL;1246}1247return out;1248}12491250static struct fragment *parse_binary_hunk(char**buf_p,1251unsigned long*sz_p,1252int*status_p,1253int*used_p)1254{1255/*1256 * Expect a line that begins with binary patch method ("literal"1257 * or "delta"), followed by the length of data before deflating.1258 * a sequence of 'length-byte' followed by base-85 encoded data1259 * should follow, terminated by a newline.1260 *1261 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1262 * and we would limit the patch line to 66 characters,1263 * so one line can fit up to 13 groups that would decode1264 * to 52 bytes max. The length byte 'A'-'Z' corresponds1265 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1266 */1267int llen, used;1268unsigned long size = *sz_p;1269char*buffer = *buf_p;1270int patch_method;1271unsigned long origlen;1272char*data = NULL;1273int hunk_size =0;1274struct fragment *frag;12751276 llen =linelen(buffer, size);1277 used = llen;12781279*status_p =0;12801281if(!prefixcmp(buffer,"delta ")) {1282 patch_method = BINARY_DELTA_DEFLATED;1283 origlen =strtoul(buffer +6, NULL,10);1284}1285else if(!prefixcmp(buffer,"literal ")) {1286 patch_method = BINARY_LITERAL_DEFLATED;1287 origlen =strtoul(buffer +8, NULL,10);1288}1289else1290return NULL;12911292 linenr++;1293 buffer += llen;1294while(1) {1295int byte_length, max_byte_length, newsize;1296 llen =linelen(buffer, size);1297 used += llen;1298 linenr++;1299if(llen ==1) {1300/* consume the blank line */1301 buffer++;1302 size--;1303break;1304}1305/*1306 * Minimum line is "A00000\n" which is 7-byte long,1307 * and the line length must be multiple of 5 plus 2.1308 */1309if((llen <7) || (llen-2) %5)1310goto corrupt;1311 max_byte_length = (llen -2) /5*4;1312 byte_length = *buffer;1313if('A'<= byte_length && byte_length <='Z')1314 byte_length = byte_length -'A'+1;1315else if('a'<= byte_length && byte_length <='z')1316 byte_length = byte_length -'a'+27;1317else1318goto corrupt;1319/* if the input length was not multiple of 4, we would1320 * have filler at the end but the filler should never1321 * exceed 3 bytes1322 */1323if(max_byte_length < byte_length ||1324 byte_length <= max_byte_length -4)1325goto corrupt;1326 newsize = hunk_size + byte_length;1327 data =xrealloc(data, newsize);1328if(decode_85(data + hunk_size, buffer +1, byte_length))1329goto corrupt;1330 hunk_size = newsize;1331 buffer += llen;1332 size -= llen;1333}13341335 frag =xcalloc(1,sizeof(*frag));1336 frag->patch =inflate_it(data, hunk_size, origlen);1337if(!frag->patch)1338goto corrupt;1339free(data);1340 frag->size = origlen;1341*buf_p = buffer;1342*sz_p = size;1343*used_p = used;1344 frag->binary_patch_method = patch_method;1345return frag;13461347 corrupt:1348free(data);1349*status_p = -1;1350error("corrupt binary patch at line%d: %.*s",1351 linenr-1, llen-1, buffer);1352return NULL;1353}13541355static intparse_binary(char*buffer,unsigned long size,struct patch *patch)1356{1357/*1358 * We have read "GIT binary patch\n"; what follows is a line1359 * that says the patch method (currently, either "literal" or1360 * "delta") and the length of data before deflating; a1361 * sequence of 'length-byte' followed by base-85 encoded data1362 * follows.1363 *1364 * When a binary patch is reversible, there is another binary1365 * hunk in the same format, starting with patch method (either1366 * "literal" or "delta") with the length of data, and a sequence1367 * of length-byte + base-85 encoded data, terminated with another1368 * empty line. This data, when applied to the postimage, produces1369 * the preimage.1370 */1371struct fragment *forward;1372struct fragment *reverse;1373int status;1374int used, used_1;13751376 forward =parse_binary_hunk(&buffer, &size, &status, &used);1377if(!forward && !status)1378/* there has to be one hunk (forward hunk) */1379returnerror("unrecognized binary patch at line%d", linenr-1);1380if(status)1381/* otherwise we already gave an error message */1382return status;13831384 reverse =parse_binary_hunk(&buffer, &size, &status, &used_1);1385if(reverse)1386 used += used_1;1387else if(status) {1388/*1389 * Not having reverse hunk is not an error, but having1390 * a corrupt reverse hunk is.1391 */1392free((void*) forward->patch);1393free(forward);1394return status;1395}1396 forward->next = reverse;1397 patch->fragments = forward;1398 patch->is_binary =1;1399return used;1400}14011402static intparse_chunk(char*buffer,unsigned long size,struct patch *patch)1403{1404int hdrsize, patchsize;1405int offset =find_header(buffer, size, &hdrsize, patch);14061407if(offset <0)1408return offset;14091410 patch->ws_rule =whitespace_rule(patch->new_name1411? patch->new_name1412: patch->old_name);14131414 patchsize =parse_single_patch(buffer + offset + hdrsize,1415 size - offset - hdrsize, patch);14161417if(!patchsize) {1418static const char*binhdr[] = {1419"Binary files ",1420"Files ",1421 NULL,1422};1423static const char git_binary[] ="GIT binary patch\n";1424int i;1425int hd = hdrsize + offset;1426unsigned long llen =linelen(buffer + hd, size - hd);14271428if(llen ==sizeof(git_binary) -1&&1429!memcmp(git_binary, buffer + hd, llen)) {1430int used;1431 linenr++;1432 used =parse_binary(buffer + hd + llen,1433 size - hd - llen, patch);1434if(used)1435 patchsize = used + llen;1436else1437 patchsize =0;1438}1439else if(!memcmp(" differ\n", buffer + hd + llen -8,8)) {1440for(i =0; binhdr[i]; i++) {1441int len =strlen(binhdr[i]);1442if(len < size - hd &&1443!memcmp(binhdr[i], buffer + hd, len)) {1444 linenr++;1445 patch->is_binary =1;1446 patchsize = llen;1447break;1448}1449}1450}14511452/* Empty patch cannot be applied if it is a text patch1453 * without metadata change. A binary patch appears1454 * empty to us here.1455 */1456if((apply || check) &&1457(!patch->is_binary && !metadata_changes(patch)))1458die("patch with only garbage at line%d", linenr);1459}14601461return offset + hdrsize + patchsize;1462}14631464#define swap(a,b) myswap((a),(b),sizeof(a))14651466#define myswap(a, b, size) do { \1467 unsigned char mytmp[size]; \1468 memcpy(mytmp, &a, size); \1469 memcpy(&a, &b, size); \1470 memcpy(&b, mytmp, size); \1471} while (0)14721473static voidreverse_patches(struct patch *p)1474{1475for(; p; p = p->next) {1476struct fragment *frag = p->fragments;14771478swap(p->new_name, p->old_name);1479swap(p->new_mode, p->old_mode);1480swap(p->is_new, p->is_delete);1481swap(p->lines_added, p->lines_deleted);1482swap(p->old_sha1_prefix, p->new_sha1_prefix);14831484for(; frag; frag = frag->next) {1485swap(frag->newpos, frag->oldpos);1486swap(frag->newlines, frag->oldlines);1487}1488}1489}14901491static const char pluses[] =1492"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";1493static const char minuses[]=1494"----------------------------------------------------------------------";14951496static voidshow_stats(struct patch *patch)1497{1498struct strbuf qname;1499char*cp = patch->new_name ? patch->new_name : patch->old_name;1500int max, add, del;15011502strbuf_init(&qname,0);1503quote_c_style(cp, &qname, NULL,0);15041505/*1506 * "scale" the filename1507 */1508 max = max_len;1509if(max >50)1510 max =50;15111512if(qname.len > max) {1513 cp =strchr(qname.buf + qname.len +3- max,'/');1514if(!cp)1515 cp = qname.buf + qname.len +3- max;1516strbuf_splice(&qname,0, cp - qname.buf,"...",3);1517}15181519if(patch->is_binary) {1520printf(" %-*s | Bin\n", max, qname.buf);1521strbuf_release(&qname);1522return;1523}15241525printf(" %-*s |", max, qname.buf);1526strbuf_release(&qname);15271528/*1529 * scale the add/delete1530 */1531 max = max + max_change >70?70- max : max_change;1532 add = patch->lines_added;1533 del = patch->lines_deleted;15341535if(max_change >0) {1536int total = ((add + del) * max + max_change /2) / max_change;1537 add = (add * max + max_change /2) / max_change;1538 del = total - add;1539}1540printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,1541 add, pluses, del, minuses);1542}15431544static intread_old_data(struct stat *st,const char*path,struct strbuf *buf)1545{1546switch(st->st_mode & S_IFMT) {1547case S_IFLNK:1548strbuf_grow(buf, st->st_size);1549if(readlink(path, buf->buf, st->st_size) != st->st_size)1550return-1;1551strbuf_setlen(buf, st->st_size);1552return0;1553case S_IFREG:1554if(strbuf_read_file(buf, path, st->st_size) != st->st_size)1555returnerror("unable to open or read%s", path);1556convert_to_git(path, buf->buf, buf->len, buf,0);1557return0;1558default:1559return-1;1560}1561}15621563static voidupdate_pre_post_images(struct image *preimage,1564struct image *postimage,1565char*buf,1566size_t len)1567{1568int i, ctx;1569char*new, *old, *fixed;1570struct image fixed_preimage;15711572/*1573 * Update the preimage with whitespace fixes. Note that we1574 * are not losing preimage->buf -- apply_one_fragment() will1575 * free "oldlines".1576 */1577prepare_image(&fixed_preimage, buf, len,1);1578assert(fixed_preimage.nr == preimage->nr);1579for(i =0; i < preimage->nr; i++)1580 fixed_preimage.line[i].flag = preimage->line[i].flag;1581free(preimage->line_allocated);1582*preimage = fixed_preimage;15831584/*1585 * Adjust the common context lines in postimage, in place.1586 * This is possible because whitespace fixing does not make1587 * the string grow.1588 */1589new= old = postimage->buf;1590 fixed = preimage->buf;1591for(i = ctx =0; i < postimage->nr; i++) {1592size_t len = postimage->line[i].len;1593if(!(postimage->line[i].flag & LINE_COMMON)) {1594/* an added line -- no counterparts in preimage */1595memmove(new, old, len);1596 old += len;1597new+= len;1598continue;1599}16001601/* a common context -- skip it in the original postimage */1602 old += len;16031604/* and find the corresponding one in the fixed preimage */1605while(ctx < preimage->nr &&1606!(preimage->line[ctx].flag & LINE_COMMON)) {1607 fixed += preimage->line[ctx].len;1608 ctx++;1609}1610if(preimage->nr <= ctx)1611die("oops");16121613/* and copy it in, while fixing the line length */1614 len = preimage->line[ctx].len;1615memcpy(new, fixed, len);1616new+= len;1617 fixed += len;1618 postimage->line[i].len = len;1619 ctx++;1620}16211622/* Fix the length of the whole thing */1623 postimage->len =new- postimage->buf;1624}16251626static intmatch_fragment(struct image *img,1627struct image *preimage,1628struct image *postimage,1629unsigned longtry,1630int try_lno,1631unsigned ws_rule,1632int match_beginning,int match_end)1633{1634int i;1635char*fixed_buf, *buf, *orig, *target;16361637if(preimage->nr + try_lno > img->nr)1638return0;16391640if(match_beginning && try_lno)1641return0;16421643if(match_end && preimage->nr + try_lno != img->nr)1644return0;16451646/* Quick hash check */1647for(i =0; i < preimage->nr; i++)1648if(preimage->line[i].hash != img->line[try_lno + i].hash)1649return0;16501651/*1652 * Do we have an exact match? If we were told to match1653 * at the end, size must be exactly at try+fragsize,1654 * otherwise try+fragsize must be still within the preimage,1655 * and either case, the old piece should match the preimage1656 * exactly.1657 */1658if((match_end1659? (try+ preimage->len == img->len)1660: (try+ preimage->len <= img->len)) &&1661!memcmp(img->buf +try, preimage->buf, preimage->len))1662return1;16631664if(ws_error_action != correct_ws_error)1665return0;16661667/*1668 * The hunk does not apply byte-by-byte, but the hash says1669 * it might with whitespace fuzz.1670 */1671 fixed_buf =xmalloc(preimage->len +1);1672 buf = fixed_buf;1673 orig = preimage->buf;1674 target = img->buf +try;1675for(i =0; i < preimage->nr; i++) {1676size_t fixlen;/* length after fixing the preimage */1677size_t oldlen = preimage->line[i].len;1678size_t tgtlen = img->line[try_lno + i].len;1679size_t tgtfixlen;/* length after fixing the target line */1680char tgtfixbuf[1024], *tgtfix;1681int match;16821683/* Try fixing the line in the preimage */1684 fixlen =ws_fix_copy(buf, orig, oldlen, ws_rule, NULL);16851686/* Try fixing the line in the target */1687if(sizeof(tgtfixbuf) < tgtlen)1688 tgtfix = tgtfixbuf;1689else1690 tgtfix =xmalloc(tgtlen);1691 tgtfixlen =ws_fix_copy(tgtfix, target, tgtlen, ws_rule, NULL);16921693/*1694 * If they match, either the preimage was based on1695 * a version before our tree fixed whitespace breakage,1696 * or we are lacking a whitespace-fix patch the tree1697 * the preimage was based on already had (i.e. target1698 * has whitespace breakage, the preimage doesn't).1699 * In either case, we are fixing the whitespace breakages1700 * so we might as well take the fix together with their1701 * real change.1702 */1703 match = (tgtfixlen == fixlen && !memcmp(tgtfix, buf, fixlen));17041705if(tgtfix != tgtfixbuf)1706free(tgtfix);1707if(!match)1708goto unmatch_exit;17091710 orig += oldlen;1711 buf += fixlen;1712 target += tgtlen;1713}17141715/*1716 * Yes, the preimage is based on an older version that still1717 * has whitespace breakages unfixed, and fixing them makes the1718 * hunk match. Update the context lines in the postimage.1719 */1720update_pre_post_images(preimage, postimage,1721 fixed_buf, buf - fixed_buf);1722return1;17231724 unmatch_exit:1725free(fixed_buf);1726return0;1727}17281729static intfind_pos(struct image *img,1730struct image *preimage,1731struct image *postimage,1732int line,1733unsigned ws_rule,1734int match_beginning,int match_end)1735{1736int i;1737unsigned long backwards, forwards,try;1738int backwards_lno, forwards_lno, try_lno;17391740if(preimage->nr > img->nr)1741return-1;17421743/*1744 * If match_begining or match_end is specified, there is no1745 * point starting from a wrong line that will never match and1746 * wander around and wait for a match at the specified end.1747 */1748if(match_beginning)1749 line =0;1750else if(match_end)1751 line = img->nr - preimage->nr;17521753if(line > img->nr)1754 line = img->nr;17551756try=0;1757for(i =0; i < line; i++)1758try+= img->line[i].len;17591760/*1761 * There's probably some smart way to do this, but I'll leave1762 * that to the smart and beautiful people. I'm simple and stupid.1763 */1764 backwards =try;1765 backwards_lno = line;1766 forwards =try;1767 forwards_lno = line;1768 try_lno = line;17691770for(i =0; ; i++) {1771if(match_fragment(img, preimage, postimage,1772try, try_lno, ws_rule,1773 match_beginning, match_end))1774return try_lno;17751776 again:1777if(backwards_lno ==0&& forwards_lno == img->nr)1778break;17791780if(i &1) {1781if(backwards_lno ==0) {1782 i++;1783goto again;1784}1785 backwards_lno--;1786 backwards -= img->line[backwards_lno].len;1787try= backwards;1788 try_lno = backwards_lno;1789}else{1790if(forwards_lno == img->nr) {1791 i++;1792goto again;1793}1794 forwards += img->line[forwards_lno].len;1795 forwards_lno++;1796try= forwards;1797 try_lno = forwards_lno;1798}17991800}1801return-1;1802}18031804static voidremove_first_line(struct image *img)1805{1806 img->buf += img->line[0].len;1807 img->len -= img->line[0].len;1808 img->line++;1809 img->nr--;1810}18111812static voidremove_last_line(struct image *img)1813{1814 img->len -= img->line[--img->nr].len;1815}18161817static voidupdate_image(struct image *img,1818int applied_pos,1819struct image *preimage,1820struct image *postimage)1821{1822/*1823 * remove the copy of preimage at offset in img1824 * and replace it with postimage1825 */1826int i, nr;1827size_t remove_count, insert_count, applied_at =0;1828char*result;18291830for(i =0; i < applied_pos; i++)1831 applied_at += img->line[i].len;18321833 remove_count =0;1834for(i =0; i < preimage->nr; i++)1835 remove_count += img->line[applied_pos + i].len;1836 insert_count = postimage->len;18371838/* Adjust the contents */1839 result =xmalloc(img->len + insert_count - remove_count +1);1840memcpy(result, img->buf, applied_at);1841memcpy(result + applied_at, postimage->buf, postimage->len);1842memcpy(result + applied_at + postimage->len,1843 img->buf + (applied_at + remove_count),1844 img->len - (applied_at + remove_count));1845free(img->buf);1846 img->buf = result;1847 img->len += insert_count - remove_count;1848 result[img->len] ='\0';18491850/* Adjust the line table */1851 nr = img->nr + postimage->nr - preimage->nr;1852if(preimage->nr < postimage->nr) {1853/*1854 * NOTE: this knows that we never call remove_first_line()1855 * on anything other than pre/post image.1856 */1857 img->line =xrealloc(img->line, nr *sizeof(*img->line));1858 img->line_allocated = img->line;1859}1860if(preimage->nr != postimage->nr)1861memmove(img->line + applied_pos + postimage->nr,1862 img->line + applied_pos + preimage->nr,1863(img->nr - (applied_pos + preimage->nr)) *1864sizeof(*img->line));1865memcpy(img->line + applied_pos,1866 postimage->line,1867 postimage->nr *sizeof(*img->line));1868 img->nr = nr;1869}18701871static intapply_one_fragment(struct image *img,struct fragment *frag,1872int inaccurate_eof,unsigned ws_rule)1873{1874int match_beginning, match_end;1875const char*patch = frag->patch;1876int size = frag->size;1877char*old, *new, *oldlines, *newlines;1878int new_blank_lines_at_end =0;1879unsigned long leading, trailing;1880int pos, applied_pos;1881struct image preimage;1882struct image postimage;18831884memset(&preimage,0,sizeof(preimage));1885memset(&postimage,0,sizeof(postimage));1886 oldlines =xmalloc(size);1887 newlines =xmalloc(size);18881889 old = oldlines;1890new= newlines;1891while(size >0) {1892char first;1893int len =linelen(patch, size);1894int plen, added;1895int added_blank_line =0;18961897if(!len)1898break;18991900/*1901 * "plen" is how much of the line we should use for1902 * the actual patch data. Normally we just remove the1903 * first character on the line, but if the line is1904 * followed by "\ No newline", then we also remove the1905 * last one (which is the newline, of course).1906 */1907 plen = len -1;1908if(len < size && patch[len] =='\\')1909 plen--;1910 first = *patch;1911if(apply_in_reverse) {1912if(first =='-')1913 first ='+';1914else if(first =='+')1915 first ='-';1916}19171918switch(first) {1919case'\n':1920/* Newer GNU diff, empty context line */1921if(plen <0)1922/* ... followed by '\No newline'; nothing */1923break;1924*old++ ='\n';1925*new++ ='\n';1926add_line_info(&preimage,"\n",1, LINE_COMMON);1927add_line_info(&postimage,"\n",1, LINE_COMMON);1928break;1929case' ':1930case'-':1931memcpy(old, patch +1, plen);1932add_line_info(&preimage, old, plen,1933(first ==' '? LINE_COMMON :0));1934 old += plen;1935if(first =='-')1936break;1937/* Fall-through for ' ' */1938case'+':1939/* --no-add does not add new lines */1940if(first =='+'&& no_add)1941break;19421943if(first !='+'||1944!whitespace_error ||1945 ws_error_action != correct_ws_error) {1946memcpy(new, patch +1, plen);1947 added = plen;1948}1949else{1950 added =ws_fix_copy(new, patch +1, plen, ws_rule, &applied_after_fixing_ws);1951}1952add_line_info(&postimage,new, added,1953(first =='+'?0: LINE_COMMON));1954new+= added;1955if(first =='+'&&1956 added ==1&&new[-1] =='\n')1957 added_blank_line =1;1958break;1959case'@':case'\\':1960/* Ignore it, we already handled it */1961break;1962default:1963if(apply_verbosely)1964error("invalid start of line: '%c'", first);1965return-1;1966}1967if(added_blank_line)1968 new_blank_lines_at_end++;1969else1970 new_blank_lines_at_end =0;1971 patch += len;1972 size -= len;1973}1974if(inaccurate_eof &&1975 old > oldlines && old[-1] =='\n'&&1976new> newlines &&new[-1] =='\n') {1977 old--;1978new--;1979}19801981 leading = frag->leading;1982 trailing = frag->trailing;19831984/*1985 * A hunk to change lines at the beginning would begin with1986 * @@ -1,L +N,M @@1987 *1988 * And a hunk to add to an empty file would begin with1989 * @@ -0,0 +N,M @@1990 *1991 * In other words, a hunk that is (frag->oldpos <= 1) with or1992 * without leading context must match at the beginning.1993 */1994 match_beginning = frag->oldpos <=1;19951996/*1997 * A hunk without trailing lines must match at the end.1998 * However, we simply cannot tell if a hunk must match end1999 * from the lack of trailing lines if the patch was generated2000 * with unidiff without any context.2001 */2002 match_end = !unidiff_zero && !trailing;20032004 pos = frag->newpos ? (frag->newpos -1) :0;2005 preimage.buf = oldlines;2006 preimage.len = old - oldlines;2007 postimage.buf = newlines;2008 postimage.len =new- newlines;2009 preimage.line = preimage.line_allocated;2010 postimage.line = postimage.line_allocated;20112012for(;;) {20132014 applied_pos =find_pos(img, &preimage, &postimage, pos,2015 ws_rule, match_beginning, match_end);20162017if(applied_pos >=0)2018break;20192020/* Am I at my context limits? */2021if((leading <= p_context) && (trailing <= p_context))2022break;2023if(match_beginning || match_end) {2024 match_beginning = match_end =0;2025continue;2026}20272028/*2029 * Reduce the number of context lines; reduce both2030 * leading and trailing if they are equal otherwise2031 * just reduce the larger context.2032 */2033if(leading >= trailing) {2034remove_first_line(&preimage);2035remove_first_line(&postimage);2036 pos--;2037 leading--;2038}2039if(trailing > leading) {2040remove_last_line(&preimage);2041remove_last_line(&postimage);2042 trailing--;2043}2044}20452046if(applied_pos >=0) {2047if(ws_error_action == correct_ws_error &&2048 new_blank_lines_at_end &&2049 postimage.nr + applied_pos == img->nr) {2050/*2051 * If the patch application adds blank lines2052 * at the end, and if the patch applies at the2053 * end of the image, remove those added blank2054 * lines.2055 */2056while(new_blank_lines_at_end--)2057remove_last_line(&postimage);2058}20592060/*2061 * Warn if it was necessary to reduce the number2062 * of context lines.2063 */2064if((leading != frag->leading) ||2065(trailing != frag->trailing))2066fprintf(stderr,"Context reduced to (%ld/%ld)"2067" to apply fragment at%d\n",2068 leading, trailing, applied_pos+1);2069update_image(img, applied_pos, &preimage, &postimage);2070}else{2071if(apply_verbosely)2072error("while searching for:\n%.*s",2073(int)(old - oldlines), oldlines);2074}20752076free(oldlines);2077free(newlines);2078free(preimage.line_allocated);2079free(postimage.line_allocated);20802081return(applied_pos <0);2082}20832084static intapply_binary_fragment(struct image *img,struct patch *patch)2085{2086struct fragment *fragment = patch->fragments;2087unsigned long len;2088void*dst;20892090/* Binary patch is irreversible without the optional second hunk */2091if(apply_in_reverse) {2092if(!fragment->next)2093returnerror("cannot reverse-apply a binary patch "2094"without the reverse hunk to '%s'",2095 patch->new_name2096? patch->new_name : patch->old_name);2097 fragment = fragment->next;2098}2099switch(fragment->binary_patch_method) {2100case BINARY_DELTA_DEFLATED:2101 dst =patch_delta(img->buf, img->len, fragment->patch,2102 fragment->size, &len);2103if(!dst)2104return-1;2105clear_image(img);2106 img->buf = dst;2107 img->len = len;2108return0;2109case BINARY_LITERAL_DEFLATED:2110clear_image(img);2111 img->len = fragment->size;2112 img->buf =xmalloc(img->len+1);2113memcpy(img->buf, fragment->patch, img->len);2114 img->buf[img->len] ='\0';2115return0;2116}2117return-1;2118}21192120static intapply_binary(struct image *img,struct patch *patch)2121{2122const char*name = patch->old_name ? patch->old_name : patch->new_name;2123unsigned char sha1[20];21242125/*2126 * For safety, we require patch index line to contain2127 * full 40-byte textual SHA1 for old and new, at least for now.2128 */2129if(strlen(patch->old_sha1_prefix) !=40||2130strlen(patch->new_sha1_prefix) !=40||2131get_sha1_hex(patch->old_sha1_prefix, sha1) ||2132get_sha1_hex(patch->new_sha1_prefix, sha1))2133returnerror("cannot apply binary patch to '%s' "2134"without full index line", name);21352136if(patch->old_name) {2137/*2138 * See if the old one matches what the patch2139 * applies to.2140 */2141hash_sha1_file(img->buf, img->len, blob_type, sha1);2142if(strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2143returnerror("the patch applies to '%s' (%s), "2144"which does not match the "2145"current contents.",2146 name,sha1_to_hex(sha1));2147}2148else{2149/* Otherwise, the old one must be empty. */2150if(img->len)2151returnerror("the patch applies to an empty "2152"'%s' but it is not empty", name);2153}21542155get_sha1_hex(patch->new_sha1_prefix, sha1);2156if(is_null_sha1(sha1)) {2157clear_image(img);2158return0;/* deletion patch */2159}21602161if(has_sha1_file(sha1)) {2162/* We already have the postimage */2163enum object_type type;2164unsigned long size;2165char*result;21662167 result =read_sha1_file(sha1, &type, &size);2168if(!result)2169returnerror("the necessary postimage%sfor "2170"'%s' cannot be read",2171 patch->new_sha1_prefix, name);2172clear_image(img);2173 img->buf = result;2174 img->len = size;2175}else{2176/*2177 * We have verified buf matches the preimage;2178 * apply the patch data to it, which is stored2179 * in the patch->fragments->{patch,size}.2180 */2181if(apply_binary_fragment(img, patch))2182returnerror("binary patch does not apply to '%s'",2183 name);21842185/* verify that the result matches */2186hash_sha1_file(img->buf, img->len, blob_type, sha1);2187if(strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))2188returnerror("binary patch to '%s' creates incorrect result (expecting%s, got%s)",2189 name, patch->new_sha1_prefix,sha1_to_hex(sha1));2190}21912192return0;2193}21942195static intapply_fragments(struct image *img,struct patch *patch)2196{2197struct fragment *frag = patch->fragments;2198const char*name = patch->old_name ? patch->old_name : patch->new_name;2199unsigned ws_rule = patch->ws_rule;2200unsigned inaccurate_eof = patch->inaccurate_eof;22012202if(patch->is_binary)2203returnapply_binary(img, patch);22042205while(frag) {2206if(apply_one_fragment(img, frag, inaccurate_eof, ws_rule)) {2207error("patch failed:%s:%ld", name, frag->oldpos);2208if(!apply_with_reject)2209return-1;2210 frag->rejected =1;2211}2212 frag = frag->next;2213}2214return0;2215}22162217static intread_file_or_gitlink(struct cache_entry *ce,struct strbuf *buf)2218{2219if(!ce)2220return0;22212222if(S_ISGITLINK(ce->ce_mode)) {2223strbuf_grow(buf,100);2224strbuf_addf(buf,"Subproject commit%s\n",sha1_to_hex(ce->sha1));2225}else{2226enum object_type type;2227unsigned long sz;2228char*result;22292230 result =read_sha1_file(ce->sha1, &type, &sz);2231if(!result)2232return-1;2233/* XXX read_sha1_file NUL-terminates */2234strbuf_attach(buf, result, sz, sz +1);2235}2236return0;2237}22382239static struct patch *in_fn_table(const char*name)2240{2241struct path_list_item *item;22422243if(name == NULL)2244return NULL;22452246 item =path_list_lookup(name, &fn_table);2247if(item != NULL)2248return(struct patch *)item->util;22492250return NULL;2251}22522253static voidadd_to_fn_table(struct patch *patch)2254{2255struct path_list_item *item;22562257/*2258 * Always add new_name unless patch is a deletion2259 * This should cover the cases for normal diffs,2260 * file creations and copies2261 */2262if(patch->new_name != NULL) {2263 item =path_list_insert(patch->new_name, &fn_table);2264 item->util = patch;2265}22662267/*2268 * store a failure on rename/deletion cases because2269 * later chunks shouldn't patch old names2270 */2271if((patch->new_name == NULL) || (patch->is_rename)) {2272 item =path_list_insert(patch->old_name, &fn_table);2273 item->util = (struct patch *) -1;2274}2275}22762277static intapply_data(struct patch *patch,struct stat *st,struct cache_entry *ce)2278{2279struct strbuf buf;2280struct image image;2281size_t len;2282char*img;2283struct patch *tpatch;22842285strbuf_init(&buf,0);22862287if((tpatch =in_fn_table(patch->old_name)) != NULL) {2288if(tpatch == (struct patch *) -1) {2289returnerror("patch%shas been renamed/deleted",2290 patch->old_name);2291}2292/* We have a patched copy in memory use that */2293strbuf_add(&buf, tpatch->result, tpatch->resultsize);2294}else if(cached) {2295if(read_file_or_gitlink(ce, &buf))2296returnerror("read of%sfailed", patch->old_name);2297}else if(patch->old_name) {2298if(S_ISGITLINK(patch->old_mode)) {2299if(ce) {2300read_file_or_gitlink(ce, &buf);2301}else{2302/*2303 * There is no way to apply subproject2304 * patch without looking at the index.2305 */2306 patch->fragments = NULL;2307}2308}else{2309if(read_old_data(st, patch->old_name, &buf))2310returnerror("read of%sfailed", patch->old_name);2311}2312}23132314 img =strbuf_detach(&buf, &len);2315prepare_image(&image, img, len, !patch->is_binary);23162317if(apply_fragments(&image, patch) <0)2318return-1;/* note with --reject this succeeds. */2319 patch->result = image.buf;2320 patch->resultsize = image.len;2321add_to_fn_table(patch);2322free(image.line_allocated);23232324if(0< patch->is_delete && patch->resultsize)2325returnerror("removal patch leaves file contents");23262327return0;2328}23292330static intcheck_to_create_blob(const char*new_name,int ok_if_exists)2331{2332struct stat nst;2333if(!lstat(new_name, &nst)) {2334if(S_ISDIR(nst.st_mode) || ok_if_exists)2335return0;2336/*2337 * A leading component of new_name might be a symlink2338 * that is going to be removed with this patch, but2339 * still pointing at somewhere that has the path.2340 * In such a case, path "new_name" does not exist as2341 * far as git is concerned.2342 */2343if(has_symlink_leading_path(strlen(new_name), new_name))2344return0;23452346returnerror("%s: already exists in working directory", new_name);2347}2348else if((errno != ENOENT) && (errno != ENOTDIR))2349returnerror("%s:%s", new_name,strerror(errno));2350return0;2351}23522353static intverify_index_match(struct cache_entry *ce,struct stat *st)2354{2355if(S_ISGITLINK(ce->ce_mode)) {2356if(!S_ISDIR(st->st_mode))2357return-1;2358return0;2359}2360returnce_match_stat(ce, st, CE_MATCH_IGNORE_VALID);2361}23622363static intcheck_preimage(struct patch *patch,struct cache_entry **ce,struct stat *st)2364{2365const char*old_name = patch->old_name;2366struct patch *tpatch;2367int stat_ret =0;2368unsigned st_mode =0;23692370/*2371 * Make sure that we do not have local modifications from the2372 * index when we are looking at the index. Also make sure2373 * we have the preimage file to be patched in the work tree,2374 * unless --cached, which tells git to apply only in the index.2375 */2376if(!old_name)2377return0;23782379assert(patch->is_new <=0);2380if((tpatch =in_fn_table(old_name)) != NULL) {2381if(tpatch == (struct patch *) -1) {2382returnerror("%s: has been deleted/renamed", old_name);2383}2384 st_mode = tpatch->new_mode;2385}else if(!cached) {2386 stat_ret =lstat(old_name, st);2387if(stat_ret && errno != ENOENT)2388returnerror("%s:%s", old_name,strerror(errno));2389}2390if(check_index && !tpatch) {2391int pos =cache_name_pos(old_name,strlen(old_name));2392if(pos <0) {2393if(patch->is_new <0)2394goto is_new;2395returnerror("%s: does not exist in index", old_name);2396}2397*ce = active_cache[pos];2398if(stat_ret <0) {2399struct checkout costate;2400/* checkout */2401 costate.base_dir ="";2402 costate.base_dir_len =0;2403 costate.force =0;2404 costate.quiet =0;2405 costate.not_new =0;2406 costate.refresh_cache =1;2407if(checkout_entry(*ce, &costate, NULL) ||2408lstat(old_name, st))2409return-1;2410}2411if(!cached &&verify_index_match(*ce, st))2412returnerror("%s: does not match index", old_name);2413if(cached)2414 st_mode = (*ce)->ce_mode;2415}else if(stat_ret <0) {2416if(patch->is_new <0)2417goto is_new;2418returnerror("%s:%s", old_name,strerror(errno));2419}24202421if(!cached)2422 st_mode =ce_mode_from_stat(*ce, st->st_mode);24232424if(patch->is_new <0)2425 patch->is_new =0;2426if(!patch->old_mode)2427 patch->old_mode = st_mode;2428if((st_mode ^ patch->old_mode) & S_IFMT)2429returnerror("%s: wrong type", old_name);2430if(st_mode != patch->old_mode)2431fprintf(stderr,"warning:%shas type%o, expected%o\n",2432 old_name, st_mode, patch->old_mode);2433return0;24342435 is_new:2436 patch->is_new =1;2437 patch->is_delete =0;2438 patch->old_name = NULL;2439return0;2440}24412442static intcheck_patch(struct patch *patch)2443{2444struct stat st;2445const char*old_name = patch->old_name;2446const char*new_name = patch->new_name;2447const char*name = old_name ? old_name : new_name;2448struct cache_entry *ce = NULL;2449int ok_if_exists;2450int status;24512452 patch->rejected =1;/* we will drop this after we succeed */24532454 status =check_preimage(patch, &ce, &st);2455if(status)2456return status;2457 old_name = patch->old_name;24582459if(in_fn_table(new_name) == (struct patch *) -1)2460/*2461 * A type-change diff is always split into a patch to2462 * delete old, immediately followed by a patch to2463 * create new (see diff.c::run_diff()); in such a case2464 * it is Ok that the entry to be deleted by the2465 * previous patch is still in the working tree and in2466 * the index.2467 */2468 ok_if_exists =1;2469else2470 ok_if_exists =0;24712472if(new_name &&2473((0< patch->is_new) | (0< patch->is_rename) | patch->is_copy)) {2474if(check_index &&2475cache_name_pos(new_name,strlen(new_name)) >=0&&2476!ok_if_exists)2477returnerror("%s: already exists in index", new_name);2478if(!cached) {2479int err =check_to_create_blob(new_name, ok_if_exists);2480if(err)2481return err;2482}2483if(!patch->new_mode) {2484if(0< patch->is_new)2485 patch->new_mode = S_IFREG |0644;2486else2487 patch->new_mode = patch->old_mode;2488}2489}24902491if(new_name && old_name) {2492int same = !strcmp(old_name, new_name);2493if(!patch->new_mode)2494 patch->new_mode = patch->old_mode;2495if((patch->old_mode ^ patch->new_mode) & S_IFMT)2496returnerror("new mode (%o) of%sdoes not match old mode (%o)%s%s",2497 patch->new_mode, new_name, patch->old_mode,2498 same ?"":" of ", same ?"": old_name);2499}25002501if(apply_data(patch, &st, ce) <0)2502returnerror("%s: patch does not apply", name);2503 patch->rejected =0;2504return0;2505}25062507static intcheck_patch_list(struct patch *patch)2508{2509int err =0;25102511while(patch) {2512if(apply_verbosely)2513say_patch_name(stderr,2514"Checking patch ", patch,"...\n");2515 err |=check_patch(patch);2516 patch = patch->next;2517}2518return err;2519}25202521/* This function tries to read the sha1 from the current index */2522static intget_current_sha1(const char*path,unsigned char*sha1)2523{2524int pos;25252526if(read_cache() <0)2527return-1;2528 pos =cache_name_pos(path,strlen(path));2529if(pos <0)2530return-1;2531hashcpy(sha1, active_cache[pos]->sha1);2532return0;2533}25342535/* Build an index that contains the just the files needed for a 3way merge */2536static voidbuild_fake_ancestor(struct patch *list,const char*filename)2537{2538struct patch *patch;2539struct index_state result = {0};2540int fd;25412542/* Once we start supporting the reverse patch, it may be2543 * worth showing the new sha1 prefix, but until then...2544 */2545for(patch = list; patch; patch = patch->next) {2546const unsigned char*sha1_ptr;2547unsigned char sha1[20];2548struct cache_entry *ce;2549const char*name;25502551 name = patch->old_name ? patch->old_name : patch->new_name;2552if(0< patch->is_new)2553continue;2554else if(get_sha1(patch->old_sha1_prefix, sha1))2555/* git diff has no index line for mode/type changes */2556if(!patch->lines_added && !patch->lines_deleted) {2557if(get_current_sha1(patch->new_name, sha1) ||2558get_current_sha1(patch->old_name, sha1))2559die("mode change for%s, which is not "2560"in current HEAD", name);2561 sha1_ptr = sha1;2562}else2563die("sha1 information is lacking or useless "2564"(%s).", name);2565else2566 sha1_ptr = sha1;25672568 ce =make_cache_entry(patch->old_mode, sha1_ptr, name,0,0);2569if(add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))2570die("Could not add%sto temporary index", name);2571}25722573 fd =open(filename, O_WRONLY | O_CREAT,0666);2574if(fd <0||write_index(&result, fd) ||close(fd))2575die("Could not write temporary index to%s", filename);25762577discard_index(&result);2578}25792580static voidstat_patch_list(struct patch *patch)2581{2582int files, adds, dels;25832584for(files = adds = dels =0; patch ; patch = patch->next) {2585 files++;2586 adds += patch->lines_added;2587 dels += patch->lines_deleted;2588show_stats(patch);2589}25902591printf("%dfiles changed,%dinsertions(+),%ddeletions(-)\n", files, adds, dels);2592}25932594static voidnumstat_patch_list(struct patch *patch)2595{2596for( ; patch; patch = patch->next) {2597const char*name;2598 name = patch->new_name ? patch->new_name : patch->old_name;2599if(patch->is_binary)2600printf("-\t-\t");2601else2602printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);2603write_name_quoted(name, stdout, line_termination);2604}2605}26062607static voidshow_file_mode_name(const char*newdelete,unsigned int mode,const char*name)2608{2609if(mode)2610printf("%smode%06o%s\n", newdelete, mode, name);2611else2612printf("%s %s\n", newdelete, name);2613}26142615static voidshow_mode_change(struct patch *p,int show_name)2616{2617if(p->old_mode && p->new_mode && p->old_mode != p->new_mode) {2618if(show_name)2619printf(" mode change%06o =>%06o%s\n",2620 p->old_mode, p->new_mode, p->new_name);2621else2622printf(" mode change%06o =>%06o\n",2623 p->old_mode, p->new_mode);2624}2625}26262627static voidshow_rename_copy(struct patch *p)2628{2629const char*renamecopy = p->is_rename ?"rename":"copy";2630const char*old, *new;26312632/* Find common prefix */2633 old = p->old_name;2634new= p->new_name;2635while(1) {2636const char*slash_old, *slash_new;2637 slash_old =strchr(old,'/');2638 slash_new =strchr(new,'/');2639if(!slash_old ||2640!slash_new ||2641 slash_old - old != slash_new -new||2642memcmp(old,new, slash_new -new))2643break;2644 old = slash_old +1;2645new= slash_new +1;2646}2647/* p->old_name thru old is the common prefix, and old and new2648 * through the end of names are renames2649 */2650if(old != p->old_name)2651printf("%s%.*s{%s=>%s} (%d%%)\n", renamecopy,2652(int)(old - p->old_name), p->old_name,2653 old,new, p->score);2654else2655printf("%s %s=>%s(%d%%)\n", renamecopy,2656 p->old_name, p->new_name, p->score);2657show_mode_change(p,0);2658}26592660static voidsummary_patch_list(struct patch *patch)2661{2662struct patch *p;26632664for(p = patch; p; p = p->next) {2665if(p->is_new)2666show_file_mode_name("create", p->new_mode, p->new_name);2667else if(p->is_delete)2668show_file_mode_name("delete", p->old_mode, p->old_name);2669else{2670if(p->is_rename || p->is_copy)2671show_rename_copy(p);2672else{2673if(p->score) {2674printf(" rewrite%s(%d%%)\n",2675 p->new_name, p->score);2676show_mode_change(p,0);2677}2678else2679show_mode_change(p,1);2680}2681}2682}2683}26842685static voidpatch_stats(struct patch *patch)2686{2687int lines = patch->lines_added + patch->lines_deleted;26882689if(lines > max_change)2690 max_change = lines;2691if(patch->old_name) {2692int len =quote_c_style(patch->old_name, NULL, NULL,0);2693if(!len)2694 len =strlen(patch->old_name);2695if(len > max_len)2696 max_len = len;2697}2698if(patch->new_name) {2699int len =quote_c_style(patch->new_name, NULL, NULL,0);2700if(!len)2701 len =strlen(patch->new_name);2702if(len > max_len)2703 max_len = len;2704}2705}27062707static voidremove_file(struct patch *patch,int rmdir_empty)2708{2709if(update_index) {2710if(remove_file_from_cache(patch->old_name) <0)2711die("unable to remove%sfrom index", patch->old_name);2712}2713if(!cached) {2714if(S_ISGITLINK(patch->old_mode)) {2715if(rmdir(patch->old_name))2716warning("unable to remove submodule%s",2717 patch->old_name);2718}else if(!unlink(patch->old_name) && rmdir_empty) {2719char*name =xstrdup(patch->old_name);2720char*end =strrchr(name,'/');2721while(end) {2722*end =0;2723if(rmdir(name))2724break;2725 end =strrchr(name,'/');2726}2727free(name);2728}2729}2730}27312732static voidadd_index_file(const char*path,unsigned mode,void*buf,unsigned long size)2733{2734struct stat st;2735struct cache_entry *ce;2736int namelen =strlen(path);2737unsigned ce_size =cache_entry_size(namelen);27382739if(!update_index)2740return;27412742 ce =xcalloc(1, ce_size);2743memcpy(ce->name, path, namelen);2744 ce->ce_mode =create_ce_mode(mode);2745 ce->ce_flags = namelen;2746if(S_ISGITLINK(mode)) {2747const char*s = buf;27482749if(get_sha1_hex(s +strlen("Subproject commit "), ce->sha1))2750die("corrupt patch for subproject%s", path);2751}else{2752if(!cached) {2753if(lstat(path, &st) <0)2754die("unable to stat newly created file%s",2755 path);2756fill_stat_cache_info(ce, &st);2757}2758if(write_sha1_file(buf, size, blob_type, ce->sha1) <0)2759die("unable to create backing store for newly created file%s", path);2760}2761if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)2762die("unable to add cache entry for%s", path);2763}27642765static inttry_create_file(const char*path,unsigned int mode,const char*buf,unsigned long size)2766{2767int fd;2768struct strbuf nbuf;27692770if(S_ISGITLINK(mode)) {2771struct stat st;2772if(!lstat(path, &st) &&S_ISDIR(st.st_mode))2773return0;2774returnmkdir(path,0777);2775}27762777if(has_symlinks &&S_ISLNK(mode))2778/* Although buf:size is counted string, it also is NUL2779 * terminated.2780 */2781returnsymlink(buf, path);27822783 fd =open(path, O_CREAT | O_EXCL | O_WRONLY, (mode &0100) ?0777:0666);2784if(fd <0)2785return-1;27862787strbuf_init(&nbuf,0);2788if(convert_to_working_tree(path, buf, size, &nbuf)) {2789 size = nbuf.len;2790 buf = nbuf.buf;2791}2792write_or_die(fd, buf, size);2793strbuf_release(&nbuf);27942795if(close(fd) <0)2796die("closing file%s:%s", path,strerror(errno));2797return0;2798}27992800/*2801 * We optimistically assume that the directories exist,2802 * which is true 99% of the time anyway. If they don't,2803 * we create them and try again.2804 */2805static voidcreate_one_file(char*path,unsigned mode,const char*buf,unsigned long size)2806{2807if(cached)2808return;2809if(!try_create_file(path, mode, buf, size))2810return;28112812if(errno == ENOENT) {2813if(safe_create_leading_directories(path))2814return;2815if(!try_create_file(path, mode, buf, size))2816return;2817}28182819if(errno == EEXIST || errno == EACCES) {2820/* We may be trying to create a file where a directory2821 * used to be.2822 */2823struct stat st;2824if(!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))2825 errno = EEXIST;2826}28272828if(errno == EEXIST) {2829unsigned int nr =getpid();28302831for(;;) {2832const char*newpath;2833 newpath =mkpath("%s~%u", path, nr);2834if(!try_create_file(newpath, mode, buf, size)) {2835if(!rename(newpath, path))2836return;2837unlink(newpath);2838break;2839}2840if(errno != EEXIST)2841break;2842++nr;2843}2844}2845die("unable to write file%smode%o", path, mode);2846}28472848static voidcreate_file(struct patch *patch)2849{2850char*path = patch->new_name;2851unsigned mode = patch->new_mode;2852unsigned long size = patch->resultsize;2853char*buf = patch->result;28542855if(!mode)2856 mode = S_IFREG |0644;2857create_one_file(path, mode, buf, size);2858add_index_file(path, mode, buf, size);2859}28602861/* phase zero is to remove, phase one is to create */2862static voidwrite_out_one_result(struct patch *patch,int phase)2863{2864if(patch->is_delete >0) {2865if(phase ==0)2866remove_file(patch,1);2867return;2868}2869if(patch->is_new >0|| patch->is_copy) {2870if(phase ==1)2871create_file(patch);2872return;2873}2874/*2875 * Rename or modification boils down to the same2876 * thing: remove the old, write the new2877 */2878if(phase ==0)2879remove_file(patch, patch->is_rename);2880if(phase ==1)2881create_file(patch);2882}28832884static intwrite_out_one_reject(struct patch *patch)2885{2886FILE*rej;2887char namebuf[PATH_MAX];2888struct fragment *frag;2889int cnt =0;28902891for(cnt =0, frag = patch->fragments; frag; frag = frag->next) {2892if(!frag->rejected)2893continue;2894 cnt++;2895}28962897if(!cnt) {2898if(apply_verbosely)2899say_patch_name(stderr,2900"Applied patch ", patch," cleanly.\n");2901return0;2902}29032904/* This should not happen, because a removal patch that leaves2905 * contents are marked "rejected" at the patch level.2906 */2907if(!patch->new_name)2908die("internal error");29092910/* Say this even without --verbose */2911say_patch_name(stderr,"Applying patch ", patch," with");2912fprintf(stderr,"%drejects...\n", cnt);29132914 cnt =strlen(patch->new_name);2915if(ARRAY_SIZE(namebuf) <= cnt +5) {2916 cnt =ARRAY_SIZE(namebuf) -5;2917fprintf(stderr,2918"warning: truncating .rej filename to %.*s.rej",2919 cnt -1, patch->new_name);2920}2921memcpy(namebuf, patch->new_name, cnt);2922memcpy(namebuf + cnt,".rej",5);29232924 rej =fopen(namebuf,"w");2925if(!rej)2926returnerror("cannot open%s:%s", namebuf,strerror(errno));29272928/* Normal git tools never deal with .rej, so do not pretend2929 * this is a git patch by saying --git nor give extended2930 * headers. While at it, maybe please "kompare" that wants2931 * the trailing TAB and some garbage at the end of line ;-).2932 */2933fprintf(rej,"diff a/%sb/%s\t(rejected hunks)\n",2934 patch->new_name, patch->new_name);2935for(cnt =1, frag = patch->fragments;2936 frag;2937 cnt++, frag = frag->next) {2938if(!frag->rejected) {2939fprintf(stderr,"Hunk #%dapplied cleanly.\n", cnt);2940continue;2941}2942fprintf(stderr,"Rejected hunk #%d.\n", cnt);2943fprintf(rej,"%.*s", frag->size, frag->patch);2944if(frag->patch[frag->size-1] !='\n')2945fputc('\n', rej);2946}2947fclose(rej);2948return-1;2949}29502951static intwrite_out_results(struct patch *list,int skipped_patch)2952{2953int phase;2954int errs =0;2955struct patch *l;29562957if(!list && !skipped_patch)2958returnerror("No changes");29592960for(phase =0; phase <2; phase++) {2961 l = list;2962while(l) {2963if(l->rejected)2964 errs =1;2965else{2966write_out_one_result(l, phase);2967if(phase ==1&&write_out_one_reject(l))2968 errs =1;2969}2970 l = l->next;2971}2972}2973return errs;2974}29752976static struct lock_file lock_file;29772978static struct excludes {2979struct excludes *next;2980const char*path;2981} *excludes;29822983static intuse_patch(struct patch *p)2984{2985const char*pathname = p->new_name ? p->new_name : p->old_name;2986struct excludes *x = excludes;2987while(x) {2988if(fnmatch(x->path, pathname,0) ==0)2989return0;2990 x = x->next;2991}2992if(0< prefix_length) {2993int pathlen =strlen(pathname);2994if(pathlen <= prefix_length ||2995memcmp(prefix, pathname, prefix_length))2996return0;2997}2998return1;2999}30003001static voidprefix_one(char**name)3002{3003char*old_name = *name;3004if(!old_name)3005return;3006*name =xstrdup(prefix_filename(prefix, prefix_length, *name));3007free(old_name);3008}30093010static voidprefix_patches(struct patch *p)3011{3012if(!prefix || p->is_toplevel_relative)3013return;3014for( ; p; p = p->next) {3015if(p->new_name == p->old_name) {3016char*prefixed = p->new_name;3017prefix_one(&prefixed);3018 p->new_name = p->old_name = prefixed;3019}3020else{3021prefix_one(&p->new_name);3022prefix_one(&p->old_name);3023}3024}3025}30263027#define INACCURATE_EOF (1<<0)3028#define RECOUNT (1<<1)30293030static intapply_patch(int fd,const char*filename,int options)3031{3032size_t offset;3033struct strbuf buf;3034struct patch *list = NULL, **listp = &list;3035int skipped_patch =0;30363037/* FIXME - memory leak when using multiple patch files as inputs */3038memset(&fn_table,0,sizeof(struct path_list));3039strbuf_init(&buf,0);3040 patch_input_file = filename;3041read_patch_file(&buf, fd);3042 offset =0;3043while(offset < buf.len) {3044struct patch *patch;3045int nr;30463047 patch =xcalloc(1,sizeof(*patch));3048 patch->inaccurate_eof = !!(options & INACCURATE_EOF);3049 patch->recount = !!(options & RECOUNT);3050 nr =parse_chunk(buf.buf + offset, buf.len - offset, patch);3051if(nr <0)3052break;3053if(apply_in_reverse)3054reverse_patches(patch);3055if(prefix)3056prefix_patches(patch);3057if(use_patch(patch)) {3058patch_stats(patch);3059*listp = patch;3060 listp = &patch->next;3061}3062else{3063/* perhaps free it a bit better? */3064free(patch);3065 skipped_patch++;3066}3067 offset += nr;3068}30693070if(whitespace_error && (ws_error_action == die_on_ws_error))3071 apply =0;30723073 update_index = check_index && apply;3074if(update_index && newfd <0)3075 newfd =hold_locked_index(&lock_file,1);30763077if(check_index) {3078if(read_cache() <0)3079die("unable to read index file");3080}30813082if((check || apply) &&3083check_patch_list(list) <0&&3084!apply_with_reject)3085exit(1);30863087if(apply &&write_out_results(list, skipped_patch))3088exit(1);30893090if(fake_ancestor)3091build_fake_ancestor(list, fake_ancestor);30923093if(diffstat)3094stat_patch_list(list);30953096if(numstat)3097numstat_patch_list(list);30983099if(summary)3100summary_patch_list(list);31013102strbuf_release(&buf);3103return0;3104}31053106static intgit_apply_config(const char*var,const char*value,void*cb)3107{3108if(!strcmp(var,"apply.whitespace"))3109returngit_config_string(&apply_default_whitespace, var, value);3110returngit_default_config(var, value, cb);3111}311231133114intcmd_apply(int argc,const char**argv,const char*unused_prefix)3115{3116int i;3117int read_stdin =1;3118int options =0;3119int errs =0;3120int is_not_gitdir;31213122const char*whitespace_option = NULL;31233124 prefix =setup_git_directory_gently(&is_not_gitdir);3125 prefix_length = prefix ?strlen(prefix) :0;3126git_config(git_apply_config, NULL);3127if(apply_default_whitespace)3128parse_whitespace_option(apply_default_whitespace);31293130for(i =1; i < argc; i++) {3131const char*arg = argv[i];3132char*end;3133int fd;31343135if(!strcmp(arg,"-")) {3136 errs |=apply_patch(0,"<stdin>", options);3137 read_stdin =0;3138continue;3139}3140if(!prefixcmp(arg,"--exclude=")) {3141struct excludes *x =xmalloc(sizeof(*x));3142 x->path = arg +10;3143 x->next = excludes;3144 excludes = x;3145continue;3146}3147if(!prefixcmp(arg,"-p")) {3148 p_value =atoi(arg +2);3149 p_value_known =1;3150continue;3151}3152if(!strcmp(arg,"--no-add")) {3153 no_add =1;3154continue;3155}3156if(!strcmp(arg,"--stat")) {3157 apply =0;3158 diffstat =1;3159continue;3160}3161if(!strcmp(arg,"--allow-binary-replacement") ||3162!strcmp(arg,"--binary")) {3163continue;/* now no-op */3164}3165if(!strcmp(arg,"--numstat")) {3166 apply =0;3167 numstat =1;3168continue;3169}3170if(!strcmp(arg,"--summary")) {3171 apply =0;3172 summary =1;3173continue;3174}3175if(!strcmp(arg,"--check")) {3176 apply =0;3177 check =1;3178continue;3179}3180if(!strcmp(arg,"--index")) {3181if(is_not_gitdir)3182die("--index outside a repository");3183 check_index =1;3184continue;3185}3186if(!strcmp(arg,"--cached")) {3187if(is_not_gitdir)3188die("--cached outside a repository");3189 check_index =1;3190 cached =1;3191continue;3192}3193if(!strcmp(arg,"--apply")) {3194 apply =1;3195continue;3196}3197if(!strcmp(arg,"--build-fake-ancestor")) {3198 apply =0;3199if(++i >= argc)3200die("need a filename");3201 fake_ancestor = argv[i];3202continue;3203}3204if(!strcmp(arg,"-z")) {3205 line_termination =0;3206continue;3207}3208if(!prefixcmp(arg,"-C")) {3209 p_context =strtoul(arg +2, &end,0);3210if(*end !='\0')3211die("unrecognized context count '%s'", arg +2);3212continue;3213}3214if(!prefixcmp(arg,"--whitespace=")) {3215 whitespace_option = arg +13;3216parse_whitespace_option(arg +13);3217continue;3218}3219if(!strcmp(arg,"-R") || !strcmp(arg,"--reverse")) {3220 apply_in_reverse =1;3221continue;3222}3223if(!strcmp(arg,"--unidiff-zero")) {3224 unidiff_zero =1;3225continue;3226}3227if(!strcmp(arg,"--reject")) {3228 apply = apply_with_reject = apply_verbosely =1;3229continue;3230}3231if(!strcmp(arg,"-v") || !strcmp(arg,"--verbose")) {3232 apply_verbosely =1;3233continue;3234}3235if(!strcmp(arg,"--inaccurate-eof")) {3236 options |= INACCURATE_EOF;3237continue;3238}3239if(!strcmp(arg,"--recount")) {3240 options |= RECOUNT;3241continue;3242}3243if(0< prefix_length)3244 arg =prefix_filename(prefix, prefix_length, arg);32453246 fd =open(arg, O_RDONLY);3247if(fd <0)3248die("can't open patch '%s':%s", arg,strerror(errno));3249 read_stdin =0;3250set_default_whitespace_mode(whitespace_option);3251 errs |=apply_patch(fd, arg, options);3252close(fd);3253}3254set_default_whitespace_mode(whitespace_option);3255if(read_stdin)3256 errs |=apply_patch(0,"<stdin>", options);3257if(whitespace_error) {3258if(squelch_whitespace_errors &&3259 squelch_whitespace_errors < whitespace_error) {3260int squelched =3261 whitespace_error - squelch_whitespace_errors;3262fprintf(stderr,"warning: squelched%d"3263"whitespace error%s\n",3264 squelched,3265 squelched ==1?"":"s");3266}3267if(ws_error_action == die_on_ws_error)3268die("%dline%sadd%swhitespace errors.",3269 whitespace_error,3270 whitespace_error ==1?"":"s",3271 whitespace_error ==1?"s":"");3272if(applied_after_fixing_ws && apply)3273fprintf(stderr,"warning:%dline%sapplied after"3274" fixing whitespace errors.\n",3275 applied_after_fixing_ws,3276 applied_after_fixing_ws ==1?"":"s");3277else if(whitespace_error)3278fprintf(stderr,"warning:%dline%sadd%swhitespace errors.\n",3279 whitespace_error,3280 whitespace_error ==1?"":"s",3281 whitespace_error ==1?"s":"");3282}32833284if(update_index) {3285if(write_cache(newfd, active_cache, active_nr) ||3286commit_locked_index(&lock_file))3287die("Unable to write new index file");3288}32893290return!!errs;3291}