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"config.h" 12#include"object-store.h" 13#include"blob.h" 14#include"delta.h" 15#include"diff.h" 16#include"dir.h" 17#include"xdiff-interface.h" 18#include"ll-merge.h" 19#include"lockfile.h" 20#include"parse-options.h" 21#include"quote.h" 22#include"rerere.h" 23#include"apply.h" 24 25static voidgit_apply_config(void) 26{ 27git_config_get_string_const("apply.whitespace", &apply_default_whitespace); 28git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace); 29git_config(git_default_config, NULL); 30} 31 32static intparse_whitespace_option(struct apply_state *state,const char*option) 33{ 34if(!option) { 35 state->ws_error_action = warn_on_ws_error; 36return0; 37} 38if(!strcmp(option,"warn")) { 39 state->ws_error_action = warn_on_ws_error; 40return0; 41} 42if(!strcmp(option,"nowarn")) { 43 state->ws_error_action = nowarn_ws_error; 44return0; 45} 46if(!strcmp(option,"error")) { 47 state->ws_error_action = die_on_ws_error; 48return0; 49} 50if(!strcmp(option,"error-all")) { 51 state->ws_error_action = die_on_ws_error; 52 state->squelch_whitespace_errors =0; 53return0; 54} 55if(!strcmp(option,"strip") || !strcmp(option,"fix")) { 56 state->ws_error_action = correct_ws_error; 57return0; 58} 59returnerror(_("unrecognized whitespace option '%s'"), option); 60} 61 62static intparse_ignorewhitespace_option(struct apply_state *state, 63const char*option) 64{ 65if(!option || !strcmp(option,"no") || 66!strcmp(option,"false") || !strcmp(option,"never") || 67!strcmp(option,"none")) { 68 state->ws_ignore_action = ignore_ws_none; 69return0; 70} 71if(!strcmp(option,"change")) { 72 state->ws_ignore_action = ignore_ws_change; 73return0; 74} 75returnerror(_("unrecognized whitespace ignore option '%s'"), option); 76} 77 78intinit_apply_state(struct apply_state *state, 79const char*prefix) 80{ 81memset(state,0,sizeof(*state)); 82 state->prefix = prefix; 83 state->apply =1; 84 state->line_termination ='\n'; 85 state->p_value =1; 86 state->p_context = UINT_MAX; 87 state->squelch_whitespace_errors =5; 88 state->ws_error_action = warn_on_ws_error; 89 state->ws_ignore_action = ignore_ws_none; 90 state->linenr =1; 91string_list_init(&state->fn_table,0); 92string_list_init(&state->limit_by_name,0); 93string_list_init(&state->symlink_changes,0); 94strbuf_init(&state->root,0); 95 96git_apply_config(); 97if(apply_default_whitespace &&parse_whitespace_option(state, apply_default_whitespace)) 98return-1; 99if(apply_default_ignorewhitespace &&parse_ignorewhitespace_option(state, apply_default_ignorewhitespace)) 100return-1; 101return0; 102} 103 104voidclear_apply_state(struct apply_state *state) 105{ 106string_list_clear(&state->limit_by_name,0); 107string_list_clear(&state->symlink_changes,0); 108strbuf_release(&state->root); 109 110/* &state->fn_table is cleared at the end of apply_patch() */ 111} 112 113static voidmute_routine(const char*msg,va_list params) 114{ 115/* do nothing */ 116} 117 118intcheck_apply_state(struct apply_state *state,int force_apply) 119{ 120int is_not_gitdir = !startup_info->have_repository; 121 122if(state->apply_with_reject && state->threeway) 123returnerror(_("--reject and --3way cannot be used together.")); 124if(state->cached && state->threeway) 125returnerror(_("--cached and --3way cannot be used together.")); 126if(state->threeway) { 127if(is_not_gitdir) 128returnerror(_("--3way outside a repository")); 129 state->check_index =1; 130} 131if(state->apply_with_reject) { 132 state->apply =1; 133if(state->apply_verbosity == verbosity_normal) 134 state->apply_verbosity = verbosity_verbose; 135} 136if(!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor)) 137 state->apply =0; 138if(state->check_index && is_not_gitdir) 139returnerror(_("--index outside a repository")); 140if(state->cached) { 141if(is_not_gitdir) 142returnerror(_("--cached outside a repository")); 143 state->check_index =1; 144} 145if(state->check_index) 146 state->unsafe_paths =0; 147 148if(state->apply_verbosity <= verbosity_silent) { 149 state->saved_error_routine =get_error_routine(); 150 state->saved_warn_routine =get_warn_routine(); 151set_error_routine(mute_routine); 152set_warn_routine(mute_routine); 153} 154 155return0; 156} 157 158static voidset_default_whitespace_mode(struct apply_state *state) 159{ 160if(!state->whitespace_option && !apply_default_whitespace) 161 state->ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error); 162} 163 164/* 165 * This represents one "hunk" from a patch, starting with 166 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 167 * patch text is pointed at by patch, and its byte length 168 * is stored in size. leading and trailing are the number 169 * of context lines. 170 */ 171struct fragment { 172unsigned long leading, trailing; 173unsigned long oldpos, oldlines; 174unsigned long newpos, newlines; 175/* 176 * 'patch' is usually borrowed from buf in apply_patch(), 177 * but some codepaths store an allocated buffer. 178 */ 179const char*patch; 180unsigned free_patch:1, 181 rejected:1; 182int size; 183int linenr; 184struct fragment *next; 185}; 186 187/* 188 * When dealing with a binary patch, we reuse "leading" field 189 * to store the type of the binary hunk, either deflated "delta" 190 * or deflated "literal". 191 */ 192#define binary_patch_method leading 193#define BINARY_DELTA_DEFLATED 1 194#define BINARY_LITERAL_DEFLATED 2 195 196/* 197 * This represents a "patch" to a file, both metainfo changes 198 * such as creation/deletion, filemode and content changes represented 199 * as a series of fragments. 200 */ 201struct patch { 202char*new_name, *old_name, *def_name; 203unsigned int old_mode, new_mode; 204int is_new, is_delete;/* -1 = unknown, 0 = false, 1 = true */ 205int rejected; 206unsigned ws_rule; 207int lines_added, lines_deleted; 208int score; 209int extension_linenr;/* first line specifying delete/new/rename/copy */ 210unsigned int is_toplevel_relative:1; 211unsigned int inaccurate_eof:1; 212unsigned int is_binary:1; 213unsigned int is_copy:1; 214unsigned int is_rename:1; 215unsigned int recount:1; 216unsigned int conflicted_threeway:1; 217unsigned int direct_to_threeway:1; 218unsigned int crlf_in_old:1; 219struct fragment *fragments; 220char*result; 221size_t resultsize; 222char old_sha1_prefix[41]; 223char new_sha1_prefix[41]; 224struct patch *next; 225 226/* three-way fallback result */ 227struct object_id threeway_stage[3]; 228}; 229 230static voidfree_fragment_list(struct fragment *list) 231{ 232while(list) { 233struct fragment *next = list->next; 234if(list->free_patch) 235free((char*)list->patch); 236free(list); 237 list = next; 238} 239} 240 241static voidfree_patch(struct patch *patch) 242{ 243free_fragment_list(patch->fragments); 244free(patch->def_name); 245free(patch->old_name); 246free(patch->new_name); 247free(patch->result); 248free(patch); 249} 250 251static voidfree_patch_list(struct patch *list) 252{ 253while(list) { 254struct patch *next = list->next; 255free_patch(list); 256 list = next; 257} 258} 259 260/* 261 * A line in a file, len-bytes long (includes the terminating LF, 262 * except for an incomplete line at the end if the file ends with 263 * one), and its contents hashes to 'hash'. 264 */ 265struct line { 266size_t len; 267unsigned hash :24; 268unsigned flag :8; 269#define LINE_COMMON 1 270#define LINE_PATCHED 2 271}; 272 273/* 274 * This represents a "file", which is an array of "lines". 275 */ 276struct image { 277char*buf; 278size_t len; 279size_t nr; 280size_t alloc; 281struct line *line_allocated; 282struct line *line; 283}; 284 285static uint32_thash_line(const char*cp,size_t len) 286{ 287size_t i; 288uint32_t h; 289for(i =0, h =0; i < len; i++) { 290if(!isspace(cp[i])) { 291 h = h *3+ (cp[i] &0xff); 292} 293} 294return h; 295} 296 297/* 298 * Compare lines s1 of length n1 and s2 of length n2, ignoring 299 * whitespace difference. Returns 1 if they match, 0 otherwise 300 */ 301static intfuzzy_matchlines(const char*s1,size_t n1, 302const char*s2,size_t n2) 303{ 304const char*end1 = s1 + n1; 305const char*end2 = s2 + n2; 306 307/* ignore line endings */ 308while(s1 < end1 && (end1[-1] =='\r'|| end1[-1] =='\n')) 309 end1--; 310while(s2 < end2 && (end2[-1] =='\r'|| end2[-1] =='\n')) 311 end2--; 312 313while(s1 < end1 && s2 < end2) { 314if(isspace(*s1)) { 315/* 316 * Skip whitespace. We check on both buffers 317 * because we don't want "a b" to match "ab". 318 */ 319if(!isspace(*s2)) 320return0; 321while(s1 < end1 &&isspace(*s1)) 322 s1++; 323while(s2 < end2 &&isspace(*s2)) 324 s2++; 325}else if(*s1++ != *s2++) 326return0; 327} 328 329/* If we reached the end on one side only, lines don't match. */ 330return s1 == end1 && s2 == end2; 331} 332 333static voidadd_line_info(struct image *img,const char*bol,size_t len,unsigned flag) 334{ 335ALLOC_GROW(img->line_allocated, img->nr +1, img->alloc); 336 img->line_allocated[img->nr].len = len; 337 img->line_allocated[img->nr].hash =hash_line(bol, len); 338 img->line_allocated[img->nr].flag = flag; 339 img->nr++; 340} 341 342/* 343 * "buf" has the file contents to be patched (read from various sources). 344 * attach it to "image" and add line-based index to it. 345 * "image" now owns the "buf". 346 */ 347static voidprepare_image(struct image *image,char*buf,size_t len, 348int prepare_linetable) 349{ 350const char*cp, *ep; 351 352memset(image,0,sizeof(*image)); 353 image->buf = buf; 354 image->len = len; 355 356if(!prepare_linetable) 357return; 358 359 ep = image->buf + image->len; 360 cp = image->buf; 361while(cp < ep) { 362const char*next; 363for(next = cp; next < ep && *next !='\n'; next++) 364; 365if(next < ep) 366 next++; 367add_line_info(image, cp, next - cp,0); 368 cp = next; 369} 370 image->line = image->line_allocated; 371} 372 373static voidclear_image(struct image *image) 374{ 375free(image->buf); 376free(image->line_allocated); 377memset(image,0,sizeof(*image)); 378} 379 380/* fmt must contain _one_ %s and no other substitution */ 381static voidsay_patch_name(FILE*output,const char*fmt,struct patch *patch) 382{ 383struct strbuf sb = STRBUF_INIT; 384 385if(patch->old_name && patch->new_name && 386strcmp(patch->old_name, patch->new_name)) { 387quote_c_style(patch->old_name, &sb, NULL,0); 388strbuf_addstr(&sb," => "); 389quote_c_style(patch->new_name, &sb, NULL,0); 390}else{ 391const char*n = patch->new_name; 392if(!n) 393 n = patch->old_name; 394quote_c_style(n, &sb, NULL,0); 395} 396fprintf(output, fmt, sb.buf); 397fputc('\n', output); 398strbuf_release(&sb); 399} 400 401#define SLOP (16) 402 403static intread_patch_file(struct strbuf *sb,int fd) 404{ 405if(strbuf_read(sb, fd,0) <0) 406returnerror_errno("git apply: failed to read"); 407 408/* 409 * Make sure that we have some slop in the buffer 410 * so that we can do speculative "memcmp" etc, and 411 * see to it that it is NUL-filled. 412 */ 413strbuf_grow(sb, SLOP); 414memset(sb->buf + sb->len,0, SLOP); 415return0; 416} 417 418static unsigned longlinelen(const char*buffer,unsigned long size) 419{ 420unsigned long len =0; 421while(size--) { 422 len++; 423if(*buffer++ =='\n') 424break; 425} 426return len; 427} 428 429static intis_dev_null(const char*str) 430{ 431returnskip_prefix(str,"/dev/null", &str) &&isspace(*str); 432} 433 434#define TERM_SPACE 1 435#define TERM_TAB 2 436 437static intname_terminate(int c,int terminate) 438{ 439if(c ==' '&& !(terminate & TERM_SPACE)) 440return0; 441if(c =='\t'&& !(terminate & TERM_TAB)) 442return0; 443 444return1; 445} 446 447/* remove double slashes to make --index work with such filenames */ 448static char*squash_slash(char*name) 449{ 450int i =0, j =0; 451 452if(!name) 453return NULL; 454 455while(name[i]) { 456if((name[j++] = name[i++]) =='/') 457while(name[i] =='/') 458 i++; 459} 460 name[j] ='\0'; 461return name; 462} 463 464static char*find_name_gnu(struct apply_state *state, 465const char*line, 466const char*def, 467int p_value) 468{ 469struct strbuf name = STRBUF_INIT; 470char*cp; 471 472/* 473 * Proposed "new-style" GNU patch/diff format; see 474 * http://marc.info/?l=git&m=112927316408690&w=2 475 */ 476if(unquote_c_style(&name, line, NULL)) { 477strbuf_release(&name); 478return NULL; 479} 480 481for(cp = name.buf; p_value; p_value--) { 482 cp =strchr(cp,'/'); 483if(!cp) { 484strbuf_release(&name); 485return NULL; 486} 487 cp++; 488} 489 490strbuf_remove(&name,0, cp - name.buf); 491if(state->root.len) 492strbuf_insert(&name,0, state->root.buf, state->root.len); 493returnsquash_slash(strbuf_detach(&name, NULL)); 494} 495 496static size_tsane_tz_len(const char*line,size_t len) 497{ 498const char*tz, *p; 499 500if(len <strlen(" +0500") || line[len-strlen(" +0500")] !=' ') 501return0; 502 tz = line + len -strlen(" +0500"); 503 504if(tz[1] !='+'&& tz[1] !='-') 505return0; 506 507for(p = tz +2; p != line + len; p++) 508if(!isdigit(*p)) 509return0; 510 511return line + len - tz; 512} 513 514static size_ttz_with_colon_len(const char*line,size_t len) 515{ 516const char*tz, *p; 517 518if(len <strlen(" +08:00") || line[len -strlen(":00")] !=':') 519return0; 520 tz = line + len -strlen(" +08:00"); 521 522if(tz[0] !=' '|| (tz[1] !='+'&& tz[1] !='-')) 523return0; 524 p = tz +2; 525if(!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 526!isdigit(*p++) || !isdigit(*p++)) 527return0; 528 529return line + len - tz; 530} 531 532static size_tdate_len(const char*line,size_t len) 533{ 534const char*date, *p; 535 536if(len <strlen("72-02-05") || line[len-strlen("-05")] !='-') 537return0; 538 p = date = line + len -strlen("72-02-05"); 539 540if(!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 541!isdigit(*p++) || !isdigit(*p++) || *p++ !='-'|| 542!isdigit(*p++) || !isdigit(*p++))/* Not a date. */ 543return0; 544 545if(date - line >=strlen("19") && 546isdigit(date[-1]) &&isdigit(date[-2]))/* 4-digit year */ 547 date -=strlen("19"); 548 549return line + len - date; 550} 551 552static size_tshort_time_len(const char*line,size_t len) 553{ 554const char*time, *p; 555 556if(len <strlen(" 07:01:32") || line[len-strlen(":32")] !=':') 557return0; 558 p = time = line + len -strlen(" 07:01:32"); 559 560/* Permit 1-digit hours? */ 561if(*p++ !=' '|| 562!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 563!isdigit(*p++) || !isdigit(*p++) || *p++ !=':'|| 564!isdigit(*p++) || !isdigit(*p++))/* Not a time. */ 565return0; 566 567return line + len - time; 568} 569 570static size_tfractional_time_len(const char*line,size_t len) 571{ 572const char*p; 573size_t n; 574 575/* Expected format: 19:41:17.620000023 */ 576if(!len || !isdigit(line[len -1])) 577return0; 578 p = line + len -1; 579 580/* Fractional seconds. */ 581while(p > line &&isdigit(*p)) 582 p--; 583if(*p !='.') 584return0; 585 586/* Hours, minutes, and whole seconds. */ 587 n =short_time_len(line, p - line); 588if(!n) 589return0; 590 591return line + len - p + n; 592} 593 594static size_ttrailing_spaces_len(const char*line,size_t len) 595{ 596const char*p; 597 598/* Expected format: ' ' x (1 or more) */ 599if(!len || line[len -1] !=' ') 600return0; 601 602 p = line + len; 603while(p != line) { 604 p--; 605if(*p !=' ') 606return line + len - (p +1); 607} 608 609/* All spaces! */ 610return len; 611} 612 613static size_tdiff_timestamp_len(const char*line,size_t len) 614{ 615const char*end = line + len; 616size_t n; 617 618/* 619 * Posix: 2010-07-05 19:41:17 620 * GNU: 2010-07-05 19:41:17.620000023 -0500 621 */ 622 623if(!isdigit(end[-1])) 624return0; 625 626 n =sane_tz_len(line, end - line); 627if(!n) 628 n =tz_with_colon_len(line, end - line); 629 end -= n; 630 631 n =short_time_len(line, end - line); 632if(!n) 633 n =fractional_time_len(line, end - line); 634 end -= n; 635 636 n =date_len(line, end - line); 637if(!n)/* No date. Too bad. */ 638return0; 639 end -= n; 640 641if(end == line)/* No space before date. */ 642return0; 643if(end[-1] =='\t') {/* Success! */ 644 end--; 645return line + len - end; 646} 647if(end[-1] !=' ')/* No space before date. */ 648return0; 649 650/* Whitespace damage. */ 651 end -=trailing_spaces_len(line, end - line); 652return line + len - end; 653} 654 655static char*find_name_common(struct apply_state *state, 656const char*line, 657const char*def, 658int p_value, 659const char*end, 660int terminate) 661{ 662int len; 663const char*start = NULL; 664 665if(p_value ==0) 666 start = line; 667while(line != end) { 668char c = *line; 669 670if(!end &&isspace(c)) { 671if(c =='\n') 672break; 673if(name_terminate(c, terminate)) 674break; 675} 676 line++; 677if(c =='/'&& !--p_value) 678 start = line; 679} 680if(!start) 681returnsquash_slash(xstrdup_or_null(def)); 682 len = line - start; 683if(!len) 684returnsquash_slash(xstrdup_or_null(def)); 685 686/* 687 * Generally we prefer the shorter name, especially 688 * if the other one is just a variation of that with 689 * something else tacked on to the end (ie "file.orig" 690 * or "file~"). 691 */ 692if(def) { 693int deflen =strlen(def); 694if(deflen < len && !strncmp(start, def, deflen)) 695returnsquash_slash(xstrdup(def)); 696} 697 698if(state->root.len) { 699char*ret =xstrfmt("%s%.*s", state->root.buf, len, start); 700returnsquash_slash(ret); 701} 702 703returnsquash_slash(xmemdupz(start, len)); 704} 705 706static char*find_name(struct apply_state *state, 707const char*line, 708char*def, 709int p_value, 710int terminate) 711{ 712if(*line =='"') { 713char*name =find_name_gnu(state, line, def, p_value); 714if(name) 715return name; 716} 717 718returnfind_name_common(state, line, def, p_value, NULL, terminate); 719} 720 721static char*find_name_traditional(struct apply_state *state, 722const char*line, 723char*def, 724int p_value) 725{ 726size_t len; 727size_t date_len; 728 729if(*line =='"') { 730char*name =find_name_gnu(state, line, def, p_value); 731if(name) 732return name; 733} 734 735 len =strchrnul(line,'\n') - line; 736 date_len =diff_timestamp_len(line, len); 737if(!date_len) 738returnfind_name_common(state, line, def, p_value, NULL, TERM_TAB); 739 len -= date_len; 740 741returnfind_name_common(state, line, def, p_value, line + len,0); 742} 743 744/* 745 * Given the string after "--- " or "+++ ", guess the appropriate 746 * p_value for the given patch. 747 */ 748static intguess_p_value(struct apply_state *state,const char*nameline) 749{ 750char*name, *cp; 751int val = -1; 752 753if(is_dev_null(nameline)) 754return-1; 755 name =find_name_traditional(state, nameline, NULL,0); 756if(!name) 757return-1; 758 cp =strchr(name,'/'); 759if(!cp) 760 val =0; 761else if(state->prefix) { 762/* 763 * Does it begin with "a/$our-prefix" and such? Then this is 764 * very likely to apply to our directory. 765 */ 766if(starts_with(name, state->prefix)) 767 val =count_slashes(state->prefix); 768else{ 769 cp++; 770if(starts_with(cp, state->prefix)) 771 val =count_slashes(state->prefix) +1; 772} 773} 774free(name); 775return val; 776} 777 778/* 779 * Does the ---/+++ line have the POSIX timestamp after the last HT? 780 * GNU diff puts epoch there to signal a creation/deletion event. Is 781 * this such a timestamp? 782 */ 783static inthas_epoch_timestamp(const char*nameline) 784{ 785/* 786 * We are only interested in epoch timestamp; any non-zero 787 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 788 * For the same reason, the date must be either 1969-12-31 or 789 * 1970-01-01, and the seconds part must be "00". 790 */ 791const char stamp_regexp[] = 792"^[0-2][0-9]:([0-5][0-9]):00(\\.0+)?" 793" " 794"([-+][0-2][0-9]:?[0-5][0-9])\n"; 795const char*timestamp = NULL, *cp, *colon; 796static regex_t *stamp; 797 regmatch_t m[10]; 798int zoneoffset, epoch_hour, hour, minute; 799int status; 800 801for(cp = nameline; *cp !='\n'; cp++) { 802if(*cp =='\t') 803 timestamp = cp +1; 804} 805if(!timestamp) 806return0; 807 808/* 809 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 810 * (west of GMT) or 1970-01-01 (east of GMT) 811 */ 812if(skip_prefix(timestamp,"1969-12-31 ", ×tamp)) 813 epoch_hour =24; 814else if(skip_prefix(timestamp,"1970-01-01 ", ×tamp)) 815 epoch_hour =0; 816else 817return0; 818 819if(!stamp) { 820 stamp =xmalloc(sizeof(*stamp)); 821if(regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 822warning(_("Cannot prepare timestamp regexp%s"), 823 stamp_regexp); 824return0; 825} 826} 827 828 status =regexec(stamp, timestamp,ARRAY_SIZE(m), m,0); 829if(status) { 830if(status != REG_NOMATCH) 831warning(_("regexec returned%dfor input:%s"), 832 status, timestamp); 833return0; 834} 835 836 hour =strtol(timestamp, NULL,10); 837 minute =strtol(timestamp + m[1].rm_so, NULL,10); 838 839 zoneoffset =strtol(timestamp + m[3].rm_so +1, (char**) &colon,10); 840if(*colon ==':') 841 zoneoffset = zoneoffset *60+strtol(colon +1, NULL,10); 842else 843 zoneoffset = (zoneoffset /100) *60+ (zoneoffset %100); 844if(timestamp[m[3].rm_so] =='-') 845 zoneoffset = -zoneoffset; 846 847return hour *60+ minute - zoneoffset == epoch_hour *60; 848} 849 850/* 851 * Get the name etc info from the ---/+++ lines of a traditional patch header 852 * 853 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 854 * files, we can happily check the index for a match, but for creating a 855 * new file we should try to match whatever "patch" does. I have no idea. 856 */ 857static intparse_traditional_patch(struct apply_state *state, 858const char*first, 859const char*second, 860struct patch *patch) 861{ 862char*name; 863 864 first +=4;/* skip "--- " */ 865 second +=4;/* skip "+++ " */ 866if(!state->p_value_known) { 867int p, q; 868 p =guess_p_value(state, first); 869 q =guess_p_value(state, second); 870if(p <0) p = q; 871if(0<= p && p == q) { 872 state->p_value = p; 873 state->p_value_known =1; 874} 875} 876if(is_dev_null(first)) { 877 patch->is_new =1; 878 patch->is_delete =0; 879 name =find_name_traditional(state, second, NULL, state->p_value); 880 patch->new_name = name; 881}else if(is_dev_null(second)) { 882 patch->is_new =0; 883 patch->is_delete =1; 884 name =find_name_traditional(state, first, NULL, state->p_value); 885 patch->old_name = name; 886}else{ 887char*first_name; 888 first_name =find_name_traditional(state, first, NULL, state->p_value); 889 name =find_name_traditional(state, second, first_name, state->p_value); 890free(first_name); 891if(has_epoch_timestamp(first)) { 892 patch->is_new =1; 893 patch->is_delete =0; 894 patch->new_name = name; 895}else if(has_epoch_timestamp(second)) { 896 patch->is_new =0; 897 patch->is_delete =1; 898 patch->old_name = name; 899}else{ 900 patch->old_name = name; 901 patch->new_name =xstrdup_or_null(name); 902} 903} 904if(!name) 905returnerror(_("unable to find filename in patch at line%d"), state->linenr); 906 907return0; 908} 909 910static intgitdiff_hdrend(struct apply_state *state, 911const char*line, 912struct patch *patch) 913{ 914return1; 915} 916 917/* 918 * We're anal about diff header consistency, to make 919 * sure that we don't end up having strange ambiguous 920 * patches floating around. 921 * 922 * As a result, gitdiff_{old|new}name() will check 923 * their names against any previous information, just 924 * to make sure.. 925 */ 926#define DIFF_OLD_NAME 0 927#define DIFF_NEW_NAME 1 928 929static intgitdiff_verify_name(struct apply_state *state, 930const char*line, 931int isnull, 932char**name, 933int side) 934{ 935if(!*name && !isnull) { 936*name =find_name(state, line, NULL, state->p_value, TERM_TAB); 937return0; 938} 939 940if(*name) { 941char*another; 942if(isnull) 943returnerror(_("git apply: bad git-diff - expected /dev/null, got%son line%d"), 944*name, state->linenr); 945 another =find_name(state, line, NULL, state->p_value, TERM_TAB); 946if(!another ||strcmp(another, *name)) { 947free(another); 948returnerror((side == DIFF_NEW_NAME) ? 949_("git apply: bad git-diff - inconsistent new filename on line%d") : 950_("git apply: bad git-diff - inconsistent old filename on line%d"), state->linenr); 951} 952free(another); 953}else{ 954if(!is_dev_null(line)) 955returnerror(_("git apply: bad git-diff - expected /dev/null on line%d"), state->linenr); 956} 957 958return0; 959} 960 961static intgitdiff_oldname(struct apply_state *state, 962const char*line, 963struct patch *patch) 964{ 965returngitdiff_verify_name(state, line, 966 patch->is_new, &patch->old_name, 967 DIFF_OLD_NAME); 968} 969 970static intgitdiff_newname(struct apply_state *state, 971const char*line, 972struct patch *patch) 973{ 974returngitdiff_verify_name(state, line, 975 patch->is_delete, &patch->new_name, 976 DIFF_NEW_NAME); 977} 978 979static intparse_mode_line(const char*line,int linenr,unsigned int*mode) 980{ 981char*end; 982*mode =strtoul(line, &end,8); 983if(end == line || !isspace(*end)) 984returnerror(_("invalid mode on line%d:%s"), linenr, line); 985return0; 986} 987 988static intgitdiff_oldmode(struct apply_state *state, 989const char*line, 990struct patch *patch) 991{ 992returnparse_mode_line(line, state->linenr, &patch->old_mode); 993} 994 995static intgitdiff_newmode(struct apply_state *state, 996const char*line, 997struct patch *patch) 998{ 999returnparse_mode_line(line, state->linenr, &patch->new_mode);1000}10011002static intgitdiff_delete(struct apply_state *state,1003const char*line,1004struct patch *patch)1005{1006 patch->is_delete =1;1007free(patch->old_name);1008 patch->old_name =xstrdup_or_null(patch->def_name);1009returngitdiff_oldmode(state, line, patch);1010}10111012static intgitdiff_newfile(struct apply_state *state,1013const char*line,1014struct patch *patch)1015{1016 patch->is_new =1;1017free(patch->new_name);1018 patch->new_name =xstrdup_or_null(patch->def_name);1019returngitdiff_newmode(state, line, patch);1020}10211022static intgitdiff_copysrc(struct apply_state *state,1023const char*line,1024struct patch *patch)1025{1026 patch->is_copy =1;1027free(patch->old_name);1028 patch->old_name =find_name(state, line, NULL, state->p_value ? state->p_value -1:0,0);1029return0;1030}10311032static intgitdiff_copydst(struct apply_state *state,1033const char*line,1034struct patch *patch)1035{1036 patch->is_copy =1;1037free(patch->new_name);1038 patch->new_name =find_name(state, line, NULL, state->p_value ? state->p_value -1:0,0);1039return0;1040}10411042static intgitdiff_renamesrc(struct apply_state *state,1043const char*line,1044struct patch *patch)1045{1046 patch->is_rename =1;1047free(patch->old_name);1048 patch->old_name =find_name(state, line, NULL, state->p_value ? state->p_value -1:0,0);1049return0;1050}10511052static intgitdiff_renamedst(struct apply_state *state,1053const char*line,1054struct patch *patch)1055{1056 patch->is_rename =1;1057free(patch->new_name);1058 patch->new_name =find_name(state, line, NULL, state->p_value ? state->p_value -1:0,0);1059return0;1060}10611062static intgitdiff_similarity(struct apply_state *state,1063const char*line,1064struct patch *patch)1065{1066unsigned long val =strtoul(line, NULL,10);1067if(val <=100)1068 patch->score = val;1069return0;1070}10711072static intgitdiff_dissimilarity(struct apply_state *state,1073const char*line,1074struct patch *patch)1075{1076unsigned long val =strtoul(line, NULL,10);1077if(val <=100)1078 patch->score = val;1079return0;1080}10811082static intgitdiff_index(struct apply_state *state,1083const char*line,1084struct patch *patch)1085{1086/*1087 * index line is N hexadecimal, "..", N hexadecimal,1088 * and optional space with octal mode.1089 */1090const char*ptr, *eol;1091int len;10921093 ptr =strchr(line,'.');1094if(!ptr || ptr[1] !='.'||40< ptr - line)1095return0;1096 len = ptr - line;1097memcpy(patch->old_sha1_prefix, line, len);1098 patch->old_sha1_prefix[len] =0;10991100 line = ptr +2;1101 ptr =strchr(line,' ');1102 eol =strchrnul(line,'\n');11031104if(!ptr || eol < ptr)1105 ptr = eol;1106 len = ptr - line;11071108if(40< len)1109return0;1110memcpy(patch->new_sha1_prefix, line, len);1111 patch->new_sha1_prefix[len] =0;1112if(*ptr ==' ')1113returngitdiff_oldmode(state, ptr +1, patch);1114return0;1115}11161117/*1118 * This is normal for a diff that doesn't change anything: we'll fall through1119 * into the next diff. Tell the parser to break out.1120 */1121static intgitdiff_unrecognized(struct apply_state *state,1122const char*line,1123struct patch *patch)1124{1125return1;1126}11271128/*1129 * Skip p_value leading components from "line"; as we do not accept1130 * absolute paths, return NULL in that case.1131 */1132static const char*skip_tree_prefix(struct apply_state *state,1133const char*line,1134int llen)1135{1136int nslash;1137int i;11381139if(!state->p_value)1140return(llen && line[0] =='/') ? NULL : line;11411142 nslash = state->p_value;1143for(i =0; i < llen; i++) {1144int ch = line[i];1145if(ch =='/'&& --nslash <=0)1146return(i ==0) ? NULL : &line[i +1];1147}1148return NULL;1149}11501151/*1152 * This is to extract the same name that appears on "diff --git"1153 * line. We do not find and return anything if it is a rename1154 * patch, and it is OK because we will find the name elsewhere.1155 * We need to reliably find name only when it is mode-change only,1156 * creation or deletion of an empty file. In any of these cases,1157 * both sides are the same name under a/ and b/ respectively.1158 */1159static char*git_header_name(struct apply_state *state,1160const char*line,1161int llen)1162{1163const char*name;1164const char*second = NULL;1165size_t len, line_len;11661167 line +=strlen("diff --git ");1168 llen -=strlen("diff --git ");11691170if(*line =='"') {1171const char*cp;1172struct strbuf first = STRBUF_INIT;1173struct strbuf sp = STRBUF_INIT;11741175if(unquote_c_style(&first, line, &second))1176goto free_and_fail1;11771178/* strip the a/b prefix including trailing slash */1179 cp =skip_tree_prefix(state, first.buf, first.len);1180if(!cp)1181goto free_and_fail1;1182strbuf_remove(&first,0, cp - first.buf);11831184/*1185 * second points at one past closing dq of name.1186 * find the second name.1187 */1188while((second < line + llen) &&isspace(*second))1189 second++;11901191if(line + llen <= second)1192goto free_and_fail1;1193if(*second =='"') {1194if(unquote_c_style(&sp, second, NULL))1195goto free_and_fail1;1196 cp =skip_tree_prefix(state, sp.buf, sp.len);1197if(!cp)1198goto free_and_fail1;1199/* They must match, otherwise ignore */1200if(strcmp(cp, first.buf))1201goto free_and_fail1;1202strbuf_release(&sp);1203returnstrbuf_detach(&first, NULL);1204}12051206/* unquoted second */1207 cp =skip_tree_prefix(state, second, line + llen - second);1208if(!cp)1209goto free_and_fail1;1210if(line + llen - cp != first.len ||1211memcmp(first.buf, cp, first.len))1212goto free_and_fail1;1213returnstrbuf_detach(&first, NULL);12141215 free_and_fail1:1216strbuf_release(&first);1217strbuf_release(&sp);1218return NULL;1219}12201221/* unquoted first name */1222 name =skip_tree_prefix(state, line, llen);1223if(!name)1224return NULL;12251226/*1227 * since the first name is unquoted, a dq if exists must be1228 * the beginning of the second name.1229 */1230for(second = name; second < line + llen; second++) {1231if(*second =='"') {1232struct strbuf sp = STRBUF_INIT;1233const char*np;12341235if(unquote_c_style(&sp, second, NULL))1236goto free_and_fail2;12371238 np =skip_tree_prefix(state, sp.buf, sp.len);1239if(!np)1240goto free_and_fail2;12411242 len = sp.buf + sp.len - np;1243if(len < second - name &&1244!strncmp(np, name, len) &&1245isspace(name[len])) {1246/* Good */1247strbuf_remove(&sp,0, np - sp.buf);1248returnstrbuf_detach(&sp, NULL);1249}12501251 free_and_fail2:1252strbuf_release(&sp);1253return NULL;1254}1255}12561257/*1258 * Accept a name only if it shows up twice, exactly the same1259 * form.1260 */1261 second =strchr(name,'\n');1262if(!second)1263return NULL;1264 line_len = second - name;1265for(len =0; ; len++) {1266switch(name[len]) {1267default:1268continue;1269case'\n':1270return NULL;1271case'\t':case' ':1272/*1273 * Is this the separator between the preimage1274 * and the postimage pathname? Again, we are1275 * only interested in the case where there is1276 * no rename, as this is only to set def_name1277 * and a rename patch has the names elsewhere1278 * in an unambiguous form.1279 */1280if(!name[len +1])1281return NULL;/* no postimage name */1282 second =skip_tree_prefix(state, name + len +1,1283 line_len - (len +1));1284if(!second)1285return NULL;1286/*1287 * Does len bytes starting at "name" and "second"1288 * (that are separated by one HT or SP we just1289 * found) exactly match?1290 */1291if(second[len] =='\n'&& !strncmp(name, second, len))1292returnxmemdupz(name, len);1293}1294}1295}12961297static intcheck_header_line(struct apply_state *state,struct patch *patch)1298{1299int extensions = (patch->is_delete ==1) + (patch->is_new ==1) +1300(patch->is_rename ==1) + (patch->is_copy ==1);1301if(extensions >1)1302returnerror(_("inconsistent header lines%dand%d"),1303 patch->extension_linenr, state->linenr);1304if(extensions && !patch->extension_linenr)1305 patch->extension_linenr = state->linenr;1306return0;1307}13081309/* Verify that we recognize the lines following a git header */1310static intparse_git_header(struct apply_state *state,1311const char*line,1312int len,1313unsigned int size,1314struct patch *patch)1315{1316unsigned long offset;13171318/* A git diff has explicit new/delete information, so we don't guess */1319 patch->is_new =0;1320 patch->is_delete =0;13211322/*1323 * Some things may not have the old name in the1324 * rest of the headers anywhere (pure mode changes,1325 * or removing or adding empty files), so we get1326 * the default name from the header.1327 */1328 patch->def_name =git_header_name(state, line, len);1329if(patch->def_name && state->root.len) {1330char*s =xstrfmt("%s%s", state->root.buf, patch->def_name);1331free(patch->def_name);1332 patch->def_name = s;1333}13341335 line += len;1336 size -= len;1337 state->linenr++;1338for(offset = len ; size >0; offset += len, size -= len, line += len, state->linenr++) {1339static const struct opentry {1340const char*str;1341int(*fn)(struct apply_state *,const char*,struct patch *);1342} optable[] = {1343{"@@ -", gitdiff_hdrend },1344{"--- ", gitdiff_oldname },1345{"+++ ", gitdiff_newname },1346{"old mode ", gitdiff_oldmode },1347{"new mode ", gitdiff_newmode },1348{"deleted file mode ", gitdiff_delete },1349{"new file mode ", gitdiff_newfile },1350{"copy from ", gitdiff_copysrc },1351{"copy to ", gitdiff_copydst },1352{"rename old ", gitdiff_renamesrc },1353{"rename new ", gitdiff_renamedst },1354{"rename from ", gitdiff_renamesrc },1355{"rename to ", gitdiff_renamedst },1356{"similarity index ", gitdiff_similarity },1357{"dissimilarity index ", gitdiff_dissimilarity },1358{"index ", gitdiff_index },1359{"", gitdiff_unrecognized },1360};1361int i;13621363 len =linelen(line, size);1364if(!len || line[len-1] !='\n')1365break;1366for(i =0; i <ARRAY_SIZE(optable); i++) {1367const struct opentry *p = optable + i;1368int oplen =strlen(p->str);1369int res;1370if(len < oplen ||memcmp(p->str, line, oplen))1371continue;1372 res = p->fn(state, line + oplen, patch);1373if(res <0)1374return-1;1375if(check_header_line(state, patch))1376return-1;1377if(res >0)1378return offset;1379break;1380}1381}13821383return offset;1384}13851386static intparse_num(const char*line,unsigned long*p)1387{1388char*ptr;13891390if(!isdigit(*line))1391return0;1392*p =strtoul(line, &ptr,10);1393return ptr - line;1394}13951396static intparse_range(const char*line,int len,int offset,const char*expect,1397unsigned long*p1,unsigned long*p2)1398{1399int digits, ex;14001401if(offset <0|| offset >= len)1402return-1;1403 line += offset;1404 len -= offset;14051406 digits =parse_num(line, p1);1407if(!digits)1408return-1;14091410 offset += digits;1411 line += digits;1412 len -= digits;14131414*p2 =1;1415if(*line ==',') {1416 digits =parse_num(line+1, p2);1417if(!digits)1418return-1;14191420 offset += digits+1;1421 line += digits+1;1422 len -= digits+1;1423}14241425 ex =strlen(expect);1426if(ex > len)1427return-1;1428if(memcmp(line, expect, ex))1429return-1;14301431return offset + ex;1432}14331434static voidrecount_diff(const char*line,int size,struct fragment *fragment)1435{1436int oldlines =0, newlines =0, ret =0;14371438if(size <1) {1439warning("recount: ignore empty hunk");1440return;1441}14421443for(;;) {1444int len =linelen(line, size);1445 size -= len;1446 line += len;14471448if(size <1)1449break;14501451switch(*line) {1452case' ':case'\n':1453 newlines++;1454/* fall through */1455case'-':1456 oldlines++;1457continue;1458case'+':1459 newlines++;1460continue;1461case'\\':1462continue;1463case'@':1464 ret = size <3|| !starts_with(line,"@@ ");1465break;1466case'd':1467 ret = size <5|| !starts_with(line,"diff ");1468break;1469default:1470 ret = -1;1471break;1472}1473if(ret) {1474warning(_("recount: unexpected line: %.*s"),1475(int)linelen(line, size), line);1476return;1477}1478break;1479}1480 fragment->oldlines = oldlines;1481 fragment->newlines = newlines;1482}14831484/*1485 * Parse a unified diff fragment header of the1486 * form "@@ -a,b +c,d @@"1487 */1488static intparse_fragment_header(const char*line,int len,struct fragment *fragment)1489{1490int offset;14911492if(!len || line[len-1] !='\n')1493return-1;14941495/* Figure out the number of lines in a fragment */1496 offset =parse_range(line, len,4," +", &fragment->oldpos, &fragment->oldlines);1497 offset =parse_range(line, len, offset," @@", &fragment->newpos, &fragment->newlines);14981499return offset;1500}15011502/*1503 * Find file diff header1504 *1505 * Returns:1506 * -1 if no header was found1507 * -128 in case of error1508 * the size of the header in bytes (called "offset") otherwise1509 */1510static intfind_header(struct apply_state *state,1511const char*line,1512unsigned long size,1513int*hdrsize,1514struct patch *patch)1515{1516unsigned long offset, len;15171518 patch->is_toplevel_relative =0;1519 patch->is_rename = patch->is_copy =0;1520 patch->is_new = patch->is_delete = -1;1521 patch->old_mode = patch->new_mode =0;1522 patch->old_name = patch->new_name = NULL;1523for(offset =0; size >0; offset += len, size -= len, line += len, state->linenr++) {1524unsigned long nextlen;15251526 len =linelen(line, size);1527if(!len)1528break;15291530/* Testing this early allows us to take a few shortcuts.. */1531if(len <6)1532continue;15331534/*1535 * Make sure we don't find any unconnected patch fragments.1536 * That's a sign that we didn't find a header, and that a1537 * patch has become corrupted/broken up.1538 */1539if(!memcmp("@@ -", line,4)) {1540struct fragment dummy;1541if(parse_fragment_header(line, len, &dummy) <0)1542continue;1543error(_("patch fragment without header at line%d: %.*s"),1544 state->linenr, (int)len-1, line);1545return-128;1546}15471548if(size < len +6)1549break;15501551/*1552 * Git patch? It might not have a real patch, just a rename1553 * or mode change, so we handle that specially1554 */1555if(!memcmp("diff --git ", line,11)) {1556int git_hdr_len =parse_git_header(state, line, len, size, patch);1557if(git_hdr_len <0)1558return-128;1559if(git_hdr_len <= len)1560continue;1561if(!patch->old_name && !patch->new_name) {1562if(!patch->def_name) {1563error(Q_("git diff header lacks filename information when removing "1564"%dleading pathname component (line%d)",1565"git diff header lacks filename information when removing "1566"%dleading pathname components (line%d)",1567 state->p_value),1568 state->p_value, state->linenr);1569return-128;1570}1571 patch->old_name =xstrdup(patch->def_name);1572 patch->new_name =xstrdup(patch->def_name);1573}1574if((!patch->new_name && !patch->is_delete) ||1575(!patch->old_name && !patch->is_new)) {1576error(_("git diff header lacks filename information "1577"(line%d)"), state->linenr);1578return-128;1579}1580 patch->is_toplevel_relative =1;1581*hdrsize = git_hdr_len;1582return offset;1583}15841585/* --- followed by +++ ? */1586if(memcmp("--- ", line,4) ||memcmp("+++ ", line + len,4))1587continue;15881589/*1590 * We only accept unified patches, so we want it to1591 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1592 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1593 */1594 nextlen =linelen(line + len, size - len);1595if(size < nextlen +14||memcmp("@@ -", line + len + nextlen,4))1596continue;15971598/* Ok, we'll consider it a patch */1599if(parse_traditional_patch(state, line, line+len, patch))1600return-128;1601*hdrsize = len + nextlen;1602 state->linenr +=2;1603return offset;1604}1605return-1;1606}16071608static voidrecord_ws_error(struct apply_state *state,1609unsigned result,1610const char*line,1611int len,1612int linenr)1613{1614char*err;16151616if(!result)1617return;16181619 state->whitespace_error++;1620if(state->squelch_whitespace_errors &&1621 state->squelch_whitespace_errors < state->whitespace_error)1622return;16231624 err =whitespace_error_string(result);1625if(state->apply_verbosity > verbosity_silent)1626fprintf(stderr,"%s:%d:%s.\n%.*s\n",1627 state->patch_input_file, linenr, err, len, line);1628free(err);1629}16301631static voidcheck_whitespace(struct apply_state *state,1632const char*line,1633int len,1634unsigned ws_rule)1635{1636unsigned result =ws_check(line +1, len -1, ws_rule);16371638record_ws_error(state, result, line +1, len -2, state->linenr);1639}16401641/*1642 * Check if the patch has context lines with CRLF or1643 * the patch wants to remove lines with CRLF.1644 */1645static voidcheck_old_for_crlf(struct patch *patch,const char*line,int len)1646{1647if(len >=2&& line[len-1] =='\n'&& line[len-2] =='\r') {1648 patch->ws_rule |= WS_CR_AT_EOL;1649 patch->crlf_in_old =1;1650}1651}165216531654/*1655 * Parse a unified diff. Note that this really needs to parse each1656 * fragment separately, since the only way to know the difference1657 * between a "---" that is part of a patch, and a "---" that starts1658 * the next patch is to look at the line counts..1659 */1660static intparse_fragment(struct apply_state *state,1661const char*line,1662unsigned long size,1663struct patch *patch,1664struct fragment *fragment)1665{1666int added, deleted;1667int len =linelen(line, size), offset;1668unsigned long oldlines, newlines;1669unsigned long leading, trailing;16701671 offset =parse_fragment_header(line, len, fragment);1672if(offset <0)1673return-1;1674if(offset >0&& patch->recount)1675recount_diff(line + offset, size - offset, fragment);1676 oldlines = fragment->oldlines;1677 newlines = fragment->newlines;1678 leading =0;1679 trailing =0;16801681/* Parse the thing.. */1682 line += len;1683 size -= len;1684 state->linenr++;1685 added = deleted =0;1686for(offset = len;16870< size;1688 offset += len, size -= len, line += len, state->linenr++) {1689if(!oldlines && !newlines)1690break;1691 len =linelen(line, size);1692if(!len || line[len-1] !='\n')1693return-1;1694switch(*line) {1695default:1696return-1;1697case'\n':/* newer GNU diff, an empty context line */1698case' ':1699 oldlines--;1700 newlines--;1701if(!deleted && !added)1702 leading++;1703 trailing++;1704check_old_for_crlf(patch, line, len);1705if(!state->apply_in_reverse &&1706 state->ws_error_action == correct_ws_error)1707check_whitespace(state, line, len, patch->ws_rule);1708break;1709case'-':1710if(!state->apply_in_reverse)1711check_old_for_crlf(patch, line, len);1712if(state->apply_in_reverse &&1713 state->ws_error_action != nowarn_ws_error)1714check_whitespace(state, line, len, patch->ws_rule);1715 deleted++;1716 oldlines--;1717 trailing =0;1718break;1719case'+':1720if(state->apply_in_reverse)1721check_old_for_crlf(patch, line, len);1722if(!state->apply_in_reverse &&1723 state->ws_error_action != nowarn_ws_error)1724check_whitespace(state, line, len, patch->ws_rule);1725 added++;1726 newlines--;1727 trailing =0;1728break;17291730/*1731 * We allow "\ No newline at end of file". Depending1732 * on locale settings when the patch was produced we1733 * don't know what this line looks like. The only1734 * thing we do know is that it begins with "\ ".1735 * Checking for 12 is just for sanity check -- any1736 * l10n of "\ No newline..." is at least that long.1737 */1738case'\\':1739if(len <12||memcmp(line,"\\",2))1740return-1;1741break;1742}1743}1744if(oldlines || newlines)1745return-1;1746if(!deleted && !added)1747return-1;17481749 fragment->leading = leading;1750 fragment->trailing = trailing;17511752/*1753 * If a fragment ends with an incomplete line, we failed to include1754 * it in the above loop because we hit oldlines == newlines == 01755 * before seeing it.1756 */1757if(12< size && !memcmp(line,"\\",2))1758 offset +=linelen(line, size);17591760 patch->lines_added += added;1761 patch->lines_deleted += deleted;17621763if(0< patch->is_new && oldlines)1764returnerror(_("new file depends on old contents"));1765if(0< patch->is_delete && newlines)1766returnerror(_("deleted file still has contents"));1767return offset;1768}17691770/*1771 * We have seen "diff --git a/... b/..." header (or a traditional patch1772 * header). Read hunks that belong to this patch into fragments and hang1773 * them to the given patch structure.1774 *1775 * The (fragment->patch, fragment->size) pair points into the memory given1776 * by the caller, not a copy, when we return.1777 *1778 * Returns:1779 * -1 in case of error,1780 * the number of bytes in the patch otherwise.1781 */1782static intparse_single_patch(struct apply_state *state,1783const char*line,1784unsigned long size,1785struct patch *patch)1786{1787unsigned long offset =0;1788unsigned long oldlines =0, newlines =0, context =0;1789struct fragment **fragp = &patch->fragments;17901791while(size >4&& !memcmp(line,"@@ -",4)) {1792struct fragment *fragment;1793int len;17941795 fragment =xcalloc(1,sizeof(*fragment));1796 fragment->linenr = state->linenr;1797 len =parse_fragment(state, line, size, patch, fragment);1798if(len <=0) {1799free(fragment);1800returnerror(_("corrupt patch at line%d"), state->linenr);1801}1802 fragment->patch = line;1803 fragment->size = len;1804 oldlines += fragment->oldlines;1805 newlines += fragment->newlines;1806 context += fragment->leading + fragment->trailing;18071808*fragp = fragment;1809 fragp = &fragment->next;18101811 offset += len;1812 line += len;1813 size -= len;1814}18151816/*1817 * If something was removed (i.e. we have old-lines) it cannot1818 * be creation, and if something was added it cannot be1819 * deletion. However, the reverse is not true; --unified=01820 * patches that only add are not necessarily creation even1821 * though they do not have any old lines, and ones that only1822 * delete are not necessarily deletion.1823 *1824 * Unfortunately, a real creation/deletion patch do _not_ have1825 * any context line by definition, so we cannot safely tell it1826 * apart with --unified=0 insanity. At least if the patch has1827 * more than one hunk it is not creation or deletion.1828 */1829if(patch->is_new <0&&1830(oldlines || (patch->fragments && patch->fragments->next)))1831 patch->is_new =0;1832if(patch->is_delete <0&&1833(newlines || (patch->fragments && patch->fragments->next)))1834 patch->is_delete =0;18351836if(0< patch->is_new && oldlines)1837returnerror(_("new file%sdepends on old contents"), patch->new_name);1838if(0< patch->is_delete && newlines)1839returnerror(_("deleted file%sstill has contents"), patch->old_name);1840if(!patch->is_delete && !newlines && context && state->apply_verbosity > verbosity_silent)1841fprintf_ln(stderr,1842_("** warning: "1843"file%sbecomes empty but is not deleted"),1844 patch->new_name);18451846return offset;1847}18481849staticinlineintmetadata_changes(struct patch *patch)1850{1851return patch->is_rename >0||1852 patch->is_copy >0||1853 patch->is_new >0||1854 patch->is_delete ||1855(patch->old_mode && patch->new_mode &&1856 patch->old_mode != patch->new_mode);1857}18581859static char*inflate_it(const void*data,unsigned long size,1860unsigned long inflated_size)1861{1862 git_zstream stream;1863void*out;1864int st;18651866memset(&stream,0,sizeof(stream));18671868 stream.next_in = (unsigned char*)data;1869 stream.avail_in = size;1870 stream.next_out = out =xmalloc(inflated_size);1871 stream.avail_out = inflated_size;1872git_inflate_init(&stream);1873 st =git_inflate(&stream, Z_FINISH);1874git_inflate_end(&stream);1875if((st != Z_STREAM_END) || stream.total_out != inflated_size) {1876free(out);1877return NULL;1878}1879return out;1880}18811882/*1883 * Read a binary hunk and return a new fragment; fragment->patch1884 * points at an allocated memory that the caller must free, so1885 * it is marked as "->free_patch = 1".1886 */1887static struct fragment *parse_binary_hunk(struct apply_state *state,1888char**buf_p,1889unsigned long*sz_p,1890int*status_p,1891int*used_p)1892{1893/*1894 * Expect a line that begins with binary patch method ("literal"1895 * or "delta"), followed by the length of data before deflating.1896 * a sequence of 'length-byte' followed by base-85 encoded data1897 * should follow, terminated by a newline.1898 *1899 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1900 * and we would limit the patch line to 66 characters,1901 * so one line can fit up to 13 groups that would decode1902 * to 52 bytes max. The length byte 'A'-'Z' corresponds1903 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1904 */1905int llen, used;1906unsigned long size = *sz_p;1907char*buffer = *buf_p;1908int patch_method;1909unsigned long origlen;1910char*data = NULL;1911int hunk_size =0;1912struct fragment *frag;19131914 llen =linelen(buffer, size);1915 used = llen;19161917*status_p =0;19181919if(starts_with(buffer,"delta ")) {1920 patch_method = BINARY_DELTA_DEFLATED;1921 origlen =strtoul(buffer +6, NULL,10);1922}1923else if(starts_with(buffer,"literal ")) {1924 patch_method = BINARY_LITERAL_DEFLATED;1925 origlen =strtoul(buffer +8, NULL,10);1926}1927else1928return NULL;19291930 state->linenr++;1931 buffer += llen;1932while(1) {1933int byte_length, max_byte_length, newsize;1934 llen =linelen(buffer, size);1935 used += llen;1936 state->linenr++;1937if(llen ==1) {1938/* consume the blank line */1939 buffer++;1940 size--;1941break;1942}1943/*1944 * Minimum line is "A00000\n" which is 7-byte long,1945 * and the line length must be multiple of 5 plus 2.1946 */1947if((llen <7) || (llen-2) %5)1948goto corrupt;1949 max_byte_length = (llen -2) /5*4;1950 byte_length = *buffer;1951if('A'<= byte_length && byte_length <='Z')1952 byte_length = byte_length -'A'+1;1953else if('a'<= byte_length && byte_length <='z')1954 byte_length = byte_length -'a'+27;1955else1956goto corrupt;1957/* if the input length was not multiple of 4, we would1958 * have filler at the end but the filler should never1959 * exceed 3 bytes1960 */1961if(max_byte_length < byte_length ||1962 byte_length <= max_byte_length -4)1963goto corrupt;1964 newsize = hunk_size + byte_length;1965 data =xrealloc(data, newsize);1966if(decode_85(data + hunk_size, buffer +1, byte_length))1967goto corrupt;1968 hunk_size = newsize;1969 buffer += llen;1970 size -= llen;1971}19721973 frag =xcalloc(1,sizeof(*frag));1974 frag->patch =inflate_it(data, hunk_size, origlen);1975 frag->free_patch =1;1976if(!frag->patch)1977goto corrupt;1978free(data);1979 frag->size = origlen;1980*buf_p = buffer;1981*sz_p = size;1982*used_p = used;1983 frag->binary_patch_method = patch_method;1984return frag;19851986 corrupt:1987free(data);1988*status_p = -1;1989error(_("corrupt binary patch at line%d: %.*s"),1990 state->linenr-1, llen-1, buffer);1991return NULL;1992}19931994/*1995 * Returns:1996 * -1 in case of error,1997 * the length of the parsed binary patch otherwise1998 */1999static intparse_binary(struct apply_state *state,2000char*buffer,2001unsigned long size,2002struct patch *patch)2003{2004/*2005 * We have read "GIT binary patch\n"; what follows is a line2006 * that says the patch method (currently, either "literal" or2007 * "delta") and the length of data before deflating; a2008 * sequence of 'length-byte' followed by base-85 encoded data2009 * follows.2010 *2011 * When a binary patch is reversible, there is another binary2012 * hunk in the same format, starting with patch method (either2013 * "literal" or "delta") with the length of data, and a sequence2014 * of length-byte + base-85 encoded data, terminated with another2015 * empty line. This data, when applied to the postimage, produces2016 * the preimage.2017 */2018struct fragment *forward;2019struct fragment *reverse;2020int status;2021int used, used_1;20222023 forward =parse_binary_hunk(state, &buffer, &size, &status, &used);2024if(!forward && !status)2025/* there has to be one hunk (forward hunk) */2026returnerror(_("unrecognized binary patch at line%d"), state->linenr-1);2027if(status)2028/* otherwise we already gave an error message */2029return status;20302031 reverse =parse_binary_hunk(state, &buffer, &size, &status, &used_1);2032if(reverse)2033 used += used_1;2034else if(status) {2035/*2036 * Not having reverse hunk is not an error, but having2037 * a corrupt reverse hunk is.2038 */2039free((void*) forward->patch);2040free(forward);2041return status;2042}2043 forward->next = reverse;2044 patch->fragments = forward;2045 patch->is_binary =1;2046return used;2047}20482049static voidprefix_one(struct apply_state *state,char**name)2050{2051char*old_name = *name;2052if(!old_name)2053return;2054*name =prefix_filename(state->prefix, *name);2055free(old_name);2056}20572058static voidprefix_patch(struct apply_state *state,struct patch *p)2059{2060if(!state->prefix || p->is_toplevel_relative)2061return;2062prefix_one(state, &p->new_name);2063prefix_one(state, &p->old_name);2064}20652066/*2067 * include/exclude2068 */20692070static voidadd_name_limit(struct apply_state *state,2071const char*name,2072int exclude)2073{2074struct string_list_item *it;20752076 it =string_list_append(&state->limit_by_name, name);2077 it->util = exclude ? NULL : (void*)1;2078}20792080static intuse_patch(struct apply_state *state,struct patch *p)2081{2082const char*pathname = p->new_name ? p->new_name : p->old_name;2083int i;20842085/* Paths outside are not touched regardless of "--include" */2086if(state->prefix && *state->prefix) {2087const char*rest;2088if(!skip_prefix(pathname, state->prefix, &rest) || !*rest)2089return0;2090}20912092/* See if it matches any of exclude/include rule */2093for(i =0; i < state->limit_by_name.nr; i++) {2094struct string_list_item *it = &state->limit_by_name.items[i];2095if(!wildmatch(it->string, pathname,0))2096return(it->util != NULL);2097}20982099/*2100 * If we had any include, a path that does not match any rule is2101 * not used. Otherwise, we saw bunch of exclude rules (or none)2102 * and such a path is used.2103 */2104return!state->has_include;2105}21062107/*2108 * Read the patch text in "buffer" that extends for "size" bytes; stop2109 * reading after seeing a single patch (i.e. changes to a single file).2110 * Create fragments (i.e. patch hunks) and hang them to the given patch.2111 *2112 * Returns:2113 * -1 if no header was found or parse_binary() failed,2114 * -128 on another error,2115 * the number of bytes consumed otherwise,2116 * so that the caller can call us again for the next patch.2117 */2118static intparse_chunk(struct apply_state *state,char*buffer,unsigned long size,struct patch *patch)2119{2120int hdrsize, patchsize;2121int offset =find_header(state, buffer, size, &hdrsize, patch);21222123if(offset <0)2124return offset;21252126prefix_patch(state, patch);21272128if(!use_patch(state, patch))2129 patch->ws_rule =0;2130else2131 patch->ws_rule =whitespace_rule(patch->new_name2132? patch->new_name2133: patch->old_name);21342135 patchsize =parse_single_patch(state,2136 buffer + offset + hdrsize,2137 size - offset - hdrsize,2138 patch);21392140if(patchsize <0)2141return-128;21422143if(!patchsize) {2144static const char git_binary[] ="GIT binary patch\n";2145int hd = hdrsize + offset;2146unsigned long llen =linelen(buffer + hd, size - hd);21472148if(llen ==sizeof(git_binary) -1&&2149!memcmp(git_binary, buffer + hd, llen)) {2150int used;2151 state->linenr++;2152 used =parse_binary(state, buffer + hd + llen,2153 size - hd - llen, patch);2154if(used <0)2155return-1;2156if(used)2157 patchsize = used + llen;2158else2159 patchsize =0;2160}2161else if(!memcmp(" differ\n", buffer + hd + llen -8,8)) {2162static const char*binhdr[] = {2163"Binary files ",2164"Files ",2165 NULL,2166};2167int i;2168for(i =0; binhdr[i]; i++) {2169int len =strlen(binhdr[i]);2170if(len < size - hd &&2171!memcmp(binhdr[i], buffer + hd, len)) {2172 state->linenr++;2173 patch->is_binary =1;2174 patchsize = llen;2175break;2176}2177}2178}21792180/* Empty patch cannot be applied if it is a text patch2181 * without metadata change. A binary patch appears2182 * empty to us here.2183 */2184if((state->apply || state->check) &&2185(!patch->is_binary && !metadata_changes(patch))) {2186error(_("patch with only garbage at line%d"), state->linenr);2187return-128;2188}2189}21902191return offset + hdrsize + patchsize;2192}21932194static voidreverse_patches(struct patch *p)2195{2196for(; p; p = p->next) {2197struct fragment *frag = p->fragments;21982199SWAP(p->new_name, p->old_name);2200SWAP(p->new_mode, p->old_mode);2201SWAP(p->is_new, p->is_delete);2202SWAP(p->lines_added, p->lines_deleted);2203SWAP(p->old_sha1_prefix, p->new_sha1_prefix);22042205for(; frag; frag = frag->next) {2206SWAP(frag->newpos, frag->oldpos);2207SWAP(frag->newlines, frag->oldlines);2208}2209}2210}22112212static const char pluses[] =2213"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2214static const char minuses[]=2215"----------------------------------------------------------------------";22162217static voidshow_stats(struct apply_state *state,struct patch *patch)2218{2219struct strbuf qname = STRBUF_INIT;2220char*cp = patch->new_name ? patch->new_name : patch->old_name;2221int max, add, del;22222223quote_c_style(cp, &qname, NULL,0);22242225/*2226 * "scale" the filename2227 */2228 max = state->max_len;2229if(max >50)2230 max =50;22312232if(qname.len > max) {2233 cp =strchr(qname.buf + qname.len +3- max,'/');2234if(!cp)2235 cp = qname.buf + qname.len +3- max;2236strbuf_splice(&qname,0, cp - qname.buf,"...",3);2237}22382239if(patch->is_binary) {2240printf(" %-*s | Bin\n", max, qname.buf);2241strbuf_release(&qname);2242return;2243}22442245printf(" %-*s |", max, qname.buf);2246strbuf_release(&qname);22472248/*2249 * scale the add/delete2250 */2251 max = max + state->max_change >70?70- max : state->max_change;2252 add = patch->lines_added;2253 del = patch->lines_deleted;22542255if(state->max_change >0) {2256int total = ((add + del) * max + state->max_change /2) / state->max_change;2257 add = (add * max + state->max_change /2) / state->max_change;2258 del = total - add;2259}2260printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2261 add, pluses, del, minuses);2262}22632264static intread_old_data(struct stat *st,struct patch *patch,2265const char*path,struct strbuf *buf)2266{2267int conv_flags = patch->crlf_in_old ?2268 CONV_EOL_KEEP_CRLF : CONV_EOL_RENORMALIZE;2269switch(st->st_mode & S_IFMT) {2270case S_IFLNK:2271if(strbuf_readlink(buf, path, st->st_size) <0)2272returnerror(_("unable to read symlink%s"), path);2273return0;2274case S_IFREG:2275if(strbuf_read_file(buf, path, st->st_size) != st->st_size)2276returnerror(_("unable to open or read%s"), path);2277/*2278 * "git apply" without "--index/--cached" should never look2279 * at the index; the target file may not have been added to2280 * the index yet, and we may not even be in any Git repository.2281 * Pass NULL to convert_to_git() to stress this; the function2282 * should never look at the index when explicit crlf option2283 * is given.2284 */2285convert_to_git(NULL, path, buf->buf, buf->len, buf, conv_flags);2286return0;2287default:2288return-1;2289}2290}22912292/*2293 * Update the preimage, and the common lines in postimage,2294 * from buffer buf of length len. If postlen is 0 the postimage2295 * is updated in place, otherwise it's updated on a new buffer2296 * of length postlen2297 */22982299static voidupdate_pre_post_images(struct image *preimage,2300struct image *postimage,2301char*buf,2302size_t len,size_t postlen)2303{2304int i, ctx, reduced;2305char*new_buf, *old_buf, *fixed;2306struct image fixed_preimage;23072308/*2309 * Update the preimage with whitespace fixes. Note that we2310 * are not losing preimage->buf -- apply_one_fragment() will2311 * free "oldlines".2312 */2313prepare_image(&fixed_preimage, buf, len,1);2314assert(postlen2315? fixed_preimage.nr == preimage->nr2316: fixed_preimage.nr <= preimage->nr);2317for(i =0; i < fixed_preimage.nr; i++)2318 fixed_preimage.line[i].flag = preimage->line[i].flag;2319free(preimage->line_allocated);2320*preimage = fixed_preimage;23212322/*2323 * Adjust the common context lines in postimage. This can be2324 * done in-place when we are shrinking it with whitespace2325 * fixing, but needs a new buffer when ignoring whitespace or2326 * expanding leading tabs to spaces.2327 *2328 * We trust the caller to tell us if the update can be done2329 * in place (postlen==0) or not.2330 */2331 old_buf = postimage->buf;2332if(postlen)2333 new_buf = postimage->buf =xmalloc(postlen);2334else2335 new_buf = old_buf;2336 fixed = preimage->buf;23372338for(i = reduced = ctx =0; i < postimage->nr; i++) {2339size_t l_len = postimage->line[i].len;2340if(!(postimage->line[i].flag & LINE_COMMON)) {2341/* an added line -- no counterparts in preimage */2342memmove(new_buf, old_buf, l_len);2343 old_buf += l_len;2344 new_buf += l_len;2345continue;2346}23472348/* a common context -- skip it in the original postimage */2349 old_buf += l_len;23502351/* and find the corresponding one in the fixed preimage */2352while(ctx < preimage->nr &&2353!(preimage->line[ctx].flag & LINE_COMMON)) {2354 fixed += preimage->line[ctx].len;2355 ctx++;2356}23572358/*2359 * preimage is expected to run out, if the caller2360 * fixed addition of trailing blank lines.2361 */2362if(preimage->nr <= ctx) {2363 reduced++;2364continue;2365}23662367/* and copy it in, while fixing the line length */2368 l_len = preimage->line[ctx].len;2369memcpy(new_buf, fixed, l_len);2370 new_buf += l_len;2371 fixed += l_len;2372 postimage->line[i].len = l_len;2373 ctx++;2374}23752376if(postlen2377? postlen < new_buf - postimage->buf2378: postimage->len < new_buf - postimage->buf)2379die("BUG: caller miscounted postlen: asked%d, orig =%d, used =%d",2380(int)postlen, (int) postimage->len, (int)(new_buf - postimage->buf));23812382/* Fix the length of the whole thing */2383 postimage->len = new_buf - postimage->buf;2384 postimage->nr -= reduced;2385}23862387static intline_by_line_fuzzy_match(struct image *img,2388struct image *preimage,2389struct image *postimage,2390unsigned long current,2391int current_lno,2392int preimage_limit)2393{2394int i;2395size_t imgoff =0;2396size_t preoff =0;2397size_t postlen = postimage->len;2398size_t extra_chars;2399char*buf;2400char*preimage_eof;2401char*preimage_end;2402struct strbuf fixed;2403char*fixed_buf;2404size_t fixed_len;24052406for(i =0; i < preimage_limit; i++) {2407size_t prelen = preimage->line[i].len;2408size_t imglen = img->line[current_lno+i].len;24092410if(!fuzzy_matchlines(img->buf + current + imgoff, imglen,2411 preimage->buf + preoff, prelen))2412return0;2413if(preimage->line[i].flag & LINE_COMMON)2414 postlen += imglen - prelen;2415 imgoff += imglen;2416 preoff += prelen;2417}24182419/*2420 * Ok, the preimage matches with whitespace fuzz.2421 *2422 * imgoff now holds the true length of the target that2423 * matches the preimage before the end of the file.2424 *2425 * Count the number of characters in the preimage that fall2426 * beyond the end of the file and make sure that all of them2427 * are whitespace characters. (This can only happen if2428 * we are removing blank lines at the end of the file.)2429 */2430 buf = preimage_eof = preimage->buf + preoff;2431for( ; i < preimage->nr; i++)2432 preoff += preimage->line[i].len;2433 preimage_end = preimage->buf + preoff;2434for( ; buf < preimage_end; buf++)2435if(!isspace(*buf))2436return0;24372438/*2439 * Update the preimage and the common postimage context2440 * lines to use the same whitespace as the target.2441 * If whitespace is missing in the target (i.e.2442 * if the preimage extends beyond the end of the file),2443 * use the whitespace from the preimage.2444 */2445 extra_chars = preimage_end - preimage_eof;2446strbuf_init(&fixed, imgoff + extra_chars);2447strbuf_add(&fixed, img->buf + current, imgoff);2448strbuf_add(&fixed, preimage_eof, extra_chars);2449 fixed_buf =strbuf_detach(&fixed, &fixed_len);2450update_pre_post_images(preimage, postimage,2451 fixed_buf, fixed_len, postlen);2452return1;2453}24542455static intmatch_fragment(struct apply_state *state,2456struct image *img,2457struct image *preimage,2458struct image *postimage,2459unsigned long current,2460int current_lno,2461unsigned ws_rule,2462int match_beginning,int match_end)2463{2464int i;2465char*fixed_buf, *buf, *orig, *target;2466struct strbuf fixed;2467size_t fixed_len, postlen;2468int preimage_limit;24692470if(preimage->nr + current_lno <= img->nr) {2471/*2472 * The hunk falls within the boundaries of img.2473 */2474 preimage_limit = preimage->nr;2475if(match_end && (preimage->nr + current_lno != img->nr))2476return0;2477}else if(state->ws_error_action == correct_ws_error &&2478(ws_rule & WS_BLANK_AT_EOF)) {2479/*2480 * This hunk extends beyond the end of img, and we are2481 * removing blank lines at the end of the file. This2482 * many lines from the beginning of the preimage must2483 * match with img, and the remainder of the preimage2484 * must be blank.2485 */2486 preimage_limit = img->nr - current_lno;2487}else{2488/*2489 * The hunk extends beyond the end of the img and2490 * we are not removing blanks at the end, so we2491 * should reject the hunk at this position.2492 */2493return0;2494}24952496if(match_beginning && current_lno)2497return0;24982499/* Quick hash check */2500for(i =0; i < preimage_limit; i++)2501if((img->line[current_lno + i].flag & LINE_PATCHED) ||2502(preimage->line[i].hash != img->line[current_lno + i].hash))2503return0;25042505if(preimage_limit == preimage->nr) {2506/*2507 * Do we have an exact match? If we were told to match2508 * at the end, size must be exactly at current+fragsize,2509 * otherwise current+fragsize must be still within the preimage,2510 * and either case, the old piece should match the preimage2511 * exactly.2512 */2513if((match_end2514? (current + preimage->len == img->len)2515: (current + preimage->len <= img->len)) &&2516!memcmp(img->buf + current, preimage->buf, preimage->len))2517return1;2518}else{2519/*2520 * The preimage extends beyond the end of img, so2521 * there cannot be an exact match.2522 *2523 * There must be one non-blank context line that match2524 * a line before the end of img.2525 */2526char*buf_end;25272528 buf = preimage->buf;2529 buf_end = buf;2530for(i =0; i < preimage_limit; i++)2531 buf_end += preimage->line[i].len;25322533for( ; buf < buf_end; buf++)2534if(!isspace(*buf))2535break;2536if(buf == buf_end)2537return0;2538}25392540/*2541 * No exact match. If we are ignoring whitespace, run a line-by-line2542 * fuzzy matching. We collect all the line length information because2543 * we need it to adjust whitespace if we match.2544 */2545if(state->ws_ignore_action == ignore_ws_change)2546returnline_by_line_fuzzy_match(img, preimage, postimage,2547 current, current_lno, preimage_limit);25482549if(state->ws_error_action != correct_ws_error)2550return0;25512552/*2553 * The hunk does not apply byte-by-byte, but the hash says2554 * it might with whitespace fuzz. We weren't asked to2555 * ignore whitespace, we were asked to correct whitespace2556 * errors, so let's try matching after whitespace correction.2557 *2558 * While checking the preimage against the target, whitespace2559 * errors in both fixed, we count how large the corresponding2560 * postimage needs to be. The postimage prepared by2561 * apply_one_fragment() has whitespace errors fixed on added2562 * lines already, but the common lines were propagated as-is,2563 * which may become longer when their whitespace errors are2564 * fixed.2565 */25662567/* First count added lines in postimage */2568 postlen =0;2569for(i =0; i < postimage->nr; i++) {2570if(!(postimage->line[i].flag & LINE_COMMON))2571 postlen += postimage->line[i].len;2572}25732574/*2575 * The preimage may extend beyond the end of the file,2576 * but in this loop we will only handle the part of the2577 * preimage that falls within the file.2578 */2579strbuf_init(&fixed, preimage->len +1);2580 orig = preimage->buf;2581 target = img->buf + current;2582for(i =0; i < preimage_limit; i++) {2583size_t oldlen = preimage->line[i].len;2584size_t tgtlen = img->line[current_lno + i].len;2585size_t fixstart = fixed.len;2586struct strbuf tgtfix;2587int match;25882589/* Try fixing the line in the preimage */2590ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);25912592/* Try fixing the line in the target */2593strbuf_init(&tgtfix, tgtlen);2594ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);25952596/*2597 * If they match, either the preimage was based on2598 * a version before our tree fixed whitespace breakage,2599 * or we are lacking a whitespace-fix patch the tree2600 * the preimage was based on already had (i.e. target2601 * has whitespace breakage, the preimage doesn't).2602 * In either case, we are fixing the whitespace breakages2603 * so we might as well take the fix together with their2604 * real change.2605 */2606 match = (tgtfix.len == fixed.len - fixstart &&2607!memcmp(tgtfix.buf, fixed.buf + fixstart,2608 fixed.len - fixstart));26092610/* Add the length if this is common with the postimage */2611if(preimage->line[i].flag & LINE_COMMON)2612 postlen += tgtfix.len;26132614strbuf_release(&tgtfix);2615if(!match)2616goto unmatch_exit;26172618 orig += oldlen;2619 target += tgtlen;2620}262126222623/*2624 * Now handle the lines in the preimage that falls beyond the2625 * end of the file (if any). They will only match if they are2626 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2627 * false).2628 */2629for( ; i < preimage->nr; i++) {2630size_t fixstart = fixed.len;/* start of the fixed preimage */2631size_t oldlen = preimage->line[i].len;2632int j;26332634/* Try fixing the line in the preimage */2635ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);26362637for(j = fixstart; j < fixed.len; j++)2638if(!isspace(fixed.buf[j]))2639goto unmatch_exit;26402641 orig += oldlen;2642}26432644/*2645 * Yes, the preimage is based on an older version that still2646 * has whitespace breakages unfixed, and fixing them makes the2647 * hunk match. Update the context lines in the postimage.2648 */2649 fixed_buf =strbuf_detach(&fixed, &fixed_len);2650if(postlen < postimage->len)2651 postlen =0;2652update_pre_post_images(preimage, postimage,2653 fixed_buf, fixed_len, postlen);2654return1;26552656 unmatch_exit:2657strbuf_release(&fixed);2658return0;2659}26602661static intfind_pos(struct apply_state *state,2662struct image *img,2663struct image *preimage,2664struct image *postimage,2665int line,2666unsigned ws_rule,2667int match_beginning,int match_end)2668{2669int i;2670unsigned long backwards, forwards, current;2671int backwards_lno, forwards_lno, current_lno;26722673/*2674 * If match_beginning or match_end is specified, there is no2675 * point starting from a wrong line that will never match and2676 * wander around and wait for a match at the specified end.2677 */2678if(match_beginning)2679 line =0;2680else if(match_end)2681 line = img->nr - preimage->nr;26822683/*2684 * Because the comparison is unsigned, the following test2685 * will also take care of a negative line number that can2686 * result when match_end and preimage is larger than the target.2687 */2688if((size_t) line > img->nr)2689 line = img->nr;26902691 current =0;2692for(i =0; i < line; i++)2693 current += img->line[i].len;26942695/*2696 * There's probably some smart way to do this, but I'll leave2697 * that to the smart and beautiful people. I'm simple and stupid.2698 */2699 backwards = current;2700 backwards_lno = line;2701 forwards = current;2702 forwards_lno = line;2703 current_lno = line;27042705for(i =0; ; i++) {2706if(match_fragment(state, img, preimage, postimage,2707 current, current_lno, ws_rule,2708 match_beginning, match_end))2709return current_lno;27102711 again:2712if(backwards_lno ==0&& forwards_lno == img->nr)2713break;27142715if(i &1) {2716if(backwards_lno ==0) {2717 i++;2718goto again;2719}2720 backwards_lno--;2721 backwards -= img->line[backwards_lno].len;2722 current = backwards;2723 current_lno = backwards_lno;2724}else{2725if(forwards_lno == img->nr) {2726 i++;2727goto again;2728}2729 forwards += img->line[forwards_lno].len;2730 forwards_lno++;2731 current = forwards;2732 current_lno = forwards_lno;2733}27342735}2736return-1;2737}27382739static voidremove_first_line(struct image *img)2740{2741 img->buf += img->line[0].len;2742 img->len -= img->line[0].len;2743 img->line++;2744 img->nr--;2745}27462747static voidremove_last_line(struct image *img)2748{2749 img->len -= img->line[--img->nr].len;2750}27512752/*2753 * The change from "preimage" and "postimage" has been found to2754 * apply at applied_pos (counts in line numbers) in "img".2755 * Update "img" to remove "preimage" and replace it with "postimage".2756 */2757static voidupdate_image(struct apply_state *state,2758struct image *img,2759int applied_pos,2760struct image *preimage,2761struct image *postimage)2762{2763/*2764 * remove the copy of preimage at offset in img2765 * and replace it with postimage2766 */2767int i, nr;2768size_t remove_count, insert_count, applied_at =0;2769char*result;2770int preimage_limit;27712772/*2773 * If we are removing blank lines at the end of img,2774 * the preimage may extend beyond the end.2775 * If that is the case, we must be careful only to2776 * remove the part of the preimage that falls within2777 * the boundaries of img. Initialize preimage_limit2778 * to the number of lines in the preimage that falls2779 * within the boundaries.2780 */2781 preimage_limit = preimage->nr;2782if(preimage_limit > img->nr - applied_pos)2783 preimage_limit = img->nr - applied_pos;27842785for(i =0; i < applied_pos; i++)2786 applied_at += img->line[i].len;27872788 remove_count =0;2789for(i =0; i < preimage_limit; i++)2790 remove_count += img->line[applied_pos + i].len;2791 insert_count = postimage->len;27922793/* Adjust the contents */2794 result =xmalloc(st_add3(st_sub(img->len, remove_count), insert_count,1));2795memcpy(result, img->buf, applied_at);2796memcpy(result + applied_at, postimage->buf, postimage->len);2797memcpy(result + applied_at + postimage->len,2798 img->buf + (applied_at + remove_count),2799 img->len - (applied_at + remove_count));2800free(img->buf);2801 img->buf = result;2802 img->len += insert_count - remove_count;2803 result[img->len] ='\0';28042805/* Adjust the line table */2806 nr = img->nr + postimage->nr - preimage_limit;2807if(preimage_limit < postimage->nr) {2808/*2809 * NOTE: this knows that we never call remove_first_line()2810 * on anything other than pre/post image.2811 */2812REALLOC_ARRAY(img->line, nr);2813 img->line_allocated = img->line;2814}2815if(preimage_limit != postimage->nr)2816MOVE_ARRAY(img->line + applied_pos + postimage->nr,2817 img->line + applied_pos + preimage_limit,2818 img->nr - (applied_pos + preimage_limit));2819COPY_ARRAY(img->line + applied_pos, postimage->line, postimage->nr);2820if(!state->allow_overlap)2821for(i =0; i < postimage->nr; i++)2822 img->line[applied_pos + i].flag |= LINE_PATCHED;2823 img->nr = nr;2824}28252826/*2827 * Use the patch-hunk text in "frag" to prepare two images (preimage and2828 * postimage) for the hunk. Find lines that match "preimage" in "img" and2829 * replace the part of "img" with "postimage" text.2830 */2831static intapply_one_fragment(struct apply_state *state,2832struct image *img,struct fragment *frag,2833int inaccurate_eof,unsigned ws_rule,2834int nth_fragment)2835{2836int match_beginning, match_end;2837const char*patch = frag->patch;2838int size = frag->size;2839char*old, *oldlines;2840struct strbuf newlines;2841int new_blank_lines_at_end =0;2842int found_new_blank_lines_at_end =0;2843int hunk_linenr = frag->linenr;2844unsigned long leading, trailing;2845int pos, applied_pos;2846struct image preimage;2847struct image postimage;28482849memset(&preimage,0,sizeof(preimage));2850memset(&postimage,0,sizeof(postimage));2851 oldlines =xmalloc(size);2852strbuf_init(&newlines, size);28532854 old = oldlines;2855while(size >0) {2856char first;2857int len =linelen(patch, size);2858int plen;2859int added_blank_line =0;2860int is_blank_context =0;2861size_t start;28622863if(!len)2864break;28652866/*2867 * "plen" is how much of the line we should use for2868 * the actual patch data. Normally we just remove the2869 * first character on the line, but if the line is2870 * followed by "\ No newline", then we also remove the2871 * last one (which is the newline, of course).2872 */2873 plen = len -1;2874if(len < size && patch[len] =='\\')2875 plen--;2876 first = *patch;2877if(state->apply_in_reverse) {2878if(first =='-')2879 first ='+';2880else if(first =='+')2881 first ='-';2882}28832884switch(first) {2885case'\n':2886/* Newer GNU diff, empty context line */2887if(plen <0)2888/* ... followed by '\No newline'; nothing */2889break;2890*old++ ='\n';2891strbuf_addch(&newlines,'\n');2892add_line_info(&preimage,"\n",1, LINE_COMMON);2893add_line_info(&postimage,"\n",1, LINE_COMMON);2894 is_blank_context =1;2895break;2896case' ':2897if(plen && (ws_rule & WS_BLANK_AT_EOF) &&2898ws_blank_line(patch +1, plen, ws_rule))2899 is_blank_context =1;2900/* fallthrough */2901case'-':2902memcpy(old, patch +1, plen);2903add_line_info(&preimage, old, plen,2904(first ==' '? LINE_COMMON :0));2905 old += plen;2906if(first =='-')2907break;2908/* fallthrough */2909case'+':2910/* --no-add does not add new lines */2911if(first =='+'&& state->no_add)2912break;29132914 start = newlines.len;2915if(first !='+'||2916!state->whitespace_error ||2917 state->ws_error_action != correct_ws_error) {2918strbuf_add(&newlines, patch +1, plen);2919}2920else{2921ws_fix_copy(&newlines, patch +1, plen, ws_rule, &state->applied_after_fixing_ws);2922}2923add_line_info(&postimage, newlines.buf + start, newlines.len - start,2924(first =='+'?0: LINE_COMMON));2925if(first =='+'&&2926(ws_rule & WS_BLANK_AT_EOF) &&2927ws_blank_line(patch +1, plen, ws_rule))2928 added_blank_line =1;2929break;2930case'@':case'\\':2931/* Ignore it, we already handled it */2932break;2933default:2934if(state->apply_verbosity > verbosity_normal)2935error(_("invalid start of line: '%c'"), first);2936 applied_pos = -1;2937goto out;2938}2939if(added_blank_line) {2940if(!new_blank_lines_at_end)2941 found_new_blank_lines_at_end = hunk_linenr;2942 new_blank_lines_at_end++;2943}2944else if(is_blank_context)2945;2946else2947 new_blank_lines_at_end =0;2948 patch += len;2949 size -= len;2950 hunk_linenr++;2951}2952if(inaccurate_eof &&2953 old > oldlines && old[-1] =='\n'&&2954 newlines.len >0&& newlines.buf[newlines.len -1] =='\n') {2955 old--;2956strbuf_setlen(&newlines, newlines.len -1);2957 preimage.line_allocated[preimage.nr -1].len--;2958 postimage.line_allocated[postimage.nr -1].len--;2959}29602961 leading = frag->leading;2962 trailing = frag->trailing;29632964/*2965 * A hunk to change lines at the beginning would begin with2966 * @@ -1,L +N,M @@2967 * but we need to be careful. -U0 that inserts before the second2968 * line also has this pattern.2969 *2970 * And a hunk to add to an empty file would begin with2971 * @@ -0,0 +N,M @@2972 *2973 * In other words, a hunk that is (frag->oldpos <= 1) with or2974 * without leading context must match at the beginning.2975 */2976 match_beginning = (!frag->oldpos ||2977(frag->oldpos ==1&& !state->unidiff_zero));29782979/*2980 * A hunk without trailing lines must match at the end.2981 * However, we simply cannot tell if a hunk must match end2982 * from the lack of trailing lines if the patch was generated2983 * with unidiff without any context.2984 */2985 match_end = !state->unidiff_zero && !trailing;29862987 pos = frag->newpos ? (frag->newpos -1) :0;2988 preimage.buf = oldlines;2989 preimage.len = old - oldlines;2990 postimage.buf = newlines.buf;2991 postimage.len = newlines.len;2992 preimage.line = preimage.line_allocated;2993 postimage.line = postimage.line_allocated;29942995for(;;) {29962997 applied_pos =find_pos(state, img, &preimage, &postimage, pos,2998 ws_rule, match_beginning, match_end);29993000if(applied_pos >=0)3001break;30023003/* Am I at my context limits? */3004if((leading <= state->p_context) && (trailing <= state->p_context))3005break;3006if(match_beginning || match_end) {3007 match_beginning = match_end =0;3008continue;3009}30103011/*3012 * Reduce the number of context lines; reduce both3013 * leading and trailing if they are equal otherwise3014 * just reduce the larger context.3015 */3016if(leading >= trailing) {3017remove_first_line(&preimage);3018remove_first_line(&postimage);3019 pos--;3020 leading--;3021}3022if(trailing > leading) {3023remove_last_line(&preimage);3024remove_last_line(&postimage);3025 trailing--;3026}3027}30283029if(applied_pos >=0) {3030if(new_blank_lines_at_end &&3031 preimage.nr + applied_pos >= img->nr &&3032(ws_rule & WS_BLANK_AT_EOF) &&3033 state->ws_error_action != nowarn_ws_error) {3034record_ws_error(state, WS_BLANK_AT_EOF,"+",1,3035 found_new_blank_lines_at_end);3036if(state->ws_error_action == correct_ws_error) {3037while(new_blank_lines_at_end--)3038remove_last_line(&postimage);3039}3040/*3041 * We would want to prevent write_out_results()3042 * from taking place in apply_patch() that follows3043 * the callchain led us here, which is:3044 * apply_patch->check_patch_list->check_patch->3045 * apply_data->apply_fragments->apply_one_fragment3046 */3047if(state->ws_error_action == die_on_ws_error)3048 state->apply =0;3049}30503051if(state->apply_verbosity > verbosity_normal && applied_pos != pos) {3052int offset = applied_pos - pos;3053if(state->apply_in_reverse)3054 offset =0- offset;3055fprintf_ln(stderr,3056Q_("Hunk #%dsucceeded at%d(offset%dline).",3057"Hunk #%dsucceeded at%d(offset%dlines).",3058 offset),3059 nth_fragment, applied_pos +1, offset);3060}30613062/*3063 * Warn if it was necessary to reduce the number3064 * of context lines.3065 */3066if((leading != frag->leading ||3067 trailing != frag->trailing) && state->apply_verbosity > verbosity_silent)3068fprintf_ln(stderr,_("Context reduced to (%ld/%ld)"3069" to apply fragment at%d"),3070 leading, trailing, applied_pos+1);3071update_image(state, img, applied_pos, &preimage, &postimage);3072}else{3073if(state->apply_verbosity > verbosity_normal)3074error(_("while searching for:\n%.*s"),3075(int)(old - oldlines), oldlines);3076}30773078out:3079free(oldlines);3080strbuf_release(&newlines);3081free(preimage.line_allocated);3082free(postimage.line_allocated);30833084return(applied_pos <0);3085}30863087static intapply_binary_fragment(struct apply_state *state,3088struct image *img,3089struct patch *patch)3090{3091struct fragment *fragment = patch->fragments;3092unsigned long len;3093void*dst;30943095if(!fragment)3096returnerror(_("missing binary patch data for '%s'"),3097 patch->new_name ?3098 patch->new_name :3099 patch->old_name);31003101/* Binary patch is irreversible without the optional second hunk */3102if(state->apply_in_reverse) {3103if(!fragment->next)3104returnerror(_("cannot reverse-apply a binary patch "3105"without the reverse hunk to '%s'"),3106 patch->new_name3107? patch->new_name : patch->old_name);3108 fragment = fragment->next;3109}3110switch(fragment->binary_patch_method) {3111case BINARY_DELTA_DEFLATED:3112 dst =patch_delta(img->buf, img->len, fragment->patch,3113 fragment->size, &len);3114if(!dst)3115return-1;3116clear_image(img);3117 img->buf = dst;3118 img->len = len;3119return0;3120case BINARY_LITERAL_DEFLATED:3121clear_image(img);3122 img->len = fragment->size;3123 img->buf =xmemdupz(fragment->patch, img->len);3124return0;3125}3126return-1;3127}31283129/*3130 * Replace "img" with the result of applying the binary patch.3131 * The binary patch data itself in patch->fragment is still kept3132 * but the preimage prepared by the caller in "img" is freed here3133 * or in the helper function apply_binary_fragment() this calls.3134 */3135static intapply_binary(struct apply_state *state,3136struct image *img,3137struct patch *patch)3138{3139const char*name = patch->old_name ? patch->old_name : patch->new_name;3140struct object_id oid;31413142/*3143 * For safety, we require patch index line to contain3144 * full 40-byte textual SHA1 for old and new, at least for now.3145 */3146if(strlen(patch->old_sha1_prefix) !=40||3147strlen(patch->new_sha1_prefix) !=40||3148get_oid_hex(patch->old_sha1_prefix, &oid) ||3149get_oid_hex(patch->new_sha1_prefix, &oid))3150returnerror(_("cannot apply binary patch to '%s' "3151"without full index line"), name);31523153if(patch->old_name) {3154/*3155 * See if the old one matches what the patch3156 * applies to.3157 */3158hash_object_file(img->buf, img->len, blob_type, &oid);3159if(strcmp(oid_to_hex(&oid), patch->old_sha1_prefix))3160returnerror(_("the patch applies to '%s' (%s), "3161"which does not match the "3162"current contents."),3163 name,oid_to_hex(&oid));3164}3165else{3166/* Otherwise, the old one must be empty. */3167if(img->len)3168returnerror(_("the patch applies to an empty "3169"'%s' but it is not empty"), name);3170}31713172get_oid_hex(patch->new_sha1_prefix, &oid);3173if(is_null_oid(&oid)) {3174clear_image(img);3175return0;/* deletion patch */3176}31773178if(has_sha1_file(oid.hash)) {3179/* We already have the postimage */3180enum object_type type;3181unsigned long size;3182char*result;31833184 result =read_object_file(&oid, &type, &size);3185if(!result)3186returnerror(_("the necessary postimage%sfor "3187"'%s' cannot be read"),3188 patch->new_sha1_prefix, name);3189clear_image(img);3190 img->buf = result;3191 img->len = size;3192}else{3193/*3194 * We have verified buf matches the preimage;3195 * apply the patch data to it, which is stored3196 * in the patch->fragments->{patch,size}.3197 */3198if(apply_binary_fragment(state, img, patch))3199returnerror(_("binary patch does not apply to '%s'"),3200 name);32013202/* verify that the result matches */3203hash_object_file(img->buf, img->len, blob_type, &oid);3204if(strcmp(oid_to_hex(&oid), patch->new_sha1_prefix))3205returnerror(_("binary patch to '%s' creates incorrect result (expecting%s, got%s)"),3206 name, patch->new_sha1_prefix,oid_to_hex(&oid));3207}32083209return0;3210}32113212static intapply_fragments(struct apply_state *state,struct image *img,struct patch *patch)3213{3214struct fragment *frag = patch->fragments;3215const char*name = patch->old_name ? patch->old_name : patch->new_name;3216unsigned ws_rule = patch->ws_rule;3217unsigned inaccurate_eof = patch->inaccurate_eof;3218int nth =0;32193220if(patch->is_binary)3221returnapply_binary(state, img, patch);32223223while(frag) {3224 nth++;3225if(apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) {3226error(_("patch failed:%s:%ld"), name, frag->oldpos);3227if(!state->apply_with_reject)3228return-1;3229 frag->rejected =1;3230}3231 frag = frag->next;3232}3233return0;3234}32353236static intread_blob_object(struct strbuf *buf,const struct object_id *oid,unsigned mode)3237{3238if(S_ISGITLINK(mode)) {3239strbuf_grow(buf,100);3240strbuf_addf(buf,"Subproject commit%s\n",oid_to_hex(oid));3241}else{3242enum object_type type;3243unsigned long sz;3244char*result;32453246 result =read_object_file(oid, &type, &sz);3247if(!result)3248return-1;3249/* XXX read_sha1_file NUL-terminates */3250strbuf_attach(buf, result, sz, sz +1);3251}3252return0;3253}32543255static intread_file_or_gitlink(const struct cache_entry *ce,struct strbuf *buf)3256{3257if(!ce)3258return0;3259returnread_blob_object(buf, &ce->oid, ce->ce_mode);3260}32613262static struct patch *in_fn_table(struct apply_state *state,const char*name)3263{3264struct string_list_item *item;32653266if(name == NULL)3267return NULL;32683269 item =string_list_lookup(&state->fn_table, name);3270if(item != NULL)3271return(struct patch *)item->util;32723273return NULL;3274}32753276/*3277 * item->util in the filename table records the status of the path.3278 * Usually it points at a patch (whose result records the contents3279 * of it after applying it), but it could be PATH_WAS_DELETED for a3280 * path that a previously applied patch has already removed, or3281 * PATH_TO_BE_DELETED for a path that a later patch would remove.3282 *3283 * The latter is needed to deal with a case where two paths A and B3284 * are swapped by first renaming A to B and then renaming B to A;3285 * moving A to B should not be prevented due to presence of B as we3286 * will remove it in a later patch.3287 */3288#define PATH_TO_BE_DELETED ((struct patch *) -2)3289#define PATH_WAS_DELETED ((struct patch *) -1)32903291static intto_be_deleted(struct patch *patch)3292{3293return patch == PATH_TO_BE_DELETED;3294}32953296static intwas_deleted(struct patch *patch)3297{3298return patch == PATH_WAS_DELETED;3299}33003301static voidadd_to_fn_table(struct apply_state *state,struct patch *patch)3302{3303struct string_list_item *item;33043305/*3306 * Always add new_name unless patch is a deletion3307 * This should cover the cases for normal diffs,3308 * file creations and copies3309 */3310if(patch->new_name != NULL) {3311 item =string_list_insert(&state->fn_table, patch->new_name);3312 item->util = patch;3313}33143315/*3316 * store a failure on rename/deletion cases because3317 * later chunks shouldn't patch old names3318 */3319if((patch->new_name == NULL) || (patch->is_rename)) {3320 item =string_list_insert(&state->fn_table, patch->old_name);3321 item->util = PATH_WAS_DELETED;3322}3323}33243325static voidprepare_fn_table(struct apply_state *state,struct patch *patch)3326{3327/*3328 * store information about incoming file deletion3329 */3330while(patch) {3331if((patch->new_name == NULL) || (patch->is_rename)) {3332struct string_list_item *item;3333 item =string_list_insert(&state->fn_table, patch->old_name);3334 item->util = PATH_TO_BE_DELETED;3335}3336 patch = patch->next;3337}3338}33393340static intcheckout_target(struct index_state *istate,3341struct cache_entry *ce,struct stat *st)3342{3343struct checkout costate = CHECKOUT_INIT;33443345 costate.refresh_cache =1;3346 costate.istate = istate;3347if(checkout_entry(ce, &costate, NULL) ||lstat(ce->name, st))3348returnerror(_("cannot checkout%s"), ce->name);3349return0;3350}33513352static struct patch *previous_patch(struct apply_state *state,3353struct patch *patch,3354int*gone)3355{3356struct patch *previous;33573358*gone =0;3359if(patch->is_copy || patch->is_rename)3360return NULL;/* "git" patches do not depend on the order */33613362 previous =in_fn_table(state, patch->old_name);3363if(!previous)3364return NULL;33653366if(to_be_deleted(previous))3367return NULL;/* the deletion hasn't happened yet */33683369if(was_deleted(previous))3370*gone =1;33713372return previous;3373}33743375static intverify_index_match(const struct cache_entry *ce,struct stat *st)3376{3377if(S_ISGITLINK(ce->ce_mode)) {3378if(!S_ISDIR(st->st_mode))3379return-1;3380return0;3381}3382returnce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3383}33843385#define SUBMODULE_PATCH_WITHOUT_INDEX 133863387static intload_patch_target(struct apply_state *state,3388struct strbuf *buf,3389const struct cache_entry *ce,3390struct stat *st,3391struct patch *patch,3392const char*name,3393unsigned expected_mode)3394{3395if(state->cached || state->check_index) {3396if(read_file_or_gitlink(ce, buf))3397returnerror(_("failed to read%s"), name);3398}else if(name) {3399if(S_ISGITLINK(expected_mode)) {3400if(ce)3401returnread_file_or_gitlink(ce, buf);3402else3403return SUBMODULE_PATCH_WITHOUT_INDEX;3404}else if(has_symlink_leading_path(name,strlen(name))) {3405returnerror(_("reading from '%s' beyond a symbolic link"), name);3406}else{3407if(read_old_data(st, patch, name, buf))3408returnerror(_("failed to read%s"), name);3409}3410}3411return0;3412}34133414/*3415 * We are about to apply "patch"; populate the "image" with the3416 * current version we have, from the working tree or from the index,3417 * depending on the situation e.g. --cached/--index. If we are3418 * applying a non-git patch that incrementally updates the tree,3419 * we read from the result of a previous diff.3420 */3421static intload_preimage(struct apply_state *state,3422struct image *image,3423struct patch *patch,struct stat *st,3424const struct cache_entry *ce)3425{3426struct strbuf buf = STRBUF_INIT;3427size_t len;3428char*img;3429struct patch *previous;3430int status;34313432 previous =previous_patch(state, patch, &status);3433if(status)3434returnerror(_("path%shas been renamed/deleted"),3435 patch->old_name);3436if(previous) {3437/* We have a patched copy in memory; use that. */3438strbuf_add(&buf, previous->result, previous->resultsize);3439}else{3440 status =load_patch_target(state, &buf, ce, st, patch,3441 patch->old_name, patch->old_mode);3442if(status <0)3443return status;3444else if(status == SUBMODULE_PATCH_WITHOUT_INDEX) {3445/*3446 * There is no way to apply subproject3447 * patch without looking at the index.3448 * NEEDSWORK: shouldn't this be flagged3449 * as an error???3450 */3451free_fragment_list(patch->fragments);3452 patch->fragments = NULL;3453}else if(status) {3454returnerror(_("failed to read%s"), patch->old_name);3455}3456}34573458 img =strbuf_detach(&buf, &len);3459prepare_image(image, img, len, !patch->is_binary);3460return0;3461}34623463static intthree_way_merge(struct image *image,3464char*path,3465const struct object_id *base,3466const struct object_id *ours,3467const struct object_id *theirs)3468{3469 mmfile_t base_file, our_file, their_file;3470 mmbuffer_t result = { NULL };3471int status;34723473read_mmblob(&base_file, base);3474read_mmblob(&our_file, ours);3475read_mmblob(&their_file, theirs);3476 status =ll_merge(&result, path,3477&base_file,"base",3478&our_file,"ours",3479&their_file,"theirs", NULL);3480free(base_file.ptr);3481free(our_file.ptr);3482free(their_file.ptr);3483if(status <0|| !result.ptr) {3484free(result.ptr);3485return-1;3486}3487clear_image(image);3488 image->buf = result.ptr;3489 image->len = result.size;34903491return status;3492}34933494/*3495 * When directly falling back to add/add three-way merge, we read from3496 * the current contents of the new_name. In no cases other than that3497 * this function will be called.3498 */3499static intload_current(struct apply_state *state,3500struct image *image,3501struct patch *patch)3502{3503struct strbuf buf = STRBUF_INIT;3504int status, pos;3505size_t len;3506char*img;3507struct stat st;3508struct cache_entry *ce;3509char*name = patch->new_name;3510unsigned mode = patch->new_mode;35113512if(!patch->is_new)3513die("BUG: patch to%sis not a creation", patch->old_name);35143515 pos =cache_name_pos(name,strlen(name));3516if(pos <0)3517returnerror(_("%s: does not exist in index"), name);3518 ce = active_cache[pos];3519if(lstat(name, &st)) {3520if(errno != ENOENT)3521returnerror_errno("%s", name);3522if(checkout_target(&the_index, ce, &st))3523return-1;3524}3525if(verify_index_match(ce, &st))3526returnerror(_("%s: does not match index"), name);35273528 status =load_patch_target(state, &buf, ce, &st, patch, name, mode);3529if(status <0)3530return status;3531else if(status)3532return-1;3533 img =strbuf_detach(&buf, &len);3534prepare_image(image, img, len, !patch->is_binary);3535return0;3536}35373538static inttry_threeway(struct apply_state *state,3539struct image *image,3540struct patch *patch,3541struct stat *st,3542const struct cache_entry *ce)3543{3544struct object_id pre_oid, post_oid, our_oid;3545struct strbuf buf = STRBUF_INIT;3546size_t len;3547int status;3548char*img;3549struct image tmp_image;35503551/* No point falling back to 3-way merge in these cases */3552if(patch->is_delete ||3553S_ISGITLINK(patch->old_mode) ||S_ISGITLINK(patch->new_mode))3554return-1;35553556/* Preimage the patch was prepared for */3557if(patch->is_new)3558write_object_file("",0, blob_type, &pre_oid);3559else if(get_oid(patch->old_sha1_prefix, &pre_oid) ||3560read_blob_object(&buf, &pre_oid, patch->old_mode))3561returnerror(_("repository lacks the necessary blob to fall back on 3-way merge."));35623563if(state->apply_verbosity > verbosity_silent)3564fprintf(stderr,_("Falling back to three-way merge...\n"));35653566 img =strbuf_detach(&buf, &len);3567prepare_image(&tmp_image, img, len,1);3568/* Apply the patch to get the post image */3569if(apply_fragments(state, &tmp_image, patch) <0) {3570clear_image(&tmp_image);3571return-1;3572}3573/* post_oid is theirs */3574write_object_file(tmp_image.buf, tmp_image.len, blob_type, &post_oid);3575clear_image(&tmp_image);35763577/* our_oid is ours */3578if(patch->is_new) {3579if(load_current(state, &tmp_image, patch))3580returnerror(_("cannot read the current contents of '%s'"),3581 patch->new_name);3582}else{3583if(load_preimage(state, &tmp_image, patch, st, ce))3584returnerror(_("cannot read the current contents of '%s'"),3585 patch->old_name);3586}3587write_object_file(tmp_image.buf, tmp_image.len, blob_type, &our_oid);3588clear_image(&tmp_image);35893590/* in-core three-way merge between post and our using pre as base */3591 status =three_way_merge(image, patch->new_name,3592&pre_oid, &our_oid, &post_oid);3593if(status <0) {3594if(state->apply_verbosity > verbosity_silent)3595fprintf(stderr,3596_("Failed to fall back on three-way merge...\n"));3597return status;3598}35993600if(status) {3601 patch->conflicted_threeway =1;3602if(patch->is_new)3603oidclr(&patch->threeway_stage[0]);3604else3605oidcpy(&patch->threeway_stage[0], &pre_oid);3606oidcpy(&patch->threeway_stage[1], &our_oid);3607oidcpy(&patch->threeway_stage[2], &post_oid);3608if(state->apply_verbosity > verbosity_silent)3609fprintf(stderr,3610_("Applied patch to '%s' with conflicts.\n"),3611 patch->new_name);3612}else{3613if(state->apply_verbosity > verbosity_silent)3614fprintf(stderr,3615_("Applied patch to '%s' cleanly.\n"),3616 patch->new_name);3617}3618return0;3619}36203621static intapply_data(struct apply_state *state,struct patch *patch,3622struct stat *st,const struct cache_entry *ce)3623{3624struct image image;36253626if(load_preimage(state, &image, patch, st, ce) <0)3627return-1;36283629if(patch->direct_to_threeway ||3630apply_fragments(state, &image, patch) <0) {3631/* Note: with --reject, apply_fragments() returns 0 */3632if(!state->threeway ||try_threeway(state, &image, patch, st, ce) <0)3633return-1;3634}3635 patch->result = image.buf;3636 patch->resultsize = image.len;3637add_to_fn_table(state, patch);3638free(image.line_allocated);36393640if(0< patch->is_delete && patch->resultsize)3641returnerror(_("removal patch leaves file contents"));36423643return0;3644}36453646/*3647 * If "patch" that we are looking at modifies or deletes what we have,3648 * we would want it not to lose any local modification we have, either3649 * in the working tree or in the index.3650 *3651 * This also decides if a non-git patch is a creation patch or a3652 * modification to an existing empty file. We do not check the state3653 * of the current tree for a creation patch in this function; the caller3654 * check_patch() separately makes sure (and errors out otherwise) that3655 * the path the patch creates does not exist in the current tree.3656 */3657static intcheck_preimage(struct apply_state *state,3658struct patch *patch,3659struct cache_entry **ce,3660struct stat *st)3661{3662const char*old_name = patch->old_name;3663struct patch *previous = NULL;3664int stat_ret =0, status;3665unsigned st_mode =0;36663667if(!old_name)3668return0;36693670assert(patch->is_new <=0);3671 previous =previous_patch(state, patch, &status);36723673if(status)3674returnerror(_("path%shas been renamed/deleted"), old_name);3675if(previous) {3676 st_mode = previous->new_mode;3677}else if(!state->cached) {3678 stat_ret =lstat(old_name, st);3679if(stat_ret && errno != ENOENT)3680returnerror_errno("%s", old_name);3681}36823683if(state->check_index && !previous) {3684int pos =cache_name_pos(old_name,strlen(old_name));3685if(pos <0) {3686if(patch->is_new <0)3687goto is_new;3688returnerror(_("%s: does not exist in index"), old_name);3689}3690*ce = active_cache[pos];3691if(stat_ret <0) {3692if(checkout_target(&the_index, *ce, st))3693return-1;3694}3695if(!state->cached &&verify_index_match(*ce, st))3696returnerror(_("%s: does not match index"), old_name);3697if(state->cached)3698 st_mode = (*ce)->ce_mode;3699}else if(stat_ret <0) {3700if(patch->is_new <0)3701goto is_new;3702returnerror_errno("%s", old_name);3703}37043705if(!state->cached && !previous)3706 st_mode =ce_mode_from_stat(*ce, st->st_mode);37073708if(patch->is_new <0)3709 patch->is_new =0;3710if(!patch->old_mode)3711 patch->old_mode = st_mode;3712if((st_mode ^ patch->old_mode) & S_IFMT)3713returnerror(_("%s: wrong type"), old_name);3714if(st_mode != patch->old_mode)3715warning(_("%shas type%o, expected%o"),3716 old_name, st_mode, patch->old_mode);3717if(!patch->new_mode && !patch->is_delete)3718 patch->new_mode = st_mode;3719return0;37203721 is_new:3722 patch->is_new =1;3723 patch->is_delete =0;3724FREE_AND_NULL(patch->old_name);3725return0;3726}372737283729#define EXISTS_IN_INDEX 13730#define EXISTS_IN_WORKTREE 237313732static intcheck_to_create(struct apply_state *state,3733const char*new_name,3734int ok_if_exists)3735{3736struct stat nst;37373738if(state->check_index &&3739cache_name_pos(new_name,strlen(new_name)) >=0&&3740!ok_if_exists)3741return EXISTS_IN_INDEX;3742if(state->cached)3743return0;37443745if(!lstat(new_name, &nst)) {3746if(S_ISDIR(nst.st_mode) || ok_if_exists)3747return0;3748/*3749 * A leading component of new_name might be a symlink3750 * that is going to be removed with this patch, but3751 * still pointing at somewhere that has the path.3752 * In such a case, path "new_name" does not exist as3753 * far as git is concerned.3754 */3755if(has_symlink_leading_path(new_name,strlen(new_name)))3756return0;37573758return EXISTS_IN_WORKTREE;3759}else if(!is_missing_file_error(errno)) {3760returnerror_errno("%s", new_name);3761}3762return0;3763}37643765static uintptr_tregister_symlink_changes(struct apply_state *state,3766const char*path,3767uintptr_t what)3768{3769struct string_list_item *ent;37703771 ent =string_list_lookup(&state->symlink_changes, path);3772if(!ent) {3773 ent =string_list_insert(&state->symlink_changes, path);3774 ent->util = (void*)0;3775}3776 ent->util = (void*)(what | ((uintptr_t)ent->util));3777return(uintptr_t)ent->util;3778}37793780static uintptr_tcheck_symlink_changes(struct apply_state *state,const char*path)3781{3782struct string_list_item *ent;37833784 ent =string_list_lookup(&state->symlink_changes, path);3785if(!ent)3786return0;3787return(uintptr_t)ent->util;3788}37893790static voidprepare_symlink_changes(struct apply_state *state,struct patch *patch)3791{3792for( ; patch; patch = patch->next) {3793if((patch->old_name &&S_ISLNK(patch->old_mode)) &&3794(patch->is_rename || patch->is_delete))3795/* the symlink at patch->old_name is removed */3796register_symlink_changes(state, patch->old_name, APPLY_SYMLINK_GOES_AWAY);37973798if(patch->new_name &&S_ISLNK(patch->new_mode))3799/* the symlink at patch->new_name is created or remains */3800register_symlink_changes(state, patch->new_name, APPLY_SYMLINK_IN_RESULT);3801}3802}38033804static intpath_is_beyond_symlink_1(struct apply_state *state,struct strbuf *name)3805{3806do{3807unsigned int change;38083809while(--name->len && name->buf[name->len] !='/')3810;/* scan backwards */3811if(!name->len)3812break;3813 name->buf[name->len] ='\0';3814 change =check_symlink_changes(state, name->buf);3815if(change & APPLY_SYMLINK_IN_RESULT)3816return1;3817if(change & APPLY_SYMLINK_GOES_AWAY)3818/*3819 * This cannot be "return 0", because we may3820 * see a new one created at a higher level.3821 */3822continue;38233824/* otherwise, check the preimage */3825if(state->check_index) {3826struct cache_entry *ce;38273828 ce =cache_file_exists(name->buf, name->len, ignore_case);3829if(ce &&S_ISLNK(ce->ce_mode))3830return1;3831}else{3832struct stat st;3833if(!lstat(name->buf, &st) &&S_ISLNK(st.st_mode))3834return1;3835}3836}while(1);3837return0;3838}38393840static intpath_is_beyond_symlink(struct apply_state *state,const char*name_)3841{3842int ret;3843struct strbuf name = STRBUF_INIT;38443845assert(*name_ !='\0');3846strbuf_addstr(&name, name_);3847 ret =path_is_beyond_symlink_1(state, &name);3848strbuf_release(&name);38493850return ret;3851}38523853static intcheck_unsafe_path(struct patch *patch)3854{3855const char*old_name = NULL;3856const char*new_name = NULL;3857if(patch->is_delete)3858 old_name = patch->old_name;3859else if(!patch->is_new && !patch->is_copy)3860 old_name = patch->old_name;3861if(!patch->is_delete)3862 new_name = patch->new_name;38633864if(old_name && !verify_path(old_name))3865returnerror(_("invalid path '%s'"), old_name);3866if(new_name && !verify_path(new_name))3867returnerror(_("invalid path '%s'"), new_name);3868return0;3869}38703871/*3872 * Check and apply the patch in-core; leave the result in patch->result3873 * for the caller to write it out to the final destination.3874 */3875static intcheck_patch(struct apply_state *state,struct patch *patch)3876{3877struct stat st;3878const char*old_name = patch->old_name;3879const char*new_name = patch->new_name;3880const char*name = old_name ? old_name : new_name;3881struct cache_entry *ce = NULL;3882struct patch *tpatch;3883int ok_if_exists;3884int status;38853886 patch->rejected =1;/* we will drop this after we succeed */38873888 status =check_preimage(state, patch, &ce, &st);3889if(status)3890return status;3891 old_name = patch->old_name;38923893/*3894 * A type-change diff is always split into a patch to delete3895 * old, immediately followed by a patch to create new (see3896 * diff.c::run_diff()); in such a case it is Ok that the entry3897 * to be deleted by the previous patch is still in the working3898 * tree and in the index.3899 *3900 * A patch to swap-rename between A and B would first rename A3901 * to B and then rename B to A. While applying the first one,3902 * the presence of B should not stop A from getting renamed to3903 * B; ask to_be_deleted() about the later rename. Removal of3904 * B and rename from A to B is handled the same way by asking3905 * was_deleted().3906 */3907if((tpatch =in_fn_table(state, new_name)) &&3908(was_deleted(tpatch) ||to_be_deleted(tpatch)))3909 ok_if_exists =1;3910else3911 ok_if_exists =0;39123913if(new_name &&3914((0< patch->is_new) || patch->is_rename || patch->is_copy)) {3915int err =check_to_create(state, new_name, ok_if_exists);39163917if(err && state->threeway) {3918 patch->direct_to_threeway =1;3919}else switch(err) {3920case0:3921break;/* happy */3922case EXISTS_IN_INDEX:3923returnerror(_("%s: already exists in index"), new_name);3924break;3925case EXISTS_IN_WORKTREE:3926returnerror(_("%s: already exists in working directory"),3927 new_name);3928default:3929return err;3930}39313932if(!patch->new_mode) {3933if(0< patch->is_new)3934 patch->new_mode = S_IFREG |0644;3935else3936 patch->new_mode = patch->old_mode;3937}3938}39393940if(new_name && old_name) {3941int same = !strcmp(old_name, new_name);3942if(!patch->new_mode)3943 patch->new_mode = patch->old_mode;3944if((patch->old_mode ^ patch->new_mode) & S_IFMT) {3945if(same)3946returnerror(_("new mode (%o) of%sdoes not "3947"match old mode (%o)"),3948 patch->new_mode, new_name,3949 patch->old_mode);3950else3951returnerror(_("new mode (%o) of%sdoes not "3952"match old mode (%o) of%s"),3953 patch->new_mode, new_name,3954 patch->old_mode, old_name);3955}3956}39573958if(!state->unsafe_paths &&check_unsafe_path(patch))3959return-128;39603961/*3962 * An attempt to read from or delete a path that is beyond a3963 * symbolic link will be prevented by load_patch_target() that3964 * is called at the beginning of apply_data() so we do not3965 * have to worry about a patch marked with "is_delete" bit3966 * here. We however need to make sure that the patch result3967 * is not deposited to a path that is beyond a symbolic link3968 * here.3969 */3970if(!patch->is_delete &&path_is_beyond_symlink(state, patch->new_name))3971returnerror(_("affected file '%s' is beyond a symbolic link"),3972 patch->new_name);39733974if(apply_data(state, patch, &st, ce) <0)3975returnerror(_("%s: patch does not apply"), name);3976 patch->rejected =0;3977return0;3978}39793980static intcheck_patch_list(struct apply_state *state,struct patch *patch)3981{3982int err =0;39833984prepare_symlink_changes(state, patch);3985prepare_fn_table(state, patch);3986while(patch) {3987int res;3988if(state->apply_verbosity > verbosity_normal)3989say_patch_name(stderr,3990_("Checking patch%s..."), patch);3991 res =check_patch(state, patch);3992if(res == -128)3993return-128;3994 err |= res;3995 patch = patch->next;3996}3997return err;3998}39994000static intread_apply_cache(struct apply_state *state)4001{4002if(state->index_file)4003returnread_cache_from(state->index_file);4004else4005returnread_cache();4006}40074008/* This function tries to read the object name from the current index */4009static intget_current_oid(struct apply_state *state,const char*path,4010struct object_id *oid)4011{4012int pos;40134014if(read_apply_cache(state) <0)4015return-1;4016 pos =cache_name_pos(path,strlen(path));4017if(pos <0)4018return-1;4019oidcpy(oid, &active_cache[pos]->oid);4020return0;4021}40224023static intpreimage_oid_in_gitlink_patch(struct patch *p,struct object_id *oid)4024{4025/*4026 * A usable gitlink patch has only one fragment (hunk) that looks like:4027 * @@ -1 +1 @@4028 * -Subproject commit <old sha1>4029 * +Subproject commit <new sha1>4030 * or4031 * @@ -1 +0,0 @@4032 * -Subproject commit <old sha1>4033 * for a removal patch.4034 */4035struct fragment *hunk = p->fragments;4036static const char heading[] ="-Subproject commit ";4037char*preimage;40384039if(/* does the patch have only one hunk? */4040 hunk && !hunk->next &&4041/* is its preimage one line? */4042 hunk->oldpos ==1&& hunk->oldlines ==1&&4043/* does preimage begin with the heading? */4044(preimage =memchr(hunk->patch,'\n', hunk->size)) != NULL &&4045starts_with(++preimage, heading) &&4046/* does it record full SHA-1? */4047!get_oid_hex(preimage +sizeof(heading) -1, oid) &&4048 preimage[sizeof(heading) + GIT_SHA1_HEXSZ -1] =='\n'&&4049/* does the abbreviated name on the index line agree with it? */4050starts_with(preimage +sizeof(heading) -1, p->old_sha1_prefix))4051return0;/* it all looks fine */40524053/* we may have full object name on the index line */4054returnget_oid_hex(p->old_sha1_prefix, oid);4055}40564057/* Build an index that contains the just the files needed for a 3way merge */4058static intbuild_fake_ancestor(struct apply_state *state,struct patch *list)4059{4060struct patch *patch;4061struct index_state result = { NULL };4062static struct lock_file lock;4063int res;40644065/* Once we start supporting the reverse patch, it may be4066 * worth showing the new sha1 prefix, but until then...4067 */4068for(patch = list; patch; patch = patch->next) {4069struct object_id oid;4070struct cache_entry *ce;4071const char*name;40724073 name = patch->old_name ? patch->old_name : patch->new_name;4074if(0< patch->is_new)4075continue;40764077if(S_ISGITLINK(patch->old_mode)) {4078if(!preimage_oid_in_gitlink_patch(patch, &oid))4079;/* ok, the textual part looks sane */4080else4081returnerror(_("sha1 information is lacking or "4082"useless for submodule%s"), name);4083}else if(!get_oid_blob(patch->old_sha1_prefix, &oid)) {4084;/* ok */4085}else if(!patch->lines_added && !patch->lines_deleted) {4086/* mode-only change: update the current */4087if(get_current_oid(state, patch->old_name, &oid))4088returnerror(_("mode change for%s, which is not "4089"in current HEAD"), name);4090}else4091returnerror(_("sha1 information is lacking or useless "4092"(%s)."), name);40934094 ce =make_cache_entry(patch->old_mode, oid.hash, name,0,0);4095if(!ce)4096returnerror(_("make_cache_entry failed for path '%s'"),4097 name);4098if(add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) {4099free(ce);4100returnerror(_("could not add%sto temporary index"),4101 name);4102}4103}41044105hold_lock_file_for_update(&lock, state->fake_ancestor, LOCK_DIE_ON_ERROR);4106 res =write_locked_index(&result, &lock, COMMIT_LOCK);4107discard_index(&result);41084109if(res)4110returnerror(_("could not write temporary index to%s"),4111 state->fake_ancestor);41124113return0;4114}41154116static voidstat_patch_list(struct apply_state *state,struct patch *patch)4117{4118int files, adds, dels;41194120for(files = adds = dels =0; patch ; patch = patch->next) {4121 files++;4122 adds += patch->lines_added;4123 dels += patch->lines_deleted;4124show_stats(state, patch);4125}41264127print_stat_summary(stdout, files, adds, dels);4128}41294130static voidnumstat_patch_list(struct apply_state *state,4131struct patch *patch)4132{4133for( ; patch; patch = patch->next) {4134const char*name;4135 name = patch->new_name ? patch->new_name : patch->old_name;4136if(patch->is_binary)4137printf("-\t-\t");4138else4139printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);4140write_name_quoted(name, stdout, state->line_termination);4141}4142}41434144static voidshow_file_mode_name(const char*newdelete,unsigned int mode,const char*name)4145{4146if(mode)4147printf("%smode%06o%s\n", newdelete, mode, name);4148else4149printf("%s %s\n", newdelete, name);4150}41514152static voidshow_mode_change(struct patch *p,int show_name)4153{4154if(p->old_mode && p->new_mode && p->old_mode != p->new_mode) {4155if(show_name)4156printf(" mode change%06o =>%06o%s\n",4157 p->old_mode, p->new_mode, p->new_name);4158else4159printf(" mode change%06o =>%06o\n",4160 p->old_mode, p->new_mode);4161}4162}41634164static voidshow_rename_copy(struct patch *p)4165{4166const char*renamecopy = p->is_rename ?"rename":"copy";4167const char*old_name, *new_name;41684169/* Find common prefix */4170 old_name = p->old_name;4171 new_name = p->new_name;4172while(1) {4173const char*slash_old, *slash_new;4174 slash_old =strchr(old_name,'/');4175 slash_new =strchr(new_name,'/');4176if(!slash_old ||4177!slash_new ||4178 slash_old - old_name != slash_new - new_name ||4179memcmp(old_name, new_name, slash_new - new_name))4180break;4181 old_name = slash_old +1;4182 new_name = slash_new +1;4183}4184/* p->old_name thru old_name is the common prefix, and old_name and new_name4185 * through the end of names are renames4186 */4187if(old_name != p->old_name)4188printf("%s%.*s{%s=>%s} (%d%%)\n", renamecopy,4189(int)(old_name - p->old_name), p->old_name,4190 old_name, new_name, p->score);4191else4192printf("%s %s=>%s(%d%%)\n", renamecopy,4193 p->old_name, p->new_name, p->score);4194show_mode_change(p,0);4195}41964197static voidsummary_patch_list(struct patch *patch)4198{4199struct patch *p;42004201for(p = patch; p; p = p->next) {4202if(p->is_new)4203show_file_mode_name("create", p->new_mode, p->new_name);4204else if(p->is_delete)4205show_file_mode_name("delete", p->old_mode, p->old_name);4206else{4207if(p->is_rename || p->is_copy)4208show_rename_copy(p);4209else{4210if(p->score) {4211printf(" rewrite%s(%d%%)\n",4212 p->new_name, p->score);4213show_mode_change(p,0);4214}4215else4216show_mode_change(p,1);4217}4218}4219}4220}42214222static voidpatch_stats(struct apply_state *state,struct patch *patch)4223{4224int lines = patch->lines_added + patch->lines_deleted;42254226if(lines > state->max_change)4227 state->max_change = lines;4228if(patch->old_name) {4229int len =quote_c_style(patch->old_name, NULL, NULL,0);4230if(!len)4231 len =strlen(patch->old_name);4232if(len > state->max_len)4233 state->max_len = len;4234}4235if(patch->new_name) {4236int len =quote_c_style(patch->new_name, NULL, NULL,0);4237if(!len)4238 len =strlen(patch->new_name);4239if(len > state->max_len)4240 state->max_len = len;4241}4242}42434244static intremove_file(struct apply_state *state,struct patch *patch,int rmdir_empty)4245{4246if(state->update_index) {4247if(remove_file_from_cache(patch->old_name) <0)4248returnerror(_("unable to remove%sfrom index"), patch->old_name);4249}4250if(!state->cached) {4251if(!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {4252remove_path(patch->old_name);4253}4254}4255return0;4256}42574258static intadd_index_file(struct apply_state *state,4259const char*path,4260unsigned mode,4261void*buf,4262unsigned long size)4263{4264struct stat st;4265struct cache_entry *ce;4266int namelen =strlen(path);4267unsigned ce_size =cache_entry_size(namelen);42684269if(!state->update_index)4270return0;42714272 ce =xcalloc(1, ce_size);4273memcpy(ce->name, path, namelen);4274 ce->ce_mode =create_ce_mode(mode);4275 ce->ce_flags =create_ce_flags(0);4276 ce->ce_namelen = namelen;4277if(S_ISGITLINK(mode)) {4278const char*s;42794280if(!skip_prefix(buf,"Subproject commit ", &s) ||4281get_oid_hex(s, &ce->oid)) {4282free(ce);4283returnerror(_("corrupt patch for submodule%s"), path);4284}4285}else{4286if(!state->cached) {4287if(lstat(path, &st) <0) {4288free(ce);4289returnerror_errno(_("unable to stat newly "4290"created file '%s'"),4291 path);4292}4293fill_stat_cache_info(ce, &st);4294}4295if(write_object_file(buf, size, blob_type, &ce->oid) <0) {4296free(ce);4297returnerror(_("unable to create backing store "4298"for newly created file%s"), path);4299}4300}4301if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0) {4302free(ce);4303returnerror(_("unable to add cache entry for%s"), path);4304}43054306return0;4307}43084309/*4310 * Returns:4311 * -1 if an unrecoverable error happened4312 * 0 if everything went well4313 * 1 if a recoverable error happened4314 */4315static inttry_create_file(const char*path,unsigned int mode,const char*buf,unsigned long size)4316{4317int fd, res;4318struct strbuf nbuf = STRBUF_INIT;43194320if(S_ISGITLINK(mode)) {4321struct stat st;4322if(!lstat(path, &st) &&S_ISDIR(st.st_mode))4323return0;4324return!!mkdir(path,0777);4325}43264327if(has_symlinks &&S_ISLNK(mode))4328/* Although buf:size is counted string, it also is NUL4329 * terminated.4330 */4331return!!symlink(buf, path);43324333 fd =open(path, O_CREAT | O_EXCL | O_WRONLY, (mode &0100) ?0777:0666);4334if(fd <0)4335return1;43364337if(convert_to_working_tree(path, buf, size, &nbuf)) {4338 size = nbuf.len;4339 buf = nbuf.buf;4340}43414342 res =write_in_full(fd, buf, size) <0;4343if(res)4344error_errno(_("failed to write to '%s'"), path);4345strbuf_release(&nbuf);43464347if(close(fd) <0&& !res)4348returnerror_errno(_("closing file '%s'"), path);43494350return res ? -1:0;4351}43524353/*4354 * We optimistically assume that the directories exist,4355 * which is true 99% of the time anyway. If they don't,4356 * we create them and try again.4357 *4358 * Returns:4359 * -1 on error4360 * 0 otherwise4361 */4362static intcreate_one_file(struct apply_state *state,4363char*path,4364unsigned mode,4365const char*buf,4366unsigned long size)4367{4368int res;43694370if(state->cached)4371return0;43724373 res =try_create_file(path, mode, buf, size);4374if(res <0)4375return-1;4376if(!res)4377return0;43784379if(errno == ENOENT) {4380if(safe_create_leading_directories(path))4381return0;4382 res =try_create_file(path, mode, buf, size);4383if(res <0)4384return-1;4385if(!res)4386return0;4387}43884389if(errno == EEXIST || errno == EACCES) {4390/* We may be trying to create a file where a directory4391 * used to be.4392 */4393struct stat st;4394if(!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))4395 errno = EEXIST;4396}43974398if(errno == EEXIST) {4399unsigned int nr =getpid();44004401for(;;) {4402char newpath[PATH_MAX];4403mksnpath(newpath,sizeof(newpath),"%s~%u", path, nr);4404 res =try_create_file(newpath, mode, buf, size);4405if(res <0)4406return-1;4407if(!res) {4408if(!rename(newpath, path))4409return0;4410unlink_or_warn(newpath);4411break;4412}4413if(errno != EEXIST)4414break;4415++nr;4416}4417}4418returnerror_errno(_("unable to write file '%s' mode%o"),4419 path, mode);4420}44214422static intadd_conflicted_stages_file(struct apply_state *state,4423struct patch *patch)4424{4425int stage, namelen;4426unsigned ce_size, mode;4427struct cache_entry *ce;44284429if(!state->update_index)4430return0;4431 namelen =strlen(patch->new_name);4432 ce_size =cache_entry_size(namelen);4433 mode = patch->new_mode ? patch->new_mode : (S_IFREG |0644);44344435remove_file_from_cache(patch->new_name);4436for(stage =1; stage <4; stage++) {4437if(is_null_oid(&patch->threeway_stage[stage -1]))4438continue;4439 ce =xcalloc(1, ce_size);4440memcpy(ce->name, patch->new_name, namelen);4441 ce->ce_mode =create_ce_mode(mode);4442 ce->ce_flags =create_ce_flags(stage);4443 ce->ce_namelen = namelen;4444oidcpy(&ce->oid, &patch->threeway_stage[stage -1]);4445if(add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) <0) {4446free(ce);4447returnerror(_("unable to add cache entry for%s"),4448 patch->new_name);4449}4450}44514452return0;4453}44544455static intcreate_file(struct apply_state *state,struct patch *patch)4456{4457char*path = patch->new_name;4458unsigned mode = patch->new_mode;4459unsigned long size = patch->resultsize;4460char*buf = patch->result;44614462if(!mode)4463 mode = S_IFREG |0644;4464if(create_one_file(state, path, mode, buf, size))4465return-1;44664467if(patch->conflicted_threeway)4468returnadd_conflicted_stages_file(state, patch);4469else4470returnadd_index_file(state, path, mode, buf, size);4471}44724473/* phase zero is to remove, phase one is to create */4474static intwrite_out_one_result(struct apply_state *state,4475struct patch *patch,4476int phase)4477{4478if(patch->is_delete >0) {4479if(phase ==0)4480returnremove_file(state, patch,1);4481return0;4482}4483if(patch->is_new >0|| patch->is_copy) {4484if(phase ==1)4485returncreate_file(state, patch);4486return0;4487}4488/*4489 * Rename or modification boils down to the same4490 * thing: remove the old, write the new4491 */4492if(phase ==0)4493returnremove_file(state, patch, patch->is_rename);4494if(phase ==1)4495returncreate_file(state, patch);4496return0;4497}44984499static intwrite_out_one_reject(struct apply_state *state,struct patch *patch)4500{4501FILE*rej;4502char namebuf[PATH_MAX];4503struct fragment *frag;4504int cnt =0;4505struct strbuf sb = STRBUF_INIT;45064507for(cnt =0, frag = patch->fragments; frag; frag = frag->next) {4508if(!frag->rejected)4509continue;4510 cnt++;4511}45124513if(!cnt) {4514if(state->apply_verbosity > verbosity_normal)4515say_patch_name(stderr,4516_("Applied patch%scleanly."), patch);4517return0;4518}45194520/* This should not happen, because a removal patch that leaves4521 * contents are marked "rejected" at the patch level.4522 */4523if(!patch->new_name)4524die(_("internal error"));45254526/* Say this even without --verbose */4527strbuf_addf(&sb,Q_("Applying patch %%swith%dreject...",4528"Applying patch %%swith%drejects...",4529 cnt),4530 cnt);4531if(state->apply_verbosity > verbosity_silent)4532say_patch_name(stderr, sb.buf, patch);4533strbuf_release(&sb);45344535 cnt =strlen(patch->new_name);4536if(ARRAY_SIZE(namebuf) <= cnt +5) {4537 cnt =ARRAY_SIZE(namebuf) -5;4538warning(_("truncating .rej filename to %.*s.rej"),4539 cnt -1, patch->new_name);4540}4541memcpy(namebuf, patch->new_name, cnt);4542memcpy(namebuf + cnt,".rej",5);45434544 rej =fopen(namebuf,"w");4545if(!rej)4546returnerror_errno(_("cannot open%s"), namebuf);45474548/* Normal git tools never deal with .rej, so do not pretend4549 * this is a git patch by saying --git or giving extended4550 * headers. While at it, maybe please "kompare" that wants4551 * the trailing TAB and some garbage at the end of line ;-).4552 */4553fprintf(rej,"diff a/%sb/%s\t(rejected hunks)\n",4554 patch->new_name, patch->new_name);4555for(cnt =1, frag = patch->fragments;4556 frag;4557 cnt++, frag = frag->next) {4558if(!frag->rejected) {4559if(state->apply_verbosity > verbosity_silent)4560fprintf_ln(stderr,_("Hunk #%dapplied cleanly."), cnt);4561continue;4562}4563if(state->apply_verbosity > verbosity_silent)4564fprintf_ln(stderr,_("Rejected hunk #%d."), cnt);4565fprintf(rej,"%.*s", frag->size, frag->patch);4566if(frag->patch[frag->size-1] !='\n')4567fputc('\n', rej);4568}4569fclose(rej);4570return-1;4571}45724573/*4574 * Returns:4575 * -1 if an error happened4576 * 0 if the patch applied cleanly4577 * 1 if the patch did not apply cleanly4578 */4579static intwrite_out_results(struct apply_state *state,struct patch *list)4580{4581int phase;4582int errs =0;4583struct patch *l;4584struct string_list cpath = STRING_LIST_INIT_DUP;45854586for(phase =0; phase <2; phase++) {4587 l = list;4588while(l) {4589if(l->rejected)4590 errs =1;4591else{4592if(write_out_one_result(state, l, phase)) {4593string_list_clear(&cpath,0);4594return-1;4595}4596if(phase ==1) {4597if(write_out_one_reject(state, l))4598 errs =1;4599if(l->conflicted_threeway) {4600string_list_append(&cpath, l->new_name);4601 errs =1;4602}4603}4604}4605 l = l->next;4606}4607}46084609if(cpath.nr) {4610struct string_list_item *item;46114612string_list_sort(&cpath);4613if(state->apply_verbosity > verbosity_silent) {4614for_each_string_list_item(item, &cpath)4615fprintf(stderr,"U%s\n", item->string);4616}4617string_list_clear(&cpath,0);46184619rerere(0);4620}46214622return errs;4623}46244625/*4626 * Try to apply a patch.4627 *4628 * Returns:4629 * -128 if a bad error happened (like patch unreadable)4630 * -1 if patch did not apply and user cannot deal with it4631 * 0 if the patch applied4632 * 1 if the patch did not apply but user might fix it4633 */4634static intapply_patch(struct apply_state *state,4635int fd,4636const char*filename,4637int options)4638{4639size_t offset;4640struct strbuf buf = STRBUF_INIT;/* owns the patch text */4641struct patch *list = NULL, **listp = &list;4642int skipped_patch =0;4643int res =0;46444645 state->patch_input_file = filename;4646if(read_patch_file(&buf, fd) <0)4647return-128;4648 offset =0;4649while(offset < buf.len) {4650struct patch *patch;4651int nr;46524653 patch =xcalloc(1,sizeof(*patch));4654 patch->inaccurate_eof = !!(options & APPLY_OPT_INACCURATE_EOF);4655 patch->recount = !!(options & APPLY_OPT_RECOUNT);4656 nr =parse_chunk(state, buf.buf + offset, buf.len - offset, patch);4657if(nr <0) {4658free_patch(patch);4659if(nr == -128) {4660 res = -128;4661goto end;4662}4663break;4664}4665if(state->apply_in_reverse)4666reverse_patches(patch);4667if(use_patch(state, patch)) {4668patch_stats(state, patch);4669*listp = patch;4670 listp = &patch->next;4671}4672else{4673if(state->apply_verbosity > verbosity_normal)4674say_patch_name(stderr,_("Skipped patch '%s'."), patch);4675free_patch(patch);4676 skipped_patch++;4677}4678 offset += nr;4679}46804681if(!list && !skipped_patch) {4682error(_("unrecognized input"));4683 res = -128;4684goto end;4685}46864687if(state->whitespace_error && (state->ws_error_action == die_on_ws_error))4688 state->apply =0;46894690 state->update_index = state->check_index && state->apply;4691if(state->update_index && !is_lock_file_locked(&state->lock_file)) {4692if(state->index_file)4693hold_lock_file_for_update(&state->lock_file,4694 state->index_file,4695 LOCK_DIE_ON_ERROR);4696else4697hold_locked_index(&state->lock_file, LOCK_DIE_ON_ERROR);4698}46994700if(state->check_index &&read_apply_cache(state) <0) {4701error(_("unable to read index file"));4702 res = -128;4703goto end;4704}47054706if(state->check || state->apply) {4707int r =check_patch_list(state, list);4708if(r == -128) {4709 res = -128;4710goto end;4711}4712if(r <0&& !state->apply_with_reject) {4713 res = -1;4714goto end;4715}4716}47174718if(state->apply) {4719int write_res =write_out_results(state, list);4720if(write_res <0) {4721 res = -128;4722goto end;4723}4724if(write_res >0) {4725/* with --3way, we still need to write the index out */4726 res = state->apply_with_reject ? -1:1;4727goto end;4728}4729}47304731if(state->fake_ancestor &&4732build_fake_ancestor(state, list)) {4733 res = -128;4734goto end;4735}47364737if(state->diffstat && state->apply_verbosity > verbosity_silent)4738stat_patch_list(state, list);47394740if(state->numstat && state->apply_verbosity > verbosity_silent)4741numstat_patch_list(state, list);47424743if(state->summary && state->apply_verbosity > verbosity_silent)4744summary_patch_list(list);47454746end:4747free_patch_list(list);4748strbuf_release(&buf);4749string_list_clear(&state->fn_table,0);4750return res;4751}47524753static intapply_option_parse_exclude(const struct option *opt,4754const char*arg,int unset)4755{4756struct apply_state *state = opt->value;4757add_name_limit(state, arg,1);4758return0;4759}47604761static intapply_option_parse_include(const struct option *opt,4762const char*arg,int unset)4763{4764struct apply_state *state = opt->value;4765add_name_limit(state, arg,0);4766 state->has_include =1;4767return0;4768}47694770static intapply_option_parse_p(const struct option *opt,4771const char*arg,4772int unset)4773{4774struct apply_state *state = opt->value;4775 state->p_value =atoi(arg);4776 state->p_value_known =1;4777return0;4778}47794780static intapply_option_parse_space_change(const struct option *opt,4781const char*arg,int unset)4782{4783struct apply_state *state = opt->value;4784if(unset)4785 state->ws_ignore_action = ignore_ws_none;4786else4787 state->ws_ignore_action = ignore_ws_change;4788return0;4789}47904791static intapply_option_parse_whitespace(const struct option *opt,4792const char*arg,int unset)4793{4794struct apply_state *state = opt->value;4795 state->whitespace_option = arg;4796if(parse_whitespace_option(state, arg))4797exit(1);4798return0;4799}48004801static intapply_option_parse_directory(const struct option *opt,4802const char*arg,int unset)4803{4804struct apply_state *state = opt->value;4805strbuf_reset(&state->root);4806strbuf_addstr(&state->root, arg);4807strbuf_complete(&state->root,'/');4808return0;4809}48104811intapply_all_patches(struct apply_state *state,4812int argc,4813const char**argv,4814int options)4815{4816int i;4817int res;4818int errs =0;4819int read_stdin =1;48204821for(i =0; i < argc; i++) {4822const char*arg = argv[i];4823char*to_free = NULL;4824int fd;48254826if(!strcmp(arg,"-")) {4827 res =apply_patch(state,0,"<stdin>", options);4828if(res <0)4829goto end;4830 errs |= res;4831 read_stdin =0;4832continue;4833}else4834 arg = to_free =prefix_filename(state->prefix, arg);48354836 fd =open(arg, O_RDONLY);4837if(fd <0) {4838error(_("can't open patch '%s':%s"), arg,strerror(errno));4839 res = -128;4840free(to_free);4841goto end;4842}4843 read_stdin =0;4844set_default_whitespace_mode(state);4845 res =apply_patch(state, fd, arg, options);4846close(fd);4847free(to_free);4848if(res <0)4849goto end;4850 errs |= res;4851}4852set_default_whitespace_mode(state);4853if(read_stdin) {4854 res =apply_patch(state,0,"<stdin>", options);4855if(res <0)4856goto end;4857 errs |= res;4858}48594860if(state->whitespace_error) {4861if(state->squelch_whitespace_errors &&4862 state->squelch_whitespace_errors < state->whitespace_error) {4863int squelched =4864 state->whitespace_error - state->squelch_whitespace_errors;4865warning(Q_("squelched%dwhitespace error",4866"squelched%dwhitespace errors",4867 squelched),4868 squelched);4869}4870if(state->ws_error_action == die_on_ws_error) {4871error(Q_("%dline adds whitespace errors.",4872"%dlines add whitespace errors.",4873 state->whitespace_error),4874 state->whitespace_error);4875 res = -128;4876goto end;4877}4878if(state->applied_after_fixing_ws && state->apply)4879warning(Q_("%dline applied after"4880" fixing whitespace errors.",4881"%dlines applied after"4882" fixing whitespace errors.",4883 state->applied_after_fixing_ws),4884 state->applied_after_fixing_ws);4885else if(state->whitespace_error)4886warning(Q_("%dline adds whitespace errors.",4887"%dlines add whitespace errors.",4888 state->whitespace_error),4889 state->whitespace_error);4890}48914892if(state->update_index) {4893 res =write_locked_index(&the_index, &state->lock_file, COMMIT_LOCK);4894if(res) {4895error(_("Unable to write new index file"));4896 res = -128;4897goto end;4898}4899}49004901 res = !!errs;49024903end:4904rollback_lock_file(&state->lock_file);49054906if(state->apply_verbosity <= verbosity_silent) {4907set_error_routine(state->saved_error_routine);4908set_warn_routine(state->saved_warn_routine);4909}49104911if(res > -1)4912return res;4913return(res == -1?1:128);4914}49154916intapply_parse_options(int argc,const char**argv,4917struct apply_state *state,4918int*force_apply,int*options,4919const char*const*apply_usage)4920{4921struct option builtin_apply_options[] = {4922{ OPTION_CALLBACK,0,"exclude", state,N_("path"),4923N_("don't apply changes matching the given path"),49240, apply_option_parse_exclude },4925{ OPTION_CALLBACK,0,"include", state,N_("path"),4926N_("apply changes matching the given path"),49270, apply_option_parse_include },4928{ OPTION_CALLBACK,'p', NULL, state,N_("num"),4929N_("remove <num> leading slashes from traditional diff paths"),49300, apply_option_parse_p },4931OPT_BOOL(0,"no-add", &state->no_add,4932N_("ignore additions made by the patch")),4933OPT_BOOL(0,"stat", &state->diffstat,4934N_("instead of applying the patch, output diffstat for the input")),4935OPT_NOOP_NOARG(0,"allow-binary-replacement"),4936OPT_NOOP_NOARG(0,"binary"),4937OPT_BOOL(0,"numstat", &state->numstat,4938N_("show number of added and deleted lines in decimal notation")),4939OPT_BOOL(0,"summary", &state->summary,4940N_("instead of applying the patch, output a summary for the input")),4941OPT_BOOL(0,"check", &state->check,4942N_("instead of applying the patch, see if the patch is applicable")),4943OPT_BOOL(0,"index", &state->check_index,4944N_("make sure the patch is applicable to the current index")),4945OPT_BOOL(0,"cached", &state->cached,4946N_("apply a patch without touching the working tree")),4947OPT_BOOL_F(0,"unsafe-paths", &state->unsafe_paths,4948N_("accept a patch that touches outside the working area"),4949 PARSE_OPT_NOCOMPLETE),4950OPT_BOOL(0,"apply", force_apply,4951N_("also apply the patch (use with --stat/--summary/--check)")),4952OPT_BOOL('3',"3way", &state->threeway,4953N_("attempt three-way merge if a patch does not apply")),4954OPT_FILENAME(0,"build-fake-ancestor", &state->fake_ancestor,4955N_("build a temporary index based on embedded index information")),4956/* Think twice before adding "--nul" synonym to this */4957OPT_SET_INT('z', NULL, &state->line_termination,4958N_("paths are separated with NUL character"),'\0'),4959OPT_INTEGER('C', NULL, &state->p_context,4960N_("ensure at least <n> lines of context match")),4961{ OPTION_CALLBACK,0,"whitespace", state,N_("action"),4962N_("detect new or modified lines that have whitespace errors"),49630, apply_option_parse_whitespace },4964{ OPTION_CALLBACK,0,"ignore-space-change", state, NULL,4965N_("ignore changes in whitespace when finding context"),4966 PARSE_OPT_NOARG, apply_option_parse_space_change },4967{ OPTION_CALLBACK,0,"ignore-whitespace", state, NULL,4968N_("ignore changes in whitespace when finding context"),4969 PARSE_OPT_NOARG, apply_option_parse_space_change },4970OPT_BOOL('R',"reverse", &state->apply_in_reverse,4971N_("apply the patch in reverse")),4972OPT_BOOL(0,"unidiff-zero", &state->unidiff_zero,4973N_("don't expect at least one line of context")),4974OPT_BOOL(0,"reject", &state->apply_with_reject,4975N_("leave the rejected hunks in corresponding *.rej files")),4976OPT_BOOL(0,"allow-overlap", &state->allow_overlap,4977N_("allow overlapping hunks")),4978OPT__VERBOSE(&state->apply_verbosity,N_("be verbose")),4979OPT_BIT(0,"inaccurate-eof", options,4980N_("tolerate incorrectly detected missing new-line at the end of file"),4981 APPLY_OPT_INACCURATE_EOF),4982OPT_BIT(0,"recount", options,4983N_("do not trust the line counts in the hunk headers"),4984 APPLY_OPT_RECOUNT),4985{ OPTION_CALLBACK,0,"directory", state,N_("root"),4986N_("prepend <root> to all filenames"),49870, apply_option_parse_directory },4988OPT_END()4989};49904991returnparse_options(argc, argv, state->prefix, builtin_apply_options, apply_usage,0);4992}