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->prefix_length = state->prefix ? strlen(state->prefix) : 0; 84 state->lock_file = lock_file; 85 state->newfd = -1; 86 state->apply = 1; 87 state->line_termination = '\n'; 88 state->p_value = 1; 89 state->p_context = UINT_MAX; 90 state->squelch_whitespace_errors = 5; 91 state->ws_error_action = warn_on_ws_error; 92 state->ws_ignore_action = ignore_ws_none; 93 state->linenr = 1; 94 string_list_init(&state->fn_table, 0); 95 string_list_init(&state->limit_by_name, 0); 96 string_list_init(&state->symlink_changes, 0); 97 strbuf_init(&state->root, 0); 98 99 git_apply_config(); 100 if (apply_default_whitespace && parse_whitespace_option(state, apply_default_whitespace)) 101 return -1; 102 if (apply_default_ignorewhitespace && parse_ignorewhitespace_option(state, apply_default_ignorewhitespace)) 103 return -1; 104 return 0; 105} 106 107void clear_apply_state(struct apply_state *state) 108{ 109 string_list_clear(&state->limit_by_name, 0); 110 string_list_clear(&state->symlink_changes, 0); 111 strbuf_release(&state->root); 112 113 /* &state->fn_table is cleared at the end of apply_patch() */ 114} 115 116static void mute_routine(const char *msg, va_list params) 117{ 118 /* do nothing */ 119} 120 121int check_apply_state(struct apply_state *state, int force_apply) 122{ 123 int is_not_gitdir = !startup_info->have_repository; 124 125 if (state->apply_with_reject && state->threeway) 126 return error(_("--reject and --3way cannot be used together.")); 127 if (state->cached && state->threeway) 128 return error(_("--cached and --3way cannot be used together.")); 129 if (state->threeway) { 130 if (is_not_gitdir) 131 return error(_("--3way outside a repository")); 132 state->check_index = 1; 133 } 134 if (state->apply_with_reject) { 135 state->apply = 1; 136 if (state->apply_verbosity == verbosity_normal) 137 state->apply_verbosity = verbosity_verbose; 138 } 139 if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor)) 140 state->apply = 0; 141 if (state->check_index && is_not_gitdir) 142 return error(_("--index outside a repository")); 143 if (state->cached) { 144 if (is_not_gitdir) 145 return error(_("--cached outside a repository")); 146 state->check_index = 1; 147 } 148 if (state->check_index) 149 state->unsafe_paths = 0; 150 if (!state->lock_file) 151 return error("BUG: state->lock_file should not be NULL"); 152 153 if (state->apply_verbosity <= verbosity_silent) { 154 state->saved_error_routine = get_error_routine(); 155 state->saved_warn_routine = get_warn_routine(); 156 set_error_routine(mute_routine); 157 set_warn_routine(mute_routine); 158 } 159 160 return 0; 161} 162 163static void set_default_whitespace_mode(struct apply_state *state) 164{ 165 if (!state->whitespace_option && !apply_default_whitespace) 166 state->ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error); 167} 168 169/* 170 * This represents one "hunk" from a patch, starting with 171 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 172 * patch text is pointed at by patch, and its byte length 173 * is stored in size. leading and trailing are the number 174 * of context lines. 175 */ 176struct fragment { 177 unsigned long leading, trailing; 178 unsigned long oldpos, oldlines; 179 unsigned long newpos, newlines; 180 /* 181 * 'patch' is usually borrowed from buf in apply_patch(), 182 * but some codepaths store an allocated buffer. 183 */ 184 const char *patch; 185 unsigned free_patch:1, 186 rejected:1; 187 int size; 188 int linenr; 189 struct fragment *next; 190}; 191 192/* 193 * When dealing with a binary patch, we reuse "leading" field 194 * to store the type of the binary hunk, either deflated "delta" 195 * or deflated "literal". 196 */ 197#define binary_patch_method leading 198#define BINARY_DELTA_DEFLATED 1 199#define BINARY_LITERAL_DEFLATED 2 200 201/* 202 * This represents a "patch" to a file, both metainfo changes 203 * such as creation/deletion, filemode and content changes represented 204 * as a series of fragments. 205 */ 206struct patch { 207 char *new_name, *old_name, *def_name; 208 unsigned int old_mode, new_mode; 209 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */ 210 int rejected; 211 unsigned ws_rule; 212 int lines_added, lines_deleted; 213 int score; 214 int extension_linenr; /* first line specifying delete/new/rename/copy */ 215 unsigned int is_toplevel_relative:1; 216 unsigned int inaccurate_eof:1; 217 unsigned int is_binary:1; 218 unsigned int is_copy:1; 219 unsigned int is_rename:1; 220 unsigned int recount:1; 221 unsigned int conflicted_threeway:1; 222 unsigned int direct_to_threeway: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 (!strncmp(name, state->prefix, state->prefix_length)) 790 val = count_slashes(state->prefix); 791 else { 792 cp++; 793 if (!strncmp(cp, state->prefix, state->prefix_length)) 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 "^(1969-12-31|1970-01-01)" 816 " " 817 "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?" 818 " " 819 "([-+][0-2][0-9]:?[0-5][0-9])\n"; 820 const char *timestamp = NULL, *cp, *colon; 821 static regex_t *stamp; 822 regmatch_t m[10]; 823 int zoneoffset; 824 int hourminute; 825 int status; 826 827 for (cp = nameline; *cp != '\n'; cp++) { 828 if (*cp == '\t') 829 timestamp = cp + 1; 830 } 831 if (!timestamp) 832 return 0; 833 if (!stamp) { 834 stamp = xmalloc(sizeof(*stamp)); 835 if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 836 warning(_("Cannot prepare timestamp regexp %s"), 837 stamp_regexp); 838 return 0; 839 } 840 } 841 842 status = regexec(stamp, timestamp, ARRAY_SIZE(m), m, 0); 843 if (status) { 844 if (status != REG_NOMATCH) 845 warning(_("regexec returned %d for input: %s"), 846 status, timestamp); 847 return 0; 848 } 849 850 zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10); 851 if (*colon == ':') 852 zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10); 853 else 854 zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100); 855 if (timestamp[m[3].rm_so] == '-') 856 zoneoffset = -zoneoffset; 857 858 /* 859 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 860 * (west of GMT) or 1970-01-01 (east of GMT) 861 */ 862 if ((zoneoffset < 0 && memcmp(timestamp, "1969-12-31", 10)) || 863 (0 <= zoneoffset && memcmp(timestamp, "1970-01-01", 10))) 864 return 0; 865 866 hourminute = (strtol(timestamp + 11, NULL, 10) * 60 + 867 strtol(timestamp + 14, NULL, 10) - 868 zoneoffset); 869 870 return ((zoneoffset < 0 && hourminute == 1440) || 871 (0 <= zoneoffset && !hourminute)); 872} 873 874/* 875 * Get the name etc info from the ---/+++ lines of a traditional patch header 876 * 877 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 878 * files, we can happily check the index for a match, but for creating a 879 * new file we should try to match whatever "patch" does. I have no idea. 880 */ 881static int parse_traditional_patch(struct apply_state *state, 882 const char *first, 883 const char *second, 884 struct patch *patch) 885{ 886 char *name; 887 888 first += 4; /* skip "--- " */ 889 second += 4; /* skip "+++ " */ 890 if (!state->p_value_known) { 891 int p, q; 892 p = guess_p_value(state, first); 893 q = guess_p_value(state, second); 894 if (p < 0) p = q; 895 if (0 <= p && p == q) { 896 state->p_value = p; 897 state->p_value_known = 1; 898 } 899 } 900 if (is_dev_null(first)) { 901 patch->is_new = 1; 902 patch->is_delete = 0; 903 name = find_name_traditional(state, second, NULL, state->p_value); 904 patch->new_name = name; 905 } else if (is_dev_null(second)) { 906 patch->is_new = 0; 907 patch->is_delete = 1; 908 name = find_name_traditional(state, first, NULL, state->p_value); 909 patch->old_name = name; 910 } else { 911 char *first_name; 912 first_name = find_name_traditional(state, first, NULL, state->p_value); 913 name = find_name_traditional(state, second, first_name, state->p_value); 914 free(first_name); 915 if (has_epoch_timestamp(first)) { 916 patch->is_new = 1; 917 patch->is_delete = 0; 918 patch->new_name = name; 919 } else if (has_epoch_timestamp(second)) { 920 patch->is_new = 0; 921 patch->is_delete = 1; 922 patch->old_name = name; 923 } else { 924 patch->old_name = name; 925 patch->new_name = xstrdup_or_null(name); 926 } 927 } 928 if (!name) 929 return error(_("unable to find filename in patch at line %d"), state->linenr); 930 931 return 0; 932} 933 934static int gitdiff_hdrend(struct apply_state *state, 935 const char *line, 936 struct patch *patch) 937{ 938 return 1; 939} 940 941/* 942 * We're anal about diff header consistency, to make 943 * sure that we don't end up having strange ambiguous 944 * patches floating around. 945 * 946 * As a result, gitdiff_{old|new}name() will check 947 * their names against any previous information, just 948 * to make sure.. 949 */ 950#define DIFF_OLD_NAME 0 951#define DIFF_NEW_NAME 1 952 953static int gitdiff_verify_name(struct apply_state *state, 954 const char *line, 955 int isnull, 956 char **name, 957 int side) 958{ 959 if (!*name && !isnull) { 960 *name = find_name(state, line, NULL, state->p_value, TERM_TAB); 961 return 0; 962 } 963 964 if (*name) { 965 char *another; 966 if (isnull) 967 return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), 968 *name, state->linenr); 969 another = find_name(state, line, NULL, state->p_value, TERM_TAB); 970 if (!another || strcmp(another, *name)) { 971 free(another); 972 return error((side == DIFF_NEW_NAME) ? 973 _("git apply: bad git-diff - inconsistent new filename on line %d") : 974 _("git apply: bad git-diff - inconsistent old filename on line %d"), state->linenr); 975 } 976 free(another); 977 } else { 978 if (!starts_with(line, "/dev/null\n")) 979 return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr); 980 } 981 982 return 0; 983} 984 985static int gitdiff_oldname(struct apply_state *state, 986 const char *line, 987 struct patch *patch) 988{ 989 return gitdiff_verify_name(state, line, 990 patch->is_new, &patch->old_name, 991 DIFF_OLD_NAME); 992} 993 994static int gitdiff_newname(struct apply_state *state, 995 const char *line, 996 struct patch *patch) 997{ 998 return gitdiff_verify_name(state, line, 999 patch->is_delete, &patch->new_name,1000 DIFF_NEW_NAME);1001}10021003static int parse_mode_line(const char *line, int linenr, unsigned int *mode)1004{1005 char *end;1006 *mode = strtoul(line, &end, 8);1007 if (end == line || !isspace(*end))1008 return error(_("invalid mode on line %d: %s"), linenr, line);1009 return 0;1010}10111012static int gitdiff_oldmode(struct apply_state *state,1013 const char *line,1014 struct patch *patch)1015{1016 return parse_mode_line(line, state->linenr, &patch->old_mode);1017}10181019static int gitdiff_newmode(struct apply_state *state,1020 const char *line,1021 struct patch *patch)1022{1023 return parse_mode_line(line, state->linenr, &patch->new_mode);1024}10251026static int gitdiff_delete(struct apply_state *state,1027 const char *line,1028 struct patch *patch)1029{1030 patch->is_delete = 1;1031 free(patch->old_name);1032 patch->old_name = xstrdup_or_null(patch->def_name);1033 return gitdiff_oldmode(state, line, patch);1034}10351036static int gitdiff_newfile(struct apply_state *state,1037 const char *line,1038 struct patch *patch)1039{1040 patch->is_new = 1;1041 free(patch->new_name);1042 patch->new_name = xstrdup_or_null(patch->def_name);1043 return gitdiff_newmode(state, line, patch);1044}10451046static int gitdiff_copysrc(struct apply_state *state,1047 const char *line,1048 struct patch *patch)1049{1050 patch->is_copy = 1;1051 free(patch->old_name);1052 patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);1053 return 0;1054}10551056static int gitdiff_copydst(struct apply_state *state,1057 const char *line,1058 struct patch *patch)1059{1060 patch->is_copy = 1;1061 free(patch->new_name);1062 patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);1063 return 0;1064}10651066static int gitdiff_renamesrc(struct apply_state *state,1067 const char *line,1068 struct patch *patch)1069{1070 patch->is_rename = 1;1071 free(patch->old_name);1072 patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);1073 return 0;1074}10751076static int gitdiff_renamedst(struct apply_state *state,1077 const char *line,1078 struct patch *patch)1079{1080 patch->is_rename = 1;1081 free(patch->new_name);1082 patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);1083 return 0;1084}10851086static int gitdiff_similarity(struct apply_state *state,1087 const char *line,1088 struct patch *patch)1089{1090 unsigned long val = strtoul(line, NULL, 10);1091 if (val <= 100)1092 patch->score = val;1093 return 0;1094}10951096static int gitdiff_dissimilarity(struct apply_state *state,1097 const char *line,1098 struct patch *patch)1099{1100 unsigned long val = strtoul(line, NULL, 10);1101 if (val <= 100)1102 patch->score = val;1103 return 0;1104}11051106static int gitdiff_index(struct apply_state *state,1107 const char *line,1108 struct patch *patch)1109{1110 /*1111 * index line is N hexadecimal, "..", N hexadecimal,1112 * and optional space with octal mode.1113 */1114 const char *ptr, *eol;1115 int len;11161117 ptr = strchr(line, '.');1118 if (!ptr || ptr[1] != '.' || 40 < ptr - line)1119 return 0;1120 len = ptr - line;1121 memcpy(patch->old_sha1_prefix, line, len);1122 patch->old_sha1_prefix[len] = 0;11231124 line = ptr + 2;1125 ptr = strchr(line, ' ');1126 eol = strchrnul(line, '\n');11271128 if (!ptr || eol < ptr)1129 ptr = eol;1130 len = ptr - line;11311132 if (40 < len)1133 return 0;1134 memcpy(patch->new_sha1_prefix, line, len);1135 patch->new_sha1_prefix[len] = 0;1136 if (*ptr == ' ')1137 return gitdiff_oldmode(state, ptr + 1, patch);1138 return 0;1139}11401141/*1142 * This is normal for a diff that doesn't change anything: we'll fall through1143 * into the next diff. Tell the parser to break out.1144 */1145static int gitdiff_unrecognized(struct apply_state *state,1146 const char *line,1147 struct patch *patch)1148{1149 return 1;1150}11511152/*1153 * Skip p_value leading components from "line"; as we do not accept1154 * absolute paths, return NULL in that case.1155 */1156static const char *skip_tree_prefix(struct apply_state *state,1157 const char *line,1158 int llen)1159{1160 int nslash;1161 int i;11621163 if (!state->p_value)1164 return (llen && line[0] == '/') ? NULL : line;11651166 nslash = state->p_value;1167 for (i = 0; i < llen; i++) {1168 int ch = line[i];1169 if (ch == '/' && --nslash <= 0)1170 return (i == 0) ? NULL : &line[i + 1];1171 }1172 return NULL;1173}11741175/*1176 * This is to extract the same name that appears on "diff --git"1177 * line. We do not find and return anything if it is a rename1178 * patch, and it is OK because we will find the name elsewhere.1179 * We need to reliably find name only when it is mode-change only,1180 * creation or deletion of an empty file. In any of these cases,1181 * both sides are the same name under a/ and b/ respectively.1182 */1183static char *git_header_name(struct apply_state *state,1184 const char *line,1185 int llen)1186{1187 const char *name;1188 const char *second = NULL;1189 size_t len, line_len;11901191 line += strlen("diff --git ");1192 llen -= strlen("diff --git ");11931194 if (*line == '"') {1195 const char *cp;1196 struct strbuf first = STRBUF_INIT;1197 struct strbuf sp = STRBUF_INIT;11981199 if (unquote_c_style(&first, line, &second))1200 goto free_and_fail1;12011202 /* strip the a/b prefix including trailing slash */1203 cp = skip_tree_prefix(state, first.buf, first.len);1204 if (!cp)1205 goto free_and_fail1;1206 strbuf_remove(&first, 0, cp - first.buf);12071208 /*1209 * second points at one past closing dq of name.1210 * find the second name.1211 */1212 while ((second < line + llen) && isspace(*second))1213 second++;12141215 if (line + llen <= second)1216 goto free_and_fail1;1217 if (*second == '"') {1218 if (unquote_c_style(&sp, second, NULL))1219 goto free_and_fail1;1220 cp = skip_tree_prefix(state, sp.buf, sp.len);1221 if (!cp)1222 goto free_and_fail1;1223 /* They must match, otherwise ignore */1224 if (strcmp(cp, first.buf))1225 goto free_and_fail1;1226 strbuf_release(&sp);1227 return strbuf_detach(&first, NULL);1228 }12291230 /* unquoted second */1231 cp = skip_tree_prefix(state, second, line + llen - second);1232 if (!cp)1233 goto free_and_fail1;1234 if (line + llen - cp != first.len ||1235 memcmp(first.buf, cp, first.len))1236 goto free_and_fail1;1237 return strbuf_detach(&first, NULL);12381239 free_and_fail1:1240 strbuf_release(&first);1241 strbuf_release(&sp);1242 return NULL;1243 }12441245 /* unquoted first name */1246 name = skip_tree_prefix(state, line, llen);1247 if (!name)1248 return NULL;12491250 /*1251 * since the first name is unquoted, a dq if exists must be1252 * the beginning of the second name.1253 */1254 for (second = name; second < line + llen; second++) {1255 if (*second == '"') {1256 struct strbuf sp = STRBUF_INIT;1257 const char *np;12581259 if (unquote_c_style(&sp, second, NULL))1260 goto free_and_fail2;12611262 np = skip_tree_prefix(state, sp.buf, sp.len);1263 if (!np)1264 goto free_and_fail2;12651266 len = sp.buf + sp.len - np;1267 if (len < second - name &&1268 !strncmp(np, name, len) &&1269 isspace(name[len])) {1270 /* Good */1271 strbuf_remove(&sp, 0, np - sp.buf);1272 return strbuf_detach(&sp, NULL);1273 }12741275 free_and_fail2:1276 strbuf_release(&sp);1277 return NULL;1278 }1279 }12801281 /*1282 * Accept a name only if it shows up twice, exactly the same1283 * form.1284 */1285 second = strchr(name, '\n');1286 if (!second)1287 return NULL;1288 line_len = second - name;1289 for (len = 0 ; ; len++) {1290 switch (name[len]) {1291 default:1292 continue;1293 case '\n':1294 return NULL;1295 case '\t': case ' ':1296 /*1297 * Is this the separator between the preimage1298 * and the postimage pathname? Again, we are1299 * only interested in the case where there is1300 * no rename, as this is only to set def_name1301 * and a rename patch has the names elsewhere1302 * in an unambiguous form.1303 */1304 if (!name[len + 1])1305 return NULL; /* no postimage name */1306 second = skip_tree_prefix(state, name + len + 1,1307 line_len - (len + 1));1308 if (!second)1309 return NULL;1310 /*1311 * Does len bytes starting at "name" and "second"1312 * (that are separated by one HT or SP we just1313 * found) exactly match?1314 */1315 if (second[len] == '\n' && !strncmp(name, second, len))1316 return xmemdupz(name, len);1317 }1318 }1319}13201321static int check_header_line(struct apply_state *state, struct patch *patch)1322{1323 int extensions = (patch->is_delete == 1) + (patch->is_new == 1) +1324 (patch->is_rename == 1) + (patch->is_copy == 1);1325 if (extensions > 1)1326 return error(_("inconsistent header lines %d and %d"),1327 patch->extension_linenr, state->linenr);1328 if (extensions && !patch->extension_linenr)1329 patch->extension_linenr = state->linenr;1330 return 0;1331}13321333/* Verify that we recognize the lines following a git header */1334static int parse_git_header(struct apply_state *state,1335 const char *line,1336 int len,1337 unsigned int size,1338 struct patch *patch)1339{1340 unsigned long offset;13411342 /* A git diff has explicit new/delete information, so we don't guess */1343 patch->is_new = 0;1344 patch->is_delete = 0;13451346 /*1347 * Some things may not have the old name in the1348 * rest of the headers anywhere (pure mode changes,1349 * or removing or adding empty files), so we get1350 * the default name from the header.1351 */1352 patch->def_name = git_header_name(state, line, len);1353 if (patch->def_name && state->root.len) {1354 char *s = xstrfmt("%s%s", state->root.buf, patch->def_name);1355 free(patch->def_name);1356 patch->def_name = s;1357 }13581359 line += len;1360 size -= len;1361 state->linenr++;1362 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, state->linenr++) {1363 static const struct opentry {1364 const char *str;1365 int (*fn)(struct apply_state *, const char *, struct patch *);1366 } optable[] = {1367 { "@@ -", gitdiff_hdrend },1368 { "--- ", gitdiff_oldname },1369 { "+++ ", gitdiff_newname },1370 { "old mode ", gitdiff_oldmode },1371 { "new mode ", gitdiff_newmode },1372 { "deleted file mode ", gitdiff_delete },1373 { "new file mode ", gitdiff_newfile },1374 { "copy from ", gitdiff_copysrc },1375 { "copy to ", gitdiff_copydst },1376 { "rename old ", gitdiff_renamesrc },1377 { "rename new ", gitdiff_renamedst },1378 { "rename from ", gitdiff_renamesrc },1379 { "rename to ", gitdiff_renamedst },1380 { "similarity index ", gitdiff_similarity },1381 { "dissimilarity index ", gitdiff_dissimilarity },1382 { "index ", gitdiff_index },1383 { "", gitdiff_unrecognized },1384 };1385 int i;13861387 len = linelen(line, size);1388 if (!len || line[len-1] != '\n')1389 break;1390 for (i = 0; i < ARRAY_SIZE(optable); i++) {1391 const struct opentry *p = optable + i;1392 int oplen = strlen(p->str);1393 int res;1394 if (len < oplen || memcmp(p->str, line, oplen))1395 continue;1396 res = p->fn(state, line + oplen, patch);1397 if (res < 0)1398 return -1;1399 if (check_header_line(state, patch))1400 return -1;1401 if (res > 0)1402 return offset;1403 break;1404 }1405 }14061407 return offset;1408}14091410static int parse_num(const char *line, unsigned long *p)1411{1412 char *ptr;14131414 if (!isdigit(*line))1415 return 0;1416 *p = strtoul(line, &ptr, 10);1417 return ptr - line;1418}14191420static int parse_range(const char *line, int len, int offset, const char *expect,1421 unsigned long *p1, unsigned long *p2)1422{1423 int digits, ex;14241425 if (offset < 0 || offset >= len)1426 return -1;1427 line += offset;1428 len -= offset;14291430 digits = parse_num(line, p1);1431 if (!digits)1432 return -1;14331434 offset += digits;1435 line += digits;1436 len -= digits;14371438 *p2 = 1;1439 if (*line == ',') {1440 digits = parse_num(line+1, p2);1441 if (!digits)1442 return -1;14431444 offset += digits+1;1445 line += digits+1;1446 len -= digits+1;1447 }14481449 ex = strlen(expect);1450 if (ex > len)1451 return -1;1452 if (memcmp(line, expect, ex))1453 return -1;14541455 return offset + ex;1456}14571458static void recount_diff(const char *line, int size, struct fragment *fragment)1459{1460 int oldlines = 0, newlines = 0, ret = 0;14611462 if (size < 1) {1463 warning("recount: ignore empty hunk");1464 return;1465 }14661467 for (;;) {1468 int len = linelen(line, size);1469 size -= len;1470 line += len;14711472 if (size < 1)1473 break;14741475 switch (*line) {1476 case ' ': case '\n':1477 newlines++;1478 /* fall through */1479 case '-':1480 oldlines++;1481 continue;1482 case '+':1483 newlines++;1484 continue;1485 case '\\':1486 continue;1487 case '@':1488 ret = size < 3 || !starts_with(line, "@@ ");1489 break;1490 case 'd':1491 ret = size < 5 || !starts_with(line, "diff ");1492 break;1493 default:1494 ret = -1;1495 break;1496 }1497 if (ret) {1498 warning(_("recount: unexpected line: %.*s"),1499 (int)linelen(line, size), line);1500 return;1501 }1502 break;1503 }1504 fragment->oldlines = oldlines;1505 fragment->newlines = newlines;1506}15071508/*1509 * Parse a unified diff fragment header of the1510 * form "@@ -a,b +c,d @@"1511 */1512static int parse_fragment_header(const char *line, int len, struct fragment *fragment)1513{1514 int offset;15151516 if (!len || line[len-1] != '\n')1517 return -1;15181519 /* Figure out the number of lines in a fragment */1520 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);1521 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);15221523 return offset;1524}15251526/*1527 * Find file diff header1528 *1529 * Returns:1530 * -1 if no header was found1531 * -128 in case of error1532 * the size of the header in bytes (called "offset") otherwise1533 */1534static int find_header(struct apply_state *state,1535 const char *line,1536 unsigned long size,1537 int *hdrsize,1538 struct patch *patch)1539{1540 unsigned long offset, len;15411542 patch->is_toplevel_relative = 0;1543 patch->is_rename = patch->is_copy = 0;1544 patch->is_new = patch->is_delete = -1;1545 patch->old_mode = patch->new_mode = 0;1546 patch->old_name = patch->new_name = NULL;1547 for (offset = 0; size > 0; offset += len, size -= len, line += len, state->linenr++) {1548 unsigned long nextlen;15491550 len = linelen(line, size);1551 if (!len)1552 break;15531554 /* Testing this early allows us to take a few shortcuts.. */1555 if (len < 6)1556 continue;15571558 /*1559 * Make sure we don't find any unconnected patch fragments.1560 * That's a sign that we didn't find a header, and that a1561 * patch has become corrupted/broken up.1562 */1563 if (!memcmp("@@ -", line, 4)) {1564 struct fragment dummy;1565 if (parse_fragment_header(line, len, &dummy) < 0)1566 continue;1567 error(_("patch fragment without header at line %d: %.*s"),1568 state->linenr, (int)len-1, line);1569 return -128;1570 }15711572 if (size < len + 6)1573 break;15741575 /*1576 * Git patch? It might not have a real patch, just a rename1577 * or mode change, so we handle that specially1578 */1579 if (!memcmp("diff --git ", line, 11)) {1580 int git_hdr_len = parse_git_header(state, line, len, size, patch);1581 if (git_hdr_len < 0)1582 return -128;1583 if (git_hdr_len <= len)1584 continue;1585 if (!patch->old_name && !patch->new_name) {1586 if (!patch->def_name) {1587 error(Q_("git diff header lacks filename information when removing "1588 "%d leading pathname component (line %d)",1589 "git diff header lacks filename information when removing "1590 "%d leading pathname components (line %d)",1591 state->p_value),1592 state->p_value, state->linenr);1593 return -128;1594 }1595 patch->old_name = xstrdup(patch->def_name);1596 patch->new_name = xstrdup(patch->def_name);1597 }1598 if ((!patch->new_name && !patch->is_delete) ||1599 (!patch->old_name && !patch->is_new)) {1600 error(_("git diff header lacks filename information "1601 "(line %d)"), state->linenr);1602 return -128;1603 }1604 patch->is_toplevel_relative = 1;1605 *hdrsize = git_hdr_len;1606 return offset;1607 }16081609 /* --- followed by +++ ? */1610 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))1611 continue;16121613 /*1614 * We only accept unified patches, so we want it to1615 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1616 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1617 */1618 nextlen = linelen(line + len, size - len);1619 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))1620 continue;16211622 /* Ok, we'll consider it a patch */1623 if (parse_traditional_patch(state, line, line+len, patch))1624 return -128;1625 *hdrsize = len + nextlen;1626 state->linenr += 2;1627 return offset;1628 }1629 return -1;1630}16311632static void record_ws_error(struct apply_state *state,1633 unsigned result,1634 const char *line,1635 int len,1636 int linenr)1637{1638 char *err;16391640 if (!result)1641 return;16421643 state->whitespace_error++;1644 if (state->squelch_whitespace_errors &&1645 state->squelch_whitespace_errors < state->whitespace_error)1646 return;16471648 err = whitespace_error_string(result);1649 if (state->apply_verbosity > verbosity_silent)1650 fprintf(stderr, "%s:%d: %s.\n%.*s\n",1651 state->patch_input_file, linenr, err, len, line);1652 free(err);1653}16541655static void check_whitespace(struct apply_state *state,1656 const char *line,1657 int len,1658 unsigned ws_rule)1659{1660 unsigned result = ws_check(line + 1, len - 1, ws_rule);16611662 record_ws_error(state, result, line + 1, len - 2, state->linenr);1663}16641665/*1666 * Parse a unified diff. Note that this really needs to parse each1667 * fragment separately, since the only way to know the difference1668 * between a "---" that is part of a patch, and a "---" that starts1669 * the next patch is to look at the line counts..1670 */1671static int parse_fragment(struct apply_state *state,1672 const char *line,1673 unsigned long size,1674 struct patch *patch,1675 struct fragment *fragment)1676{1677 int added, deleted;1678 int len = linelen(line, size), offset;1679 unsigned long oldlines, newlines;1680 unsigned long leading, trailing;16811682 offset = parse_fragment_header(line, len, fragment);1683 if (offset < 0)1684 return -1;1685 if (offset > 0 && patch->recount)1686 recount_diff(line + offset, size - offset, fragment);1687 oldlines = fragment->oldlines;1688 newlines = fragment->newlines;1689 leading = 0;1690 trailing = 0;16911692 /* Parse the thing.. */1693 line += len;1694 size -= len;1695 state->linenr++;1696 added = deleted = 0;1697 for (offset = len;1698 0 < size;1699 offset += len, size -= len, line += len, state->linenr++) {1700 if (!oldlines && !newlines)1701 break;1702 len = linelen(line, size);1703 if (!len || line[len-1] != '\n')1704 return -1;1705 switch (*line) {1706 default:1707 return -1;1708 case '\n': /* newer GNU diff, an empty context line */1709 case ' ':1710 oldlines--;1711 newlines--;1712 if (!deleted && !added)1713 leading++;1714 trailing++;1715 if (!state->apply_in_reverse &&1716 state->ws_error_action == correct_ws_error)1717 check_whitespace(state, line, len, patch->ws_rule);1718 break;1719 case '-':1720 if (state->apply_in_reverse &&1721 state->ws_error_action != nowarn_ws_error)1722 check_whitespace(state, line, len, patch->ws_rule);1723 deleted++;1724 oldlines--;1725 trailing = 0;1726 break;1727 case '+':1728 if (!state->apply_in_reverse &&1729 state->ws_error_action != nowarn_ws_error)1730 check_whitespace(state, line, len, patch->ws_rule);1731 added++;1732 newlines--;1733 trailing = 0;1734 break;17351736 /*1737 * We allow "\ No newline at end of file". Depending1738 * on locale settings when the patch was produced we1739 * don't know what this line looks like. The only1740 * thing we do know is that it begins with "\ ".1741 * Checking for 12 is just for sanity check -- any1742 * l10n of "\ No newline..." is at least that long.1743 */1744 case '\\':1745 if (len < 12 || memcmp(line, "\\ ", 2))1746 return -1;1747 break;1748 }1749 }1750 if (oldlines || newlines)1751 return -1;1752 if (!deleted && !added)1753 return -1;17541755 fragment->leading = leading;1756 fragment->trailing = trailing;17571758 /*1759 * If a fragment ends with an incomplete line, we failed to include1760 * it in the above loop because we hit oldlines == newlines == 01761 * before seeing it.1762 */1763 if (12 < size && !memcmp(line, "\\ ", 2))1764 offset += linelen(line, size);17651766 patch->lines_added += added;1767 patch->lines_deleted += deleted;17681769 if (0 < patch->is_new && oldlines)1770 return error(_("new file depends on old contents"));1771 if (0 < patch->is_delete && newlines)1772 return error(_("deleted file still has contents"));1773 return offset;1774}17751776/*1777 * We have seen "diff --git a/... b/..." header (or a traditional patch1778 * header). Read hunks that belong to this patch into fragments and hang1779 * them to the given patch structure.1780 *1781 * The (fragment->patch, fragment->size) pair points into the memory given1782 * by the caller, not a copy, when we return.1783 *1784 * Returns:1785 * -1 in case of error,1786 * the number of bytes in the patch otherwise.1787 */1788static int parse_single_patch(struct apply_state *state,1789 const char *line,1790 unsigned long size,1791 struct patch *patch)1792{1793 unsigned long offset = 0;1794 unsigned long oldlines = 0, newlines = 0, context = 0;1795 struct fragment **fragp = &patch->fragments;17961797 while (size > 4 && !memcmp(line, "@@ -", 4)) {1798 struct fragment *fragment;1799 int len;18001801 fragment = xcalloc(1, sizeof(*fragment));1802 fragment->linenr = state->linenr;1803 len = parse_fragment(state, line, size, patch, fragment);1804 if (len <= 0) {1805 free(fragment);1806 return error(_("corrupt patch at line %d"), state->linenr);1807 }1808 fragment->patch = line;1809 fragment->size = len;1810 oldlines += fragment->oldlines;1811 newlines += fragment->newlines;1812 context += fragment->leading + fragment->trailing;18131814 *fragp = fragment;1815 fragp = &fragment->next;18161817 offset += len;1818 line += len;1819 size -= len;1820 }18211822 /*1823 * If something was removed (i.e. we have old-lines) it cannot1824 * be creation, and if something was added it cannot be1825 * deletion. However, the reverse is not true; --unified=01826 * patches that only add are not necessarily creation even1827 * though they do not have any old lines, and ones that only1828 * delete are not necessarily deletion.1829 *1830 * Unfortunately, a real creation/deletion patch do _not_ have1831 * any context line by definition, so we cannot safely tell it1832 * apart with --unified=0 insanity. At least if the patch has1833 * more than one hunk it is not creation or deletion.1834 */1835 if (patch->is_new < 0 &&1836 (oldlines || (patch->fragments && patch->fragments->next)))1837 patch->is_new = 0;1838 if (patch->is_delete < 0 &&1839 (newlines || (patch->fragments && patch->fragments->next)))1840 patch->is_delete = 0;18411842 if (0 < patch->is_new && oldlines)1843 return error(_("new file %s depends on old contents"), patch->new_name);1844 if (0 < patch->is_delete && newlines)1845 return error(_("deleted file %s still has contents"), patch->old_name);1846 if (!patch->is_delete && !newlines && context && state->apply_verbosity > verbosity_silent)1847 fprintf_ln(stderr,1848 _("** warning: "1849 "file %s becomes empty but is not deleted"),1850 patch->new_name);18511852 return offset;1853}18541855static inline int metadata_changes(struct patch *patch)1856{1857 return patch->is_rename > 0 ||1858 patch->is_copy > 0 ||1859 patch->is_new > 0 ||1860 patch->is_delete ||1861 (patch->old_mode && patch->new_mode &&1862 patch->old_mode != patch->new_mode);1863}18641865static char *inflate_it(const void *data, unsigned long size,1866 unsigned long inflated_size)1867{1868 git_zstream stream;1869 void *out;1870 int st;18711872 memset(&stream, 0, sizeof(stream));18731874 stream.next_in = (unsigned char *)data;1875 stream.avail_in = size;1876 stream.next_out = out = xmalloc(inflated_size);1877 stream.avail_out = inflated_size;1878 git_inflate_init(&stream);1879 st = git_inflate(&stream, Z_FINISH);1880 git_inflate_end(&stream);1881 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {1882 free(out);1883 return NULL;1884 }1885 return out;1886}18871888/*1889 * Read a binary hunk and return a new fragment; fragment->patch1890 * points at an allocated memory that the caller must free, so1891 * it is marked as "->free_patch = 1".1892 */1893static struct fragment *parse_binary_hunk(struct apply_state *state,1894 char **buf_p,1895 unsigned long *sz_p,1896 int *status_p,1897 int *used_p)1898{1899 /*1900 * Expect a line that begins with binary patch method ("literal"1901 * or "delta"), followed by the length of data before deflating.1902 * a sequence of 'length-byte' followed by base-85 encoded data1903 * should follow, terminated by a newline.1904 *1905 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1906 * and we would limit the patch line to 66 characters,1907 * so one line can fit up to 13 groups that would decode1908 * to 52 bytes max. The length byte 'A'-'Z' corresponds1909 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1910 */1911 int llen, used;1912 unsigned long size = *sz_p;1913 char *buffer = *buf_p;1914 int patch_method;1915 unsigned long origlen;1916 char *data = NULL;1917 int hunk_size = 0;1918 struct fragment *frag;19191920 llen = linelen(buffer, size);1921 used = llen;19221923 *status_p = 0;19241925 if (starts_with(buffer, "delta ")) {1926 patch_method = BINARY_DELTA_DEFLATED;1927 origlen = strtoul(buffer + 6, NULL, 10);1928 }1929 else if (starts_with(buffer, "literal ")) {1930 patch_method = BINARY_LITERAL_DEFLATED;1931 origlen = strtoul(buffer + 8, NULL, 10);1932 }1933 else1934 return NULL;19351936 state->linenr++;1937 buffer += llen;1938 while (1) {1939 int byte_length, max_byte_length, newsize;1940 llen = linelen(buffer, size);1941 used += llen;1942 state->linenr++;1943 if (llen == 1) {1944 /* consume the blank line */1945 buffer++;1946 size--;1947 break;1948 }1949 /*1950 * Minimum line is "A00000\n" which is 7-byte long,1951 * and the line length must be multiple of 5 plus 2.1952 */1953 if ((llen < 7) || (llen-2) % 5)1954 goto corrupt;1955 max_byte_length = (llen - 2) / 5 * 4;1956 byte_length = *buffer;1957 if ('A' <= byte_length && byte_length <= 'Z')1958 byte_length = byte_length - 'A' + 1;1959 else if ('a' <= byte_length && byte_length <= 'z')1960 byte_length = byte_length - 'a' + 27;1961 else1962 goto corrupt;1963 /* if the input length was not multiple of 4, we would1964 * have filler at the end but the filler should never1965 * exceed 3 bytes1966 */1967 if (max_byte_length < byte_length ||1968 byte_length <= max_byte_length - 4)1969 goto corrupt;1970 newsize = hunk_size + byte_length;1971 data = xrealloc(data, newsize);1972 if (decode_85(data + hunk_size, buffer + 1, byte_length))1973 goto corrupt;1974 hunk_size = newsize;1975 buffer += llen;1976 size -= llen;1977 }19781979 frag = xcalloc(1, sizeof(*frag));1980 frag->patch = inflate_it(data, hunk_size, origlen);1981 frag->free_patch = 1;1982 if (!frag->patch)1983 goto corrupt;1984 free(data);1985 frag->size = origlen;1986 *buf_p = buffer;1987 *sz_p = size;1988 *used_p = used;1989 frag->binary_patch_method = patch_method;1990 return frag;19911992 corrupt:1993 free(data);1994 *status_p = -1;1995 error(_("corrupt binary patch at line %d: %.*s"),1996 state->linenr-1, llen-1, buffer);1997 return NULL;1998}19992000/*2001 * Returns:2002 * -1 in case of error,2003 * the length of the parsed binary patch otherwise2004 */2005static int parse_binary(struct apply_state *state,2006 char *buffer,2007 unsigned long size,2008 struct patch *patch)2009{2010 /*2011 * We have read "GIT binary patch\n"; what follows is a line2012 * that says the patch method (currently, either "literal" or2013 * "delta") and the length of data before deflating; a2014 * sequence of 'length-byte' followed by base-85 encoded data2015 * follows.2016 *2017 * When a binary patch is reversible, there is another binary2018 * hunk in the same format, starting with patch method (either2019 * "literal" or "delta") with the length of data, and a sequence2020 * of length-byte + base-85 encoded data, terminated with another2021 * empty line. This data, when applied to the postimage, produces2022 * the preimage.2023 */2024 struct fragment *forward;2025 struct fragment *reverse;2026 int status;2027 int used, used_1;20282029 forward = parse_binary_hunk(state, &buffer, &size, &status, &used);2030 if (!forward && !status)2031 /* there has to be one hunk (forward hunk) */2032 return error(_("unrecognized binary patch at line %d"), state->linenr-1);2033 if (status)2034 /* otherwise we already gave an error message */2035 return status;20362037 reverse = parse_binary_hunk(state, &buffer, &size, &status, &used_1);2038 if (reverse)2039 used += used_1;2040 else if (status) {2041 /*2042 * Not having reverse hunk is not an error, but having2043 * a corrupt reverse hunk is.2044 */2045 free((void*) forward->patch);2046 free(forward);2047 return status;2048 }2049 forward->next = reverse;2050 patch->fragments = forward;2051 patch->is_binary = 1;2052 return used;2053}20542055static void prefix_one(struct apply_state *state, char **name)2056{2057 char *old_name = *name;2058 if (!old_name)2059 return;2060 *name = prefix_filename(state->prefix, *name);2061 free(old_name);2062}20632064static void prefix_patch(struct apply_state *state, struct patch *p)2065{2066 if (!state->prefix || p->is_toplevel_relative)2067 return;2068 prefix_one(state, &p->new_name);2069 prefix_one(state, &p->old_name);2070}20712072/*2073 * include/exclude2074 */20752076static void add_name_limit(struct apply_state *state,2077 const char *name,2078 int exclude)2079{2080 struct string_list_item *it;20812082 it = string_list_append(&state->limit_by_name, name);2083 it->util = exclude ? NULL : (void *) 1;2084}20852086static int use_patch(struct apply_state *state, struct patch *p)2087{2088 const char *pathname = p->new_name ? p->new_name : p->old_name;2089 int i;20902091 /* Paths outside are not touched regardless of "--include" */2092 if (0 < state->prefix_length) {2093 int pathlen = strlen(pathname);2094 if (pathlen <= state->prefix_length ||2095 memcmp(state->prefix, pathname, state->prefix_length))2096 return 0;2097 }20982099 /* See if it matches any of exclude/include rule */2100 for (i = 0; i < state->limit_by_name.nr; i++) {2101 struct string_list_item *it = &state->limit_by_name.items[i];2102 if (!wildmatch(it->string, pathname, 0))2103 return (it->util != NULL);2104 }21052106 /*2107 * If we had any include, a path that does not match any rule is2108 * not used. Otherwise, we saw bunch of exclude rules (or none)2109 * and such a path is used.2110 */2111 return !state->has_include;2112}21132114/*2115 * Read the patch text in "buffer" that extends for "size" bytes; stop2116 * reading after seeing a single patch (i.e. changes to a single file).2117 * Create fragments (i.e. patch hunks) and hang them to the given patch.2118 *2119 * Returns:2120 * -1 if no header was found or parse_binary() failed,2121 * -128 on another error,2122 * the number of bytes consumed otherwise,2123 * so that the caller can call us again for the next patch.2124 */2125static int parse_chunk(struct apply_state *state, char *buffer, unsigned long size, struct patch *patch)2126{2127 int hdrsize, patchsize;2128 int offset = find_header(state, buffer, size, &hdrsize, patch);21292130 if (offset < 0)2131 return offset;21322133 prefix_patch(state, patch);21342135 if (!use_patch(state, patch))2136 patch->ws_rule = 0;2137 else2138 patch->ws_rule = whitespace_rule(patch->new_name2139 ? patch->new_name2140 : patch->old_name);21412142 patchsize = parse_single_patch(state,2143 buffer + offset + hdrsize,2144 size - offset - hdrsize,2145 patch);21462147 if (patchsize < 0)2148 return -128;21492150 if (!patchsize) {2151 static const char git_binary[] = "GIT binary patch\n";2152 int hd = hdrsize + offset;2153 unsigned long llen = linelen(buffer + hd, size - hd);21542155 if (llen == sizeof(git_binary) - 1 &&2156 !memcmp(git_binary, buffer + hd, llen)) {2157 int used;2158 state->linenr++;2159 used = parse_binary(state, buffer + hd + llen,2160 size - hd - llen, patch);2161 if (used < 0)2162 return -1;2163 if (used)2164 patchsize = used + llen;2165 else2166 patchsize = 0;2167 }2168 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {2169 static const char *binhdr[] = {2170 "Binary files ",2171 "Files ",2172 NULL,2173 };2174 int i;2175 for (i = 0; binhdr[i]; i++) {2176 int len = strlen(binhdr[i]);2177 if (len < size - hd &&2178 !memcmp(binhdr[i], buffer + hd, len)) {2179 state->linenr++;2180 patch->is_binary = 1;2181 patchsize = llen;2182 break;2183 }2184 }2185 }21862187 /* Empty patch cannot be applied if it is a text patch2188 * without metadata change. A binary patch appears2189 * empty to us here.2190 */2191 if ((state->apply || state->check) &&2192 (!patch->is_binary && !metadata_changes(patch))) {2193 error(_("patch with only garbage at line %d"), state->linenr);2194 return -128;2195 }2196 }21972198 return offset + hdrsize + patchsize;2199}22002201static void reverse_patches(struct patch *p)2202{2203 for (; p; p = p->next) {2204 struct fragment *frag = p->fragments;22052206 SWAP(p->new_name, p->old_name);2207 SWAP(p->new_mode, p->old_mode);2208 SWAP(p->is_new, p->is_delete);2209 SWAP(p->lines_added, p->lines_deleted);2210 SWAP(p->old_sha1_prefix, p->new_sha1_prefix);22112212 for (; frag; frag = frag->next) {2213 SWAP(frag->newpos, frag->oldpos);2214 SWAP(frag->newlines, frag->oldlines);2215 }2216 }2217}22182219static const char pluses[] =2220"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2221static const char minuses[]=2222"----------------------------------------------------------------------";22232224static void show_stats(struct apply_state *state, struct patch *patch)2225{2226 struct strbuf qname = STRBUF_INIT;2227 char *cp = patch->new_name ? patch->new_name : patch->old_name;2228 int max, add, del;22292230 quote_c_style(cp, &qname, NULL, 0);22312232 /*2233 * "scale" the filename2234 */2235 max = state->max_len;2236 if (max > 50)2237 max = 50;22382239 if (qname.len > max) {2240 cp = strchr(qname.buf + qname.len + 3 - max, '/');2241 if (!cp)2242 cp = qname.buf + qname.len + 3 - max;2243 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);2244 }22452246 if (patch->is_binary) {2247 printf(" %-*s | Bin\n", max, qname.buf);2248 strbuf_release(&qname);2249 return;2250 }22512252 printf(" %-*s |", max, qname.buf);2253 strbuf_release(&qname);22542255 /*2256 * scale the add/delete2257 */2258 max = max + state->max_change > 70 ? 70 - max : state->max_change;2259 add = patch->lines_added;2260 del = patch->lines_deleted;22612262 if (state->max_change > 0) {2263 int total = ((add + del) * max + state->max_change / 2) / state->max_change;2264 add = (add * max + state->max_change / 2) / state->max_change;2265 del = total - add;2266 }2267 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2268 add, pluses, del, minuses);2269}22702271static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)2272{2273 switch (st->st_mode & S_IFMT) {2274 case S_IFLNK:2275 if (strbuf_readlink(buf, path, st->st_size) < 0)2276 return error(_("unable to read symlink %s"), path);2277 return 0;2278 case S_IFREG:2279 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)2280 return error(_("unable to open or read %s"), path);2281 convert_to_git(&the_index, path, buf->buf, buf->len, buf, 0);2282 return 0;2283 default:2284 return -1;2285 }2286}22872288/*2289 * Update the preimage, and the common lines in postimage,2290 * from buffer buf of length len. If postlen is 0 the postimage2291 * is updated in place, otherwise it's updated on a new buffer2292 * of length postlen2293 */22942295static void update_pre_post_images(struct image *preimage,2296 struct image *postimage,2297 char *buf,2298 size_t len, size_t postlen)2299{2300 int i, ctx, reduced;2301 char *new, *old, *fixed;2302 struct image fixed_preimage;23032304 /*2305 * Update the preimage with whitespace fixes. Note that we2306 * are not losing preimage->buf -- apply_one_fragment() will2307 * free "oldlines".2308 */2309 prepare_image(&fixed_preimage, buf, len, 1);2310 assert(postlen2311 ? fixed_preimage.nr == preimage->nr2312 : fixed_preimage.nr <= preimage->nr);2313 for (i = 0; i < fixed_preimage.nr; i++)2314 fixed_preimage.line[i].flag = preimage->line[i].flag;2315 free(preimage->line_allocated);2316 *preimage = fixed_preimage;23172318 /*2319 * Adjust the common context lines in postimage. This can be2320 * done in-place when we are shrinking it with whitespace2321 * fixing, but needs a new buffer when ignoring whitespace or2322 * expanding leading tabs to spaces.2323 *2324 * We trust the caller to tell us if the update can be done2325 * in place (postlen==0) or not.2326 */2327 old = postimage->buf;2328 if (postlen)2329 new = postimage->buf = xmalloc(postlen);2330 else2331 new = old;2332 fixed = preimage->buf;23332334 for (i = reduced = ctx = 0; i < postimage->nr; i++) {2335 size_t l_len = postimage->line[i].len;2336 if (!(postimage->line[i].flag & LINE_COMMON)) {2337 /* an added line -- no counterparts in preimage */2338 memmove(new, old, l_len);2339 old += l_len;2340 new += l_len;2341 continue;2342 }23432344 /* a common context -- skip it in the original postimage */2345 old += l_len;23462347 /* and find the corresponding one in the fixed preimage */2348 while (ctx < preimage->nr &&2349 !(preimage->line[ctx].flag & LINE_COMMON)) {2350 fixed += preimage->line[ctx].len;2351 ctx++;2352 }23532354 /*2355 * preimage is expected to run out, if the caller2356 * fixed addition of trailing blank lines.2357 */2358 if (preimage->nr <= ctx) {2359 reduced++;2360 continue;2361 }23622363 /* and copy it in, while fixing the line length */2364 l_len = preimage->line[ctx].len;2365 memcpy(new, fixed, l_len);2366 new += l_len;2367 fixed += l_len;2368 postimage->line[i].len = l_len;2369 ctx++;2370 }23712372 if (postlen2373 ? postlen < new - postimage->buf2374 : postimage->len < new - postimage->buf)2375 die("BUG: caller miscounted postlen: asked %d, orig = %d, used = %d",2376 (int)postlen, (int) postimage->len, (int)(new - postimage->buf));23772378 /* Fix the length of the whole thing */2379 postimage->len = new - postimage->buf;2380 postimage->nr -= reduced;2381}23822383static int line_by_line_fuzzy_match(struct image *img,2384 struct image *preimage,2385 struct image *postimage,2386 unsigned long try,2387 int try_lno,2388 int preimage_limit)2389{2390 int i;2391 size_t imgoff = 0;2392 size_t preoff = 0;2393 size_t postlen = postimage->len;2394 size_t extra_chars;2395 char *buf;2396 char *preimage_eof;2397 char *preimage_end;2398 struct strbuf fixed;2399 char *fixed_buf;2400 size_t fixed_len;24012402 for (i = 0; i < preimage_limit; i++) {2403 size_t prelen = preimage->line[i].len;2404 size_t imglen = img->line[try_lno+i].len;24052406 if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,2407 preimage->buf + preoff, prelen))2408 return 0;2409 if (preimage->line[i].flag & LINE_COMMON)2410 postlen += imglen - prelen;2411 imgoff += imglen;2412 preoff += prelen;2413 }24142415 /*2416 * Ok, the preimage matches with whitespace fuzz.2417 *2418 * imgoff now holds the true length of the target that2419 * matches the preimage before the end of the file.2420 *2421 * Count the number of characters in the preimage that fall2422 * beyond the end of the file and make sure that all of them2423 * are whitespace characters. (This can only happen if2424 * we are removing blank lines at the end of the file.)2425 */2426 buf = preimage_eof = preimage->buf + preoff;2427 for ( ; i < preimage->nr; i++)2428 preoff += preimage->line[i].len;2429 preimage_end = preimage->buf + preoff;2430 for ( ; buf < preimage_end; buf++)2431 if (!isspace(*buf))2432 return 0;24332434 /*2435 * Update the preimage and the common postimage context2436 * lines to use the same whitespace as the target.2437 * If whitespace is missing in the target (i.e.2438 * if the preimage extends beyond the end of the file),2439 * use the whitespace from the preimage.2440 */2441 extra_chars = preimage_end - preimage_eof;2442 strbuf_init(&fixed, imgoff + extra_chars);2443 strbuf_add(&fixed, img->buf + try, imgoff);2444 strbuf_add(&fixed, preimage_eof, extra_chars);2445 fixed_buf = strbuf_detach(&fixed, &fixed_len);2446 update_pre_post_images(preimage, postimage,2447 fixed_buf, fixed_len, postlen);2448 return 1;2449}24502451static int match_fragment(struct apply_state *state,2452 struct image *img,2453 struct image *preimage,2454 struct image *postimage,2455 unsigned long try,2456 int try_lno,2457 unsigned ws_rule,2458 int match_beginning, int match_end)2459{2460 int i;2461 char *fixed_buf, *buf, *orig, *target;2462 struct strbuf fixed;2463 size_t fixed_len, postlen;2464 int preimage_limit;24652466 if (preimage->nr + try_lno <= img->nr) {2467 /*2468 * The hunk falls within the boundaries of img.2469 */2470 preimage_limit = preimage->nr;2471 if (match_end && (preimage->nr + try_lno != img->nr))2472 return 0;2473 } else if (state->ws_error_action == correct_ws_error &&2474 (ws_rule & WS_BLANK_AT_EOF)) {2475 /*2476 * This hunk extends beyond the end of img, and we are2477 * removing blank lines at the end of the file. This2478 * many lines from the beginning of the preimage must2479 * match with img, and the remainder of the preimage2480 * must be blank.2481 */2482 preimage_limit = img->nr - try_lno;2483 } else {2484 /*2485 * The hunk extends beyond the end of the img and2486 * we are not removing blanks at the end, so we2487 * should reject the hunk at this position.2488 */2489 return 0;2490 }24912492 if (match_beginning && try_lno)2493 return 0;24942495 /* Quick hash check */2496 for (i = 0; i < preimage_limit; i++)2497 if ((img->line[try_lno + i].flag & LINE_PATCHED) ||2498 (preimage->line[i].hash != img->line[try_lno + i].hash))2499 return 0;25002501 if (preimage_limit == preimage->nr) {2502 /*2503 * Do we have an exact match? If we were told to match2504 * at the end, size must be exactly at try+fragsize,2505 * otherwise try+fragsize must be still within the preimage,2506 * and either case, the old piece should match the preimage2507 * exactly.2508 */2509 if ((match_end2510 ? (try + preimage->len == img->len)2511 : (try + preimage->len <= img->len)) &&2512 !memcmp(img->buf + try, preimage->buf, preimage->len))2513 return 1;2514 } else {2515 /*2516 * The preimage extends beyond the end of img, so2517 * there cannot be an exact match.2518 *2519 * There must be one non-blank context line that match2520 * a line before the end of img.2521 */2522 char *buf_end;25232524 buf = preimage->buf;2525 buf_end = buf;2526 for (i = 0; i < preimage_limit; i++)2527 buf_end += preimage->line[i].len;25282529 for ( ; buf < buf_end; buf++)2530 if (!isspace(*buf))2531 break;2532 if (buf == buf_end)2533 return 0;2534 }25352536 /*2537 * No exact match. If we are ignoring whitespace, run a line-by-line2538 * fuzzy matching. We collect all the line length information because2539 * we need it to adjust whitespace if we match.2540 */2541 if (state->ws_ignore_action == ignore_ws_change)2542 return line_by_line_fuzzy_match(img, preimage, postimage,2543 try, try_lno, preimage_limit);25442545 if (state->ws_error_action != correct_ws_error)2546 return 0;25472548 /*2549 * The hunk does not apply byte-by-byte, but the hash says2550 * it might with whitespace fuzz. We weren't asked to2551 * ignore whitespace, we were asked to correct whitespace2552 * errors, so let's try matching after whitespace correction.2553 *2554 * While checking the preimage against the target, whitespace2555 * errors in both fixed, we count how large the corresponding2556 * postimage needs to be. The postimage prepared by2557 * apply_one_fragment() has whitespace errors fixed on added2558 * lines already, but the common lines were propagated as-is,2559 * which may become longer when their whitespace errors are2560 * fixed.2561 */25622563 /* First count added lines in postimage */2564 postlen = 0;2565 for (i = 0; i < postimage->nr; i++) {2566 if (!(postimage->line[i].flag & LINE_COMMON))2567 postlen += postimage->line[i].len;2568 }25692570 /*2571 * The preimage may extend beyond the end of the file,2572 * but in this loop we will only handle the part of the2573 * preimage that falls within the file.2574 */2575 strbuf_init(&fixed, preimage->len + 1);2576 orig = preimage->buf;2577 target = img->buf + try;2578 for (i = 0; i < preimage_limit; i++) {2579 size_t oldlen = preimage->line[i].len;2580 size_t tgtlen = img->line[try_lno + i].len;2581 size_t fixstart = fixed.len;2582 struct strbuf tgtfix;2583 int match;25842585 /* Try fixing the line in the preimage */2586 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);25872588 /* Try fixing the line in the target */2589 strbuf_init(&tgtfix, tgtlen);2590 ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);25912592 /*2593 * If they match, either the preimage was based on2594 * a version before our tree fixed whitespace breakage,2595 * or we are lacking a whitespace-fix patch the tree2596 * the preimage was based on already had (i.e. target2597 * has whitespace breakage, the preimage doesn't).2598 * In either case, we are fixing the whitespace breakages2599 * so we might as well take the fix together with their2600 * real change.2601 */2602 match = (tgtfix.len == fixed.len - fixstart &&2603 !memcmp(tgtfix.buf, fixed.buf + fixstart,2604 fixed.len - fixstart));26052606 /* Add the length if this is common with the postimage */2607 if (preimage->line[i].flag & LINE_COMMON)2608 postlen += tgtfix.len;26092610 strbuf_release(&tgtfix);2611 if (!match)2612 goto unmatch_exit;26132614 orig += oldlen;2615 target += tgtlen;2616 }261726182619 /*2620 * Now handle the lines in the preimage that falls beyond the2621 * end of the file (if any). They will only match if they are2622 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2623 * false).2624 */2625 for ( ; i < preimage->nr; i++) {2626 size_t fixstart = fixed.len; /* start of the fixed preimage */2627 size_t oldlen = preimage->line[i].len;2628 int j;26292630 /* Try fixing the line in the preimage */2631 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);26322633 for (j = fixstart; j < fixed.len; j++)2634 if (!isspace(fixed.buf[j]))2635 goto unmatch_exit;26362637 orig += oldlen;2638 }26392640 /*2641 * Yes, the preimage is based on an older version that still2642 * has whitespace breakages unfixed, and fixing them makes the2643 * hunk match. Update the context lines in the postimage.2644 */2645 fixed_buf = strbuf_detach(&fixed, &fixed_len);2646 if (postlen < postimage->len)2647 postlen = 0;2648 update_pre_post_images(preimage, postimage,2649 fixed_buf, fixed_len, postlen);2650 return 1;26512652 unmatch_exit:2653 strbuf_release(&fixed);2654 return 0;2655}26562657static int find_pos(struct apply_state *state,2658 struct image *img,2659 struct image *preimage,2660 struct image *postimage,2661 int line,2662 unsigned ws_rule,2663 int match_beginning, int match_end)2664{2665 int i;2666 unsigned long backwards, forwards, try;2667 int backwards_lno, forwards_lno, try_lno;26682669 /*2670 * If match_beginning or match_end is specified, there is no2671 * point starting from a wrong line that will never match and2672 * wander around and wait for a match at the specified end.2673 */2674 if (match_beginning)2675 line = 0;2676 else if (match_end)2677 line = img->nr - preimage->nr;26782679 /*2680 * Because the comparison is unsigned, the following test2681 * will also take care of a negative line number that can2682 * result when match_end and preimage is larger than the target.2683 */2684 if ((size_t) line > img->nr)2685 line = img->nr;26862687 try = 0;2688 for (i = 0; i < line; i++)2689 try += img->line[i].len;26902691 /*2692 * There's probably some smart way to do this, but I'll leave2693 * that to the smart and beautiful people. I'm simple and stupid.2694 */2695 backwards = try;2696 backwards_lno = line;2697 forwards = try;2698 forwards_lno = line;2699 try_lno = line;27002701 for (i = 0; ; i++) {2702 if (match_fragment(state, img, preimage, postimage,2703 try, try_lno, ws_rule,2704 match_beginning, match_end))2705 return try_lno;27062707 again:2708 if (backwards_lno == 0 && forwards_lno == img->nr)2709 break;27102711 if (i & 1) {2712 if (backwards_lno == 0) {2713 i++;2714 goto again;2715 }2716 backwards_lno--;2717 backwards -= img->line[backwards_lno].len;2718 try = backwards;2719 try_lno = backwards_lno;2720 } else {2721 if (forwards_lno == img->nr) {2722 i++;2723 goto again;2724 }2725 forwards += img->line[forwards_lno].len;2726 forwards_lno++;2727 try = forwards;2728 try_lno = forwards_lno;2729 }27302731 }2732 return -1;2733}27342735static void remove_first_line(struct image *img)2736{2737 img->buf += img->line[0].len;2738 img->len -= img->line[0].len;2739 img->line++;2740 img->nr--;2741}27422743static void remove_last_line(struct image *img)2744{2745 img->len -= img->line[--img->nr].len;2746}27472748/*2749 * The change from "preimage" and "postimage" has been found to2750 * apply at applied_pos (counts in line numbers) in "img".2751 * Update "img" to remove "preimage" and replace it with "postimage".2752 */2753static void update_image(struct apply_state *state,2754 struct image *img,2755 int applied_pos,2756 struct image *preimage,2757 struct image *postimage)2758{2759 /*2760 * remove the copy of preimage at offset in img2761 * and replace it with postimage2762 */2763 int i, nr;2764 size_t remove_count, insert_count, applied_at = 0;2765 char *result;2766 int preimage_limit;27672768 /*2769 * If we are removing blank lines at the end of img,2770 * the preimage may extend beyond the end.2771 * If that is the case, we must be careful only to2772 * remove the part of the preimage that falls within2773 * the boundaries of img. Initialize preimage_limit2774 * to the number of lines in the preimage that falls2775 * within the boundaries.2776 */2777 preimage_limit = preimage->nr;2778 if (preimage_limit > img->nr - applied_pos)2779 preimage_limit = img->nr - applied_pos;27802781 for (i = 0; i < applied_pos; i++)2782 applied_at += img->line[i].len;27832784 remove_count = 0;2785 for (i = 0; i < preimage_limit; i++)2786 remove_count += img->line[applied_pos + i].len;2787 insert_count = postimage->len;27882789 /* Adjust the contents */2790 result = xmalloc(st_add3(st_sub(img->len, remove_count), insert_count, 1));2791 memcpy(result, img->buf, applied_at);2792 memcpy(result + applied_at, postimage->buf, postimage->len);2793 memcpy(result + applied_at + postimage->len,2794 img->buf + (applied_at + remove_count),2795 img->len - (applied_at + remove_count));2796 free(img->buf);2797 img->buf = result;2798 img->len += insert_count - remove_count;2799 result[img->len] = '\0';28002801 /* Adjust the line table */2802 nr = img->nr + postimage->nr - preimage_limit;2803 if (preimage_limit < postimage->nr) {2804 /*2805 * NOTE: this knows that we never call remove_first_line()2806 * on anything other than pre/post image.2807 */2808 REALLOC_ARRAY(img->line, nr);2809 img->line_allocated = img->line;2810 }2811 if (preimage_limit != postimage->nr)2812 memmove(img->line + applied_pos + postimage->nr,2813 img->line + applied_pos + preimage_limit,2814 (img->nr - (applied_pos + preimage_limit)) *2815 sizeof(*img->line));2816 memcpy(img->line + applied_pos,2817 postimage->line,2818 postimage->nr * sizeof(*img->line));2819 if (!state->allow_overlap)2820 for (i = 0; i < postimage->nr; i++)2821 img->line[applied_pos + i].flag |= LINE_PATCHED;2822 img->nr = nr;2823}28242825/*2826 * Use the patch-hunk text in "frag" to prepare two images (preimage and2827 * postimage) for the hunk. Find lines that match "preimage" in "img" and2828 * replace the part of "img" with "postimage" text.2829 */2830static int apply_one_fragment(struct apply_state *state,2831 struct image *img, struct fragment *frag,2832 int inaccurate_eof, unsigned ws_rule,2833 int nth_fragment)2834{2835 int match_beginning, match_end;2836 const char *patch = frag->patch;2837 int size = frag->size;2838 char *old, *oldlines;2839 struct strbuf newlines;2840 int new_blank_lines_at_end = 0;2841 int found_new_blank_lines_at_end = 0;2842 int hunk_linenr = frag->linenr;2843 unsigned long leading, trailing;2844 int pos, applied_pos;2845 struct image preimage;2846 struct image postimage;28472848 memset(&preimage, 0, sizeof(preimage));2849 memset(&postimage, 0, sizeof(postimage));2850 oldlines = xmalloc(size);2851 strbuf_init(&newlines, size);28522853 old = oldlines;2854 while (size > 0) {2855 char first;2856 int len = linelen(patch, size);2857 int plen;2858 int added_blank_line = 0;2859 int is_blank_context = 0;2860 size_t start;28612862 if (!len)2863 break;28642865 /*2866 * "plen" is how much of the line we should use for2867 * the actual patch data. Normally we just remove the2868 * first character on the line, but if the line is2869 * followed by "\ No newline", then we also remove the2870 * last one (which is the newline, of course).2871 */2872 plen = len - 1;2873 if (len < size && patch[len] == '\\')2874 plen--;2875 first = *patch;2876 if (state->apply_in_reverse) {2877 if (first == '-')2878 first = '+';2879 else if (first == '+')2880 first = '-';2881 }28822883 switch (first) {2884 case '\n':2885 /* Newer GNU diff, empty context line */2886 if (plen < 0)2887 /* ... followed by '\No newline'; nothing */2888 break;2889 *old++ = '\n';2890 strbuf_addch(&newlines, '\n');2891 add_line_info(&preimage, "\n", 1, LINE_COMMON);2892 add_line_info(&postimage, "\n", 1, LINE_COMMON);2893 is_blank_context = 1;2894 break;2895 case ' ':2896 if (plen && (ws_rule & WS_BLANK_AT_EOF) &&2897 ws_blank_line(patch + 1, plen, ws_rule))2898 is_blank_context = 1;2899 case '-':2900 memcpy(old, patch + 1, plen);2901 add_line_info(&preimage, old, plen,2902 (first == ' ' ? LINE_COMMON : 0));2903 old += plen;2904 if (first == '-')2905 break;2906 /* Fall-through for ' ' */2907 case '+':2908 /* --no-add does not add new lines */2909 if (first == '+' && state->no_add)2910 break;29112912 start = newlines.len;2913 if (first != '+' ||2914 !state->whitespace_error ||2915 state->ws_error_action != correct_ws_error) {2916 strbuf_add(&newlines, patch + 1, plen);2917 }2918 else {2919 ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &state->applied_after_fixing_ws);2920 }2921 add_line_info(&postimage, newlines.buf + start, newlines.len - start,2922 (first == '+' ? 0 : LINE_COMMON));2923 if (first == '+' &&2924 (ws_rule & WS_BLANK_AT_EOF) &&2925 ws_blank_line(patch + 1, plen, ws_rule))2926 added_blank_line = 1;2927 break;2928 case '@': case '\\':2929 /* Ignore it, we already handled it */2930 break;2931 default:2932 if (state->apply_verbosity > verbosity_normal)2933 error(_("invalid start of line: '%c'"), first);2934 applied_pos = -1;2935 goto out;2936 }2937 if (added_blank_line) {2938 if (!new_blank_lines_at_end)2939 found_new_blank_lines_at_end = hunk_linenr;2940 new_blank_lines_at_end++;2941 }2942 else if (is_blank_context)2943 ;2944 else2945 new_blank_lines_at_end = 0;2946 patch += len;2947 size -= len;2948 hunk_linenr++;2949 }2950 if (inaccurate_eof &&2951 old > oldlines && old[-1] == '\n' &&2952 newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {2953 old--;2954 strbuf_setlen(&newlines, newlines.len - 1);2955 }29562957 leading = frag->leading;2958 trailing = frag->trailing;29592960 /*2961 * A hunk to change lines at the beginning would begin with2962 * @@ -1,L +N,M @@2963 * but we need to be careful. -U0 that inserts before the second2964 * line also has this pattern.2965 *2966 * And a hunk to add to an empty file would begin with2967 * @@ -0,0 +N,M @@2968 *2969 * In other words, a hunk that is (frag->oldpos <= 1) with or2970 * without leading context must match at the beginning.2971 */2972 match_beginning = (!frag->oldpos ||2973 (frag->oldpos == 1 && !state->unidiff_zero));29742975 /*2976 * A hunk without trailing lines must match at the end.2977 * However, we simply cannot tell if a hunk must match end2978 * from the lack of trailing lines if the patch was generated2979 * with unidiff without any context.2980 */2981 match_end = !state->unidiff_zero && !trailing;29822983 pos = frag->newpos ? (frag->newpos - 1) : 0;2984 preimage.buf = oldlines;2985 preimage.len = old - oldlines;2986 postimage.buf = newlines.buf;2987 postimage.len = newlines.len;2988 preimage.line = preimage.line_allocated;2989 postimage.line = postimage.line_allocated;29902991 for (;;) {29922993 applied_pos = find_pos(state, img, &preimage, &postimage, pos,2994 ws_rule, match_beginning, match_end);29952996 if (applied_pos >= 0)2997 break;29982999 /* Am I at my context limits? */3000 if ((leading <= state->p_context) && (trailing <= state->p_context))3001 break;3002 if (match_beginning || match_end) {3003 match_beginning = match_end = 0;3004 continue;3005 }30063007 /*3008 * Reduce the number of context lines; reduce both3009 * leading and trailing if they are equal otherwise3010 * just reduce the larger context.3011 */3012 if (leading >= trailing) {3013 remove_first_line(&preimage);3014 remove_first_line(&postimage);3015 pos--;3016 leading--;3017 }3018 if (trailing > leading) {3019 remove_last_line(&preimage);3020 remove_last_line(&postimage);3021 trailing--;3022 }3023 }30243025 if (applied_pos >= 0) {3026 if (new_blank_lines_at_end &&3027 preimage.nr + applied_pos >= img->nr &&3028 (ws_rule & WS_BLANK_AT_EOF) &&3029 state->ws_error_action != nowarn_ws_error) {3030 record_ws_error(state, WS_BLANK_AT_EOF, "+", 1,3031 found_new_blank_lines_at_end);3032 if (state->ws_error_action == correct_ws_error) {3033 while (new_blank_lines_at_end--)3034 remove_last_line(&postimage);3035 }3036 /*3037 * We would want to prevent write_out_results()3038 * from taking place in apply_patch() that follows3039 * the callchain led us here, which is:3040 * apply_patch->check_patch_list->check_patch->3041 * apply_data->apply_fragments->apply_one_fragment3042 */3043 if (state->ws_error_action == die_on_ws_error)3044 state->apply = 0;3045 }30463047 if (state->apply_verbosity > verbosity_normal && applied_pos != pos) {3048 int offset = applied_pos - pos;3049 if (state->apply_in_reverse)3050 offset = 0 - offset;3051 fprintf_ln(stderr,3052 Q_("Hunk #%d succeeded at %d (offset %d line).",3053 "Hunk #%d succeeded at %d (offset %d lines).",3054 offset),3055 nth_fragment, applied_pos + 1, offset);3056 }30573058 /*3059 * Warn if it was necessary to reduce the number3060 * of context lines.3061 */3062 if ((leading != frag->leading ||3063 trailing != frag->trailing) && state->apply_verbosity > verbosity_silent)3064 fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"3065 " to apply fragment at %d"),3066 leading, trailing, applied_pos+1);3067 update_image(state, img, applied_pos, &preimage, &postimage);3068 } else {3069 if (state->apply_verbosity > verbosity_normal)3070 error(_("while searching for:\n%.*s"),3071 (int)(old - oldlines), oldlines);3072 }30733074out:3075 free(oldlines);3076 strbuf_release(&newlines);3077 free(preimage.line_allocated);3078 free(postimage.line_allocated);30793080 return (applied_pos < 0);3081}30823083static int apply_binary_fragment(struct apply_state *state,3084 struct image *img,3085 struct patch *patch)3086{3087 struct fragment *fragment = patch->fragments;3088 unsigned long len;3089 void *dst;30903091 if (!fragment)3092 return error(_("missing binary patch data for '%s'"),3093 patch->new_name ?3094 patch->new_name :3095 patch->old_name);30963097 /* Binary patch is irreversible without the optional second hunk */3098 if (state->apply_in_reverse) {3099 if (!fragment->next)3100 return error(_("cannot reverse-apply a binary patch "3101 "without the reverse hunk to '%s'"),3102 patch->new_name3103 ? patch->new_name : patch->old_name);3104 fragment = fragment->next;3105 }3106 switch (fragment->binary_patch_method) {3107 case BINARY_DELTA_DEFLATED:3108 dst = patch_delta(img->buf, img->len, fragment->patch,3109 fragment->size, &len);3110 if (!dst)3111 return -1;3112 clear_image(img);3113 img->buf = dst;3114 img->len = len;3115 return 0;3116 case BINARY_LITERAL_DEFLATED:3117 clear_image(img);3118 img->len = fragment->size;3119 img->buf = xmemdupz(fragment->patch, img->len);3120 return 0;3121 }3122 return -1;3123}31243125/*3126 * Replace "img" with the result of applying the binary patch.3127 * The binary patch data itself in patch->fragment is still kept3128 * but the preimage prepared by the caller in "img" is freed here3129 * or in the helper function apply_binary_fragment() this calls.3130 */3131static int apply_binary(struct apply_state *state,3132 struct image *img,3133 struct patch *patch)3134{3135 const char *name = patch->old_name ? patch->old_name : patch->new_name;3136 struct object_id oid;31373138 /*3139 * For safety, we require patch index line to contain3140 * full 40-byte textual SHA1 for old and new, at least for now.3141 */3142 if (strlen(patch->old_sha1_prefix) != 40 ||3143 strlen(patch->new_sha1_prefix) != 40 ||3144 get_oid_hex(patch->old_sha1_prefix, &oid) ||3145 get_oid_hex(patch->new_sha1_prefix, &oid))3146 return error(_("cannot apply binary patch to '%s' "3147 "without full index line"), name);31483149 if (patch->old_name) {3150 /*3151 * See if the old one matches what the patch3152 * applies to.3153 */3154 hash_sha1_file(img->buf, img->len, blob_type, oid.hash);3155 if (strcmp(oid_to_hex(&oid), patch->old_sha1_prefix))3156 return error(_("the patch applies to '%s' (%s), "3157 "which does not match the "3158 "current contents."),3159 name, oid_to_hex(&oid));3160 }3161 else {3162 /* Otherwise, the old one must be empty. */3163 if (img->len)3164 return error(_("the patch applies to an empty "3165 "'%s' but it is not empty"), name);3166 }31673168 get_oid_hex(patch->new_sha1_prefix, &oid);3169 if (is_null_oid(&oid)) {3170 clear_image(img);3171 return 0; /* deletion patch */3172 }31733174 if (has_sha1_file(oid.hash)) {3175 /* We already have the postimage */3176 enum object_type type;3177 unsigned long size;3178 char *result;31793180 result = read_sha1_file(oid.hash, &type, &size);3181 if (!result)3182 return error(_("the necessary postimage %s for "3183 "'%s' cannot be read"),3184 patch->new_sha1_prefix, name);3185 clear_image(img);3186 img->buf = result;3187 img->len = size;3188 } else {3189 /*3190 * We have verified buf matches the preimage;3191 * apply the patch data to it, which is stored3192 * in the patch->fragments->{patch,size}.3193 */3194 if (apply_binary_fragment(state, img, patch))3195 return error(_("binary patch does not apply to '%s'"),3196 name);31973198 /* verify that the result matches */3199 hash_sha1_file(img->buf, img->len, blob_type, oid.hash);3200 if (strcmp(oid_to_hex(&oid), patch->new_sha1_prefix))3201 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),3202 name, patch->new_sha1_prefix, oid_to_hex(&oid));3203 }32043205 return 0;3206}32073208static int apply_fragments(struct apply_state *state, struct image *img, struct patch *patch)3209{3210 struct fragment *frag = patch->fragments;3211 const char *name = patch->old_name ? patch->old_name : patch->new_name;3212 unsigned ws_rule = patch->ws_rule;3213 unsigned inaccurate_eof = patch->inaccurate_eof;3214 int nth = 0;32153216 if (patch->is_binary)3217 return apply_binary(state, img, patch);32183219 while (frag) {3220 nth++;3221 if (apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) {3222 error(_("patch failed: %s:%ld"), name, frag->oldpos);3223 if (!state->apply_with_reject)3224 return -1;3225 frag->rejected = 1;3226 }3227 frag = frag->next;3228 }3229 return 0;3230}32313232static int read_blob_object(struct strbuf *buf, const struct object_id *oid, unsigned mode)3233{3234 if (S_ISGITLINK(mode)) {3235 strbuf_grow(buf, 100);3236 strbuf_addf(buf, "Subproject commit %s\n", oid_to_hex(oid));3237 } else {3238 enum object_type type;3239 unsigned long sz;3240 char *result;32413242 result = read_sha1_file(oid->hash, &type, &sz);3243 if (!result)3244 return -1;3245 /* XXX read_sha1_file NUL-terminates */3246 strbuf_attach(buf, result, sz, sz + 1);3247 }3248 return 0;3249}32503251static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf)3252{3253 if (!ce)3254 return 0;3255 return read_blob_object(buf, &ce->oid, ce->ce_mode);3256}32573258static struct patch *in_fn_table(struct apply_state *state, const char *name)3259{3260 struct string_list_item *item;32613262 if (name == NULL)3263 return NULL;32643265 item = string_list_lookup(&state->fn_table, name);3266 if (item != NULL)3267 return (struct patch *)item->util;32683269 return NULL;3270}32713272/*3273 * item->util in the filename table records the status of the path.3274 * Usually it points at a patch (whose result records the contents3275 * of it after applying it), but it could be PATH_WAS_DELETED for a3276 * path that a previously applied patch has already removed, or3277 * PATH_TO_BE_DELETED for a path that a later patch would remove.3278 *3279 * The latter is needed to deal with a case where two paths A and B3280 * are swapped by first renaming A to B and then renaming B to A;3281 * moving A to B should not be prevented due to presence of B as we3282 * will remove it in a later patch.3283 */3284#define PATH_TO_BE_DELETED ((struct patch *) -2)3285#define PATH_WAS_DELETED ((struct patch *) -1)32863287static int to_be_deleted(struct patch *patch)3288{3289 return patch == PATH_TO_BE_DELETED;3290}32913292static int was_deleted(struct patch *patch)3293{3294 return patch == PATH_WAS_DELETED;3295}32963297static void add_to_fn_table(struct apply_state *state, struct patch *patch)3298{3299 struct string_list_item *item;33003301 /*3302 * Always add new_name unless patch is a deletion3303 * This should cover the cases for normal diffs,3304 * file creations and copies3305 */3306 if (patch->new_name != NULL) {3307 item = string_list_insert(&state->fn_table, patch->new_name);3308 item->util = patch;3309 }33103311 /*3312 * store a failure on rename/deletion cases because3313 * later chunks shouldn't patch old names3314 */3315 if ((patch->new_name == NULL) || (patch->is_rename)) {3316 item = string_list_insert(&state->fn_table, patch->old_name);3317 item->util = PATH_WAS_DELETED;3318 }3319}33203321static void prepare_fn_table(struct apply_state *state, struct patch *patch)3322{3323 /*3324 * store information about incoming file deletion3325 */3326 while (patch) {3327 if ((patch->new_name == NULL) || (patch->is_rename)) {3328 struct string_list_item *item;3329 item = string_list_insert(&state->fn_table, patch->old_name);3330 item->util = PATH_TO_BE_DELETED;3331 }3332 patch = patch->next;3333 }3334}33353336static int checkout_target(struct index_state *istate,3337 struct cache_entry *ce, struct stat *st)3338{3339 struct checkout costate = CHECKOUT_INIT;33403341 costate.refresh_cache = 1;3342 costate.istate = istate;3343 if (checkout_entry(ce, &costate, NULL) || lstat(ce->name, st))3344 return error(_("cannot checkout %s"), ce->name);3345 return 0;3346}33473348static struct patch *previous_patch(struct apply_state *state,3349 struct patch *patch,3350 int *gone)3351{3352 struct patch *previous;33533354 *gone = 0;3355 if (patch->is_copy || patch->is_rename)3356 return NULL; /* "git" patches do not depend on the order */33573358 previous = in_fn_table(state, patch->old_name);3359 if (!previous)3360 return NULL;33613362 if (to_be_deleted(previous))3363 return NULL; /* the deletion hasn't happened yet */33643365 if (was_deleted(previous))3366 *gone = 1;33673368 return previous;3369}33703371static int verify_index_match(const struct cache_entry *ce, struct stat *st)3372{3373 if (S_ISGITLINK(ce->ce_mode)) {3374 if (!S_ISDIR(st->st_mode))3375 return -1;3376 return 0;3377 }3378 return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3379}33803381#define SUBMODULE_PATCH_WITHOUT_INDEX 133823383static int load_patch_target(struct apply_state *state,3384 struct strbuf *buf,3385 const struct cache_entry *ce,3386 struct stat *st,3387 const char *name,3388 unsigned expected_mode)3389{3390 if (state->cached || state->check_index) {3391 if (read_file_or_gitlink(ce, buf))3392 return error(_("failed to read %s"), name);3393 } else if (name) {3394 if (S_ISGITLINK(expected_mode)) {3395 if (ce)3396 return read_file_or_gitlink(ce, buf);3397 else3398 return SUBMODULE_PATCH_WITHOUT_INDEX;3399 } else if (has_symlink_leading_path(name, strlen(name))) {3400 return error(_("reading from '%s' beyond a symbolic link"), name);3401 } else {3402 if (read_old_data(st, name, buf))3403 return error(_("failed to read %s"), name);3404 }3405 }3406 return 0;3407}34083409/*3410 * We are about to apply "patch"; populate the "image" with the3411 * current version we have, from the working tree or from the index,3412 * depending on the situation e.g. --cached/--index. If we are3413 * applying a non-git patch that incrementally updates the tree,3414 * we read from the result of a previous diff.3415 */3416static int load_preimage(struct apply_state *state,3417 struct image *image,3418 struct patch *patch, struct stat *st,3419 const struct cache_entry *ce)3420{3421 struct strbuf buf = STRBUF_INIT;3422 size_t len;3423 char *img;3424 struct patch *previous;3425 int status;34263427 previous = previous_patch(state, patch, &status);3428 if (status)3429 return error(_("path %s has been renamed/deleted"),3430 patch->old_name);3431 if (previous) {3432 /* We have a patched copy in memory; use that. */3433 strbuf_add(&buf, previous->result, previous->resultsize);3434 } else {3435 status = load_patch_target(state, &buf, ce, st,3436 patch->old_name, patch->old_mode);3437 if (status < 0)3438 return status;3439 else if (status == SUBMODULE_PATCH_WITHOUT_INDEX) {3440 /*3441 * There is no way to apply subproject3442 * patch without looking at the index.3443 * NEEDSWORK: shouldn't this be flagged3444 * as an error???3445 */3446 free_fragment_list(patch->fragments);3447 patch->fragments = NULL;3448 } else if (status) {3449 return error(_("failed to read %s"), patch->old_name);3450 }3451 }34523453 img = strbuf_detach(&buf, &len);3454 prepare_image(image, img, len, !patch->is_binary);3455 return 0;3456}34573458static int three_way_merge(struct image *image,3459 char *path,3460 const struct object_id *base,3461 const struct object_id *ours,3462 const struct object_id *theirs)3463{3464 mmfile_t base_file, our_file, their_file;3465 mmbuffer_t result = { NULL };3466 int status;34673468 read_mmblob(&base_file, base);3469 read_mmblob(&our_file, ours);3470 read_mmblob(&their_file, theirs);3471 status = ll_merge(&result, path,3472 &base_file, "base",3473 &our_file, "ours",3474 &their_file, "theirs", NULL);3475 free(base_file.ptr);3476 free(our_file.ptr);3477 free(their_file.ptr);3478 if (status < 0 || !result.ptr) {3479 free(result.ptr);3480 return -1;3481 }3482 clear_image(image);3483 image->buf = result.ptr;3484 image->len = result.size;34853486 return status;3487}34883489/*3490 * When directly falling back to add/add three-way merge, we read from3491 * the current contents of the new_name. In no cases other than that3492 * this function will be called.3493 */3494static int load_current(struct apply_state *state,3495 struct image *image,3496 struct patch *patch)3497{3498 struct strbuf buf = STRBUF_INIT;3499 int status, pos;3500 size_t len;3501 char *img;3502 struct stat st;3503 struct cache_entry *ce;3504 char *name = patch->new_name;3505 unsigned mode = patch->new_mode;35063507 if (!patch->is_new)3508 die("BUG: patch to %s is not a creation", patch->old_name);35093510 pos = cache_name_pos(name, strlen(name));3511 if (pos < 0)3512 return error(_("%s: does not exist in index"), name);3513 ce = active_cache[pos];3514 if (lstat(name, &st)) {3515 if (errno != ENOENT)3516 return error_errno("%s", name);3517 if (checkout_target(&the_index, ce, &st))3518 return -1;3519 }3520 if (verify_index_match(ce, &st))3521 return error(_("%s: does not match index"), name);35223523 status = load_patch_target(state, &buf, ce, &st, name, mode);3524 if (status < 0)3525 return status;3526 else if (status)3527 return -1;3528 img = strbuf_detach(&buf, &len);3529 prepare_image(image, img, len, !patch->is_binary);3530 return 0;3531}35323533static int try_threeway(struct apply_state *state,3534 struct image *image,3535 struct patch *patch,3536 struct stat *st,3537 const struct cache_entry *ce)3538{3539 struct object_id pre_oid, post_oid, our_oid;3540 struct strbuf buf = STRBUF_INIT;3541 size_t len;3542 int status;3543 char *img;3544 struct image tmp_image;35453546 /* No point falling back to 3-way merge in these cases */3547 if (patch->is_delete ||3548 S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))3549 return -1;35503551 /* Preimage the patch was prepared for */3552 if (patch->is_new)3553 write_sha1_file("", 0, blob_type, pre_oid.hash);3554 else if (get_sha1(patch->old_sha1_prefix, pre_oid.hash) ||3555 read_blob_object(&buf, &pre_oid, patch->old_mode))3556 return error(_("repository lacks the necessary blob to fall back on 3-way merge."));35573558 if (state->apply_verbosity > verbosity_silent)3559 fprintf(stderr, _("Falling back to three-way merge...\n"));35603561 img = strbuf_detach(&buf, &len);3562 prepare_image(&tmp_image, img, len, 1);3563 /* Apply the patch to get the post image */3564 if (apply_fragments(state, &tmp_image, patch) < 0) {3565 clear_image(&tmp_image);3566 return -1;3567 }3568 /* post_oid is theirs */3569 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_oid.hash);3570 clear_image(&tmp_image);35713572 /* our_oid is ours */3573 if (patch->is_new) {3574 if (load_current(state, &tmp_image, patch))3575 return error(_("cannot read the current contents of '%s'"),3576 patch->new_name);3577 } else {3578 if (load_preimage(state, &tmp_image, patch, st, ce))3579 return error(_("cannot read the current contents of '%s'"),3580 patch->old_name);3581 }3582 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_oid.hash);3583 clear_image(&tmp_image);35843585 /* in-core three-way merge between post and our using pre as base */3586 status = three_way_merge(image, patch->new_name,3587 &pre_oid, &our_oid, &post_oid);3588 if (status < 0) {3589 if (state->apply_verbosity > verbosity_silent)3590 fprintf(stderr,3591 _("Failed to fall back on three-way merge...\n"));3592 return status;3593 }35943595 if (status) {3596 patch->conflicted_threeway = 1;3597 if (patch->is_new)3598 oidclr(&patch->threeway_stage[0]);3599 else3600 oidcpy(&patch->threeway_stage[0], &pre_oid);3601 oidcpy(&patch->threeway_stage[1], &our_oid);3602 oidcpy(&patch->threeway_stage[2], &post_oid);3603 if (state->apply_verbosity > verbosity_silent)3604 fprintf(stderr,3605 _("Applied patch to '%s' with conflicts.\n"),3606 patch->new_name);3607 } else {3608 if (state->apply_verbosity > verbosity_silent)3609 fprintf(stderr,3610 _("Applied patch to '%s' cleanly.\n"),3611 patch->new_name);3612 }3613 return 0;3614}36153616static int apply_data(struct apply_state *state, struct patch *patch,3617 struct stat *st, const struct cache_entry *ce)3618{3619 struct image image;36203621 if (load_preimage(state, &image, patch, st, ce) < 0)3622 return -1;36233624 if (patch->direct_to_threeway ||3625 apply_fragments(state, &image, patch) < 0) {3626 /* Note: with --reject, apply_fragments() returns 0 */3627 if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0)3628 return -1;3629 }3630 patch->result = image.buf;3631 patch->resultsize = image.len;3632 add_to_fn_table(state, patch);3633 free(image.line_allocated);36343635 if (0 < patch->is_delete && patch->resultsize)3636 return error(_("removal patch leaves file contents"));36373638 return 0;3639}36403641/*3642 * If "patch" that we are looking at modifies or deletes what we have,3643 * we would want it not to lose any local modification we have, either3644 * in the working tree or in the index.3645 *3646 * This also decides if a non-git patch is a creation patch or a3647 * modification to an existing empty file. We do not check the state3648 * of the current tree for a creation patch in this function; the caller3649 * check_patch() separately makes sure (and errors out otherwise) that3650 * the path the patch creates does not exist in the current tree.3651 */3652static int check_preimage(struct apply_state *state,3653 struct patch *patch,3654 struct cache_entry **ce,3655 struct stat *st)3656{3657 const char *old_name = patch->old_name;3658 struct patch *previous = NULL;3659 int stat_ret = 0, status;3660 unsigned st_mode = 0;36613662 if (!old_name)3663 return 0;36643665 assert(patch->is_new <= 0);3666 previous = previous_patch(state, patch, &status);36673668 if (status)3669 return error(_("path %s has been renamed/deleted"), old_name);3670 if (previous) {3671 st_mode = previous->new_mode;3672 } else if (!state->cached) {3673 stat_ret = lstat(old_name, st);3674 if (stat_ret && errno != ENOENT)3675 return error_errno("%s", old_name);3676 }36773678 if (state->check_index && !previous) {3679 int pos = cache_name_pos(old_name, strlen(old_name));3680 if (pos < 0) {3681 if (patch->is_new < 0)3682 goto is_new;3683 return error(_("%s: does not exist in index"), old_name);3684 }3685 *ce = active_cache[pos];3686 if (stat_ret < 0) {3687 if (checkout_target(&the_index, *ce, st))3688 return -1;3689 }3690 if (!state->cached && verify_index_match(*ce, st))3691 return error(_("%s: does not match index"), old_name);3692 if (state->cached)3693 st_mode = (*ce)->ce_mode;3694 } else if (stat_ret < 0) {3695 if (patch->is_new < 0)3696 goto is_new;3697 return error_errno("%s", old_name);3698 }36993700 if (!state->cached && !previous)3701 st_mode = ce_mode_from_stat(*ce, st->st_mode);37023703 if (patch->is_new < 0)3704 patch->is_new = 0;3705 if (!patch->old_mode)3706 patch->old_mode = st_mode;3707 if ((st_mode ^ patch->old_mode) & S_IFMT)3708 return error(_("%s: wrong type"), old_name);3709 if (st_mode != patch->old_mode)3710 warning(_("%s has type %o, expected %o"),3711 old_name, st_mode, patch->old_mode);3712 if (!patch->new_mode && !patch->is_delete)3713 patch->new_mode = st_mode;3714 return 0;37153716 is_new:3717 patch->is_new = 1;3718 patch->is_delete = 0;3719 FREE_AND_NULL(patch->old_name);3720 return 0;3721}372237233724#define EXISTS_IN_INDEX 13725#define EXISTS_IN_WORKTREE 237263727static int check_to_create(struct apply_state *state,3728 const char *new_name,3729 int ok_if_exists)3730{3731 struct stat nst;37323733 if (state->check_index &&3734 cache_name_pos(new_name, strlen(new_name)) >= 0 &&3735 !ok_if_exists)3736 return EXISTS_IN_INDEX;3737 if (state->cached)3738 return 0;37393740 if (!lstat(new_name, &nst)) {3741 if (S_ISDIR(nst.st_mode) || ok_if_exists)3742 return 0;3743 /*3744 * A leading component of new_name might be a symlink3745 * that is going to be removed with this patch, but3746 * still pointing at somewhere that has the path.3747 * In such a case, path "new_name" does not exist as3748 * far as git is concerned.3749 */3750 if (has_symlink_leading_path(new_name, strlen(new_name)))3751 return 0;37523753 return EXISTS_IN_WORKTREE;3754 } else if (!is_missing_file_error(errno)) {3755 return error_errno("%s", new_name);3756 }3757 return 0;3758}37593760static uintptr_t register_symlink_changes(struct apply_state *state,3761 const char *path,3762 uintptr_t what)3763{3764 struct string_list_item *ent;37653766 ent = string_list_lookup(&state->symlink_changes, path);3767 if (!ent) {3768 ent = string_list_insert(&state->symlink_changes, path);3769 ent->util = (void *)0;3770 }3771 ent->util = (void *)(what | ((uintptr_t)ent->util));3772 return (uintptr_t)ent->util;3773}37743775static uintptr_t check_symlink_changes(struct apply_state *state, const char *path)3776{3777 struct string_list_item *ent;37783779 ent = string_list_lookup(&state->symlink_changes, path);3780 if (!ent)3781 return 0;3782 return (uintptr_t)ent->util;3783}37843785static void prepare_symlink_changes(struct apply_state *state, struct patch *patch)3786{3787 for ( ; patch; patch = patch->next) {3788 if ((patch->old_name && S_ISLNK(patch->old_mode)) &&3789 (patch->is_rename || patch->is_delete))3790 /* the symlink at patch->old_name is removed */3791 register_symlink_changes(state, patch->old_name, APPLY_SYMLINK_GOES_AWAY);37923793 if (patch->new_name && S_ISLNK(patch->new_mode))3794 /* the symlink at patch->new_name is created or remains */3795 register_symlink_changes(state, patch->new_name, APPLY_SYMLINK_IN_RESULT);3796 }3797}37983799static int path_is_beyond_symlink_1(struct apply_state *state, struct strbuf *name)3800{3801 do {3802 unsigned int change;38033804 while (--name->len && name->buf[name->len] != '/')3805 ; /* scan backwards */3806 if (!name->len)3807 break;3808 name->buf[name->len] = '\0';3809 change = check_symlink_changes(state, name->buf);3810 if (change & APPLY_SYMLINK_IN_RESULT)3811 return 1;3812 if (change & APPLY_SYMLINK_GOES_AWAY)3813 /*3814 * This cannot be "return 0", because we may3815 * see a new one created at a higher level.3816 */3817 continue;38183819 /* otherwise, check the preimage */3820 if (state->check_index) {3821 struct cache_entry *ce;38223823 ce = cache_file_exists(name->buf, name->len, ignore_case);3824 if (ce && S_ISLNK(ce->ce_mode))3825 return 1;3826 } else {3827 struct stat st;3828 if (!lstat(name->buf, &st) && S_ISLNK(st.st_mode))3829 return 1;3830 }3831 } while (1);3832 return 0;3833}38343835static int path_is_beyond_symlink(struct apply_state *state, const char *name_)3836{3837 int ret;3838 struct strbuf name = STRBUF_INIT;38393840 assert(*name_ != '\0');3841 strbuf_addstr(&name, name_);3842 ret = path_is_beyond_symlink_1(state, &name);3843 strbuf_release(&name);38443845 return ret;3846}38473848static int check_unsafe_path(struct patch *patch)3849{3850 const char *old_name = NULL;3851 const char *new_name = NULL;3852 if (patch->is_delete)3853 old_name = patch->old_name;3854 else if (!patch->is_new && !patch->is_copy)3855 old_name = patch->old_name;3856 if (!patch->is_delete)3857 new_name = patch->new_name;38583859 if (old_name && !verify_path(old_name))3860 return error(_("invalid path '%s'"), old_name);3861 if (new_name && !verify_path(new_name))3862 return error(_("invalid path '%s'"), new_name);3863 return 0;3864}38653866/*3867 * Check and apply the patch in-core; leave the result in patch->result3868 * for the caller to write it out to the final destination.3869 */3870static int check_patch(struct apply_state *state, struct patch *patch)3871{3872 struct stat st;3873 const char *old_name = patch->old_name;3874 const char *new_name = patch->new_name;3875 const char *name = old_name ? old_name : new_name;3876 struct cache_entry *ce = NULL;3877 struct patch *tpatch;3878 int ok_if_exists;3879 int status;38803881 patch->rejected = 1; /* we will drop this after we succeed */38823883 status = check_preimage(state, patch, &ce, &st);3884 if (status)3885 return status;3886 old_name = patch->old_name;38873888 /*3889 * A type-change diff is always split into a patch to delete3890 * old, immediately followed by a patch to create new (see3891 * diff.c::run_diff()); in such a case it is Ok that the entry3892 * to be deleted by the previous patch is still in the working3893 * tree and in the index.3894 *3895 * A patch to swap-rename between A and B would first rename A3896 * to B and then rename B to A. While applying the first one,3897 * the presence of B should not stop A from getting renamed to3898 * B; ask to_be_deleted() about the later rename. Removal of3899 * B and rename from A to B is handled the same way by asking3900 * was_deleted().3901 */3902 if ((tpatch = in_fn_table(state, new_name)) &&3903 (was_deleted(tpatch) || to_be_deleted(tpatch)))3904 ok_if_exists = 1;3905 else3906 ok_if_exists = 0;39073908 if (new_name &&3909 ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {3910 int err = check_to_create(state, new_name, ok_if_exists);39113912 if (err && state->threeway) {3913 patch->direct_to_threeway = 1;3914 } else switch (err) {3915 case 0:3916 break; /* happy */3917 case EXISTS_IN_INDEX:3918 return error(_("%s: already exists in index"), new_name);3919 break;3920 case EXISTS_IN_WORKTREE:3921 return error(_("%s: already exists in working directory"),3922 new_name);3923 default:3924 return err;3925 }39263927 if (!patch->new_mode) {3928 if (0 < patch->is_new)3929 patch->new_mode = S_IFREG | 0644;3930 else3931 patch->new_mode = patch->old_mode;3932 }3933 }39343935 if (new_name && old_name) {3936 int same = !strcmp(old_name, new_name);3937 if (!patch->new_mode)3938 patch->new_mode = patch->old_mode;3939 if ((patch->old_mode ^ patch->new_mode) & S_IFMT) {3940 if (same)3941 return error(_("new mode (%o) of %s does not "3942 "match old mode (%o)"),3943 patch->new_mode, new_name,3944 patch->old_mode);3945 else3946 return error(_("new mode (%o) of %s does not "3947 "match old mode (%o) of %s"),3948 patch->new_mode, new_name,3949 patch->old_mode, old_name);3950 }3951 }39523953 if (!state->unsafe_paths && check_unsafe_path(patch))3954 return -128;39553956 /*3957 * An attempt to read from or delete a path that is beyond a3958 * symbolic link will be prevented by load_patch_target() that3959 * is called at the beginning of apply_data() so we do not3960 * have to worry about a patch marked with "is_delete" bit3961 * here. We however need to make sure that the patch result3962 * is not deposited to a path that is beyond a symbolic link3963 * here.3964 */3965 if (!patch->is_delete && path_is_beyond_symlink(state, patch->new_name))3966 return error(_("affected file '%s' is beyond a symbolic link"),3967 patch->new_name);39683969 if (apply_data(state, patch, &st, ce) < 0)3970 return error(_("%s: patch does not apply"), name);3971 patch->rejected = 0;3972 return 0;3973}39743975static int check_patch_list(struct apply_state *state, struct patch *patch)3976{3977 int err = 0;39783979 prepare_symlink_changes(state, patch);3980 prepare_fn_table(state, patch);3981 while (patch) {3982 int res;3983 if (state->apply_verbosity > verbosity_normal)3984 say_patch_name(stderr,3985 _("Checking patch %s..."), patch);3986 res = check_patch(state, patch);3987 if (res == -128)3988 return -128;3989 err |= res;3990 patch = patch->next;3991 }3992 return err;3993}39943995static int read_apply_cache(struct apply_state *state)3996{3997 if (state->index_file)3998 return read_cache_from(state->index_file);3999 else4000 return read_cache();4001}40024003/* This function tries to read the object name from the current index */4004static int get_current_oid(struct apply_state *state, const char *path,4005 struct object_id *oid)4006{4007 int pos;40084009 if (read_apply_cache(state) < 0)4010 return -1;4011 pos = cache_name_pos(path, strlen(path));4012 if (pos < 0)4013 return -1;4014 oidcpy(oid, &active_cache[pos]->oid);4015 return 0;4016}40174018static int preimage_oid_in_gitlink_patch(struct patch *p, struct object_id *oid)4019{4020 /*4021 * A usable gitlink patch has only one fragment (hunk) that looks like:4022 * @@ -1 +1 @@4023 * -Subproject commit <old sha1>4024 * +Subproject commit <new sha1>4025 * or4026 * @@ -1 +0,0 @@4027 * -Subproject commit <old sha1>4028 * for a removal patch.4029 */4030 struct fragment *hunk = p->fragments;4031 static const char heading[] = "-Subproject commit ";4032 char *preimage;40334034 if (/* does the patch have only one hunk? */4035 hunk && !hunk->next &&4036 /* is its preimage one line? */4037 hunk->oldpos == 1 && hunk->oldlines == 1 &&4038 /* does preimage begin with the heading? */4039 (preimage = memchr(hunk->patch, '\n', hunk->size)) != NULL &&4040 starts_with(++preimage, heading) &&4041 /* does it record full SHA-1? */4042 !get_oid_hex(preimage + sizeof(heading) - 1, oid) &&4043 preimage[sizeof(heading) + GIT_SHA1_HEXSZ - 1] == '\n' &&4044 /* does the abbreviated name on the index line agree with it? */4045 starts_with(preimage + sizeof(heading) - 1, p->old_sha1_prefix))4046 return 0; /* it all looks fine */40474048 /* we may have full object name on the index line */4049 return get_oid_hex(p->old_sha1_prefix, oid);4050}40514052/* Build an index that contains the just the files needed for a 3way merge */4053static int build_fake_ancestor(struct apply_state *state, struct patch *list)4054{4055 struct patch *patch;4056 struct index_state result = { NULL };4057 static struct lock_file lock;4058 int res;40594060 /* Once we start supporting the reverse patch, it may be4061 * worth showing the new sha1 prefix, but until then...4062 */4063 for (patch = list; patch; patch = patch->next) {4064 struct object_id oid;4065 struct cache_entry *ce;4066 const char *name;40674068 name = patch->old_name ? patch->old_name : patch->new_name;4069 if (0 < patch->is_new)4070 continue;40714072 if (S_ISGITLINK(patch->old_mode)) {4073 if (!preimage_oid_in_gitlink_patch(patch, &oid))4074 ; /* ok, the textual part looks sane */4075 else4076 return error(_("sha1 information is lacking or "4077 "useless for submodule %s"), name);4078 } else if (!get_sha1_blob(patch->old_sha1_prefix, oid.hash)) {4079 ; /* ok */4080 } else if (!patch->lines_added && !patch->lines_deleted) {4081 /* mode-only change: update the current */4082 if (get_current_oid(state, patch->old_name, &oid))4083 return error(_("mode change for %s, which is not "4084 "in current HEAD"), name);4085 } else4086 return error(_("sha1 information is lacking or useless "4087 "(%s)."), name);40884089 ce = make_cache_entry(patch->old_mode, oid.hash, name, 0, 0);4090 if (!ce)4091 return error(_("make_cache_entry failed for path '%s'"),4092 name);4093 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) {4094 free(ce);4095 return error(_("could not add %s to temporary index"),4096 name);4097 }4098 }40994100 hold_lock_file_for_update(&lock, state->fake_ancestor, LOCK_DIE_ON_ERROR);4101 res = write_locked_index(&result, &lock, COMMIT_LOCK);4102 discard_index(&result);41034104 if (res)4105 return error(_("could not write temporary index to %s"),4106 state->fake_ancestor);41074108 return 0;4109}41104111static void stat_patch_list(struct apply_state *state, struct patch *patch)4112{4113 int files, adds, dels;41144115 for (files = adds = dels = 0 ; patch ; patch = patch->next) {4116 files++;4117 adds += patch->lines_added;4118 dels += patch->lines_deleted;4119 show_stats(state, patch);4120 }41214122 print_stat_summary(stdout, files, adds, dels);4123}41244125static void numstat_patch_list(struct apply_state *state,4126 struct patch *patch)4127{4128 for ( ; patch; patch = patch->next) {4129 const char *name;4130 name = patch->new_name ? patch->new_name : patch->old_name;4131 if (patch->is_binary)4132 printf("-\t-\t");4133 else4134 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);4135 write_name_quoted(name, stdout, state->line_termination);4136 }4137}41384139static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)4140{4141 if (mode)4142 printf(" %s mode %06o %s\n", newdelete, mode, name);4143 else4144 printf(" %s %s\n", newdelete, name);4145}41464147static void show_mode_change(struct patch *p, int show_name)4148{4149 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {4150 if (show_name)4151 printf(" mode change %06o => %06o %s\n",4152 p->old_mode, p->new_mode, p->new_name);4153 else4154 printf(" mode change %06o => %06o\n",4155 p->old_mode, p->new_mode);4156 }4157}41584159static void show_rename_copy(struct patch *p)4160{4161 const char *renamecopy = p->is_rename ? "rename" : "copy";4162 const char *old, *new;41634164 /* Find common prefix */4165 old = p->old_name;4166 new = p->new_name;4167 while (1) {4168 const char *slash_old, *slash_new;4169 slash_old = strchr(old, '/');4170 slash_new = strchr(new, '/');4171 if (!slash_old ||4172 !slash_new ||4173 slash_old - old != slash_new - new ||4174 memcmp(old, new, slash_new - new))4175 break;4176 old = slash_old + 1;4177 new = slash_new + 1;4178 }4179 /* p->old_name thru old is the common prefix, and old and new4180 * through the end of names are renames4181 */4182 if (old != p->old_name)4183 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,4184 (int)(old - p->old_name), p->old_name,4185 old, new, p->score);4186 else4187 printf(" %s %s => %s (%d%%)\n", renamecopy,4188 p->old_name, p->new_name, p->score);4189 show_mode_change(p, 0);4190}41914192static void summary_patch_list(struct patch *patch)4193{4194 struct patch *p;41954196 for (p = patch; p; p = p->next) {4197 if (p->is_new)4198 show_file_mode_name("create", p->new_mode, p->new_name);4199 else if (p->is_delete)4200 show_file_mode_name("delete", p->old_mode, p->old_name);4201 else {4202 if (p->is_rename || p->is_copy)4203 show_rename_copy(p);4204 else {4205 if (p->score) {4206 printf(" rewrite %s (%d%%)\n",4207 p->new_name, p->score);4208 show_mode_change(p, 0);4209 }4210 else4211 show_mode_change(p, 1);4212 }4213 }4214 }4215}42164217static void patch_stats(struct apply_state *state, struct patch *patch)4218{4219 int lines = patch->lines_added + patch->lines_deleted;42204221 if (lines > state->max_change)4222 state->max_change = lines;4223 if (patch->old_name) {4224 int len = quote_c_style(patch->old_name, NULL, NULL, 0);4225 if (!len)4226 len = strlen(patch->old_name);4227 if (len > state->max_len)4228 state->max_len = len;4229 }4230 if (patch->new_name) {4231 int len = quote_c_style(patch->new_name, NULL, NULL, 0);4232 if (!len)4233 len = strlen(patch->new_name);4234 if (len > state->max_len)4235 state->max_len = len;4236 }4237}42384239static int remove_file(struct apply_state *state, struct patch *patch, int rmdir_empty)4240{4241 if (state->update_index) {4242 if (remove_file_from_cache(patch->old_name) < 0)4243 return error(_("unable to remove %s from index"), patch->old_name);4244 }4245 if (!state->cached) {4246 if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {4247 remove_path(patch->old_name);4248 }4249 }4250 return 0;4251}42524253static int add_index_file(struct apply_state *state,4254 const char *path,4255 unsigned mode,4256 void *buf,4257 unsigned long size)4258{4259 struct stat st;4260 struct cache_entry *ce;4261 int namelen = strlen(path);4262 unsigned ce_size = cache_entry_size(namelen);42634264 if (!state->update_index)4265 return 0;42664267 ce = xcalloc(1, ce_size);4268 memcpy(ce->name, path, namelen);4269 ce->ce_mode = create_ce_mode(mode);4270 ce->ce_flags = create_ce_flags(0);4271 ce->ce_namelen = namelen;4272 if (S_ISGITLINK(mode)) {4273 const char *s;42744275 if (!skip_prefix(buf, "Subproject commit ", &s) ||4276 get_oid_hex(s, &ce->oid)) {4277 free(ce);4278 return error(_("corrupt patch for submodule %s"), path);4279 }4280 } else {4281 if (!state->cached) {4282 if (lstat(path, &st) < 0) {4283 free(ce);4284 return error_errno(_("unable to stat newly "4285 "created file '%s'"),4286 path);4287 }4288 fill_stat_cache_info(ce, &st);4289 }4290 if (write_sha1_file(buf, size, blob_type, ce->oid.hash) < 0) {4291 free(ce);4292 return error(_("unable to create backing store "4293 "for newly created file %s"), path);4294 }4295 }4296 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0) {4297 free(ce);4298 return error(_("unable to add cache entry for %s"), path);4299 }43004301 return 0;4302}43034304/*4305 * Returns:4306 * -1 if an unrecoverable error happened4307 * 0 if everything went well4308 * 1 if a recoverable error happened4309 */4310static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)4311{4312 int fd, res;4313 struct strbuf nbuf = STRBUF_INIT;43144315 if (S_ISGITLINK(mode)) {4316 struct stat st;4317 if (!lstat(path, &st) && S_ISDIR(st.st_mode))4318 return 0;4319 return !!mkdir(path, 0777);4320 }43214322 if (has_symlinks && S_ISLNK(mode))4323 /* Although buf:size is counted string, it also is NUL4324 * terminated.4325 */4326 return !!symlink(buf, path);43274328 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);4329 if (fd < 0)4330 return 1;43314332 if (convert_to_working_tree(path, buf, size, &nbuf)) {4333 size = nbuf.len;4334 buf = nbuf.buf;4335 }43364337 res = write_in_full(fd, buf, size) < 0;4338 if (res)4339 error_errno(_("failed to write to '%s'"), path);4340 strbuf_release(&nbuf);43414342 if (close(fd) < 0 && !res)4343 return error_errno(_("closing file '%s'"), path);43444345 return res ? -1 : 0;4346}43474348/*4349 * We optimistically assume that the directories exist,4350 * which is true 99% of the time anyway. If they don't,4351 * we create them and try again.4352 *4353 * Returns:4354 * -1 on error4355 * 0 otherwise4356 */4357static int create_one_file(struct apply_state *state,4358 char *path,4359 unsigned mode,4360 const char *buf,4361 unsigned long size)4362{4363 int res;43644365 if (state->cached)4366 return 0;43674368 res = try_create_file(path, mode, buf, size);4369 if (res < 0)4370 return -1;4371 if (!res)4372 return 0;43734374 if (errno == ENOENT) {4375 if (safe_create_leading_directories(path))4376 return 0;4377 res = try_create_file(path, mode, buf, size);4378 if (res < 0)4379 return -1;4380 if (!res)4381 return 0;4382 }43834384 if (errno == EEXIST || errno == EACCES) {4385 /* We may be trying to create a file where a directory4386 * used to be.4387 */4388 struct stat st;4389 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))4390 errno = EEXIST;4391 }43924393 if (errno == EEXIST) {4394 unsigned int nr = getpid();43954396 for (;;) {4397 char newpath[PATH_MAX];4398 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);4399 res = try_create_file(newpath, mode, buf, size);4400 if (res < 0)4401 return -1;4402 if (!res) {4403 if (!rename(newpath, path))4404 return 0;4405 unlink_or_warn(newpath);4406 break;4407 }4408 if (errno != EEXIST)4409 break;4410 ++nr;4411 }4412 }4413 return error_errno(_("unable to write file '%s' mode %o"),4414 path, mode);4415}44164417static int add_conflicted_stages_file(struct apply_state *state,4418 struct patch *patch)4419{4420 int stage, namelen;4421 unsigned ce_size, mode;4422 struct cache_entry *ce;44234424 if (!state->update_index)4425 return 0;4426 namelen = strlen(patch->new_name);4427 ce_size = cache_entry_size(namelen);4428 mode = patch->new_mode ? patch->new_mode : (S_IFREG | 0644);44294430 remove_file_from_cache(patch->new_name);4431 for (stage = 1; stage < 4; stage++) {4432 if (is_null_oid(&patch->threeway_stage[stage - 1]))4433 continue;4434 ce = xcalloc(1, ce_size);4435 memcpy(ce->name, patch->new_name, namelen);4436 ce->ce_mode = create_ce_mode(mode);4437 ce->ce_flags = create_ce_flags(stage);4438 ce->ce_namelen = namelen;4439 oidcpy(&ce->oid, &patch->threeway_stage[stage - 1]);4440 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0) {4441 free(ce);4442 return error(_("unable to add cache entry for %s"),4443 patch->new_name);4444 }4445 }44464447 return 0;4448}44494450static int create_file(struct apply_state *state, struct patch *patch)4451{4452 char *path = patch->new_name;4453 unsigned mode = patch->new_mode;4454 unsigned long size = patch->resultsize;4455 char *buf = patch->result;44564457 if (!mode)4458 mode = S_IFREG | 0644;4459 if (create_one_file(state, path, mode, buf, size))4460 return -1;44614462 if (patch->conflicted_threeway)4463 return add_conflicted_stages_file(state, patch);4464 else4465 return add_index_file(state, path, mode, buf, size);4466}44674468/* phase zero is to remove, phase one is to create */4469static int write_out_one_result(struct apply_state *state,4470 struct patch *patch,4471 int phase)4472{4473 if (patch->is_delete > 0) {4474 if (phase == 0)4475 return remove_file(state, patch, 1);4476 return 0;4477 }4478 if (patch->is_new > 0 || patch->is_copy) {4479 if (phase == 1)4480 return create_file(state, patch);4481 return 0;4482 }4483 /*4484 * Rename or modification boils down to the same4485 * thing: remove the old, write the new4486 */4487 if (phase == 0)4488 return remove_file(state, patch, patch->is_rename);4489 if (phase == 1)4490 return create_file(state, patch);4491 return 0;4492}44934494static int write_out_one_reject(struct apply_state *state, struct patch *patch)4495{4496 FILE *rej;4497 char namebuf[PATH_MAX];4498 struct fragment *frag;4499 int cnt = 0;4500 struct strbuf sb = STRBUF_INIT;45014502 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {4503 if (!frag->rejected)4504 continue;4505 cnt++;4506 }45074508 if (!cnt) {4509 if (state->apply_verbosity > verbosity_normal)4510 say_patch_name(stderr,4511 _("Applied patch %s cleanly."), patch);4512 return 0;4513 }45144515 /* This should not happen, because a removal patch that leaves4516 * contents are marked "rejected" at the patch level.4517 */4518 if (!patch->new_name)4519 die(_("internal error"));45204521 /* Say this even without --verbose */4522 strbuf_addf(&sb, Q_("Applying patch %%s with %d reject...",4523 "Applying patch %%s with %d rejects...",4524 cnt),4525 cnt);4526 if (state->apply_verbosity > verbosity_silent)4527 say_patch_name(stderr, sb.buf, patch);4528 strbuf_release(&sb);45294530 cnt = strlen(patch->new_name);4531 if (ARRAY_SIZE(namebuf) <= cnt + 5) {4532 cnt = ARRAY_SIZE(namebuf) - 5;4533 warning(_("truncating .rej filename to %.*s.rej"),4534 cnt - 1, patch->new_name);4535 }4536 memcpy(namebuf, patch->new_name, cnt);4537 memcpy(namebuf + cnt, ".rej", 5);45384539 rej = fopen(namebuf, "w");4540 if (!rej)4541 return error_errno(_("cannot open %s"), namebuf);45424543 /* Normal git tools never deal with .rej, so do not pretend4544 * this is a git patch by saying --git or giving extended4545 * headers. While at it, maybe please "kompare" that wants4546 * the trailing TAB and some garbage at the end of line ;-).4547 */4548 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",4549 patch->new_name, patch->new_name);4550 for (cnt = 1, frag = patch->fragments;4551 frag;4552 cnt++, frag = frag->next) {4553 if (!frag->rejected) {4554 if (state->apply_verbosity > verbosity_silent)4555 fprintf_ln(stderr, _("Hunk #%d applied cleanly."), cnt);4556 continue;4557 }4558 if (state->apply_verbosity > verbosity_silent)4559 fprintf_ln(stderr, _("Rejected hunk #%d."), cnt);4560 fprintf(rej, "%.*s", frag->size, frag->patch);4561 if (frag->patch[frag->size-1] != '\n')4562 fputc('\n', rej);4563 }4564 fclose(rej);4565 return -1;4566}45674568/*4569 * Returns:4570 * -1 if an error happened4571 * 0 if the patch applied cleanly4572 * 1 if the patch did not apply cleanly4573 */4574static int write_out_results(struct apply_state *state, struct patch *list)4575{4576 int phase;4577 int errs = 0;4578 struct patch *l;4579 struct string_list cpath = STRING_LIST_INIT_DUP;45804581 for (phase = 0; phase < 2; phase++) {4582 l = list;4583 while (l) {4584 if (l->rejected)4585 errs = 1;4586 else {4587 if (write_out_one_result(state, l, phase)) {4588 string_list_clear(&cpath, 0);4589 return -1;4590 }4591 if (phase == 1) {4592 if (write_out_one_reject(state, l))4593 errs = 1;4594 if (l->conflicted_threeway) {4595 string_list_append(&cpath, l->new_name);4596 errs = 1;4597 }4598 }4599 }4600 l = l->next;4601 }4602 }46034604 if (cpath.nr) {4605 struct string_list_item *item;46064607 string_list_sort(&cpath);4608 if (state->apply_verbosity > verbosity_silent) {4609 for_each_string_list_item(item, &cpath)4610 fprintf(stderr, "U %s\n", item->string);4611 }4612 string_list_clear(&cpath, 0);46134614 rerere(0);4615 }46164617 return errs;4618}46194620/*4621 * Try to apply a patch.4622 *4623 * Returns:4624 * -128 if a bad error happened (like patch unreadable)4625 * -1 if patch did not apply and user cannot deal with it4626 * 0 if the patch applied4627 * 1 if the patch did not apply but user might fix it4628 */4629static int apply_patch(struct apply_state *state,4630 int fd,4631 const char *filename,4632 int options)4633{4634 size_t offset;4635 struct strbuf buf = STRBUF_INIT; /* owns the patch text */4636 struct patch *list = NULL, **listp = &list;4637 int skipped_patch = 0;4638 int res = 0;46394640 state->patch_input_file = filename;4641 if (read_patch_file(&buf, fd) < 0)4642 return -128;4643 offset = 0;4644 while (offset < buf.len) {4645 struct patch *patch;4646 int nr;46474648 patch = xcalloc(1, sizeof(*patch));4649 patch->inaccurate_eof = !!(options & APPLY_OPT_INACCURATE_EOF);4650 patch->recount = !!(options & APPLY_OPT_RECOUNT);4651 nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch);4652 if (nr < 0) {4653 free_patch(patch);4654 if (nr == -128) {4655 res = -128;4656 goto end;4657 }4658 break;4659 }4660 if (state->apply_in_reverse)4661 reverse_patches(patch);4662 if (use_patch(state, patch)) {4663 patch_stats(state, patch);4664 *listp = patch;4665 listp = &patch->next;4666 }4667 else {4668 if (state->apply_verbosity > verbosity_normal)4669 say_patch_name(stderr, _("Skipped patch '%s'."), patch);4670 free_patch(patch);4671 skipped_patch++;4672 }4673 offset += nr;4674 }46754676 if (!list && !skipped_patch) {4677 error(_("unrecognized input"));4678 res = -128;4679 goto end;4680 }46814682 if (state->whitespace_error && (state->ws_error_action == die_on_ws_error))4683 state->apply = 0;46844685 state->update_index = state->check_index && state->apply;4686 if (state->update_index && state->newfd < 0) {4687 if (state->index_file)4688 state->newfd = hold_lock_file_for_update(state->lock_file,4689 state->index_file,4690 LOCK_DIE_ON_ERROR);4691 else4692 state->newfd = hold_locked_index(state->lock_file, LOCK_DIE_ON_ERROR);4693 }46944695 if (state->check_index && read_apply_cache(state) < 0) {4696 error(_("unable to read index file"));4697 res = -128;4698 goto end;4699 }47004701 if (state->check || state->apply) {4702 int r = check_patch_list(state, list);4703 if (r == -128) {4704 res = -128;4705 goto end;4706 }4707 if (r < 0 && !state->apply_with_reject) {4708 res = -1;4709 goto end;4710 }4711 }47124713 if (state->apply) {4714 int write_res = write_out_results(state, list);4715 if (write_res < 0) {4716 res = -128;4717 goto end;4718 }4719 if (write_res > 0) {4720 /* with --3way, we still need to write the index out */4721 res = state->apply_with_reject ? -1 : 1;4722 goto end;4723 }4724 }47254726 if (state->fake_ancestor &&4727 build_fake_ancestor(state, list)) {4728 res = -128;4729 goto end;4730 }47314732 if (state->diffstat && state->apply_verbosity > verbosity_silent)4733 stat_patch_list(state, list);47344735 if (state->numstat && state->apply_verbosity > verbosity_silent)4736 numstat_patch_list(state, list);47374738 if (state->summary && state->apply_verbosity > verbosity_silent)4739 summary_patch_list(list);47404741end:4742 free_patch_list(list);4743 strbuf_release(&buf);4744 string_list_clear(&state->fn_table, 0);4745 return res;4746}47474748static int apply_option_parse_exclude(const struct option *opt,4749 const char *arg, int unset)4750{4751 struct apply_state *state = opt->value;4752 add_name_limit(state, arg, 1);4753 return 0;4754}47554756static int apply_option_parse_include(const struct option *opt,4757 const char *arg, int unset)4758{4759 struct apply_state *state = opt->value;4760 add_name_limit(state, arg, 0);4761 state->has_include = 1;4762 return 0;4763}47644765static int apply_option_parse_p(const struct option *opt,4766 const char *arg,4767 int unset)4768{4769 struct apply_state *state = opt->value;4770 state->p_value = atoi(arg);4771 state->p_value_known = 1;4772 return 0;4773}47744775static int apply_option_parse_space_change(const struct option *opt,4776 const char *arg, int unset)4777{4778 struct apply_state *state = opt->value;4779 if (unset)4780 state->ws_ignore_action = ignore_ws_none;4781 else4782 state->ws_ignore_action = ignore_ws_change;4783 return 0;4784}47854786static int apply_option_parse_whitespace(const struct option *opt,4787 const char *arg, int unset)4788{4789 struct apply_state *state = opt->value;4790 state->whitespace_option = arg;4791 if (parse_whitespace_option(state, arg))4792 exit(1);4793 return 0;4794}47954796static int apply_option_parse_directory(const struct option *opt,4797 const char *arg, int unset)4798{4799 struct apply_state *state = opt->value;4800 strbuf_reset(&state->root);4801 strbuf_addstr(&state->root, arg);4802 strbuf_complete(&state->root, '/');4803 return 0;4804}48054806int apply_all_patches(struct apply_state *state,4807 int argc,4808 const char **argv,4809 int options)4810{4811 int i;4812 int res;4813 int errs = 0;4814 int read_stdin = 1;48154816 for (i = 0; i < argc; i++) {4817 const char *arg = argv[i];4818 char *to_free = NULL;4819 int fd;48204821 if (!strcmp(arg, "-")) {4822 res = apply_patch(state, 0, "<stdin>", options);4823 if (res < 0)4824 goto end;4825 errs |= res;4826 read_stdin = 0;4827 continue;4828 } else4829 arg = to_free = prefix_filename(state->prefix, arg);48304831 fd = open(arg, O_RDONLY);4832 if (fd < 0) {4833 error(_("can't open patch '%s': %s"), arg, strerror(errno));4834 res = -128;4835 free(to_free);4836 goto end;4837 }4838 read_stdin = 0;4839 set_default_whitespace_mode(state);4840 res = apply_patch(state, fd, arg, options);4841 close(fd);4842 free(to_free);4843 if (res < 0)4844 goto end;4845 errs |= res;4846 }4847 set_default_whitespace_mode(state);4848 if (read_stdin) {4849 res = apply_patch(state, 0, "<stdin>", options);4850 if (res < 0)4851 goto end;4852 errs |= res;4853 }48544855 if (state->whitespace_error) {4856 if (state->squelch_whitespace_errors &&4857 state->squelch_whitespace_errors < state->whitespace_error) {4858 int squelched =4859 state->whitespace_error - state->squelch_whitespace_errors;4860 warning(Q_("squelched %d whitespace error",4861 "squelched %d whitespace errors",4862 squelched),4863 squelched);4864 }4865 if (state->ws_error_action == die_on_ws_error) {4866 error(Q_("%d line adds whitespace errors.",4867 "%d lines add whitespace errors.",4868 state->whitespace_error),4869 state->whitespace_error);4870 res = -128;4871 goto end;4872 }4873 if (state->applied_after_fixing_ws && state->apply)4874 warning(Q_("%d line applied after"4875 " fixing whitespace errors.",4876 "%d lines applied after"4877 " fixing whitespace errors.",4878 state->applied_after_fixing_ws),4879 state->applied_after_fixing_ws);4880 else if (state->whitespace_error)4881 warning(Q_("%d line adds whitespace errors.",4882 "%d lines add whitespace errors.",4883 state->whitespace_error),4884 state->whitespace_error);4885 }48864887 if (state->update_index) {4888 res = write_locked_index(&the_index, state->lock_file, COMMIT_LOCK);4889 if (res) {4890 error(_("Unable to write new index file"));4891 res = -128;4892 goto end;4893 }4894 state->newfd = -1;4895 }48964897 res = !!errs;48984899end:4900 if (state->newfd >= 0) {4901 rollback_lock_file(state->lock_file);4902 state->newfd = -1;4903 }49044905 if (state->apply_verbosity <= verbosity_silent) {4906 set_error_routine(state->saved_error_routine);4907 set_warn_routine(state->saved_warn_routine);4908 }49094910 if (res > -1)4911 return res;4912 return (res == -1 ? 1 : 128);4913}49144915int apply_parse_options(int argc, const char **argv,4916 struct apply_state *state,4917 int *force_apply, int *options,4918 const char * const *apply_usage)4919{4920 struct option builtin_apply_options[] = {4921 { OPTION_CALLBACK, 0, "exclude", state, N_("path"),4922 N_("don't apply changes matching the given path"),4923 0, apply_option_parse_exclude },4924 { OPTION_CALLBACK, 0, "include", state, N_("path"),4925 N_("apply changes matching the given path"),4926 0, apply_option_parse_include },4927 { OPTION_CALLBACK, 'p', NULL, state, N_("num"),4928 N_("remove <num> leading slashes from traditional diff paths"),4929 0, apply_option_parse_p },4930 OPT_BOOL(0, "no-add", &state->no_add,4931 N_("ignore additions made by the patch")),4932 OPT_BOOL(0, "stat", &state->diffstat,4933 N_("instead of applying the patch, output diffstat for the input")),4934 OPT_NOOP_NOARG(0, "allow-binary-replacement"),4935 OPT_NOOP_NOARG(0, "binary"),4936 OPT_BOOL(0, "numstat", &state->numstat,4937 N_("show number of added and deleted lines in decimal notation")),4938 OPT_BOOL(0, "summary", &state->summary,4939 N_("instead of applying the patch, output a summary for the input")),4940 OPT_BOOL(0, "check", &state->check,4941 N_("instead of applying the patch, see if the patch is applicable")),4942 OPT_BOOL(0, "index", &state->check_index,4943 N_("make sure the patch is applicable to the current index")),4944 OPT_BOOL(0, "cached", &state->cached,4945 N_("apply a patch without touching the working tree")),4946 OPT_BOOL(0, "unsafe-paths", &state->unsafe_paths,4947 N_("accept a patch that touches outside the working area")),4948 OPT_BOOL(0, "apply", force_apply,4949 N_("also apply the patch (use with --stat/--summary/--check)")),4950 OPT_BOOL('3', "3way", &state->threeway,4951 N_( "attempt three-way merge if a patch does not apply")),4952 OPT_FILENAME(0, "build-fake-ancestor", &state->fake_ancestor,4953 N_("build a temporary index based on embedded index information")),4954 /* Think twice before adding "--nul" synonym to this */4955 OPT_SET_INT('z', NULL, &state->line_termination,4956 N_("paths are separated with NUL character"), '\0'),4957 OPT_INTEGER('C', NULL, &state->p_context,4958 N_("ensure at least <n> lines of context match")),4959 { OPTION_CALLBACK, 0, "whitespace", state, N_("action"),4960 N_("detect new or modified lines that have whitespace errors"),4961 0, apply_option_parse_whitespace },4962 { OPTION_CALLBACK, 0, "ignore-space-change", state, NULL,4963 N_("ignore changes in whitespace when finding context"),4964 PARSE_OPT_NOARG, apply_option_parse_space_change },4965 { OPTION_CALLBACK, 0, "ignore-whitespace", state, NULL,4966 N_("ignore changes in whitespace when finding context"),4967 PARSE_OPT_NOARG, apply_option_parse_space_change },4968 OPT_BOOL('R', "reverse", &state->apply_in_reverse,4969 N_("apply the patch in reverse")),4970 OPT_BOOL(0, "unidiff-zero", &state->unidiff_zero,4971 N_("don't expect at least one line of context")),4972 OPT_BOOL(0, "reject", &state->apply_with_reject,4973 N_("leave the rejected hunks in corresponding *.rej files")),4974 OPT_BOOL(0, "allow-overlap", &state->allow_overlap,4975 N_("allow overlapping hunks")),4976 OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")),4977 OPT_BIT(0, "inaccurate-eof", options,4978 N_("tolerate incorrectly detected missing new-line at the end of file"),4979 APPLY_OPT_INACCURATE_EOF),4980 OPT_BIT(0, "recount", options,4981 N_("do not trust the line counts in the hunk headers"),4982 APPLY_OPT_RECOUNT),4983 { OPTION_CALLBACK, 0, "directory", state, N_("root"),4984 N_("prepend <root> to all filenames"),4985 0, apply_option_parse_directory },4986 OPT_END()4987 };49884989 return parse_options(argc, argv, state->prefix, builtin_apply_options, apply_usage, 0);4990}