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 10#include"cache.h" 11#include"blob.h" 12#include"delta.h" 13#include"diff.h" 14#include"dir.h" 15#include"xdiff-interface.h" 16#include"ll-merge.h" 17#include"lockfile.h" 18#include"parse-options.h" 19#include"quote.h" 20#include"rerere.h" 21#include"apply.h" 22 23static voidgit_apply_config(void) 24{ 25git_config_get_string_const("apply.whitespace", &apply_default_whitespace); 26git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace); 27git_config(git_default_config, NULL); 28} 29 30static intparse_whitespace_option(struct apply_state *state,const char*option) 31{ 32if(!option) { 33 state->ws_error_action = warn_on_ws_error; 34return0; 35} 36if(!strcmp(option,"warn")) { 37 state->ws_error_action = warn_on_ws_error; 38return0; 39} 40if(!strcmp(option,"nowarn")) { 41 state->ws_error_action = nowarn_ws_error; 42return0; 43} 44if(!strcmp(option,"error")) { 45 state->ws_error_action = die_on_ws_error; 46return0; 47} 48if(!strcmp(option,"error-all")) { 49 state->ws_error_action = die_on_ws_error; 50 state->squelch_whitespace_errors =0; 51return0; 52} 53if(!strcmp(option,"strip") || !strcmp(option,"fix")) { 54 state->ws_error_action = correct_ws_error; 55return0; 56} 57returnerror(_("unrecognized whitespace option '%s'"), option); 58} 59 60static intparse_ignorewhitespace_option(struct apply_state *state, 61const char*option) 62{ 63if(!option || !strcmp(option,"no") || 64!strcmp(option,"false") || !strcmp(option,"never") || 65!strcmp(option,"none")) { 66 state->ws_ignore_action = ignore_ws_none; 67return0; 68} 69if(!strcmp(option,"change")) { 70 state->ws_ignore_action = ignore_ws_change; 71return0; 72} 73returnerror(_("unrecognized whitespace ignore option '%s'"), option); 74} 75 76intinit_apply_state(struct apply_state *state, 77const char*prefix, 78struct lock_file *lock_file) 79{ 80memset(state,0,sizeof(*state)); 81 state->prefix = prefix; 82 state->prefix_length = state->prefix ?strlen(state->prefix) :0; 83 state->lock_file = lock_file; 84 state->newfd = -1; 85 state->apply =1; 86 state->line_termination ='\n'; 87 state->p_value =1; 88 state->p_context = UINT_MAX; 89 state->squelch_whitespace_errors =5; 90 state->ws_error_action = warn_on_ws_error; 91 state->ws_ignore_action = ignore_ws_none; 92 state->linenr =1; 93string_list_init(&state->fn_table,0); 94string_list_init(&state->limit_by_name,0); 95string_list_init(&state->symlink_changes,0); 96strbuf_init(&state->root,0); 97 98git_apply_config(); 99if(apply_default_whitespace &&parse_whitespace_option(state, apply_default_whitespace)) 100return-1; 101if(apply_default_ignorewhitespace &&parse_ignorewhitespace_option(state, apply_default_ignorewhitespace)) 102return-1; 103return0; 104} 105 106voidclear_apply_state(struct apply_state *state) 107{ 108string_list_clear(&state->limit_by_name,0); 109string_list_clear(&state->symlink_changes,0); 110strbuf_release(&state->root); 111 112/* &state->fn_table is cleared at the end of apply_patch() */ 113} 114 115static voidmute_routine(const char*msg,va_list params) 116{ 117/* do nothing */ 118} 119 120intcheck_apply_state(struct apply_state *state,int force_apply) 121{ 122int is_not_gitdir = !startup_info->have_repository; 123 124if(state->apply_with_reject && state->threeway) 125returnerror(_("--reject and --3way cannot be used together.")); 126if(state->cached && state->threeway) 127returnerror(_("--cached and --3way cannot be used together.")); 128if(state->threeway) { 129if(is_not_gitdir) 130returnerror(_("--3way outside a repository")); 131 state->check_index =1; 132} 133if(state->apply_with_reject) { 134 state->apply =1; 135if(state->apply_verbosity == verbosity_normal) 136 state->apply_verbosity = verbosity_verbose; 137} 138if(!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor)) 139 state->apply =0; 140if(state->check_index && is_not_gitdir) 141returnerror(_("--index outside a repository")); 142if(state->cached) { 143if(is_not_gitdir) 144returnerror(_("--cached outside a repository")); 145 state->check_index =1; 146} 147if(state->check_index) 148 state->unsafe_paths =0; 149if(!state->lock_file) 150returnerror("BUG: state->lock_file should not be NULL"); 151 152if(state->apply_verbosity <= verbosity_silent) { 153 state->saved_error_routine =get_error_routine(); 154 state->saved_warn_routine =get_warn_routine(); 155set_error_routine(mute_routine); 156set_warn_routine(mute_routine); 157} 158 159return0; 160} 161 162static voidset_default_whitespace_mode(struct apply_state *state) 163{ 164if(!state->whitespace_option && !apply_default_whitespace) 165 state->ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error); 166} 167 168/* 169 * This represents one "hunk" from a patch, starting with 170 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 171 * patch text is pointed at by patch, and its byte length 172 * is stored in size. leading and trailing are the number 173 * of context lines. 174 */ 175struct fragment { 176unsigned long leading, trailing; 177unsigned long oldpos, oldlines; 178unsigned long newpos, newlines; 179/* 180 * 'patch' is usually borrowed from buf in apply_patch(), 181 * but some codepaths store an allocated buffer. 182 */ 183const char*patch; 184unsigned free_patch:1, 185 rejected:1; 186int size; 187int linenr; 188struct fragment *next; 189}; 190 191/* 192 * When dealing with a binary patch, we reuse "leading" field 193 * to store the type of the binary hunk, either deflated "delta" 194 * or deflated "literal". 195 */ 196#define binary_patch_method leading 197#define BINARY_DELTA_DEFLATED 1 198#define BINARY_LITERAL_DEFLATED 2 199 200/* 201 * This represents a "patch" to a file, both metainfo changes 202 * such as creation/deletion, filemode and content changes represented 203 * as a series of fragments. 204 */ 205struct patch { 206char*new_name, *old_name, *def_name; 207unsigned int old_mode, new_mode; 208int is_new, is_delete;/* -1 = unknown, 0 = false, 1 = true */ 209int rejected; 210unsigned ws_rule; 211int lines_added, lines_deleted; 212int score; 213unsigned int is_toplevel_relative:1; 214unsigned int inaccurate_eof:1; 215unsigned int is_binary:1; 216unsigned int is_copy:1; 217unsigned int is_rename:1; 218unsigned int recount:1; 219unsigned int conflicted_threeway:1; 220unsigned int direct_to_threeway:1; 221struct fragment *fragments; 222char*result; 223size_t resultsize; 224char old_sha1_prefix[41]; 225char new_sha1_prefix[41]; 226struct patch *next; 227 228/* three-way fallback result */ 229struct object_id threeway_stage[3]; 230}; 231 232static voidfree_fragment_list(struct fragment *list) 233{ 234while(list) { 235struct fragment *next = list->next; 236if(list->free_patch) 237free((char*)list->patch); 238free(list); 239 list = next; 240} 241} 242 243static voidfree_patch(struct patch *patch) 244{ 245free_fragment_list(patch->fragments); 246free(patch->def_name); 247free(patch->old_name); 248free(patch->new_name); 249free(patch->result); 250free(patch); 251} 252 253static voidfree_patch_list(struct patch *list) 254{ 255while(list) { 256struct patch *next = list->next; 257free_patch(list); 258 list = next; 259} 260} 261 262/* 263 * A line in a file, len-bytes long (includes the terminating LF, 264 * except for an incomplete line at the end if the file ends with 265 * one), and its contents hashes to 'hash'. 266 */ 267struct line { 268size_t len; 269unsigned hash :24; 270unsigned flag :8; 271#define LINE_COMMON 1 272#define LINE_PATCHED 2 273}; 274 275/* 276 * This represents a "file", which is an array of "lines". 277 */ 278struct image { 279char*buf; 280size_t len; 281size_t nr; 282size_t alloc; 283struct line *line_allocated; 284struct line *line; 285}; 286 287static uint32_thash_line(const char*cp,size_t len) 288{ 289size_t i; 290uint32_t h; 291for(i =0, h =0; i < len; i++) { 292if(!isspace(cp[i])) { 293 h = h *3+ (cp[i] &0xff); 294} 295} 296return h; 297} 298 299/* 300 * Compare lines s1 of length n1 and s2 of length n2, ignoring 301 * whitespace difference. Returns 1 if they match, 0 otherwise 302 */ 303static intfuzzy_matchlines(const char*s1,size_t n1, 304const char*s2,size_t n2) 305{ 306const char*last1 = s1 + n1 -1; 307const char*last2 = s2 + n2 -1; 308int result =0; 309 310/* ignore line endings */ 311while((*last1 =='\r') || (*last1 =='\n')) 312 last1--; 313while((*last2 =='\r') || (*last2 =='\n')) 314 last2--; 315 316/* skip leading whitespaces, if both begin with whitespace */ 317if(s1 <= last1 && s2 <= last2 &&isspace(*s1) &&isspace(*s2)) { 318while(isspace(*s1) && (s1 <= last1)) 319 s1++; 320while(isspace(*s2) && (s2 <= last2)) 321 s2++; 322} 323/* early return if both lines are empty */ 324if((s1 > last1) && (s2 > last2)) 325return1; 326while(!result) { 327 result = *s1++ - *s2++; 328/* 329 * Skip whitespace inside. We check for whitespace on 330 * both buffers because we don't want "a b" to match 331 * "ab" 332 */ 333if(isspace(*s1) &&isspace(*s2)) { 334while(isspace(*s1) && s1 <= last1) 335 s1++; 336while(isspace(*s2) && s2 <= last2) 337 s2++; 338} 339/* 340 * If we reached the end on one side only, 341 * lines don't match 342 */ 343if( 344((s2 > last2) && (s1 <= last1)) || 345((s1 > last1) && (s2 <= last2))) 346return0; 347if((s1 > last1) && (s2 > last2)) 348break; 349} 350 351return!result; 352} 353 354static voidadd_line_info(struct image *img,const char*bol,size_t len,unsigned flag) 355{ 356ALLOC_GROW(img->line_allocated, img->nr +1, img->alloc); 357 img->line_allocated[img->nr].len = len; 358 img->line_allocated[img->nr].hash =hash_line(bol, len); 359 img->line_allocated[img->nr].flag = flag; 360 img->nr++; 361} 362 363/* 364 * "buf" has the file contents to be patched (read from various sources). 365 * attach it to "image" and add line-based index to it. 366 * "image" now owns the "buf". 367 */ 368static voidprepare_image(struct image *image,char*buf,size_t len, 369int prepare_linetable) 370{ 371const char*cp, *ep; 372 373memset(image,0,sizeof(*image)); 374 image->buf = buf; 375 image->len = len; 376 377if(!prepare_linetable) 378return; 379 380 ep = image->buf + image->len; 381 cp = image->buf; 382while(cp < ep) { 383const char*next; 384for(next = cp; next < ep && *next !='\n'; next++) 385; 386if(next < ep) 387 next++; 388add_line_info(image, cp, next - cp,0); 389 cp = next; 390} 391 image->line = image->line_allocated; 392} 393 394static voidclear_image(struct image *image) 395{ 396free(image->buf); 397free(image->line_allocated); 398memset(image,0,sizeof(*image)); 399} 400 401/* fmt must contain _one_ %s and no other substitution */ 402static voidsay_patch_name(FILE*output,const char*fmt,struct patch *patch) 403{ 404struct strbuf sb = STRBUF_INIT; 405 406if(patch->old_name && patch->new_name && 407strcmp(patch->old_name, patch->new_name)) { 408quote_c_style(patch->old_name, &sb, NULL,0); 409strbuf_addstr(&sb," => "); 410quote_c_style(patch->new_name, &sb, NULL,0); 411}else{ 412const char*n = patch->new_name; 413if(!n) 414 n = patch->old_name; 415quote_c_style(n, &sb, NULL,0); 416} 417fprintf(output, fmt, sb.buf); 418fputc('\n', output); 419strbuf_release(&sb); 420} 421 422#define SLOP (16) 423 424static intread_patch_file(struct strbuf *sb,int fd) 425{ 426if(strbuf_read(sb, fd,0) <0) 427returnerror_errno("git apply: failed to read"); 428 429/* 430 * Make sure that we have some slop in the buffer 431 * so that we can do speculative "memcmp" etc, and 432 * see to it that it is NUL-filled. 433 */ 434strbuf_grow(sb, SLOP); 435memset(sb->buf + sb->len,0, SLOP); 436return0; 437} 438 439static unsigned longlinelen(const char*buffer,unsigned long size) 440{ 441unsigned long len =0; 442while(size--) { 443 len++; 444if(*buffer++ =='\n') 445break; 446} 447return len; 448} 449 450static intis_dev_null(const char*str) 451{ 452returnskip_prefix(str,"/dev/null", &str) &&isspace(*str); 453} 454 455#define TERM_SPACE 1 456#define TERM_TAB 2 457 458static intname_terminate(int c,int terminate) 459{ 460if(c ==' '&& !(terminate & TERM_SPACE)) 461return0; 462if(c =='\t'&& !(terminate & TERM_TAB)) 463return0; 464 465return1; 466} 467 468/* remove double slashes to make --index work with such filenames */ 469static char*squash_slash(char*name) 470{ 471int i =0, j =0; 472 473if(!name) 474return NULL; 475 476while(name[i]) { 477if((name[j++] = name[i++]) =='/') 478while(name[i] =='/') 479 i++; 480} 481 name[j] ='\0'; 482return name; 483} 484 485static char*find_name_gnu(struct apply_state *state, 486const char*line, 487const char*def, 488int p_value) 489{ 490struct strbuf name = STRBUF_INIT; 491char*cp; 492 493/* 494 * Proposed "new-style" GNU patch/diff format; see 495 * http://marc.info/?l=git&m=112927316408690&w=2 496 */ 497if(unquote_c_style(&name, line, NULL)) { 498strbuf_release(&name); 499return NULL; 500} 501 502for(cp = name.buf; p_value; p_value--) { 503 cp =strchr(cp,'/'); 504if(!cp) { 505strbuf_release(&name); 506return NULL; 507} 508 cp++; 509} 510 511strbuf_remove(&name,0, cp - name.buf); 512if(state->root.len) 513strbuf_insert(&name,0, state->root.buf, state->root.len); 514returnsquash_slash(strbuf_detach(&name, NULL)); 515} 516 517static size_tsane_tz_len(const char*line,size_t len) 518{ 519const char*tz, *p; 520 521if(len <strlen(" +0500") || line[len-strlen(" +0500")] !=' ') 522return0; 523 tz = line + len -strlen(" +0500"); 524 525if(tz[1] !='+'&& tz[1] !='-') 526return0; 527 528for(p = tz +2; p != line + len; p++) 529if(!isdigit(*p)) 530return0; 531 532return line + len - tz; 533} 534 535static size_ttz_with_colon_len(const char*line,size_t len) 536{ 537const char*tz, *p; 538 539if(len <strlen(" +08:00") || line[len -strlen(":00")] !=':') 540return0; 541 tz = line + len -strlen(" +08:00"); 542 543if(tz[0] !=' '|| (tz[1] !='+'&& tz[1] !='-')) 544return0; 545 p = tz +2; 546if(!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 547!isdigit(*p++) || !isdigit(*p++)) 548return0; 549 550return line + len - tz; 551} 552 553static size_tdate_len(const char*line,size_t len) 554{ 555const char*date, *p; 556 557if(len <strlen("72-02-05") || line[len-strlen("-05")] !='-') 558return0; 559 p = date = line + len -strlen("72-02-05"); 560 561if(!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 562!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 563!isdigit(*p++) || !isdigit(*p++))/* Not a date. */ 564return0; 565 566if(date - line >=strlen("19") && 567isdigit(date[-1]) &&isdigit(date[-2]))/* 4-digit year */ 568 date -=strlen("19"); 569 570return line + len - date; 571} 572 573static size_tshort_time_len(const char*line,size_t len) 574{ 575const char*time, *p; 576 577if(len <strlen(" 07:01:32") || line[len-strlen(":32")] !=':') 578return0; 579 p = time = line + len -strlen(" 07:01:32"); 580 581/* Permit 1-digit hours? */ 582if(*p++ !=' '|| 583!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 584!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 585!isdigit(*p++) || !isdigit(*p++))/* Not a time. */ 586return0; 587 588return line + len - time; 589} 590 591static size_tfractional_time_len(const char*line,size_t len) 592{ 593const char*p; 594size_t n; 595 596/* Expected format: 19:41:17.620000023 */ 597if(!len || !isdigit(line[len -1])) 598return0; 599 p = line + len -1; 600 601/* Fractional seconds. */ 602while(p > line &&isdigit(*p)) 603 p--; 604if(*p !='.') 605return0; 606 607/* Hours, minutes, and whole seconds. */ 608 n =short_time_len(line, p - line); 609if(!n) 610return0; 611 612return line + len - p + n; 613} 614 615static size_ttrailing_spaces_len(const char*line,size_t len) 616{ 617const char*p; 618 619/* Expected format: ' ' x (1 or more) */ 620if(!len || line[len -1] !=' ') 621return0; 622 623 p = line + len; 624while(p != line) { 625 p--; 626if(*p !=' ') 627return line + len - (p +1); 628} 629 630/* All spaces! */ 631return len; 632} 633 634static size_tdiff_timestamp_len(const char*line,size_t len) 635{ 636const char*end = line + len; 637size_t n; 638 639/* 640 * Posix: 2010-07-05 19:41:17 641 * GNU: 2010-07-05 19:41:17.620000023 -0500 642 */ 643 644if(!isdigit(end[-1])) 645return0; 646 647 n =sane_tz_len(line, end - line); 648if(!n) 649 n =tz_with_colon_len(line, end - line); 650 end -= n; 651 652 n =short_time_len(line, end - line); 653if(!n) 654 n =fractional_time_len(line, end - line); 655 end -= n; 656 657 n =date_len(line, end - line); 658if(!n)/* No date. Too bad. */ 659return0; 660 end -= n; 661 662if(end == line)/* No space before date. */ 663return0; 664if(end[-1] =='\t') {/* Success! */ 665 end--; 666return line + len - end; 667} 668if(end[-1] !=' ')/* No space before date. */ 669return0; 670 671/* Whitespace damage. */ 672 end -=trailing_spaces_len(line, end - line); 673return line + len - end; 674} 675 676static char*find_name_common(struct apply_state *state, 677const char*line, 678const char*def, 679int p_value, 680const char*end, 681int terminate) 682{ 683int len; 684const char*start = NULL; 685 686if(p_value ==0) 687 start = line; 688while(line != end) { 689char c = *line; 690 691if(!end &&isspace(c)) { 692if(c =='\n') 693break; 694if(name_terminate(c, terminate)) 695break; 696} 697 line++; 698if(c =='/'&& !--p_value) 699 start = line; 700} 701if(!start) 702returnsquash_slash(xstrdup_or_null(def)); 703 len = line - start; 704if(!len) 705returnsquash_slash(xstrdup_or_null(def)); 706 707/* 708 * Generally we prefer the shorter name, especially 709 * if the other one is just a variation of that with 710 * something else tacked on to the end (ie "file.orig" 711 * or "file~"). 712 */ 713if(def) { 714int deflen =strlen(def); 715if(deflen < len && !strncmp(start, def, deflen)) 716returnsquash_slash(xstrdup(def)); 717} 718 719if(state->root.len) { 720char*ret =xstrfmt("%s%.*s", state->root.buf, len, start); 721returnsquash_slash(ret); 722} 723 724returnsquash_slash(xmemdupz(start, len)); 725} 726 727static char*find_name(struct apply_state *state, 728const char*line, 729char*def, 730int p_value, 731int terminate) 732{ 733if(*line =='"') { 734char*name =find_name_gnu(state, line, def, p_value); 735if(name) 736return name; 737} 738 739returnfind_name_common(state, line, def, p_value, NULL, terminate); 740} 741 742static char*find_name_traditional(struct apply_state *state, 743const char*line, 744char*def, 745int p_value) 746{ 747size_t len; 748size_t date_len; 749 750if(*line =='"') { 751char*name =find_name_gnu(state, line, def, p_value); 752if(name) 753return name; 754} 755 756 len =strchrnul(line,'\n') - line; 757 date_len =diff_timestamp_len(line, len); 758if(!date_len) 759returnfind_name_common(state, line, def, p_value, NULL, TERM_TAB); 760 len -= date_len; 761 762returnfind_name_common(state, line, def, p_value, line + len,0); 763} 764 765static intcount_slashes(const char*cp) 766{ 767int cnt =0; 768char ch; 769 770while((ch = *cp++)) 771if(ch =='/') 772 cnt++; 773return cnt; 774} 775 776/* 777 * Given the string after "--- " or "+++ ", guess the appropriate 778 * p_value for the given patch. 779 */ 780static intguess_p_value(struct apply_state *state,const char*nameline) 781{ 782char*name, *cp; 783int val = -1; 784 785if(is_dev_null(nameline)) 786return-1; 787 name =find_name_traditional(state, nameline, NULL,0); 788if(!name) 789return-1; 790 cp =strchr(name,'/'); 791if(!cp) 792 val =0; 793else if(state->prefix) { 794/* 795 * Does it begin with "a/$our-prefix" and such? Then this is 796 * very likely to apply to our directory. 797 */ 798if(!strncmp(name, state->prefix, state->prefix_length)) 799 val =count_slashes(state->prefix); 800else{ 801 cp++; 802if(!strncmp(cp, state->prefix, state->prefix_length)) 803 val =count_slashes(state->prefix) +1; 804} 805} 806free(name); 807return val; 808} 809 810/* 811 * Does the ---/+++ line have the POSIX timestamp after the last HT? 812 * GNU diff puts epoch there to signal a creation/deletion event. Is 813 * this such a timestamp? 814 */ 815static inthas_epoch_timestamp(const char*nameline) 816{ 817/* 818 * We are only interested in epoch timestamp; any non-zero 819 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 820 * For the same reason, the date must be either 1969-12-31 or 821 * 1970-01-01, and the seconds part must be "00". 822 */ 823const char stamp_regexp[] = 824"^(1969-12-31|1970-01-01)" 825" " 826"[0-2][0-9]:[0-5][0-9]:00(\\.0+)?" 827" " 828"([-+][0-2][0-9]:?[0-5][0-9])\n"; 829const char*timestamp = NULL, *cp, *colon; 830static regex_t *stamp; 831 regmatch_t m[10]; 832int zoneoffset; 833int hourminute; 834int status; 835 836for(cp = nameline; *cp !='\n'; cp++) { 837if(*cp =='\t') 838 timestamp = cp +1; 839} 840if(!timestamp) 841return0; 842if(!stamp) { 843 stamp =xmalloc(sizeof(*stamp)); 844if(regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 845warning(_("Cannot prepare timestamp regexp%s"), 846 stamp_regexp); 847return0; 848} 849} 850 851 status =regexec(stamp, timestamp,ARRAY_SIZE(m), m,0); 852if(status) { 853if(status != REG_NOMATCH) 854warning(_("regexec returned%dfor input:%s"), 855 status, timestamp); 856return0; 857} 858 859 zoneoffset =strtol(timestamp + m[3].rm_so +1, (char**) &colon,10); 860if(*colon ==':') 861 zoneoffset = zoneoffset *60+strtol(colon +1, NULL,10); 862else 863 zoneoffset = (zoneoffset /100) *60+ (zoneoffset %100); 864if(timestamp[m[3].rm_so] =='-') 865 zoneoffset = -zoneoffset; 866 867/* 868 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 869 * (west of GMT) or 1970-01-01 (east of GMT) 870 */ 871if((zoneoffset <0&&memcmp(timestamp,"1969-12-31",10)) || 872(0<= zoneoffset &&memcmp(timestamp,"1970-01-01",10))) 873return0; 874 875 hourminute = (strtol(timestamp +11, NULL,10) *60+ 876strtol(timestamp +14, NULL,10) - 877 zoneoffset); 878 879return((zoneoffset <0&& hourminute ==1440) || 880(0<= zoneoffset && !hourminute)); 881} 882 883/* 884 * Get the name etc info from the ---/+++ lines of a traditional patch header 885 * 886 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 887 * files, we can happily check the index for a match, but for creating a 888 * new file we should try to match whatever "patch" does. I have no idea. 889 */ 890static intparse_traditional_patch(struct apply_state *state, 891const char*first, 892const char*second, 893struct patch *patch) 894{ 895char*name; 896 897 first +=4;/* skip "--- " */ 898 second +=4;/* skip "+++ " */ 899if(!state->p_value_known) { 900int p, q; 901 p =guess_p_value(state, first); 902 q =guess_p_value(state, second); 903if(p <0) p = q; 904if(0<= p && p == q) { 905 state->p_value = p; 906 state->p_value_known =1; 907} 908} 909if(is_dev_null(first)) { 910 patch->is_new =1; 911 patch->is_delete =0; 912 name =find_name_traditional(state, second, NULL, state->p_value); 913 patch->new_name = name; 914}else if(is_dev_null(second)) { 915 patch->is_new =0; 916 patch->is_delete =1; 917 name =find_name_traditional(state, first, NULL, state->p_value); 918 patch->old_name = name; 919}else{ 920char*first_name; 921 first_name =find_name_traditional(state, first, NULL, state->p_value); 922 name =find_name_traditional(state, second, first_name, state->p_value); 923free(first_name); 924if(has_epoch_timestamp(first)) { 925 patch->is_new =1; 926 patch->is_delete =0; 927 patch->new_name = name; 928}else if(has_epoch_timestamp(second)) { 929 patch->is_new =0; 930 patch->is_delete =1; 931 patch->old_name = name; 932}else{ 933 patch->old_name = name; 934 patch->new_name =xstrdup_or_null(name); 935} 936} 937if(!name) 938returnerror(_("unable to find filename in patch at line%d"), state->linenr); 939 940return0; 941} 942 943static intgitdiff_hdrend(struct apply_state *state, 944const char*line, 945struct patch *patch) 946{ 947return1; 948} 949 950/* 951 * We're anal about diff header consistency, to make 952 * sure that we don't end up having strange ambiguous 953 * patches floating around. 954 * 955 * As a result, gitdiff_{old|new}name() will check 956 * their names against any previous information, just 957 * to make sure.. 958 */ 959#define DIFF_OLD_NAME 0 960#define DIFF_NEW_NAME 1 961 962static intgitdiff_verify_name(struct apply_state *state, 963const char*line, 964int isnull, 965char**name, 966int side) 967{ 968if(!*name && !isnull) { 969*name =find_name(state, line, NULL, state->p_value, TERM_TAB); 970return0; 971} 972 973if(*name) { 974int len =strlen(*name); 975char*another; 976if(isnull) 977returnerror(_("git apply: bad git-diff - expected /dev/null, got%son line%d"), 978*name, state->linenr); 979 another =find_name(state, line, NULL, state->p_value, TERM_TAB); 980if(!another ||memcmp(another, *name, len +1)) { 981free(another); 982returnerror((side == DIFF_NEW_NAME) ? 983_("git apply: bad git-diff - inconsistent new filename on line%d") : 984_("git apply: bad git-diff - inconsistent old filename on line%d"), state->linenr); 985} 986free(another); 987}else{ 988/* expect "/dev/null" */ 989if(memcmp("/dev/null", line,9) || line[9] !='\n') 990returnerror(_("git apply: bad git-diff - expected /dev/null on line%d"), state->linenr); 991} 992 993return0; 994} 995 996static intgitdiff_oldname(struct apply_state *state, 997const char*line, 998struct patch *patch) 999{1000returngitdiff_verify_name(state, line,1001 patch->is_new, &patch->old_name,1002 DIFF_OLD_NAME);1003}10041005static intgitdiff_newname(struct apply_state *state,1006const char*line,1007struct patch *patch)1008{1009returngitdiff_verify_name(state, line,1010 patch->is_delete, &patch->new_name,1011 DIFF_NEW_NAME);1012}10131014static intparse_mode_line(const char*line,int linenr,unsigned int*mode)1015{1016char*end;1017*mode =strtoul(line, &end,8);1018if(end == line || !isspace(*end))1019returnerror(_("invalid mode on line%d:%s"), linenr, line);1020return0;1021}10221023static intgitdiff_oldmode(struct apply_state *state,1024const char*line,1025struct patch *patch)1026{1027returnparse_mode_line(line, state->linenr, &patch->old_mode);1028}10291030static intgitdiff_newmode(struct apply_state *state,1031const char*line,1032struct patch *patch)1033{1034returnparse_mode_line(line, state->linenr, &patch->new_mode);1035}10361037static intgitdiff_delete(struct apply_state *state,1038const char*line,1039struct patch *patch)1040{1041 patch->is_delete =1;1042free(patch->old_name);1043 patch->old_name =xstrdup_or_null(patch->def_name);1044returngitdiff_oldmode(state, line, patch);1045}10461047static intgitdiff_newfile(struct apply_state *state,1048const char*line,1049struct patch *patch)1050{1051 patch->is_new =1;1052free(patch->new_name);1053 patch->new_name =xstrdup_or_null(patch->def_name);1054returngitdiff_newmode(state, line, patch);1055}10561057static intgitdiff_copysrc(struct apply_state *state,1058const char*line,1059struct patch *patch)1060{1061 patch->is_copy =1;1062free(patch->old_name);1063 patch->old_name =find_name(state, line, NULL, state->p_value ? state->p_value -1:0,0);1064return0;1065}10661067static intgitdiff_copydst(struct apply_state *state,1068const char*line,1069struct patch *patch)1070{1071 patch->is_copy =1;1072free(patch->new_name);1073 patch->new_name =find_name(state, line, NULL, state->p_value ? state->p_value -1:0,0);1074return0;1075}10761077static intgitdiff_renamesrc(struct apply_state *state,1078const char*line,1079struct patch *patch)1080{1081 patch->is_rename =1;1082free(patch->old_name);1083 patch->old_name =find_name(state, line, NULL, state->p_value ? state->p_value -1:0,0);1084return0;1085}10861087static intgitdiff_renamedst(struct apply_state *state,1088const char*line,1089struct patch *patch)1090{1091 patch->is_rename =1;1092free(patch->new_name);1093 patch->new_name =find_name(state, line, NULL, state->p_value ? state->p_value -1:0,0);1094return0;1095}10961097static intgitdiff_similarity(struct apply_state *state,1098const char*line,1099struct patch *patch)1100{1101unsigned long val =strtoul(line, NULL,10);1102if(val <=100)1103 patch->score = val;1104return0;1105}11061107static intgitdiff_dissimilarity(struct apply_state *state,1108const char*line,1109struct patch *patch)1110{1111unsigned long val =strtoul(line, NULL,10);1112if(val <=100)1113 patch->score = val;1114return0;1115}11161117static intgitdiff_index(struct apply_state *state,1118const char*line,1119struct patch *patch)1120{1121/*1122 * index line is N hexadecimal, "..", N hexadecimal,1123 * and optional space with octal mode.1124 */1125const char*ptr, *eol;1126int len;11271128 ptr =strchr(line,'.');1129if(!ptr || ptr[1] !='.'||40< ptr - line)1130return0;1131 len = ptr - line;1132memcpy(patch->old_sha1_prefix, line, len);1133 patch->old_sha1_prefix[len] =0;11341135 line = ptr +2;1136 ptr =strchr(line,' ');1137 eol =strchrnul(line,'\n');11381139if(!ptr || eol < ptr)1140 ptr = eol;1141 len = ptr - line;11421143if(40< len)1144return0;1145memcpy(patch->new_sha1_prefix, line, len);1146 patch->new_sha1_prefix[len] =0;1147if(*ptr ==' ')1148returngitdiff_oldmode(state, ptr +1, patch);1149return0;1150}11511152/*1153 * This is normal for a diff that doesn't change anything: we'll fall through1154 * into the next diff. Tell the parser to break out.1155 */1156static intgitdiff_unrecognized(struct apply_state *state,1157const char*line,1158struct patch *patch)1159{1160return1;1161}11621163/*1164 * Skip p_value leading components from "line"; as we do not accept1165 * absolute paths, return NULL in that case.1166 */1167static const char*skip_tree_prefix(struct apply_state *state,1168const char*line,1169int llen)1170{1171int nslash;1172int i;11731174if(!state->p_value)1175return(llen && line[0] =='/') ? NULL : line;11761177 nslash = state->p_value;1178for(i =0; i < llen; i++) {1179int ch = line[i];1180if(ch =='/'&& --nslash <=0)1181return(i ==0) ? NULL : &line[i +1];1182}1183return NULL;1184}11851186/*1187 * This is to extract the same name that appears on "diff --git"1188 * line. We do not find and return anything if it is a rename1189 * patch, and it is OK because we will find the name elsewhere.1190 * We need to reliably find name only when it is mode-change only,1191 * creation or deletion of an empty file. In any of these cases,1192 * both sides are the same name under a/ and b/ respectively.1193 */1194static char*git_header_name(struct apply_state *state,1195const char*line,1196int llen)1197{1198const char*name;1199const char*second = NULL;1200size_t len, line_len;12011202 line +=strlen("diff --git ");1203 llen -=strlen("diff --git ");12041205if(*line =='"') {1206const char*cp;1207struct strbuf first = STRBUF_INIT;1208struct strbuf sp = STRBUF_INIT;12091210if(unquote_c_style(&first, line, &second))1211goto free_and_fail1;12121213/* strip the a/b prefix including trailing slash */1214 cp =skip_tree_prefix(state, first.buf, first.len);1215if(!cp)1216goto free_and_fail1;1217strbuf_remove(&first,0, cp - first.buf);12181219/*1220 * second points at one past closing dq of name.1221 * find the second name.1222 */1223while((second < line + llen) &&isspace(*second))1224 second++;12251226if(line + llen <= second)1227goto free_and_fail1;1228if(*second =='"') {1229if(unquote_c_style(&sp, second, NULL))1230goto free_and_fail1;1231 cp =skip_tree_prefix(state, sp.buf, sp.len);1232if(!cp)1233goto free_and_fail1;1234/* They must match, otherwise ignore */1235if(strcmp(cp, first.buf))1236goto free_and_fail1;1237strbuf_release(&sp);1238returnstrbuf_detach(&first, NULL);1239}12401241/* unquoted second */1242 cp =skip_tree_prefix(state, second, line + llen - second);1243if(!cp)1244goto free_and_fail1;1245if(line + llen - cp != first.len ||1246memcmp(first.buf, cp, first.len))1247goto free_and_fail1;1248returnstrbuf_detach(&first, NULL);12491250 free_and_fail1:1251strbuf_release(&first);1252strbuf_release(&sp);1253return NULL;1254}12551256/* unquoted first name */1257 name =skip_tree_prefix(state, line, llen);1258if(!name)1259return NULL;12601261/*1262 * since the first name is unquoted, a dq if exists must be1263 * the beginning of the second name.1264 */1265for(second = name; second < line + llen; second++) {1266if(*second =='"') {1267struct strbuf sp = STRBUF_INIT;1268const char*np;12691270if(unquote_c_style(&sp, second, NULL))1271goto free_and_fail2;12721273 np =skip_tree_prefix(state, sp.buf, sp.len);1274if(!np)1275goto free_and_fail2;12761277 len = sp.buf + sp.len - np;1278if(len < second - name &&1279!strncmp(np, name, len) &&1280isspace(name[len])) {1281/* Good */1282strbuf_remove(&sp,0, np - sp.buf);1283returnstrbuf_detach(&sp, NULL);1284}12851286 free_and_fail2:1287strbuf_release(&sp);1288return NULL;1289}1290}12911292/*1293 * Accept a name only if it shows up twice, exactly the same1294 * form.1295 */1296 second =strchr(name,'\n');1297if(!second)1298return NULL;1299 line_len = second - name;1300for(len =0; ; len++) {1301switch(name[len]) {1302default:1303continue;1304case'\n':1305return NULL;1306case'\t':case' ':1307/*1308 * Is this the separator between the preimage1309 * and the postimage pathname? Again, we are1310 * only interested in the case where there is1311 * no rename, as this is only to set def_name1312 * and a rename patch has the names elsewhere1313 * in an unambiguous form.1314 */1315if(!name[len +1])1316return NULL;/* no postimage name */1317 second =skip_tree_prefix(state, name + len +1,1318 line_len - (len +1));1319if(!second)1320return NULL;1321/*1322 * Does len bytes starting at "name" and "second"1323 * (that are separated by one HT or SP we just1324 * found) exactly match?1325 */1326if(second[len] =='\n'&& !strncmp(name, second, len))1327returnxmemdupz(name, len);1328}1329}1330}13311332/* Verify that we recognize the lines following a git header */1333static intparse_git_header(struct apply_state *state,1334const char*line,1335int len,1336unsigned int size,1337struct patch *patch)1338{1339unsigned long offset;13401341/* A git diff has explicit new/delete information, so we don't guess */1342 patch->is_new =0;1343 patch->is_delete =0;13441345/*1346 * Some things may not have the old name in the1347 * rest of the headers anywhere (pure mode changes,1348 * or removing or adding empty files), so we get1349 * the default name from the header.1350 */1351 patch->def_name =git_header_name(state, line, len);1352if(patch->def_name && state->root.len) {1353char*s =xstrfmt("%s%s", state->root.buf, patch->def_name);1354free(patch->def_name);1355 patch->def_name = s;1356}13571358 line += len;1359 size -= len;1360 state->linenr++;1361for(offset = len ; size >0; offset += len, size -= len, line += len, state->linenr++) {1362static const struct opentry {1363const char*str;1364int(*fn)(struct apply_state *,const char*,struct patch *);1365} optable[] = {1366{"@@ -", gitdiff_hdrend },1367{"--- ", gitdiff_oldname },1368{"+++ ", gitdiff_newname },1369{"old mode ", gitdiff_oldmode },1370{"new mode ", gitdiff_newmode },1371{"deleted file mode ", gitdiff_delete },1372{"new file mode ", gitdiff_newfile },1373{"copy from ", gitdiff_copysrc },1374{"copy to ", gitdiff_copydst },1375{"rename old ", gitdiff_renamesrc },1376{"rename new ", gitdiff_renamedst },1377{"rename from ", gitdiff_renamesrc },1378{"rename to ", gitdiff_renamedst },1379{"similarity index ", gitdiff_similarity },1380{"dissimilarity index ", gitdiff_dissimilarity },1381{"index ", gitdiff_index },1382{"", gitdiff_unrecognized },1383};1384int i;13851386 len =linelen(line, size);1387if(!len || line[len-1] !='\n')1388break;1389for(i =0; i <ARRAY_SIZE(optable); i++) {1390const struct opentry *p = optable + i;1391int oplen =strlen(p->str);1392int res;1393if(len < oplen ||memcmp(p->str, line, oplen))1394continue;1395 res = p->fn(state, line + oplen, patch);1396if(res <0)1397return-1;1398if(res >0)1399return offset;1400break;1401}1402}14031404return offset;1405}14061407static intparse_num(const char*line,unsigned long*p)1408{1409char*ptr;14101411if(!isdigit(*line))1412return0;1413*p =strtoul(line, &ptr,10);1414return ptr - line;1415}14161417static intparse_range(const char*line,int len,int offset,const char*expect,1418unsigned long*p1,unsigned long*p2)1419{1420int digits, ex;14211422if(offset <0|| offset >= len)1423return-1;1424 line += offset;1425 len -= offset;14261427 digits =parse_num(line, p1);1428if(!digits)1429return-1;14301431 offset += digits;1432 line += digits;1433 len -= digits;14341435*p2 =1;1436if(*line ==',') {1437 digits =parse_num(line+1, p2);1438if(!digits)1439return-1;14401441 offset += digits+1;1442 line += digits+1;1443 len -= digits+1;1444}14451446 ex =strlen(expect);1447if(ex > len)1448return-1;1449if(memcmp(line, expect, ex))1450return-1;14511452return offset + ex;1453}14541455static voidrecount_diff(const char*line,int size,struct fragment *fragment)1456{1457int oldlines =0, newlines =0, ret =0;14581459if(size <1) {1460warning("recount: ignore empty hunk");1461return;1462}14631464for(;;) {1465int len =linelen(line, size);1466 size -= len;1467 line += len;14681469if(size <1)1470break;14711472switch(*line) {1473case' ':case'\n':1474 newlines++;1475/* fall through */1476case'-':1477 oldlines++;1478continue;1479case'+':1480 newlines++;1481continue;1482case'\\':1483continue;1484case'@':1485 ret = size <3|| !starts_with(line,"@@ ");1486break;1487case'd':1488 ret = size <5|| !starts_with(line,"diff ");1489break;1490default:1491 ret = -1;1492break;1493}1494if(ret) {1495warning(_("recount: unexpected line: %.*s"),1496(int)linelen(line, size), line);1497return;1498}1499break;1500}1501 fragment->oldlines = oldlines;1502 fragment->newlines = newlines;1503}15041505/*1506 * Parse a unified diff fragment header of the1507 * form "@@ -a,b +c,d @@"1508 */1509static intparse_fragment_header(const char*line,int len,struct fragment *fragment)1510{1511int offset;15121513if(!len || line[len-1] !='\n')1514return-1;15151516/* Figure out the number of lines in a fragment */1517 offset =parse_range(line, len,4," +", &fragment->oldpos, &fragment->oldlines);1518 offset =parse_range(line, len, offset," @@", &fragment->newpos, &fragment->newlines);15191520return offset;1521}15221523/*1524 * Find file diff header1525 *1526 * Returns:1527 * -1 if no header was found1528 * -128 in case of error1529 * the size of the header in bytes (called "offset") otherwise1530 */1531static intfind_header(struct apply_state *state,1532const char*line,1533unsigned long size,1534int*hdrsize,1535struct patch *patch)1536{1537unsigned long offset, len;15381539 patch->is_toplevel_relative =0;1540 patch->is_rename = patch->is_copy =0;1541 patch->is_new = patch->is_delete = -1;1542 patch->old_mode = patch->new_mode =0;1543 patch->old_name = patch->new_name = NULL;1544for(offset =0; size >0; offset += len, size -= len, line += len, state->linenr++) {1545unsigned long nextlen;15461547 len =linelen(line, size);1548if(!len)1549break;15501551/* Testing this early allows us to take a few shortcuts.. */1552if(len <6)1553continue;15541555/*1556 * Make sure we don't find any unconnected patch fragments.1557 * That's a sign that we didn't find a header, and that a1558 * patch has become corrupted/broken up.1559 */1560if(!memcmp("@@ -", line,4)) {1561struct fragment dummy;1562if(parse_fragment_header(line, len, &dummy) <0)1563continue;1564error(_("patch fragment without header at line%d: %.*s"),1565 state->linenr, (int)len-1, line);1566return-128;1567}15681569if(size < len +6)1570break;15711572/*1573 * Git patch? It might not have a real patch, just a rename1574 * or mode change, so we handle that specially1575 */1576if(!memcmp("diff --git ", line,11)) {1577int git_hdr_len =parse_git_header(state, line, len, size, patch);1578if(git_hdr_len <0)1579return-128;1580if(git_hdr_len <= len)1581continue;1582if(!patch->old_name && !patch->new_name) {1583if(!patch->def_name) {1584error(Q_("git diff header lacks filename information when removing "1585"%dleading pathname component (line%d)",1586"git diff header lacks filename information when removing "1587"%dleading pathname components (line%d)",1588 state->p_value),1589 state->p_value, state->linenr);1590return-128;1591}1592 patch->old_name =xstrdup(patch->def_name);1593 patch->new_name =xstrdup(patch->def_name);1594}1595if((!patch->new_name && !patch->is_delete) ||1596(!patch->old_name && !patch->is_new)) {1597error(_("git diff header lacks filename information "1598"(line%d)"), state->linenr);1599return-128;1600}1601 patch->is_toplevel_relative =1;1602*hdrsize = git_hdr_len;1603return offset;1604}16051606/* --- followed by +++ ? */1607if(memcmp("--- ", line,4) ||memcmp("+++ ", line + len,4))1608continue;16091610/*1611 * We only accept unified patches, so we want it to1612 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1613 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1614 */1615 nextlen =linelen(line + len, size - len);1616if(size < nextlen +14||memcmp("@@ -", line + len + nextlen,4))1617continue;16181619/* Ok, we'll consider it a patch */1620if(parse_traditional_patch(state, line, line+len, patch))1621return-128;1622*hdrsize = len + nextlen;1623 state->linenr +=2;1624return offset;1625}1626return-1;1627}16281629static voidrecord_ws_error(struct apply_state *state,1630unsigned result,1631const char*line,1632int len,1633int linenr)1634{1635char*err;16361637if(!result)1638return;16391640 state->whitespace_error++;1641if(state->squelch_whitespace_errors &&1642 state->squelch_whitespace_errors < state->whitespace_error)1643return;16441645 err =whitespace_error_string(result);1646if(state->apply_verbosity > verbosity_silent)1647fprintf(stderr,"%s:%d:%s.\n%.*s\n",1648 state->patch_input_file, linenr, err, len, line);1649free(err);1650}16511652static voidcheck_whitespace(struct apply_state *state,1653const char*line,1654int len,1655unsigned ws_rule)1656{1657unsigned result =ws_check(line +1, len -1, ws_rule);16581659record_ws_error(state, result, line +1, len -2, state->linenr);1660}16611662/*1663 * Parse a unified diff. Note that this really needs to parse each1664 * fragment separately, since the only way to know the difference1665 * between a "---" that is part of a patch, and a "---" that starts1666 * the next patch is to look at the line counts..1667 */1668static intparse_fragment(struct apply_state *state,1669const char*line,1670unsigned long size,1671struct patch *patch,1672struct fragment *fragment)1673{1674int added, deleted;1675int len =linelen(line, size), offset;1676unsigned long oldlines, newlines;1677unsigned long leading, trailing;16781679 offset =parse_fragment_header(line, len, fragment);1680if(offset <0)1681return-1;1682if(offset >0&& patch->recount)1683recount_diff(line + offset, size - offset, fragment);1684 oldlines = fragment->oldlines;1685 newlines = fragment->newlines;1686 leading =0;1687 trailing =0;16881689/* Parse the thing.. */1690 line += len;1691 size -= len;1692 state->linenr++;1693 added = deleted =0;1694for(offset = len;16950< size;1696 offset += len, size -= len, line += len, state->linenr++) {1697if(!oldlines && !newlines)1698break;1699 len =linelen(line, size);1700if(!len || line[len-1] !='\n')1701return-1;1702switch(*line) {1703default:1704return-1;1705case'\n':/* newer GNU diff, an empty context line */1706case' ':1707 oldlines--;1708 newlines--;1709if(!deleted && !added)1710 leading++;1711 trailing++;1712if(!state->apply_in_reverse &&1713 state->ws_error_action == correct_ws_error)1714check_whitespace(state, line, len, patch->ws_rule);1715break;1716case'-':1717if(state->apply_in_reverse &&1718 state->ws_error_action != nowarn_ws_error)1719check_whitespace(state, line, len, patch->ws_rule);1720 deleted++;1721 oldlines--;1722 trailing =0;1723break;1724case'+':1725if(!state->apply_in_reverse &&1726 state->ws_error_action != nowarn_ws_error)1727check_whitespace(state, line, len, patch->ws_rule);1728 added++;1729 newlines--;1730 trailing =0;1731break;17321733/*1734 * We allow "\ No newline at end of file". Depending1735 * on locale settings when the patch was produced we1736 * don't know what this line looks like. The only1737 * thing we do know is that it begins with "\ ".1738 * Checking for 12 is just for sanity check -- any1739 * l10n of "\ No newline..." is at least that long.1740 */1741case'\\':1742if(len <12||memcmp(line,"\\",2))1743return-1;1744break;1745}1746}1747if(oldlines || newlines)1748return-1;1749if(!deleted && !added)1750return-1;17511752 fragment->leading = leading;1753 fragment->trailing = trailing;17541755/*1756 * If a fragment ends with an incomplete line, we failed to include1757 * it in the above loop because we hit oldlines == newlines == 01758 * before seeing it.1759 */1760if(12< size && !memcmp(line,"\\",2))1761 offset +=linelen(line, size);17621763 patch->lines_added += added;1764 patch->lines_deleted += deleted;17651766if(0< patch->is_new && oldlines)1767returnerror(_("new file depends on old contents"));1768if(0< patch->is_delete && newlines)1769returnerror(_("deleted file still has contents"));1770return offset;1771}17721773/*1774 * We have seen "diff --git a/... b/..." header (or a traditional patch1775 * header). Read hunks that belong to this patch into fragments and hang1776 * them to the given patch structure.1777 *1778 * The (fragment->patch, fragment->size) pair points into the memory given1779 * by the caller, not a copy, when we return.1780 *1781 * Returns:1782 * -1 in case of error,1783 * the number of bytes in the patch otherwise.1784 */1785static intparse_single_patch(struct apply_state *state,1786const char*line,1787unsigned long size,1788struct patch *patch)1789{1790unsigned long offset =0;1791unsigned long oldlines =0, newlines =0, context =0;1792struct fragment **fragp = &patch->fragments;17931794while(size >4&& !memcmp(line,"@@ -",4)) {1795struct fragment *fragment;1796int len;17971798 fragment =xcalloc(1,sizeof(*fragment));1799 fragment->linenr = state->linenr;1800 len =parse_fragment(state, line, size, patch, fragment);1801if(len <=0) {1802free(fragment);1803returnerror(_("corrupt patch at line%d"), state->linenr);1804}1805 fragment->patch = line;1806 fragment->size = len;1807 oldlines += fragment->oldlines;1808 newlines += fragment->newlines;1809 context += fragment->leading + fragment->trailing;18101811*fragp = fragment;1812 fragp = &fragment->next;18131814 offset += len;1815 line += len;1816 size -= len;1817}18181819/*1820 * If something was removed (i.e. we have old-lines) it cannot1821 * be creation, and if something was added it cannot be1822 * deletion. However, the reverse is not true; --unified=01823 * patches that only add are not necessarily creation even1824 * though they do not have any old lines, and ones that only1825 * delete are not necessarily deletion.1826 *1827 * Unfortunately, a real creation/deletion patch do _not_ have1828 * any context line by definition, so we cannot safely tell it1829 * apart with --unified=0 insanity. At least if the patch has1830 * more than one hunk it is not creation or deletion.1831 */1832if(patch->is_new <0&&1833(oldlines || (patch->fragments && patch->fragments->next)))1834 patch->is_new =0;1835if(patch->is_delete <0&&1836(newlines || (patch->fragments && patch->fragments->next)))1837 patch->is_delete =0;18381839if(0< patch->is_new && oldlines)1840returnerror(_("new file%sdepends on old contents"), patch->new_name);1841if(0< patch->is_delete && newlines)1842returnerror(_("deleted file%sstill has contents"), patch->old_name);1843if(!patch->is_delete && !newlines && context && state->apply_verbosity > verbosity_silent)1844fprintf_ln(stderr,1845_("** warning: "1846"file%sbecomes empty but is not deleted"),1847 patch->new_name);18481849return offset;1850}18511852staticinlineintmetadata_changes(struct patch *patch)1853{1854return patch->is_rename >0||1855 patch->is_copy >0||1856 patch->is_new >0||1857 patch->is_delete ||1858(patch->old_mode && patch->new_mode &&1859 patch->old_mode != patch->new_mode);1860}18611862static char*inflate_it(const void*data,unsigned long size,1863unsigned long inflated_size)1864{1865 git_zstream stream;1866void*out;1867int st;18681869memset(&stream,0,sizeof(stream));18701871 stream.next_in = (unsigned char*)data;1872 stream.avail_in = size;1873 stream.next_out = out =xmalloc(inflated_size);1874 stream.avail_out = inflated_size;1875git_inflate_init(&stream);1876 st =git_inflate(&stream, Z_FINISH);1877git_inflate_end(&stream);1878if((st != Z_STREAM_END) || stream.total_out != inflated_size) {1879free(out);1880return NULL;1881}1882return out;1883}18841885/*1886 * Read a binary hunk and return a new fragment; fragment->patch1887 * points at an allocated memory that the caller must free, so1888 * it is marked as "->free_patch = 1".1889 */1890static struct fragment *parse_binary_hunk(struct apply_state *state,1891char**buf_p,1892unsigned long*sz_p,1893int*status_p,1894int*used_p)1895{1896/*1897 * Expect a line that begins with binary patch method ("literal"1898 * or "delta"), followed by the length of data before deflating.1899 * a sequence of 'length-byte' followed by base-85 encoded data1900 * should follow, terminated by a newline.1901 *1902 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1903 * and we would limit the patch line to 66 characters,1904 * so one line can fit up to 13 groups that would decode1905 * to 52 bytes max. The length byte 'A'-'Z' corresponds1906 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1907 */1908int llen, used;1909unsigned long size = *sz_p;1910char*buffer = *buf_p;1911int patch_method;1912unsigned long origlen;1913char*data = NULL;1914int hunk_size =0;1915struct fragment *frag;19161917 llen =linelen(buffer, size);1918 used = llen;19191920*status_p =0;19211922if(starts_with(buffer,"delta ")) {1923 patch_method = BINARY_DELTA_DEFLATED;1924 origlen =strtoul(buffer +6, NULL,10);1925}1926else if(starts_with(buffer,"literal ")) {1927 patch_method = BINARY_LITERAL_DEFLATED;1928 origlen =strtoul(buffer +8, NULL,10);1929}1930else1931return NULL;19321933 state->linenr++;1934 buffer += llen;1935while(1) {1936int byte_length, max_byte_length, newsize;1937 llen =linelen(buffer, size);1938 used += llen;1939 state->linenr++;1940if(llen ==1) {1941/* consume the blank line */1942 buffer++;1943 size--;1944break;1945}1946/*1947 * Minimum line is "A00000\n" which is 7-byte long,1948 * and the line length must be multiple of 5 plus 2.1949 */1950if((llen <7) || (llen-2) %5)1951goto corrupt;1952 max_byte_length = (llen -2) /5*4;1953 byte_length = *buffer;1954if('A'<= byte_length && byte_length <='Z')1955 byte_length = byte_length -'A'+1;1956else if('a'<= byte_length && byte_length <='z')1957 byte_length = byte_length -'a'+27;1958else1959goto corrupt;1960/* if the input length was not multiple of 4, we would1961 * have filler at the end but the filler should never1962 * exceed 3 bytes1963 */1964if(max_byte_length < byte_length ||1965 byte_length <= max_byte_length -4)1966goto corrupt;1967 newsize = hunk_size + byte_length;1968 data =xrealloc(data, newsize);1969if(decode_85(data + hunk_size, buffer +1, byte_length))1970goto corrupt;1971 hunk_size = newsize;1972 buffer += llen;1973 size -= llen;1974}19751976 frag =xcalloc(1,sizeof(*frag));1977 frag->patch =inflate_it(data, hunk_size, origlen);1978 frag->free_patch =1;1979if(!frag->patch)1980goto corrupt;1981free(data);1982 frag->size = origlen;1983*buf_p = buffer;1984*sz_p = size;1985*used_p = used;1986 frag->binary_patch_method = patch_method;1987return frag;19881989 corrupt:1990free(data);1991*status_p = -1;1992error(_("corrupt binary patch at line%d: %.*s"),1993 state->linenr-1, llen-1, buffer);1994return NULL;1995}19961997/*1998 * Returns:1999 * -1 in case of error,2000 * the length of the parsed binary patch otherwise2001 */2002static intparse_binary(struct apply_state *state,2003char*buffer,2004unsigned long size,2005struct patch *patch)2006{2007/*2008 * We have read "GIT binary patch\n"; what follows is a line2009 * that says the patch method (currently, either "literal" or2010 * "delta") and the length of data before deflating; a2011 * sequence of 'length-byte' followed by base-85 encoded data2012 * follows.2013 *2014 * When a binary patch is reversible, there is another binary2015 * hunk in the same format, starting with patch method (either2016 * "literal" or "delta") with the length of data, and a sequence2017 * of length-byte + base-85 encoded data, terminated with another2018 * empty line. This data, when applied to the postimage, produces2019 * the preimage.2020 */2021struct fragment *forward;2022struct fragment *reverse;2023int status;2024int used, used_1;20252026 forward =parse_binary_hunk(state, &buffer, &size, &status, &used);2027if(!forward && !status)2028/* there has to be one hunk (forward hunk) */2029returnerror(_("unrecognized binary patch at line%d"), state->linenr-1);2030if(status)2031/* otherwise we already gave an error message */2032return status;20332034 reverse =parse_binary_hunk(state, &buffer, &size, &status, &used_1);2035if(reverse)2036 used += used_1;2037else if(status) {2038/*2039 * Not having reverse hunk is not an error, but having2040 * a corrupt reverse hunk is.2041 */2042free((void*) forward->patch);2043free(forward);2044return status;2045}2046 forward->next = reverse;2047 patch->fragments = forward;2048 patch->is_binary =1;2049return used;2050}20512052static voidprefix_one(struct apply_state *state,char**name)2053{2054char*old_name = *name;2055if(!old_name)2056return;2057*name =xstrdup(prefix_filename(state->prefix, state->prefix_length, *name));2058free(old_name);2059}20602061static voidprefix_patch(struct apply_state *state,struct patch *p)2062{2063if(!state->prefix || p->is_toplevel_relative)2064return;2065prefix_one(state, &p->new_name);2066prefix_one(state, &p->old_name);2067}20682069/*2070 * include/exclude2071 */20722073static voidadd_name_limit(struct apply_state *state,2074const char*name,2075int exclude)2076{2077struct string_list_item *it;20782079 it =string_list_append(&state->limit_by_name, name);2080 it->util = exclude ? NULL : (void*)1;2081}20822083static intuse_patch(struct apply_state *state,struct patch *p)2084{2085const char*pathname = p->new_name ? p->new_name : p->old_name;2086int i;20872088/* Paths outside are not touched regardless of "--include" */2089if(0< state->prefix_length) {2090int pathlen =strlen(pathname);2091if(pathlen <= state->prefix_length ||2092memcmp(state->prefix, pathname, state->prefix_length))2093return0;2094}20952096/* See if it matches any of exclude/include rule */2097for(i =0; i < state->limit_by_name.nr; i++) {2098struct string_list_item *it = &state->limit_by_name.items[i];2099if(!wildmatch(it->string, pathname,0, NULL))2100return(it->util != NULL);2101}21022103/*2104 * If we had any include, a path that does not match any rule is2105 * not used. Otherwise, we saw bunch of exclude rules (or none)2106 * and such a path is used.2107 */2108return!state->has_include;2109}21102111/*2112 * Read the patch text in "buffer" that extends for "size" bytes; stop2113 * reading after seeing a single patch (i.e. changes to a single file).2114 * Create fragments (i.e. patch hunks) and hang them to the given patch.2115 *2116 * Returns:2117 * -1 if no header was found or parse_binary() failed,2118 * -128 on another error,2119 * the number of bytes consumed otherwise,2120 * so that the caller can call us again for the next patch.2121 */2122static intparse_chunk(struct apply_state *state,char*buffer,unsigned long size,struct patch *patch)2123{2124int hdrsize, patchsize;2125int offset =find_header(state, buffer, size, &hdrsize, patch);21262127if(offset <0)2128return offset;21292130prefix_patch(state, patch);21312132if(!use_patch(state, patch))2133 patch->ws_rule =0;2134else2135 patch->ws_rule =whitespace_rule(patch->new_name2136? patch->new_name2137: patch->old_name);21382139 patchsize =parse_single_patch(state,2140 buffer + offset + hdrsize,2141 size - offset - hdrsize,2142 patch);21432144if(patchsize <0)2145return-128;21462147if(!patchsize) {2148static const char git_binary[] ="GIT binary patch\n";2149int hd = hdrsize + offset;2150unsigned long llen =linelen(buffer + hd, size - hd);21512152if(llen ==sizeof(git_binary) -1&&2153!memcmp(git_binary, buffer + hd, llen)) {2154int used;2155 state->linenr++;2156 used =parse_binary(state, buffer + hd + llen,2157 size - hd - llen, patch);2158if(used <0)2159return-1;2160if(used)2161 patchsize = used + llen;2162else2163 patchsize =0;2164}2165else if(!memcmp(" differ\n", buffer + hd + llen -8,8)) {2166static const char*binhdr[] = {2167"Binary files ",2168"Files ",2169 NULL,2170};2171int i;2172for(i =0; binhdr[i]; i++) {2173int len =strlen(binhdr[i]);2174if(len < size - hd &&2175!memcmp(binhdr[i], buffer + hd, len)) {2176 state->linenr++;2177 patch->is_binary =1;2178 patchsize = llen;2179break;2180}2181}2182}21832184/* Empty patch cannot be applied if it is a text patch2185 * without metadata change. A binary patch appears2186 * empty to us here.2187 */2188if((state->apply || state->check) &&2189(!patch->is_binary && !metadata_changes(patch))) {2190error(_("patch with only garbage at line%d"), state->linenr);2191return-128;2192}2193}21942195return offset + hdrsize + patchsize;2196}21972198#define swap(a,b) myswap((a),(b),sizeof(a))21992200#define myswap(a, b, size) do { \2201 unsigned char mytmp[size]; \2202 memcpy(mytmp, &a, size); \2203 memcpy(&a, &b, size); \2204 memcpy(&b, mytmp, size); \2205} while (0)22062207static voidreverse_patches(struct patch *p)2208{2209for(; p; p = p->next) {2210struct fragment *frag = p->fragments;22112212swap(p->new_name, p->old_name);2213swap(p->new_mode, p->old_mode);2214swap(p->is_new, p->is_delete);2215swap(p->lines_added, p->lines_deleted);2216swap(p->old_sha1_prefix, p->new_sha1_prefix);22172218for(; frag; frag = frag->next) {2219swap(frag->newpos, frag->oldpos);2220swap(frag->newlines, frag->oldlines);2221}2222}2223}22242225static const char pluses[] =2226"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2227static const char minuses[]=2228"----------------------------------------------------------------------";22292230static voidshow_stats(struct apply_state *state,struct patch *patch)2231{2232struct strbuf qname = STRBUF_INIT;2233char*cp = patch->new_name ? patch->new_name : patch->old_name;2234int max, add, del;22352236quote_c_style(cp, &qname, NULL,0);22372238/*2239 * "scale" the filename2240 */2241 max = state->max_len;2242if(max >50)2243 max =50;22442245if(qname.len > max) {2246 cp =strchr(qname.buf + qname.len +3- max,'/');2247if(!cp)2248 cp = qname.buf + qname.len +3- max;2249strbuf_splice(&qname,0, cp - qname.buf,"...",3);2250}22512252if(patch->is_binary) {2253printf(" %-*s | Bin\n", max, qname.buf);2254strbuf_release(&qname);2255return;2256}22572258printf(" %-*s |", max, qname.buf);2259strbuf_release(&qname);22602261/*2262 * scale the add/delete2263 */2264 max = max + state->max_change >70?70- max : state->max_change;2265 add = patch->lines_added;2266 del = patch->lines_deleted;22672268if(state->max_change >0) {2269int total = ((add + del) * max + state->max_change /2) / state->max_change;2270 add = (add * max + state->max_change /2) / state->max_change;2271 del = total - add;2272}2273printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2274 add, pluses, del, minuses);2275}22762277static intread_old_data(struct stat *st,const char*path,struct strbuf *buf)2278{2279switch(st->st_mode & S_IFMT) {2280case S_IFLNK:2281if(strbuf_readlink(buf, path, st->st_size) <0)2282returnerror(_("unable to read symlink%s"), path);2283return0;2284case S_IFREG:2285if(strbuf_read_file(buf, path, st->st_size) != st->st_size)2286returnerror(_("unable to open or read%s"), path);2287convert_to_git(path, buf->buf, buf->len, buf,0);2288return0;2289default:2290return-1;2291}2292}22932294/*2295 * Update the preimage, and the common lines in postimage,2296 * from buffer buf of length len. If postlen is 0 the postimage2297 * is updated in place, otherwise it's updated on a new buffer2298 * of length postlen2299 */23002301static voidupdate_pre_post_images(struct image *preimage,2302struct image *postimage,2303char*buf,2304size_t len,size_t postlen)2305{2306int i, ctx, reduced;2307char*new, *old, *fixed;2308struct image fixed_preimage;23092310/*2311 * Update the preimage with whitespace fixes. Note that we2312 * are not losing preimage->buf -- apply_one_fragment() will2313 * free "oldlines".2314 */2315prepare_image(&fixed_preimage, buf, len,1);2316assert(postlen2317? fixed_preimage.nr == preimage->nr2318: fixed_preimage.nr <= preimage->nr);2319for(i =0; i < fixed_preimage.nr; i++)2320 fixed_preimage.line[i].flag = preimage->line[i].flag;2321free(preimage->line_allocated);2322*preimage = fixed_preimage;23232324/*2325 * Adjust the common context lines in postimage. This can be2326 * done in-place when we are shrinking it with whitespace2327 * fixing, but needs a new buffer when ignoring whitespace or2328 * expanding leading tabs to spaces.2329 *2330 * We trust the caller to tell us if the update can be done2331 * in place (postlen==0) or not.2332 */2333 old = postimage->buf;2334if(postlen)2335new= postimage->buf =xmalloc(postlen);2336else2337new= old;2338 fixed = preimage->buf;23392340for(i = reduced = ctx =0; i < postimage->nr; i++) {2341size_t l_len = postimage->line[i].len;2342if(!(postimage->line[i].flag & LINE_COMMON)) {2343/* an added line -- no counterparts in preimage */2344memmove(new, old, l_len);2345 old += l_len;2346new+= l_len;2347continue;2348}23492350/* a common context -- skip it in the original postimage */2351 old += l_len;23522353/* and find the corresponding one in the fixed preimage */2354while(ctx < preimage->nr &&2355!(preimage->line[ctx].flag & LINE_COMMON)) {2356 fixed += preimage->line[ctx].len;2357 ctx++;2358}23592360/*2361 * preimage is expected to run out, if the caller2362 * fixed addition of trailing blank lines.2363 */2364if(preimage->nr <= ctx) {2365 reduced++;2366continue;2367}23682369/* and copy it in, while fixing the line length */2370 l_len = preimage->line[ctx].len;2371memcpy(new, fixed, l_len);2372new+= l_len;2373 fixed += l_len;2374 postimage->line[i].len = l_len;2375 ctx++;2376}23772378if(postlen2379? postlen <new- postimage->buf2380: postimage->len <new- postimage->buf)2381die("BUG: caller miscounted postlen: asked%d, orig =%d, used =%d",2382(int)postlen, (int) postimage->len, (int)(new- postimage->buf));23832384/* Fix the length of the whole thing */2385 postimage->len =new- postimage->buf;2386 postimage->nr -= reduced;2387}23882389static intline_by_line_fuzzy_match(struct image *img,2390struct image *preimage,2391struct image *postimage,2392unsigned longtry,2393int try_lno,2394int preimage_limit)2395{2396int i;2397size_t imgoff =0;2398size_t preoff =0;2399size_t postlen = postimage->len;2400size_t extra_chars;2401char*buf;2402char*preimage_eof;2403char*preimage_end;2404struct strbuf fixed;2405char*fixed_buf;2406size_t fixed_len;24072408for(i =0; i < preimage_limit; i++) {2409size_t prelen = preimage->line[i].len;2410size_t imglen = img->line[try_lno+i].len;24112412if(!fuzzy_matchlines(img->buf +try+ imgoff, imglen,2413 preimage->buf + preoff, prelen))2414return0;2415if(preimage->line[i].flag & LINE_COMMON)2416 postlen += imglen - prelen;2417 imgoff += imglen;2418 preoff += prelen;2419}24202421/*2422 * Ok, the preimage matches with whitespace fuzz.2423 *2424 * imgoff now holds the true length of the target that2425 * matches the preimage before the end of the file.2426 *2427 * Count the number of characters in the preimage that fall2428 * beyond the end of the file and make sure that all of them2429 * are whitespace characters. (This can only happen if2430 * we are removing blank lines at the end of the file.)2431 */2432 buf = preimage_eof = preimage->buf + preoff;2433for( ; i < preimage->nr; i++)2434 preoff += preimage->line[i].len;2435 preimage_end = preimage->buf + preoff;2436for( ; buf < preimage_end; buf++)2437if(!isspace(*buf))2438return0;24392440/*2441 * Update the preimage and the common postimage context2442 * lines to use the same whitespace as the target.2443 * If whitespace is missing in the target (i.e.2444 * if the preimage extends beyond the end of the file),2445 * use the whitespace from the preimage.2446 */2447 extra_chars = preimage_end - preimage_eof;2448strbuf_init(&fixed, imgoff + extra_chars);2449strbuf_add(&fixed, img->buf +try, imgoff);2450strbuf_add(&fixed, preimage_eof, extra_chars);2451 fixed_buf =strbuf_detach(&fixed, &fixed_len);2452update_pre_post_images(preimage, postimage,2453 fixed_buf, fixed_len, postlen);2454return1;2455}24562457static intmatch_fragment(struct apply_state *state,2458struct image *img,2459struct image *preimage,2460struct image *postimage,2461unsigned longtry,2462int try_lno,2463unsigned ws_rule,2464int match_beginning,int match_end)2465{2466int i;2467char*fixed_buf, *buf, *orig, *target;2468struct strbuf fixed;2469size_t fixed_len, postlen;2470int preimage_limit;24712472if(preimage->nr + try_lno <= img->nr) {2473/*2474 * The hunk falls within the boundaries of img.2475 */2476 preimage_limit = preimage->nr;2477if(match_end && (preimage->nr + try_lno != img->nr))2478return0;2479}else if(state->ws_error_action == correct_ws_error &&2480(ws_rule & WS_BLANK_AT_EOF)) {2481/*2482 * This hunk extends beyond the end of img, and we are2483 * removing blank lines at the end of the file. This2484 * many lines from the beginning of the preimage must2485 * match with img, and the remainder of the preimage2486 * must be blank.2487 */2488 preimage_limit = img->nr - try_lno;2489}else{2490/*2491 * The hunk extends beyond the end of the img and2492 * we are not removing blanks at the end, so we2493 * should reject the hunk at this position.2494 */2495return0;2496}24972498if(match_beginning && try_lno)2499return0;25002501/* Quick hash check */2502for(i =0; i < preimage_limit; i++)2503if((img->line[try_lno + i].flag & LINE_PATCHED) ||2504(preimage->line[i].hash != img->line[try_lno + i].hash))2505return0;25062507if(preimage_limit == preimage->nr) {2508/*2509 * Do we have an exact match? If we were told to match2510 * at the end, size must be exactly at try+fragsize,2511 * otherwise try+fragsize must be still within the preimage,2512 * and either case, the old piece should match the preimage2513 * exactly.2514 */2515if((match_end2516? (try+ preimage->len == img->len)2517: (try+ preimage->len <= img->len)) &&2518!memcmp(img->buf +try, preimage->buf, preimage->len))2519return1;2520}else{2521/*2522 * The preimage extends beyond the end of img, so2523 * there cannot be an exact match.2524 *2525 * There must be one non-blank context line that match2526 * a line before the end of img.2527 */2528char*buf_end;25292530 buf = preimage->buf;2531 buf_end = buf;2532for(i =0; i < preimage_limit; i++)2533 buf_end += preimage->line[i].len;25342535for( ; buf < buf_end; buf++)2536if(!isspace(*buf))2537break;2538if(buf == buf_end)2539return0;2540}25412542/*2543 * No exact match. If we are ignoring whitespace, run a line-by-line2544 * fuzzy matching. We collect all the line length information because2545 * we need it to adjust whitespace if we match.2546 */2547if(state->ws_ignore_action == ignore_ws_change)2548returnline_by_line_fuzzy_match(img, preimage, postimage,2549try, try_lno, preimage_limit);25502551if(state->ws_error_action != correct_ws_error)2552return0;25532554/*2555 * The hunk does not apply byte-by-byte, but the hash says2556 * it might with whitespace fuzz. We weren't asked to2557 * ignore whitespace, we were asked to correct whitespace2558 * errors, so let's try matching after whitespace correction.2559 *2560 * While checking the preimage against the target, whitespace2561 * errors in both fixed, we count how large the corresponding2562 * postimage needs to be. The postimage prepared by2563 * apply_one_fragment() has whitespace errors fixed on added2564 * lines already, but the common lines were propagated as-is,2565 * which may become longer when their whitespace errors are2566 * fixed.2567 */25682569/* First count added lines in postimage */2570 postlen =0;2571for(i =0; i < postimage->nr; i++) {2572if(!(postimage->line[i].flag & LINE_COMMON))2573 postlen += postimage->line[i].len;2574}25752576/*2577 * The preimage may extend beyond the end of the file,2578 * but in this loop we will only handle the part of the2579 * preimage that falls within the file.2580 */2581strbuf_init(&fixed, preimage->len +1);2582 orig = preimage->buf;2583 target = img->buf +try;2584for(i =0; i < preimage_limit; i++) {2585size_t oldlen = preimage->line[i].len;2586size_t tgtlen = img->line[try_lno + i].len;2587size_t fixstart = fixed.len;2588struct strbuf tgtfix;2589int match;25902591/* Try fixing the line in the preimage */2592ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);25932594/* Try fixing the line in the target */2595strbuf_init(&tgtfix, tgtlen);2596ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);25972598/*2599 * If they match, either the preimage was based on2600 * a version before our tree fixed whitespace breakage,2601 * or we are lacking a whitespace-fix patch the tree2602 * the preimage was based on already had (i.e. target2603 * has whitespace breakage, the preimage doesn't).2604 * In either case, we are fixing the whitespace breakages2605 * so we might as well take the fix together with their2606 * real change.2607 */2608 match = (tgtfix.len == fixed.len - fixstart &&2609!memcmp(tgtfix.buf, fixed.buf + fixstart,2610 fixed.len - fixstart));26112612/* Add the length if this is common with the postimage */2613if(preimage->line[i].flag & LINE_COMMON)2614 postlen += tgtfix.len;26152616strbuf_release(&tgtfix);2617if(!match)2618goto unmatch_exit;26192620 orig += oldlen;2621 target += tgtlen;2622}262326242625/*2626 * Now handle the lines in the preimage that falls beyond the2627 * end of the file (if any). They will only match if they are2628 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2629 * false).2630 */2631for( ; i < preimage->nr; i++) {2632size_t fixstart = fixed.len;/* start of the fixed preimage */2633size_t oldlen = preimage->line[i].len;2634int j;26352636/* Try fixing the line in the preimage */2637ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);26382639for(j = fixstart; j < fixed.len; j++)2640if(!isspace(fixed.buf[j]))2641goto unmatch_exit;26422643 orig += oldlen;2644}26452646/*2647 * Yes, the preimage is based on an older version that still2648 * has whitespace breakages unfixed, and fixing them makes the2649 * hunk match. Update the context lines in the postimage.2650 */2651 fixed_buf =strbuf_detach(&fixed, &fixed_len);2652if(postlen < postimage->len)2653 postlen =0;2654update_pre_post_images(preimage, postimage,2655 fixed_buf, fixed_len, postlen);2656return1;26572658 unmatch_exit:2659strbuf_release(&fixed);2660return0;2661}26622663static intfind_pos(struct apply_state *state,2664struct image *img,2665struct image *preimage,2666struct image *postimage,2667int line,2668unsigned ws_rule,2669int match_beginning,int match_end)2670{2671int i;2672unsigned long backwards, forwards,try;2673int backwards_lno, forwards_lno, try_lno;26742675/*2676 * If match_beginning or match_end is specified, there is no2677 * point starting from a wrong line that will never match and2678 * wander around and wait for a match at the specified end.2679 */2680if(match_beginning)2681 line =0;2682else if(match_end)2683 line = img->nr - preimage->nr;26842685/*2686 * Because the comparison is unsigned, the following test2687 * will also take care of a negative line number that can2688 * result when match_end and preimage is larger than the target.2689 */2690if((size_t) line > img->nr)2691 line = img->nr;26922693try=0;2694for(i =0; i < line; i++)2695try+= img->line[i].len;26962697/*2698 * There's probably some smart way to do this, but I'll leave2699 * that to the smart and beautiful people. I'm simple and stupid.2700 */2701 backwards =try;2702 backwards_lno = line;2703 forwards =try;2704 forwards_lno = line;2705 try_lno = line;27062707for(i =0; ; i++) {2708if(match_fragment(state, img, preimage, postimage,2709try, try_lno, ws_rule,2710 match_beginning, match_end))2711return try_lno;27122713 again:2714if(backwards_lno ==0&& forwards_lno == img->nr)2715break;27162717if(i &1) {2718if(backwards_lno ==0) {2719 i++;2720goto again;2721}2722 backwards_lno--;2723 backwards -= img->line[backwards_lno].len;2724try= backwards;2725 try_lno = backwards_lno;2726}else{2727if(forwards_lno == img->nr) {2728 i++;2729goto again;2730}2731 forwards += img->line[forwards_lno].len;2732 forwards_lno++;2733try= forwards;2734 try_lno = forwards_lno;2735}27362737}2738return-1;2739}27402741static voidremove_first_line(struct image *img)2742{2743 img->buf += img->line[0].len;2744 img->len -= img->line[0].len;2745 img->line++;2746 img->nr--;2747}27482749static voidremove_last_line(struct image *img)2750{2751 img->len -= img->line[--img->nr].len;2752}27532754/*2755 * The change from "preimage" and "postimage" has been found to2756 * apply at applied_pos (counts in line numbers) in "img".2757 * Update "img" to remove "preimage" and replace it with "postimage".2758 */2759static voidupdate_image(struct apply_state *state,2760struct image *img,2761int applied_pos,2762struct image *preimage,2763struct image *postimage)2764{2765/*2766 * remove the copy of preimage at offset in img2767 * and replace it with postimage2768 */2769int i, nr;2770size_t remove_count, insert_count, applied_at =0;2771char*result;2772int preimage_limit;27732774/*2775 * If we are removing blank lines at the end of img,2776 * the preimage may extend beyond the end.2777 * If that is the case, we must be careful only to2778 * remove the part of the preimage that falls within2779 * the boundaries of img. Initialize preimage_limit2780 * to the number of lines in the preimage that falls2781 * within the boundaries.2782 */2783 preimage_limit = preimage->nr;2784if(preimage_limit > img->nr - applied_pos)2785 preimage_limit = img->nr - applied_pos;27862787for(i =0; i < applied_pos; i++)2788 applied_at += img->line[i].len;27892790 remove_count =0;2791for(i =0; i < preimage_limit; i++)2792 remove_count += img->line[applied_pos + i].len;2793 insert_count = postimage->len;27942795/* Adjust the contents */2796 result =xmalloc(st_add3(st_sub(img->len, remove_count), insert_count,1));2797memcpy(result, img->buf, applied_at);2798memcpy(result + applied_at, postimage->buf, postimage->len);2799memcpy(result + applied_at + postimage->len,2800 img->buf + (applied_at + remove_count),2801 img->len - (applied_at + remove_count));2802free(img->buf);2803 img->buf = result;2804 img->len += insert_count - remove_count;2805 result[img->len] ='\0';28062807/* Adjust the line table */2808 nr = img->nr + postimage->nr - preimage_limit;2809if(preimage_limit < postimage->nr) {2810/*2811 * NOTE: this knows that we never call remove_first_line()2812 * on anything other than pre/post image.2813 */2814REALLOC_ARRAY(img->line, nr);2815 img->line_allocated = img->line;2816}2817if(preimage_limit != postimage->nr)2818memmove(img->line + applied_pos + postimage->nr,2819 img->line + applied_pos + preimage_limit,2820(img->nr - (applied_pos + preimage_limit)) *2821sizeof(*img->line));2822memcpy(img->line + applied_pos,2823 postimage->line,2824 postimage->nr *sizeof(*img->line));2825if(!state->allow_overlap)2826for(i =0; i < postimage->nr; i++)2827 img->line[applied_pos + i].flag |= LINE_PATCHED;2828 img->nr = nr;2829}28302831/*2832 * Use the patch-hunk text in "frag" to prepare two images (preimage and2833 * postimage) for the hunk. Find lines that match "preimage" in "img" and2834 * replace the part of "img" with "postimage" text.2835 */2836static intapply_one_fragment(struct apply_state *state,2837struct image *img,struct fragment *frag,2838int inaccurate_eof,unsigned ws_rule,2839int nth_fragment)2840{2841int match_beginning, match_end;2842const char*patch = frag->patch;2843int size = frag->size;2844char*old, *oldlines;2845struct strbuf newlines;2846int new_blank_lines_at_end =0;2847int found_new_blank_lines_at_end =0;2848int hunk_linenr = frag->linenr;2849unsigned long leading, trailing;2850int pos, applied_pos;2851struct image preimage;2852struct image postimage;28532854memset(&preimage,0,sizeof(preimage));2855memset(&postimage,0,sizeof(postimage));2856 oldlines =xmalloc(size);2857strbuf_init(&newlines, size);28582859 old = oldlines;2860while(size >0) {2861char first;2862int len =linelen(patch, size);2863int plen;2864int added_blank_line =0;2865int is_blank_context =0;2866size_t start;28672868if(!len)2869break;28702871/*2872 * "plen" is how much of the line we should use for2873 * the actual patch data. Normally we just remove the2874 * first character on the line, but if the line is2875 * followed by "\ No newline", then we also remove the2876 * last one (which is the newline, of course).2877 */2878 plen = len -1;2879if(len < size && patch[len] =='\\')2880 plen--;2881 first = *patch;2882if(state->apply_in_reverse) {2883if(first =='-')2884 first ='+';2885else if(first =='+')2886 first ='-';2887}28882889switch(first) {2890case'\n':2891/* Newer GNU diff, empty context line */2892if(plen <0)2893/* ... followed by '\No newline'; nothing */2894break;2895*old++ ='\n';2896strbuf_addch(&newlines,'\n');2897add_line_info(&preimage,"\n",1, LINE_COMMON);2898add_line_info(&postimage,"\n",1, LINE_COMMON);2899 is_blank_context =1;2900break;2901case' ':2902if(plen && (ws_rule & WS_BLANK_AT_EOF) &&2903ws_blank_line(patch +1, plen, ws_rule))2904 is_blank_context =1;2905case'-':2906memcpy(old, patch +1, plen);2907add_line_info(&preimage, old, plen,2908(first ==' '? LINE_COMMON :0));2909 old += plen;2910if(first =='-')2911break;2912/* Fall-through for ' ' */2913case'+':2914/* --no-add does not add new lines */2915if(first =='+'&& state->no_add)2916break;29172918 start = newlines.len;2919if(first !='+'||2920!state->whitespace_error ||2921 state->ws_error_action != correct_ws_error) {2922strbuf_add(&newlines, patch +1, plen);2923}2924else{2925ws_fix_copy(&newlines, patch +1, plen, ws_rule, &state->applied_after_fixing_ws);2926}2927add_line_info(&postimage, newlines.buf + start, newlines.len - start,2928(first =='+'?0: LINE_COMMON));2929if(first =='+'&&2930(ws_rule & WS_BLANK_AT_EOF) &&2931ws_blank_line(patch +1, plen, ws_rule))2932 added_blank_line =1;2933break;2934case'@':case'\\':2935/* Ignore it, we already handled it */2936break;2937default:2938if(state->apply_verbosity > verbosity_normal)2939error(_("invalid start of line: '%c'"), first);2940 applied_pos = -1;2941goto out;2942}2943if(added_blank_line) {2944if(!new_blank_lines_at_end)2945 found_new_blank_lines_at_end = hunk_linenr;2946 new_blank_lines_at_end++;2947}2948else if(is_blank_context)2949;2950else2951 new_blank_lines_at_end =0;2952 patch += len;2953 size -= len;2954 hunk_linenr++;2955}2956if(inaccurate_eof &&2957 old > oldlines && old[-1] =='\n'&&2958 newlines.len >0&& newlines.buf[newlines.len -1] =='\n') {2959 old--;2960strbuf_setlen(&newlines, newlines.len -1);2961}29622963 leading = frag->leading;2964 trailing = frag->trailing;29652966/*2967 * A hunk to change lines at the beginning would begin with2968 * @@ -1,L +N,M @@2969 * but we need to be careful. -U0 that inserts before the second2970 * line also has this pattern.2971 *2972 * And a hunk to add to an empty file would begin with2973 * @@ -0,0 +N,M @@2974 *2975 * In other words, a hunk that is (frag->oldpos <= 1) with or2976 * without leading context must match at the beginning.2977 */2978 match_beginning = (!frag->oldpos ||2979(frag->oldpos ==1&& !state->unidiff_zero));29802981/*2982 * A hunk without trailing lines must match at the end.2983 * However, we simply cannot tell if a hunk must match end2984 * from the lack of trailing lines if the patch was generated2985 * with unidiff without any context.2986 */2987 match_end = !state->unidiff_zero && !trailing;29882989 pos = frag->newpos ? (frag->newpos -1) :0;2990 preimage.buf = oldlines;2991 preimage.len = old - oldlines;2992 postimage.buf = newlines.buf;2993 postimage.len = newlines.len;2994 preimage.line = preimage.line_allocated;2995 postimage.line = postimage.line_allocated;29962997for(;;) {29982999 applied_pos =find_pos(state, img, &preimage, &postimage, pos,3000 ws_rule, match_beginning, match_end);30013002if(applied_pos >=0)3003break;30043005/* Am I at my context limits? */3006if((leading <= state->p_context) && (trailing <= state->p_context))3007break;3008if(match_beginning || match_end) {3009 match_beginning = match_end =0;3010continue;3011}30123013/*3014 * Reduce the number of context lines; reduce both3015 * leading and trailing if they are equal otherwise3016 * just reduce the larger context.3017 */3018if(leading >= trailing) {3019remove_first_line(&preimage);3020remove_first_line(&postimage);3021 pos--;3022 leading--;3023}3024if(trailing > leading) {3025remove_last_line(&preimage);3026remove_last_line(&postimage);3027 trailing--;3028}3029}30303031if(applied_pos >=0) {3032if(new_blank_lines_at_end &&3033 preimage.nr + applied_pos >= img->nr &&3034(ws_rule & WS_BLANK_AT_EOF) &&3035 state->ws_error_action != nowarn_ws_error) {3036record_ws_error(state, WS_BLANK_AT_EOF,"+",1,3037 found_new_blank_lines_at_end);3038if(state->ws_error_action == correct_ws_error) {3039while(new_blank_lines_at_end--)3040remove_last_line(&postimage);3041}3042/*3043 * We would want to prevent write_out_results()3044 * from taking place in apply_patch() that follows3045 * the callchain led us here, which is:3046 * apply_patch->check_patch_list->check_patch->3047 * apply_data->apply_fragments->apply_one_fragment3048 */3049if(state->ws_error_action == die_on_ws_error)3050 state->apply =0;3051}30523053if(state->apply_verbosity > verbosity_normal && applied_pos != pos) {3054int offset = applied_pos - pos;3055if(state->apply_in_reverse)3056 offset =0- offset;3057fprintf_ln(stderr,3058Q_("Hunk #%dsucceeded at%d(offset%dline).",3059"Hunk #%dsucceeded at%d(offset%dlines).",3060 offset),3061 nth_fragment, applied_pos +1, offset);3062}30633064/*3065 * Warn if it was necessary to reduce the number3066 * of context lines.3067 */3068if((leading != frag->leading ||3069 trailing != frag->trailing) && state->apply_verbosity > verbosity_silent)3070fprintf_ln(stderr,_("Context reduced to (%ld/%ld)"3071" to apply fragment at%d"),3072 leading, trailing, applied_pos+1);3073update_image(state, img, applied_pos, &preimage, &postimage);3074}else{3075if(state->apply_verbosity > verbosity_normal)3076error(_("while searching for:\n%.*s"),3077(int)(old - oldlines), oldlines);3078}30793080out:3081free(oldlines);3082strbuf_release(&newlines);3083free(preimage.line_allocated);3084free(postimage.line_allocated);30853086return(applied_pos <0);3087}30883089static intapply_binary_fragment(struct apply_state *state,3090struct image *img,3091struct patch *patch)3092{3093struct fragment *fragment = patch->fragments;3094unsigned long len;3095void*dst;30963097if(!fragment)3098returnerror(_("missing binary patch data for '%s'"),3099 patch->new_name ?3100 patch->new_name :3101 patch->old_name);31023103/* Binary patch is irreversible without the optional second hunk */3104if(state->apply_in_reverse) {3105if(!fragment->next)3106returnerror(_("cannot reverse-apply a binary patch "3107"without the reverse hunk to '%s'"),3108 patch->new_name3109? patch->new_name : patch->old_name);3110 fragment = fragment->next;3111}3112switch(fragment->binary_patch_method) {3113case BINARY_DELTA_DEFLATED:3114 dst =patch_delta(img->buf, img->len, fragment->patch,3115 fragment->size, &len);3116if(!dst)3117return-1;3118clear_image(img);3119 img->buf = dst;3120 img->len = len;3121return0;3122case BINARY_LITERAL_DEFLATED:3123clear_image(img);3124 img->len = fragment->size;3125 img->buf =xmemdupz(fragment->patch, img->len);3126return0;3127}3128return-1;3129}31303131/*3132 * Replace "img" with the result of applying the binary patch.3133 * The binary patch data itself in patch->fragment is still kept3134 * but the preimage prepared by the caller in "img" is freed here3135 * or in the helper function apply_binary_fragment() this calls.3136 */3137static intapply_binary(struct apply_state *state,3138struct image *img,3139struct patch *patch)3140{3141const char*name = patch->old_name ? patch->old_name : patch->new_name;3142struct object_id oid;31433144/*3145 * For safety, we require patch index line to contain3146 * full 40-byte textual SHA1 for old and new, at least for now.3147 */3148if(strlen(patch->old_sha1_prefix) !=40||3149strlen(patch->new_sha1_prefix) !=40||3150get_oid_hex(patch->old_sha1_prefix, &oid) ||3151get_oid_hex(patch->new_sha1_prefix, &oid))3152returnerror(_("cannot apply binary patch to '%s' "3153"without full index line"), name);31543155if(patch->old_name) {3156/*3157 * See if the old one matches what the patch3158 * applies to.3159 */3160hash_sha1_file(img->buf, img->len, blob_type, oid.hash);3161if(strcmp(oid_to_hex(&oid), patch->old_sha1_prefix))3162returnerror(_("the patch applies to '%s' (%s), "3163"which does not match the "3164"current contents."),3165 name,oid_to_hex(&oid));3166}3167else{3168/* Otherwise, the old one must be empty. */3169if(img->len)3170returnerror(_("the patch applies to an empty "3171"'%s' but it is not empty"), name);3172}31733174get_oid_hex(patch->new_sha1_prefix, &oid);3175if(is_null_oid(&oid)) {3176clear_image(img);3177return0;/* deletion patch */3178}31793180if(has_sha1_file(oid.hash)) {3181/* We already have the postimage */3182enum object_type type;3183unsigned long size;3184char*result;31853186 result =read_sha1_file(oid.hash, &type, &size);3187if(!result)3188returnerror(_("the necessary postimage%sfor "3189"'%s' cannot be read"),3190 patch->new_sha1_prefix, name);3191clear_image(img);3192 img->buf = result;3193 img->len = size;3194}else{3195/*3196 * We have verified buf matches the preimage;3197 * apply the patch data to it, which is stored3198 * in the patch->fragments->{patch,size}.3199 */3200if(apply_binary_fragment(state, img, patch))3201returnerror(_("binary patch does not apply to '%s'"),3202 name);32033204/* verify that the result matches */3205hash_sha1_file(img->buf, img->len, blob_type, oid.hash);3206if(strcmp(oid_to_hex(&oid), patch->new_sha1_prefix))3207returnerror(_("binary patch to '%s' creates incorrect result (expecting%s, got%s)"),3208 name, patch->new_sha1_prefix,oid_to_hex(&oid));3209}32103211return0;3212}32133214static intapply_fragments(struct apply_state *state,struct image *img,struct patch *patch)3215{3216struct fragment *frag = patch->fragments;3217const char*name = patch->old_name ? patch->old_name : patch->new_name;3218unsigned ws_rule = patch->ws_rule;3219unsigned inaccurate_eof = patch->inaccurate_eof;3220int nth =0;32213222if(patch->is_binary)3223returnapply_binary(state, img, patch);32243225while(frag) {3226 nth++;3227if(apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) {3228error(_("patch failed:%s:%ld"), name, frag->oldpos);3229if(!state->apply_with_reject)3230return-1;3231 frag->rejected =1;3232}3233 frag = frag->next;3234}3235return0;3236}32373238static intread_blob_object(struct strbuf *buf,const struct object_id *oid,unsigned mode)3239{3240if(S_ISGITLINK(mode)) {3241strbuf_grow(buf,100);3242strbuf_addf(buf,"Subproject commit%s\n",oid_to_hex(oid));3243}else{3244enum object_type type;3245unsigned long sz;3246char*result;32473248 result =read_sha1_file(oid->hash, &type, &sz);3249if(!result)3250return-1;3251/* XXX read_sha1_file NUL-terminates */3252strbuf_attach(buf, result, sz, sz +1);3253}3254return0;3255}32563257static intread_file_or_gitlink(const struct cache_entry *ce,struct strbuf *buf)3258{3259if(!ce)3260return0;3261returnread_blob_object(buf, &ce->oid, ce->ce_mode);3262}32633264static struct patch *in_fn_table(struct apply_state *state,const char*name)3265{3266struct string_list_item *item;32673268if(name == NULL)3269return NULL;32703271 item =string_list_lookup(&state->fn_table, name);3272if(item != NULL)3273return(struct patch *)item->util;32743275return NULL;3276}32773278/*3279 * item->util in the filename table records the status of the path.3280 * Usually it points at a patch (whose result records the contents3281 * of it after applying it), but it could be PATH_WAS_DELETED for a3282 * path that a previously applied patch has already removed, or3283 * PATH_TO_BE_DELETED for a path that a later patch would remove.3284 *3285 * The latter is needed to deal with a case where two paths A and B3286 * are swapped by first renaming A to B and then renaming B to A;3287 * moving A to B should not be prevented due to presence of B as we3288 * will remove it in a later patch.3289 */3290#define PATH_TO_BE_DELETED ((struct patch *) -2)3291#define PATH_WAS_DELETED ((struct patch *) -1)32923293static intto_be_deleted(struct patch *patch)3294{3295return patch == PATH_TO_BE_DELETED;3296}32973298static intwas_deleted(struct patch *patch)3299{3300return patch == PATH_WAS_DELETED;3301}33023303static voidadd_to_fn_table(struct apply_state *state,struct patch *patch)3304{3305struct string_list_item *item;33063307/*3308 * Always add new_name unless patch is a deletion3309 * This should cover the cases for normal diffs,3310 * file creations and copies3311 */3312if(patch->new_name != NULL) {3313 item =string_list_insert(&state->fn_table, patch->new_name);3314 item->util = patch;3315}33163317/*3318 * store a failure on rename/deletion cases because3319 * later chunks shouldn't patch old names3320 */3321if((patch->new_name == NULL) || (patch->is_rename)) {3322 item =string_list_insert(&state->fn_table, patch->old_name);3323 item->util = PATH_WAS_DELETED;3324}3325}33263327static voidprepare_fn_table(struct apply_state *state,struct patch *patch)3328{3329/*3330 * store information about incoming file deletion3331 */3332while(patch) {3333if((patch->new_name == NULL) || (patch->is_rename)) {3334struct string_list_item *item;3335 item =string_list_insert(&state->fn_table, patch->old_name);3336 item->util = PATH_TO_BE_DELETED;3337}3338 patch = patch->next;3339}3340}33413342static intcheckout_target(struct index_state *istate,3343struct cache_entry *ce,struct stat *st)3344{3345struct checkout costate = CHECKOUT_INIT;33463347 costate.refresh_cache =1;3348 costate.istate = istate;3349if(checkout_entry(ce, &costate, NULL) ||lstat(ce->name, st))3350returnerror(_("cannot checkout%s"), ce->name);3351return0;3352}33533354static struct patch *previous_patch(struct apply_state *state,3355struct patch *patch,3356int*gone)3357{3358struct patch *previous;33593360*gone =0;3361if(patch->is_copy || patch->is_rename)3362return NULL;/* "git" patches do not depend on the order */33633364 previous =in_fn_table(state, patch->old_name);3365if(!previous)3366return NULL;33673368if(to_be_deleted(previous))3369return NULL;/* the deletion hasn't happened yet */33703371if(was_deleted(previous))3372*gone =1;33733374return previous;3375}33763377static intverify_index_match(const struct cache_entry *ce,struct stat *st)3378{3379if(S_ISGITLINK(ce->ce_mode)) {3380if(!S_ISDIR(st->st_mode))3381return-1;3382return0;3383}3384returnce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3385}33863387#define SUBMODULE_PATCH_WITHOUT_INDEX 133883389static intload_patch_target(struct apply_state *state,3390struct strbuf *buf,3391const struct cache_entry *ce,3392struct stat *st,3393const char*name,3394unsigned expected_mode)3395{3396if(state->cached || state->check_index) {3397if(read_file_or_gitlink(ce, buf))3398returnerror(_("failed to read%s"), name);3399}else if(name) {3400if(S_ISGITLINK(expected_mode)) {3401if(ce)3402returnread_file_or_gitlink(ce, buf);3403else3404return SUBMODULE_PATCH_WITHOUT_INDEX;3405}else if(has_symlink_leading_path(name,strlen(name))) {3406returnerror(_("reading from '%s' beyond a symbolic link"), name);3407}else{3408if(read_old_data(st, name, buf))3409returnerror(_("failed to read%s"), name);3410}3411}3412return0;3413}34143415/*3416 * We are about to apply "patch"; populate the "image" with the3417 * current version we have, from the working tree or from the index,3418 * depending on the situation e.g. --cached/--index. If we are3419 * applying a non-git patch that incrementally updates the tree,3420 * we read from the result of a previous diff.3421 */3422static intload_preimage(struct apply_state *state,3423struct image *image,3424struct patch *patch,struct stat *st,3425const struct cache_entry *ce)3426{3427struct strbuf buf = STRBUF_INIT;3428size_t len;3429char*img;3430struct patch *previous;3431int status;34323433 previous =previous_patch(state, patch, &status);3434if(status)3435returnerror(_("path%shas been renamed/deleted"),3436 patch->old_name);3437if(previous) {3438/* We have a patched copy in memory; use that. */3439strbuf_add(&buf, previous->result, previous->resultsize);3440}else{3441 status =load_patch_target(state, &buf, ce, st,3442 patch->old_name, patch->old_mode);3443if(status <0)3444return status;3445else if(status == SUBMODULE_PATCH_WITHOUT_INDEX) {3446/*3447 * There is no way to apply subproject3448 * patch without looking at the index.3449 * NEEDSWORK: shouldn't this be flagged3450 * as an error???3451 */3452free_fragment_list(patch->fragments);3453 patch->fragments = NULL;3454}else if(status) {3455returnerror(_("failed to read%s"), patch->old_name);3456}3457}34583459 img =strbuf_detach(&buf, &len);3460prepare_image(image, img, len, !patch->is_binary);3461return0;3462}34633464static intthree_way_merge(struct image *image,3465char*path,3466const struct object_id *base,3467const struct object_id *ours,3468const struct object_id *theirs)3469{3470 mmfile_t base_file, our_file, their_file;3471 mmbuffer_t result = { NULL };3472int status;34733474read_mmblob(&base_file, base);3475read_mmblob(&our_file, ours);3476read_mmblob(&their_file, theirs);3477 status =ll_merge(&result, path,3478&base_file,"base",3479&our_file,"ours",3480&their_file,"theirs", NULL);3481free(base_file.ptr);3482free(our_file.ptr);3483free(their_file.ptr);3484if(status <0|| !result.ptr) {3485free(result.ptr);3486return-1;3487}3488clear_image(image);3489 image->buf = result.ptr;3490 image->len = result.size;34913492return status;3493}34943495/*3496 * When directly falling back to add/add three-way merge, we read from3497 * the current contents of the new_name. In no cases other than that3498 * this function will be called.3499 */3500static intload_current(struct apply_state *state,3501struct image *image,3502struct patch *patch)3503{3504struct strbuf buf = STRBUF_INIT;3505int status, pos;3506size_t len;3507char*img;3508struct stat st;3509struct cache_entry *ce;3510char*name = patch->new_name;3511unsigned mode = patch->new_mode;35123513if(!patch->is_new)3514die("BUG: patch to%sis not a creation", patch->old_name);35153516 pos =cache_name_pos(name,strlen(name));3517if(pos <0)3518returnerror(_("%s: does not exist in index"), name);3519 ce = active_cache[pos];3520if(lstat(name, &st)) {3521if(errno != ENOENT)3522returnerror_errno("%s", name);3523if(checkout_target(&the_index, ce, &st))3524return-1;3525}3526if(verify_index_match(ce, &st))3527returnerror(_("%s: does not match index"), name);35283529 status =load_patch_target(state, &buf, ce, &st, name, mode);3530if(status <0)3531return status;3532else if(status)3533return-1;3534 img =strbuf_detach(&buf, &len);3535prepare_image(image, img, len, !patch->is_binary);3536return0;3537}35383539static inttry_threeway(struct apply_state *state,3540struct image *image,3541struct patch *patch,3542struct stat *st,3543const struct cache_entry *ce)3544{3545struct object_id pre_oid, post_oid, our_oid;3546struct strbuf buf = STRBUF_INIT;3547size_t len;3548int status;3549char*img;3550struct image tmp_image;35513552/* No point falling back to 3-way merge in these cases */3553if(patch->is_delete ||3554S_ISGITLINK(patch->old_mode) ||S_ISGITLINK(patch->new_mode))3555return-1;35563557/* Preimage the patch was prepared for */3558if(patch->is_new)3559write_sha1_file("",0, blob_type, pre_oid.hash);3560else if(get_sha1(patch->old_sha1_prefix, pre_oid.hash) ||3561read_blob_object(&buf, &pre_oid, patch->old_mode))3562returnerror(_("repository lacks the necessary blob to fall back on 3-way merge."));35633564if(state->apply_verbosity > verbosity_silent)3565fprintf(stderr,_("Falling back to three-way merge...\n"));35663567 img =strbuf_detach(&buf, &len);3568prepare_image(&tmp_image, img, len,1);3569/* Apply the patch to get the post image */3570if(apply_fragments(state, &tmp_image, patch) <0) {3571clear_image(&tmp_image);3572return-1;3573}3574/* post_oid is theirs */3575write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_oid.hash);3576clear_image(&tmp_image);35773578/* our_oid is ours */3579if(patch->is_new) {3580if(load_current(state, &tmp_image, patch))3581returnerror(_("cannot read the current contents of '%s'"),3582 patch->new_name);3583}else{3584if(load_preimage(state, &tmp_image, patch, st, ce))3585returnerror(_("cannot read the current contents of '%s'"),3586 patch->old_name);3587}3588write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_oid.hash);3589clear_image(&tmp_image);35903591/* in-core three-way merge between post and our using pre as base */3592 status =three_way_merge(image, patch->new_name,3593&pre_oid, &our_oid, &post_oid);3594if(status <0) {3595if(state->apply_verbosity > verbosity_silent)3596fprintf(stderr,3597_("Failed to fall back on three-way merge...\n"));3598return status;3599}36003601if(status) {3602 patch->conflicted_threeway =1;3603if(patch->is_new)3604oidclr(&patch->threeway_stage[0]);3605else3606oidcpy(&patch->threeway_stage[0], &pre_oid);3607oidcpy(&patch->threeway_stage[1], &our_oid);3608oidcpy(&patch->threeway_stage[2], &post_oid);3609if(state->apply_verbosity > verbosity_silent)3610fprintf(stderr,3611_("Applied patch to '%s' with conflicts.\n"),3612 patch->new_name);3613}else{3614if(state->apply_verbosity > verbosity_silent)3615fprintf(stderr,3616_("Applied patch to '%s' cleanly.\n"),3617 patch->new_name);3618}3619return0;3620}36213622static intapply_data(struct apply_state *state,struct patch *patch,3623struct stat *st,const struct cache_entry *ce)3624{3625struct image image;36263627if(load_preimage(state, &image, patch, st, ce) <0)3628return-1;36293630if(patch->direct_to_threeway ||3631apply_fragments(state, &image, patch) <0) {3632/* Note: with --reject, apply_fragments() returns 0 */3633if(!state->threeway ||try_threeway(state, &image, patch, st, ce) <0)3634return-1;3635}3636 patch->result = image.buf;3637 patch->resultsize = image.len;3638add_to_fn_table(state, patch);3639free(image.line_allocated);36403641if(0< patch->is_delete && patch->resultsize)3642returnerror(_("removal patch leaves file contents"));36433644return0;3645}36463647/*3648 * If "patch" that we are looking at modifies or deletes what we have,3649 * we would want it not to lose any local modification we have, either3650 * in the working tree or in the index.3651 *3652 * This also decides if a non-git patch is a creation patch or a3653 * modification to an existing empty file. We do not check the state3654 * of the current tree for a creation patch in this function; the caller3655 * check_patch() separately makes sure (and errors out otherwise) that3656 * the path the patch creates does not exist in the current tree.3657 */3658static intcheck_preimage(struct apply_state *state,3659struct patch *patch,3660struct cache_entry **ce,3661struct stat *st)3662{3663const char*old_name = patch->old_name;3664struct patch *previous = NULL;3665int stat_ret =0, status;3666unsigned st_mode =0;36673668if(!old_name)3669return0;36703671assert(patch->is_new <=0);3672 previous =previous_patch(state, patch, &status);36733674if(status)3675returnerror(_("path%shas been renamed/deleted"), old_name);3676if(previous) {3677 st_mode = previous->new_mode;3678}else if(!state->cached) {3679 stat_ret =lstat(old_name, st);3680if(stat_ret && errno != ENOENT)3681returnerror_errno("%s", old_name);3682}36833684if(state->check_index && !previous) {3685int pos =cache_name_pos(old_name,strlen(old_name));3686if(pos <0) {3687if(patch->is_new <0)3688goto is_new;3689returnerror(_("%s: does not exist in index"), old_name);3690}3691*ce = active_cache[pos];3692if(stat_ret <0) {3693if(checkout_target(&the_index, *ce, st))3694return-1;3695}3696if(!state->cached &&verify_index_match(*ce, st))3697returnerror(_("%s: does not match index"), old_name);3698if(state->cached)3699 st_mode = (*ce)->ce_mode;3700}else if(stat_ret <0) {3701if(patch->is_new <0)3702goto is_new;3703returnerror_errno("%s", old_name);3704}37053706if(!state->cached && !previous)3707 st_mode =ce_mode_from_stat(*ce, st->st_mode);37083709if(patch->is_new <0)3710 patch->is_new =0;3711if(!patch->old_mode)3712 patch->old_mode = st_mode;3713if((st_mode ^ patch->old_mode) & S_IFMT)3714returnerror(_("%s: wrong type"), old_name);3715if(st_mode != patch->old_mode)3716warning(_("%shas type%o, expected%o"),3717 old_name, st_mode, patch->old_mode);3718if(!patch->new_mode && !patch->is_delete)3719 patch->new_mode = st_mode;3720return0;37213722 is_new:3723 patch->is_new =1;3724 patch->is_delete =0;3725free(patch->old_name);3726 patch->old_name = NULL;3727return0;3728}372937303731#define EXISTS_IN_INDEX 13732#define EXISTS_IN_WORKTREE 237333734static intcheck_to_create(struct apply_state *state,3735const char*new_name,3736int ok_if_exists)3737{3738struct stat nst;37393740if(state->check_index &&3741cache_name_pos(new_name,strlen(new_name)) >=0&&3742!ok_if_exists)3743return EXISTS_IN_INDEX;3744if(state->cached)3745return0;37463747if(!lstat(new_name, &nst)) {3748if(S_ISDIR(nst.st_mode) || ok_if_exists)3749return0;3750/*3751 * A leading component of new_name might be a symlink3752 * that is going to be removed with this patch, but3753 * still pointing at somewhere that has the path.3754 * In such a case, path "new_name" does not exist as3755 * far as git is concerned.3756 */3757if(has_symlink_leading_path(new_name,strlen(new_name)))3758return0;37593760return EXISTS_IN_WORKTREE;3761}else if((errno != ENOENT) && (errno != ENOTDIR)) {3762returnerror_errno("%s", new_name);3763}3764return0;3765}37663767static uintptr_tregister_symlink_changes(struct apply_state *state,3768const char*path,3769uintptr_t what)3770{3771struct string_list_item *ent;37723773 ent =string_list_lookup(&state->symlink_changes, path);3774if(!ent) {3775 ent =string_list_insert(&state->symlink_changes, path);3776 ent->util = (void*)0;3777}3778 ent->util = (void*)(what | ((uintptr_t)ent->util));3779return(uintptr_t)ent->util;3780}37813782static uintptr_tcheck_symlink_changes(struct apply_state *state,const char*path)3783{3784struct string_list_item *ent;37853786 ent =string_list_lookup(&state->symlink_changes, path);3787if(!ent)3788return0;3789return(uintptr_t)ent->util;3790}37913792static voidprepare_symlink_changes(struct apply_state *state,struct patch *patch)3793{3794for( ; patch; patch = patch->next) {3795if((patch->old_name &&S_ISLNK(patch->old_mode)) &&3796(patch->is_rename || patch->is_delete))3797/* the symlink at patch->old_name is removed */3798register_symlink_changes(state, patch->old_name, APPLY_SYMLINK_GOES_AWAY);37993800if(patch->new_name &&S_ISLNK(patch->new_mode))3801/* the symlink at patch->new_name is created or remains */3802register_symlink_changes(state, patch->new_name, APPLY_SYMLINK_IN_RESULT);3803}3804}38053806static intpath_is_beyond_symlink_1(struct apply_state *state,struct strbuf *name)3807{3808do{3809unsigned int change;38103811while(--name->len && name->buf[name->len] !='/')3812;/* scan backwards */3813if(!name->len)3814break;3815 name->buf[name->len] ='\0';3816 change =check_symlink_changes(state, name->buf);3817if(change & APPLY_SYMLINK_IN_RESULT)3818return1;3819if(change & APPLY_SYMLINK_GOES_AWAY)3820/*3821 * This cannot be "return 0", because we may3822 * see a new one created at a higher level.3823 */3824continue;38253826/* otherwise, check the preimage */3827if(state->check_index) {3828struct cache_entry *ce;38293830 ce =cache_file_exists(name->buf, name->len, ignore_case);3831if(ce &&S_ISLNK(ce->ce_mode))3832return1;3833}else{3834struct stat st;3835if(!lstat(name->buf, &st) &&S_ISLNK(st.st_mode))3836return1;3837}3838}while(1);3839return0;3840}38413842static intpath_is_beyond_symlink(struct apply_state *state,const char*name_)3843{3844int ret;3845struct strbuf name = STRBUF_INIT;38463847assert(*name_ !='\0');3848strbuf_addstr(&name, name_);3849 ret =path_is_beyond_symlink_1(state, &name);3850strbuf_release(&name);38513852return ret;3853}38543855static intcheck_unsafe_path(struct patch *patch)3856{3857const char*old_name = NULL;3858const char*new_name = NULL;3859if(patch->is_delete)3860 old_name = patch->old_name;3861else if(!patch->is_new && !patch->is_copy)3862 old_name = patch->old_name;3863if(!patch->is_delete)3864 new_name = patch->new_name;38653866if(old_name && !verify_path(old_name))3867returnerror(_("invalid path '%s'"), old_name);3868if(new_name && !verify_path(new_name))3869returnerror(_("invalid path '%s'"), new_name);3870return0;3871}38723873/*3874 * Check and apply the patch in-core; leave the result in patch->result3875 * for the caller to write it out to the final destination.3876 */3877static intcheck_patch(struct apply_state *state,struct patch *patch)3878{3879struct stat st;3880const char*old_name = patch->old_name;3881const char*new_name = patch->new_name;3882const char*name = old_name ? old_name : new_name;3883struct cache_entry *ce = NULL;3884struct patch *tpatch;3885int ok_if_exists;3886int status;38873888 patch->rejected =1;/* we will drop this after we succeed */38893890 status =check_preimage(state, patch, &ce, &st);3891if(status)3892return status;3893 old_name = patch->old_name;38943895/*3896 * A type-change diff is always split into a patch to delete3897 * old, immediately followed by a patch to create new (see3898 * diff.c::run_diff()); in such a case it is Ok that the entry3899 * to be deleted by the previous patch is still in the working3900 * tree and in the index.3901 *3902 * A patch to swap-rename between A and B would first rename A3903 * to B and then rename B to A. While applying the first one,3904 * the presence of B should not stop A from getting renamed to3905 * B; ask to_be_deleted() about the later rename. Removal of3906 * B and rename from A to B is handled the same way by asking3907 * was_deleted().3908 */3909if((tpatch =in_fn_table(state, new_name)) &&3910(was_deleted(tpatch) ||to_be_deleted(tpatch)))3911 ok_if_exists =1;3912else3913 ok_if_exists =0;39143915if(new_name &&3916((0< patch->is_new) || patch->is_rename || patch->is_copy)) {3917int err =check_to_create(state, new_name, ok_if_exists);39183919if(err && state->threeway) {3920 patch->direct_to_threeway =1;3921}else switch(err) {3922case0:3923break;/* happy */3924case EXISTS_IN_INDEX:3925returnerror(_("%s: already exists in index"), new_name);3926break;3927case EXISTS_IN_WORKTREE:3928returnerror(_("%s: already exists in working directory"),3929 new_name);3930default:3931return err;3932}39333934if(!patch->new_mode) {3935if(0< patch->is_new)3936 patch->new_mode = S_IFREG |0644;3937else3938 patch->new_mode = patch->old_mode;3939}3940}39413942if(new_name && old_name) {3943int same = !strcmp(old_name, new_name);3944if(!patch->new_mode)3945 patch->new_mode = patch->old_mode;3946if((patch->old_mode ^ patch->new_mode) & S_IFMT) {3947if(same)3948returnerror(_("new mode (%o) of%sdoes not "3949"match old mode (%o)"),3950 patch->new_mode, new_name,3951 patch->old_mode);3952else3953returnerror(_("new mode (%o) of%sdoes not "3954"match old mode (%o) of%s"),3955 patch->new_mode, new_name,3956 patch->old_mode, old_name);3957}3958}39593960if(!state->unsafe_paths &&check_unsafe_path(patch))3961return-128;39623963/*3964 * An attempt to read from or delete a path that is beyond a3965 * symbolic link will be prevented by load_patch_target() that3966 * is called at the beginning of apply_data() so we do not3967 * have to worry about a patch marked with "is_delete" bit3968 * here. We however need to make sure that the patch result3969 * is not deposited to a path that is beyond a symbolic link3970 * here.3971 */3972if(!patch->is_delete &&path_is_beyond_symlink(state, patch->new_name))3973returnerror(_("affected file '%s' is beyond a symbolic link"),3974 patch->new_name);39753976if(apply_data(state, patch, &st, ce) <0)3977returnerror(_("%s: patch does not apply"), name);3978 patch->rejected =0;3979return0;3980}39813982static intcheck_patch_list(struct apply_state *state,struct patch *patch)3983{3984int err =0;39853986prepare_symlink_changes(state, patch);3987prepare_fn_table(state, patch);3988while(patch) {3989int res;3990if(state->apply_verbosity > verbosity_normal)3991say_patch_name(stderr,3992_("Checking patch%s..."), patch);3993 res =check_patch(state, patch);3994if(res == -128)3995return-128;3996 err |= res;3997 patch = patch->next;3998}3999return err;4000}40014002static intread_apply_cache(struct apply_state *state)4003{4004if(state->index_file)4005returnread_cache_from(state->index_file);4006else4007returnread_cache();4008}40094010/* This function tries to read the object name from the current index */4011static intget_current_oid(struct apply_state *state,const char*path,4012struct object_id *oid)4013{4014int pos;40154016if(read_apply_cache(state) <0)4017return-1;4018 pos =cache_name_pos(path,strlen(path));4019if(pos <0)4020return-1;4021oidcpy(oid, &active_cache[pos]->oid);4022return0;4023}40244025static intpreimage_oid_in_gitlink_patch(struct patch *p,struct object_id *oid)4026{4027/*4028 * A usable gitlink patch has only one fragment (hunk) that looks like:4029 * @@ -1 +1 @@4030 * -Subproject commit <old sha1>4031 * +Subproject commit <new sha1>4032 * or4033 * @@ -1 +0,0 @@4034 * -Subproject commit <old sha1>4035 * for a removal patch.4036 */4037struct fragment *hunk = p->fragments;4038static const char heading[] ="-Subproject commit ";4039char*preimage;40404041if(/* does the patch have only one hunk? */4042 hunk && !hunk->next &&4043/* is its preimage one line? */4044 hunk->oldpos ==1&& hunk->oldlines ==1&&4045/* does preimage begin with the heading? */4046(preimage =memchr(hunk->patch,'\n', hunk->size)) != NULL &&4047starts_with(++preimage, heading) &&4048/* does it record full SHA-1? */4049!get_oid_hex(preimage +sizeof(heading) -1, oid) &&4050 preimage[sizeof(heading) + GIT_SHA1_HEXSZ -1] =='\n'&&4051/* does the abbreviated name on the index line agree with it? */4052starts_with(preimage +sizeof(heading) -1, p->old_sha1_prefix))4053return0;/* it all looks fine */40544055/* we may have full object name on the index line */4056returnget_oid_hex(p->old_sha1_prefix, oid);4057}40584059/* Build an index that contains the just the files needed for a 3way merge */4060static intbuild_fake_ancestor(struct apply_state *state,struct patch *list)4061{4062struct patch *patch;4063struct index_state result = { NULL };4064static struct lock_file lock;4065int res;40664067/* Once we start supporting the reverse patch, it may be4068 * worth showing the new sha1 prefix, but until then...4069 */4070for(patch = list; patch; patch = patch->next) {4071struct object_id oid;4072struct cache_entry *ce;4073const char*name;40744075 name = patch->old_name ? patch->old_name : patch->new_name;4076if(0< patch->is_new)4077continue;40784079if(S_ISGITLINK(patch->old_mode)) {4080if(!preimage_oid_in_gitlink_patch(patch, &oid))4081;/* ok, the textual part looks sane */4082else4083returnerror(_("sha1 information is lacking or "4084"useless for submodule%s"), name);4085}else if(!get_sha1_blob(patch->old_sha1_prefix, oid.hash)) {4086;/* ok */4087}else if(!patch->lines_added && !patch->lines_deleted) {4088/* mode-only change: update the current */4089if(get_current_oid(state, patch->old_name, &oid))4090returnerror(_("mode change for%s, which is not "4091"in current HEAD"), name);4092}else4093returnerror(_("sha1 information is lacking or useless "4094"(%s)."), name);40954096 ce =make_cache_entry(patch->old_mode, oid.hash, name,0,0);4097if(!ce)4098returnerror(_("make_cache_entry failed for path '%s'"),4099 name);4100if(add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) {4101free(ce);4102returnerror(_("could not add%sto temporary index"),4103 name);4104}4105}41064107hold_lock_file_for_update(&lock, state->fake_ancestor, LOCK_DIE_ON_ERROR);4108 res =write_locked_index(&result, &lock, COMMIT_LOCK);4109discard_index(&result);41104111if(res)4112returnerror(_("could not write temporary index to%s"),4113 state->fake_ancestor);41144115return0;4116}41174118static voidstat_patch_list(struct apply_state *state,struct patch *patch)4119{4120int files, adds, dels;41214122for(files = adds = dels =0; patch ; patch = patch->next) {4123 files++;4124 adds += patch->lines_added;4125 dels += patch->lines_deleted;4126show_stats(state, patch);4127}41284129print_stat_summary(stdout, files, adds, dels);4130}41314132static voidnumstat_patch_list(struct apply_state *state,4133struct patch *patch)4134{4135for( ; patch; patch = patch->next) {4136const char*name;4137 name = patch->new_name ? patch->new_name : patch->old_name;4138if(patch->is_binary)4139printf("-\t-\t");4140else4141printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);4142write_name_quoted(name, stdout, state->line_termination);4143}4144}41454146static voidshow_file_mode_name(const char*newdelete,unsigned int mode,const char*name)4147{4148if(mode)4149printf("%smode%06o%s\n", newdelete, mode, name);4150else4151printf("%s %s\n", newdelete, name);4152}41534154static voidshow_mode_change(struct patch *p,int show_name)4155{4156if(p->old_mode && p->new_mode && p->old_mode != p->new_mode) {4157if(show_name)4158printf(" mode change%06o =>%06o%s\n",4159 p->old_mode, p->new_mode, p->new_name);4160else4161printf(" mode change%06o =>%06o\n",4162 p->old_mode, p->new_mode);4163}4164}41654166static voidshow_rename_copy(struct patch *p)4167{4168const char*renamecopy = p->is_rename ?"rename":"copy";4169const char*old, *new;41704171/* Find common prefix */4172 old = p->old_name;4173new= p->new_name;4174while(1) {4175const char*slash_old, *slash_new;4176 slash_old =strchr(old,'/');4177 slash_new =strchr(new,'/');4178if(!slash_old ||4179!slash_new ||4180 slash_old - old != slash_new -new||4181memcmp(old,new, slash_new -new))4182break;4183 old = slash_old +1;4184new= slash_new +1;4185}4186/* p->old_name thru old is the common prefix, and old and new4187 * through the end of names are renames4188 */4189if(old != p->old_name)4190printf("%s%.*s{%s=>%s} (%d%%)\n", renamecopy,4191(int)(old - p->old_name), p->old_name,4192 old,new, p->score);4193else4194printf("%s %s=>%s(%d%%)\n", renamecopy,4195 p->old_name, p->new_name, p->score);4196show_mode_change(p,0);4197}41984199static voidsummary_patch_list(struct patch *patch)4200{4201struct patch *p;42024203for(p = patch; p; p = p->next) {4204if(p->is_new)4205show_file_mode_name("create", p->new_mode, p->new_name);4206else if(p->is_delete)4207show_file_mode_name("delete", p->old_mode, p->old_name);4208else{4209if(p->is_rename || p->is_copy)4210show_rename_copy(p);4211else{4212if(p->score) {4213printf(" rewrite%s(%d%%)\n",4214 p->new_name, p->score);4215show_mode_change(p,0);4216}4217else4218show_mode_change(p,1);4219}4220}4221}4222}42234224static voidpatch_stats(struct apply_state *state,struct patch *patch)4225{4226int lines = patch->lines_added + patch->lines_deleted;42274228if(lines > state->max_change)4229 state->max_change = lines;4230if(patch->old_name) {4231int len =quote_c_style(patch->old_name, NULL, NULL,0);4232if(!len)4233 len =strlen(patch->old_name);4234if(len > state->max_len)4235 state->max_len = len;4236}4237if(patch->new_name) {4238int len =quote_c_style(patch->new_name, NULL, NULL,0);4239if(!len)4240 len =strlen(patch->new_name);4241if(len > state->max_len)4242 state->max_len = len;4243}4244}42454246static intremove_file(struct apply_state *state,struct patch *patch,int rmdir_empty)4247{4248if(state->update_index) {4249if(remove_file_from_cache(patch->old_name) <0)4250returnerror(_("unable to remove%sfrom index"), patch->old_name);4251}4252if(!state->cached) {4253if(!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {4254remove_path(patch->old_name);4255}4256}4257return0;4258}42594260static intadd_index_file(struct apply_state *state,4261const char*path,4262unsigned mode,4263void*buf,4264unsigned long size)4265{4266struct stat st;4267struct cache_entry *ce;4268int namelen =strlen(path);4269unsigned ce_size =cache_entry_size(namelen);42704271if(!state->update_index)4272return0;42734274 ce =xcalloc(1, ce_size);4275memcpy(ce->name, path, namelen);4276 ce->ce_mode =create_ce_mode(mode);4277 ce->ce_flags =create_ce_flags(0);4278 ce->ce_namelen = namelen;4279if(S_ISGITLINK(mode)) {4280const char*s;42814282if(!skip_prefix(buf,"Subproject commit ", &s) ||4283get_oid_hex(s, &ce->oid)) {4284free(ce);4285returnerror(_("corrupt patch for submodule%s"), path);4286}4287}else{4288if(!state->cached) {4289if(lstat(path, &st) <0) {4290free(ce);4291returnerror_errno(_("unable to stat newly "4292"created file '%s'"),4293 path);4294}4295fill_stat_cache_info(ce, &st);4296}4297if(write_sha1_file(buf, size, blob_type, ce->oid.hash) <0) {4298free(ce);4299returnerror(_("unable to create backing store "4300"for newly created file%s"), path);4301}4302}4303if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0) {4304free(ce);4305returnerror(_("unable to add cache entry for%s"), path);4306}43074308return0;4309}43104311/*4312 * Returns:4313 * -1 if an unrecoverable error happened4314 * 0 if everything went well4315 * 1 if a recoverable error happened4316 */4317static inttry_create_file(const char*path,unsigned int mode,const char*buf,unsigned long size)4318{4319int fd, res;4320struct strbuf nbuf = STRBUF_INIT;43214322if(S_ISGITLINK(mode)) {4323struct stat st;4324if(!lstat(path, &st) &&S_ISDIR(st.st_mode))4325return0;4326return!!mkdir(path,0777);4327}43284329if(has_symlinks &&S_ISLNK(mode))4330/* Although buf:size is counted string, it also is NUL4331 * terminated.4332 */4333return!!symlink(buf, path);43344335 fd =open(path, O_CREAT | O_EXCL | O_WRONLY, (mode &0100) ?0777:0666);4336if(fd <0)4337return1;43384339if(convert_to_working_tree(path, buf, size, &nbuf)) {4340 size = nbuf.len;4341 buf = nbuf.buf;4342}43434344 res =write_in_full(fd, buf, size) <0;4345if(res)4346error_errno(_("failed to write to '%s'"), path);4347strbuf_release(&nbuf);43484349if(close(fd) <0&& !res)4350returnerror_errno(_("closing file '%s'"), path);43514352return res ? -1:0;4353}43544355/*4356 * We optimistically assume that the directories exist,4357 * which is true 99% of the time anyway. If they don't,4358 * we create them and try again.4359 *4360 * Returns:4361 * -1 on error4362 * 0 otherwise4363 */4364static intcreate_one_file(struct apply_state *state,4365char*path,4366unsigned mode,4367const char*buf,4368unsigned long size)4369{4370int res;43714372if(state->cached)4373return0;43744375 res =try_create_file(path, mode, buf, size);4376if(res <0)4377return-1;4378if(!res)4379return0;43804381if(errno == ENOENT) {4382if(safe_create_leading_directories(path))4383return0;4384 res =try_create_file(path, mode, buf, size);4385if(res <0)4386return-1;4387if(!res)4388return0;4389}43904391if(errno == EEXIST || errno == EACCES) {4392/* We may be trying to create a file where a directory4393 * used to be.4394 */4395struct stat st;4396if(!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))4397 errno = EEXIST;4398}43994400if(errno == EEXIST) {4401unsigned int nr =getpid();44024403for(;;) {4404char newpath[PATH_MAX];4405mksnpath(newpath,sizeof(newpath),"%s~%u", path, nr);4406 res =try_create_file(newpath, mode, buf, size);4407if(res <0)4408return-1;4409if(!res) {4410if(!rename(newpath, path))4411return0;4412unlink_or_warn(newpath);4413break;4414}4415if(errno != EEXIST)4416break;4417++nr;4418}4419}4420returnerror_errno(_("unable to write file '%s' mode%o"),4421 path, mode);4422}44234424static intadd_conflicted_stages_file(struct apply_state *state,4425struct patch *patch)4426{4427int stage, namelen;4428unsigned ce_size, mode;4429struct cache_entry *ce;44304431if(!state->update_index)4432return0;4433 namelen =strlen(patch->new_name);4434 ce_size =cache_entry_size(namelen);4435 mode = patch->new_mode ? patch->new_mode : (S_IFREG |0644);44364437remove_file_from_cache(patch->new_name);4438for(stage =1; stage <4; stage++) {4439if(is_null_oid(&patch->threeway_stage[stage -1]))4440continue;4441 ce =xcalloc(1, ce_size);4442memcpy(ce->name, patch->new_name, namelen);4443 ce->ce_mode =create_ce_mode(mode);4444 ce->ce_flags =create_ce_flags(stage);4445 ce->ce_namelen = namelen;4446oidcpy(&ce->oid, &patch->threeway_stage[stage -1]);4447if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0) {4448free(ce);4449returnerror(_("unable to add cache entry for%s"),4450 patch->new_name);4451}4452}44534454return0;4455}44564457static intcreate_file(struct apply_state *state,struct patch *patch)4458{4459char*path = patch->new_name;4460unsigned mode = patch->new_mode;4461unsigned long size = patch->resultsize;4462char*buf = patch->result;44634464if(!mode)4465 mode = S_IFREG |0644;4466if(create_one_file(state, path, mode, buf, size))4467return-1;44684469if(patch->conflicted_threeway)4470returnadd_conflicted_stages_file(state, patch);4471else4472returnadd_index_file(state, path, mode, buf, size);4473}44744475/* phase zero is to remove, phase one is to create */4476static intwrite_out_one_result(struct apply_state *state,4477struct patch *patch,4478int phase)4479{4480if(patch->is_delete >0) {4481if(phase ==0)4482returnremove_file(state, patch,1);4483return0;4484}4485if(patch->is_new >0|| patch->is_copy) {4486if(phase ==1)4487returncreate_file(state, patch);4488return0;4489}4490/*4491 * Rename or modification boils down to the same4492 * thing: remove the old, write the new4493 */4494if(phase ==0)4495returnremove_file(state, patch, patch->is_rename);4496if(phase ==1)4497returncreate_file(state, patch);4498return0;4499}45004501static intwrite_out_one_reject(struct apply_state *state,struct patch *patch)4502{4503FILE*rej;4504char namebuf[PATH_MAX];4505struct fragment *frag;4506int cnt =0;4507struct strbuf sb = STRBUF_INIT;45084509for(cnt =0, frag = patch->fragments; frag; frag = frag->next) {4510if(!frag->rejected)4511continue;4512 cnt++;4513}45144515if(!cnt) {4516if(state->apply_verbosity > verbosity_normal)4517say_patch_name(stderr,4518_("Applied patch%scleanly."), patch);4519return0;4520}45214522/* This should not happen, because a removal patch that leaves4523 * contents are marked "rejected" at the patch level.4524 */4525if(!patch->new_name)4526die(_("internal error"));45274528/* Say this even without --verbose */4529strbuf_addf(&sb,Q_("Applying patch %%swith%dreject...",4530"Applying patch %%swith%drejects...",4531 cnt),4532 cnt);4533if(state->apply_verbosity > verbosity_silent)4534say_patch_name(stderr, sb.buf, patch);4535strbuf_release(&sb);45364537 cnt =strlen(patch->new_name);4538if(ARRAY_SIZE(namebuf) <= cnt +5) {4539 cnt =ARRAY_SIZE(namebuf) -5;4540warning(_("truncating .rej filename to %.*s.rej"),4541 cnt -1, patch->new_name);4542}4543memcpy(namebuf, patch->new_name, cnt);4544memcpy(namebuf + cnt,".rej",5);45454546 rej =fopen(namebuf,"w");4547if(!rej)4548returnerror_errno(_("cannot open%s"), namebuf);45494550/* Normal git tools never deal with .rej, so do not pretend4551 * this is a git patch by saying --git or giving extended4552 * headers. While at it, maybe please "kompare" that wants4553 * the trailing TAB and some garbage at the end of line ;-).4554 */4555fprintf(rej,"diff a/%sb/%s\t(rejected hunks)\n",4556 patch->new_name, patch->new_name);4557for(cnt =1, frag = patch->fragments;4558 frag;4559 cnt++, frag = frag->next) {4560if(!frag->rejected) {4561if(state->apply_verbosity > verbosity_silent)4562fprintf_ln(stderr,_("Hunk #%dapplied cleanly."), cnt);4563continue;4564}4565if(state->apply_verbosity > verbosity_silent)4566fprintf_ln(stderr,_("Rejected hunk #%d."), cnt);4567fprintf(rej,"%.*s", frag->size, frag->patch);4568if(frag->patch[frag->size-1] !='\n')4569fputc('\n', rej);4570}4571fclose(rej);4572return-1;4573}45744575/*4576 * Returns:4577 * -1 if an error happened4578 * 0 if the patch applied cleanly4579 * 1 if the patch did not apply cleanly4580 */4581static intwrite_out_results(struct apply_state *state,struct patch *list)4582{4583int phase;4584int errs =0;4585struct patch *l;4586struct string_list cpath = STRING_LIST_INIT_DUP;45874588for(phase =0; phase <2; phase++) {4589 l = list;4590while(l) {4591if(l->rejected)4592 errs =1;4593else{4594if(write_out_one_result(state, l, phase)) {4595string_list_clear(&cpath,0);4596return-1;4597}4598if(phase ==1) {4599if(write_out_one_reject(state, l))4600 errs =1;4601if(l->conflicted_threeway) {4602string_list_append(&cpath, l->new_name);4603 errs =1;4604}4605}4606}4607 l = l->next;4608}4609}46104611if(cpath.nr) {4612struct string_list_item *item;46134614string_list_sort(&cpath);4615if(state->apply_verbosity > verbosity_silent) {4616for_each_string_list_item(item, &cpath)4617fprintf(stderr,"U%s\n", item->string);4618}4619string_list_clear(&cpath,0);46204621rerere(0);4622}46234624return errs;4625}46264627/*4628 * Try to apply a patch.4629 *4630 * Returns:4631 * -128 if a bad error happened (like patch unreadable)4632 * -1 if patch did not apply and user cannot deal with it4633 * 0 if the patch applied4634 * 1 if the patch did not apply but user might fix it4635 */4636static intapply_patch(struct apply_state *state,4637int fd,4638const char*filename,4639int options)4640{4641size_t offset;4642struct strbuf buf = STRBUF_INIT;/* owns the patch text */4643struct patch *list = NULL, **listp = &list;4644int skipped_patch =0;4645int res =0;46464647 state->patch_input_file = filename;4648if(read_patch_file(&buf, fd) <0)4649return-128;4650 offset =0;4651while(offset < buf.len) {4652struct patch *patch;4653int nr;46544655 patch =xcalloc(1,sizeof(*patch));4656 patch->inaccurate_eof = !!(options & APPLY_OPT_INACCURATE_EOF);4657 patch->recount = !!(options & APPLY_OPT_RECOUNT);4658 nr =parse_chunk(state, buf.buf + offset, buf.len - offset, patch);4659if(nr <0) {4660free_patch(patch);4661if(nr == -128) {4662 res = -128;4663goto end;4664}4665break;4666}4667if(state->apply_in_reverse)4668reverse_patches(patch);4669if(use_patch(state, patch)) {4670patch_stats(state, patch);4671*listp = patch;4672 listp = &patch->next;4673}4674else{4675if(state->apply_verbosity > verbosity_normal)4676say_patch_name(stderr,_("Skipped patch '%s'."), patch);4677free_patch(patch);4678 skipped_patch++;4679}4680 offset += nr;4681}46824683if(!list && !skipped_patch) {4684error(_("unrecognized input"));4685 res = -128;4686goto end;4687}46884689if(state->whitespace_error && (state->ws_error_action == die_on_ws_error))4690 state->apply =0;46914692 state->update_index = state->check_index && state->apply;4693if(state->update_index && state->newfd <0) {4694if(state->index_file)4695 state->newfd =hold_lock_file_for_update(state->lock_file,4696 state->index_file,4697 LOCK_DIE_ON_ERROR);4698else4699 state->newfd =hold_locked_index(state->lock_file,1);4700}47014702if(state->check_index &&read_apply_cache(state) <0) {4703error(_("unable to read index file"));4704 res = -128;4705goto end;4706}47074708if(state->check || state->apply) {4709int r =check_patch_list(state, list);4710if(r == -128) {4711 res = -128;4712goto end;4713}4714if(r <0&& !state->apply_with_reject) {4715 res = -1;4716goto end;4717}4718}47194720if(state->apply) {4721int write_res =write_out_results(state, list);4722if(write_res <0) {4723 res = -128;4724goto end;4725}4726if(write_res >0) {4727/* with --3way, we still need to write the index out */4728 res = state->apply_with_reject ? -1:1;4729goto end;4730}4731}47324733if(state->fake_ancestor &&4734build_fake_ancestor(state, list)) {4735 res = -128;4736goto end;4737}47384739if(state->diffstat && state->apply_verbosity > verbosity_silent)4740stat_patch_list(state, list);47414742if(state->numstat && state->apply_verbosity > verbosity_silent)4743numstat_patch_list(state, list);47444745if(state->summary && state->apply_verbosity > verbosity_silent)4746summary_patch_list(list);47474748end:4749free_patch_list(list);4750strbuf_release(&buf);4751string_list_clear(&state->fn_table,0);4752return res;4753}47544755static intapply_option_parse_exclude(const struct option *opt,4756const char*arg,int unset)4757{4758struct apply_state *state = opt->value;4759add_name_limit(state, arg,1);4760return0;4761}47624763static intapply_option_parse_include(const struct option *opt,4764const char*arg,int unset)4765{4766struct apply_state *state = opt->value;4767add_name_limit(state, arg,0);4768 state->has_include =1;4769return0;4770}47714772static intapply_option_parse_p(const struct option *opt,4773const char*arg,4774int unset)4775{4776struct apply_state *state = opt->value;4777 state->p_value =atoi(arg);4778 state->p_value_known =1;4779return0;4780}47814782static intapply_option_parse_space_change(const struct option *opt,4783const char*arg,int unset)4784{4785struct apply_state *state = opt->value;4786if(unset)4787 state->ws_ignore_action = ignore_ws_none;4788else4789 state->ws_ignore_action = ignore_ws_change;4790return0;4791}47924793static intapply_option_parse_whitespace(const struct option *opt,4794const char*arg,int unset)4795{4796struct apply_state *state = opt->value;4797 state->whitespace_option = arg;4798if(parse_whitespace_option(state, arg))4799exit(1);4800return0;4801}48024803static intapply_option_parse_directory(const struct option *opt,4804const char*arg,int unset)4805{4806struct apply_state *state = opt->value;4807strbuf_reset(&state->root);4808strbuf_addstr(&state->root, arg);4809strbuf_complete(&state->root,'/');4810return0;4811}48124813intapply_all_patches(struct apply_state *state,4814int argc,4815const char**argv,4816int options)4817{4818int i;4819int res;4820int errs =0;4821int read_stdin =1;48224823for(i =0; i < argc; i++) {4824const char*arg = argv[i];4825int fd;48264827if(!strcmp(arg,"-")) {4828 res =apply_patch(state,0,"<stdin>", options);4829if(res <0)4830goto end;4831 errs |= res;4832 read_stdin =0;4833continue;4834}else if(0< state->prefix_length)4835 arg =prefix_filename(state->prefix,4836 state->prefix_length,4837 arg);48384839 fd =open(arg, O_RDONLY);4840if(fd <0) {4841error(_("can't open patch '%s':%s"), arg,strerror(errno));4842 res = -128;4843goto end;4844}4845 read_stdin =0;4846set_default_whitespace_mode(state);4847 res =apply_patch(state, fd, arg, options);4848close(fd);4849if(res <0)4850goto end;4851 errs |= res;4852}4853set_default_whitespace_mode(state);4854if(read_stdin) {4855 res =apply_patch(state,0,"<stdin>", options);4856if(res <0)4857goto end;4858 errs |= res;4859}48604861if(state->whitespace_error) {4862if(state->squelch_whitespace_errors &&4863 state->squelch_whitespace_errors < state->whitespace_error) {4864int squelched =4865 state->whitespace_error - state->squelch_whitespace_errors;4866warning(Q_("squelched%dwhitespace error",4867"squelched%dwhitespace errors",4868 squelched),4869 squelched);4870}4871if(state->ws_error_action == die_on_ws_error) {4872error(Q_("%dline adds whitespace errors.",4873"%dlines add whitespace errors.",4874 state->whitespace_error),4875 state->whitespace_error);4876 res = -128;4877goto end;4878}4879if(state->applied_after_fixing_ws && state->apply)4880warning(Q_("%dline applied after"4881" fixing whitespace errors.",4882"%dlines applied after"4883" fixing whitespace errors.",4884 state->applied_after_fixing_ws),4885 state->applied_after_fixing_ws);4886else if(state->whitespace_error)4887warning(Q_("%dline adds whitespace errors.",4888"%dlines add whitespace errors.",4889 state->whitespace_error),4890 state->whitespace_error);4891}48924893if(state->update_index) {4894 res =write_locked_index(&the_index, state->lock_file, COMMIT_LOCK);4895if(res) {4896error(_("Unable to write new index file"));4897 res = -128;4898goto end;4899}4900 state->newfd = -1;4901}49024903 res = !!errs;49044905end:4906if(state->newfd >=0) {4907rollback_lock_file(state->lock_file);4908 state->newfd = -1;4909}49104911if(state->apply_verbosity <= verbosity_silent) {4912set_error_routine(state->saved_error_routine);4913set_warn_routine(state->saved_warn_routine);4914}49154916if(res > -1)4917return res;4918return(res == -1?1:128);4919}49204921intapply_parse_options(int argc,const char**argv,4922struct apply_state *state,4923int*force_apply,int*options,4924const char*const*apply_usage)4925{4926struct option builtin_apply_options[] = {4927{ OPTION_CALLBACK,0,"exclude", state,N_("path"),4928N_("don't apply changes matching the given path"),49290, apply_option_parse_exclude },4930{ OPTION_CALLBACK,0,"include", state,N_("path"),4931N_("apply changes matching the given path"),49320, apply_option_parse_include },4933{ OPTION_CALLBACK,'p', NULL, state,N_("num"),4934N_("remove <num> leading slashes from traditional diff paths"),49350, apply_option_parse_p },4936OPT_BOOL(0,"no-add", &state->no_add,4937N_("ignore additions made by the patch")),4938OPT_BOOL(0,"stat", &state->diffstat,4939N_("instead of applying the patch, output diffstat for the input")),4940OPT_NOOP_NOARG(0,"allow-binary-replacement"),4941OPT_NOOP_NOARG(0,"binary"),4942OPT_BOOL(0,"numstat", &state->numstat,4943N_("show number of added and deleted lines in decimal notation")),4944OPT_BOOL(0,"summary", &state->summary,4945N_("instead of applying the patch, output a summary for the input")),4946OPT_BOOL(0,"check", &state->check,4947N_("instead of applying the patch, see if the patch is applicable")),4948OPT_BOOL(0,"index", &state->check_index,4949N_("make sure the patch is applicable to the current index")),4950OPT_BOOL(0,"cached", &state->cached,4951N_("apply a patch without touching the working tree")),4952OPT_BOOL(0,"unsafe-paths", &state->unsafe_paths,4953N_("accept a patch that touches outside the working area")),4954OPT_BOOL(0,"apply", force_apply,4955N_("also apply the patch (use with --stat/--summary/--check)")),4956OPT_BOOL('3',"3way", &state->threeway,4957N_("attempt three-way merge if a patch does not apply")),4958OPT_FILENAME(0,"build-fake-ancestor", &state->fake_ancestor,4959N_("build a temporary index based on embedded index information")),4960/* Think twice before adding "--nul" synonym to this */4961OPT_SET_INT('z', NULL, &state->line_termination,4962N_("paths are separated with NUL character"),'\0'),4963OPT_INTEGER('C', NULL, &state->p_context,4964N_("ensure at least <n> lines of context match")),4965{ OPTION_CALLBACK,0,"whitespace", state,N_("action"),4966N_("detect new or modified lines that have whitespace errors"),49670, apply_option_parse_whitespace },4968{ OPTION_CALLBACK,0,"ignore-space-change", state, NULL,4969N_("ignore changes in whitespace when finding context"),4970 PARSE_OPT_NOARG, apply_option_parse_space_change },4971{ OPTION_CALLBACK,0,"ignore-whitespace", state, NULL,4972N_("ignore changes in whitespace when finding context"),4973 PARSE_OPT_NOARG, apply_option_parse_space_change },4974OPT_BOOL('R',"reverse", &state->apply_in_reverse,4975N_("apply the patch in reverse")),4976OPT_BOOL(0,"unidiff-zero", &state->unidiff_zero,4977N_("don't expect at least one line of context")),4978OPT_BOOL(0,"reject", &state->apply_with_reject,4979N_("leave the rejected hunks in corresponding *.rej files")),4980OPT_BOOL(0,"allow-overlap", &state->allow_overlap,4981N_("allow overlapping hunks")),4982OPT__VERBOSE(&state->apply_verbosity,N_("be verbose")),4983OPT_BIT(0,"inaccurate-eof", options,4984N_("tolerate incorrectly detected missing new-line at the end of file"),4985 APPLY_OPT_INACCURATE_EOF),4986OPT_BIT(0,"recount", options,4987N_("do not trust the line counts in the hunk headers"),4988 APPLY_OPT_RECOUNT),4989{ OPTION_CALLBACK,0,"directory", state,N_("root"),4990N_("prepend <root> to all filenames"),49910, apply_option_parse_directory },4992OPT_END()4993};49944995returnparse_options(argc, argv, state->prefix, builtin_apply_options, apply_usage,0);4996}