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 allow_overlap; 47static int no_add; 48static const char*fake_ancestor; 49static int line_termination ='\n'; 50static unsigned int p_context = UINT_MAX; 51static const char*const apply_usage[] = { 52"git apply [options] [<patch>...]", 53 NULL 54}; 55 56static enum ws_error_action { 57 nowarn_ws_error, 58 warn_on_ws_error, 59 die_on_ws_error, 60 correct_ws_error 61} ws_error_action = warn_on_ws_error; 62static int whitespace_error; 63static int squelch_whitespace_errors =5; 64static int applied_after_fixing_ws; 65 66static enum ws_ignore { 67 ignore_ws_none, 68 ignore_ws_change 69} ws_ignore_action = ignore_ws_none; 70 71 72static const char*patch_input_file; 73static const char*root; 74static int root_len; 75static int read_stdin =1; 76static int options; 77 78static voidparse_whitespace_option(const char*option) 79{ 80if(!option) { 81 ws_error_action = warn_on_ws_error; 82return; 83} 84if(!strcmp(option,"warn")) { 85 ws_error_action = warn_on_ws_error; 86return; 87} 88if(!strcmp(option,"nowarn")) { 89 ws_error_action = nowarn_ws_error; 90return; 91} 92if(!strcmp(option,"error")) { 93 ws_error_action = die_on_ws_error; 94return; 95} 96if(!strcmp(option,"error-all")) { 97 ws_error_action = die_on_ws_error; 98 squelch_whitespace_errors =0; 99return; 100} 101if(!strcmp(option,"strip") || !strcmp(option,"fix")) { 102 ws_error_action = correct_ws_error; 103return; 104} 105die("unrecognized whitespace option '%s'", option); 106} 107 108static voidparse_ignorewhitespace_option(const char*option) 109{ 110if(!option || !strcmp(option,"no") || 111!strcmp(option,"false") || !strcmp(option,"never") || 112!strcmp(option,"none")) { 113 ws_ignore_action = ignore_ws_none; 114return; 115} 116if(!strcmp(option,"change")) { 117 ws_ignore_action = ignore_ws_change; 118return; 119} 120die("unrecognized whitespace ignore option '%s'", option); 121} 122 123static voidset_default_whitespace_mode(const char*whitespace_option) 124{ 125if(!whitespace_option && !apply_default_whitespace) 126 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); 127} 128 129/* 130 * For "diff-stat" like behaviour, we keep track of the biggest change 131 * we've seen, and the longest filename. That allows us to do simple 132 * scaling. 133 */ 134static int max_change, max_len; 135 136/* 137 * Various "current state", notably line numbers and what 138 * file (and how) we're patching right now.. The "is_xxxx" 139 * things are flags, where -1 means "don't know yet". 140 */ 141static int linenr =1; 142 143/* 144 * This represents one "hunk" from a patch, starting with 145 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 146 * patch text is pointed at by patch, and its byte length 147 * is stored in size. leading and trailing are the number 148 * of context lines. 149 */ 150struct fragment { 151unsigned long leading, trailing; 152unsigned long oldpos, oldlines; 153unsigned long newpos, newlines; 154const char*patch; 155int size; 156int rejected; 157int linenr; 158struct fragment *next; 159}; 160 161/* 162 * When dealing with a binary patch, we reuse "leading" field 163 * to store the type of the binary hunk, either deflated "delta" 164 * or deflated "literal". 165 */ 166#define binary_patch_method leading 167#define BINARY_DELTA_DEFLATED 1 168#define BINARY_LITERAL_DEFLATED 2 169 170/* 171 * This represents a "patch" to a file, both metainfo changes 172 * such as creation/deletion, filemode and content changes represented 173 * as a series of fragments. 174 */ 175struct patch { 176char*new_name, *old_name, *def_name; 177unsigned int old_mode, new_mode; 178int is_new, is_delete;/* -1 = unknown, 0 = false, 1 = true */ 179int rejected; 180unsigned ws_rule; 181unsigned long deflate_origlen; 182int lines_added, lines_deleted; 183int score; 184unsigned int is_toplevel_relative:1; 185unsigned int inaccurate_eof:1; 186unsigned int is_binary:1; 187unsigned int is_copy:1; 188unsigned int is_rename:1; 189unsigned int recount:1; 190struct fragment *fragments; 191char*result; 192size_t resultsize; 193char old_sha1_prefix[41]; 194char new_sha1_prefix[41]; 195struct patch *next; 196}; 197 198/* 199 * A line in a file, len-bytes long (includes the terminating LF, 200 * except for an incomplete line at the end if the file ends with 201 * one), and its contents hashes to 'hash'. 202 */ 203struct line { 204size_t len; 205unsigned hash :24; 206unsigned flag :8; 207#define LINE_COMMON 1 208#define LINE_PATCHED 2 209}; 210 211/* 212 * This represents a "file", which is an array of "lines". 213 */ 214struct image { 215char*buf; 216size_t len; 217size_t nr; 218size_t alloc; 219struct line *line_allocated; 220struct line *line; 221}; 222 223/* 224 * Records filenames that have been touched, in order to handle 225 * the case where more than one patches touch the same file. 226 */ 227 228static struct string_list fn_table; 229 230static uint32_thash_line(const char*cp,size_t len) 231{ 232size_t i; 233uint32_t h; 234for(i =0, h =0; i < len; i++) { 235if(!isspace(cp[i])) { 236 h = h *3+ (cp[i] &0xff); 237} 238} 239return h; 240} 241 242/* 243 * Compare lines s1 of length n1 and s2 of length n2, ignoring 244 * whitespace difference. Returns 1 if they match, 0 otherwise 245 */ 246static intfuzzy_matchlines(const char*s1,size_t n1, 247const char*s2,size_t n2) 248{ 249const char*last1 = s1 + n1 -1; 250const char*last2 = s2 + n2 -1; 251int result =0; 252 253/* ignore line endings */ 254while((*last1 =='\r') || (*last1 =='\n')) 255 last1--; 256while((*last2 =='\r') || (*last2 =='\n')) 257 last2--; 258 259/* skip leading whitespace */ 260while(isspace(*s1) && (s1 <= last1)) 261 s1++; 262while(isspace(*s2) && (s2 <= last2)) 263 s2++; 264/* early return if both lines are empty */ 265if((s1 > last1) && (s2 > last2)) 266return1; 267while(!result) { 268 result = *s1++ - *s2++; 269/* 270 * Skip whitespace inside. We check for whitespace on 271 * both buffers because we don't want "a b" to match 272 * "ab" 273 */ 274if(isspace(*s1) &&isspace(*s2)) { 275while(isspace(*s1) && s1 <= last1) 276 s1++; 277while(isspace(*s2) && s2 <= last2) 278 s2++; 279} 280/* 281 * If we reached the end on one side only, 282 * lines don't match 283 */ 284if( 285((s2 > last2) && (s1 <= last1)) || 286((s1 > last1) && (s2 <= last2))) 287return0; 288if((s1 > last1) && (s2 > last2)) 289break; 290} 291 292return!result; 293} 294 295static voidadd_line_info(struct image *img,const char*bol,size_t len,unsigned flag) 296{ 297ALLOC_GROW(img->line_allocated, img->nr +1, img->alloc); 298 img->line_allocated[img->nr].len = len; 299 img->line_allocated[img->nr].hash =hash_line(bol, len); 300 img->line_allocated[img->nr].flag = flag; 301 img->nr++; 302} 303 304static voidprepare_image(struct image *image,char*buf,size_t len, 305int prepare_linetable) 306{ 307const char*cp, *ep; 308 309memset(image,0,sizeof(*image)); 310 image->buf = buf; 311 image->len = len; 312 313if(!prepare_linetable) 314return; 315 316 ep = image->buf + image->len; 317 cp = image->buf; 318while(cp < ep) { 319const char*next; 320for(next = cp; next < ep && *next !='\n'; next++) 321; 322if(next < ep) 323 next++; 324add_line_info(image, cp, next - cp,0); 325 cp = next; 326} 327 image->line = image->line_allocated; 328} 329 330static voidclear_image(struct image *image) 331{ 332free(image->buf); 333 image->buf = NULL; 334 image->len =0; 335} 336 337static voidsay_patch_name(FILE*output,const char*pre, 338struct patch *patch,const char*post) 339{ 340fputs(pre, output); 341if(patch->old_name && patch->new_name && 342strcmp(patch->old_name, patch->new_name)) { 343quote_c_style(patch->old_name, NULL, output,0); 344fputs(" => ", output); 345quote_c_style(patch->new_name, NULL, output,0); 346}else{ 347const char*n = patch->new_name; 348if(!n) 349 n = patch->old_name; 350quote_c_style(n, NULL, output,0); 351} 352fputs(post, output); 353} 354 355#define CHUNKSIZE (8192) 356#define SLOP (16) 357 358static voidread_patch_file(struct strbuf *sb,int fd) 359{ 360if(strbuf_read(sb, fd,0) <0) 361die_errno("git apply: failed to read"); 362 363/* 364 * Make sure that we have some slop in the buffer 365 * so that we can do speculative "memcmp" etc, and 366 * see to it that it is NUL-filled. 367 */ 368strbuf_grow(sb, SLOP); 369memset(sb->buf + sb->len,0, SLOP); 370} 371 372static unsigned longlinelen(const char*buffer,unsigned long size) 373{ 374unsigned long len =0; 375while(size--) { 376 len++; 377if(*buffer++ =='\n') 378break; 379} 380return len; 381} 382 383static intis_dev_null(const char*str) 384{ 385return!memcmp("/dev/null", str,9) &&isspace(str[9]); 386} 387 388#define TERM_SPACE 1 389#define TERM_TAB 2 390 391static intname_terminate(const char*name,int namelen,int c,int terminate) 392{ 393if(c ==' '&& !(terminate & TERM_SPACE)) 394return0; 395if(c =='\t'&& !(terminate & TERM_TAB)) 396return0; 397 398return1; 399} 400 401/* remove double slashes to make --index work with such filenames */ 402static char*squash_slash(char*name) 403{ 404int i =0, j =0; 405 406if(!name) 407return NULL; 408 409while(name[i]) { 410if((name[j++] = name[i++]) =='/') 411while(name[i] =='/') 412 i++; 413} 414 name[j] ='\0'; 415return name; 416} 417 418static char*find_name_gnu(const char*line,char*def,int p_value) 419{ 420struct strbuf name = STRBUF_INIT; 421char*cp; 422 423/* 424 * Proposed "new-style" GNU patch/diff format; see 425 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 426 */ 427if(unquote_c_style(&name, line, NULL)) { 428strbuf_release(&name); 429return NULL; 430} 431 432for(cp = name.buf; p_value; p_value--) { 433 cp =strchr(cp,'/'); 434if(!cp) { 435strbuf_release(&name); 436return NULL; 437} 438 cp++; 439} 440 441/* name can later be freed, so we need 442 * to memmove, not just return cp 443 */ 444strbuf_remove(&name,0, cp - name.buf); 445free(def); 446if(root) 447strbuf_insert(&name,0, root, root_len); 448returnsquash_slash(strbuf_detach(&name, NULL)); 449} 450 451static size_tsane_tz_len(const char*line,size_t len) 452{ 453const char*tz, *p; 454 455if(len <strlen(" +0500") || line[len-strlen(" +0500")] !=' ') 456return0; 457 tz = line + len -strlen(" +0500"); 458 459if(tz[1] !='+'&& tz[1] !='-') 460return0; 461 462for(p = tz +2; p != line + len; p++) 463if(!isdigit(*p)) 464return0; 465 466return line + len - tz; 467} 468 469static size_ttz_with_colon_len(const char*line,size_t len) 470{ 471const char*tz, *p; 472 473if(len <strlen(" +08:00") || line[len -strlen(":00")] !=':') 474return0; 475 tz = line + len -strlen(" +08:00"); 476 477if(tz[0] !=' '|| (tz[1] !='+'&& tz[1] !='-')) 478return0; 479 p = tz +2; 480if(!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 481!isdigit(*p++) || !isdigit(*p++)) 482return0; 483 484return line + len - tz; 485} 486 487static size_tdate_len(const char*line,size_t len) 488{ 489const char*date, *p; 490 491if(len <strlen("72-02-05") || line[len-strlen("-05")] !='-') 492return0; 493 p = date = line + len -strlen("72-02-05"); 494 495if(!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 496!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 497!isdigit(*p++) || !isdigit(*p++))/* Not a date. */ 498return0; 499 500if(date - line >=strlen("19") && 501isdigit(date[-1]) &&isdigit(date[-2]))/* 4-digit year */ 502 date -=strlen("19"); 503 504return line + len - date; 505} 506 507static size_tshort_time_len(const char*line,size_t len) 508{ 509const char*time, *p; 510 511if(len <strlen(" 07:01:32") || line[len-strlen(":32")] !=':') 512return0; 513 p = time = line + len -strlen(" 07:01:32"); 514 515/* Permit 1-digit hours? */ 516if(*p++ !=' '|| 517!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 518!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 519!isdigit(*p++) || !isdigit(*p++))/* Not a time. */ 520return0; 521 522return line + len - time; 523} 524 525static size_tfractional_time_len(const char*line,size_t len) 526{ 527const char*p; 528size_t n; 529 530/* Expected format: 19:41:17.620000023 */ 531if(!len || !isdigit(line[len -1])) 532return0; 533 p = line + len -1; 534 535/* Fractional seconds. */ 536while(p > line &&isdigit(*p)) 537 p--; 538if(*p !='.') 539return0; 540 541/* Hours, minutes, and whole seconds. */ 542 n =short_time_len(line, p - line); 543if(!n) 544return0; 545 546return line + len - p + n; 547} 548 549static size_ttrailing_spaces_len(const char*line,size_t len) 550{ 551const char*p; 552 553/* Expected format: ' ' x (1 or more) */ 554if(!len || line[len -1] !=' ') 555return0; 556 557 p = line + len; 558while(p != line) { 559 p--; 560if(*p !=' ') 561return line + len - (p +1); 562} 563 564/* All spaces! */ 565return len; 566} 567 568static size_tdiff_timestamp_len(const char*line,size_t len) 569{ 570const char*end = line + len; 571size_t n; 572 573/* 574 * Posix: 2010-07-05 19:41:17 575 * GNU: 2010-07-05 19:41:17.620000023 -0500 576 */ 577 578if(!isdigit(end[-1])) 579return0; 580 581 n =sane_tz_len(line, end - line); 582if(!n) 583 n =tz_with_colon_len(line, end - line); 584 end -= n; 585 586 n =short_time_len(line, end - line); 587if(!n) 588 n =fractional_time_len(line, end - line); 589 end -= n; 590 591 n =date_len(line, end - line); 592if(!n)/* No date. Too bad. */ 593return0; 594 end -= n; 595 596if(end == line)/* No space before date. */ 597return0; 598if(end[-1] =='\t') {/* Success! */ 599 end--; 600return line + len - end; 601} 602if(end[-1] !=' ')/* No space before date. */ 603return0; 604 605/* Whitespace damage. */ 606 end -=trailing_spaces_len(line, end - line); 607return line + len - end; 608} 609 610static char*find_name_common(const char*line,char*def,int p_value, 611const char*end,int terminate) 612{ 613int len; 614const char*start = NULL; 615 616if(p_value ==0) 617 start = line; 618while(line != end) { 619char c = *line; 620 621if(!end &&isspace(c)) { 622if(c =='\n') 623break; 624if(name_terminate(start, line-start, c, terminate)) 625break; 626} 627 line++; 628if(c =='/'&& !--p_value) 629 start = line; 630} 631if(!start) 632returnsquash_slash(def); 633 len = line - start; 634if(!len) 635returnsquash_slash(def); 636 637/* 638 * Generally we prefer the shorter name, especially 639 * if the other one is just a variation of that with 640 * something else tacked on to the end (ie "file.orig" 641 * or "file~"). 642 */ 643if(def) { 644int deflen =strlen(def); 645if(deflen < len && !strncmp(start, def, deflen)) 646returnsquash_slash(def); 647free(def); 648} 649 650if(root) { 651char*ret =xmalloc(root_len + len +1); 652strcpy(ret, root); 653memcpy(ret + root_len, start, len); 654 ret[root_len + len] ='\0'; 655returnsquash_slash(ret); 656} 657 658returnsquash_slash(xmemdupz(start, len)); 659} 660 661static char*find_name(const char*line,char*def,int p_value,int terminate) 662{ 663if(*line =='"') { 664char*name =find_name_gnu(line, def, p_value); 665if(name) 666return name; 667} 668 669returnfind_name_common(line, def, p_value, NULL, terminate); 670} 671 672static char*find_name_traditional(const char*line,char*def,int p_value) 673{ 674size_t len =strlen(line); 675size_t date_len; 676 677if(*line =='"') { 678char*name =find_name_gnu(line, def, p_value); 679if(name) 680return name; 681} 682 683 len =strchrnul(line,'\n') - line; 684 date_len =diff_timestamp_len(line, len); 685if(!date_len) 686returnfind_name_common(line, def, p_value, NULL, TERM_TAB); 687 len -= date_len; 688 689returnfind_name_common(line, def, p_value, line + len,0); 690} 691 692static intcount_slashes(const char*cp) 693{ 694int cnt =0; 695char ch; 696 697while((ch = *cp++)) 698if(ch =='/') 699 cnt++; 700return cnt; 701} 702 703/* 704 * Given the string after "--- " or "+++ ", guess the appropriate 705 * p_value for the given patch. 706 */ 707static intguess_p_value(const char*nameline) 708{ 709char*name, *cp; 710int val = -1; 711 712if(is_dev_null(nameline)) 713return-1; 714 name =find_name_traditional(nameline, NULL,0); 715if(!name) 716return-1; 717 cp =strchr(name,'/'); 718if(!cp) 719 val =0; 720else if(prefix) { 721/* 722 * Does it begin with "a/$our-prefix" and such? Then this is 723 * very likely to apply to our directory. 724 */ 725if(!strncmp(name, prefix, prefix_length)) 726 val =count_slashes(prefix); 727else{ 728 cp++; 729if(!strncmp(cp, prefix, prefix_length)) 730 val =count_slashes(prefix) +1; 731} 732} 733free(name); 734return val; 735} 736 737/* 738 * Does the ---/+++ line has the POSIX timestamp after the last HT? 739 * GNU diff puts epoch there to signal a creation/deletion event. Is 740 * this such a timestamp? 741 */ 742static inthas_epoch_timestamp(const char*nameline) 743{ 744/* 745 * We are only interested in epoch timestamp; any non-zero 746 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 747 * For the same reason, the date must be either 1969-12-31 or 748 * 1970-01-01, and the seconds part must be "00". 749 */ 750const char stamp_regexp[] = 751"^(1969-12-31|1970-01-01)" 752" " 753"[0-2][0-9]:[0-5][0-9]:00(\\.0+)?" 754" " 755"([-+][0-2][0-9]:?[0-5][0-9])\n"; 756const char*timestamp = NULL, *cp, *colon; 757static regex_t *stamp; 758 regmatch_t m[10]; 759int zoneoffset; 760int hourminute; 761int status; 762 763for(cp = nameline; *cp !='\n'; cp++) { 764if(*cp =='\t') 765 timestamp = cp +1; 766} 767if(!timestamp) 768return0; 769if(!stamp) { 770 stamp =xmalloc(sizeof(*stamp)); 771if(regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 772warning("Cannot prepare timestamp regexp%s", 773 stamp_regexp); 774return0; 775} 776} 777 778 status =regexec(stamp, timestamp,ARRAY_SIZE(m), m,0); 779if(status) { 780if(status != REG_NOMATCH) 781warning("regexec returned%dfor input:%s", 782 status, timestamp); 783return0; 784} 785 786 zoneoffset =strtol(timestamp + m[3].rm_so +1, (char**) &colon,10); 787if(*colon ==':') 788 zoneoffset = zoneoffset *60+strtol(colon +1, NULL,10); 789else 790 zoneoffset = (zoneoffset /100) *60+ (zoneoffset %100); 791if(timestamp[m[3].rm_so] =='-') 792 zoneoffset = -zoneoffset; 793 794/* 795 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 796 * (west of GMT) or 1970-01-01 (east of GMT) 797 */ 798if((zoneoffset <0&&memcmp(timestamp,"1969-12-31",10)) || 799(0<= zoneoffset &&memcmp(timestamp,"1970-01-01",10))) 800return0; 801 802 hourminute = (strtol(timestamp +11, NULL,10) *60+ 803strtol(timestamp +14, NULL,10) - 804 zoneoffset); 805 806return((zoneoffset <0&& hourminute ==1440) || 807(0<= zoneoffset && !hourminute)); 808} 809 810/* 811 * Get the name etc info from the ---/+++ lines of a traditional patch header 812 * 813 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 814 * files, we can happily check the index for a match, but for creating a 815 * new file we should try to match whatever "patch" does. I have no idea. 816 */ 817static voidparse_traditional_patch(const char*first,const char*second,struct patch *patch) 818{ 819char*name; 820 821 first +=4;/* skip "--- " */ 822 second +=4;/* skip "+++ " */ 823if(!p_value_known) { 824int p, q; 825 p =guess_p_value(first); 826 q =guess_p_value(second); 827if(p <0) p = q; 828if(0<= p && p == q) { 829 p_value = p; 830 p_value_known =1; 831} 832} 833if(is_dev_null(first)) { 834 patch->is_new =1; 835 patch->is_delete =0; 836 name =find_name_traditional(second, NULL, p_value); 837 patch->new_name = name; 838}else if(is_dev_null(second)) { 839 patch->is_new =0; 840 patch->is_delete =1; 841 name =find_name_traditional(first, NULL, p_value); 842 patch->old_name = name; 843}else{ 844 name =find_name_traditional(first, NULL, p_value); 845 name =find_name_traditional(second, name, p_value); 846if(has_epoch_timestamp(first)) { 847 patch->is_new =1; 848 patch->is_delete =0; 849 patch->new_name = name; 850}else if(has_epoch_timestamp(second)) { 851 patch->is_new =0; 852 patch->is_delete =1; 853 patch->old_name = name; 854}else{ 855 patch->old_name = patch->new_name = name; 856} 857} 858if(!name) 859die("unable to find filename in patch at line%d", linenr); 860} 861 862static intgitdiff_hdrend(const char*line,struct patch *patch) 863{ 864return-1; 865} 866 867/* 868 * We're anal about diff header consistency, to make 869 * sure that we don't end up having strange ambiguous 870 * patches floating around. 871 * 872 * As a result, gitdiff_{old|new}name() will check 873 * their names against any previous information, just 874 * to make sure.. 875 */ 876static char*gitdiff_verify_name(const char*line,int isnull,char*orig_name,const char*oldnew) 877{ 878if(!orig_name && !isnull) 879returnfind_name(line, NULL, p_value, TERM_TAB); 880 881if(orig_name) { 882int len; 883const char*name; 884char*another; 885 name = orig_name; 886 len =strlen(name); 887if(isnull) 888die("git apply: bad git-diff - expected /dev/null, got%son line%d", name, linenr); 889 another =find_name(line, NULL, p_value, TERM_TAB); 890if(!another ||memcmp(another, name, len +1)) 891die("git apply: bad git-diff - inconsistent%sfilename on line%d", oldnew, linenr); 892free(another); 893return orig_name; 894} 895else{ 896/* expect "/dev/null" */ 897if(memcmp("/dev/null", line,9) || line[9] !='\n') 898die("git apply: bad git-diff - expected /dev/null on line%d", linenr); 899return NULL; 900} 901} 902 903static intgitdiff_oldname(const char*line,struct patch *patch) 904{ 905 patch->old_name =gitdiff_verify_name(line, patch->is_new, patch->old_name,"old"); 906return0; 907} 908 909static intgitdiff_newname(const char*line,struct patch *patch) 910{ 911 patch->new_name =gitdiff_verify_name(line, patch->is_delete, patch->new_name,"new"); 912return0; 913} 914 915static intgitdiff_oldmode(const char*line,struct patch *patch) 916{ 917 patch->old_mode =strtoul(line, NULL,8); 918return0; 919} 920 921static intgitdiff_newmode(const char*line,struct patch *patch) 922{ 923 patch->new_mode =strtoul(line, NULL,8); 924return0; 925} 926 927static intgitdiff_delete(const char*line,struct patch *patch) 928{ 929 patch->is_delete =1; 930 patch->old_name = patch->def_name; 931returngitdiff_oldmode(line, patch); 932} 933 934static intgitdiff_newfile(const char*line,struct patch *patch) 935{ 936 patch->is_new =1; 937 patch->new_name = patch->def_name; 938returngitdiff_newmode(line, patch); 939} 940 941static intgitdiff_copysrc(const char*line,struct patch *patch) 942{ 943 patch->is_copy =1; 944 patch->old_name =find_name(line, NULL, p_value ? p_value -1:0,0); 945return0; 946} 947 948static intgitdiff_copydst(const char*line,struct patch *patch) 949{ 950 patch->is_copy =1; 951 patch->new_name =find_name(line, NULL, p_value ? p_value -1:0,0); 952return0; 953} 954 955static intgitdiff_renamesrc(const char*line,struct patch *patch) 956{ 957 patch->is_rename =1; 958 patch->old_name =find_name(line, NULL, p_value ? p_value -1:0,0); 959return0; 960} 961 962static intgitdiff_renamedst(const char*line,struct patch *patch) 963{ 964 patch->is_rename =1; 965 patch->new_name =find_name(line, NULL, p_value ? p_value -1:0,0); 966return0; 967} 968 969static intgitdiff_similarity(const char*line,struct patch *patch) 970{ 971if((patch->score =strtoul(line, NULL,10)) == ULONG_MAX) 972 patch->score =0; 973return0; 974} 975 976static intgitdiff_dissimilarity(const char*line,struct patch *patch) 977{ 978if((patch->score =strtoul(line, NULL,10)) == ULONG_MAX) 979 patch->score =0; 980return0; 981} 982 983static intgitdiff_index(const char*line,struct patch *patch) 984{ 985/* 986 * index line is N hexadecimal, "..", N hexadecimal, 987 * and optional space with octal mode. 988 */ 989const char*ptr, *eol; 990int len; 991 992 ptr =strchr(line,'.'); 993if(!ptr || ptr[1] !='.'||40< ptr - line) 994return0; 995 len = ptr - line; 996memcpy(patch->old_sha1_prefix, line, len); 997 patch->old_sha1_prefix[len] =0; 998 999 line = ptr +2;1000 ptr =strchr(line,' ');1001 eol =strchr(line,'\n');10021003if(!ptr || eol < ptr)1004 ptr = eol;1005 len = ptr - line;10061007if(40< len)1008return0;1009memcpy(patch->new_sha1_prefix, line, len);1010 patch->new_sha1_prefix[len] =0;1011if(*ptr ==' ')1012 patch->old_mode =strtoul(ptr+1, NULL,8);1013return0;1014}10151016/*1017 * This is normal for a diff that doesn't change anything: we'll fall through1018 * into the next diff. Tell the parser to break out.1019 */1020static intgitdiff_unrecognized(const char*line,struct patch *patch)1021{1022return-1;1023}10241025static const char*stop_at_slash(const char*line,int llen)1026{1027int nslash = p_value;1028int i;10291030for(i =0; i < llen; i++) {1031int ch = line[i];1032if(ch =='/'&& --nslash <=0)1033return&line[i];1034}1035return NULL;1036}10371038/*1039 * This is to extract the same name that appears on "diff --git"1040 * line. We do not find and return anything if it is a rename1041 * patch, and it is OK because we will find the name elsewhere.1042 * We need to reliably find name only when it is mode-change only,1043 * creation or deletion of an empty file. In any of these cases,1044 * both sides are the same name under a/ and b/ respectively.1045 */1046static char*git_header_name(char*line,int llen)1047{1048const char*name;1049const char*second = NULL;1050size_t len, line_len;10511052 line +=strlen("diff --git ");1053 llen -=strlen("diff --git ");10541055if(*line =='"') {1056const char*cp;1057struct strbuf first = STRBUF_INIT;1058struct strbuf sp = STRBUF_INIT;10591060if(unquote_c_style(&first, line, &second))1061goto free_and_fail1;10621063/* advance to the first slash */1064 cp =stop_at_slash(first.buf, first.len);1065/* we do not accept absolute paths */1066if(!cp || cp == first.buf)1067goto free_and_fail1;1068strbuf_remove(&first,0, cp +1- first.buf);10691070/*1071 * second points at one past closing dq of name.1072 * find the second name.1073 */1074while((second < line + llen) &&isspace(*second))1075 second++;10761077if(line + llen <= second)1078goto free_and_fail1;1079if(*second =='"') {1080if(unquote_c_style(&sp, second, NULL))1081goto free_and_fail1;1082 cp =stop_at_slash(sp.buf, sp.len);1083if(!cp || cp == sp.buf)1084goto free_and_fail1;1085/* They must match, otherwise ignore */1086if(strcmp(cp +1, first.buf))1087goto free_and_fail1;1088strbuf_release(&sp);1089returnstrbuf_detach(&first, NULL);1090}10911092/* unquoted second */1093 cp =stop_at_slash(second, line + llen - second);1094if(!cp || cp == second)1095goto free_and_fail1;1096 cp++;1097if(line + llen - cp != first.len +1||1098memcmp(first.buf, cp, first.len))1099goto free_and_fail1;1100returnstrbuf_detach(&first, NULL);11011102 free_and_fail1:1103strbuf_release(&first);1104strbuf_release(&sp);1105return NULL;1106}11071108/* unquoted first name */1109 name =stop_at_slash(line, llen);1110if(!name || name == line)1111return NULL;1112 name++;11131114/*1115 * since the first name is unquoted, a dq if exists must be1116 * the beginning of the second name.1117 */1118for(second = name; second < line + llen; second++) {1119if(*second =='"') {1120struct strbuf sp = STRBUF_INIT;1121const char*np;11221123if(unquote_c_style(&sp, second, NULL))1124goto free_and_fail2;11251126 np =stop_at_slash(sp.buf, sp.len);1127if(!np || np == sp.buf)1128goto free_and_fail2;1129 np++;11301131 len = sp.buf + sp.len - np;1132if(len < second - name &&1133!strncmp(np, name, len) &&1134isspace(name[len])) {1135/* Good */1136strbuf_remove(&sp,0, np - sp.buf);1137returnstrbuf_detach(&sp, NULL);1138}11391140 free_and_fail2:1141strbuf_release(&sp);1142return NULL;1143}1144}11451146/*1147 * Accept a name only if it shows up twice, exactly the same1148 * form.1149 */1150 second =strchr(name,'\n');1151if(!second)1152return NULL;1153 line_len = second - name;1154for(len =0; ; len++) {1155switch(name[len]) {1156default:1157continue;1158case'\n':1159return NULL;1160case'\t':case' ':1161 second =stop_at_slash(name + len, line_len - len);1162if(!second)1163return NULL;1164 second++;1165if(second[len] =='\n'&& !strncmp(name, second, len)) {1166returnxmemdupz(name, len);1167}1168}1169}1170}11711172/* Verify that we recognize the lines following a git header */1173static intparse_git_header(char*line,int len,unsigned int size,struct patch *patch)1174{1175unsigned long offset;11761177/* A git diff has explicit new/delete information, so we don't guess */1178 patch->is_new =0;1179 patch->is_delete =0;11801181/*1182 * Some things may not have the old name in the1183 * rest of the headers anywhere (pure mode changes,1184 * or removing or adding empty files), so we get1185 * the default name from the header.1186 */1187 patch->def_name =git_header_name(line, len);1188if(patch->def_name && root) {1189char*s =xmalloc(root_len +strlen(patch->def_name) +1);1190strcpy(s, root);1191strcpy(s + root_len, patch->def_name);1192free(patch->def_name);1193 patch->def_name = s;1194}11951196 line += len;1197 size -= len;1198 linenr++;1199for(offset = len ; size >0; offset += len, size -= len, line += len, linenr++) {1200static const struct opentry {1201const char*str;1202int(*fn)(const char*,struct patch *);1203} optable[] = {1204{"@@ -", gitdiff_hdrend },1205{"--- ", gitdiff_oldname },1206{"+++ ", gitdiff_newname },1207{"old mode ", gitdiff_oldmode },1208{"new mode ", gitdiff_newmode },1209{"deleted file mode ", gitdiff_delete },1210{"new file mode ", gitdiff_newfile },1211{"copy from ", gitdiff_copysrc },1212{"copy to ", gitdiff_copydst },1213{"rename old ", gitdiff_renamesrc },1214{"rename new ", gitdiff_renamedst },1215{"rename from ", gitdiff_renamesrc },1216{"rename to ", gitdiff_renamedst },1217{"similarity index ", gitdiff_similarity },1218{"dissimilarity index ", gitdiff_dissimilarity },1219{"index ", gitdiff_index },1220{"", gitdiff_unrecognized },1221};1222int i;12231224 len =linelen(line, size);1225if(!len || line[len-1] !='\n')1226break;1227for(i =0; i <ARRAY_SIZE(optable); i++) {1228const struct opentry *p = optable + i;1229int oplen =strlen(p->str);1230if(len < oplen ||memcmp(p->str, line, oplen))1231continue;1232if(p->fn(line + oplen, patch) <0)1233return offset;1234break;1235}1236}12371238return offset;1239}12401241static intparse_num(const char*line,unsigned long*p)1242{1243char*ptr;12441245if(!isdigit(*line))1246return0;1247*p =strtoul(line, &ptr,10);1248return ptr - line;1249}12501251static intparse_range(const char*line,int len,int offset,const char*expect,1252unsigned long*p1,unsigned long*p2)1253{1254int digits, ex;12551256if(offset <0|| offset >= len)1257return-1;1258 line += offset;1259 len -= offset;12601261 digits =parse_num(line, p1);1262if(!digits)1263return-1;12641265 offset += digits;1266 line += digits;1267 len -= digits;12681269*p2 =1;1270if(*line ==',') {1271 digits =parse_num(line+1, p2);1272if(!digits)1273return-1;12741275 offset += digits+1;1276 line += digits+1;1277 len -= digits+1;1278}12791280 ex =strlen(expect);1281if(ex > len)1282return-1;1283if(memcmp(line, expect, ex))1284return-1;12851286return offset + ex;1287}12881289static voidrecount_diff(char*line,int size,struct fragment *fragment)1290{1291int oldlines =0, newlines =0, ret =0;12921293if(size <1) {1294warning("recount: ignore empty hunk");1295return;1296}12971298for(;;) {1299int len =linelen(line, size);1300 size -= len;1301 line += len;13021303if(size <1)1304break;13051306switch(*line) {1307case' ':case'\n':1308 newlines++;1309/* fall through */1310case'-':1311 oldlines++;1312continue;1313case'+':1314 newlines++;1315continue;1316case'\\':1317continue;1318case'@':1319 ret = size <3||prefixcmp(line,"@@ ");1320break;1321case'd':1322 ret = size <5||prefixcmp(line,"diff ");1323break;1324default:1325 ret = -1;1326break;1327}1328if(ret) {1329warning("recount: unexpected line: %.*s",1330(int)linelen(line, size), line);1331return;1332}1333break;1334}1335 fragment->oldlines = oldlines;1336 fragment->newlines = newlines;1337}13381339/*1340 * Parse a unified diff fragment header of the1341 * form "@@ -a,b +c,d @@"1342 */1343static intparse_fragment_header(char*line,int len,struct fragment *fragment)1344{1345int offset;13461347if(!len || line[len-1] !='\n')1348return-1;13491350/* Figure out the number of lines in a fragment */1351 offset =parse_range(line, len,4," +", &fragment->oldpos, &fragment->oldlines);1352 offset =parse_range(line, len, offset," @@", &fragment->newpos, &fragment->newlines);13531354return offset;1355}13561357static intfind_header(char*line,unsigned long size,int*hdrsize,struct patch *patch)1358{1359unsigned long offset, len;13601361 patch->is_toplevel_relative =0;1362 patch->is_rename = patch->is_copy =0;1363 patch->is_new = patch->is_delete = -1;1364 patch->old_mode = patch->new_mode =0;1365 patch->old_name = patch->new_name = NULL;1366for(offset =0; size >0; offset += len, size -= len, line += len, linenr++) {1367unsigned long nextlen;13681369 len =linelen(line, size);1370if(!len)1371break;13721373/* Testing this early allows us to take a few shortcuts.. */1374if(len <6)1375continue;13761377/*1378 * Make sure we don't find any unconnected patch fragments.1379 * That's a sign that we didn't find a header, and that a1380 * patch has become corrupted/broken up.1381 */1382if(!memcmp("@@ -", line,4)) {1383struct fragment dummy;1384if(parse_fragment_header(line, len, &dummy) <0)1385continue;1386die("patch fragment without header at line%d: %.*s",1387 linenr, (int)len-1, line);1388}13891390if(size < len +6)1391break;13921393/*1394 * Git patch? It might not have a real patch, just a rename1395 * or mode change, so we handle that specially1396 */1397if(!memcmp("diff --git ", line,11)) {1398int git_hdr_len =parse_git_header(line, len, size, patch);1399if(git_hdr_len <= len)1400continue;1401if(!patch->old_name && !patch->new_name) {1402if(!patch->def_name)1403die("git diff header lacks filename information when removing "1404"%dleading pathname components (line%d)", p_value, linenr);1405 patch->old_name = patch->new_name = patch->def_name;1406}1407 patch->is_toplevel_relative =1;1408*hdrsize = git_hdr_len;1409return offset;1410}14111412/* --- followed by +++ ? */1413if(memcmp("--- ", line,4) ||memcmp("+++ ", line + len,4))1414continue;14151416/*1417 * We only accept unified patches, so we want it to1418 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1419 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1420 */1421 nextlen =linelen(line + len, size - len);1422if(size < nextlen +14||memcmp("@@ -", line + len + nextlen,4))1423continue;14241425/* Ok, we'll consider it a patch */1426parse_traditional_patch(line, line+len, patch);1427*hdrsize = len + nextlen;1428 linenr +=2;1429return offset;1430}1431return-1;1432}14331434static voidrecord_ws_error(unsigned result,const char*line,int len,int linenr)1435{1436char*err;14371438if(!result)1439return;14401441 whitespace_error++;1442if(squelch_whitespace_errors &&1443 squelch_whitespace_errors < whitespace_error)1444return;14451446 err =whitespace_error_string(result);1447fprintf(stderr,"%s:%d:%s.\n%.*s\n",1448 patch_input_file, linenr, err, len, line);1449free(err);1450}14511452static voidcheck_whitespace(const char*line,int len,unsigned ws_rule)1453{1454unsigned result =ws_check(line +1, len -1, ws_rule);14551456record_ws_error(result, line +1, len -2, linenr);1457}14581459/*1460 * Parse a unified diff. Note that this really needs to parse each1461 * fragment separately, since the only way to know the difference1462 * between a "---" that is part of a patch, and a "---" that starts1463 * the next patch is to look at the line counts..1464 */1465static intparse_fragment(char*line,unsigned long size,1466struct patch *patch,struct fragment *fragment)1467{1468int added, deleted;1469int len =linelen(line, size), offset;1470unsigned long oldlines, newlines;1471unsigned long leading, trailing;14721473 offset =parse_fragment_header(line, len, fragment);1474if(offset <0)1475return-1;1476if(offset >0&& patch->recount)1477recount_diff(line + offset, size - offset, fragment);1478 oldlines = fragment->oldlines;1479 newlines = fragment->newlines;1480 leading =0;1481 trailing =0;14821483/* Parse the thing.. */1484 line += len;1485 size -= len;1486 linenr++;1487 added = deleted =0;1488for(offset = len;14890< size;1490 offset += len, size -= len, line += len, linenr++) {1491if(!oldlines && !newlines)1492break;1493 len =linelen(line, size);1494if(!len || line[len-1] !='\n')1495return-1;1496switch(*line) {1497default:1498return-1;1499case'\n':/* newer GNU diff, an empty context line */1500case' ':1501 oldlines--;1502 newlines--;1503if(!deleted && !added)1504 leading++;1505 trailing++;1506break;1507case'-':1508if(apply_in_reverse &&1509 ws_error_action != nowarn_ws_error)1510check_whitespace(line, len, patch->ws_rule);1511 deleted++;1512 oldlines--;1513 trailing =0;1514break;1515case'+':1516if(!apply_in_reverse &&1517 ws_error_action != nowarn_ws_error)1518check_whitespace(line, len, patch->ws_rule);1519 added++;1520 newlines--;1521 trailing =0;1522break;15231524/*1525 * We allow "\ No newline at end of file". Depending1526 * on locale settings when the patch was produced we1527 * don't know what this line looks like. The only1528 * thing we do know is that it begins with "\ ".1529 * Checking for 12 is just for sanity check -- any1530 * l10n of "\ No newline..." is at least that long.1531 */1532case'\\':1533if(len <12||memcmp(line,"\\",2))1534return-1;1535break;1536}1537}1538if(oldlines || newlines)1539return-1;1540 fragment->leading = leading;1541 fragment->trailing = trailing;15421543/*1544 * If a fragment ends with an incomplete line, we failed to include1545 * it in the above loop because we hit oldlines == newlines == 01546 * before seeing it.1547 */1548if(12< size && !memcmp(line,"\\",2))1549 offset +=linelen(line, size);15501551 patch->lines_added += added;1552 patch->lines_deleted += deleted;15531554if(0< patch->is_new && oldlines)1555returnerror("new file depends on old contents");1556if(0< patch->is_delete && newlines)1557returnerror("deleted file still has contents");1558return offset;1559}15601561static intparse_single_patch(char*line,unsigned long size,struct patch *patch)1562{1563unsigned long offset =0;1564unsigned long oldlines =0, newlines =0, context =0;1565struct fragment **fragp = &patch->fragments;15661567while(size >4&& !memcmp(line,"@@ -",4)) {1568struct fragment *fragment;1569int len;15701571 fragment =xcalloc(1,sizeof(*fragment));1572 fragment->linenr = linenr;1573 len =parse_fragment(line, size, patch, fragment);1574if(len <=0)1575die("corrupt patch at line%d", linenr);1576 fragment->patch = line;1577 fragment->size = len;1578 oldlines += fragment->oldlines;1579 newlines += fragment->newlines;1580 context += fragment->leading + fragment->trailing;15811582*fragp = fragment;1583 fragp = &fragment->next;15841585 offset += len;1586 line += len;1587 size -= len;1588}15891590/*1591 * If something was removed (i.e. we have old-lines) it cannot1592 * be creation, and if something was added it cannot be1593 * deletion. However, the reverse is not true; --unified=01594 * patches that only add are not necessarily creation even1595 * though they do not have any old lines, and ones that only1596 * delete are not necessarily deletion.1597 *1598 * Unfortunately, a real creation/deletion patch do _not_ have1599 * any context line by definition, so we cannot safely tell it1600 * apart with --unified=0 insanity. At least if the patch has1601 * more than one hunk it is not creation or deletion.1602 */1603if(patch->is_new <0&&1604(oldlines || (patch->fragments && patch->fragments->next)))1605 patch->is_new =0;1606if(patch->is_delete <0&&1607(newlines || (patch->fragments && patch->fragments->next)))1608 patch->is_delete =0;16091610if(0< patch->is_new && oldlines)1611die("new file%sdepends on old contents", patch->new_name);1612if(0< patch->is_delete && newlines)1613die("deleted file%sstill has contents", patch->old_name);1614if(!patch->is_delete && !newlines && context)1615fprintf(stderr,"** warning: file%sbecomes empty but "1616"is not deleted\n", patch->new_name);16171618return offset;1619}16201621staticinlineintmetadata_changes(struct patch *patch)1622{1623return patch->is_rename >0||1624 patch->is_copy >0||1625 patch->is_new >0||1626 patch->is_delete ||1627(patch->old_mode && patch->new_mode &&1628 patch->old_mode != patch->new_mode);1629}16301631static char*inflate_it(const void*data,unsigned long size,1632unsigned long inflated_size)1633{1634 git_zstream stream;1635void*out;1636int st;16371638memset(&stream,0,sizeof(stream));16391640 stream.next_in = (unsigned char*)data;1641 stream.avail_in = size;1642 stream.next_out = out =xmalloc(inflated_size);1643 stream.avail_out = inflated_size;1644git_inflate_init(&stream);1645 st =git_inflate(&stream, Z_FINISH);1646git_inflate_end(&stream);1647if((st != Z_STREAM_END) || stream.total_out != inflated_size) {1648free(out);1649return NULL;1650}1651return out;1652}16531654static struct fragment *parse_binary_hunk(char**buf_p,1655unsigned long*sz_p,1656int*status_p,1657int*used_p)1658{1659/*1660 * Expect a line that begins with binary patch method ("literal"1661 * or "delta"), followed by the length of data before deflating.1662 * a sequence of 'length-byte' followed by base-85 encoded data1663 * should follow, terminated by a newline.1664 *1665 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1666 * and we would limit the patch line to 66 characters,1667 * so one line can fit up to 13 groups that would decode1668 * to 52 bytes max. The length byte 'A'-'Z' corresponds1669 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1670 */1671int llen, used;1672unsigned long size = *sz_p;1673char*buffer = *buf_p;1674int patch_method;1675unsigned long origlen;1676char*data = NULL;1677int hunk_size =0;1678struct fragment *frag;16791680 llen =linelen(buffer, size);1681 used = llen;16821683*status_p =0;16841685if(!prefixcmp(buffer,"delta ")) {1686 patch_method = BINARY_DELTA_DEFLATED;1687 origlen =strtoul(buffer +6, NULL,10);1688}1689else if(!prefixcmp(buffer,"literal ")) {1690 patch_method = BINARY_LITERAL_DEFLATED;1691 origlen =strtoul(buffer +8, NULL,10);1692}1693else1694return NULL;16951696 linenr++;1697 buffer += llen;1698while(1) {1699int byte_length, max_byte_length, newsize;1700 llen =linelen(buffer, size);1701 used += llen;1702 linenr++;1703if(llen ==1) {1704/* consume the blank line */1705 buffer++;1706 size--;1707break;1708}1709/*1710 * Minimum line is "A00000\n" which is 7-byte long,1711 * and the line length must be multiple of 5 plus 2.1712 */1713if((llen <7) || (llen-2) %5)1714goto corrupt;1715 max_byte_length = (llen -2) /5*4;1716 byte_length = *buffer;1717if('A'<= byte_length && byte_length <='Z')1718 byte_length = byte_length -'A'+1;1719else if('a'<= byte_length && byte_length <='z')1720 byte_length = byte_length -'a'+27;1721else1722goto corrupt;1723/* if the input length was not multiple of 4, we would1724 * have filler at the end but the filler should never1725 * exceed 3 bytes1726 */1727if(max_byte_length < byte_length ||1728 byte_length <= max_byte_length -4)1729goto corrupt;1730 newsize = hunk_size + byte_length;1731 data =xrealloc(data, newsize);1732if(decode_85(data + hunk_size, buffer +1, byte_length))1733goto corrupt;1734 hunk_size = newsize;1735 buffer += llen;1736 size -= llen;1737}17381739 frag =xcalloc(1,sizeof(*frag));1740 frag->patch =inflate_it(data, hunk_size, origlen);1741if(!frag->patch)1742goto corrupt;1743free(data);1744 frag->size = origlen;1745*buf_p = buffer;1746*sz_p = size;1747*used_p = used;1748 frag->binary_patch_method = patch_method;1749return frag;17501751 corrupt:1752free(data);1753*status_p = -1;1754error("corrupt binary patch at line%d: %.*s",1755 linenr-1, llen-1, buffer);1756return NULL;1757}17581759static intparse_binary(char*buffer,unsigned long size,struct patch *patch)1760{1761/*1762 * We have read "GIT binary patch\n"; what follows is a line1763 * that says the patch method (currently, either "literal" or1764 * "delta") and the length of data before deflating; a1765 * sequence of 'length-byte' followed by base-85 encoded data1766 * follows.1767 *1768 * When a binary patch is reversible, there is another binary1769 * hunk in the same format, starting with patch method (either1770 * "literal" or "delta") with the length of data, and a sequence1771 * of length-byte + base-85 encoded data, terminated with another1772 * empty line. This data, when applied to the postimage, produces1773 * the preimage.1774 */1775struct fragment *forward;1776struct fragment *reverse;1777int status;1778int used, used_1;17791780 forward =parse_binary_hunk(&buffer, &size, &status, &used);1781if(!forward && !status)1782/* there has to be one hunk (forward hunk) */1783returnerror("unrecognized binary patch at line%d", linenr-1);1784if(status)1785/* otherwise we already gave an error message */1786return status;17871788 reverse =parse_binary_hunk(&buffer, &size, &status, &used_1);1789if(reverse)1790 used += used_1;1791else if(status) {1792/*1793 * Not having reverse hunk is not an error, but having1794 * a corrupt reverse hunk is.1795 */1796free((void*) forward->patch);1797free(forward);1798return status;1799}1800 forward->next = reverse;1801 patch->fragments = forward;1802 patch->is_binary =1;1803return used;1804}18051806static intparse_chunk(char*buffer,unsigned long size,struct patch *patch)1807{1808int hdrsize, patchsize;1809int offset =find_header(buffer, size, &hdrsize, patch);18101811if(offset <0)1812return offset;18131814 patch->ws_rule =whitespace_rule(patch->new_name1815? patch->new_name1816: patch->old_name);18171818 patchsize =parse_single_patch(buffer + offset + hdrsize,1819 size - offset - hdrsize, patch);18201821if(!patchsize) {1822static const char*binhdr[] = {1823"Binary files ",1824"Files ",1825 NULL,1826};1827static const char git_binary[] ="GIT binary patch\n";1828int i;1829int hd = hdrsize + offset;1830unsigned long llen =linelen(buffer + hd, size - hd);18311832if(llen ==sizeof(git_binary) -1&&1833!memcmp(git_binary, buffer + hd, llen)) {1834int used;1835 linenr++;1836 used =parse_binary(buffer + hd + llen,1837 size - hd - llen, patch);1838if(used)1839 patchsize = used + llen;1840else1841 patchsize =0;1842}1843else if(!memcmp(" differ\n", buffer + hd + llen -8,8)) {1844for(i =0; binhdr[i]; i++) {1845int len =strlen(binhdr[i]);1846if(len < size - hd &&1847!memcmp(binhdr[i], buffer + hd, len)) {1848 linenr++;1849 patch->is_binary =1;1850 patchsize = llen;1851break;1852}1853}1854}18551856/* Empty patch cannot be applied if it is a text patch1857 * without metadata change. A binary patch appears1858 * empty to us here.1859 */1860if((apply || check) &&1861(!patch->is_binary && !metadata_changes(patch)))1862die("patch with only garbage at line%d", linenr);1863}18641865return offset + hdrsize + patchsize;1866}18671868#define swap(a,b) myswap((a),(b),sizeof(a))18691870#define myswap(a, b, size) do { \1871 unsigned char mytmp[size]; \1872 memcpy(mytmp, &a, size); \1873 memcpy(&a, &b, size); \1874 memcpy(&b, mytmp, size); \1875} while (0)18761877static voidreverse_patches(struct patch *p)1878{1879for(; p; p = p->next) {1880struct fragment *frag = p->fragments;18811882swap(p->new_name, p->old_name);1883swap(p->new_mode, p->old_mode);1884swap(p->is_new, p->is_delete);1885swap(p->lines_added, p->lines_deleted);1886swap(p->old_sha1_prefix, p->new_sha1_prefix);18871888for(; frag; frag = frag->next) {1889swap(frag->newpos, frag->oldpos);1890swap(frag->newlines, frag->oldlines);1891}1892}1893}18941895static const char pluses[] =1896"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";1897static const char minuses[]=1898"----------------------------------------------------------------------";18991900static voidshow_stats(struct patch *patch)1901{1902struct strbuf qname = STRBUF_INIT;1903char*cp = patch->new_name ? patch->new_name : patch->old_name;1904int max, add, del;19051906quote_c_style(cp, &qname, NULL,0);19071908/*1909 * "scale" the filename1910 */1911 max = max_len;1912if(max >50)1913 max =50;19141915if(qname.len > max) {1916 cp =strchr(qname.buf + qname.len +3- max,'/');1917if(!cp)1918 cp = qname.buf + qname.len +3- max;1919strbuf_splice(&qname,0, cp - qname.buf,"...",3);1920}19211922if(patch->is_binary) {1923printf(" %-*s | Bin\n", max, qname.buf);1924strbuf_release(&qname);1925return;1926}19271928printf(" %-*s |", max, qname.buf);1929strbuf_release(&qname);19301931/*1932 * scale the add/delete1933 */1934 max = max + max_change >70?70- max : max_change;1935 add = patch->lines_added;1936 del = patch->lines_deleted;19371938if(max_change >0) {1939int total = ((add + del) * max + max_change /2) / max_change;1940 add = (add * max + max_change /2) / max_change;1941 del = total - add;1942}1943printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,1944 add, pluses, del, minuses);1945}19461947static intread_old_data(struct stat *st,const char*path,struct strbuf *buf)1948{1949switch(st->st_mode & S_IFMT) {1950case S_IFLNK:1951if(strbuf_readlink(buf, path, st->st_size) <0)1952returnerror("unable to read symlink%s", path);1953return0;1954case S_IFREG:1955if(strbuf_read_file(buf, path, st->st_size) != st->st_size)1956returnerror("unable to open or read%s", path);1957convert_to_git(path, buf->buf, buf->len, buf,0);1958return0;1959default:1960return-1;1961}1962}19631964/*1965 * Update the preimage, and the common lines in postimage,1966 * from buffer buf of length len. If postlen is 0 the postimage1967 * is updated in place, otherwise it's updated on a new buffer1968 * of length postlen1969 */19701971static voidupdate_pre_post_images(struct image *preimage,1972struct image *postimage,1973char*buf,1974size_t len,size_t postlen)1975{1976int i, ctx;1977char*new, *old, *fixed;1978struct image fixed_preimage;19791980/*1981 * Update the preimage with whitespace fixes. Note that we1982 * are not losing preimage->buf -- apply_one_fragment() will1983 * free "oldlines".1984 */1985prepare_image(&fixed_preimage, buf, len,1);1986assert(fixed_preimage.nr == preimage->nr);1987for(i =0; i < preimage->nr; i++)1988 fixed_preimage.line[i].flag = preimage->line[i].flag;1989free(preimage->line_allocated);1990*preimage = fixed_preimage;19911992/*1993 * Adjust the common context lines in postimage. This can be1994 * done in-place when we are just doing whitespace fixing,1995 * which does not make the string grow, but needs a new buffer1996 * when ignoring whitespace causes the update, since in this case1997 * we could have e.g. tabs converted to multiple spaces.1998 * We trust the caller to tell us if the update can be done1999 * in place (postlen==0) or not.2000 */2001 old = postimage->buf;2002if(postlen)2003new= postimage->buf =xmalloc(postlen);2004else2005new= old;2006 fixed = preimage->buf;2007for(i = ctx =0; i < postimage->nr; i++) {2008size_t len = postimage->line[i].len;2009if(!(postimage->line[i].flag & LINE_COMMON)) {2010/* an added line -- no counterparts in preimage */2011memmove(new, old, len);2012 old += len;2013new+= len;2014continue;2015}20162017/* a common context -- skip it in the original postimage */2018 old += len;20192020/* and find the corresponding one in the fixed preimage */2021while(ctx < preimage->nr &&2022!(preimage->line[ctx].flag & LINE_COMMON)) {2023 fixed += preimage->line[ctx].len;2024 ctx++;2025}2026if(preimage->nr <= ctx)2027die("oops");20282029/* and copy it in, while fixing the line length */2030 len = preimage->line[ctx].len;2031memcpy(new, fixed, len);2032new+= len;2033 fixed += len;2034 postimage->line[i].len = len;2035 ctx++;2036}20372038/* Fix the length of the whole thing */2039 postimage->len =new- postimage->buf;2040}20412042static intmatch_fragment(struct image *img,2043struct image *preimage,2044struct image *postimage,2045unsigned longtry,2046int try_lno,2047unsigned ws_rule,2048int match_beginning,int match_end)2049{2050int i;2051char*fixed_buf, *buf, *orig, *target;2052struct strbuf fixed;2053size_t fixed_len;2054int preimage_limit;20552056if(preimage->nr + try_lno <= img->nr) {2057/*2058 * The hunk falls within the boundaries of img.2059 */2060 preimage_limit = preimage->nr;2061if(match_end && (preimage->nr + try_lno != img->nr))2062return0;2063}else if(ws_error_action == correct_ws_error &&2064(ws_rule & WS_BLANK_AT_EOF)) {2065/*2066 * This hunk extends beyond the end of img, and we are2067 * removing blank lines at the end of the file. This2068 * many lines from the beginning of the preimage must2069 * match with img, and the remainder of the preimage2070 * must be blank.2071 */2072 preimage_limit = img->nr - try_lno;2073}else{2074/*2075 * The hunk extends beyond the end of the img and2076 * we are not removing blanks at the end, so we2077 * should reject the hunk at this position.2078 */2079return0;2080}20812082if(match_beginning && try_lno)2083return0;20842085/* Quick hash check */2086for(i =0; i < preimage_limit; i++)2087if((img->line[try_lno + i].flag & LINE_PATCHED) ||2088(preimage->line[i].hash != img->line[try_lno + i].hash))2089return0;20902091if(preimage_limit == preimage->nr) {2092/*2093 * Do we have an exact match? If we were told to match2094 * at the end, size must be exactly at try+fragsize,2095 * otherwise try+fragsize must be still within the preimage,2096 * and either case, the old piece should match the preimage2097 * exactly.2098 */2099if((match_end2100? (try+ preimage->len == img->len)2101: (try+ preimage->len <= img->len)) &&2102!memcmp(img->buf +try, preimage->buf, preimage->len))2103return1;2104}else{2105/*2106 * The preimage extends beyond the end of img, so2107 * there cannot be an exact match.2108 *2109 * There must be one non-blank context line that match2110 * a line before the end of img.2111 */2112char*buf_end;21132114 buf = preimage->buf;2115 buf_end = buf;2116for(i =0; i < preimage_limit; i++)2117 buf_end += preimage->line[i].len;21182119for( ; buf < buf_end; buf++)2120if(!isspace(*buf))2121break;2122if(buf == buf_end)2123return0;2124}21252126/*2127 * No exact match. If we are ignoring whitespace, run a line-by-line2128 * fuzzy matching. We collect all the line length information because2129 * we need it to adjust whitespace if we match.2130 */2131if(ws_ignore_action == ignore_ws_change) {2132size_t imgoff =0;2133size_t preoff =0;2134size_t postlen = postimage->len;2135size_t extra_chars;2136char*preimage_eof;2137char*preimage_end;2138for(i =0; i < preimage_limit; i++) {2139size_t prelen = preimage->line[i].len;2140size_t imglen = img->line[try_lno+i].len;21412142if(!fuzzy_matchlines(img->buf +try+ imgoff, imglen,2143 preimage->buf + preoff, prelen))2144return0;2145if(preimage->line[i].flag & LINE_COMMON)2146 postlen += imglen - prelen;2147 imgoff += imglen;2148 preoff += prelen;2149}21502151/*2152 * Ok, the preimage matches with whitespace fuzz.2153 *2154 * imgoff now holds the true length of the target that2155 * matches the preimage before the end of the file.2156 *2157 * Count the number of characters in the preimage that fall2158 * beyond the end of the file and make sure that all of them2159 * are whitespace characters. (This can only happen if2160 * we are removing blank lines at the end of the file.)2161 */2162 buf = preimage_eof = preimage->buf + preoff;2163for( ; i < preimage->nr; i++)2164 preoff += preimage->line[i].len;2165 preimage_end = preimage->buf + preoff;2166for( ; buf < preimage_end; buf++)2167if(!isspace(*buf))2168return0;21692170/*2171 * Update the preimage and the common postimage context2172 * lines to use the same whitespace as the target.2173 * If whitespace is missing in the target (i.e.2174 * if the preimage extends beyond the end of the file),2175 * use the whitespace from the preimage.2176 */2177 extra_chars = preimage_end - preimage_eof;2178strbuf_init(&fixed, imgoff + extra_chars);2179strbuf_add(&fixed, img->buf +try, imgoff);2180strbuf_add(&fixed, preimage_eof, extra_chars);2181 fixed_buf =strbuf_detach(&fixed, &fixed_len);2182update_pre_post_images(preimage, postimage,2183 fixed_buf, fixed_len, postlen);2184return1;2185}21862187if(ws_error_action != correct_ws_error)2188return0;21892190/*2191 * The hunk does not apply byte-by-byte, but the hash says2192 * it might with whitespace fuzz. We haven't been asked to2193 * ignore whitespace, we were asked to correct whitespace2194 * errors, so let's try matching after whitespace correction.2195 *2196 * The preimage may extend beyond the end of the file,2197 * but in this loop we will only handle the part of the2198 * preimage that falls within the file.2199 */2200strbuf_init(&fixed, preimage->len +1);2201 orig = preimage->buf;2202 target = img->buf +try;2203for(i =0; i < preimage_limit; i++) {2204size_t oldlen = preimage->line[i].len;2205size_t tgtlen = img->line[try_lno + i].len;2206size_t fixstart = fixed.len;2207struct strbuf tgtfix;2208int match;22092210/* Try fixing the line in the preimage */2211ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);22122213/* Try fixing the line in the target */2214strbuf_init(&tgtfix, tgtlen);2215ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);22162217/*2218 * If they match, either the preimage was based on2219 * a version before our tree fixed whitespace breakage,2220 * or we are lacking a whitespace-fix patch the tree2221 * the preimage was based on already had (i.e. target2222 * has whitespace breakage, the preimage doesn't).2223 * In either case, we are fixing the whitespace breakages2224 * so we might as well take the fix together with their2225 * real change.2226 */2227 match = (tgtfix.len == fixed.len - fixstart &&2228!memcmp(tgtfix.buf, fixed.buf + fixstart,2229 fixed.len - fixstart));22302231strbuf_release(&tgtfix);2232if(!match)2233goto unmatch_exit;22342235 orig += oldlen;2236 target += tgtlen;2237}223822392240/*2241 * Now handle the lines in the preimage that falls beyond the2242 * end of the file (if any). They will only match if they are2243 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2244 * false).2245 */2246for( ; i < preimage->nr; i++) {2247size_t fixstart = fixed.len;/* start of the fixed preimage */2248size_t oldlen = preimage->line[i].len;2249int j;22502251/* Try fixing the line in the preimage */2252ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);22532254for(j = fixstart; j < fixed.len; j++)2255if(!isspace(fixed.buf[j]))2256goto unmatch_exit;22572258 orig += oldlen;2259}22602261/*2262 * Yes, the preimage is based on an older version that still2263 * has whitespace breakages unfixed, and fixing them makes the2264 * hunk match. Update the context lines in the postimage.2265 */2266 fixed_buf =strbuf_detach(&fixed, &fixed_len);2267update_pre_post_images(preimage, postimage,2268 fixed_buf, fixed_len,0);2269return1;22702271 unmatch_exit:2272strbuf_release(&fixed);2273return0;2274}22752276static intfind_pos(struct image *img,2277struct image *preimage,2278struct image *postimage,2279int line,2280unsigned ws_rule,2281int match_beginning,int match_end)2282{2283int i;2284unsigned long backwards, forwards,try;2285int backwards_lno, forwards_lno, try_lno;22862287/*2288 * If match_beginning or match_end is specified, there is no2289 * point starting from a wrong line that will never match and2290 * wander around and wait for a match at the specified end.2291 */2292if(match_beginning)2293 line =0;2294else if(match_end)2295 line = img->nr - preimage->nr;22962297/*2298 * Because the comparison is unsigned, the following test2299 * will also take care of a negative line number that can2300 * result when match_end and preimage is larger than the target.2301 */2302if((size_t) line > img->nr)2303 line = img->nr;23042305try=0;2306for(i =0; i < line; i++)2307try+= img->line[i].len;23082309/*2310 * There's probably some smart way to do this, but I'll leave2311 * that to the smart and beautiful people. I'm simple and stupid.2312 */2313 backwards =try;2314 backwards_lno = line;2315 forwards =try;2316 forwards_lno = line;2317 try_lno = line;23182319for(i =0; ; i++) {2320if(match_fragment(img, preimage, postimage,2321try, try_lno, ws_rule,2322 match_beginning, match_end))2323return try_lno;23242325 again:2326if(backwards_lno ==0&& forwards_lno == img->nr)2327break;23282329if(i &1) {2330if(backwards_lno ==0) {2331 i++;2332goto again;2333}2334 backwards_lno--;2335 backwards -= img->line[backwards_lno].len;2336try= backwards;2337 try_lno = backwards_lno;2338}else{2339if(forwards_lno == img->nr) {2340 i++;2341goto again;2342}2343 forwards += img->line[forwards_lno].len;2344 forwards_lno++;2345try= forwards;2346 try_lno = forwards_lno;2347}23482349}2350return-1;2351}23522353static voidremove_first_line(struct image *img)2354{2355 img->buf += img->line[0].len;2356 img->len -= img->line[0].len;2357 img->line++;2358 img->nr--;2359}23602361static voidremove_last_line(struct image *img)2362{2363 img->len -= img->line[--img->nr].len;2364}23652366static voidupdate_image(struct image *img,2367int applied_pos,2368struct image *preimage,2369struct image *postimage)2370{2371/*2372 * remove the copy of preimage at offset in img2373 * and replace it with postimage2374 */2375int i, nr;2376size_t remove_count, insert_count, applied_at =0;2377char*result;2378int preimage_limit;23792380/*2381 * If we are removing blank lines at the end of img,2382 * the preimage may extend beyond the end.2383 * If that is the case, we must be careful only to2384 * remove the part of the preimage that falls within2385 * the boundaries of img. Initialize preimage_limit2386 * to the number of lines in the preimage that falls2387 * within the boundaries.2388 */2389 preimage_limit = preimage->nr;2390if(preimage_limit > img->nr - applied_pos)2391 preimage_limit = img->nr - applied_pos;23922393for(i =0; i < applied_pos; i++)2394 applied_at += img->line[i].len;23952396 remove_count =0;2397for(i =0; i < preimage_limit; i++)2398 remove_count += img->line[applied_pos + i].len;2399 insert_count = postimage->len;24002401/* Adjust the contents */2402 result =xmalloc(img->len + insert_count - remove_count +1);2403memcpy(result, img->buf, applied_at);2404memcpy(result + applied_at, postimage->buf, postimage->len);2405memcpy(result + applied_at + postimage->len,2406 img->buf + (applied_at + remove_count),2407 img->len - (applied_at + remove_count));2408free(img->buf);2409 img->buf = result;2410 img->len += insert_count - remove_count;2411 result[img->len] ='\0';24122413/* Adjust the line table */2414 nr = img->nr + postimage->nr - preimage_limit;2415if(preimage_limit < postimage->nr) {2416/*2417 * NOTE: this knows that we never call remove_first_line()2418 * on anything other than pre/post image.2419 */2420 img->line =xrealloc(img->line, nr *sizeof(*img->line));2421 img->line_allocated = img->line;2422}2423if(preimage_limit != postimage->nr)2424memmove(img->line + applied_pos + postimage->nr,2425 img->line + applied_pos + preimage_limit,2426(img->nr - (applied_pos + preimage_limit)) *2427sizeof(*img->line));2428memcpy(img->line + applied_pos,2429 postimage->line,2430 postimage->nr *sizeof(*img->line));2431if(!allow_overlap)2432for(i =0; i < postimage->nr; i++)2433 img->line[applied_pos + i].flag |= LINE_PATCHED;2434 img->nr = nr;2435}24362437static intapply_one_fragment(struct image *img,struct fragment *frag,2438int inaccurate_eof,unsigned ws_rule,2439int nth_fragment)2440{2441int match_beginning, match_end;2442const char*patch = frag->patch;2443int size = frag->size;2444char*old, *oldlines;2445struct strbuf newlines;2446int new_blank_lines_at_end =0;2447unsigned long leading, trailing;2448int pos, applied_pos;2449struct image preimage;2450struct image postimage;24512452memset(&preimage,0,sizeof(preimage));2453memset(&postimage,0,sizeof(postimage));2454 oldlines =xmalloc(size);2455strbuf_init(&newlines, size);24562457 old = oldlines;2458while(size >0) {2459char first;2460int len =linelen(patch, size);2461int plen;2462int added_blank_line =0;2463int is_blank_context =0;2464size_t start;24652466if(!len)2467break;24682469/*2470 * "plen" is how much of the line we should use for2471 * the actual patch data. Normally we just remove the2472 * first character on the line, but if the line is2473 * followed by "\ No newline", then we also remove the2474 * last one (which is the newline, of course).2475 */2476 plen = len -1;2477if(len < size && patch[len] =='\\')2478 plen--;2479 first = *patch;2480if(apply_in_reverse) {2481if(first =='-')2482 first ='+';2483else if(first =='+')2484 first ='-';2485}24862487switch(first) {2488case'\n':2489/* Newer GNU diff, empty context line */2490if(plen <0)2491/* ... followed by '\No newline'; nothing */2492break;2493*old++ ='\n';2494strbuf_addch(&newlines,'\n');2495add_line_info(&preimage,"\n",1, LINE_COMMON);2496add_line_info(&postimage,"\n",1, LINE_COMMON);2497 is_blank_context =1;2498break;2499case' ':2500if(plen && (ws_rule & WS_BLANK_AT_EOF) &&2501ws_blank_line(patch +1, plen, ws_rule))2502 is_blank_context =1;2503case'-':2504memcpy(old, patch +1, plen);2505add_line_info(&preimage, old, plen,2506(first ==' '? LINE_COMMON :0));2507 old += plen;2508if(first =='-')2509break;2510/* Fall-through for ' ' */2511case'+':2512/* --no-add does not add new lines */2513if(first =='+'&& no_add)2514break;25152516 start = newlines.len;2517if(first !='+'||2518!whitespace_error ||2519 ws_error_action != correct_ws_error) {2520strbuf_add(&newlines, patch +1, plen);2521}2522else{2523ws_fix_copy(&newlines, patch +1, plen, ws_rule, &applied_after_fixing_ws);2524}2525add_line_info(&postimage, newlines.buf + start, newlines.len - start,2526(first =='+'?0: LINE_COMMON));2527if(first =='+'&&2528(ws_rule & WS_BLANK_AT_EOF) &&2529ws_blank_line(patch +1, plen, ws_rule))2530 added_blank_line =1;2531break;2532case'@':case'\\':2533/* Ignore it, we already handled it */2534break;2535default:2536if(apply_verbosely)2537error("invalid start of line: '%c'", first);2538return-1;2539}2540if(added_blank_line)2541 new_blank_lines_at_end++;2542else if(is_blank_context)2543;2544else2545 new_blank_lines_at_end =0;2546 patch += len;2547 size -= len;2548}2549if(inaccurate_eof &&2550 old > oldlines && old[-1] =='\n'&&2551 newlines.len >0&& newlines.buf[newlines.len -1] =='\n') {2552 old--;2553strbuf_setlen(&newlines, newlines.len -1);2554}25552556 leading = frag->leading;2557 trailing = frag->trailing;25582559/*2560 * A hunk to change lines at the beginning would begin with2561 * @@ -1,L +N,M @@2562 * but we need to be careful. -U0 that inserts before the second2563 * line also has this pattern.2564 *2565 * And a hunk to add to an empty file would begin with2566 * @@ -0,0 +N,M @@2567 *2568 * In other words, a hunk that is (frag->oldpos <= 1) with or2569 * without leading context must match at the beginning.2570 */2571 match_beginning = (!frag->oldpos ||2572(frag->oldpos ==1&& !unidiff_zero));25732574/*2575 * A hunk without trailing lines must match at the end.2576 * However, we simply cannot tell if a hunk must match end2577 * from the lack of trailing lines if the patch was generated2578 * with unidiff without any context.2579 */2580 match_end = !unidiff_zero && !trailing;25812582 pos = frag->newpos ? (frag->newpos -1) :0;2583 preimage.buf = oldlines;2584 preimage.len = old - oldlines;2585 postimage.buf = newlines.buf;2586 postimage.len = newlines.len;2587 preimage.line = preimage.line_allocated;2588 postimage.line = postimage.line_allocated;25892590for(;;) {25912592 applied_pos =find_pos(img, &preimage, &postimage, pos,2593 ws_rule, match_beginning, match_end);25942595if(applied_pos >=0)2596break;25972598/* Am I at my context limits? */2599if((leading <= p_context) && (trailing <= p_context))2600break;2601if(match_beginning || match_end) {2602 match_beginning = match_end =0;2603continue;2604}26052606/*2607 * Reduce the number of context lines; reduce both2608 * leading and trailing if they are equal otherwise2609 * just reduce the larger context.2610 */2611if(leading >= trailing) {2612remove_first_line(&preimage);2613remove_first_line(&postimage);2614 pos--;2615 leading--;2616}2617if(trailing > leading) {2618remove_last_line(&preimage);2619remove_last_line(&postimage);2620 trailing--;2621}2622}26232624if(applied_pos >=0) {2625if(new_blank_lines_at_end &&2626 preimage.nr + applied_pos >= img->nr &&2627(ws_rule & WS_BLANK_AT_EOF) &&2628 ws_error_action != nowarn_ws_error) {2629record_ws_error(WS_BLANK_AT_EOF,"+",1, frag->linenr);2630if(ws_error_action == correct_ws_error) {2631while(new_blank_lines_at_end--)2632remove_last_line(&postimage);2633}2634/*2635 * We would want to prevent write_out_results()2636 * from taking place in apply_patch() that follows2637 * the callchain led us here, which is:2638 * apply_patch->check_patch_list->check_patch->2639 * apply_data->apply_fragments->apply_one_fragment2640 */2641if(ws_error_action == die_on_ws_error)2642 apply =0;2643}26442645if(apply_verbosely && applied_pos != pos) {2646int offset = applied_pos - pos;2647if(apply_in_reverse)2648 offset =0- offset;2649fprintf(stderr,2650"Hunk #%dsucceeded at%d(offset%dlines).\n",2651 nth_fragment, applied_pos +1, offset);2652}26532654/*2655 * Warn if it was necessary to reduce the number2656 * of context lines.2657 */2658if((leading != frag->leading) ||2659(trailing != frag->trailing))2660fprintf(stderr,"Context reduced to (%ld/%ld)"2661" to apply fragment at%d\n",2662 leading, trailing, applied_pos+1);2663update_image(img, applied_pos, &preimage, &postimage);2664}else{2665if(apply_verbosely)2666error("while searching for:\n%.*s",2667(int)(old - oldlines), oldlines);2668}26692670free(oldlines);2671strbuf_release(&newlines);2672free(preimage.line_allocated);2673free(postimage.line_allocated);26742675return(applied_pos <0);2676}26772678static intapply_binary_fragment(struct image *img,struct patch *patch)2679{2680struct fragment *fragment = patch->fragments;2681unsigned long len;2682void*dst;26832684if(!fragment)2685returnerror("missing binary patch data for '%s'",2686 patch->new_name ?2687 patch->new_name :2688 patch->old_name);26892690/* Binary patch is irreversible without the optional second hunk */2691if(apply_in_reverse) {2692if(!fragment->next)2693returnerror("cannot reverse-apply a binary patch "2694"without the reverse hunk to '%s'",2695 patch->new_name2696? patch->new_name : patch->old_name);2697 fragment = fragment->next;2698}2699switch(fragment->binary_patch_method) {2700case BINARY_DELTA_DEFLATED:2701 dst =patch_delta(img->buf, img->len, fragment->patch,2702 fragment->size, &len);2703if(!dst)2704return-1;2705clear_image(img);2706 img->buf = dst;2707 img->len = len;2708return0;2709case BINARY_LITERAL_DEFLATED:2710clear_image(img);2711 img->len = fragment->size;2712 img->buf =xmalloc(img->len+1);2713memcpy(img->buf, fragment->patch, img->len);2714 img->buf[img->len] ='\0';2715return0;2716}2717return-1;2718}27192720static intapply_binary(struct image *img,struct patch *patch)2721{2722const char*name = patch->old_name ? patch->old_name : patch->new_name;2723unsigned char sha1[20];27242725/*2726 * For safety, we require patch index line to contain2727 * full 40-byte textual SHA1 for old and new, at least for now.2728 */2729if(strlen(patch->old_sha1_prefix) !=40||2730strlen(patch->new_sha1_prefix) !=40||2731get_sha1_hex(patch->old_sha1_prefix, sha1) ||2732get_sha1_hex(patch->new_sha1_prefix, sha1))2733returnerror("cannot apply binary patch to '%s' "2734"without full index line", name);27352736if(patch->old_name) {2737/*2738 * See if the old one matches what the patch2739 * applies to.2740 */2741hash_sha1_file(img->buf, img->len, blob_type, sha1);2742if(strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2743returnerror("the patch applies to '%s' (%s), "2744"which does not match the "2745"current contents.",2746 name,sha1_to_hex(sha1));2747}2748else{2749/* Otherwise, the old one must be empty. */2750if(img->len)2751returnerror("the patch applies to an empty "2752"'%s' but it is not empty", name);2753}27542755get_sha1_hex(patch->new_sha1_prefix, sha1);2756if(is_null_sha1(sha1)) {2757clear_image(img);2758return0;/* deletion patch */2759}27602761if(has_sha1_file(sha1)) {2762/* We already have the postimage */2763enum object_type type;2764unsigned long size;2765char*result;27662767 result =read_sha1_file(sha1, &type, &size);2768if(!result)2769returnerror("the necessary postimage%sfor "2770"'%s' cannot be read",2771 patch->new_sha1_prefix, name);2772clear_image(img);2773 img->buf = result;2774 img->len = size;2775}else{2776/*2777 * We have verified buf matches the preimage;2778 * apply the patch data to it, which is stored2779 * in the patch->fragments->{patch,size}.2780 */2781if(apply_binary_fragment(img, patch))2782returnerror("binary patch does not apply to '%s'",2783 name);27842785/* verify that the result matches */2786hash_sha1_file(img->buf, img->len, blob_type, sha1);2787if(strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))2788returnerror("binary patch to '%s' creates incorrect result (expecting%s, got%s)",2789 name, patch->new_sha1_prefix,sha1_to_hex(sha1));2790}27912792return0;2793}27942795static intapply_fragments(struct image *img,struct patch *patch)2796{2797struct fragment *frag = patch->fragments;2798const char*name = patch->old_name ? patch->old_name : patch->new_name;2799unsigned ws_rule = patch->ws_rule;2800unsigned inaccurate_eof = patch->inaccurate_eof;2801int nth =0;28022803if(patch->is_binary)2804returnapply_binary(img, patch);28052806while(frag) {2807 nth++;2808if(apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {2809error("patch failed:%s:%ld", name, frag->oldpos);2810if(!apply_with_reject)2811return-1;2812 frag->rejected =1;2813}2814 frag = frag->next;2815}2816return0;2817}28182819static intread_file_or_gitlink(struct cache_entry *ce,struct strbuf *buf)2820{2821if(!ce)2822return0;28232824if(S_ISGITLINK(ce->ce_mode)) {2825strbuf_grow(buf,100);2826strbuf_addf(buf,"Subproject commit%s\n",sha1_to_hex(ce->sha1));2827}else{2828enum object_type type;2829unsigned long sz;2830char*result;28312832 result =read_sha1_file(ce->sha1, &type, &sz);2833if(!result)2834return-1;2835/* XXX read_sha1_file NUL-terminates */2836strbuf_attach(buf, result, sz, sz +1);2837}2838return0;2839}28402841static struct patch *in_fn_table(const char*name)2842{2843struct string_list_item *item;28442845if(name == NULL)2846return NULL;28472848 item =string_list_lookup(&fn_table, name);2849if(item != NULL)2850return(struct patch *)item->util;28512852return NULL;2853}28542855/*2856 * item->util in the filename table records the status of the path.2857 * Usually it points at a patch (whose result records the contents2858 * of it after applying it), but it could be PATH_WAS_DELETED for a2859 * path that a previously applied patch has already removed.2860 */2861#define PATH_TO_BE_DELETED ((struct patch *) -2)2862#define PATH_WAS_DELETED ((struct patch *) -1)28632864static intto_be_deleted(struct patch *patch)2865{2866return patch == PATH_TO_BE_DELETED;2867}28682869static intwas_deleted(struct patch *patch)2870{2871return patch == PATH_WAS_DELETED;2872}28732874static voidadd_to_fn_table(struct patch *patch)2875{2876struct string_list_item *item;28772878/*2879 * Always add new_name unless patch is a deletion2880 * This should cover the cases for normal diffs,2881 * file creations and copies2882 */2883if(patch->new_name != NULL) {2884 item =string_list_insert(&fn_table, patch->new_name);2885 item->util = patch;2886}28872888/*2889 * store a failure on rename/deletion cases because2890 * later chunks shouldn't patch old names2891 */2892if((patch->new_name == NULL) || (patch->is_rename)) {2893 item =string_list_insert(&fn_table, patch->old_name);2894 item->util = PATH_WAS_DELETED;2895}2896}28972898static voidprepare_fn_table(struct patch *patch)2899{2900/*2901 * store information about incoming file deletion2902 */2903while(patch) {2904if((patch->new_name == NULL) || (patch->is_rename)) {2905struct string_list_item *item;2906 item =string_list_insert(&fn_table, patch->old_name);2907 item->util = PATH_TO_BE_DELETED;2908}2909 patch = patch->next;2910}2911}29122913static intapply_data(struct patch *patch,struct stat *st,struct cache_entry *ce)2914{2915struct strbuf buf = STRBUF_INIT;2916struct image image;2917size_t len;2918char*img;2919struct patch *tpatch;29202921if(!(patch->is_copy || patch->is_rename) &&2922(tpatch =in_fn_table(patch->old_name)) != NULL && !to_be_deleted(tpatch)) {2923if(was_deleted(tpatch)) {2924returnerror("patch%shas been renamed/deleted",2925 patch->old_name);2926}2927/* We have a patched copy in memory use that */2928strbuf_add(&buf, tpatch->result, tpatch->resultsize);2929}else if(cached) {2930if(read_file_or_gitlink(ce, &buf))2931returnerror("read of%sfailed", patch->old_name);2932}else if(patch->old_name) {2933if(S_ISGITLINK(patch->old_mode)) {2934if(ce) {2935read_file_or_gitlink(ce, &buf);2936}else{2937/*2938 * There is no way to apply subproject2939 * patch without looking at the index.2940 */2941 patch->fragments = NULL;2942}2943}else{2944if(read_old_data(st, patch->old_name, &buf))2945returnerror("read of%sfailed", patch->old_name);2946}2947}29482949 img =strbuf_detach(&buf, &len);2950prepare_image(&image, img, len, !patch->is_binary);29512952if(apply_fragments(&image, patch) <0)2953return-1;/* note with --reject this succeeds. */2954 patch->result = image.buf;2955 patch->resultsize = image.len;2956add_to_fn_table(patch);2957free(image.line_allocated);29582959if(0< patch->is_delete && patch->resultsize)2960returnerror("removal patch leaves file contents");29612962return0;2963}29642965static intcheck_to_create_blob(const char*new_name,int ok_if_exists)2966{2967struct stat nst;2968if(!lstat(new_name, &nst)) {2969if(S_ISDIR(nst.st_mode) || ok_if_exists)2970return0;2971/*2972 * A leading component of new_name might be a symlink2973 * that is going to be removed with this patch, but2974 * still pointing at somewhere that has the path.2975 * In such a case, path "new_name" does not exist as2976 * far as git is concerned.2977 */2978if(has_symlink_leading_path(new_name,strlen(new_name)))2979return0;29802981returnerror("%s: already exists in working directory", new_name);2982}2983else if((errno != ENOENT) && (errno != ENOTDIR))2984returnerror("%s:%s", new_name,strerror(errno));2985return0;2986}29872988static intverify_index_match(struct cache_entry *ce,struct stat *st)2989{2990if(S_ISGITLINK(ce->ce_mode)) {2991if(!S_ISDIR(st->st_mode))2992return-1;2993return0;2994}2995returnce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);2996}29972998static intcheck_preimage(struct patch *patch,struct cache_entry **ce,struct stat *st)2999{3000const char*old_name = patch->old_name;3001struct patch *tpatch = NULL;3002int stat_ret =0;3003unsigned st_mode =0;30043005/*3006 * Make sure that we do not have local modifications from the3007 * index when we are looking at the index. Also make sure3008 * we have the preimage file to be patched in the work tree,3009 * unless --cached, which tells git to apply only in the index.3010 */3011if(!old_name)3012return0;30133014assert(patch->is_new <=0);30153016if(!(patch->is_copy || patch->is_rename) &&3017(tpatch =in_fn_table(old_name)) != NULL && !to_be_deleted(tpatch)) {3018if(was_deleted(tpatch))3019returnerror("%s: has been deleted/renamed", old_name);3020 st_mode = tpatch->new_mode;3021}else if(!cached) {3022 stat_ret =lstat(old_name, st);3023if(stat_ret && errno != ENOENT)3024returnerror("%s:%s", old_name,strerror(errno));3025}30263027if(to_be_deleted(tpatch))3028 tpatch = NULL;30293030if(check_index && !tpatch) {3031int pos =cache_name_pos(old_name,strlen(old_name));3032if(pos <0) {3033if(patch->is_new <0)3034goto is_new;3035returnerror("%s: does not exist in index", old_name);3036}3037*ce = active_cache[pos];3038if(stat_ret <0) {3039struct checkout costate;3040/* checkout */3041memset(&costate,0,sizeof(costate));3042 costate.base_dir ="";3043 costate.refresh_cache =1;3044if(checkout_entry(*ce, &costate, NULL) ||3045lstat(old_name, st))3046return-1;3047}3048if(!cached &&verify_index_match(*ce, st))3049returnerror("%s: does not match index", old_name);3050if(cached)3051 st_mode = (*ce)->ce_mode;3052}else if(stat_ret <0) {3053if(patch->is_new <0)3054goto is_new;3055returnerror("%s:%s", old_name,strerror(errno));3056}30573058if(!cached && !tpatch)3059 st_mode =ce_mode_from_stat(*ce, st->st_mode);30603061if(patch->is_new <0)3062 patch->is_new =0;3063if(!patch->old_mode)3064 patch->old_mode = st_mode;3065if((st_mode ^ patch->old_mode) & S_IFMT)3066returnerror("%s: wrong type", old_name);3067if(st_mode != patch->old_mode)3068warning("%shas type%o, expected%o",3069 old_name, st_mode, patch->old_mode);3070if(!patch->new_mode && !patch->is_delete)3071 patch->new_mode = st_mode;3072return0;30733074 is_new:3075 patch->is_new =1;3076 patch->is_delete =0;3077 patch->old_name = NULL;3078return0;3079}30803081static intcheck_patch(struct patch *patch)3082{3083struct stat st;3084const char*old_name = patch->old_name;3085const char*new_name = patch->new_name;3086const char*name = old_name ? old_name : new_name;3087struct cache_entry *ce = NULL;3088struct patch *tpatch;3089int ok_if_exists;3090int status;30913092 patch->rejected =1;/* we will drop this after we succeed */30933094 status =check_preimage(patch, &ce, &st);3095if(status)3096return status;3097 old_name = patch->old_name;30983099if((tpatch =in_fn_table(new_name)) &&3100(was_deleted(tpatch) ||to_be_deleted(tpatch)))3101/*3102 * A type-change diff is always split into a patch to3103 * delete old, immediately followed by a patch to3104 * create new (see diff.c::run_diff()); in such a case3105 * it is Ok that the entry to be deleted by the3106 * previous patch is still in the working tree and in3107 * the index.3108 */3109 ok_if_exists =1;3110else3111 ok_if_exists =0;31123113if(new_name &&3114((0< patch->is_new) | (0< patch->is_rename) | patch->is_copy)) {3115if(check_index &&3116cache_name_pos(new_name,strlen(new_name)) >=0&&3117!ok_if_exists)3118returnerror("%s: already exists in index", new_name);3119if(!cached) {3120int err =check_to_create_blob(new_name, ok_if_exists);3121if(err)3122return err;3123}3124if(!patch->new_mode) {3125if(0< patch->is_new)3126 patch->new_mode = S_IFREG |0644;3127else3128 patch->new_mode = patch->old_mode;3129}3130}31313132if(new_name && old_name) {3133int same = !strcmp(old_name, new_name);3134if(!patch->new_mode)3135 patch->new_mode = patch->old_mode;3136if((patch->old_mode ^ patch->new_mode) & S_IFMT)3137returnerror("new mode (%o) of%sdoes not match old mode (%o)%s%s",3138 patch->new_mode, new_name, patch->old_mode,3139 same ?"":" of ", same ?"": old_name);3140}31413142if(apply_data(patch, &st, ce) <0)3143returnerror("%s: patch does not apply", name);3144 patch->rejected =0;3145return0;3146}31473148static intcheck_patch_list(struct patch *patch)3149{3150int err =0;31513152prepare_fn_table(patch);3153while(patch) {3154if(apply_verbosely)3155say_patch_name(stderr,3156"Checking patch ", patch,"...\n");3157 err |=check_patch(patch);3158 patch = patch->next;3159}3160return err;3161}31623163/* This function tries to read the sha1 from the current index */3164static intget_current_sha1(const char*path,unsigned char*sha1)3165{3166int pos;31673168if(read_cache() <0)3169return-1;3170 pos =cache_name_pos(path,strlen(path));3171if(pos <0)3172return-1;3173hashcpy(sha1, active_cache[pos]->sha1);3174return0;3175}31763177/* Build an index that contains the just the files needed for a 3way merge */3178static voidbuild_fake_ancestor(struct patch *list,const char*filename)3179{3180struct patch *patch;3181struct index_state result = { NULL };3182int fd;31833184/* Once we start supporting the reverse patch, it may be3185 * worth showing the new sha1 prefix, but until then...3186 */3187for(patch = list; patch; patch = patch->next) {3188const unsigned char*sha1_ptr;3189unsigned char sha1[20];3190struct cache_entry *ce;3191const char*name;31923193 name = patch->old_name ? patch->old_name : patch->new_name;3194if(0< patch->is_new)3195continue;3196else if(get_sha1(patch->old_sha1_prefix, sha1))3197/* git diff has no index line for mode/type changes */3198if(!patch->lines_added && !patch->lines_deleted) {3199if(get_current_sha1(patch->old_name, sha1))3200die("mode change for%s, which is not "3201"in current HEAD", name);3202 sha1_ptr = sha1;3203}else3204die("sha1 information is lacking or useless "3205"(%s).", name);3206else3207 sha1_ptr = sha1;32083209 ce =make_cache_entry(patch->old_mode, sha1_ptr, name,0,0);3210if(!ce)3211die("make_cache_entry failed for path '%s'", name);3212if(add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))3213die("Could not add%sto temporary index", name);3214}32153216 fd =open(filename, O_WRONLY | O_CREAT,0666);3217if(fd <0||write_index(&result, fd) ||close(fd))3218die("Could not write temporary index to%s", filename);32193220discard_index(&result);3221}32223223static voidstat_patch_list(struct patch *patch)3224{3225int files, adds, dels;32263227for(files = adds = dels =0; patch ; patch = patch->next) {3228 files++;3229 adds += patch->lines_added;3230 dels += patch->lines_deleted;3231show_stats(patch);3232}32333234printf("%dfiles changed,%dinsertions(+),%ddeletions(-)\n", files, adds, dels);3235}32363237static voidnumstat_patch_list(struct patch *patch)3238{3239for( ; patch; patch = patch->next) {3240const char*name;3241 name = patch->new_name ? patch->new_name : patch->old_name;3242if(patch->is_binary)3243printf("-\t-\t");3244else3245printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);3246write_name_quoted(name, stdout, line_termination);3247}3248}32493250static voidshow_file_mode_name(const char*newdelete,unsigned int mode,const char*name)3251{3252if(mode)3253printf("%smode%06o%s\n", newdelete, mode, name);3254else3255printf("%s %s\n", newdelete, name);3256}32573258static voidshow_mode_change(struct patch *p,int show_name)3259{3260if(p->old_mode && p->new_mode && p->old_mode != p->new_mode) {3261if(show_name)3262printf(" mode change%06o =>%06o%s\n",3263 p->old_mode, p->new_mode, p->new_name);3264else3265printf(" mode change%06o =>%06o\n",3266 p->old_mode, p->new_mode);3267}3268}32693270static voidshow_rename_copy(struct patch *p)3271{3272const char*renamecopy = p->is_rename ?"rename":"copy";3273const char*old, *new;32743275/* Find common prefix */3276 old = p->old_name;3277new= p->new_name;3278while(1) {3279const char*slash_old, *slash_new;3280 slash_old =strchr(old,'/');3281 slash_new =strchr(new,'/');3282if(!slash_old ||3283!slash_new ||3284 slash_old - old != slash_new -new||3285memcmp(old,new, slash_new -new))3286break;3287 old = slash_old +1;3288new= slash_new +1;3289}3290/* p->old_name thru old is the common prefix, and old and new3291 * through the end of names are renames3292 */3293if(old != p->old_name)3294printf("%s%.*s{%s=>%s} (%d%%)\n", renamecopy,3295(int)(old - p->old_name), p->old_name,3296 old,new, p->score);3297else3298printf("%s %s=>%s(%d%%)\n", renamecopy,3299 p->old_name, p->new_name, p->score);3300show_mode_change(p,0);3301}33023303static voidsummary_patch_list(struct patch *patch)3304{3305struct patch *p;33063307for(p = patch; p; p = p->next) {3308if(p->is_new)3309show_file_mode_name("create", p->new_mode, p->new_name);3310else if(p->is_delete)3311show_file_mode_name("delete", p->old_mode, p->old_name);3312else{3313if(p->is_rename || p->is_copy)3314show_rename_copy(p);3315else{3316if(p->score) {3317printf(" rewrite%s(%d%%)\n",3318 p->new_name, p->score);3319show_mode_change(p,0);3320}3321else3322show_mode_change(p,1);3323}3324}3325}3326}33273328static voidpatch_stats(struct patch *patch)3329{3330int lines = patch->lines_added + patch->lines_deleted;33313332if(lines > max_change)3333 max_change = lines;3334if(patch->old_name) {3335int len =quote_c_style(patch->old_name, NULL, NULL,0);3336if(!len)3337 len =strlen(patch->old_name);3338if(len > max_len)3339 max_len = len;3340}3341if(patch->new_name) {3342int len =quote_c_style(patch->new_name, NULL, NULL,0);3343if(!len)3344 len =strlen(patch->new_name);3345if(len > max_len)3346 max_len = len;3347}3348}33493350static voidremove_file(struct patch *patch,int rmdir_empty)3351{3352if(update_index) {3353if(remove_file_from_cache(patch->old_name) <0)3354die("unable to remove%sfrom index", patch->old_name);3355}3356if(!cached) {3357if(!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {3358remove_path(patch->old_name);3359}3360}3361}33623363static voidadd_index_file(const char*path,unsigned mode,void*buf,unsigned long size)3364{3365struct stat st;3366struct cache_entry *ce;3367int namelen =strlen(path);3368unsigned ce_size =cache_entry_size(namelen);33693370if(!update_index)3371return;33723373 ce =xcalloc(1, ce_size);3374memcpy(ce->name, path, namelen);3375 ce->ce_mode =create_ce_mode(mode);3376 ce->ce_flags = namelen;3377if(S_ISGITLINK(mode)) {3378const char*s = buf;33793380if(get_sha1_hex(s +strlen("Subproject commit "), ce->sha1))3381die("corrupt patch for subproject%s", path);3382}else{3383if(!cached) {3384if(lstat(path, &st) <0)3385die_errno("unable to stat newly created file '%s'",3386 path);3387fill_stat_cache_info(ce, &st);3388}3389if(write_sha1_file(buf, size, blob_type, ce->sha1) <0)3390die("unable to create backing store for newly created file%s", path);3391}3392if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0)3393die("unable to add cache entry for%s", path);3394}33953396static inttry_create_file(const char*path,unsigned int mode,const char*buf,unsigned long size)3397{3398int fd;3399struct strbuf nbuf = STRBUF_INIT;34003401if(S_ISGITLINK(mode)) {3402struct stat st;3403if(!lstat(path, &st) &&S_ISDIR(st.st_mode))3404return0;3405returnmkdir(path,0777);3406}34073408if(has_symlinks &&S_ISLNK(mode))3409/* Although buf:size is counted string, it also is NUL3410 * terminated.3411 */3412returnsymlink(buf, path);34133414 fd =open(path, O_CREAT | O_EXCL | O_WRONLY, (mode &0100) ?0777:0666);3415if(fd <0)3416return-1;34173418if(convert_to_working_tree(path, buf, size, &nbuf)) {3419 size = nbuf.len;3420 buf = nbuf.buf;3421}3422write_or_die(fd, buf, size);3423strbuf_release(&nbuf);34243425if(close(fd) <0)3426die_errno("closing file '%s'", path);3427return0;3428}34293430/*3431 * We optimistically assume that the directories exist,3432 * which is true 99% of the time anyway. If they don't,3433 * we create them and try again.3434 */3435static voidcreate_one_file(char*path,unsigned mode,const char*buf,unsigned long size)3436{3437if(cached)3438return;3439if(!try_create_file(path, mode, buf, size))3440return;34413442if(errno == ENOENT) {3443if(safe_create_leading_directories(path))3444return;3445if(!try_create_file(path, mode, buf, size))3446return;3447}34483449if(errno == EEXIST || errno == EACCES) {3450/* We may be trying to create a file where a directory3451 * used to be.3452 */3453struct stat st;3454if(!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))3455 errno = EEXIST;3456}34573458if(errno == EEXIST) {3459unsigned int nr =getpid();34603461for(;;) {3462char newpath[PATH_MAX];3463mksnpath(newpath,sizeof(newpath),"%s~%u", path, nr);3464if(!try_create_file(newpath, mode, buf, size)) {3465if(!rename(newpath, path))3466return;3467unlink_or_warn(newpath);3468break;3469}3470if(errno != EEXIST)3471break;3472++nr;3473}3474}3475die_errno("unable to write file '%s' mode%o", path, mode);3476}34773478static voidcreate_file(struct patch *patch)3479{3480char*path = patch->new_name;3481unsigned mode = patch->new_mode;3482unsigned long size = patch->resultsize;3483char*buf = patch->result;34843485if(!mode)3486 mode = S_IFREG |0644;3487create_one_file(path, mode, buf, size);3488add_index_file(path, mode, buf, size);3489}34903491/* phase zero is to remove, phase one is to create */3492static voidwrite_out_one_result(struct patch *patch,int phase)3493{3494if(patch->is_delete >0) {3495if(phase ==0)3496remove_file(patch,1);3497return;3498}3499if(patch->is_new >0|| patch->is_copy) {3500if(phase ==1)3501create_file(patch);3502return;3503}3504/*3505 * Rename or modification boils down to the same3506 * thing: remove the old, write the new3507 */3508if(phase ==0)3509remove_file(patch, patch->is_rename);3510if(phase ==1)3511create_file(patch);3512}35133514static intwrite_out_one_reject(struct patch *patch)3515{3516FILE*rej;3517char namebuf[PATH_MAX];3518struct fragment *frag;3519int cnt =0;35203521for(cnt =0, frag = patch->fragments; frag; frag = frag->next) {3522if(!frag->rejected)3523continue;3524 cnt++;3525}35263527if(!cnt) {3528if(apply_verbosely)3529say_patch_name(stderr,3530"Applied patch ", patch," cleanly.\n");3531return0;3532}35333534/* This should not happen, because a removal patch that leaves3535 * contents are marked "rejected" at the patch level.3536 */3537if(!patch->new_name)3538die("internal error");35393540/* Say this even without --verbose */3541say_patch_name(stderr,"Applying patch ", patch," with");3542fprintf(stderr,"%drejects...\n", cnt);35433544 cnt =strlen(patch->new_name);3545if(ARRAY_SIZE(namebuf) <= cnt +5) {3546 cnt =ARRAY_SIZE(namebuf) -5;3547warning("truncating .rej filename to %.*s.rej",3548 cnt -1, patch->new_name);3549}3550memcpy(namebuf, patch->new_name, cnt);3551memcpy(namebuf + cnt,".rej",5);35523553 rej =fopen(namebuf,"w");3554if(!rej)3555returnerror("cannot open%s:%s", namebuf,strerror(errno));35563557/* Normal git tools never deal with .rej, so do not pretend3558 * this is a git patch by saying --git nor give extended3559 * headers. While at it, maybe please "kompare" that wants3560 * the trailing TAB and some garbage at the end of line ;-).3561 */3562fprintf(rej,"diff a/%sb/%s\t(rejected hunks)\n",3563 patch->new_name, patch->new_name);3564for(cnt =1, frag = patch->fragments;3565 frag;3566 cnt++, frag = frag->next) {3567if(!frag->rejected) {3568fprintf(stderr,"Hunk #%dapplied cleanly.\n", cnt);3569continue;3570}3571fprintf(stderr,"Rejected hunk #%d.\n", cnt);3572fprintf(rej,"%.*s", frag->size, frag->patch);3573if(frag->patch[frag->size-1] !='\n')3574fputc('\n', rej);3575}3576fclose(rej);3577return-1;3578}35793580static intwrite_out_results(struct patch *list,int skipped_patch)3581{3582int phase;3583int errs =0;3584struct patch *l;35853586if(!list && !skipped_patch)3587returnerror("No changes");35883589for(phase =0; phase <2; phase++) {3590 l = list;3591while(l) {3592if(l->rejected)3593 errs =1;3594else{3595write_out_one_result(l, phase);3596if(phase ==1&&write_out_one_reject(l))3597 errs =1;3598}3599 l = l->next;3600}3601}3602return errs;3603}36043605static struct lock_file lock_file;36063607static struct string_list limit_by_name;3608static int has_include;3609static voidadd_name_limit(const char*name,int exclude)3610{3611struct string_list_item *it;36123613 it =string_list_append(&limit_by_name, name);3614 it->util = exclude ? NULL : (void*)1;3615}36163617static intuse_patch(struct patch *p)3618{3619const char*pathname = p->new_name ? p->new_name : p->old_name;3620int i;36213622/* Paths outside are not touched regardless of "--include" */3623if(0< prefix_length) {3624int pathlen =strlen(pathname);3625if(pathlen <= prefix_length ||3626memcmp(prefix, pathname, prefix_length))3627return0;3628}36293630/* See if it matches any of exclude/include rule */3631for(i =0; i < limit_by_name.nr; i++) {3632struct string_list_item *it = &limit_by_name.items[i];3633if(!fnmatch(it->string, pathname,0))3634return(it->util != NULL);3635}36363637/*3638 * If we had any include, a path that does not match any rule is3639 * not used. Otherwise, we saw bunch of exclude rules (or none)3640 * and such a path is used.3641 */3642return!has_include;3643}364436453646static voidprefix_one(char**name)3647{3648char*old_name = *name;3649if(!old_name)3650return;3651*name =xstrdup(prefix_filename(prefix, prefix_length, *name));3652free(old_name);3653}36543655static voidprefix_patches(struct patch *p)3656{3657if(!prefix || p->is_toplevel_relative)3658return;3659for( ; p; p = p->next) {3660if(p->new_name == p->old_name) {3661char*prefixed = p->new_name;3662prefix_one(&prefixed);3663 p->new_name = p->old_name = prefixed;3664}3665else{3666prefix_one(&p->new_name);3667prefix_one(&p->old_name);3668}3669}3670}36713672#define INACCURATE_EOF (1<<0)3673#define RECOUNT (1<<1)36743675static intapply_patch(int fd,const char*filename,int options)3676{3677size_t offset;3678struct strbuf buf = STRBUF_INIT;3679struct patch *list = NULL, **listp = &list;3680int skipped_patch =0;36813682/* FIXME - memory leak when using multiple patch files as inputs */3683memset(&fn_table,0,sizeof(struct string_list));3684 patch_input_file = filename;3685read_patch_file(&buf, fd);3686 offset =0;3687while(offset < buf.len) {3688struct patch *patch;3689int nr;36903691 patch =xcalloc(1,sizeof(*patch));3692 patch->inaccurate_eof = !!(options & INACCURATE_EOF);3693 patch->recount = !!(options & RECOUNT);3694 nr =parse_chunk(buf.buf + offset, buf.len - offset, patch);3695if(nr <0)3696break;3697if(apply_in_reverse)3698reverse_patches(patch);3699if(prefix)3700prefix_patches(patch);3701if(use_patch(patch)) {3702patch_stats(patch);3703*listp = patch;3704 listp = &patch->next;3705}3706else{3707/* perhaps free it a bit better? */3708free(patch);3709 skipped_patch++;3710}3711 offset += nr;3712}37133714if(whitespace_error && (ws_error_action == die_on_ws_error))3715 apply =0;37163717 update_index = check_index && apply;3718if(update_index && newfd <0)3719 newfd =hold_locked_index(&lock_file,1);37203721if(check_index) {3722if(read_cache() <0)3723die("unable to read index file");3724}37253726if((check || apply) &&3727check_patch_list(list) <0&&3728!apply_with_reject)3729exit(1);37303731if(apply &&write_out_results(list, skipped_patch))3732exit(1);37333734if(fake_ancestor)3735build_fake_ancestor(list, fake_ancestor);37363737if(diffstat)3738stat_patch_list(list);37393740if(numstat)3741numstat_patch_list(list);37423743if(summary)3744summary_patch_list(list);37453746strbuf_release(&buf);3747return0;3748}37493750static intgit_apply_config(const char*var,const char*value,void*cb)3751{3752if(!strcmp(var,"apply.whitespace"))3753returngit_config_string(&apply_default_whitespace, var, value);3754else if(!strcmp(var,"apply.ignorewhitespace"))3755returngit_config_string(&apply_default_ignorewhitespace, var, value);3756returngit_default_config(var, value, cb);3757}37583759static intoption_parse_exclude(const struct option *opt,3760const char*arg,int unset)3761{3762add_name_limit(arg,1);3763return0;3764}37653766static intoption_parse_include(const struct option *opt,3767const char*arg,int unset)3768{3769add_name_limit(arg,0);3770 has_include =1;3771return0;3772}37733774static intoption_parse_p(const struct option *opt,3775const char*arg,int unset)3776{3777 p_value =atoi(arg);3778 p_value_known =1;3779return0;3780}37813782static intoption_parse_z(const struct option *opt,3783const char*arg,int unset)3784{3785if(unset)3786 line_termination ='\n';3787else3788 line_termination =0;3789return0;3790}37913792static intoption_parse_space_change(const struct option *opt,3793const char*arg,int unset)3794{3795if(unset)3796 ws_ignore_action = ignore_ws_none;3797else3798 ws_ignore_action = ignore_ws_change;3799return0;3800}38013802static intoption_parse_whitespace(const struct option *opt,3803const char*arg,int unset)3804{3805const char**whitespace_option = opt->value;38063807*whitespace_option = arg;3808parse_whitespace_option(arg);3809return0;3810}38113812static intoption_parse_directory(const struct option *opt,3813const char*arg,int unset)3814{3815 root_len =strlen(arg);3816if(root_len && arg[root_len -1] !='/') {3817char*new_root;3818 root = new_root =xmalloc(root_len +2);3819strcpy(new_root, arg);3820strcpy(new_root + root_len++,"/");3821}else3822 root = arg;3823return0;3824}38253826intcmd_apply(int argc,const char**argv,const char*prefix_)3827{3828int i;3829int errs =0;3830int is_not_gitdir = !startup_info->have_repository;3831int binary;3832int force_apply =0;38333834const char*whitespace_option = NULL;38353836struct option builtin_apply_options[] = {3837{ OPTION_CALLBACK,0,"exclude", NULL,"path",3838"don't apply changes matching the given path",38390, option_parse_exclude },3840{ OPTION_CALLBACK,0,"include", NULL,"path",3841"apply changes matching the given path",38420, option_parse_include },3843{ OPTION_CALLBACK,'p', NULL, NULL,"num",3844"remove <num> leading slashes from traditional diff paths",38450, option_parse_p },3846OPT_BOOLEAN(0,"no-add", &no_add,3847"ignore additions made by the patch"),3848OPT_BOOLEAN(0,"stat", &diffstat,3849"instead of applying the patch, output diffstat for the input"),3850{ OPTION_BOOLEAN,0,"allow-binary-replacement", &binary,3851 NULL,"old option, now no-op",3852 PARSE_OPT_HIDDEN | PARSE_OPT_NOARG },3853{ OPTION_BOOLEAN,0,"binary", &binary,3854 NULL,"old option, now no-op",3855 PARSE_OPT_HIDDEN | PARSE_OPT_NOARG },3856OPT_BOOLEAN(0,"numstat", &numstat,3857"shows number of added and deleted lines in decimal notation"),3858OPT_BOOLEAN(0,"summary", &summary,3859"instead of applying the patch, output a summary for the input"),3860OPT_BOOLEAN(0,"check", &check,3861"instead of applying the patch, see if the patch is applicable"),3862OPT_BOOLEAN(0,"index", &check_index,3863"make sure the patch is applicable to the current index"),3864OPT_BOOLEAN(0,"cached", &cached,3865"apply a patch without touching the working tree"),3866OPT_BOOLEAN(0,"apply", &force_apply,3867"also apply the patch (use with --stat/--summary/--check)"),3868OPT_FILENAME(0,"build-fake-ancestor", &fake_ancestor,3869"build a temporary index based on embedded index information"),3870{ OPTION_CALLBACK,'z', NULL, NULL, NULL,3871"paths are separated with NUL character",3872 PARSE_OPT_NOARG, option_parse_z },3873OPT_INTEGER('C', NULL, &p_context,3874"ensure at least <n> lines of context match"),3875{ OPTION_CALLBACK,0,"whitespace", &whitespace_option,"action",3876"detect new or modified lines that have whitespace errors",38770, option_parse_whitespace },3878{ OPTION_CALLBACK,0,"ignore-space-change", NULL, NULL,3879"ignore changes in whitespace when finding context",3880 PARSE_OPT_NOARG, option_parse_space_change },3881{ OPTION_CALLBACK,0,"ignore-whitespace", NULL, NULL,3882"ignore changes in whitespace when finding context",3883 PARSE_OPT_NOARG, option_parse_space_change },3884OPT_BOOLEAN('R',"reverse", &apply_in_reverse,3885"apply the patch in reverse"),3886OPT_BOOLEAN(0,"unidiff-zero", &unidiff_zero,3887"don't expect at least one line of context"),3888OPT_BOOLEAN(0,"reject", &apply_with_reject,3889"leave the rejected hunks in corresponding *.rej files"),3890OPT_BOOLEAN(0,"allow-overlap", &allow_overlap,3891"allow overlapping hunks"),3892OPT__VERBOSE(&apply_verbosely,"be verbose"),3893OPT_BIT(0,"inaccurate-eof", &options,3894"tolerate incorrectly detected missing new-line at the end of file",3895 INACCURATE_EOF),3896OPT_BIT(0,"recount", &options,3897"do not trust the line counts in the hunk headers",3898 RECOUNT),3899{ OPTION_CALLBACK,0,"directory", NULL,"root",3900"prepend <root> to all filenames",39010, option_parse_directory },3902OPT_END()3903};39043905 prefix = prefix_;3906 prefix_length = prefix ?strlen(prefix) :0;3907git_config(git_apply_config, NULL);3908if(apply_default_whitespace)3909parse_whitespace_option(apply_default_whitespace);3910if(apply_default_ignorewhitespace)3911parse_ignorewhitespace_option(apply_default_ignorewhitespace);39123913 argc =parse_options(argc, argv, prefix, builtin_apply_options,3914 apply_usage,0);39153916if(apply_with_reject)3917 apply = apply_verbosely =1;3918if(!force_apply && (diffstat || numstat || summary || check || fake_ancestor))3919 apply =0;3920if(check_index && is_not_gitdir)3921die("--index outside a repository");3922if(cached) {3923if(is_not_gitdir)3924die("--cached outside a repository");3925 check_index =1;3926}3927for(i =0; i < argc; i++) {3928const char*arg = argv[i];3929int fd;39303931if(!strcmp(arg,"-")) {3932 errs |=apply_patch(0,"<stdin>", options);3933 read_stdin =0;3934continue;3935}else if(0< prefix_length)3936 arg =prefix_filename(prefix, prefix_length, arg);39373938 fd =open(arg, O_RDONLY);3939if(fd <0)3940die_errno("can't open patch '%s'", arg);3941 read_stdin =0;3942set_default_whitespace_mode(whitespace_option);3943 errs |=apply_patch(fd, arg, options);3944close(fd);3945}3946set_default_whitespace_mode(whitespace_option);3947if(read_stdin)3948 errs |=apply_patch(0,"<stdin>", options);3949if(whitespace_error) {3950if(squelch_whitespace_errors &&3951 squelch_whitespace_errors < whitespace_error) {3952int squelched =3953 whitespace_error - squelch_whitespace_errors;3954warning("squelched%d"3955"whitespace error%s",3956 squelched,3957 squelched ==1?"":"s");3958}3959if(ws_error_action == die_on_ws_error)3960die("%dline%sadd%swhitespace errors.",3961 whitespace_error,3962 whitespace_error ==1?"":"s",3963 whitespace_error ==1?"s":"");3964if(applied_after_fixing_ws && apply)3965warning("%dline%sapplied after"3966" fixing whitespace errors.",3967 applied_after_fixing_ws,3968 applied_after_fixing_ws ==1?"":"s");3969else if(whitespace_error)3970warning("%dline%sadd%swhitespace errors.",3971 whitespace_error,3972 whitespace_error ==1?"":"s",3973 whitespace_error ==1?"s":"");3974}39753976if(update_index) {3977if(write_cache(newfd, active_cache, active_nr) ||3978commit_locked_index(&lock_file))3979die("Unable to write new index file");3980}39813982return!!errs;3983}