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 "blob.h" 13#include "delta.h" 14#include "diff.h" 15#include "dir.h" 16#include "xdiff-interface.h" 17#include "ll-merge.h" 18#include "lockfile.h" 19#include "parse-options.h" 20#include "quote.h" 21#include "rerere.h" 22#include "apply.h" 23 24static void git_apply_config(void) 25{ 26 git_config_get_string_const("apply.whitespace", &apply_default_whitespace); 27 git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace); 28 git_config(git_default_config, NULL); 29} 30 31static int parse_whitespace_option(struct apply_state *state, const char *option) 32{ 33 if (!option) { 34 state->ws_error_action = warn_on_ws_error; 35 return 0; 36 } 37 if (!strcmp(option, "warn")) { 38 state->ws_error_action = warn_on_ws_error; 39 return 0; 40 } 41 if (!strcmp(option, "nowarn")) { 42 state->ws_error_action = nowarn_ws_error; 43 return 0; 44 } 45 if (!strcmp(option, "error")) { 46 state->ws_error_action = die_on_ws_error; 47 return 0; 48 } 49 if (!strcmp(option, "error-all")) { 50 state->ws_error_action = die_on_ws_error; 51 state->squelch_whitespace_errors = 0; 52 return 0; 53 } 54 if (!strcmp(option, "strip") || !strcmp(option, "fix")) { 55 state->ws_error_action = correct_ws_error; 56 return 0; 57 } 58 return error(_("unrecognized whitespace option '%s'"), option); 59} 60 61static int parse_ignorewhitespace_option(struct apply_state *state, 62 const char *option) 63{ 64 if (!option || !strcmp(option, "no") || 65 !strcmp(option, "false") || !strcmp(option, "never") || 66 !strcmp(option, "none")) { 67 state->ws_ignore_action = ignore_ws_none; 68 return 0; 69 } 70 if (!strcmp(option, "change")) { 71 state->ws_ignore_action = ignore_ws_change; 72 return 0; 73 } 74 return error(_("unrecognized whitespace ignore option '%s'"), option); 75} 76 77int init_apply_state(struct apply_state *state, 78 const char *prefix, 79 struct lock_file *lock_file) 80{ 81 memset(state, 0, sizeof(*state)); 82 state->prefix = prefix; 83 state->lock_file = lock_file; 84 state->newfd = -1; 85 state->apply = 1; 86 state->line_termination = '\n'; 87 state->p_value = 1; 88 state->p_context = UINT_MAX; 89 state->squelch_whitespace_errors = 5; 90 state->ws_error_action = warn_on_ws_error; 91 state->ws_ignore_action = ignore_ws_none; 92 state->linenr = 1; 93 string_list_init(&state->fn_table, 0); 94 string_list_init(&state->limit_by_name, 0); 95 string_list_init(&state->symlink_changes, 0); 96 strbuf_init(&state->root, 0); 97 98 git_apply_config(); 99 if (apply_default_whitespace && parse_whitespace_option(state, apply_default_whitespace)) 100 return -1; 101 if (apply_default_ignorewhitespace && parse_ignorewhitespace_option(state, apply_default_ignorewhitespace)) 102 return -1; 103 return 0; 104} 105 106void clear_apply_state(struct apply_state *state) 107{ 108 string_list_clear(&state->limit_by_name, 0); 109 string_list_clear(&state->symlink_changes, 0); 110 strbuf_release(&state->root); 111 112 /* &state->fn_table is cleared at the end of apply_patch() */ 113} 114 115static void mute_routine(const char *msg, va_list params) 116{ 117 /* do nothing */ 118} 119 120int check_apply_state(struct apply_state *state, int force_apply) 121{ 122 int is_not_gitdir = !startup_info->have_repository; 123 124 if (state->apply_with_reject && state->threeway) 125 return error(_("--reject and --3way cannot be used together.")); 126 if (state->cached && state->threeway) 127 return error(_("--cached and --3way cannot be used together.")); 128 if (state->threeway) { 129 if (is_not_gitdir) 130 return error(_("--3way outside a repository")); 131 state->check_index = 1; 132 } 133 if (state->apply_with_reject) { 134 state->apply = 1; 135 if (state->apply_verbosity == verbosity_normal) 136 state->apply_verbosity = verbosity_verbose; 137 } 138 if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor)) 139 state->apply = 0; 140 if (state->check_index && is_not_gitdir) 141 return error(_("--index outside a repository")); 142 if (state->cached) { 143 if (is_not_gitdir) 144 return error(_("--cached outside a repository")); 145 state->check_index = 1; 146 } 147 if (state->check_index) 148 state->unsafe_paths = 0; 149 if (!state->lock_file) 150 return error("BUG: state->lock_file should not be NULL"); 151 152 if (state->apply_verbosity <= verbosity_silent) { 153 state->saved_error_routine = get_error_routine(); 154 state->saved_warn_routine = get_warn_routine(); 155 set_error_routine(mute_routine); 156 set_warn_routine(mute_routine); 157 } 158 159 return 0; 160} 161 162static void set_default_whitespace_mode(struct apply_state *state) 163{ 164 if (!state->whitespace_option && !apply_default_whitespace) 165 state->ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error); 166} 167 168/* 169 * This represents one "hunk" from a patch, starting with 170 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 171 * patch text is pointed at by patch, and its byte length 172 * is stored in size. leading and trailing are the number 173 * of context lines. 174 */ 175struct fragment { 176 unsigned long leading, trailing; 177 unsigned long oldpos, oldlines; 178 unsigned long newpos, newlines; 179 /* 180 * 'patch' is usually borrowed from buf in apply_patch(), 181 * but some codepaths store an allocated buffer. 182 */ 183 const char *patch; 184 unsigned free_patch:1, 185 rejected:1; 186 int size; 187 int linenr; 188 struct fragment *next; 189}; 190 191/* 192 * When dealing with a binary patch, we reuse "leading" field 193 * to store the type of the binary hunk, either deflated "delta" 194 * or deflated "literal". 195 */ 196#define binary_patch_method leading 197#define BINARY_DELTA_DEFLATED 1 198#define BINARY_LITERAL_DEFLATED 2 199 200/* 201 * This represents a "patch" to a file, both metainfo changes 202 * such as creation/deletion, filemode and content changes represented 203 * as a series of fragments. 204 */ 205struct patch { 206 char *new_name, *old_name, *def_name; 207 unsigned int old_mode, new_mode; 208 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */ 209 int rejected; 210 unsigned ws_rule; 211 int lines_added, lines_deleted; 212 int score; 213 int extension_linenr; /* first line specifying delete/new/rename/copy */ 214 unsigned int is_toplevel_relative:1; 215 unsigned int inaccurate_eof:1; 216 unsigned int is_binary:1; 217 unsigned int is_copy:1; 218 unsigned int is_rename:1; 219 unsigned int recount:1; 220 unsigned int conflicted_threeway:1; 221 unsigned int direct_to_threeway:1; 222 unsigned int crlf_in_old:1; 223 struct fragment *fragments; 224 char *result; 225 size_t resultsize; 226 char old_sha1_prefix[41]; 227 char new_sha1_prefix[41]; 228 struct patch *next; 229 230 /* three-way fallback result */ 231 struct object_id threeway_stage[3]; 232}; 233 234static void free_fragment_list(struct fragment *list) 235{ 236 while (list) { 237 struct fragment *next = list->next; 238 if (list->free_patch) 239 free((char *)list->patch); 240 free(list); 241 list = next; 242 } 243} 244 245static void free_patch(struct patch *patch) 246{ 247 free_fragment_list(patch->fragments); 248 free(patch->def_name); 249 free(patch->old_name); 250 free(patch->new_name); 251 free(patch->result); 252 free(patch); 253} 254 255static void free_patch_list(struct patch *list) 256{ 257 while (list) { 258 struct patch *next = list->next; 259 free_patch(list); 260 list = next; 261 } 262} 263 264/* 265 * A line in a file, len-bytes long (includes the terminating LF, 266 * except for an incomplete line at the end if the file ends with 267 * one), and its contents hashes to 'hash'. 268 */ 269struct line { 270 size_t len; 271 unsigned hash : 24; 272 unsigned flag : 8; 273#define LINE_COMMON 1 274#define LINE_PATCHED 2 275}; 276 277/* 278 * This represents a "file", which is an array of "lines". 279 */ 280struct image { 281 char *buf; 282 size_t len; 283 size_t nr; 284 size_t alloc; 285 struct line *line_allocated; 286 struct line *line; 287}; 288 289static uint32_t hash_line(const char *cp, size_t len) 290{ 291 size_t i; 292 uint32_t h; 293 for (i = 0, h = 0; i < len; i++) { 294 if (!isspace(cp[i])) { 295 h = h * 3 + (cp[i] & 0xff); 296 } 297 } 298 return h; 299} 300 301/* 302 * Compare lines s1 of length n1 and s2 of length n2, ignoring 303 * whitespace difference. Returns 1 if they match, 0 otherwise 304 */ 305static int fuzzy_matchlines(const char *s1, size_t n1, 306 const char *s2, size_t n2) 307{ 308 const char *last1 = s1 + n1 - 1; 309 const char *last2 = s2 + n2 - 1; 310 int result = 0; 311 312 /* ignore line endings */ 313 while ((*last1 == '\r') || (*last1 == '\n')) 314 last1--; 315 while ((*last2 == '\r') || (*last2 == '\n')) 316 last2--; 317 318 /* skip leading whitespaces, if both begin with whitespace */ 319 if (s1 <= last1 && s2 <= last2 && isspace(*s1) && isspace(*s2)) { 320 while (isspace(*s1) && (s1 <= last1)) 321 s1++; 322 while (isspace(*s2) && (s2 <= last2)) 323 s2++; 324 } 325 /* early return if both lines are empty */ 326 if ((s1 > last1) && (s2 > last2)) 327 return 1; 328 while (!result) { 329 result = *s1++ - *s2++; 330 /* 331 * Skip whitespace inside. We check for whitespace on 332 * both buffers because we don't want "a b" to match 333 * "ab" 334 */ 335 if (isspace(*s1) && isspace(*s2)) { 336 while (isspace(*s1) && s1 <= last1) 337 s1++; 338 while (isspace(*s2) && s2 <= last2) 339 s2++; 340 } 341 /* 342 * If we reached the end on one side only, 343 * lines don't match 344 */ 345 if ( 346 ((s2 > last2) && (s1 <= last1)) || 347 ((s1 > last1) && (s2 <= last2))) 348 return 0; 349 if ((s1 > last1) && (s2 > last2)) 350 break; 351 } 352 353 return !result; 354} 355 356static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag) 357{ 358 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc); 359 img->line_allocated[img->nr].len = len; 360 img->line_allocated[img->nr].hash = hash_line(bol, len); 361 img->line_allocated[img->nr].flag = flag; 362 img->nr++; 363} 364 365/* 366 * "buf" has the file contents to be patched (read from various sources). 367 * attach it to "image" and add line-based index to it. 368 * "image" now owns the "buf". 369 */ 370static void prepare_image(struct image *image, char *buf, size_t len, 371 int prepare_linetable) 372{ 373 const char *cp, *ep; 374 375 memset(image, 0, sizeof(*image)); 376 image->buf = buf; 377 image->len = len; 378 379 if (!prepare_linetable) 380 return; 381 382 ep = image->buf + image->len; 383 cp = image->buf; 384 while (cp < ep) { 385 const char *next; 386 for (next = cp; next < ep && *next != '\n'; next++) 387 ; 388 if (next < ep) 389 next++; 390 add_line_info(image, cp, next - cp, 0); 391 cp = next; 392 } 393 image->line = image->line_allocated; 394} 395 396static void clear_image(struct image *image) 397{ 398 free(image->buf); 399 free(image->line_allocated); 400 memset(image, 0, sizeof(*image)); 401} 402 403/* fmt must contain _one_ %s and no other substitution */ 404static void say_patch_name(FILE *output, const char *fmt, struct patch *patch) 405{ 406 struct strbuf sb = STRBUF_INIT; 407 408 if (patch->old_name && patch->new_name && 409 strcmp(patch->old_name, patch->new_name)) { 410 quote_c_style(patch->old_name, &sb, NULL, 0); 411 strbuf_addstr(&sb, " => "); 412 quote_c_style(patch->new_name, &sb, NULL, 0); 413 } else { 414 const char *n = patch->new_name; 415 if (!n) 416 n = patch->old_name; 417 quote_c_style(n, &sb, NULL, 0); 418 } 419 fprintf(output, fmt, sb.buf); 420 fputc('\n', output); 421 strbuf_release(&sb); 422} 423 424#define SLOP (16) 425 426static int read_patch_file(struct strbuf *sb, int fd) 427{ 428 if (strbuf_read(sb, fd, 0) < 0) 429 return error_errno("git apply: failed to read"); 430 431 /* 432 * Make sure that we have some slop in the buffer 433 * so that we can do speculative "memcmp" etc, and 434 * see to it that it is NUL-filled. 435 */ 436 strbuf_grow(sb, SLOP); 437 memset(sb->buf + sb->len, 0, SLOP); 438 return 0; 439} 440 441static unsigned long linelen(const char *buffer, unsigned long size) 442{ 443 unsigned long len = 0; 444 while (size--) { 445 len++; 446 if (*buffer++ == '\n') 447 break; 448 } 449 return len; 450} 451 452static int is_dev_null(const char *str) 453{ 454 return skip_prefix(str, "/dev/null", &str) && isspace(*str); 455} 456 457#define TERM_SPACE 1 458#define TERM_TAB 2 459 460static int name_terminate(int c, int terminate) 461{ 462 if (c == ' ' && !(terminate & TERM_SPACE)) 463 return 0; 464 if (c == '\t' && !(terminate & TERM_TAB)) 465 return 0; 466 467 return 1; 468} 469 470/* remove double slashes to make --index work with such filenames */ 471static char *squash_slash(char *name) 472{ 473 int i = 0, j = 0; 474 475 if (!name) 476 return NULL; 477 478 while (name[i]) { 479 if ((name[j++] = name[i++]) == '/') 480 while (name[i] == '/') 481 i++; 482 } 483 name[j] = '\0'; 484 return name; 485} 486 487static char *find_name_gnu(struct apply_state *state, 488 const char *line, 489 const char *def, 490 int p_value) 491{ 492 struct strbuf name = STRBUF_INIT; 493 char *cp; 494 495 /* 496 * Proposed "new-style" GNU patch/diff format; see 497 * http://marc.info/?l=git&m=112927316408690&w=2 498 */ 499 if (unquote_c_style(&name, line, NULL)) { 500 strbuf_release(&name); 501 return NULL; 502 } 503 504 for (cp = name.buf; p_value; p_value--) { 505 cp = strchr(cp, '/'); 506 if (!cp) { 507 strbuf_release(&name); 508 return NULL; 509 } 510 cp++; 511 } 512 513 strbuf_remove(&name, 0, cp - name.buf); 514 if (state->root.len) 515 strbuf_insert(&name, 0, state->root.buf, state->root.len); 516 return squash_slash(strbuf_detach(&name, NULL)); 517} 518 519static size_t sane_tz_len(const char *line, size_t len) 520{ 521 const char *tz, *p; 522 523 if (len < strlen(" +0500") || line[len-strlen(" +0500")] != ' ') 524 return 0; 525 tz = line + len - strlen(" +0500"); 526 527 if (tz[1] != '+' && tz[1] != '-') 528 return 0; 529 530 for (p = tz + 2; p != line + len; p++) 531 if (!isdigit(*p)) 532 return 0; 533 534 return line + len - tz; 535} 536 537static size_t tz_with_colon_len(const char *line, size_t len) 538{ 539 const char *tz, *p; 540 541 if (len < strlen(" +08:00") || line[len - strlen(":00")] != ':') 542 return 0; 543 tz = line + len - strlen(" +08:00"); 544 545 if (tz[0] != ' ' || (tz[1] != '+' && tz[1] != '-')) 546 return 0; 547 p = tz + 2; 548 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 549 !isdigit(*p++) || !isdigit(*p++)) 550 return 0; 551 552 return line + len - tz; 553} 554 555static size_t date_len(const char *line, size_t len) 556{ 557 const char *date, *p; 558 559 if (len < strlen("72-02-05") || line[len-strlen("-05")] != '-') 560 return 0; 561 p = date = line + len - strlen("72-02-05"); 562 563 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || 564 !isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || 565 !isdigit(*p++) || !isdigit(*p++)) /* Not a date. */ 566 return 0; 567 568 if (date - line >= strlen("19") && 569 isdigit(date[-1]) && isdigit(date[-2])) /* 4-digit year */ 570 date -= strlen("19"); 571 572 return line + len - date; 573} 574 575static size_t short_time_len(const char *line, size_t len) 576{ 577 const char *time, *p; 578 579 if (len < strlen(" 07:01:32") || line[len-strlen(":32")] != ':') 580 return 0; 581 p = time = line + len - strlen(" 07:01:32"); 582 583 /* Permit 1-digit hours? */ 584 if (*p++ != ' ' || 585 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 586 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 587 !isdigit(*p++) || !isdigit(*p++)) /* Not a time. */ 588 return 0; 589 590 return line + len - time; 591} 592 593static size_t fractional_time_len(const char *line, size_t len) 594{ 595 const char *p; 596 size_t n; 597 598 /* Expected format: 19:41:17.620000023 */ 599 if (!len || !isdigit(line[len - 1])) 600 return 0; 601 p = line + len - 1; 602 603 /* Fractional seconds. */ 604 while (p > line && isdigit(*p)) 605 p--; 606 if (*p != '.') 607 return 0; 608 609 /* Hours, minutes, and whole seconds. */ 610 n = short_time_len(line, p - line); 611 if (!n) 612 return 0; 613 614 return line + len - p + n; 615} 616 617static size_t trailing_spaces_len(const char *line, size_t len) 618{ 619 const char *p; 620 621 /* Expected format: ' ' x (1 or more) */ 622 if (!len || line[len - 1] != ' ') 623 return 0; 624 625 p = line + len; 626 while (p != line) { 627 p--; 628 if (*p != ' ') 629 return line + len - (p + 1); 630 } 631 632 /* All spaces! */ 633 return len; 634} 635 636static size_t diff_timestamp_len(const char *line, size_t len) 637{ 638 const char *end = line + len; 639 size_t n; 640 641 /* 642 * Posix: 2010-07-05 19:41:17 643 * GNU: 2010-07-05 19:41:17.620000023 -0500 644 */ 645 646 if (!isdigit(end[-1])) 647 return 0; 648 649 n = sane_tz_len(line, end - line); 650 if (!n) 651 n = tz_with_colon_len(line, end - line); 652 end -= n; 653 654 n = short_time_len(line, end - line); 655 if (!n) 656 n = fractional_time_len(line, end - line); 657 end -= n; 658 659 n = date_len(line, end - line); 660 if (!n) /* No date. Too bad. */ 661 return 0; 662 end -= n; 663 664 if (end == line) /* No space before date. */ 665 return 0; 666 if (end[-1] == '\t') { /* Success! */ 667 end--; 668 return line + len - end; 669 } 670 if (end[-1] != ' ') /* No space before date. */ 671 return 0; 672 673 /* Whitespace damage. */ 674 end -= trailing_spaces_len(line, end - line); 675 return line + len - end; 676} 677 678static char *find_name_common(struct apply_state *state, 679 const char *line, 680 const char *def, 681 int p_value, 682 const char *end, 683 int terminate) 684{ 685 int len; 686 const char *start = NULL; 687 688 if (p_value == 0) 689 start = line; 690 while (line != end) { 691 char c = *line; 692 693 if (!end && isspace(c)) { 694 if (c == '\n') 695 break; 696 if (name_terminate(c, terminate)) 697 break; 698 } 699 line++; 700 if (c == '/' && !--p_value) 701 start = line; 702 } 703 if (!start) 704 return squash_slash(xstrdup_or_null(def)); 705 len = line - start; 706 if (!len) 707 return squash_slash(xstrdup_or_null(def)); 708 709 /* 710 * Generally we prefer the shorter name, especially 711 * if the other one is just a variation of that with 712 * something else tacked on to the end (ie "file.orig" 713 * or "file~"). 714 */ 715 if (def) { 716 int deflen = strlen(def); 717 if (deflen < len && !strncmp(start, def, deflen)) 718 return squash_slash(xstrdup(def)); 719 } 720 721 if (state->root.len) { 722 char *ret = xstrfmt("%s%.*s", state->root.buf, len, start); 723 return squash_slash(ret); 724 } 725 726 return squash_slash(xmemdupz(start, len)); 727} 728 729static char *find_name(struct apply_state *state, 730 const char *line, 731 char *def, 732 int p_value, 733 int terminate) 734{ 735 if (*line == '"') { 736 char *name = find_name_gnu(state, line, def, p_value); 737 if (name) 738 return name; 739 } 740 741 return find_name_common(state, line, def, p_value, NULL, terminate); 742} 743 744static char *find_name_traditional(struct apply_state *state, 745 const char *line, 746 char *def, 747 int p_value) 748{ 749 size_t len; 750 size_t date_len; 751 752 if (*line == '"') { 753 char *name = find_name_gnu(state, line, def, p_value); 754 if (name) 755 return name; 756 } 757 758 len = strchrnul(line, '\n') - line; 759 date_len = diff_timestamp_len(line, len); 760 if (!date_len) 761 return find_name_common(state, line, def, p_value, NULL, TERM_TAB); 762 len -= date_len; 763 764 return find_name_common(state, line, def, p_value, line + len, 0); 765} 766 767/* 768 * Given the string after "--- " or "+++ ", guess the appropriate 769 * p_value for the given patch. 770 */ 771static int guess_p_value(struct apply_state *state, const char *nameline) 772{ 773 char *name, *cp; 774 int val = -1; 775 776 if (is_dev_null(nameline)) 777 return -1; 778 name = find_name_traditional(state, nameline, NULL, 0); 779 if (!name) 780 return -1; 781 cp = strchr(name, '/'); 782 if (!cp) 783 val = 0; 784 else if (state->prefix) { 785 /* 786 * Does it begin with "a/$our-prefix" and such? Then this is 787 * very likely to apply to our directory. 788 */ 789 if (starts_with(name, state->prefix)) 790 val = count_slashes(state->prefix); 791 else { 792 cp++; 793 if (starts_with(cp, state->prefix)) 794 val = count_slashes(state->prefix) + 1; 795 } 796 } 797 free(name); 798 return val; 799} 800 801/* 802 * Does the ---/+++ line have the POSIX timestamp after the last HT? 803 * GNU diff puts epoch there to signal a creation/deletion event. Is 804 * this such a timestamp? 805 */ 806static int has_epoch_timestamp(const char *nameline) 807{ 808 /* 809 * We are only interested in epoch timestamp; any non-zero 810 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 811 * For the same reason, the date must be either 1969-12-31 or 812 * 1970-01-01, and the seconds part must be "00". 813 */ 814 const char stamp_regexp[] = 815 "^[0-2][0-9]:([0-5][0-9]):00(\\.0+)?" 816 " " 817 "([-+][0-2][0-9]:?[0-5][0-9])\n"; 818 const char *timestamp = NULL, *cp, *colon; 819 static regex_t *stamp; 820 regmatch_t m[10]; 821 int zoneoffset, epoch_hour, hour, minute; 822 int status; 823 824 for (cp = nameline; *cp != '\n'; cp++) { 825 if (*cp == '\t') 826 timestamp = cp + 1; 827 } 828 if (!timestamp) 829 return 0; 830 831 /* 832 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 833 * (west of GMT) or 1970-01-01 (east of GMT) 834 */ 835 if (skip_prefix(timestamp, "1969-12-31 ", ×tamp)) 836 epoch_hour = 24; 837 else if (skip_prefix(timestamp, "1970-01-01 ", ×tamp)) 838 epoch_hour = 0; 839 else 840 return 0; 841 842 if (!stamp) { 843 stamp = xmalloc(sizeof(*stamp)); 844 if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 845 warning(_("Cannot prepare timestamp regexp %s"), 846 stamp_regexp); 847 return 0; 848 } 849 } 850 851 status = regexec(stamp, timestamp, ARRAY_SIZE(m), m, 0); 852 if (status) { 853 if (status != REG_NOMATCH) 854 warning(_("regexec returned %d for input: %s"), 855 status, timestamp); 856 return 0; 857 } 858 859 hour = strtol(timestamp, NULL, 10); 860 minute = strtol(timestamp + m[1].rm_so, NULL, 10); 861 862 zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10); 863 if (*colon == ':') 864 zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10); 865 else 866 zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100); 867 if (timestamp[m[3].rm_so] == '-') 868 zoneoffset = -zoneoffset; 869 870 return hour * 60 + minute - zoneoffset == epoch_hour * 60; 871} 872 873/* 874 * Get the name etc info from the ---/+++ lines of a traditional patch header 875 * 876 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 877 * files, we can happily check the index for a match, but for creating a 878 * new file we should try to match whatever "patch" does. I have no idea. 879 */ 880static int parse_traditional_patch(struct apply_state *state, 881 const char *first, 882 const char *second, 883 struct patch *patch) 884{ 885 char *name; 886 887 first += 4; /* skip "--- " */ 888 second += 4; /* skip "+++ " */ 889 if (!state->p_value_known) { 890 int p, q; 891 p = guess_p_value(state, first); 892 q = guess_p_value(state, second); 893 if (p < 0) p = q; 894 if (0 <= p && p == q) { 895 state->p_value = p; 896 state->p_value_known = 1; 897 } 898 } 899 if (is_dev_null(first)) { 900 patch->is_new = 1; 901 patch->is_delete = 0; 902 name = find_name_traditional(state, second, NULL, state->p_value); 903 patch->new_name = name; 904 } else if (is_dev_null(second)) { 905 patch->is_new = 0; 906 patch->is_delete = 1; 907 name = find_name_traditional(state, first, NULL, state->p_value); 908 patch->old_name = name; 909 } else { 910 char *first_name; 911 first_name = find_name_traditional(state, first, NULL, state->p_value); 912 name = find_name_traditional(state, second, first_name, state->p_value); 913 free(first_name); 914 if (has_epoch_timestamp(first)) { 915 patch->is_new = 1; 916 patch->is_delete = 0; 917 patch->new_name = name; 918 } else if (has_epoch_timestamp(second)) { 919 patch->is_new = 0; 920 patch->is_delete = 1; 921 patch->old_name = name; 922 } else { 923 patch->old_name = name; 924 patch->new_name = xstrdup_or_null(name); 925 } 926 } 927 if (!name) 928 return error(_("unable to find filename in patch at line %d"), state->linenr); 929 930 return 0; 931} 932 933static int gitdiff_hdrend(struct apply_state *state, 934 const char *line, 935 struct patch *patch) 936{ 937 return 1; 938} 939 940/* 941 * We're anal about diff header consistency, to make 942 * sure that we don't end up having strange ambiguous 943 * patches floating around. 944 * 945 * As a result, gitdiff_{old|new}name() will check 946 * their names against any previous information, just 947 * to make sure.. 948 */ 949#define DIFF_OLD_NAME 0 950#define DIFF_NEW_NAME 1 951 952static int gitdiff_verify_name(struct apply_state *state, 953 const char *line, 954 int isnull, 955 char **name, 956 int side) 957{ 958 if (!*name && !isnull) { 959 *name = find_name(state, line, NULL, state->p_value, TERM_TAB); 960 return 0; 961 } 962 963 if (*name) { 964 char *another; 965 if (isnull) 966 return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), 967 *name, state->linenr); 968 another = find_name(state, line, NULL, state->p_value, TERM_TAB); 969 if (!another || strcmp(another, *name)) { 970 free(another); 971 return error((side == DIFF_NEW_NAME) ? 972 _("git apply: bad git-diff - inconsistent new filename on line %d") : 973 _("git apply: bad git-diff - inconsistent old filename on line %d"), state->linenr); 974 } 975 free(another); 976 } else { 977 if (!starts_with(line, "/dev/null\n")) 978 return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr); 979 } 980 981 return 0; 982} 983 984static int gitdiff_oldname(struct apply_state *state, 985 const char *line, 986 struct patch *patch) 987{ 988 return gitdiff_verify_name(state, line, 989 patch->is_new, &patch->old_name, 990 DIFF_OLD_NAME); 991} 992 993static int gitdiff_newname(struct apply_state *state, 994 const char *line, 995 struct patch *patch) 996{ 997 return gitdiff_verify_name(state, line, 998 patch->is_delete, &patch->new_name, 999 DIFF_NEW_NAME);1000}10011002static int parse_mode_line(const char *line, int linenr, unsigned int *mode)1003{1004 char *end;1005 *mode = strtoul(line, &end, 8);1006 if (end == line || !isspace(*end))1007 return error(_("invalid mode on line %d: %s"), linenr, line);1008 return 0;1009}10101011static int gitdiff_oldmode(struct apply_state *state,1012 const char *line,1013 struct patch *patch)1014{1015 return parse_mode_line(line, state->linenr, &patch->old_mode);1016}10171018static int gitdiff_newmode(struct apply_state *state,1019 const char *line,1020 struct patch *patch)1021{1022 return parse_mode_line(line, state->linenr, &patch->new_mode);1023}10241025static int gitdiff_delete(struct apply_state *state,1026 const char *line,1027 struct patch *patch)1028{1029 patch->is_delete = 1;1030 free(patch->old_name);1031 patch->old_name = xstrdup_or_null(patch->def_name);1032 return gitdiff_oldmode(state, line, patch);1033}10341035static int gitdiff_newfile(struct apply_state *state,1036 const char *line,1037 struct patch *patch)1038{1039 patch->is_new = 1;1040 free(patch->new_name);1041 patch->new_name = xstrdup_or_null(patch->def_name);1042 return gitdiff_newmode(state, line, patch);1043}10441045static int gitdiff_copysrc(struct apply_state *state,1046 const char *line,1047 struct patch *patch)1048{1049 patch->is_copy = 1;1050 free(patch->old_name);1051 patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);1052 return 0;1053}10541055static int gitdiff_copydst(struct apply_state *state,1056 const char *line,1057 struct patch *patch)1058{1059 patch->is_copy = 1;1060 free(patch->new_name);1061 patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);1062 return 0;1063}10641065static int gitdiff_renamesrc(struct apply_state *state,1066 const char *line,1067 struct patch *patch)1068{1069 patch->is_rename = 1;1070 free(patch->old_name);1071 patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);1072 return 0;1073}10741075static int gitdiff_renamedst(struct apply_state *state,1076 const char *line,1077 struct patch *patch)1078{1079 patch->is_rename = 1;1080 free(patch->new_name);1081 patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);1082 return 0;1083}10841085static int gitdiff_similarity(struct apply_state *state,1086 const char *line,1087 struct patch *patch)1088{1089 unsigned long val = strtoul(line, NULL, 10);1090 if (val <= 100)1091 patch->score = val;1092 return 0;1093}10941095static int gitdiff_dissimilarity(struct apply_state *state,1096 const char *line,1097 struct patch *patch)1098{1099 unsigned long val = strtoul(line, NULL, 10);1100 if (val <= 100)1101 patch->score = val;1102 return 0;1103}11041105static int gitdiff_index(struct apply_state *state,1106 const char *line,1107 struct patch *patch)1108{1109 /*1110 * index line is N hexadecimal, "..", N hexadecimal,1111 * and optional space with octal mode.1112 */1113 const char *ptr, *eol;1114 int len;11151116 ptr = strchr(line, '.');1117 if (!ptr || ptr[1] != '.' || 40 < ptr - line)1118 return 0;1119 len = ptr - line;1120 memcpy(patch->old_sha1_prefix, line, len);1121 patch->old_sha1_prefix[len] = 0;11221123 line = ptr + 2;1124 ptr = strchr(line, ' ');1125 eol = strchrnul(line, '\n');11261127 if (!ptr || eol < ptr)1128 ptr = eol;1129 len = ptr - line;11301131 if (40 < len)1132 return 0;1133 memcpy(patch->new_sha1_prefix, line, len);1134 patch->new_sha1_prefix[len] = 0;1135 if (*ptr == ' ')1136 return gitdiff_oldmode(state, ptr + 1, patch);1137 return 0;1138}11391140/*1141 * This is normal for a diff that doesn't change anything: we'll fall through1142 * into the next diff. Tell the parser to break out.1143 */1144static int gitdiff_unrecognized(struct apply_state *state,1145 const char *line,1146 struct patch *patch)1147{1148 return 1;1149}11501151/*1152 * Skip p_value leading components from "line"; as we do not accept1153 * absolute paths, return NULL in that case.1154 */1155static const char *skip_tree_prefix(struct apply_state *state,1156 const char *line,1157 int llen)1158{1159 int nslash;1160 int i;11611162 if (!state->p_value)1163 return (llen && line[0] == '/') ? NULL : line;11641165 nslash = state->p_value;1166 for (i = 0; i < llen; i++) {1167 int ch = line[i];1168 if (ch == '/' && --nslash <= 0)1169 return (i == 0) ? NULL : &line[i + 1];1170 }1171 return NULL;1172}11731174/*1175 * This is to extract the same name that appears on "diff --git"1176 * line. We do not find and return anything if it is a rename1177 * patch, and it is OK because we will find the name elsewhere.1178 * We need to reliably find name only when it is mode-change only,1179 * creation or deletion of an empty file. In any of these cases,1180 * both sides are the same name under a/ and b/ respectively.1181 */1182static char *git_header_name(struct apply_state *state,1183 const char *line,1184 int llen)1185{1186 const char *name;1187 const char *second = NULL;1188 size_t len, line_len;11891190 line += strlen("diff --git ");1191 llen -= strlen("diff --git ");11921193 if (*line == '"') {1194 const char *cp;1195 struct strbuf first = STRBUF_INIT;1196 struct strbuf sp = STRBUF_INIT;11971198 if (unquote_c_style(&first, line, &second))1199 goto free_and_fail1;12001201 /* strip the a/b prefix including trailing slash */1202 cp = skip_tree_prefix(state, first.buf, first.len);1203 if (!cp)1204 goto free_and_fail1;1205 strbuf_remove(&first, 0, cp - first.buf);12061207 /*1208 * second points at one past closing dq of name.1209 * find the second name.1210 */1211 while ((second < line + llen) && isspace(*second))1212 second++;12131214 if (line + llen <= second)1215 goto free_and_fail1;1216 if (*second == '"') {1217 if (unquote_c_style(&sp, second, NULL))1218 goto free_and_fail1;1219 cp = skip_tree_prefix(state, sp.buf, sp.len);1220 if (!cp)1221 goto free_and_fail1;1222 /* They must match, otherwise ignore */1223 if (strcmp(cp, first.buf))1224 goto free_and_fail1;1225 strbuf_release(&sp);1226 return strbuf_detach(&first, NULL);1227 }12281229 /* unquoted second */1230 cp = skip_tree_prefix(state, second, line + llen - second);1231 if (!cp)1232 goto free_and_fail1;1233 if (line + llen - cp != first.len ||1234 memcmp(first.buf, cp, first.len))1235 goto free_and_fail1;1236 return strbuf_detach(&first, NULL);12371238 free_and_fail1:1239 strbuf_release(&first);1240 strbuf_release(&sp);1241 return NULL;1242 }12431244 /* unquoted first name */1245 name = skip_tree_prefix(state, line, llen);1246 if (!name)1247 return NULL;12481249 /*1250 * since the first name is unquoted, a dq if exists must be1251 * the beginning of the second name.1252 */1253 for (second = name; second < line + llen; second++) {1254 if (*second == '"') {1255 struct strbuf sp = STRBUF_INIT;1256 const char *np;12571258 if (unquote_c_style(&sp, second, NULL))1259 goto free_and_fail2;12601261 np = skip_tree_prefix(state, sp.buf, sp.len);1262 if (!np)1263 goto free_and_fail2;12641265 len = sp.buf + sp.len - np;1266 if (len < second - name &&1267 !strncmp(np, name, len) &&1268 isspace(name[len])) {1269 /* Good */1270 strbuf_remove(&sp, 0, np - sp.buf);1271 return strbuf_detach(&sp, NULL);1272 }12731274 free_and_fail2:1275 strbuf_release(&sp);1276 return NULL;1277 }1278 }12791280 /*1281 * Accept a name only if it shows up twice, exactly the same1282 * form.1283 */1284 second = strchr(name, '\n');1285 if (!second)1286 return NULL;1287 line_len = second - name;1288 for (len = 0 ; ; len++) {1289 switch (name[len]) {1290 default:1291 continue;1292 case '\n':1293 return NULL;1294 case '\t': case ' ':1295 /*1296 * Is this the separator between the preimage1297 * and the postimage pathname? Again, we are1298 * only interested in the case where there is1299 * no rename, as this is only to set def_name1300 * and a rename patch has the names elsewhere1301 * in an unambiguous form.1302 */1303 if (!name[len + 1])1304 return NULL; /* no postimage name */1305 second = skip_tree_prefix(state, name + len + 1,1306 line_len - (len + 1));1307 if (!second)1308 return NULL;1309 /*1310 * Does len bytes starting at "name" and "second"1311 * (that are separated by one HT or SP we just1312 * found) exactly match?1313 */1314 if (second[len] == '\n' && !strncmp(name, second, len))1315 return xmemdupz(name, len);1316 }1317 }1318}13191320static int check_header_line(struct apply_state *state, struct patch *patch)1321{1322 int extensions = (patch->is_delete == 1) + (patch->is_new == 1) +1323 (patch->is_rename == 1) + (patch->is_copy == 1);1324 if (extensions > 1)1325 return error(_("inconsistent header lines %d and %d"),1326 patch->extension_linenr, state->linenr);1327 if (extensions && !patch->extension_linenr)1328 patch->extension_linenr = state->linenr;1329 return 0;1330}13311332/* Verify that we recognize the lines following a git header */1333static int parse_git_header(struct apply_state *state,1334 const char *line,1335 int len,1336 unsigned int size,1337 struct patch *patch)1338{1339 unsigned long offset;13401341 /* A git diff has explicit new/delete information, so we don't guess */1342 patch->is_new = 0;1343 patch->is_delete = 0;13441345 /*1346 * Some things may not have the old name in the1347 * rest of the headers anywhere (pure mode changes,1348 * or removing or adding empty files), so we get1349 * the default name from the header.1350 */1351 patch->def_name = git_header_name(state, line, len);1352 if (patch->def_name && state->root.len) {1353 char *s = xstrfmt("%s%s", state->root.buf, patch->def_name);1354 free(patch->def_name);1355 patch->def_name = s;1356 }13571358 line += len;1359 size -= len;1360 state->linenr++;1361 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, state->linenr++) {1362 static const struct opentry {1363 const char *str;1364 int (*fn)(struct apply_state *, const char *, struct patch *);1365 } optable[] = {1366 { "@@ -", gitdiff_hdrend },1367 { "--- ", gitdiff_oldname },1368 { "+++ ", gitdiff_newname },1369 { "old mode ", gitdiff_oldmode },1370 { "new mode ", gitdiff_newmode },1371 { "deleted file mode ", gitdiff_delete },1372 { "new file mode ", gitdiff_newfile },1373 { "copy from ", gitdiff_copysrc },1374 { "copy to ", gitdiff_copydst },1375 { "rename old ", gitdiff_renamesrc },1376 { "rename new ", gitdiff_renamedst },1377 { "rename from ", gitdiff_renamesrc },1378 { "rename to ", gitdiff_renamedst },1379 { "similarity index ", gitdiff_similarity },1380 { "dissimilarity index ", gitdiff_dissimilarity },1381 { "index ", gitdiff_index },1382 { "", gitdiff_unrecognized },1383 };1384 int i;13851386 len = linelen(line, size);1387 if (!len || line[len-1] != '\n')1388 break;1389 for (i = 0; i < ARRAY_SIZE(optable); i++) {1390 const struct opentry *p = optable + i;1391 int oplen = strlen(p->str);1392 int res;1393 if (len < oplen || memcmp(p->str, line, oplen))1394 continue;1395 res = p->fn(state, line + oplen, patch);1396 if (res < 0)1397 return -1;1398 if (check_header_line(state, patch))1399 return -1;1400 if (res > 0)1401 return offset;1402 break;1403 }1404 }14051406 return offset;1407}14081409static int parse_num(const char *line, unsigned long *p)1410{1411 char *ptr;14121413 if (!isdigit(*line))1414 return 0;1415 *p = strtoul(line, &ptr, 10);1416 return ptr - line;1417}14181419static int parse_range(const char *line, int len, int offset, const char *expect,1420 unsigned long *p1, unsigned long *p2)1421{1422 int digits, ex;14231424 if (offset < 0 || offset >= len)1425 return -1;1426 line += offset;1427 len -= offset;14281429 digits = parse_num(line, p1);1430 if (!digits)1431 return -1;14321433 offset += digits;1434 line += digits;1435 len -= digits;14361437 *p2 = 1;1438 if (*line == ',') {1439 digits = parse_num(line+1, p2);1440 if (!digits)1441 return -1;14421443 offset += digits+1;1444 line += digits+1;1445 len -= digits+1;1446 }14471448 ex = strlen(expect);1449 if (ex > len)1450 return -1;1451 if (memcmp(line, expect, ex))1452 return -1;14531454 return offset + ex;1455}14561457static void recount_diff(const char *line, int size, struct fragment *fragment)1458{1459 int oldlines = 0, newlines = 0, ret = 0;14601461 if (size < 1) {1462 warning("recount: ignore empty hunk");1463 return;1464 }14651466 for (;;) {1467 int len = linelen(line, size);1468 size -= len;1469 line += len;14701471 if (size < 1)1472 break;14731474 switch (*line) {1475 case ' ': case '\n':1476 newlines++;1477 /* fall through */1478 case '-':1479 oldlines++;1480 continue;1481 case '+':1482 newlines++;1483 continue;1484 case '\\':1485 continue;1486 case '@':1487 ret = size < 3 || !starts_with(line, "@@ ");1488 break;1489 case 'd':1490 ret = size < 5 || !starts_with(line, "diff ");1491 break;1492 default:1493 ret = -1;1494 break;1495 }1496 if (ret) {1497 warning(_("recount: unexpected line: %.*s"),1498 (int)linelen(line, size), line);1499 return;1500 }1501 break;1502 }1503 fragment->oldlines = oldlines;1504 fragment->newlines = newlines;1505}15061507/*1508 * Parse a unified diff fragment header of the1509 * form "@@ -a,b +c,d @@"1510 */1511static int parse_fragment_header(const char *line, int len, struct fragment *fragment)1512{1513 int offset;15141515 if (!len || line[len-1] != '\n')1516 return -1;15171518 /* Figure out the number of lines in a fragment */1519 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);1520 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);15211522 return offset;1523}15241525/*1526 * Find file diff header1527 *1528 * Returns:1529 * -1 if no header was found1530 * -128 in case of error1531 * the size of the header in bytes (called "offset") otherwise1532 */1533static int find_header(struct apply_state *state,1534 const char *line,1535 unsigned long size,1536 int *hdrsize,1537 struct patch *patch)1538{1539 unsigned long offset, len;15401541 patch->is_toplevel_relative = 0;1542 patch->is_rename = patch->is_copy = 0;1543 patch->is_new = patch->is_delete = -1;1544 patch->old_mode = patch->new_mode = 0;1545 patch->old_name = patch->new_name = NULL;1546 for (offset = 0; size > 0; offset += len, size -= len, line += len, state->linenr++) {1547 unsigned long nextlen;15481549 len = linelen(line, size);1550 if (!len)1551 break;15521553 /* Testing this early allows us to take a few shortcuts.. */1554 if (len < 6)1555 continue;15561557 /*1558 * Make sure we don't find any unconnected patch fragments.1559 * That's a sign that we didn't find a header, and that a1560 * patch has become corrupted/broken up.1561 */1562 if (!memcmp("@@ -", line, 4)) {1563 struct fragment dummy;1564 if (parse_fragment_header(line, len, &dummy) < 0)1565 continue;1566 error(_("patch fragment without header at line %d: %.*s"),1567 state->linenr, (int)len-1, line);1568 return -128;1569 }15701571 if (size < len + 6)1572 break;15731574 /*1575 * Git patch? It might not have a real patch, just a rename1576 * or mode change, so we handle that specially1577 */1578 if (!memcmp("diff --git ", line, 11)) {1579 int git_hdr_len = parse_git_header(state, line, len, size, patch);1580 if (git_hdr_len < 0)1581 return -128;1582 if (git_hdr_len <= len)1583 continue;1584 if (!patch->old_name && !patch->new_name) {1585 if (!patch->def_name) {1586 error(Q_("git diff header lacks filename information when removing "1587 "%d leading pathname component (line %d)",1588 "git diff header lacks filename information when removing "1589 "%d leading pathname components (line %d)",1590 state->p_value),1591 state->p_value, state->linenr);1592 return -128;1593 }1594 patch->old_name = xstrdup(patch->def_name);1595 patch->new_name = xstrdup(patch->def_name);1596 }1597 if ((!patch->new_name && !patch->is_delete) ||1598 (!patch->old_name && !patch->is_new)) {1599 error(_("git diff header lacks filename information "1600 "(line %d)"), state->linenr);1601 return -128;1602 }1603 patch->is_toplevel_relative = 1;1604 *hdrsize = git_hdr_len;1605 return offset;1606 }16071608 /* --- followed by +++ ? */1609 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))1610 continue;16111612 /*1613 * We only accept unified patches, so we want it to1614 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1615 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1616 */1617 nextlen = linelen(line + len, size - len);1618 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))1619 continue;16201621 /* Ok, we'll consider it a patch */1622 if (parse_traditional_patch(state, line, line+len, patch))1623 return -128;1624 *hdrsize = len + nextlen;1625 state->linenr += 2;1626 return offset;1627 }1628 return -1;1629}16301631static void record_ws_error(struct apply_state *state,1632 unsigned result,1633 const char *line,1634 int len,1635 int linenr)1636{1637 char *err;16381639 if (!result)1640 return;16411642 state->whitespace_error++;1643 if (state->squelch_whitespace_errors &&1644 state->squelch_whitespace_errors < state->whitespace_error)1645 return;16461647 err = whitespace_error_string(result);1648 if (state->apply_verbosity > verbosity_silent)1649 fprintf(stderr, "%s:%d: %s.\n%.*s\n",1650 state->patch_input_file, linenr, err, len, line);1651 free(err);1652}16531654static void check_whitespace(struct apply_state *state,1655 const char *line,1656 int len,1657 unsigned ws_rule)1658{1659 unsigned result = ws_check(line + 1, len - 1, ws_rule);16601661 record_ws_error(state, result, line + 1, len - 2, state->linenr);1662}16631664/*1665 * Check if the patch has context lines with CRLF or1666 * the patch wants to remove lines with CRLF.1667 */1668static void check_old_for_crlf(struct patch *patch, const char *line, int len)1669{1670 if (len >= 2 && line[len-1] == '\n' && line[len-2] == '\r') {1671 patch->ws_rule |= WS_CR_AT_EOL;1672 patch->crlf_in_old = 1;1673 }1674}167516761677/*1678 * Parse a unified diff. Note that this really needs to parse each1679 * fragment separately, since the only way to know the difference1680 * between a "---" that is part of a patch, and a "---" that starts1681 * the next patch is to look at the line counts..1682 */1683static int parse_fragment(struct apply_state *state,1684 const char *line,1685 unsigned long size,1686 struct patch *patch,1687 struct fragment *fragment)1688{1689 int added, deleted;1690 int len = linelen(line, size), offset;1691 unsigned long oldlines, newlines;1692 unsigned long leading, trailing;16931694 offset = parse_fragment_header(line, len, fragment);1695 if (offset < 0)1696 return -1;1697 if (offset > 0 && patch->recount)1698 recount_diff(line + offset, size - offset, fragment);1699 oldlines = fragment->oldlines;1700 newlines = fragment->newlines;1701 leading = 0;1702 trailing = 0;17031704 /* Parse the thing.. */1705 line += len;1706 size -= len;1707 state->linenr++;1708 added = deleted = 0;1709 for (offset = len;1710 0 < size;1711 offset += len, size -= len, line += len, state->linenr++) {1712 if (!oldlines && !newlines)1713 break;1714 len = linelen(line, size);1715 if (!len || line[len-1] != '\n')1716 return -1;1717 switch (*line) {1718 default:1719 return -1;1720 case '\n': /* newer GNU diff, an empty context line */1721 case ' ':1722 oldlines--;1723 newlines--;1724 if (!deleted && !added)1725 leading++;1726 trailing++;1727 check_old_for_crlf(patch, line, len);1728 if (!state->apply_in_reverse &&1729 state->ws_error_action == correct_ws_error)1730 check_whitespace(state, line, len, patch->ws_rule);1731 break;1732 case '-':1733 if (!state->apply_in_reverse)1734 check_old_for_crlf(patch, line, len);1735 if (state->apply_in_reverse &&1736 state->ws_error_action != nowarn_ws_error)1737 check_whitespace(state, line, len, patch->ws_rule);1738 deleted++;1739 oldlines--;1740 trailing = 0;1741 break;1742 case '+':1743 if (state->apply_in_reverse)1744 check_old_for_crlf(patch, line, len);1745 if (!state->apply_in_reverse &&1746 state->ws_error_action != nowarn_ws_error)1747 check_whitespace(state, line, len, patch->ws_rule);1748 added++;1749 newlines--;1750 trailing = 0;1751 break;17521753 /*1754 * We allow "\ No newline at end of file". Depending1755 * on locale settings when the patch was produced we1756 * don't know what this line looks like. The only1757 * thing we do know is that it begins with "\ ".1758 * Checking for 12 is just for sanity check -- any1759 * l10n of "\ No newline..." is at least that long.1760 */1761 case '\\':1762 if (len < 12 || memcmp(line, "\\ ", 2))1763 return -1;1764 break;1765 }1766 }1767 if (oldlines || newlines)1768 return -1;1769 if (!deleted && !added)1770 return -1;17711772 fragment->leading = leading;1773 fragment->trailing = trailing;17741775 /*1776 * If a fragment ends with an incomplete line, we failed to include1777 * it in the above loop because we hit oldlines == newlines == 01778 * before seeing it.1779 */1780 if (12 < size && !memcmp(line, "\\ ", 2))1781 offset += linelen(line, size);17821783 patch->lines_added += added;1784 patch->lines_deleted += deleted;17851786 if (0 < patch->is_new && oldlines)1787 return error(_("new file depends on old contents"));1788 if (0 < patch->is_delete && newlines)1789 return error(_("deleted file still has contents"));1790 return offset;1791}17921793/*1794 * We have seen "diff --git a/... b/..." header (or a traditional patch1795 * header). Read hunks that belong to this patch into fragments and hang1796 * them to the given patch structure.1797 *1798 * The (fragment->patch, fragment->size) pair points into the memory given1799 * by the caller, not a copy, when we return.1800 *1801 * Returns:1802 * -1 in case of error,1803 * the number of bytes in the patch otherwise.1804 */1805static int parse_single_patch(struct apply_state *state,1806 const char *line,1807 unsigned long size,1808 struct patch *patch)1809{1810 unsigned long offset = 0;1811 unsigned long oldlines = 0, newlines = 0, context = 0;1812 struct fragment **fragp = &patch->fragments;18131814 while (size > 4 && !memcmp(line, "@@ -", 4)) {1815 struct fragment *fragment;1816 int len;18171818 fragment = xcalloc(1, sizeof(*fragment));1819 fragment->linenr = state->linenr;1820 len = parse_fragment(state, line, size, patch, fragment);1821 if (len <= 0) {1822 free(fragment);1823 return error(_("corrupt patch at line %d"), state->linenr);1824 }1825 fragment->patch = line;1826 fragment->size = len;1827 oldlines += fragment->oldlines;1828 newlines += fragment->newlines;1829 context += fragment->leading + fragment->trailing;18301831 *fragp = fragment;1832 fragp = &fragment->next;18331834 offset += len;1835 line += len;1836 size -= len;1837 }18381839 /*1840 * If something was removed (i.e. we have old-lines) it cannot1841 * be creation, and if something was added it cannot be1842 * deletion. However, the reverse is not true; --unified=01843 * patches that only add are not necessarily creation even1844 * though they do not have any old lines, and ones that only1845 * delete are not necessarily deletion.1846 *1847 * Unfortunately, a real creation/deletion patch do _not_ have1848 * any context line by definition, so we cannot safely tell it1849 * apart with --unified=0 insanity. At least if the patch has1850 * more than one hunk it is not creation or deletion.1851 */1852 if (patch->is_new < 0 &&1853 (oldlines || (patch->fragments && patch->fragments->next)))1854 patch->is_new = 0;1855 if (patch->is_delete < 0 &&1856 (newlines || (patch->fragments && patch->fragments->next)))1857 patch->is_delete = 0;18581859 if (0 < patch->is_new && oldlines)1860 return error(_("new file %s depends on old contents"), patch->new_name);1861 if (0 < patch->is_delete && newlines)1862 return error(_("deleted file %s still has contents"), patch->old_name);1863 if (!patch->is_delete && !newlines && context && state->apply_verbosity > verbosity_silent)1864 fprintf_ln(stderr,1865 _("** warning: "1866 "file %s becomes empty but is not deleted"),1867 patch->new_name);18681869 return offset;1870}18711872static inline int metadata_changes(struct patch *patch)1873{1874 return patch->is_rename > 0 ||1875 patch->is_copy > 0 ||1876 patch->is_new > 0 ||1877 patch->is_delete ||1878 (patch->old_mode && patch->new_mode &&1879 patch->old_mode != patch->new_mode);1880}18811882static char *inflate_it(const void *data, unsigned long size,1883 unsigned long inflated_size)1884{1885 git_zstream stream;1886 void *out;1887 int st;18881889 memset(&stream, 0, sizeof(stream));18901891 stream.next_in = (unsigned char *)data;1892 stream.avail_in = size;1893 stream.next_out = out = xmalloc(inflated_size);1894 stream.avail_out = inflated_size;1895 git_inflate_init(&stream);1896 st = git_inflate(&stream, Z_FINISH);1897 git_inflate_end(&stream);1898 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {1899 free(out);1900 return NULL;1901 }1902 return out;1903}19041905/*1906 * Read a binary hunk and return a new fragment; fragment->patch1907 * points at an allocated memory that the caller must free, so1908 * it is marked as "->free_patch = 1".1909 */1910static struct fragment *parse_binary_hunk(struct apply_state *state,1911 char **buf_p,1912 unsigned long *sz_p,1913 int *status_p,1914 int *used_p)1915{1916 /*1917 * Expect a line that begins with binary patch method ("literal"1918 * or "delta"), followed by the length of data before deflating.1919 * a sequence of 'length-byte' followed by base-85 encoded data1920 * should follow, terminated by a newline.1921 *1922 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1923 * and we would limit the patch line to 66 characters,1924 * so one line can fit up to 13 groups that would decode1925 * to 52 bytes max. The length byte 'A'-'Z' corresponds1926 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1927 */1928 int llen, used;1929 unsigned long size = *sz_p;1930 char *buffer = *buf_p;1931 int patch_method;1932 unsigned long origlen;1933 char *data = NULL;1934 int hunk_size = 0;1935 struct fragment *frag;19361937 llen = linelen(buffer, size);1938 used = llen;19391940 *status_p = 0;19411942 if (starts_with(buffer, "delta ")) {1943 patch_method = BINARY_DELTA_DEFLATED;1944 origlen = strtoul(buffer + 6, NULL, 10);1945 }1946 else if (starts_with(buffer, "literal ")) {1947 patch_method = BINARY_LITERAL_DEFLATED;1948 origlen = strtoul(buffer + 8, NULL, 10);1949 }1950 else1951 return NULL;19521953 state->linenr++;1954 buffer += llen;1955 while (1) {1956 int byte_length, max_byte_length, newsize;1957 llen = linelen(buffer, size);1958 used += llen;1959 state->linenr++;1960 if (llen == 1) {1961 /* consume the blank line */1962 buffer++;1963 size--;1964 break;1965 }1966 /*1967 * Minimum line is "A00000\n" which is 7-byte long,1968 * and the line length must be multiple of 5 plus 2.1969 */1970 if ((llen < 7) || (llen-2) % 5)1971 goto corrupt;1972 max_byte_length = (llen - 2) / 5 * 4;1973 byte_length = *buffer;1974 if ('A' <= byte_length && byte_length <= 'Z')1975 byte_length = byte_length - 'A' + 1;1976 else if ('a' <= byte_length && byte_length <= 'z')1977 byte_length = byte_length - 'a' + 27;1978 else1979 goto corrupt;1980 /* if the input length was not multiple of 4, we would1981 * have filler at the end but the filler should never1982 * exceed 3 bytes1983 */1984 if (max_byte_length < byte_length ||1985 byte_length <= max_byte_length - 4)1986 goto corrupt;1987 newsize = hunk_size + byte_length;1988 data = xrealloc(data, newsize);1989 if (decode_85(data + hunk_size, buffer + 1, byte_length))1990 goto corrupt;1991 hunk_size = newsize;1992 buffer += llen;1993 size -= llen;1994 }19951996 frag = xcalloc(1, sizeof(*frag));1997 frag->patch = inflate_it(data, hunk_size, origlen);1998 frag->free_patch = 1;1999 if (!frag->patch)2000 goto corrupt;2001 free(data);2002 frag->size = origlen;2003 *buf_p = buffer;2004 *sz_p = size;2005 *used_p = used;2006 frag->binary_patch_method = patch_method;2007 return frag;20082009 corrupt:2010 free(data);2011 *status_p = -1;2012 error(_("corrupt binary patch at line %d: %.*s"),2013 state->linenr-1, llen-1, buffer);2014 return NULL;2015}20162017/*2018 * Returns:2019 * -1 in case of error,2020 * the length of the parsed binary patch otherwise2021 */2022static int parse_binary(struct apply_state *state,2023 char *buffer,2024 unsigned long size,2025 struct patch *patch)2026{2027 /*2028 * We have read "GIT binary patch\n"; what follows is a line2029 * that says the patch method (currently, either "literal" or2030 * "delta") and the length of data before deflating; a2031 * sequence of 'length-byte' followed by base-85 encoded data2032 * follows.2033 *2034 * When a binary patch is reversible, there is another binary2035 * hunk in the same format, starting with patch method (either2036 * "literal" or "delta") with the length of data, and a sequence2037 * of length-byte + base-85 encoded data, terminated with another2038 * empty line. This data, when applied to the postimage, produces2039 * the preimage.2040 */2041 struct fragment *forward;2042 struct fragment *reverse;2043 int status;2044 int used, used_1;20452046 forward = parse_binary_hunk(state, &buffer, &size, &status, &used);2047 if (!forward && !status)2048 /* there has to be one hunk (forward hunk) */2049 return error(_("unrecognized binary patch at line %d"), state->linenr-1);2050 if (status)2051 /* otherwise we already gave an error message */2052 return status;20532054 reverse = parse_binary_hunk(state, &buffer, &size, &status, &used_1);2055 if (reverse)2056 used += used_1;2057 else if (status) {2058 /*2059 * Not having reverse hunk is not an error, but having2060 * a corrupt reverse hunk is.2061 */2062 free((void*) forward->patch);2063 free(forward);2064 return status;2065 }2066 forward->next = reverse;2067 patch->fragments = forward;2068 patch->is_binary = 1;2069 return used;2070}20712072static void prefix_one(struct apply_state *state, char **name)2073{2074 char *old_name = *name;2075 if (!old_name)2076 return;2077 *name = prefix_filename(state->prefix, *name);2078 free(old_name);2079}20802081static void prefix_patch(struct apply_state *state, struct patch *p)2082{2083 if (!state->prefix || p->is_toplevel_relative)2084 return;2085 prefix_one(state, &p->new_name);2086 prefix_one(state, &p->old_name);2087}20882089/*2090 * include/exclude2091 */20922093static void add_name_limit(struct apply_state *state,2094 const char *name,2095 int exclude)2096{2097 struct string_list_item *it;20982099 it = string_list_append(&state->limit_by_name, name);2100 it->util = exclude ? NULL : (void *) 1;2101}21022103static int use_patch(struct apply_state *state, struct patch *p)2104{2105 const char *pathname = p->new_name ? p->new_name : p->old_name;2106 int i;21072108 /* Paths outside are not touched regardless of "--include" */2109 if (state->prefix && *state->prefix) {2110 const char *rest;2111 if (!skip_prefix(pathname, state->prefix, &rest) || !*rest)2112 return 0;2113 }21142115 /* See if it matches any of exclude/include rule */2116 for (i = 0; i < state->limit_by_name.nr; i++) {2117 struct string_list_item *it = &state->limit_by_name.items[i];2118 if (!wildmatch(it->string, pathname, 0))2119 return (it->util != NULL);2120 }21212122 /*2123 * If we had any include, a path that does not match any rule is2124 * not used. Otherwise, we saw bunch of exclude rules (or none)2125 * and such a path is used.2126 */2127 return !state->has_include;2128}21292130/*2131 * Read the patch text in "buffer" that extends for "size" bytes; stop2132 * reading after seeing a single patch (i.e. changes to a single file).2133 * Create fragments (i.e. patch hunks) and hang them to the given patch.2134 *2135 * Returns:2136 * -1 if no header was found or parse_binary() failed,2137 * -128 on another error,2138 * the number of bytes consumed otherwise,2139 * so that the caller can call us again for the next patch.2140 */2141static int parse_chunk(struct apply_state *state, char *buffer, unsigned long size, struct patch *patch)2142{2143 int hdrsize, patchsize;2144 int offset = find_header(state, buffer, size, &hdrsize, patch);21452146 if (offset < 0)2147 return offset;21482149 prefix_patch(state, patch);21502151 if (!use_patch(state, patch))2152 patch->ws_rule = 0;2153 else2154 patch->ws_rule = whitespace_rule(patch->new_name2155 ? patch->new_name2156 : patch->old_name);21572158 patchsize = parse_single_patch(state,2159 buffer + offset + hdrsize,2160 size - offset - hdrsize,2161 patch);21622163 if (patchsize < 0)2164 return -128;21652166 if (!patchsize) {2167 static const char git_binary[] = "GIT binary patch\n";2168 int hd = hdrsize + offset;2169 unsigned long llen = linelen(buffer + hd, size - hd);21702171 if (llen == sizeof(git_binary) - 1 &&2172 !memcmp(git_binary, buffer + hd, llen)) {2173 int used;2174 state->linenr++;2175 used = parse_binary(state, buffer + hd + llen,2176 size - hd - llen, patch);2177 if (used < 0)2178 return -1;2179 if (used)2180 patchsize = used + llen;2181 else2182 patchsize = 0;2183 }2184 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {2185 static const char *binhdr[] = {2186 "Binary files ",2187 "Files ",2188 NULL,2189 };2190 int i;2191 for (i = 0; binhdr[i]; i++) {2192 int len = strlen(binhdr[i]);2193 if (len < size - hd &&2194 !memcmp(binhdr[i], buffer + hd, len)) {2195 state->linenr++;2196 patch->is_binary = 1;2197 patchsize = llen;2198 break;2199 }2200 }2201 }22022203 /* Empty patch cannot be applied if it is a text patch2204 * without metadata change. A binary patch appears2205 * empty to us here.2206 */2207 if ((state->apply || state->check) &&2208 (!patch->is_binary && !metadata_changes(patch))) {2209 error(_("patch with only garbage at line %d"), state->linenr);2210 return -128;2211 }2212 }22132214 return offset + hdrsize + patchsize;2215}22162217static void reverse_patches(struct patch *p)2218{2219 for (; p; p = p->next) {2220 struct fragment *frag = p->fragments;22212222 SWAP(p->new_name, p->old_name);2223 SWAP(p->new_mode, p->old_mode);2224 SWAP(p->is_new, p->is_delete);2225 SWAP(p->lines_added, p->lines_deleted);2226 SWAP(p->old_sha1_prefix, p->new_sha1_prefix);22272228 for (; frag; frag = frag->next) {2229 SWAP(frag->newpos, frag->oldpos);2230 SWAP(frag->newlines, frag->oldlines);2231 }2232 }2233}22342235static const char pluses[] =2236"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2237static const char minuses[]=2238"----------------------------------------------------------------------";22392240static void show_stats(struct apply_state *state, struct patch *patch)2241{2242 struct strbuf qname = STRBUF_INIT;2243 char *cp = patch->new_name ? patch->new_name : patch->old_name;2244 int max, add, del;22452246 quote_c_style(cp, &qname, NULL, 0);22472248 /*2249 * "scale" the filename2250 */2251 max = state->max_len;2252 if (max > 50)2253 max = 50;22542255 if (qname.len > max) {2256 cp = strchr(qname.buf + qname.len + 3 - max, '/');2257 if (!cp)2258 cp = qname.buf + qname.len + 3 - max;2259 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);2260 }22612262 if (patch->is_binary) {2263 printf(" %-*s | Bin\n", max, qname.buf);2264 strbuf_release(&qname);2265 return;2266 }22672268 printf(" %-*s |", max, qname.buf);2269 strbuf_release(&qname);22702271 /*2272 * scale the add/delete2273 */2274 max = max + state->max_change > 70 ? 70 - max : state->max_change;2275 add = patch->lines_added;2276 del = patch->lines_deleted;22772278 if (state->max_change > 0) {2279 int total = ((add + del) * max + state->max_change / 2) / state->max_change;2280 add = (add * max + state->max_change / 2) / state->max_change;2281 del = total - add;2282 }2283 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2284 add, pluses, del, minuses);2285}22862287static int read_old_data(struct stat *st, struct patch *patch,2288 const char *path, struct strbuf *buf)2289{2290 enum safe_crlf safe_crlf = patch->crlf_in_old ?2291 SAFE_CRLF_KEEP_CRLF : SAFE_CRLF_RENORMALIZE;2292 switch (st->st_mode & S_IFMT) {2293 case S_IFLNK:2294 if (strbuf_readlink(buf, path, st->st_size) < 0)2295 return error(_("unable to read symlink %s"), path);2296 return 0;2297 case S_IFREG:2298 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)2299 return error(_("unable to open or read %s"), path);2300 /*2301 * "git apply" without "--index/--cached" should never look2302 * at the index; the target file may not have been added to2303 * the index yet, and we may not even be in any Git repository.2304 * Pass NULL to convert_to_git() to stress this; the function2305 * should never look at the index when explicit crlf option2306 * is given.2307 */2308 convert_to_git(NULL, path, buf->buf, buf->len, buf, safe_crlf);2309 return 0;2310 default:2311 return -1;2312 }2313}23142315/*2316 * Update the preimage, and the common lines in postimage,2317 * from buffer buf of length len. If postlen is 0 the postimage2318 * is updated in place, otherwise it's updated on a new buffer2319 * of length postlen2320 */23212322static void update_pre_post_images(struct image *preimage,2323 struct image *postimage,2324 char *buf,2325 size_t len, size_t postlen)2326{2327 int i, ctx, reduced;2328 char *new, *old, *fixed;2329 struct image fixed_preimage;23302331 /*2332 * Update the preimage with whitespace fixes. Note that we2333 * are not losing preimage->buf -- apply_one_fragment() will2334 * free "oldlines".2335 */2336 prepare_image(&fixed_preimage, buf, len, 1);2337 assert(postlen2338 ? fixed_preimage.nr == preimage->nr2339 : fixed_preimage.nr <= preimage->nr);2340 for (i = 0; i < fixed_preimage.nr; i++)2341 fixed_preimage.line[i].flag = preimage->line[i].flag;2342 free(preimage->line_allocated);2343 *preimage = fixed_preimage;23442345 /*2346 * Adjust the common context lines in postimage. This can be2347 * done in-place when we are shrinking it with whitespace2348 * fixing, but needs a new buffer when ignoring whitespace or2349 * expanding leading tabs to spaces.2350 *2351 * We trust the caller to tell us if the update can be done2352 * in place (postlen==0) or not.2353 */2354 old = postimage->buf;2355 if (postlen)2356 new = postimage->buf = xmalloc(postlen);2357 else2358 new = old;2359 fixed = preimage->buf;23602361 for (i = reduced = ctx = 0; i < postimage->nr; i++) {2362 size_t l_len = postimage->line[i].len;2363 if (!(postimage->line[i].flag & LINE_COMMON)) {2364 /* an added line -- no counterparts in preimage */2365 memmove(new, old, l_len);2366 old += l_len;2367 new += l_len;2368 continue;2369 }23702371 /* a common context -- skip it in the original postimage */2372 old += l_len;23732374 /* and find the corresponding one in the fixed preimage */2375 while (ctx < preimage->nr &&2376 !(preimage->line[ctx].flag & LINE_COMMON)) {2377 fixed += preimage->line[ctx].len;2378 ctx++;2379 }23802381 /*2382 * preimage is expected to run out, if the caller2383 * fixed addition of trailing blank lines.2384 */2385 if (preimage->nr <= ctx) {2386 reduced++;2387 continue;2388 }23892390 /* and copy it in, while fixing the line length */2391 l_len = preimage->line[ctx].len;2392 memcpy(new, fixed, l_len);2393 new += l_len;2394 fixed += l_len;2395 postimage->line[i].len = l_len;2396 ctx++;2397 }23982399 if (postlen2400 ? postlen < new - postimage->buf2401 : postimage->len < new - postimage->buf)2402 die("BUG: caller miscounted postlen: asked %d, orig = %d, used = %d",2403 (int)postlen, (int) postimage->len, (int)(new - postimage->buf));24042405 /* Fix the length of the whole thing */2406 postimage->len = new - postimage->buf;2407 postimage->nr -= reduced;2408}24092410static int line_by_line_fuzzy_match(struct image *img,2411 struct image *preimage,2412 struct image *postimage,2413 unsigned long try,2414 int try_lno,2415 int preimage_limit)2416{2417 int i;2418 size_t imgoff = 0;2419 size_t preoff = 0;2420 size_t postlen = postimage->len;2421 size_t extra_chars;2422 char *buf;2423 char *preimage_eof;2424 char *preimage_end;2425 struct strbuf fixed;2426 char *fixed_buf;2427 size_t fixed_len;24282429 for (i = 0; i < preimage_limit; i++) {2430 size_t prelen = preimage->line[i].len;2431 size_t imglen = img->line[try_lno+i].len;24322433 if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,2434 preimage->buf + preoff, prelen))2435 return 0;2436 if (preimage->line[i].flag & LINE_COMMON)2437 postlen += imglen - prelen;2438 imgoff += imglen;2439 preoff += prelen;2440 }24412442 /*2443 * Ok, the preimage matches with whitespace fuzz.2444 *2445 * imgoff now holds the true length of the target that2446 * matches the preimage before the end of the file.2447 *2448 * Count the number of characters in the preimage that fall2449 * beyond the end of the file and make sure that all of them2450 * are whitespace characters. (This can only happen if2451 * we are removing blank lines at the end of the file.)2452 */2453 buf = preimage_eof = preimage->buf + preoff;2454 for ( ; i < preimage->nr; i++)2455 preoff += preimage->line[i].len;2456 preimage_end = preimage->buf + preoff;2457 for ( ; buf < preimage_end; buf++)2458 if (!isspace(*buf))2459 return 0;24602461 /*2462 * Update the preimage and the common postimage context2463 * lines to use the same whitespace as the target.2464 * If whitespace is missing in the target (i.e.2465 * if the preimage extends beyond the end of the file),2466 * use the whitespace from the preimage.2467 */2468 extra_chars = preimage_end - preimage_eof;2469 strbuf_init(&fixed, imgoff + extra_chars);2470 strbuf_add(&fixed, img->buf + try, imgoff);2471 strbuf_add(&fixed, preimage_eof, extra_chars);2472 fixed_buf = strbuf_detach(&fixed, &fixed_len);2473 update_pre_post_images(preimage, postimage,2474 fixed_buf, fixed_len, postlen);2475 return 1;2476}24772478static int match_fragment(struct apply_state *state,2479 struct image *img,2480 struct image *preimage,2481 struct image *postimage,2482 unsigned long try,2483 int try_lno,2484 unsigned ws_rule,2485 int match_beginning, int match_end)2486{2487 int i;2488 char *fixed_buf, *buf, *orig, *target;2489 struct strbuf fixed;2490 size_t fixed_len, postlen;2491 int preimage_limit;24922493 if (preimage->nr + try_lno <= img->nr) {2494 /*2495 * The hunk falls within the boundaries of img.2496 */2497 preimage_limit = preimage->nr;2498 if (match_end && (preimage->nr + try_lno != img->nr))2499 return 0;2500 } else if (state->ws_error_action == correct_ws_error &&2501 (ws_rule & WS_BLANK_AT_EOF)) {2502 /*2503 * This hunk extends beyond the end of img, and we are2504 * removing blank lines at the end of the file. This2505 * many lines from the beginning of the preimage must2506 * match with img, and the remainder of the preimage2507 * must be blank.2508 */2509 preimage_limit = img->nr - try_lno;2510 } else {2511 /*2512 * The hunk extends beyond the end of the img and2513 * we are not removing blanks at the end, so we2514 * should reject the hunk at this position.2515 */2516 return 0;2517 }25182519 if (match_beginning && try_lno)2520 return 0;25212522 /* Quick hash check */2523 for (i = 0; i < preimage_limit; i++)2524 if ((img->line[try_lno + i].flag & LINE_PATCHED) ||2525 (preimage->line[i].hash != img->line[try_lno + i].hash))2526 return 0;25272528 if (preimage_limit == preimage->nr) {2529 /*2530 * Do we have an exact match? If we were told to match2531 * at the end, size must be exactly at try+fragsize,2532 * otherwise try+fragsize must be still within the preimage,2533 * and either case, the old piece should match the preimage2534 * exactly.2535 */2536 if ((match_end2537 ? (try + preimage->len == img->len)2538 : (try + preimage->len <= img->len)) &&2539 !memcmp(img->buf + try, preimage->buf, preimage->len))2540 return 1;2541 } else {2542 /*2543 * The preimage extends beyond the end of img, so2544 * there cannot be an exact match.2545 *2546 * There must be one non-blank context line that match2547 * a line before the end of img.2548 */2549 char *buf_end;25502551 buf = preimage->buf;2552 buf_end = buf;2553 for (i = 0; i < preimage_limit; i++)2554 buf_end += preimage->line[i].len;25552556 for ( ; buf < buf_end; buf++)2557 if (!isspace(*buf))2558 break;2559 if (buf == buf_end)2560 return 0;2561 }25622563 /*2564 * No exact match. If we are ignoring whitespace, run a line-by-line2565 * fuzzy matching. We collect all the line length information because2566 * we need it to adjust whitespace if we match.2567 */2568 if (state->ws_ignore_action == ignore_ws_change)2569 return line_by_line_fuzzy_match(img, preimage, postimage,2570 try, try_lno, preimage_limit);25712572 if (state->ws_error_action != correct_ws_error)2573 return 0;25742575 /*2576 * The hunk does not apply byte-by-byte, but the hash says2577 * it might with whitespace fuzz. We weren't asked to2578 * ignore whitespace, we were asked to correct whitespace2579 * errors, so let's try matching after whitespace correction.2580 *2581 * While checking the preimage against the target, whitespace2582 * errors in both fixed, we count how large the corresponding2583 * postimage needs to be. The postimage prepared by2584 * apply_one_fragment() has whitespace errors fixed on added2585 * lines already, but the common lines were propagated as-is,2586 * which may become longer when their whitespace errors are2587 * fixed.2588 */25892590 /* First count added lines in postimage */2591 postlen = 0;2592 for (i = 0; i < postimage->nr; i++) {2593 if (!(postimage->line[i].flag & LINE_COMMON))2594 postlen += postimage->line[i].len;2595 }25962597 /*2598 * The preimage may extend beyond the end of the file,2599 * but in this loop we will only handle the part of the2600 * preimage that falls within the file.2601 */2602 strbuf_init(&fixed, preimage->len + 1);2603 orig = preimage->buf;2604 target = img->buf + try;2605 for (i = 0; i < preimage_limit; i++) {2606 size_t oldlen = preimage->line[i].len;2607 size_t tgtlen = img->line[try_lno + i].len;2608 size_t fixstart = fixed.len;2609 struct strbuf tgtfix;2610 int match;26112612 /* Try fixing the line in the preimage */2613 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);26142615 /* Try fixing the line in the target */2616 strbuf_init(&tgtfix, tgtlen);2617 ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);26182619 /*2620 * If they match, either the preimage was based on2621 * a version before our tree fixed whitespace breakage,2622 * or we are lacking a whitespace-fix patch the tree2623 * the preimage was based on already had (i.e. target2624 * has whitespace breakage, the preimage doesn't).2625 * In either case, we are fixing the whitespace breakages2626 * so we might as well take the fix together with their2627 * real change.2628 */2629 match = (tgtfix.len == fixed.len - fixstart &&2630 !memcmp(tgtfix.buf, fixed.buf + fixstart,2631 fixed.len - fixstart));26322633 /* Add the length if this is common with the postimage */2634 if (preimage->line[i].flag & LINE_COMMON)2635 postlen += tgtfix.len;26362637 strbuf_release(&tgtfix);2638 if (!match)2639 goto unmatch_exit;26402641 orig += oldlen;2642 target += tgtlen;2643 }264426452646 /*2647 * Now handle the lines in the preimage that falls beyond the2648 * end of the file (if any). They will only match if they are2649 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2650 * false).2651 */2652 for ( ; i < preimage->nr; i++) {2653 size_t fixstart = fixed.len; /* start of the fixed preimage */2654 size_t oldlen = preimage->line[i].len;2655 int j;26562657 /* Try fixing the line in the preimage */2658 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);26592660 for (j = fixstart; j < fixed.len; j++)2661 if (!isspace(fixed.buf[j]))2662 goto unmatch_exit;26632664 orig += oldlen;2665 }26662667 /*2668 * Yes, the preimage is based on an older version that still2669 * has whitespace breakages unfixed, and fixing them makes the2670 * hunk match. Update the context lines in the postimage.2671 */2672 fixed_buf = strbuf_detach(&fixed, &fixed_len);2673 if (postlen < postimage->len)2674 postlen = 0;2675 update_pre_post_images(preimage, postimage,2676 fixed_buf, fixed_len, postlen);2677 return 1;26782679 unmatch_exit:2680 strbuf_release(&fixed);2681 return 0;2682}26832684static int find_pos(struct apply_state *state,2685 struct image *img,2686 struct image *preimage,2687 struct image *postimage,2688 int line,2689 unsigned ws_rule,2690 int match_beginning, int match_end)2691{2692 int i;2693 unsigned long backwards, forwards, try;2694 int backwards_lno, forwards_lno, try_lno;26952696 /*2697 * If match_beginning or match_end is specified, there is no2698 * point starting from a wrong line that will never match and2699 * wander around and wait for a match at the specified end.2700 */2701 if (match_beginning)2702 line = 0;2703 else if (match_end)2704 line = img->nr - preimage->nr;27052706 /*2707 * Because the comparison is unsigned, the following test2708 * will also take care of a negative line number that can2709 * result when match_end and preimage is larger than the target.2710 */2711 if ((size_t) line > img->nr)2712 line = img->nr;27132714 try = 0;2715 for (i = 0; i < line; i++)2716 try += img->line[i].len;27172718 /*2719 * There's probably some smart way to do this, but I'll leave2720 * that to the smart and beautiful people. I'm simple and stupid.2721 */2722 backwards = try;2723 backwards_lno = line;2724 forwards = try;2725 forwards_lno = line;2726 try_lno = line;27272728 for (i = 0; ; i++) {2729 if (match_fragment(state, img, preimage, postimage,2730 try, try_lno, ws_rule,2731 match_beginning, match_end))2732 return try_lno;27332734 again:2735 if (backwards_lno == 0 && forwards_lno == img->nr)2736 break;27372738 if (i & 1) {2739 if (backwards_lno == 0) {2740 i++;2741 goto again;2742 }2743 backwards_lno--;2744 backwards -= img->line[backwards_lno].len;2745 try = backwards;2746 try_lno = backwards_lno;2747 } else {2748 if (forwards_lno == img->nr) {2749 i++;2750 goto again;2751 }2752 forwards += img->line[forwards_lno].len;2753 forwards_lno++;2754 try = forwards;2755 try_lno = forwards_lno;2756 }27572758 }2759 return -1;2760}27612762static void remove_first_line(struct image *img)2763{2764 img->buf += img->line[0].len;2765 img->len -= img->line[0].len;2766 img->line++;2767 img->nr--;2768}27692770static void remove_last_line(struct image *img)2771{2772 img->len -= img->line[--img->nr].len;2773}27742775/*2776 * The change from "preimage" and "postimage" has been found to2777 * apply at applied_pos (counts in line numbers) in "img".2778 * Update "img" to remove "preimage" and replace it with "postimage".2779 */2780static void update_image(struct apply_state *state,2781 struct image *img,2782 int applied_pos,2783 struct image *preimage,2784 struct image *postimage)2785{2786 /*2787 * remove the copy of preimage at offset in img2788 * and replace it with postimage2789 */2790 int i, nr;2791 size_t remove_count, insert_count, applied_at = 0;2792 char *result;2793 int preimage_limit;27942795 /*2796 * If we are removing blank lines at the end of img,2797 * the preimage may extend beyond the end.2798 * If that is the case, we must be careful only to2799 * remove the part of the preimage that falls within2800 * the boundaries of img. Initialize preimage_limit2801 * to the number of lines in the preimage that falls2802 * within the boundaries.2803 */2804 preimage_limit = preimage->nr;2805 if (preimage_limit > img->nr - applied_pos)2806 preimage_limit = img->nr - applied_pos;28072808 for (i = 0; i < applied_pos; i++)2809 applied_at += img->line[i].len;28102811 remove_count = 0;2812 for (i = 0; i < preimage_limit; i++)2813 remove_count += img->line[applied_pos + i].len;2814 insert_count = postimage->len;28152816 /* Adjust the contents */2817 result = xmalloc(st_add3(st_sub(img->len, remove_count), insert_count, 1));2818 memcpy(result, img->buf, applied_at);2819 memcpy(result + applied_at, postimage->buf, postimage->len);2820 memcpy(result + applied_at + postimage->len,2821 img->buf + (applied_at + remove_count),2822 img->len - (applied_at + remove_count));2823 free(img->buf);2824 img->buf = result;2825 img->len += insert_count - remove_count;2826 result[img->len] = '\0';28272828 /* Adjust the line table */2829 nr = img->nr + postimage->nr - preimage_limit;2830 if (preimage_limit < postimage->nr) {2831 /*2832 * NOTE: this knows that we never call remove_first_line()2833 * on anything other than pre/post image.2834 */2835 REALLOC_ARRAY(img->line, nr);2836 img->line_allocated = img->line;2837 }2838 if (preimage_limit != postimage->nr)2839 MOVE_ARRAY(img->line + applied_pos + postimage->nr,2840 img->line + applied_pos + preimage_limit,2841 img->nr - (applied_pos + preimage_limit));2842 COPY_ARRAY(img->line + applied_pos, postimage->line, postimage->nr);2843 if (!state->allow_overlap)2844 for (i = 0; i < postimage->nr; i++)2845 img->line[applied_pos + i].flag |= LINE_PATCHED;2846 img->nr = nr;2847}28482849/*2850 * Use the patch-hunk text in "frag" to prepare two images (preimage and2851 * postimage) for the hunk. Find lines that match "preimage" in "img" and2852 * replace the part of "img" with "postimage" text.2853 */2854static int apply_one_fragment(struct apply_state *state,2855 struct image *img, struct fragment *frag,2856 int inaccurate_eof, unsigned ws_rule,2857 int nth_fragment)2858{2859 int match_beginning, match_end;2860 const char *patch = frag->patch;2861 int size = frag->size;2862 char *old, *oldlines;2863 struct strbuf newlines;2864 int new_blank_lines_at_end = 0;2865 int found_new_blank_lines_at_end = 0;2866 int hunk_linenr = frag->linenr;2867 unsigned long leading, trailing;2868 int pos, applied_pos;2869 struct image preimage;2870 struct image postimage;28712872 memset(&preimage, 0, sizeof(preimage));2873 memset(&postimage, 0, sizeof(postimage));2874 oldlines = xmalloc(size);2875 strbuf_init(&newlines, size);28762877 old = oldlines;2878 while (size > 0) {2879 char first;2880 int len = linelen(patch, size);2881 int plen;2882 int added_blank_line = 0;2883 int is_blank_context = 0;2884 size_t start;28852886 if (!len)2887 break;28882889 /*2890 * "plen" is how much of the line we should use for2891 * the actual patch data. Normally we just remove the2892 * first character on the line, but if the line is2893 * followed by "\ No newline", then we also remove the2894 * last one (which is the newline, of course).2895 */2896 plen = len - 1;2897 if (len < size && patch[len] == '\\')2898 plen--;2899 first = *patch;2900 if (state->apply_in_reverse) {2901 if (first == '-')2902 first = '+';2903 else if (first == '+')2904 first = '-';2905 }29062907 switch (first) {2908 case '\n':2909 /* Newer GNU diff, empty context line */2910 if (plen < 0)2911 /* ... followed by '\No newline'; nothing */2912 break;2913 *old++ = '\n';2914 strbuf_addch(&newlines, '\n');2915 add_line_info(&preimage, "\n", 1, LINE_COMMON);2916 add_line_info(&postimage, "\n", 1, LINE_COMMON);2917 is_blank_context = 1;2918 break;2919 case ' ':2920 if (plen && (ws_rule & WS_BLANK_AT_EOF) &&2921 ws_blank_line(patch + 1, plen, ws_rule))2922 is_blank_context = 1;2923 case '-':2924 memcpy(old, patch + 1, plen);2925 add_line_info(&preimage, old, plen,2926 (first == ' ' ? LINE_COMMON : 0));2927 old += plen;2928 if (first == '-')2929 break;2930 /* Fall-through for ' ' */2931 case '+':2932 /* --no-add does not add new lines */2933 if (first == '+' && state->no_add)2934 break;29352936 start = newlines.len;2937 if (first != '+' ||2938 !state->whitespace_error ||2939 state->ws_error_action != correct_ws_error) {2940 strbuf_add(&newlines, patch + 1, plen);2941 }2942 else {2943 ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &state->applied_after_fixing_ws);2944 }2945 add_line_info(&postimage, newlines.buf + start, newlines.len - start,2946 (first == '+' ? 0 : LINE_COMMON));2947 if (first == '+' &&2948 (ws_rule & WS_BLANK_AT_EOF) &&2949 ws_blank_line(patch + 1, plen, ws_rule))2950 added_blank_line = 1;2951 break;2952 case '@': case '\\':2953 /* Ignore it, we already handled it */2954 break;2955 default:2956 if (state->apply_verbosity > verbosity_normal)2957 error(_("invalid start of line: '%c'"), first);2958 applied_pos = -1;2959 goto out;2960 }2961 if (added_blank_line) {2962 if (!new_blank_lines_at_end)2963 found_new_blank_lines_at_end = hunk_linenr;2964 new_blank_lines_at_end++;2965 }2966 else if (is_blank_context)2967 ;2968 else2969 new_blank_lines_at_end = 0;2970 patch += len;2971 size -= len;2972 hunk_linenr++;2973 }2974 if (inaccurate_eof &&2975 old > oldlines && old[-1] == '\n' &&2976 newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {2977 old--;2978 strbuf_setlen(&newlines, newlines.len - 1);2979 }29802981 leading = frag->leading;2982 trailing = frag->trailing;29832984 /*2985 * A hunk to change lines at the beginning would begin with2986 * @@ -1,L +N,M @@2987 * but we need to be careful. -U0 that inserts before the second2988 * line also has this pattern.2989 *2990 * And a hunk to add to an empty file would begin with2991 * @@ -0,0 +N,M @@2992 *2993 * In other words, a hunk that is (frag->oldpos <= 1) with or2994 * without leading context must match at the beginning.2995 */2996 match_beginning = (!frag->oldpos ||2997 (frag->oldpos == 1 && !state->unidiff_zero));29982999 /*3000 * A hunk without trailing lines must match at the end.3001 * However, we simply cannot tell if a hunk must match end3002 * from the lack of trailing lines if the patch was generated3003 * with unidiff without any context.3004 */3005 match_end = !state->unidiff_zero && !trailing;30063007 pos = frag->newpos ? (frag->newpos - 1) : 0;3008 preimage.buf = oldlines;3009 preimage.len = old - oldlines;3010 postimage.buf = newlines.buf;3011 postimage.len = newlines.len;3012 preimage.line = preimage.line_allocated;3013 postimage.line = postimage.line_allocated;30143015 for (;;) {30163017 applied_pos = find_pos(state, img, &preimage, &postimage, pos,3018 ws_rule, match_beginning, match_end);30193020 if (applied_pos >= 0)3021 break;30223023 /* Am I at my context limits? */3024 if ((leading <= state->p_context) && (trailing <= state->p_context))3025 break;3026 if (match_beginning || match_end) {3027 match_beginning = match_end = 0;3028 continue;3029 }30303031 /*3032 * Reduce the number of context lines; reduce both3033 * leading and trailing if they are equal otherwise3034 * just reduce the larger context.3035 */3036 if (leading >= trailing) {3037 remove_first_line(&preimage);3038 remove_first_line(&postimage);3039 pos--;3040 leading--;3041 }3042 if (trailing > leading) {3043 remove_last_line(&preimage);3044 remove_last_line(&postimage);3045 trailing--;3046 }3047 }30483049 if (applied_pos >= 0) {3050 if (new_blank_lines_at_end &&3051 preimage.nr + applied_pos >= img->nr &&3052 (ws_rule & WS_BLANK_AT_EOF) &&3053 state->ws_error_action != nowarn_ws_error) {3054 record_ws_error(state, WS_BLANK_AT_EOF, "+", 1,3055 found_new_blank_lines_at_end);3056 if (state->ws_error_action == correct_ws_error) {3057 while (new_blank_lines_at_end--)3058 remove_last_line(&postimage);3059 }3060 /*3061 * We would want to prevent write_out_results()3062 * from taking place in apply_patch() that follows3063 * the callchain led us here, which is:3064 * apply_patch->check_patch_list->check_patch->3065 * apply_data->apply_fragments->apply_one_fragment3066 */3067 if (state->ws_error_action == die_on_ws_error)3068 state->apply = 0;3069 }30703071 if (state->apply_verbosity > verbosity_normal && applied_pos != pos) {3072 int offset = applied_pos - pos;3073 if (state->apply_in_reverse)3074 offset = 0 - offset;3075 fprintf_ln(stderr,3076 Q_("Hunk #%d succeeded at %d (offset %d line).",3077 "Hunk #%d succeeded at %d (offset %d lines).",3078 offset),3079 nth_fragment, applied_pos + 1, offset);3080 }30813082 /*3083 * Warn if it was necessary to reduce the number3084 * of context lines.3085 */3086 if ((leading != frag->leading ||3087 trailing != frag->trailing) && state->apply_verbosity > verbosity_silent)3088 fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"3089 " to apply fragment at %d"),3090 leading, trailing, applied_pos+1);3091 update_image(state, img, applied_pos, &preimage, &postimage);3092 } else {3093 if (state->apply_verbosity > verbosity_normal)3094 error(_("while searching for:\n%.*s"),3095 (int)(old - oldlines), oldlines);3096 }30973098out:3099 free(oldlines);3100 strbuf_release(&newlines);3101 free(preimage.line_allocated);3102 free(postimage.line_allocated);31033104 return (applied_pos < 0);3105}31063107static int apply_binary_fragment(struct apply_state *state,3108 struct image *img,3109 struct patch *patch)3110{3111 struct fragment *fragment = patch->fragments;3112 unsigned long len;3113 void *dst;31143115 if (!fragment)3116 return error(_("missing binary patch data for '%s'"),3117 patch->new_name ?3118 patch->new_name :3119 patch->old_name);31203121 /* Binary patch is irreversible without the optional second hunk */3122 if (state->apply_in_reverse) {3123 if (!fragment->next)3124 return error(_("cannot reverse-apply a binary patch "3125 "without the reverse hunk to '%s'"),3126 patch->new_name3127 ? patch->new_name : patch->old_name);3128 fragment = fragment->next;3129 }3130 switch (fragment->binary_patch_method) {3131 case BINARY_DELTA_DEFLATED:3132 dst = patch_delta(img->buf, img->len, fragment->patch,3133 fragment->size, &len);3134 if (!dst)3135 return -1;3136 clear_image(img);3137 img->buf = dst;3138 img->len = len;3139 return 0;3140 case BINARY_LITERAL_DEFLATED:3141 clear_image(img);3142 img->len = fragment->size;3143 img->buf = xmemdupz(fragment->patch, img->len);3144 return 0;3145 }3146 return -1;3147}31483149/*3150 * Replace "img" with the result of applying the binary patch.3151 * The binary patch data itself in patch->fragment is still kept3152 * but the preimage prepared by the caller in "img" is freed here3153 * or in the helper function apply_binary_fragment() this calls.3154 */3155static int apply_binary(struct apply_state *state,3156 struct image *img,3157 struct patch *patch)3158{3159 const char *name = patch->old_name ? patch->old_name : patch->new_name;3160 struct object_id oid;31613162 /*3163 * For safety, we require patch index line to contain3164 * full 40-byte textual SHA1 for old and new, at least for now.3165 */3166 if (strlen(patch->old_sha1_prefix) != 40 ||3167 strlen(patch->new_sha1_prefix) != 40 ||3168 get_oid_hex(patch->old_sha1_prefix, &oid) ||3169 get_oid_hex(patch->new_sha1_prefix, &oid))3170 return error(_("cannot apply binary patch to '%s' "3171 "without full index line"), name);31723173 if (patch->old_name) {3174 /*3175 * See if the old one matches what the patch3176 * applies to.3177 */3178 hash_sha1_file(img->buf, img->len, blob_type, oid.hash);3179 if (strcmp(oid_to_hex(&oid), patch->old_sha1_prefix))3180 return error(_("the patch applies to '%s' (%s), "3181 "which does not match the "3182 "current contents."),3183 name, oid_to_hex(&oid));3184 }3185 else {3186 /* Otherwise, the old one must be empty. */3187 if (img->len)3188 return error(_("the patch applies to an empty "3189 "'%s' but it is not empty"), name);3190 }31913192 get_oid_hex(patch->new_sha1_prefix, &oid);3193 if (is_null_oid(&oid)) {3194 clear_image(img);3195 return 0; /* deletion patch */3196 }31973198 if (has_sha1_file(oid.hash)) {3199 /* We already have the postimage */3200 enum object_type type;3201 unsigned long size;3202 char *result;32033204 result = read_sha1_file(oid.hash, &type, &size);3205 if (!result)3206 return error(_("the necessary postimage %s for "3207 "'%s' cannot be read"),3208 patch->new_sha1_prefix, name);3209 clear_image(img);3210 img->buf = result;3211 img->len = size;3212 } else {3213 /*3214 * We have verified buf matches the preimage;3215 * apply the patch data to it, which is stored3216 * in the patch->fragments->{patch,size}.3217 */3218 if (apply_binary_fragment(state, img, patch))3219 return error(_("binary patch does not apply to '%s'"),3220 name);32213222 /* verify that the result matches */3223 hash_sha1_file(img->buf, img->len, blob_type, oid.hash);3224 if (strcmp(oid_to_hex(&oid), patch->new_sha1_prefix))3225 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),3226 name, patch->new_sha1_prefix, oid_to_hex(&oid));3227 }32283229 return 0;3230}32313232static int apply_fragments(struct apply_state *state, struct image *img, struct patch *patch)3233{3234 struct fragment *frag = patch->fragments;3235 const char *name = patch->old_name ? patch->old_name : patch->new_name;3236 unsigned ws_rule = patch->ws_rule;3237 unsigned inaccurate_eof = patch->inaccurate_eof;3238 int nth = 0;32393240 if (patch->is_binary)3241 return apply_binary(state, img, patch);32423243 while (frag) {3244 nth++;3245 if (apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) {3246 error(_("patch failed: %s:%ld"), name, frag->oldpos);3247 if (!state->apply_with_reject)3248 return -1;3249 frag->rejected = 1;3250 }3251 frag = frag->next;3252 }3253 return 0;3254}32553256static int read_blob_object(struct strbuf *buf, const struct object_id *oid, unsigned mode)3257{3258 if (S_ISGITLINK(mode)) {3259 strbuf_grow(buf, 100);3260 strbuf_addf(buf, "Subproject commit %s\n", oid_to_hex(oid));3261 } else {3262 enum object_type type;3263 unsigned long sz;3264 char *result;32653266 result = read_sha1_file(oid->hash, &type, &sz);3267 if (!result)3268 return -1;3269 /* XXX read_sha1_file NUL-terminates */3270 strbuf_attach(buf, result, sz, sz + 1);3271 }3272 return 0;3273}32743275static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf)3276{3277 if (!ce)3278 return 0;3279 return read_blob_object(buf, &ce->oid, ce->ce_mode);3280}32813282static struct patch *in_fn_table(struct apply_state *state, const char *name)3283{3284 struct string_list_item *item;32853286 if (name == NULL)3287 return NULL;32883289 item = string_list_lookup(&state->fn_table, name);3290 if (item != NULL)3291 return (struct patch *)item->util;32923293 return NULL;3294}32953296/*3297 * item->util in the filename table records the status of the path.3298 * Usually it points at a patch (whose result records the contents3299 * of it after applying it), but it could be PATH_WAS_DELETED for a3300 * path that a previously applied patch has already removed, or3301 * PATH_TO_BE_DELETED for a path that a later patch would remove.3302 *3303 * The latter is needed to deal with a case where two paths A and B3304 * are swapped by first renaming A to B and then renaming B to A;3305 * moving A to B should not be prevented due to presence of B as we3306 * will remove it in a later patch.3307 */3308#define PATH_TO_BE_DELETED ((struct patch *) -2)3309#define PATH_WAS_DELETED ((struct patch *) -1)33103311static int to_be_deleted(struct patch *patch)3312{3313 return patch == PATH_TO_BE_DELETED;3314}33153316static int was_deleted(struct patch *patch)3317{3318 return patch == PATH_WAS_DELETED;3319}33203321static void add_to_fn_table(struct apply_state *state, struct patch *patch)3322{3323 struct string_list_item *item;33243325 /*3326 * Always add new_name unless patch is a deletion3327 * This should cover the cases for normal diffs,3328 * file creations and copies3329 */3330 if (patch->new_name != NULL) {3331 item = string_list_insert(&state->fn_table, patch->new_name);3332 item->util = patch;3333 }33343335 /*3336 * store a failure on rename/deletion cases because3337 * later chunks shouldn't patch old names3338 */3339 if ((patch->new_name == NULL) || (patch->is_rename)) {3340 item = string_list_insert(&state->fn_table, patch->old_name);3341 item->util = PATH_WAS_DELETED;3342 }3343}33443345static void prepare_fn_table(struct apply_state *state, struct patch *patch)3346{3347 /*3348 * store information about incoming file deletion3349 */3350 while (patch) {3351 if ((patch->new_name == NULL) || (patch->is_rename)) {3352 struct string_list_item *item;3353 item = string_list_insert(&state->fn_table, patch->old_name);3354 item->util = PATH_TO_BE_DELETED;3355 }3356 patch = patch->next;3357 }3358}33593360static int checkout_target(struct index_state *istate,3361 struct cache_entry *ce, struct stat *st)3362{3363 struct checkout costate = CHECKOUT_INIT;33643365 costate.refresh_cache = 1;3366 costate.istate = istate;3367 if (checkout_entry(ce, &costate, NULL) || lstat(ce->name, st))3368 return error(_("cannot checkout %s"), ce->name);3369 return 0;3370}33713372static struct patch *previous_patch(struct apply_state *state,3373 struct patch *patch,3374 int *gone)3375{3376 struct patch *previous;33773378 *gone = 0;3379 if (patch->is_copy || patch->is_rename)3380 return NULL; /* "git" patches do not depend on the order */33813382 previous = in_fn_table(state, patch->old_name);3383 if (!previous)3384 return NULL;33853386 if (to_be_deleted(previous))3387 return NULL; /* the deletion hasn't happened yet */33883389 if (was_deleted(previous))3390 *gone = 1;33913392 return previous;3393}33943395static int verify_index_match(const struct cache_entry *ce, struct stat *st)3396{3397 if (S_ISGITLINK(ce->ce_mode)) {3398 if (!S_ISDIR(st->st_mode))3399 return -1;3400 return 0;3401 }3402 return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3403}34043405#define SUBMODULE_PATCH_WITHOUT_INDEX 134063407static int load_patch_target(struct apply_state *state,3408 struct strbuf *buf,3409 const struct cache_entry *ce,3410 struct stat *st,3411 struct patch *patch,3412 const char *name,3413 unsigned expected_mode)3414{3415 if (state->cached || state->check_index) {3416 if (read_file_or_gitlink(ce, buf))3417 return error(_("failed to read %s"), name);3418 } else if (name) {3419 if (S_ISGITLINK(expected_mode)) {3420 if (ce)3421 return read_file_or_gitlink(ce, buf);3422 else3423 return SUBMODULE_PATCH_WITHOUT_INDEX;3424 } else if (has_symlink_leading_path(name, strlen(name))) {3425 return error(_("reading from '%s' beyond a symbolic link"), name);3426 } else {3427 if (read_old_data(st, patch, name, buf))3428 return error(_("failed to read %s"), name);3429 }3430 }3431 return 0;3432}34333434/*3435 * We are about to apply "patch"; populate the "image" with the3436 * current version we have, from the working tree or from the index,3437 * depending on the situation e.g. --cached/--index. If we are3438 * applying a non-git patch that incrementally updates the tree,3439 * we read from the result of a previous diff.3440 */3441static int load_preimage(struct apply_state *state,3442 struct image *image,3443 struct patch *patch, struct stat *st,3444 const struct cache_entry *ce)3445{3446 struct strbuf buf = STRBUF_INIT;3447 size_t len;3448 char *img;3449 struct patch *previous;3450 int status;34513452 previous = previous_patch(state, patch, &status);3453 if (status)3454 return error(_("path %s has been renamed/deleted"),3455 patch->old_name);3456 if (previous) {3457 /* We have a patched copy in memory; use that. */3458 strbuf_add(&buf, previous->result, previous->resultsize);3459 } else {3460 status = load_patch_target(state, &buf, ce, st, patch,3461 patch->old_name, patch->old_mode);3462 if (status < 0)3463 return status;3464 else if (status == SUBMODULE_PATCH_WITHOUT_INDEX) {3465 /*3466 * There is no way to apply subproject3467 * patch without looking at the index.3468 * NEEDSWORK: shouldn't this be flagged3469 * as an error???3470 */3471 free_fragment_list(patch->fragments);3472 patch->fragments = NULL;3473 } else if (status) {3474 return error(_("failed to read %s"), patch->old_name);3475 }3476 }34773478 img = strbuf_detach(&buf, &len);3479 prepare_image(image, img, len, !patch->is_binary);3480 return 0;3481}34823483static int three_way_merge(struct image *image,3484 char *path,3485 const struct object_id *base,3486 const struct object_id *ours,3487 const struct object_id *theirs)3488{3489 mmfile_t base_file, our_file, their_file;3490 mmbuffer_t result = { NULL };3491 int status;34923493 read_mmblob(&base_file, base);3494 read_mmblob(&our_file, ours);3495 read_mmblob(&their_file, theirs);3496 status = ll_merge(&result, path,3497 &base_file, "base",3498 &our_file, "ours",3499 &their_file, "theirs", NULL);3500 free(base_file.ptr);3501 free(our_file.ptr);3502 free(their_file.ptr);3503 if (status < 0 || !result.ptr) {3504 free(result.ptr);3505 return -1;3506 }3507 clear_image(image);3508 image->buf = result.ptr;3509 image->len = result.size;35103511 return status;3512}35133514/*3515 * When directly falling back to add/add three-way merge, we read from3516 * the current contents of the new_name. In no cases other than that3517 * this function will be called.3518 */3519static int load_current(struct apply_state *state,3520 struct image *image,3521 struct patch *patch)3522{3523 struct strbuf buf = STRBUF_INIT;3524 int status, pos;3525 size_t len;3526 char *img;3527 struct stat st;3528 struct cache_entry *ce;3529 char *name = patch->new_name;3530 unsigned mode = patch->new_mode;35313532 if (!patch->is_new)3533 die("BUG: patch to %s is not a creation", patch->old_name);35343535 pos = cache_name_pos(name, strlen(name));3536 if (pos < 0)3537 return error(_("%s: does not exist in index"), name);3538 ce = active_cache[pos];3539 if (lstat(name, &st)) {3540 if (errno != ENOENT)3541 return error_errno("%s", name);3542 if (checkout_target(&the_index, ce, &st))3543 return -1;3544 }3545 if (verify_index_match(ce, &st))3546 return error(_("%s: does not match index"), name);35473548 status = load_patch_target(state, &buf, ce, &st, patch, name, mode);3549 if (status < 0)3550 return status;3551 else if (status)3552 return -1;3553 img = strbuf_detach(&buf, &len);3554 prepare_image(image, img, len, !patch->is_binary);3555 return 0;3556}35573558static int try_threeway(struct apply_state *state,3559 struct image *image,3560 struct patch *patch,3561 struct stat *st,3562 const struct cache_entry *ce)3563{3564 struct object_id pre_oid, post_oid, our_oid;3565 struct strbuf buf = STRBUF_INIT;3566 size_t len;3567 int status;3568 char *img;3569 struct image tmp_image;35703571 /* No point falling back to 3-way merge in these cases */3572 if (patch->is_delete ||3573 S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))3574 return -1;35753576 /* Preimage the patch was prepared for */3577 if (patch->is_new)3578 write_sha1_file("", 0, blob_type, pre_oid.hash);3579 else if (get_oid(patch->old_sha1_prefix, &pre_oid) ||3580 read_blob_object(&buf, &pre_oid, patch->old_mode))3581 return error(_("repository lacks the necessary blob to fall back on 3-way merge."));35823583 if (state->apply_verbosity > verbosity_silent)3584 fprintf(stderr, _("Falling back to three-way merge...\n"));35853586 img = strbuf_detach(&buf, &len);3587 prepare_image(&tmp_image, img, len, 1);3588 /* Apply the patch to get the post image */3589 if (apply_fragments(state, &tmp_image, patch) < 0) {3590 clear_image(&tmp_image);3591 return -1;3592 }3593 /* post_oid is theirs */3594 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_oid.hash);3595 clear_image(&tmp_image);35963597 /* our_oid is ours */3598 if (patch->is_new) {3599 if (load_current(state, &tmp_image, patch))3600 return error(_("cannot read the current contents of '%s'"),3601 patch->new_name);3602 } else {3603 if (load_preimage(state, &tmp_image, patch, st, ce))3604 return error(_("cannot read the current contents of '%s'"),3605 patch->old_name);3606 }3607 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_oid.hash);3608 clear_image(&tmp_image);36093610 /* in-core three-way merge between post and our using pre as base */3611 status = three_way_merge(image, patch->new_name,3612 &pre_oid, &our_oid, &post_oid);3613 if (status < 0) {3614 if (state->apply_verbosity > verbosity_silent)3615 fprintf(stderr,3616 _("Failed to fall back on three-way merge...\n"));3617 return status;3618 }36193620 if (status) {3621 patch->conflicted_threeway = 1;3622 if (patch->is_new)3623 oidclr(&patch->threeway_stage[0]);3624 else3625 oidcpy(&patch->threeway_stage[0], &pre_oid);3626 oidcpy(&patch->threeway_stage[1], &our_oid);3627 oidcpy(&patch->threeway_stage[2], &post_oid);3628 if (state->apply_verbosity > verbosity_silent)3629 fprintf(stderr,3630 _("Applied patch to '%s' with conflicts.\n"),3631 patch->new_name);3632 } else {3633 if (state->apply_verbosity > verbosity_silent)3634 fprintf(stderr,3635 _("Applied patch to '%s' cleanly.\n"),3636 patch->new_name);3637 }3638 return 0;3639}36403641static int apply_data(struct apply_state *state, struct patch *patch,3642 struct stat *st, const struct cache_entry *ce)3643{3644 struct image image;36453646 if (load_preimage(state, &image, patch, st, ce) < 0)3647 return -1;36483649 if (patch->direct_to_threeway ||3650 apply_fragments(state, &image, patch) < 0) {3651 /* Note: with --reject, apply_fragments() returns 0 */3652 if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0)3653 return -1;3654 }3655 patch->result = image.buf;3656 patch->resultsize = image.len;3657 add_to_fn_table(state, patch);3658 free(image.line_allocated);36593660 if (0 < patch->is_delete && patch->resultsize)3661 return error(_("removal patch leaves file contents"));36623663 return 0;3664}36653666/*3667 * If "patch" that we are looking at modifies or deletes what we have,3668 * we would want it not to lose any local modification we have, either3669 * in the working tree or in the index.3670 *3671 * This also decides if a non-git patch is a creation patch or a3672 * modification to an existing empty file. We do not check the state3673 * of the current tree for a creation patch in this function; the caller3674 * check_patch() separately makes sure (and errors out otherwise) that3675 * the path the patch creates does not exist in the current tree.3676 */3677static int check_preimage(struct apply_state *state,3678 struct patch *patch,3679 struct cache_entry **ce,3680 struct stat *st)3681{3682 const char *old_name = patch->old_name;3683 struct patch *previous = NULL;3684 int stat_ret = 0, status;3685 unsigned st_mode = 0;36863687 if (!old_name)3688 return 0;36893690 assert(patch->is_new <= 0);3691 previous = previous_patch(state, patch, &status);36923693 if (status)3694 return error(_("path %s has been renamed/deleted"), old_name);3695 if (previous) {3696 st_mode = previous->new_mode;3697 } else if (!state->cached) {3698 stat_ret = lstat(old_name, st);3699 if (stat_ret && errno != ENOENT)3700 return error_errno("%s", old_name);3701 }37023703 if (state->check_index && !previous) {3704 int pos = cache_name_pos(old_name, strlen(old_name));3705 if (pos < 0) {3706 if (patch->is_new < 0)3707 goto is_new;3708 return error(_("%s: does not exist in index"), old_name);3709 }3710 *ce = active_cache[pos];3711 if (stat_ret < 0) {3712 if (checkout_target(&the_index, *ce, st))3713 return -1;3714 }3715 if (!state->cached && verify_index_match(*ce, st))3716 return error(_("%s: does not match index"), old_name);3717 if (state->cached)3718 st_mode = (*ce)->ce_mode;3719 } else if (stat_ret < 0) {3720 if (patch->is_new < 0)3721 goto is_new;3722 return error_errno("%s", old_name);3723 }37243725 if (!state->cached && !previous)3726 st_mode = ce_mode_from_stat(*ce, st->st_mode);37273728 if (patch->is_new < 0)3729 patch->is_new = 0;3730 if (!patch->old_mode)3731 patch->old_mode = st_mode;3732 if ((st_mode ^ patch->old_mode) & S_IFMT)3733 return error(_("%s: wrong type"), old_name);3734 if (st_mode != patch->old_mode)3735 warning(_("%s has type %o, expected %o"),3736 old_name, st_mode, patch->old_mode);3737 if (!patch->new_mode && !patch->is_delete)3738 patch->new_mode = st_mode;3739 return 0;37403741 is_new:3742 patch->is_new = 1;3743 patch->is_delete = 0;3744 FREE_AND_NULL(patch->old_name);3745 return 0;3746}374737483749#define EXISTS_IN_INDEX 13750#define EXISTS_IN_WORKTREE 237513752static int check_to_create(struct apply_state *state,3753 const char *new_name,3754 int ok_if_exists)3755{3756 struct stat nst;37573758 if (state->check_index &&3759 cache_name_pos(new_name, strlen(new_name)) >= 0 &&3760 !ok_if_exists)3761 return EXISTS_IN_INDEX;3762 if (state->cached)3763 return 0;37643765 if (!lstat(new_name, &nst)) {3766 if (S_ISDIR(nst.st_mode) || ok_if_exists)3767 return 0;3768 /*3769 * A leading component of new_name might be a symlink3770 * that is going to be removed with this patch, but3771 * still pointing at somewhere that has the path.3772 * In such a case, path "new_name" does not exist as3773 * far as git is concerned.3774 */3775 if (has_symlink_leading_path(new_name, strlen(new_name)))3776 return 0;37773778 return EXISTS_IN_WORKTREE;3779 } else if (!is_missing_file_error(errno)) {3780 return error_errno("%s", new_name);3781 }3782 return 0;3783}37843785static uintptr_t register_symlink_changes(struct apply_state *state,3786 const char *path,3787 uintptr_t what)3788{3789 struct string_list_item *ent;37903791 ent = string_list_lookup(&state->symlink_changes, path);3792 if (!ent) {3793 ent = string_list_insert(&state->symlink_changes, path);3794 ent->util = (void *)0;3795 }3796 ent->util = (void *)(what | ((uintptr_t)ent->util));3797 return (uintptr_t)ent->util;3798}37993800static uintptr_t check_symlink_changes(struct apply_state *state, const char *path)3801{3802 struct string_list_item *ent;38033804 ent = string_list_lookup(&state->symlink_changes, path);3805 if (!ent)3806 return 0;3807 return (uintptr_t)ent->util;3808}38093810static void prepare_symlink_changes(struct apply_state *state, struct patch *patch)3811{3812 for ( ; patch; patch = patch->next) {3813 if ((patch->old_name && S_ISLNK(patch->old_mode)) &&3814 (patch->is_rename || patch->is_delete))3815 /* the symlink at patch->old_name is removed */3816 register_symlink_changes(state, patch->old_name, APPLY_SYMLINK_GOES_AWAY);38173818 if (patch->new_name && S_ISLNK(patch->new_mode))3819 /* the symlink at patch->new_name is created or remains */3820 register_symlink_changes(state, patch->new_name, APPLY_SYMLINK_IN_RESULT);3821 }3822}38233824static int path_is_beyond_symlink_1(struct apply_state *state, struct strbuf *name)3825{3826 do {3827 unsigned int change;38283829 while (--name->len && name->buf[name->len] != '/')3830 ; /* scan backwards */3831 if (!name->len)3832 break;3833 name->buf[name->len] = '\0';3834 change = check_symlink_changes(state, name->buf);3835 if (change & APPLY_SYMLINK_IN_RESULT)3836 return 1;3837 if (change & APPLY_SYMLINK_GOES_AWAY)3838 /*3839 * This cannot be "return 0", because we may3840 * see a new one created at a higher level.3841 */3842 continue;38433844 /* otherwise, check the preimage */3845 if (state->check_index) {3846 struct cache_entry *ce;38473848 ce = cache_file_exists(name->buf, name->len, ignore_case);3849 if (ce && S_ISLNK(ce->ce_mode))3850 return 1;3851 } else {3852 struct stat st;3853 if (!lstat(name->buf, &st) && S_ISLNK(st.st_mode))3854 return 1;3855 }3856 } while (1);3857 return 0;3858}38593860static int path_is_beyond_symlink(struct apply_state *state, const char *name_)3861{3862 int ret;3863 struct strbuf name = STRBUF_INIT;38643865 assert(*name_ != '\0');3866 strbuf_addstr(&name, name_);3867 ret = path_is_beyond_symlink_1(state, &name);3868 strbuf_release(&name);38693870 return ret;3871}38723873static int check_unsafe_path(struct patch *patch)3874{3875 const char *old_name = NULL;3876 const char *new_name = NULL;3877 if (patch->is_delete)3878 old_name = patch->old_name;3879 else if (!patch->is_new && !patch->is_copy)3880 old_name = patch->old_name;3881 if (!patch->is_delete)3882 new_name = patch->new_name;38833884 if (old_name && !verify_path(old_name))3885 return error(_("invalid path '%s'"), old_name);3886 if (new_name && !verify_path(new_name))3887 return error(_("invalid path '%s'"), new_name);3888 return 0;3889}38903891/*3892 * Check and apply the patch in-core; leave the result in patch->result3893 * for the caller to write it out to the final destination.3894 */3895static int check_patch(struct apply_state *state, struct patch *patch)3896{3897 struct stat st;3898 const char *old_name = patch->old_name;3899 const char *new_name = patch->new_name;3900 const char *name = old_name ? old_name : new_name;3901 struct cache_entry *ce = NULL;3902 struct patch *tpatch;3903 int ok_if_exists;3904 int status;39053906 patch->rejected = 1; /* we will drop this after we succeed */39073908 status = check_preimage(state, patch, &ce, &st);3909 if (status)3910 return status;3911 old_name = patch->old_name;39123913 /*3914 * A type-change diff is always split into a patch to delete3915 * old, immediately followed by a patch to create new (see3916 * diff.c::run_diff()); in such a case it is Ok that the entry3917 * to be deleted by the previous patch is still in the working3918 * tree and in the index.3919 *3920 * A patch to swap-rename between A and B would first rename A3921 * to B and then rename B to A. While applying the first one,3922 * the presence of B should not stop A from getting renamed to3923 * B; ask to_be_deleted() about the later rename. Removal of3924 * B and rename from A to B is handled the same way by asking3925 * was_deleted().3926 */3927 if ((tpatch = in_fn_table(state, new_name)) &&3928 (was_deleted(tpatch) || to_be_deleted(tpatch)))3929 ok_if_exists = 1;3930 else3931 ok_if_exists = 0;39323933 if (new_name &&3934 ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {3935 int err = check_to_create(state, new_name, ok_if_exists);39363937 if (err && state->threeway) {3938 patch->direct_to_threeway = 1;3939 } else switch (err) {3940 case 0:3941 break; /* happy */3942 case EXISTS_IN_INDEX:3943 return error(_("%s: already exists in index"), new_name);3944 break;3945 case EXISTS_IN_WORKTREE:3946 return error(_("%s: already exists in working directory"),3947 new_name);3948 default:3949 return err;3950 }39513952 if (!patch->new_mode) {3953 if (0 < patch->is_new)3954 patch->new_mode = S_IFREG | 0644;3955 else3956 patch->new_mode = patch->old_mode;3957 }3958 }39593960 if (new_name && old_name) {3961 int same = !strcmp(old_name, new_name);3962 if (!patch->new_mode)3963 patch->new_mode = patch->old_mode;3964 if ((patch->old_mode ^ patch->new_mode) & S_IFMT) {3965 if (same)3966 return error(_("new mode (%o) of %s does not "3967 "match old mode (%o)"),3968 patch->new_mode, new_name,3969 patch->old_mode);3970 else3971 return error(_("new mode (%o) of %s does not "3972 "match old mode (%o) of %s"),3973 patch->new_mode, new_name,3974 patch->old_mode, old_name);3975 }3976 }39773978 if (!state->unsafe_paths && check_unsafe_path(patch))3979 return -128;39803981 /*3982 * An attempt to read from or delete a path that is beyond a3983 * symbolic link will be prevented by load_patch_target() that3984 * is called at the beginning of apply_data() so we do not3985 * have to worry about a patch marked with "is_delete" bit3986 * here. We however need to make sure that the patch result3987 * is not deposited to a path that is beyond a symbolic link3988 * here.3989 */3990 if (!patch->is_delete && path_is_beyond_symlink(state, patch->new_name))3991 return error(_("affected file '%s' is beyond a symbolic link"),3992 patch->new_name);39933994 if (apply_data(state, patch, &st, ce) < 0)3995 return error(_("%s: patch does not apply"), name);3996 patch->rejected = 0;3997 return 0;3998}39994000static int check_patch_list(struct apply_state *state, struct patch *patch)4001{4002 int err = 0;40034004 prepare_symlink_changes(state, patch);4005 prepare_fn_table(state, patch);4006 while (patch) {4007 int res;4008 if (state->apply_verbosity > verbosity_normal)4009 say_patch_name(stderr,4010 _("Checking patch %s..."), patch);4011 res = check_patch(state, patch);4012 if (res == -128)4013 return -128;4014 err |= res;4015 patch = patch->next;4016 }4017 return err;4018}40194020static int read_apply_cache(struct apply_state *state)4021{4022 if (state->index_file)4023 return read_cache_from(state->index_file);4024 else4025 return read_cache();4026}40274028/* This function tries to read the object name from the current index */4029static int get_current_oid(struct apply_state *state, const char *path,4030 struct object_id *oid)4031{4032 int pos;40334034 if (read_apply_cache(state) < 0)4035 return -1;4036 pos = cache_name_pos(path, strlen(path));4037 if (pos < 0)4038 return -1;4039 oidcpy(oid, &active_cache[pos]->oid);4040 return 0;4041}40424043static int preimage_oid_in_gitlink_patch(struct patch *p, struct object_id *oid)4044{4045 /*4046 * A usable gitlink patch has only one fragment (hunk) that looks like:4047 * @@ -1 +1 @@4048 * -Subproject commit <old sha1>4049 * +Subproject commit <new sha1>4050 * or4051 * @@ -1 +0,0 @@4052 * -Subproject commit <old sha1>4053 * for a removal patch.4054 */4055 struct fragment *hunk = p->fragments;4056 static const char heading[] = "-Subproject commit ";4057 char *preimage;40584059 if (/* does the patch have only one hunk? */4060 hunk && !hunk->next &&4061 /* is its preimage one line? */4062 hunk->oldpos == 1 && hunk->oldlines == 1 &&4063 /* does preimage begin with the heading? */4064 (preimage = memchr(hunk->patch, '\n', hunk->size)) != NULL &&4065 starts_with(++preimage, heading) &&4066 /* does it record full SHA-1? */4067 !get_oid_hex(preimage + sizeof(heading) - 1, oid) &&4068 preimage[sizeof(heading) + GIT_SHA1_HEXSZ - 1] == '\n' &&4069 /* does the abbreviated name on the index line agree with it? */4070 starts_with(preimage + sizeof(heading) - 1, p->old_sha1_prefix))4071 return 0; /* it all looks fine */40724073 /* we may have full object name on the index line */4074 return get_oid_hex(p->old_sha1_prefix, oid);4075}40764077/* Build an index that contains the just the files needed for a 3way merge */4078static int build_fake_ancestor(struct apply_state *state, struct patch *list)4079{4080 struct patch *patch;4081 struct index_state result = { NULL };4082 static struct lock_file lock;4083 int res;40844085 /* Once we start supporting the reverse patch, it may be4086 * worth showing the new sha1 prefix, but until then...4087 */4088 for (patch = list; patch; patch = patch->next) {4089 struct object_id oid;4090 struct cache_entry *ce;4091 const char *name;40924093 name = patch->old_name ? patch->old_name : patch->new_name;4094 if (0 < patch->is_new)4095 continue;40964097 if (S_ISGITLINK(patch->old_mode)) {4098 if (!preimage_oid_in_gitlink_patch(patch, &oid))4099 ; /* ok, the textual part looks sane */4100 else4101 return error(_("sha1 information is lacking or "4102 "useless for submodule %s"), name);4103 } else if (!get_oid_blob(patch->old_sha1_prefix, &oid)) {4104 ; /* ok */4105 } else if (!patch->lines_added && !patch->lines_deleted) {4106 /* mode-only change: update the current */4107 if (get_current_oid(state, patch->old_name, &oid))4108 return error(_("mode change for %s, which is not "4109 "in current HEAD"), name);4110 } else4111 return error(_("sha1 information is lacking or useless "4112 "(%s)."), name);41134114 ce = make_cache_entry(patch->old_mode, oid.hash, name, 0, 0);4115 if (!ce)4116 return error(_("make_cache_entry failed for path '%s'"),4117 name);4118 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) {4119 free(ce);4120 return error(_("could not add %s to temporary index"),4121 name);4122 }4123 }41244125 hold_lock_file_for_update(&lock, state->fake_ancestor, LOCK_DIE_ON_ERROR);4126 res = write_locked_index(&result, &lock, COMMIT_LOCK);4127 discard_index(&result);41284129 if (res)4130 return error(_("could not write temporary index to %s"),4131 state->fake_ancestor);41324133 return 0;4134}41354136static void stat_patch_list(struct apply_state *state, struct patch *patch)4137{4138 int files, adds, dels;41394140 for (files = adds = dels = 0 ; patch ; patch = patch->next) {4141 files++;4142 adds += patch->lines_added;4143 dels += patch->lines_deleted;4144 show_stats(state, patch);4145 }41464147 print_stat_summary(stdout, files, adds, dels);4148}41494150static void numstat_patch_list(struct apply_state *state,4151 struct patch *patch)4152{4153 for ( ; patch; patch = patch->next) {4154 const char *name;4155 name = patch->new_name ? patch->new_name : patch->old_name;4156 if (patch->is_binary)4157 printf("-\t-\t");4158 else4159 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);4160 write_name_quoted(name, stdout, state->line_termination);4161 }4162}41634164static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)4165{4166 if (mode)4167 printf(" %s mode %06o %s\n", newdelete, mode, name);4168 else4169 printf(" %s %s\n", newdelete, name);4170}41714172static void show_mode_change(struct patch *p, int show_name)4173{4174 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {4175 if (show_name)4176 printf(" mode change %06o => %06o %s\n",4177 p->old_mode, p->new_mode, p->new_name);4178 else4179 printf(" mode change %06o => %06o\n",4180 p->old_mode, p->new_mode);4181 }4182}41834184static void show_rename_copy(struct patch *p)4185{4186 const char *renamecopy = p->is_rename ? "rename" : "copy";4187 const char *old, *new;41884189 /* Find common prefix */4190 old = p->old_name;4191 new = p->new_name;4192 while (1) {4193 const char *slash_old, *slash_new;4194 slash_old = strchr(old, '/');4195 slash_new = strchr(new, '/');4196 if (!slash_old ||4197 !slash_new ||4198 slash_old - old != slash_new - new ||4199 memcmp(old, new, slash_new - new))4200 break;4201 old = slash_old + 1;4202 new = slash_new + 1;4203 }4204 /* p->old_name thru old is the common prefix, and old and new4205 * through the end of names are renames4206 */4207 if (old != p->old_name)4208 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,4209 (int)(old - p->old_name), p->old_name,4210 old, new, p->score);4211 else4212 printf(" %s %s => %s (%d%%)\n", renamecopy,4213 p->old_name, p->new_name, p->score);4214 show_mode_change(p, 0);4215}42164217static void summary_patch_list(struct patch *patch)4218{4219 struct patch *p;42204221 for (p = patch; p; p = p->next) {4222 if (p->is_new)4223 show_file_mode_name("create", p->new_mode, p->new_name);4224 else if (p->is_delete)4225 show_file_mode_name("delete", p->old_mode, p->old_name);4226 else {4227 if (p->is_rename || p->is_copy)4228 show_rename_copy(p);4229 else {4230 if (p->score) {4231 printf(" rewrite %s (%d%%)\n",4232 p->new_name, p->score);4233 show_mode_change(p, 0);4234 }4235 else4236 show_mode_change(p, 1);4237 }4238 }4239 }4240}42414242static void patch_stats(struct apply_state *state, struct patch *patch)4243{4244 int lines = patch->lines_added + patch->lines_deleted;42454246 if (lines > state->max_change)4247 state->max_change = lines;4248 if (patch->old_name) {4249 int len = quote_c_style(patch->old_name, NULL, NULL, 0);4250 if (!len)4251 len = strlen(patch->old_name);4252 if (len > state->max_len)4253 state->max_len = len;4254 }4255 if (patch->new_name) {4256 int len = quote_c_style(patch->new_name, NULL, NULL, 0);4257 if (!len)4258 len = strlen(patch->new_name);4259 if (len > state->max_len)4260 state->max_len = len;4261 }4262}42634264static int remove_file(struct apply_state *state, struct patch *patch, int rmdir_empty)4265{4266 if (state->update_index) {4267 if (remove_file_from_cache(patch->old_name) < 0)4268 return error(_("unable to remove %s from index"), patch->old_name);4269 }4270 if (!state->cached) {4271 if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {4272 remove_path(patch->old_name);4273 }4274 }4275 return 0;4276}42774278static int add_index_file(struct apply_state *state,4279 const char *path,4280 unsigned mode,4281 void *buf,4282 unsigned long size)4283{4284 struct stat st;4285 struct cache_entry *ce;4286 int namelen = strlen(path);4287 unsigned ce_size = cache_entry_size(namelen);42884289 if (!state->update_index)4290 return 0;42914292 ce = xcalloc(1, ce_size);4293 memcpy(ce->name, path, namelen);4294 ce->ce_mode = create_ce_mode(mode);4295 ce->ce_flags = create_ce_flags(0);4296 ce->ce_namelen = namelen;4297 if (S_ISGITLINK(mode)) {4298 const char *s;42994300 if (!skip_prefix(buf, "Subproject commit ", &s) ||4301 get_oid_hex(s, &ce->oid)) {4302 free(ce);4303 return error(_("corrupt patch for submodule %s"), path);4304 }4305 } else {4306 if (!state->cached) {4307 if (lstat(path, &st) < 0) {4308 free(ce);4309 return error_errno(_("unable to stat newly "4310 "created file '%s'"),4311 path);4312 }4313 fill_stat_cache_info(ce, &st);4314 }4315 if (write_sha1_file(buf, size, blob_type, ce->oid.hash) < 0) {4316 free(ce);4317 return error(_("unable to create backing store "4318 "for newly created file %s"), path);4319 }4320 }4321 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0) {4322 free(ce);4323 return error(_("unable to add cache entry for %s"), path);4324 }43254326 return 0;4327}43284329/*4330 * Returns:4331 * -1 if an unrecoverable error happened4332 * 0 if everything went well4333 * 1 if a recoverable error happened4334 */4335static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)4336{4337 int fd, res;4338 struct strbuf nbuf = STRBUF_INIT;43394340 if (S_ISGITLINK(mode)) {4341 struct stat st;4342 if (!lstat(path, &st) && S_ISDIR(st.st_mode))4343 return 0;4344 return !!mkdir(path, 0777);4345 }43464347 if (has_symlinks && S_ISLNK(mode))4348 /* Although buf:size is counted string, it also is NUL4349 * terminated.4350 */4351 return !!symlink(buf, path);43524353 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);4354 if (fd < 0)4355 return 1;43564357 if (convert_to_working_tree(path, buf, size, &nbuf)) {4358 size = nbuf.len;4359 buf = nbuf.buf;4360 }43614362 res = write_in_full(fd, buf, size) < 0;4363 if (res)4364 error_errno(_("failed to write to '%s'"), path);4365 strbuf_release(&nbuf);43664367 if (close(fd) < 0 && !res)4368 return error_errno(_("closing file '%s'"), path);43694370 return res ? -1 : 0;4371}43724373/*4374 * We optimistically assume that the directories exist,4375 * which is true 99% of the time anyway. If they don't,4376 * we create them and try again.4377 *4378 * Returns:4379 * -1 on error4380 * 0 otherwise4381 */4382static int create_one_file(struct apply_state *state,4383 char *path,4384 unsigned mode,4385 const char *buf,4386 unsigned long size)4387{4388 int res;43894390 if (state->cached)4391 return 0;43924393 res = try_create_file(path, mode, buf, size);4394 if (res < 0)4395 return -1;4396 if (!res)4397 return 0;43984399 if (errno == ENOENT) {4400 if (safe_create_leading_directories(path))4401 return 0;4402 res = try_create_file(path, mode, buf, size);4403 if (res < 0)4404 return -1;4405 if (!res)4406 return 0;4407 }44084409 if (errno == EEXIST || errno == EACCES) {4410 /* We may be trying to create a file where a directory4411 * used to be.4412 */4413 struct stat st;4414 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))4415 errno = EEXIST;4416 }44174418 if (errno == EEXIST) {4419 unsigned int nr = getpid();44204421 for (;;) {4422 char newpath[PATH_MAX];4423 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);4424 res = try_create_file(newpath, mode, buf, size);4425 if (res < 0)4426 return -1;4427 if (!res) {4428 if (!rename(newpath, path))4429 return 0;4430 unlink_or_warn(newpath);4431 break;4432 }4433 if (errno != EEXIST)4434 break;4435 ++nr;4436 }4437 }4438 return error_errno(_("unable to write file '%s' mode %o"),4439 path, mode);4440}44414442static int add_conflicted_stages_file(struct apply_state *state,4443 struct patch *patch)4444{4445 int stage, namelen;4446 unsigned ce_size, mode;4447 struct cache_entry *ce;44484449 if (!state->update_index)4450 return 0;4451 namelen = strlen(patch->new_name);4452 ce_size = cache_entry_size(namelen);4453 mode = patch->new_mode ? patch->new_mode : (S_IFREG | 0644);44544455 remove_file_from_cache(patch->new_name);4456 for (stage = 1; stage < 4; stage++) {4457 if (is_null_oid(&patch->threeway_stage[stage - 1]))4458 continue;4459 ce = xcalloc(1, ce_size);4460 memcpy(ce->name, patch->new_name, namelen);4461 ce->ce_mode = create_ce_mode(mode);4462 ce->ce_flags = create_ce_flags(stage);4463 ce->ce_namelen = namelen;4464 oidcpy(&ce->oid, &patch->threeway_stage[stage - 1]);4465 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0) {4466 free(ce);4467 return error(_("unable to add cache entry for %s"),4468 patch->new_name);4469 }4470 }44714472 return 0;4473}44744475static int create_file(struct apply_state *state, struct patch *patch)4476{4477 char *path = patch->new_name;4478 unsigned mode = patch->new_mode;4479 unsigned long size = patch->resultsize;4480 char *buf = patch->result;44814482 if (!mode)4483 mode = S_IFREG | 0644;4484 if (create_one_file(state, path, mode, buf, size))4485 return -1;44864487 if (patch->conflicted_threeway)4488 return add_conflicted_stages_file(state, patch);4489 else4490 return add_index_file(state, path, mode, buf, size);4491}44924493/* phase zero is to remove, phase one is to create */4494static int write_out_one_result(struct apply_state *state,4495 struct patch *patch,4496 int phase)4497{4498 if (patch->is_delete > 0) {4499 if (phase == 0)4500 return remove_file(state, patch, 1);4501 return 0;4502 }4503 if (patch->is_new > 0 || patch->is_copy) {4504 if (phase == 1)4505 return create_file(state, patch);4506 return 0;4507 }4508 /*4509 * Rename or modification boils down to the same4510 * thing: remove the old, write the new4511 */4512 if (phase == 0)4513 return remove_file(state, patch, patch->is_rename);4514 if (phase == 1)4515 return create_file(state, patch);4516 return 0;4517}45184519static int write_out_one_reject(struct apply_state *state, struct patch *patch)4520{4521 FILE *rej;4522 char namebuf[PATH_MAX];4523 struct fragment *frag;4524 int cnt = 0;4525 struct strbuf sb = STRBUF_INIT;45264527 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {4528 if (!frag->rejected)4529 continue;4530 cnt++;4531 }45324533 if (!cnt) {4534 if (state->apply_verbosity > verbosity_normal)4535 say_patch_name(stderr,4536 _("Applied patch %s cleanly."), patch);4537 return 0;4538 }45394540 /* This should not happen, because a removal patch that leaves4541 * contents are marked "rejected" at the patch level.4542 */4543 if (!patch->new_name)4544 die(_("internal error"));45454546 /* Say this even without --verbose */4547 strbuf_addf(&sb, Q_("Applying patch %%s with %d reject...",4548 "Applying patch %%s with %d rejects...",4549 cnt),4550 cnt);4551 if (state->apply_verbosity > verbosity_silent)4552 say_patch_name(stderr, sb.buf, patch);4553 strbuf_release(&sb);45544555 cnt = strlen(patch->new_name);4556 if (ARRAY_SIZE(namebuf) <= cnt + 5) {4557 cnt = ARRAY_SIZE(namebuf) - 5;4558 warning(_("truncating .rej filename to %.*s.rej"),4559 cnt - 1, patch->new_name);4560 }4561 memcpy(namebuf, patch->new_name, cnt);4562 memcpy(namebuf + cnt, ".rej", 5);45634564 rej = fopen(namebuf, "w");4565 if (!rej)4566 return error_errno(_("cannot open %s"), namebuf);45674568 /* Normal git tools never deal with .rej, so do not pretend4569 * this is a git patch by saying --git or giving extended4570 * headers. While at it, maybe please "kompare" that wants4571 * the trailing TAB and some garbage at the end of line ;-).4572 */4573 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",4574 patch->new_name, patch->new_name);4575 for (cnt = 1, frag = patch->fragments;4576 frag;4577 cnt++, frag = frag->next) {4578 if (!frag->rejected) {4579 if (state->apply_verbosity > verbosity_silent)4580 fprintf_ln(stderr, _("Hunk #%d applied cleanly."), cnt);4581 continue;4582 }4583 if (state->apply_verbosity > verbosity_silent)4584 fprintf_ln(stderr, _("Rejected hunk #%d."), cnt);4585 fprintf(rej, "%.*s", frag->size, frag->patch);4586 if (frag->patch[frag->size-1] != '\n')4587 fputc('\n', rej);4588 }4589 fclose(rej);4590 return -1;4591}45924593/*4594 * Returns:4595 * -1 if an error happened4596 * 0 if the patch applied cleanly4597 * 1 if the patch did not apply cleanly4598 */4599static int write_out_results(struct apply_state *state, struct patch *list)4600{4601 int phase;4602 int errs = 0;4603 struct patch *l;4604 struct string_list cpath = STRING_LIST_INIT_DUP;46054606 for (phase = 0; phase < 2; phase++) {4607 l = list;4608 while (l) {4609 if (l->rejected)4610 errs = 1;4611 else {4612 if (write_out_one_result(state, l, phase)) {4613 string_list_clear(&cpath, 0);4614 return -1;4615 }4616 if (phase == 1) {4617 if (write_out_one_reject(state, l))4618 errs = 1;4619 if (l->conflicted_threeway) {4620 string_list_append(&cpath, l->new_name);4621 errs = 1;4622 }4623 }4624 }4625 l = l->next;4626 }4627 }46284629 if (cpath.nr) {4630 struct string_list_item *item;46314632 string_list_sort(&cpath);4633 if (state->apply_verbosity > verbosity_silent) {4634 for_each_string_list_item(item, &cpath)4635 fprintf(stderr, "U %s\n", item->string);4636 }4637 string_list_clear(&cpath, 0);46384639 rerere(0);4640 }46414642 return errs;4643}46444645/*4646 * Try to apply a patch.4647 *4648 * Returns:4649 * -128 if a bad error happened (like patch unreadable)4650 * -1 if patch did not apply and user cannot deal with it4651 * 0 if the patch applied4652 * 1 if the patch did not apply but user might fix it4653 */4654static int apply_patch(struct apply_state *state,4655 int fd,4656 const char *filename,4657 int options)4658{4659 size_t offset;4660 struct strbuf buf = STRBUF_INIT; /* owns the patch text */4661 struct patch *list = NULL, **listp = &list;4662 int skipped_patch = 0;4663 int res = 0;46644665 state->patch_input_file = filename;4666 if (read_patch_file(&buf, fd) < 0)4667 return -128;4668 offset = 0;4669 while (offset < buf.len) {4670 struct patch *patch;4671 int nr;46724673 patch = xcalloc(1, sizeof(*patch));4674 patch->inaccurate_eof = !!(options & APPLY_OPT_INACCURATE_EOF);4675 patch->recount = !!(options & APPLY_OPT_RECOUNT);4676 nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch);4677 if (nr < 0) {4678 free_patch(patch);4679 if (nr == -128) {4680 res = -128;4681 goto end;4682 }4683 break;4684 }4685 if (state->apply_in_reverse)4686 reverse_patches(patch);4687 if (use_patch(state, patch)) {4688 patch_stats(state, patch);4689 *listp = patch;4690 listp = &patch->next;4691 }4692 else {4693 if (state->apply_verbosity > verbosity_normal)4694 say_patch_name(stderr, _("Skipped patch '%s'."), patch);4695 free_patch(patch);4696 skipped_patch++;4697 }4698 offset += nr;4699 }47004701 if (!list && !skipped_patch) {4702 error(_("unrecognized input"));4703 res = -128;4704 goto end;4705 }47064707 if (state->whitespace_error && (state->ws_error_action == die_on_ws_error))4708 state->apply = 0;47094710 state->update_index = state->check_index && state->apply;4711 if (state->update_index && state->newfd < 0) {4712 if (state->index_file)4713 state->newfd = hold_lock_file_for_update(state->lock_file,4714 state->index_file,4715 LOCK_DIE_ON_ERROR);4716 else4717 state->newfd = hold_locked_index(state->lock_file, LOCK_DIE_ON_ERROR);4718 }47194720 if (state->check_index && read_apply_cache(state) < 0) {4721 error(_("unable to read index file"));4722 res = -128;4723 goto end;4724 }47254726 if (state->check || state->apply) {4727 int r = check_patch_list(state, list);4728 if (r == -128) {4729 res = -128;4730 goto end;4731 }4732 if (r < 0 && !state->apply_with_reject) {4733 res = -1;4734 goto end;4735 }4736 }47374738 if (state->apply) {4739 int write_res = write_out_results(state, list);4740 if (write_res < 0) {4741 res = -128;4742 goto end;4743 }4744 if (write_res > 0) {4745 /* with --3way, we still need to write the index out */4746 res = state->apply_with_reject ? -1 : 1;4747 goto end;4748 }4749 }47504751 if (state->fake_ancestor &&4752 build_fake_ancestor(state, list)) {4753 res = -128;4754 goto end;4755 }47564757 if (state->diffstat && state->apply_verbosity > verbosity_silent)4758 stat_patch_list(state, list);47594760 if (state->numstat && state->apply_verbosity > verbosity_silent)4761 numstat_patch_list(state, list);47624763 if (state->summary && state->apply_verbosity > verbosity_silent)4764 summary_patch_list(list);47654766end:4767 free_patch_list(list);4768 strbuf_release(&buf);4769 string_list_clear(&state->fn_table, 0);4770 return res;4771}47724773static int apply_option_parse_exclude(const struct option *opt,4774 const char *arg, int unset)4775{4776 struct apply_state *state = opt->value;4777 add_name_limit(state, arg, 1);4778 return 0;4779}47804781static int apply_option_parse_include(const struct option *opt,4782 const char *arg, int unset)4783{4784 struct apply_state *state = opt->value;4785 add_name_limit(state, arg, 0);4786 state->has_include = 1;4787 return 0;4788}47894790static int apply_option_parse_p(const struct option *opt,4791 const char *arg,4792 int unset)4793{4794 struct apply_state *state = opt->value;4795 state->p_value = atoi(arg);4796 state->p_value_known = 1;4797 return 0;4798}47994800static int apply_option_parse_space_change(const struct option *opt,4801 const char *arg, int unset)4802{4803 struct apply_state *state = opt->value;4804 if (unset)4805 state->ws_ignore_action = ignore_ws_none;4806 else4807 state->ws_ignore_action = ignore_ws_change;4808 return 0;4809}48104811static int apply_option_parse_whitespace(const struct option *opt,4812 const char *arg, int unset)4813{4814 struct apply_state *state = opt->value;4815 state->whitespace_option = arg;4816 if (parse_whitespace_option(state, arg))4817 exit(1);4818 return 0;4819}48204821static int apply_option_parse_directory(const struct option *opt,4822 const char *arg, int unset)4823{4824 struct apply_state *state = opt->value;4825 strbuf_reset(&state->root);4826 strbuf_addstr(&state->root, arg);4827 strbuf_complete(&state->root, '/');4828 return 0;4829}48304831int apply_all_patches(struct apply_state *state,4832 int argc,4833 const char **argv,4834 int options)4835{4836 int i;4837 int res;4838 int errs = 0;4839 int read_stdin = 1;48404841 for (i = 0; i < argc; i++) {4842 const char *arg = argv[i];4843 char *to_free = NULL;4844 int fd;48454846 if (!strcmp(arg, "-")) {4847 res = apply_patch(state, 0, "<stdin>", options);4848 if (res < 0)4849 goto end;4850 errs |= res;4851 read_stdin = 0;4852 continue;4853 } else4854 arg = to_free = prefix_filename(state->prefix, arg);48554856 fd = open(arg, O_RDONLY);4857 if (fd < 0) {4858 error(_("can't open patch '%s': %s"), arg, strerror(errno));4859 res = -128;4860 free(to_free);4861 goto end;4862 }4863 read_stdin = 0;4864 set_default_whitespace_mode(state);4865 res = apply_patch(state, fd, arg, options);4866 close(fd);4867 free(to_free);4868 if (res < 0)4869 goto end;4870 errs |= res;4871 }4872 set_default_whitespace_mode(state);4873 if (read_stdin) {4874 res = apply_patch(state, 0, "<stdin>", options);4875 if (res < 0)4876 goto end;4877 errs |= res;4878 }48794880 if (state->whitespace_error) {4881 if (state->squelch_whitespace_errors &&4882 state->squelch_whitespace_errors < state->whitespace_error) {4883 int squelched =4884 state->whitespace_error - state->squelch_whitespace_errors;4885 warning(Q_("squelched %d whitespace error",4886 "squelched %d whitespace errors",4887 squelched),4888 squelched);4889 }4890 if (state->ws_error_action == die_on_ws_error) {4891 error(Q_("%d line adds whitespace errors.",4892 "%d lines add whitespace errors.",4893 state->whitespace_error),4894 state->whitespace_error);4895 res = -128;4896 goto end;4897 }4898 if (state->applied_after_fixing_ws && state->apply)4899 warning(Q_("%d line applied after"4900 " fixing whitespace errors.",4901 "%d lines applied after"4902 " fixing whitespace errors.",4903 state->applied_after_fixing_ws),4904 state->applied_after_fixing_ws);4905 else if (state->whitespace_error)4906 warning(Q_("%d line adds whitespace errors.",4907 "%d lines add whitespace errors.",4908 state->whitespace_error),4909 state->whitespace_error);4910 }49114912 if (state->update_index) {4913 res = write_locked_index(&the_index, state->lock_file, COMMIT_LOCK);4914 if (res) {4915 error(_("Unable to write new index file"));4916 res = -128;4917 goto end;4918 }4919 state->newfd = -1;4920 }49214922 res = !!errs;49234924end:4925 if (state->newfd >= 0) {4926 rollback_lock_file(state->lock_file);4927 state->newfd = -1;4928 }49294930 if (state->apply_verbosity <= verbosity_silent) {4931 set_error_routine(state->saved_error_routine);4932 set_warn_routine(state->saved_warn_routine);4933 }49344935 if (res > -1)4936 return res;4937 return (res == -1 ? 1 : 128);4938}49394940int apply_parse_options(int argc, const char **argv,4941 struct apply_state *state,4942 int *force_apply, int *options,4943 const char * const *apply_usage)4944{4945 struct option builtin_apply_options[] = {4946 { OPTION_CALLBACK, 0, "exclude", state, N_("path"),4947 N_("don't apply changes matching the given path"),4948 0, apply_option_parse_exclude },4949 { OPTION_CALLBACK, 0, "include", state, N_("path"),4950 N_("apply changes matching the given path"),4951 0, apply_option_parse_include },4952 { OPTION_CALLBACK, 'p', NULL, state, N_("num"),4953 N_("remove <num> leading slashes from traditional diff paths"),4954 0, apply_option_parse_p },4955 OPT_BOOL(0, "no-add", &state->no_add,4956 N_("ignore additions made by the patch")),4957 OPT_BOOL(0, "stat", &state->diffstat,4958 N_("instead of applying the patch, output diffstat for the input")),4959 OPT_NOOP_NOARG(0, "allow-binary-replacement"),4960 OPT_NOOP_NOARG(0, "binary"),4961 OPT_BOOL(0, "numstat", &state->numstat,4962 N_("show number of added and deleted lines in decimal notation")),4963 OPT_BOOL(0, "summary", &state->summary,4964 N_("instead of applying the patch, output a summary for the input")),4965 OPT_BOOL(0, "check", &state->check,4966 N_("instead of applying the patch, see if the patch is applicable")),4967 OPT_BOOL(0, "index", &state->check_index,4968 N_("make sure the patch is applicable to the current index")),4969 OPT_BOOL(0, "cached", &state->cached,4970 N_("apply a patch without touching the working tree")),4971 OPT_BOOL(0, "unsafe-paths", &state->unsafe_paths,4972 N_("accept a patch that touches outside the working area")),4973 OPT_BOOL(0, "apply", force_apply,4974 N_("also apply the patch (use with --stat/--summary/--check)")),4975 OPT_BOOL('3', "3way", &state->threeway,4976 N_( "attempt three-way merge if a patch does not apply")),4977 OPT_FILENAME(0, "build-fake-ancestor", &state->fake_ancestor,4978 N_("build a temporary index based on embedded index information")),4979 /* Think twice before adding "--nul" synonym to this */4980 OPT_SET_INT('z', NULL, &state->line_termination,4981 N_("paths are separated with NUL character"), '\0'),4982 OPT_INTEGER('C', NULL, &state->p_context,4983 N_("ensure at least <n> lines of context match")),4984 { OPTION_CALLBACK, 0, "whitespace", state, N_("action"),4985 N_("detect new or modified lines that have whitespace errors"),4986 0, apply_option_parse_whitespace },4987 { OPTION_CALLBACK, 0, "ignore-space-change", state, NULL,4988 N_("ignore changes in whitespace when finding context"),4989 PARSE_OPT_NOARG, apply_option_parse_space_change },4990 { OPTION_CALLBACK, 0, "ignore-whitespace", state, NULL,4991 N_("ignore changes in whitespace when finding context"),4992 PARSE_OPT_NOARG, apply_option_parse_space_change },4993 OPT_BOOL('R', "reverse", &state->apply_in_reverse,4994 N_("apply the patch in reverse")),4995 OPT_BOOL(0, "unidiff-zero", &state->unidiff_zero,4996 N_("don't expect at least one line of context")),4997 OPT_BOOL(0, "reject", &state->apply_with_reject,4998 N_("leave the rejected hunks in corresponding *.rej files")),4999 OPT_BOOL(0, "allow-overlap", &state->allow_overlap,5000 N_("allow overlapping hunks")),5001 OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")),5002 OPT_BIT(0, "inaccurate-eof", options,5003 N_("tolerate incorrectly detected missing new-line at the end of file"),5004 APPLY_OPT_INACCURATE_EOF),5005 OPT_BIT(0, "recount", options,5006 N_("do not trust the line counts in the hunk headers"),5007 APPLY_OPT_RECOUNT),5008 { OPTION_CALLBACK, 0, "directory", state, N_("root"),5009 N_("prepend <root> to all filenames"),5010 0, apply_option_parse_directory },5011 OPT_END()5012 };50135014 return parse_options(argc, argv, state->prefix, builtin_apply_options, apply_usage, 0);5015}