1/* 2 * apply.c 3 * 4 * Copyright (C) Linus Torvalds, 2005 5 * 6 * This applies patches on top of some (arbitrary) version of the SCM. 7 * 8 */ 9 10#include "cache.h" 11#include "config.h" 12#include "object-store.h" 13#include "blob.h" 14#include "delta.h" 15#include "diff.h" 16#include "dir.h" 17#include "xdiff-interface.h" 18#include "ll-merge.h" 19#include "lockfile.h" 20#include "parse-options.h" 21#include "quote.h" 22#include "rerere.h" 23#include "apply.h" 24 25static void git_apply_config(void) 26{ 27 git_config_get_string_const("apply.whitespace", &apply_default_whitespace); 28 git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace); 29 git_config(git_default_config, NULL); 30} 31 32static int parse_whitespace_option(struct apply_state *state, const char *option) 33{ 34 if (!option) { 35 state->ws_error_action = warn_on_ws_error; 36 return 0; 37 } 38 if (!strcmp(option, "warn")) { 39 state->ws_error_action = warn_on_ws_error; 40 return 0; 41 } 42 if (!strcmp(option, "nowarn")) { 43 state->ws_error_action = nowarn_ws_error; 44 return 0; 45 } 46 if (!strcmp(option, "error")) { 47 state->ws_error_action = die_on_ws_error; 48 return 0; 49 } 50 if (!strcmp(option, "error-all")) { 51 state->ws_error_action = die_on_ws_error; 52 state->squelch_whitespace_errors = 0; 53 return 0; 54 } 55 if (!strcmp(option, "strip") || !strcmp(option, "fix")) { 56 state->ws_error_action = correct_ws_error; 57 return 0; 58 } 59 return error(_("unrecognized whitespace option '%s'"), option); 60} 61 62static int parse_ignorewhitespace_option(struct apply_state *state, 63 const char *option) 64{ 65 if (!option || !strcmp(option, "no") || 66 !strcmp(option, "false") || !strcmp(option, "never") || 67 !strcmp(option, "none")) { 68 state->ws_ignore_action = ignore_ws_none; 69 return 0; 70 } 71 if (!strcmp(option, "change")) { 72 state->ws_ignore_action = ignore_ws_change; 73 return 0; 74 } 75 return error(_("unrecognized whitespace ignore option '%s'"), option); 76} 77 78int init_apply_state(struct apply_state *state, 79 struct repository *repo, 80 const char *prefix) 81{ 82 memset(state, 0, sizeof(*state)); 83 state->prefix = prefix; 84 state->repo = repo; 85 state->apply = 1; 86 state->line_termination = '\n'; 87 state->p_value = 1; 88 state->p_context = UINT_MAX; 89 state->squelch_whitespace_errors = 5; 90 state->ws_error_action = warn_on_ws_error; 91 state->ws_ignore_action = ignore_ws_none; 92 state->linenr = 1; 93 string_list_init(&state->fn_table, 0); 94 string_list_init(&state->limit_by_name, 0); 95 string_list_init(&state->symlink_changes, 0); 96 strbuf_init(&state->root, 0); 97 98 git_apply_config(); 99 if (apply_default_whitespace && parse_whitespace_option(state, apply_default_whitespace)) 100 return -1; 101 if (apply_default_ignorewhitespace && parse_ignorewhitespace_option(state, apply_default_ignorewhitespace)) 102 return -1; 103 return 0; 104} 105 106void clear_apply_state(struct apply_state *state) 107{ 108 string_list_clear(&state->limit_by_name, 0); 109 string_list_clear(&state->symlink_changes, 0); 110 strbuf_release(&state->root); 111 112 /* &state->fn_table is cleared at the end of apply_patch() */ 113} 114 115static void mute_routine(const char *msg, va_list params) 116{ 117 /* do nothing */ 118} 119 120int check_apply_state(struct apply_state *state, int force_apply) 121{ 122 int is_not_gitdir = !startup_info->have_repository; 123 124 if (state->apply_with_reject && state->threeway) 125 return error(_("--reject and --3way cannot be used together.")); 126 if (state->cached && state->threeway) 127 return error(_("--cached and --3way cannot be used together.")); 128 if (state->threeway) { 129 if (is_not_gitdir) 130 return error(_("--3way outside a repository")); 131 state->check_index = 1; 132 } 133 if (state->apply_with_reject) { 134 state->apply = 1; 135 if (state->apply_verbosity == verbosity_normal) 136 state->apply_verbosity = verbosity_verbose; 137 } 138 if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor)) 139 state->apply = 0; 140 if (state->check_index && is_not_gitdir) 141 return error(_("--index outside a repository")); 142 if (state->cached) { 143 if (is_not_gitdir) 144 return error(_("--cached outside a repository")); 145 state->check_index = 1; 146 } 147 if (state->ita_only && (state->check_index || is_not_gitdir)) 148 state->ita_only = 0; 149 if (state->check_index) 150 state->unsafe_paths = 0; 151 152 if (state->apply_verbosity <= verbosity_silent) { 153 state->saved_error_routine = get_error_routine(); 154 state->saved_warn_routine = get_warn_routine(); 155 set_error_routine(mute_routine); 156 set_warn_routine(mute_routine); 157 } 158 159 return 0; 160} 161 162static void set_default_whitespace_mode(struct apply_state *state) 163{ 164 if (!state->whitespace_option && !apply_default_whitespace) 165 state->ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error); 166} 167 168/* 169 * This represents one "hunk" from a patch, starting with 170 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 171 * patch text is pointed at by patch, and its byte length 172 * is stored in size. leading and trailing are the number 173 * of context lines. 174 */ 175struct fragment { 176 unsigned long leading, trailing; 177 unsigned long oldpos, oldlines; 178 unsigned long newpos, newlines; 179 /* 180 * 'patch' is usually borrowed from buf in apply_patch(), 181 * but some codepaths store an allocated buffer. 182 */ 183 const char *patch; 184 unsigned free_patch:1, 185 rejected:1; 186 int size; 187 int linenr; 188 struct fragment *next; 189}; 190 191/* 192 * When dealing with a binary patch, we reuse "leading" field 193 * to store the type of the binary hunk, either deflated "delta" 194 * or deflated "literal". 195 */ 196#define binary_patch_method leading 197#define BINARY_DELTA_DEFLATED 1 198#define BINARY_LITERAL_DEFLATED 2 199 200/* 201 * This represents a "patch" to a file, both metainfo changes 202 * such as creation/deletion, filemode and content changes represented 203 * as a series of fragments. 204 */ 205struct patch { 206 char *new_name, *old_name, *def_name; 207 unsigned int old_mode, new_mode; 208 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */ 209 int rejected; 210 unsigned ws_rule; 211 int lines_added, lines_deleted; 212 int score; 213 int extension_linenr; /* first line specifying delete/new/rename/copy */ 214 unsigned int is_toplevel_relative:1; 215 unsigned int inaccurate_eof:1; 216 unsigned int is_binary:1; 217 unsigned int is_copy:1; 218 unsigned int is_rename:1; 219 unsigned int recount:1; 220 unsigned int conflicted_threeway:1; 221 unsigned int direct_to_threeway:1; 222 unsigned int crlf_in_old:1; 223 struct fragment *fragments; 224 char *result; 225 size_t resultsize; 226 char old_sha1_prefix[41]; 227 char new_sha1_prefix[41]; 228 struct patch *next; 229 230 /* three-way fallback result */ 231 struct object_id threeway_stage[3]; 232}; 233 234static void free_fragment_list(struct fragment *list) 235{ 236 while (list) { 237 struct fragment *next = list->next; 238 if (list->free_patch) 239 free((char *)list->patch); 240 free(list); 241 list = next; 242 } 243} 244 245static void free_patch(struct patch *patch) 246{ 247 free_fragment_list(patch->fragments); 248 free(patch->def_name); 249 free(patch->old_name); 250 free(patch->new_name); 251 free(patch->result); 252 free(patch); 253} 254 255static void free_patch_list(struct patch *list) 256{ 257 while (list) { 258 struct patch *next = list->next; 259 free_patch(list); 260 list = next; 261 } 262} 263 264/* 265 * A line in a file, len-bytes long (includes the terminating LF, 266 * except for an incomplete line at the end if the file ends with 267 * one), and its contents hashes to 'hash'. 268 */ 269struct line { 270 size_t len; 271 unsigned hash : 24; 272 unsigned flag : 8; 273#define LINE_COMMON 1 274#define LINE_PATCHED 2 275}; 276 277/* 278 * This represents a "file", which is an array of "lines". 279 */ 280struct image { 281 char *buf; 282 size_t len; 283 size_t nr; 284 size_t alloc; 285 struct line *line_allocated; 286 struct line *line; 287}; 288 289static uint32_t hash_line(const char *cp, size_t len) 290{ 291 size_t i; 292 uint32_t h; 293 for (i = 0, h = 0; i < len; i++) { 294 if (!isspace(cp[i])) { 295 h = h * 3 + (cp[i] & 0xff); 296 } 297 } 298 return h; 299} 300 301/* 302 * Compare lines s1 of length n1 and s2 of length n2, ignoring 303 * whitespace difference. Returns 1 if they match, 0 otherwise 304 */ 305static int fuzzy_matchlines(const char *s1, size_t n1, 306 const char *s2, size_t n2) 307{ 308 const char *end1 = s1 + n1; 309 const char *end2 = s2 + n2; 310 311 /* ignore line endings */ 312 while (s1 < end1 && (end1[-1] == '\r' || end1[-1] == '\n')) 313 end1--; 314 while (s2 < end2 && (end2[-1] == '\r' || end2[-1] == '\n')) 315 end2--; 316 317 while (s1 < end1 && s2 < end2) { 318 if (isspace(*s1)) { 319 /* 320 * Skip whitespace. We check on both buffers 321 * because we don't want "a b" to match "ab". 322 */ 323 if (!isspace(*s2)) 324 return 0; 325 while (s1 < end1 && isspace(*s1)) 326 s1++; 327 while (s2 < end2 && isspace(*s2)) 328 s2++; 329 } else if (*s1++ != *s2++) 330 return 0; 331 } 332 333 /* If we reached the end on one side only, lines don't match. */ 334 return s1 == end1 && s2 == end2; 335} 336 337static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag) 338{ 339 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc); 340 img->line_allocated[img->nr].len = len; 341 img->line_allocated[img->nr].hash = hash_line(bol, len); 342 img->line_allocated[img->nr].flag = flag; 343 img->nr++; 344} 345 346/* 347 * "buf" has the file contents to be patched (read from various sources). 348 * attach it to "image" and add line-based index to it. 349 * "image" now owns the "buf". 350 */ 351static void prepare_image(struct image *image, char *buf, size_t len, 352 int prepare_linetable) 353{ 354 const char *cp, *ep; 355 356 memset(image, 0, sizeof(*image)); 357 image->buf = buf; 358 image->len = len; 359 360 if (!prepare_linetable) 361 return; 362 363 ep = image->buf + image->len; 364 cp = image->buf; 365 while (cp < ep) { 366 const char *next; 367 for (next = cp; next < ep && *next != '\n'; next++) 368 ; 369 if (next < ep) 370 next++; 371 add_line_info(image, cp, next - cp, 0); 372 cp = next; 373 } 374 image->line = image->line_allocated; 375} 376 377static void clear_image(struct image *image) 378{ 379 free(image->buf); 380 free(image->line_allocated); 381 memset(image, 0, sizeof(*image)); 382} 383 384/* fmt must contain _one_ %s and no other substitution */ 385static void say_patch_name(FILE *output, const char *fmt, struct patch *patch) 386{ 387 struct strbuf sb = STRBUF_INIT; 388 389 if (patch->old_name && patch->new_name && 390 strcmp(patch->old_name, patch->new_name)) { 391 quote_c_style(patch->old_name, &sb, NULL, 0); 392 strbuf_addstr(&sb, " => "); 393 quote_c_style(patch->new_name, &sb, NULL, 0); 394 } else { 395 const char *n = patch->new_name; 396 if (!n) 397 n = patch->old_name; 398 quote_c_style(n, &sb, NULL, 0); 399 } 400 fprintf(output, fmt, sb.buf); 401 fputc('\n', output); 402 strbuf_release(&sb); 403} 404 405#define SLOP (16) 406 407static int read_patch_file(struct strbuf *sb, int fd) 408{ 409 if (strbuf_read(sb, fd, 0) < 0) 410 return error_errno("git apply: failed to read"); 411 412 /* 413 * Make sure that we have some slop in the buffer 414 * so that we can do speculative "memcmp" etc, and 415 * see to it that it is NUL-filled. 416 */ 417 strbuf_grow(sb, SLOP); 418 memset(sb->buf + sb->len, 0, SLOP); 419 return 0; 420} 421 422static unsigned long linelen(const char *buffer, unsigned long size) 423{ 424 unsigned long len = 0; 425 while (size--) { 426 len++; 427 if (*buffer++ == '\n') 428 break; 429 } 430 return len; 431} 432 433static int is_dev_null(const char *str) 434{ 435 return skip_prefix(str, "/dev/null", &str) && isspace(*str); 436} 437 438#define TERM_SPACE 1 439#define TERM_TAB 2 440 441static int name_terminate(int c, int terminate) 442{ 443 if (c == ' ' && !(terminate & TERM_SPACE)) 444 return 0; 445 if (c == '\t' && !(terminate & TERM_TAB)) 446 return 0; 447 448 return 1; 449} 450 451/* remove double slashes to make --index work with such filenames */ 452static char *squash_slash(char *name) 453{ 454 int i = 0, j = 0; 455 456 if (!name) 457 return NULL; 458 459 while (name[i]) { 460 if ((name[j++] = name[i++]) == '/') 461 while (name[i] == '/') 462 i++; 463 } 464 name[j] = '\0'; 465 return name; 466} 467 468static char *find_name_gnu(struct apply_state *state, 469 const char *line, 470 const char *def, 471 int p_value) 472{ 473 struct strbuf name = STRBUF_INIT; 474 char *cp; 475 476 /* 477 * Proposed "new-style" GNU patch/diff format; see 478 * http://marc.info/?l=git&m=112927316408690&w=2 479 */ 480 if (unquote_c_style(&name, line, NULL)) { 481 strbuf_release(&name); 482 return NULL; 483 } 484 485 for (cp = name.buf; p_value; p_value--) { 486 cp = strchr(cp, '/'); 487 if (!cp) { 488 strbuf_release(&name); 489 return NULL; 490 } 491 cp++; 492 } 493 494 strbuf_remove(&name, 0, cp - name.buf); 495 if (state->root.len) 496 strbuf_insert(&name, 0, state->root.buf, state->root.len); 497 return squash_slash(strbuf_detach(&name, NULL)); 498} 499 500static size_t sane_tz_len(const char *line, size_t len) 501{ 502 const char *tz, *p; 503 504 if (len < strlen(" +0500") || line[len-strlen(" +0500")] != ' ') 505 return 0; 506 tz = line + len - strlen(" +0500"); 507 508 if (tz[1] != '+' && tz[1] != '-') 509 return 0; 510 511 for (p = tz + 2; p != line + len; p++) 512 if (!isdigit(*p)) 513 return 0; 514 515 return line + len - tz; 516} 517 518static size_t tz_with_colon_len(const char *line, size_t len) 519{ 520 const char *tz, *p; 521 522 if (len < strlen(" +08:00") || line[len - strlen(":00")] != ':') 523 return 0; 524 tz = line + len - strlen(" +08:00"); 525 526 if (tz[0] != ' ' || (tz[1] != '+' && tz[1] != '-')) 527 return 0; 528 p = tz + 2; 529 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 530 !isdigit(*p++) || !isdigit(*p++)) 531 return 0; 532 533 return line + len - tz; 534} 535 536static size_t date_len(const char *line, size_t len) 537{ 538 const char *date, *p; 539 540 if (len < strlen("72-02-05") || line[len-strlen("-05")] != '-') 541 return 0; 542 p = date = line + len - strlen("72-02-05"); 543 544 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || 545 !isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || 546 !isdigit(*p++) || !isdigit(*p++)) /* Not a date. */ 547 return 0; 548 549 if (date - line >= strlen("19") && 550 isdigit(date[-1]) && isdigit(date[-2])) /* 4-digit year */ 551 date -= strlen("19"); 552 553 return line + len - date; 554} 555 556static size_t short_time_len(const char *line, size_t len) 557{ 558 const char *time, *p; 559 560 if (len < strlen(" 07:01:32") || line[len-strlen(":32")] != ':') 561 return 0; 562 p = time = line + len - strlen(" 07:01:32"); 563 564 /* Permit 1-digit hours? */ 565 if (*p++ != ' ' || 566 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 567 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 568 !isdigit(*p++) || !isdigit(*p++)) /* Not a time. */ 569 return 0; 570 571 return line + len - time; 572} 573 574static size_t fractional_time_len(const char *line, size_t len) 575{ 576 const char *p; 577 size_t n; 578 579 /* Expected format: 19:41:17.620000023 */ 580 if (!len || !isdigit(line[len - 1])) 581 return 0; 582 p = line + len - 1; 583 584 /* Fractional seconds. */ 585 while (p > line && isdigit(*p)) 586 p--; 587 if (*p != '.') 588 return 0; 589 590 /* Hours, minutes, and whole seconds. */ 591 n = short_time_len(line, p - line); 592 if (!n) 593 return 0; 594 595 return line + len - p + n; 596} 597 598static size_t trailing_spaces_len(const char *line, size_t len) 599{ 600 const char *p; 601 602 /* Expected format: ' ' x (1 or more) */ 603 if (!len || line[len - 1] != ' ') 604 return 0; 605 606 p = line + len; 607 while (p != line) { 608 p--; 609 if (*p != ' ') 610 return line + len - (p + 1); 611 } 612 613 /* All spaces! */ 614 return len; 615} 616 617static size_t diff_timestamp_len(const char *line, size_t len) 618{ 619 const char *end = line + len; 620 size_t n; 621 622 /* 623 * Posix: 2010-07-05 19:41:17 624 * GNU: 2010-07-05 19:41:17.620000023 -0500 625 */ 626 627 if (!isdigit(end[-1])) 628 return 0; 629 630 n = sane_tz_len(line, end - line); 631 if (!n) 632 n = tz_with_colon_len(line, end - line); 633 end -= n; 634 635 n = short_time_len(line, end - line); 636 if (!n) 637 n = fractional_time_len(line, end - line); 638 end -= n; 639 640 n = date_len(line, end - line); 641 if (!n) /* No date. Too bad. */ 642 return 0; 643 end -= n; 644 645 if (end == line) /* No space before date. */ 646 return 0; 647 if (end[-1] == '\t') { /* Success! */ 648 end--; 649 return line + len - end; 650 } 651 if (end[-1] != ' ') /* No space before date. */ 652 return 0; 653 654 /* Whitespace damage. */ 655 end -= trailing_spaces_len(line, end - line); 656 return line + len - end; 657} 658 659static char *find_name_common(struct apply_state *state, 660 const char *line, 661 const char *def, 662 int p_value, 663 const char *end, 664 int terminate) 665{ 666 int len; 667 const char *start = NULL; 668 669 if (p_value == 0) 670 start = line; 671 while (line != end) { 672 char c = *line; 673 674 if (!end && isspace(c)) { 675 if (c == '\n') 676 break; 677 if (name_terminate(c, terminate)) 678 break; 679 } 680 line++; 681 if (c == '/' && !--p_value) 682 start = line; 683 } 684 if (!start) 685 return squash_slash(xstrdup_or_null(def)); 686 len = line - start; 687 if (!len) 688 return squash_slash(xstrdup_or_null(def)); 689 690 /* 691 * Generally we prefer the shorter name, especially 692 * if the other one is just a variation of that with 693 * something else tacked on to the end (ie "file.orig" 694 * or "file~"). 695 */ 696 if (def) { 697 int deflen = strlen(def); 698 if (deflen < len && !strncmp(start, def, deflen)) 699 return squash_slash(xstrdup(def)); 700 } 701 702 if (state->root.len) { 703 char *ret = xstrfmt("%s%.*s", state->root.buf, len, start); 704 return squash_slash(ret); 705 } 706 707 return squash_slash(xmemdupz(start, len)); 708} 709 710static char *find_name(struct apply_state *state, 711 const char *line, 712 char *def, 713 int p_value, 714 int terminate) 715{ 716 if (*line == '"') { 717 char *name = find_name_gnu(state, line, def, p_value); 718 if (name) 719 return name; 720 } 721 722 return find_name_common(state, line, def, p_value, NULL, terminate); 723} 724 725static char *find_name_traditional(struct apply_state *state, 726 const char *line, 727 char *def, 728 int p_value) 729{ 730 size_t len; 731 size_t date_len; 732 733 if (*line == '"') { 734 char *name = find_name_gnu(state, line, def, p_value); 735 if (name) 736 return name; 737 } 738 739 len = strchrnul(line, '\n') - line; 740 date_len = diff_timestamp_len(line, len); 741 if (!date_len) 742 return find_name_common(state, line, def, p_value, NULL, TERM_TAB); 743 len -= date_len; 744 745 return find_name_common(state, line, def, p_value, line + len, 0); 746} 747 748/* 749 * Given the string after "--- " or "+++ ", guess the appropriate 750 * p_value for the given patch. 751 */ 752static int guess_p_value(struct apply_state *state, const char *nameline) 753{ 754 char *name, *cp; 755 int val = -1; 756 757 if (is_dev_null(nameline)) 758 return -1; 759 name = find_name_traditional(state, nameline, NULL, 0); 760 if (!name) 761 return -1; 762 cp = strchr(name, '/'); 763 if (!cp) 764 val = 0; 765 else if (state->prefix) { 766 /* 767 * Does it begin with "a/$our-prefix" and such? Then this is 768 * very likely to apply to our directory. 769 */ 770 if (starts_with(name, state->prefix)) 771 val = count_slashes(state->prefix); 772 else { 773 cp++; 774 if (starts_with(cp, state->prefix)) 775 val = count_slashes(state->prefix) + 1; 776 } 777 } 778 free(name); 779 return val; 780} 781 782/* 783 * Does the ---/+++ line have the POSIX timestamp after the last HT? 784 * GNU diff puts epoch there to signal a creation/deletion event. Is 785 * this such a timestamp? 786 */ 787static int has_epoch_timestamp(const char *nameline) 788{ 789 /* 790 * We are only interested in epoch timestamp; any non-zero 791 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 792 * For the same reason, the date must be either 1969-12-31 or 793 * 1970-01-01, and the seconds part must be "00". 794 */ 795 const char stamp_regexp[] = 796 "^[0-2][0-9]:([0-5][0-9]):00(\\.0+)?" 797 " " 798 "([-+][0-2][0-9]:?[0-5][0-9])\n"; 799 const char *timestamp = NULL, *cp, *colon; 800 static regex_t *stamp; 801 regmatch_t m[10]; 802 int zoneoffset, epoch_hour, hour, minute; 803 int status; 804 805 for (cp = nameline; *cp != '\n'; cp++) { 806 if (*cp == '\t') 807 timestamp = cp + 1; 808 } 809 if (!timestamp) 810 return 0; 811 812 /* 813 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 814 * (west of GMT) or 1970-01-01 (east of GMT) 815 */ 816 if (skip_prefix(timestamp, "1969-12-31 ", ×tamp)) 817 epoch_hour = 24; 818 else if (skip_prefix(timestamp, "1970-01-01 ", ×tamp)) 819 epoch_hour = 0; 820 else 821 return 0; 822 823 if (!stamp) { 824 stamp = xmalloc(sizeof(*stamp)); 825 if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 826 warning(_("Cannot prepare timestamp regexp %s"), 827 stamp_regexp); 828 return 0; 829 } 830 } 831 832 status = regexec(stamp, timestamp, ARRAY_SIZE(m), m, 0); 833 if (status) { 834 if (status != REG_NOMATCH) 835 warning(_("regexec returned %d for input: %s"), 836 status, timestamp); 837 return 0; 838 } 839 840 hour = strtol(timestamp, NULL, 10); 841 minute = strtol(timestamp + m[1].rm_so, NULL, 10); 842 843 zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10); 844 if (*colon == ':') 845 zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10); 846 else 847 zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100); 848 if (timestamp[m[3].rm_so] == '-') 849 zoneoffset = -zoneoffset; 850 851 return hour * 60 + minute - zoneoffset == epoch_hour * 60; 852} 853 854/* 855 * Get the name etc info from the ---/+++ lines of a traditional patch header 856 * 857 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 858 * files, we can happily check the index for a match, but for creating a 859 * new file we should try to match whatever "patch" does. I have no idea. 860 */ 861static int parse_traditional_patch(struct apply_state *state, 862 const char *first, 863 const char *second, 864 struct patch *patch) 865{ 866 char *name; 867 868 first += 4; /* skip "--- " */ 869 second += 4; /* skip "+++ " */ 870 if (!state->p_value_known) { 871 int p, q; 872 p = guess_p_value(state, first); 873 q = guess_p_value(state, second); 874 if (p < 0) p = q; 875 if (0 <= p && p == q) { 876 state->p_value = p; 877 state->p_value_known = 1; 878 } 879 } 880 if (is_dev_null(first)) { 881 patch->is_new = 1; 882 patch->is_delete = 0; 883 name = find_name_traditional(state, second, NULL, state->p_value); 884 patch->new_name = name; 885 } else if (is_dev_null(second)) { 886 patch->is_new = 0; 887 patch->is_delete = 1; 888 name = find_name_traditional(state, first, NULL, state->p_value); 889 patch->old_name = name; 890 } else { 891 char *first_name; 892 first_name = find_name_traditional(state, first, NULL, state->p_value); 893 name = find_name_traditional(state, second, first_name, state->p_value); 894 free(first_name); 895 if (has_epoch_timestamp(first)) { 896 patch->is_new = 1; 897 patch->is_delete = 0; 898 patch->new_name = name; 899 } else if (has_epoch_timestamp(second)) { 900 patch->is_new = 0; 901 patch->is_delete = 1; 902 patch->old_name = name; 903 } else { 904 patch->old_name = name; 905 patch->new_name = xstrdup_or_null(name); 906 } 907 } 908 if (!name) 909 return error(_("unable to find filename in patch at line %d"), state->linenr); 910 911 return 0; 912} 913 914static int gitdiff_hdrend(struct apply_state *state, 915 const char *line, 916 struct patch *patch) 917{ 918 return 1; 919} 920 921/* 922 * We're anal about diff header consistency, to make 923 * sure that we don't end up having strange ambiguous 924 * patches floating around. 925 * 926 * As a result, gitdiff_{old|new}name() will check 927 * their names against any previous information, just 928 * to make sure.. 929 */ 930#define DIFF_OLD_NAME 0 931#define DIFF_NEW_NAME 1 932 933static int gitdiff_verify_name(struct apply_state *state, 934 const char *line, 935 int isnull, 936 char **name, 937 int side) 938{ 939 if (!*name && !isnull) { 940 *name = find_name(state, line, NULL, state->p_value, TERM_TAB); 941 return 0; 942 } 943 944 if (*name) { 945 char *another; 946 if (isnull) 947 return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), 948 *name, state->linenr); 949 another = find_name(state, line, NULL, state->p_value, TERM_TAB); 950 if (!another || strcmp(another, *name)) { 951 free(another); 952 return error((side == DIFF_NEW_NAME) ? 953 _("git apply: bad git-diff - inconsistent new filename on line %d") : 954 _("git apply: bad git-diff - inconsistent old filename on line %d"), state->linenr); 955 } 956 free(another); 957 } else { 958 if (!is_dev_null(line)) 959 return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr); 960 } 961 962 return 0; 963} 964 965static int gitdiff_oldname(struct apply_state *state, 966 const char *line, 967 struct patch *patch) 968{ 969 return gitdiff_verify_name(state, line, 970 patch->is_new, &patch->old_name, 971 DIFF_OLD_NAME); 972} 973 974static int gitdiff_newname(struct apply_state *state, 975 const char *line, 976 struct patch *patch) 977{ 978 return gitdiff_verify_name(state, line, 979 patch->is_delete, &patch->new_name, 980 DIFF_NEW_NAME); 981} 982 983static int parse_mode_line(const char *line, int linenr, unsigned int *mode) 984{ 985 char *end; 986 *mode = strtoul(line, &end, 8); 987 if (end == line || !isspace(*end)) 988 return error(_("invalid mode on line %d: %s"), linenr, line); 989 return 0; 990} 991 992static int gitdiff_oldmode(struct apply_state *state, 993 const char *line, 994 struct patch *patch) 995{ 996 return parse_mode_line(line, state->linenr, &patch->old_mode); 997} 998 999static int gitdiff_newmode(struct apply_state *state,1000 const char *line,1001 struct patch *patch)1002{1003 return parse_mode_line(line, state->linenr, &patch->new_mode);1004}10051006static int gitdiff_delete(struct apply_state *state,1007 const char *line,1008 struct patch *patch)1009{1010 patch->is_delete = 1;1011 free(patch->old_name);1012 patch->old_name = xstrdup_or_null(patch->def_name);1013 return gitdiff_oldmode(state, line, patch);1014}10151016static int gitdiff_newfile(struct apply_state *state,1017 const char *line,1018 struct patch *patch)1019{1020 patch->is_new = 1;1021 free(patch->new_name);1022 patch->new_name = xstrdup_or_null(patch->def_name);1023 return gitdiff_newmode(state, line, patch);1024}10251026static int gitdiff_copysrc(struct apply_state *state,1027 const char *line,1028 struct patch *patch)1029{1030 patch->is_copy = 1;1031 free(patch->old_name);1032 patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);1033 return 0;1034}10351036static int gitdiff_copydst(struct apply_state *state,1037 const char *line,1038 struct patch *patch)1039{1040 patch->is_copy = 1;1041 free(patch->new_name);1042 patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);1043 return 0;1044}10451046static int gitdiff_renamesrc(struct apply_state *state,1047 const char *line,1048 struct patch *patch)1049{1050 patch->is_rename = 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_renamedst(struct apply_state *state,1057 const char *line,1058 struct patch *patch)1059{1060 patch->is_rename = 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_similarity(struct apply_state *state,1067 const char *line,1068 struct patch *patch)1069{1070 unsigned long val = strtoul(line, NULL, 10);1071 if (val <= 100)1072 patch->score = val;1073 return 0;1074}10751076static int gitdiff_dissimilarity(struct apply_state *state,1077 const char *line,1078 struct patch *patch)1079{1080 unsigned long val = strtoul(line, NULL, 10);1081 if (val <= 100)1082 patch->score = val;1083 return 0;1084}10851086static int gitdiff_index(struct apply_state *state,1087 const char *line,1088 struct patch *patch)1089{1090 /*1091 * index line is N hexadecimal, "..", N hexadecimal,1092 * and optional space with octal mode.1093 */1094 const char *ptr, *eol;1095 int len;10961097 ptr = strchr(line, '.');1098 if (!ptr || ptr[1] != '.' || 40 < ptr - line)1099 return 0;1100 len = ptr - line;1101 memcpy(patch->old_sha1_prefix, line, len);1102 patch->old_sha1_prefix[len] = 0;11031104 line = ptr + 2;1105 ptr = strchr(line, ' ');1106 eol = strchrnul(line, '\n');11071108 if (!ptr || eol < ptr)1109 ptr = eol;1110 len = ptr - line;11111112 if (40 < len)1113 return 0;1114 memcpy(patch->new_sha1_prefix, line, len);1115 patch->new_sha1_prefix[len] = 0;1116 if (*ptr == ' ')1117 return gitdiff_oldmode(state, ptr + 1, patch);1118 return 0;1119}11201121/*1122 * This is normal for a diff that doesn't change anything: we'll fall through1123 * into the next diff. Tell the parser to break out.1124 */1125static int gitdiff_unrecognized(struct apply_state *state,1126 const char *line,1127 struct patch *patch)1128{1129 return 1;1130}11311132/*1133 * Skip p_value leading components from "line"; as we do not accept1134 * absolute paths, return NULL in that case.1135 */1136static const char *skip_tree_prefix(struct apply_state *state,1137 const char *line,1138 int llen)1139{1140 int nslash;1141 int i;11421143 if (!state->p_value)1144 return (llen && line[0] == '/') ? NULL : line;11451146 nslash = state->p_value;1147 for (i = 0; i < llen; i++) {1148 int ch = line[i];1149 if (ch == '/' && --nslash <= 0)1150 return (i == 0) ? NULL : &line[i + 1];1151 }1152 return NULL;1153}11541155/*1156 * This is to extract the same name that appears on "diff --git"1157 * line. We do not find and return anything if it is a rename1158 * patch, and it is OK because we will find the name elsewhere.1159 * We need to reliably find name only when it is mode-change only,1160 * creation or deletion of an empty file. In any of these cases,1161 * both sides are the same name under a/ and b/ respectively.1162 */1163static char *git_header_name(struct apply_state *state,1164 const char *line,1165 int llen)1166{1167 const char *name;1168 const char *second = NULL;1169 size_t len, line_len;11701171 line += strlen("diff --git ");1172 llen -= strlen("diff --git ");11731174 if (*line == '"') {1175 const char *cp;1176 struct strbuf first = STRBUF_INIT;1177 struct strbuf sp = STRBUF_INIT;11781179 if (unquote_c_style(&first, line, &second))1180 goto free_and_fail1;11811182 /* strip the a/b prefix including trailing slash */1183 cp = skip_tree_prefix(state, first.buf, first.len);1184 if (!cp)1185 goto free_and_fail1;1186 strbuf_remove(&first, 0, cp - first.buf);11871188 /*1189 * second points at one past closing dq of name.1190 * find the second name.1191 */1192 while ((second < line + llen) && isspace(*second))1193 second++;11941195 if (line + llen <= second)1196 goto free_and_fail1;1197 if (*second == '"') {1198 if (unquote_c_style(&sp, second, NULL))1199 goto free_and_fail1;1200 cp = skip_tree_prefix(state, sp.buf, sp.len);1201 if (!cp)1202 goto free_and_fail1;1203 /* They must match, otherwise ignore */1204 if (strcmp(cp, first.buf))1205 goto free_and_fail1;1206 strbuf_release(&sp);1207 return strbuf_detach(&first, NULL);1208 }12091210 /* unquoted second */1211 cp = skip_tree_prefix(state, second, line + llen - second);1212 if (!cp)1213 goto free_and_fail1;1214 if (line + llen - cp != first.len ||1215 memcmp(first.buf, cp, first.len))1216 goto free_and_fail1;1217 return strbuf_detach(&first, NULL);12181219 free_and_fail1:1220 strbuf_release(&first);1221 strbuf_release(&sp);1222 return NULL;1223 }12241225 /* unquoted first name */1226 name = skip_tree_prefix(state, line, llen);1227 if (!name)1228 return NULL;12291230 /*1231 * since the first name is unquoted, a dq if exists must be1232 * the beginning of the second name.1233 */1234 for (second = name; second < line + llen; second++) {1235 if (*second == '"') {1236 struct strbuf sp = STRBUF_INIT;1237 const char *np;12381239 if (unquote_c_style(&sp, second, NULL))1240 goto free_and_fail2;12411242 np = skip_tree_prefix(state, sp.buf, sp.len);1243 if (!np)1244 goto free_and_fail2;12451246 len = sp.buf + sp.len - np;1247 if (len < second - name &&1248 !strncmp(np, name, len) &&1249 isspace(name[len])) {1250 /* Good */1251 strbuf_remove(&sp, 0, np - sp.buf);1252 return strbuf_detach(&sp, NULL);1253 }12541255 free_and_fail2:1256 strbuf_release(&sp);1257 return NULL;1258 }1259 }12601261 /*1262 * Accept a name only if it shows up twice, exactly the same1263 * form.1264 */1265 second = strchr(name, '\n');1266 if (!second)1267 return NULL;1268 line_len = second - name;1269 for (len = 0 ; ; len++) {1270 switch (name[len]) {1271 default:1272 continue;1273 case '\n':1274 return NULL;1275 case '\t': case ' ':1276 /*1277 * Is this the separator between the preimage1278 * and the postimage pathname? Again, we are1279 * only interested in the case where there is1280 * no rename, as this is only to set def_name1281 * and a rename patch has the names elsewhere1282 * in an unambiguous form.1283 */1284 if (!name[len + 1])1285 return NULL; /* no postimage name */1286 second = skip_tree_prefix(state, name + len + 1,1287 line_len - (len + 1));1288 if (!second)1289 return NULL;1290 /*1291 * Does len bytes starting at "name" and "second"1292 * (that are separated by one HT or SP we just1293 * found) exactly match?1294 */1295 if (second[len] == '\n' && !strncmp(name, second, len))1296 return xmemdupz(name, len);1297 }1298 }1299}13001301static int check_header_line(struct apply_state *state, struct patch *patch)1302{1303 int extensions = (patch->is_delete == 1) + (patch->is_new == 1) +1304 (patch->is_rename == 1) + (patch->is_copy == 1);1305 if (extensions > 1)1306 return error(_("inconsistent header lines %d and %d"),1307 patch->extension_linenr, state->linenr);1308 if (extensions && !patch->extension_linenr)1309 patch->extension_linenr = state->linenr;1310 return 0;1311}13121313/* Verify that we recognize the lines following a git header */1314static int parse_git_header(struct apply_state *state,1315 const char *line,1316 int len,1317 unsigned int size,1318 struct patch *patch)1319{1320 unsigned long offset;13211322 /* A git diff has explicit new/delete information, so we don't guess */1323 patch->is_new = 0;1324 patch->is_delete = 0;13251326 /*1327 * Some things may not have the old name in the1328 * rest of the headers anywhere (pure mode changes,1329 * or removing or adding empty files), so we get1330 * the default name from the header.1331 */1332 patch->def_name = git_header_name(state, line, len);1333 if (patch->def_name && state->root.len) {1334 char *s = xstrfmt("%s%s", state->root.buf, patch->def_name);1335 free(patch->def_name);1336 patch->def_name = s;1337 }13381339 line += len;1340 size -= len;1341 state->linenr++;1342 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, state->linenr++) {1343 static const struct opentry {1344 const char *str;1345 int (*fn)(struct apply_state *, const char *, struct patch *);1346 } optable[] = {1347 { "@@ -", gitdiff_hdrend },1348 { "--- ", gitdiff_oldname },1349 { "+++ ", gitdiff_newname },1350 { "old mode ", gitdiff_oldmode },1351 { "new mode ", gitdiff_newmode },1352 { "deleted file mode ", gitdiff_delete },1353 { "new file mode ", gitdiff_newfile },1354 { "copy from ", gitdiff_copysrc },1355 { "copy to ", gitdiff_copydst },1356 { "rename old ", gitdiff_renamesrc },1357 { "rename new ", gitdiff_renamedst },1358 { "rename from ", gitdiff_renamesrc },1359 { "rename to ", gitdiff_renamedst },1360 { "similarity index ", gitdiff_similarity },1361 { "dissimilarity index ", gitdiff_dissimilarity },1362 { "index ", gitdiff_index },1363 { "", gitdiff_unrecognized },1364 };1365 int i;13661367 len = linelen(line, size);1368 if (!len || line[len-1] != '\n')1369 break;1370 for (i = 0; i < ARRAY_SIZE(optable); i++) {1371 const struct opentry *p = optable + i;1372 int oplen = strlen(p->str);1373 int res;1374 if (len < oplen || memcmp(p->str, line, oplen))1375 continue;1376 res = p->fn(state, line + oplen, patch);1377 if (res < 0)1378 return -1;1379 if (check_header_line(state, patch))1380 return -1;1381 if (res > 0)1382 return offset;1383 break;1384 }1385 }13861387 return offset;1388}13891390static int parse_num(const char *line, unsigned long *p)1391{1392 char *ptr;13931394 if (!isdigit(*line))1395 return 0;1396 *p = strtoul(line, &ptr, 10);1397 return ptr - line;1398}13991400static int parse_range(const char *line, int len, int offset, const char *expect,1401 unsigned long *p1, unsigned long *p2)1402{1403 int digits, ex;14041405 if (offset < 0 || offset >= len)1406 return -1;1407 line += offset;1408 len -= offset;14091410 digits = parse_num(line, p1);1411 if (!digits)1412 return -1;14131414 offset += digits;1415 line += digits;1416 len -= digits;14171418 *p2 = 1;1419 if (*line == ',') {1420 digits = parse_num(line+1, p2);1421 if (!digits)1422 return -1;14231424 offset += digits+1;1425 line += digits+1;1426 len -= digits+1;1427 }14281429 ex = strlen(expect);1430 if (ex > len)1431 return -1;1432 if (memcmp(line, expect, ex))1433 return -1;14341435 return offset + ex;1436}14371438static void recount_diff(const char *line, int size, struct fragment *fragment)1439{1440 int oldlines = 0, newlines = 0, ret = 0;14411442 if (size < 1) {1443 warning("recount: ignore empty hunk");1444 return;1445 }14461447 for (;;) {1448 int len = linelen(line, size);1449 size -= len;1450 line += len;14511452 if (size < 1)1453 break;14541455 switch (*line) {1456 case ' ': case '\n':1457 newlines++;1458 /* fall through */1459 case '-':1460 oldlines++;1461 continue;1462 case '+':1463 newlines++;1464 continue;1465 case '\\':1466 continue;1467 case '@':1468 ret = size < 3 || !starts_with(line, "@@ ");1469 break;1470 case 'd':1471 ret = size < 5 || !starts_with(line, "diff ");1472 break;1473 default:1474 ret = -1;1475 break;1476 }1477 if (ret) {1478 warning(_("recount: unexpected line: %.*s"),1479 (int)linelen(line, size), line);1480 return;1481 }1482 break;1483 }1484 fragment->oldlines = oldlines;1485 fragment->newlines = newlines;1486}14871488/*1489 * Parse a unified diff fragment header of the1490 * form "@@ -a,b +c,d @@"1491 */1492static int parse_fragment_header(const char *line, int len, struct fragment *fragment)1493{1494 int offset;14951496 if (!len || line[len-1] != '\n')1497 return -1;14981499 /* Figure out the number of lines in a fragment */1500 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);1501 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);15021503 return offset;1504}15051506/*1507 * Find file diff header1508 *1509 * Returns:1510 * -1 if no header was found1511 * -128 in case of error1512 * the size of the header in bytes (called "offset") otherwise1513 */1514static int find_header(struct apply_state *state,1515 const char *line,1516 unsigned long size,1517 int *hdrsize,1518 struct patch *patch)1519{1520 unsigned long offset, len;15211522 patch->is_toplevel_relative = 0;1523 patch->is_rename = patch->is_copy = 0;1524 patch->is_new = patch->is_delete = -1;1525 patch->old_mode = patch->new_mode = 0;1526 patch->old_name = patch->new_name = NULL;1527 for (offset = 0; size > 0; offset += len, size -= len, line += len, state->linenr++) {1528 unsigned long nextlen;15291530 len = linelen(line, size);1531 if (!len)1532 break;15331534 /* Testing this early allows us to take a few shortcuts.. */1535 if (len < 6)1536 continue;15371538 /*1539 * Make sure we don't find any unconnected patch fragments.1540 * That's a sign that we didn't find a header, and that a1541 * patch has become corrupted/broken up.1542 */1543 if (!memcmp("@@ -", line, 4)) {1544 struct fragment dummy;1545 if (parse_fragment_header(line, len, &dummy) < 0)1546 continue;1547 error(_("patch fragment without header at line %d: %.*s"),1548 state->linenr, (int)len-1, line);1549 return -128;1550 }15511552 if (size < len + 6)1553 break;15541555 /*1556 * Git patch? It might not have a real patch, just a rename1557 * or mode change, so we handle that specially1558 */1559 if (!memcmp("diff --git ", line, 11)) {1560 int git_hdr_len = parse_git_header(state, line, len, size, patch);1561 if (git_hdr_len < 0)1562 return -128;1563 if (git_hdr_len <= len)1564 continue;1565 if (!patch->old_name && !patch->new_name) {1566 if (!patch->def_name) {1567 error(Q_("git diff header lacks filename information when removing "1568 "%d leading pathname component (line %d)",1569 "git diff header lacks filename information when removing "1570 "%d leading pathname components (line %d)",1571 state->p_value),1572 state->p_value, state->linenr);1573 return -128;1574 }1575 patch->old_name = xstrdup(patch->def_name);1576 patch->new_name = xstrdup(patch->def_name);1577 }1578 if ((!patch->new_name && !patch->is_delete) ||1579 (!patch->old_name && !patch->is_new)) {1580 error(_("git diff header lacks filename information "1581 "(line %d)"), state->linenr);1582 return -128;1583 }1584 patch->is_toplevel_relative = 1;1585 *hdrsize = git_hdr_len;1586 return offset;1587 }15881589 /* --- followed by +++ ? */1590 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))1591 continue;15921593 /*1594 * We only accept unified patches, so we want it to1595 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1596 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1597 */1598 nextlen = linelen(line + len, size - len);1599 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))1600 continue;16011602 /* Ok, we'll consider it a patch */1603 if (parse_traditional_patch(state, line, line+len, patch))1604 return -128;1605 *hdrsize = len + nextlen;1606 state->linenr += 2;1607 return offset;1608 }1609 return -1;1610}16111612static void record_ws_error(struct apply_state *state,1613 unsigned result,1614 const char *line,1615 int len,1616 int linenr)1617{1618 char *err;16191620 if (!result)1621 return;16221623 state->whitespace_error++;1624 if (state->squelch_whitespace_errors &&1625 state->squelch_whitespace_errors < state->whitespace_error)1626 return;16271628 err = whitespace_error_string(result);1629 if (state->apply_verbosity > verbosity_silent)1630 fprintf(stderr, "%s:%d: %s.\n%.*s\n",1631 state->patch_input_file, linenr, err, len, line);1632 free(err);1633}16341635static void check_whitespace(struct apply_state *state,1636 const char *line,1637 int len,1638 unsigned ws_rule)1639{1640 unsigned result = ws_check(line + 1, len - 1, ws_rule);16411642 record_ws_error(state, result, line + 1, len - 2, state->linenr);1643}16441645/*1646 * Check if the patch has context lines with CRLF or1647 * the patch wants to remove lines with CRLF.1648 */1649static void check_old_for_crlf(struct patch *patch, const char *line, int len)1650{1651 if (len >= 2 && line[len-1] == '\n' && line[len-2] == '\r') {1652 patch->ws_rule |= WS_CR_AT_EOL;1653 patch->crlf_in_old = 1;1654 }1655}165616571658/*1659 * Parse a unified diff. Note that this really needs to parse each1660 * fragment separately, since the only way to know the difference1661 * between a "---" that is part of a patch, and a "---" that starts1662 * the next patch is to look at the line counts..1663 */1664static int parse_fragment(struct apply_state *state,1665 const char *line,1666 unsigned long size,1667 struct patch *patch,1668 struct fragment *fragment)1669{1670 int added, deleted;1671 int len = linelen(line, size), offset;1672 unsigned long oldlines, newlines;1673 unsigned long leading, trailing;16741675 offset = parse_fragment_header(line, len, fragment);1676 if (offset < 0)1677 return -1;1678 if (offset > 0 && patch->recount)1679 recount_diff(line + offset, size - offset, fragment);1680 oldlines = fragment->oldlines;1681 newlines = fragment->newlines;1682 leading = 0;1683 trailing = 0;16841685 /* Parse the thing.. */1686 line += len;1687 size -= len;1688 state->linenr++;1689 added = deleted = 0;1690 for (offset = len;1691 0 < size;1692 offset += len, size -= len, line += len, state->linenr++) {1693 if (!oldlines && !newlines)1694 break;1695 len = linelen(line, size);1696 if (!len || line[len-1] != '\n')1697 return -1;1698 switch (*line) {1699 default:1700 return -1;1701 case '\n': /* newer GNU diff, an empty context line */1702 case ' ':1703 oldlines--;1704 newlines--;1705 if (!deleted && !added)1706 leading++;1707 trailing++;1708 check_old_for_crlf(patch, line, len);1709 if (!state->apply_in_reverse &&1710 state->ws_error_action == correct_ws_error)1711 check_whitespace(state, line, len, patch->ws_rule);1712 break;1713 case '-':1714 if (!state->apply_in_reverse)1715 check_old_for_crlf(patch, line, len);1716 if (state->apply_in_reverse &&1717 state->ws_error_action != nowarn_ws_error)1718 check_whitespace(state, line, len, patch->ws_rule);1719 deleted++;1720 oldlines--;1721 trailing = 0;1722 break;1723 case '+':1724 if (state->apply_in_reverse)1725 check_old_for_crlf(patch, line, len);1726 if (!state->apply_in_reverse &&1727 state->ws_error_action != nowarn_ws_error)1728 check_whitespace(state, line, len, patch->ws_rule);1729 added++;1730 newlines--;1731 trailing = 0;1732 break;17331734 /*1735 * We allow "\ No newline at end of file". Depending1736 * on locale settings when the patch was produced we1737 * don't know what this line looks like. The only1738 * thing we do know is that it begins with "\ ".1739 * Checking for 12 is just for sanity check -- any1740 * l10n of "\ No newline..." is at least that long.1741 */1742 case '\\':1743 if (len < 12 || memcmp(line, "\\ ", 2))1744 return -1;1745 break;1746 }1747 }1748 if (oldlines || newlines)1749 return -1;1750 if (!deleted && !added)1751 return -1;17521753 fragment->leading = leading;1754 fragment->trailing = trailing;17551756 /*1757 * If a fragment ends with an incomplete line, we failed to include1758 * it in the above loop because we hit oldlines == newlines == 01759 * before seeing it.1760 */1761 if (12 < size && !memcmp(line, "\\ ", 2))1762 offset += linelen(line, size);17631764 patch->lines_added += added;1765 patch->lines_deleted += deleted;17661767 if (0 < patch->is_new && oldlines)1768 return error(_("new file depends on old contents"));1769 if (0 < patch->is_delete && newlines)1770 return error(_("deleted file still has contents"));1771 return offset;1772}17731774/*1775 * We have seen "diff --git a/... b/..." header (or a traditional patch1776 * header). Read hunks that belong to this patch into fragments and hang1777 * them to the given patch structure.1778 *1779 * The (fragment->patch, fragment->size) pair points into the memory given1780 * by the caller, not a copy, when we return.1781 *1782 * Returns:1783 * -1 in case of error,1784 * the number of bytes in the patch otherwise.1785 */1786static int parse_single_patch(struct apply_state *state,1787 const char *line,1788 unsigned long size,1789 struct patch *patch)1790{1791 unsigned long offset = 0;1792 unsigned long oldlines = 0, newlines = 0, context = 0;1793 struct fragment **fragp = &patch->fragments;17941795 while (size > 4 && !memcmp(line, "@@ -", 4)) {1796 struct fragment *fragment;1797 int len;17981799 fragment = xcalloc(1, sizeof(*fragment));1800 fragment->linenr = state->linenr;1801 len = parse_fragment(state, line, size, patch, fragment);1802 if (len <= 0) {1803 free(fragment);1804 return error(_("corrupt patch at line %d"), state->linenr);1805 }1806 fragment->patch = line;1807 fragment->size = len;1808 oldlines += fragment->oldlines;1809 newlines += fragment->newlines;1810 context += fragment->leading + fragment->trailing;18111812 *fragp = fragment;1813 fragp = &fragment->next;18141815 offset += len;1816 line += len;1817 size -= len;1818 }18191820 /*1821 * If something was removed (i.e. we have old-lines) it cannot1822 * be creation, and if something was added it cannot be1823 * deletion. However, the reverse is not true; --unified=01824 * patches that only add are not necessarily creation even1825 * though they do not have any old lines, and ones that only1826 * delete are not necessarily deletion.1827 *1828 * Unfortunately, a real creation/deletion patch do _not_ have1829 * any context line by definition, so we cannot safely tell it1830 * apart with --unified=0 insanity. At least if the patch has1831 * more than one hunk it is not creation or deletion.1832 */1833 if (patch->is_new < 0 &&1834 (oldlines || (patch->fragments && patch->fragments->next)))1835 patch->is_new = 0;1836 if (patch->is_delete < 0 &&1837 (newlines || (patch->fragments && patch->fragments->next)))1838 patch->is_delete = 0;18391840 if (0 < patch->is_new && oldlines)1841 return error(_("new file %s depends on old contents"), patch->new_name);1842 if (0 < patch->is_delete && newlines)1843 return error(_("deleted file %s still has contents"), patch->old_name);1844 if (!patch->is_delete && !newlines && context && state->apply_verbosity > verbosity_silent)1845 fprintf_ln(stderr,1846 _("** warning: "1847 "file %s becomes empty but is not deleted"),1848 patch->new_name);18491850 return offset;1851}18521853static inline int metadata_changes(struct patch *patch)1854{1855 return patch->is_rename > 0 ||1856 patch->is_copy > 0 ||1857 patch->is_new > 0 ||1858 patch->is_delete ||1859 (patch->old_mode && patch->new_mode &&1860 patch->old_mode != patch->new_mode);1861}18621863static char *inflate_it(const void *data, unsigned long size,1864 unsigned long inflated_size)1865{1866 git_zstream stream;1867 void *out;1868 int st;18691870 memset(&stream, 0, sizeof(stream));18711872 stream.next_in = (unsigned char *)data;1873 stream.avail_in = size;1874 stream.next_out = out = xmalloc(inflated_size);1875 stream.avail_out = inflated_size;1876 git_inflate_init(&stream);1877 st = git_inflate(&stream, Z_FINISH);1878 git_inflate_end(&stream);1879 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {1880 free(out);1881 return NULL;1882 }1883 return out;1884}18851886/*1887 * Read a binary hunk and return a new fragment; fragment->patch1888 * points at an allocated memory that the caller must free, so1889 * it is marked as "->free_patch = 1".1890 */1891static struct fragment *parse_binary_hunk(struct apply_state *state,1892 char **buf_p,1893 unsigned long *sz_p,1894 int *status_p,1895 int *used_p)1896{1897 /*1898 * Expect a line that begins with binary patch method ("literal"1899 * or "delta"), followed by the length of data before deflating.1900 * a sequence of 'length-byte' followed by base-85 encoded data1901 * should follow, terminated by a newline.1902 *1903 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1904 * and we would limit the patch line to 66 characters,1905 * so one line can fit up to 13 groups that would decode1906 * to 52 bytes max. The length byte 'A'-'Z' corresponds1907 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1908 */1909 int llen, used;1910 unsigned long size = *sz_p;1911 char *buffer = *buf_p;1912 int patch_method;1913 unsigned long origlen;1914 char *data = NULL;1915 int hunk_size = 0;1916 struct fragment *frag;19171918 llen = linelen(buffer, size);1919 used = llen;19201921 *status_p = 0;19221923 if (starts_with(buffer, "delta ")) {1924 patch_method = BINARY_DELTA_DEFLATED;1925 origlen = strtoul(buffer + 6, NULL, 10);1926 }1927 else if (starts_with(buffer, "literal ")) {1928 patch_method = BINARY_LITERAL_DEFLATED;1929 origlen = strtoul(buffer + 8, NULL, 10);1930 }1931 else1932 return NULL;19331934 state->linenr++;1935 buffer += llen;1936 while (1) {1937 int byte_length, max_byte_length, newsize;1938 llen = linelen(buffer, size);1939 used += llen;1940 state->linenr++;1941 if (llen == 1) {1942 /* consume the blank line */1943 buffer++;1944 size--;1945 break;1946 }1947 /*1948 * Minimum line is "A00000\n" which is 7-byte long,1949 * and the line length must be multiple of 5 plus 2.1950 */1951 if ((llen < 7) || (llen-2) % 5)1952 goto corrupt;1953 max_byte_length = (llen - 2) / 5 * 4;1954 byte_length = *buffer;1955 if ('A' <= byte_length && byte_length <= 'Z')1956 byte_length = byte_length - 'A' + 1;1957 else if ('a' <= byte_length && byte_length <= 'z')1958 byte_length = byte_length - 'a' + 27;1959 else1960 goto corrupt;1961 /* if the input length was not multiple of 4, we would1962 * have filler at the end but the filler should never1963 * exceed 3 bytes1964 */1965 if (max_byte_length < byte_length ||1966 byte_length <= max_byte_length - 4)1967 goto corrupt;1968 newsize = hunk_size + byte_length;1969 data = xrealloc(data, newsize);1970 if (decode_85(data + hunk_size, buffer + 1, byte_length))1971 goto corrupt;1972 hunk_size = newsize;1973 buffer += llen;1974 size -= llen;1975 }19761977 frag = xcalloc(1, sizeof(*frag));1978 frag->patch = inflate_it(data, hunk_size, origlen);1979 frag->free_patch = 1;1980 if (!frag->patch)1981 goto corrupt;1982 free(data);1983 frag->size = origlen;1984 *buf_p = buffer;1985 *sz_p = size;1986 *used_p = used;1987 frag->binary_patch_method = patch_method;1988 return frag;19891990 corrupt:1991 free(data);1992 *status_p = -1;1993 error(_("corrupt binary patch at line %d: %.*s"),1994 state->linenr-1, llen-1, buffer);1995 return NULL;1996}19971998/*1999 * Returns:2000 * -1 in case of error,2001 * the length of the parsed binary patch otherwise2002 */2003static int parse_binary(struct apply_state *state,2004 char *buffer,2005 unsigned long size,2006 struct patch *patch)2007{2008 /*2009 * We have read "GIT binary patch\n"; what follows is a line2010 * that says the patch method (currently, either "literal" or2011 * "delta") and the length of data before deflating; a2012 * sequence of 'length-byte' followed by base-85 encoded data2013 * follows.2014 *2015 * When a binary patch is reversible, there is another binary2016 * hunk in the same format, starting with patch method (either2017 * "literal" or "delta") with the length of data, and a sequence2018 * of length-byte + base-85 encoded data, terminated with another2019 * empty line. This data, when applied to the postimage, produces2020 * the preimage.2021 */2022 struct fragment *forward;2023 struct fragment *reverse;2024 int status;2025 int used, used_1;20262027 forward = parse_binary_hunk(state, &buffer, &size, &status, &used);2028 if (!forward && !status)2029 /* there has to be one hunk (forward hunk) */2030 return error(_("unrecognized binary patch at line %d"), state->linenr-1);2031 if (status)2032 /* otherwise we already gave an error message */2033 return status;20342035 reverse = parse_binary_hunk(state, &buffer, &size, &status, &used_1);2036 if (reverse)2037 used += used_1;2038 else if (status) {2039 /*2040 * Not having reverse hunk is not an error, but having2041 * a corrupt reverse hunk is.2042 */2043 free((void*) forward->patch);2044 free(forward);2045 return status;2046 }2047 forward->next = reverse;2048 patch->fragments = forward;2049 patch->is_binary = 1;2050 return used;2051}20522053static void prefix_one(struct apply_state *state, char **name)2054{2055 char *old_name = *name;2056 if (!old_name)2057 return;2058 *name = prefix_filename(state->prefix, *name);2059 free(old_name);2060}20612062static void prefix_patch(struct apply_state *state, struct patch *p)2063{2064 if (!state->prefix || p->is_toplevel_relative)2065 return;2066 prefix_one(state, &p->new_name);2067 prefix_one(state, &p->old_name);2068}20692070/*2071 * include/exclude2072 */20732074static void add_name_limit(struct apply_state *state,2075 const char *name,2076 int exclude)2077{2078 struct string_list_item *it;20792080 it = string_list_append(&state->limit_by_name, name);2081 it->util = exclude ? NULL : (void *) 1;2082}20832084static int use_patch(struct apply_state *state, struct patch *p)2085{2086 const char *pathname = p->new_name ? p->new_name : p->old_name;2087 int i;20882089 /* Paths outside are not touched regardless of "--include" */2090 if (state->prefix && *state->prefix) {2091 const char *rest;2092 if (!skip_prefix(pathname, state->prefix, &rest) || !*rest)2093 return 0;2094 }20952096 /* See if it matches any of exclude/include rule */2097 for (i = 0; i < state->limit_by_name.nr; i++) {2098 struct string_list_item *it = &state->limit_by_name.items[i];2099 if (!wildmatch(it->string, pathname, 0))2100 return (it->util != NULL);2101 }21022103 /*2104 * If we had any include, a path that does not match any rule is2105 * not used. Otherwise, we saw bunch of exclude rules (or none)2106 * and such a path is used.2107 */2108 return !state->has_include;2109}21102111/*2112 * Read the patch text in "buffer" that extends for "size" bytes; stop2113 * reading after seeing a single patch (i.e. changes to a single file).2114 * Create fragments (i.e. patch hunks) and hang them to the given patch.2115 *2116 * Returns:2117 * -1 if no header was found or parse_binary() failed,2118 * -128 on another error,2119 * the number of bytes consumed otherwise,2120 * so that the caller can call us again for the next patch.2121 */2122static int parse_chunk(struct apply_state *state, char *buffer, unsigned long size, struct patch *patch)2123{2124 int hdrsize, patchsize;2125 int offset = find_header(state, buffer, size, &hdrsize, patch);21262127 if (offset < 0)2128 return offset;21292130 prefix_patch(state, patch);21312132 if (!use_patch(state, patch))2133 patch->ws_rule = 0;2134 else2135 patch->ws_rule = whitespace_rule(patch->new_name2136 ? patch->new_name2137 : patch->old_name);21382139 patchsize = parse_single_patch(state,2140 buffer + offset + hdrsize,2141 size - offset - hdrsize,2142 patch);21432144 if (patchsize < 0)2145 return -128;21462147 if (!patchsize) {2148 static const char git_binary[] = "GIT binary patch\n";2149 int hd = hdrsize + offset;2150 unsigned long llen = linelen(buffer + hd, size - hd);21512152 if (llen == sizeof(git_binary) - 1 &&2153 !memcmp(git_binary, buffer + hd, llen)) {2154 int used;2155 state->linenr++;2156 used = parse_binary(state, buffer + hd + llen,2157 size - hd - llen, patch);2158 if (used < 0)2159 return -1;2160 if (used)2161 patchsize = used + llen;2162 else2163 patchsize = 0;2164 }2165 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {2166 static const char *binhdr[] = {2167 "Binary files ",2168 "Files ",2169 NULL,2170 };2171 int i;2172 for (i = 0; binhdr[i]; i++) {2173 int len = strlen(binhdr[i]);2174 if (len < size - hd &&2175 !memcmp(binhdr[i], buffer + hd, len)) {2176 state->linenr++;2177 patch->is_binary = 1;2178 patchsize = llen;2179 break;2180 }2181 }2182 }21832184 /* Empty patch cannot be applied if it is a text patch2185 * without metadata change. A binary patch appears2186 * empty to us here.2187 */2188 if ((state->apply || state->check) &&2189 (!patch->is_binary && !metadata_changes(patch))) {2190 error(_("patch with only garbage at line %d"), state->linenr);2191 return -128;2192 }2193 }21942195 return offset + hdrsize + patchsize;2196}21972198static void reverse_patches(struct patch *p)2199{2200 for (; p; p = p->next) {2201 struct fragment *frag = p->fragments;22022203 SWAP(p->new_name, p->old_name);2204 SWAP(p->new_mode, p->old_mode);2205 SWAP(p->is_new, p->is_delete);2206 SWAP(p->lines_added, p->lines_deleted);2207 SWAP(p->old_sha1_prefix, p->new_sha1_prefix);22082209 for (; frag; frag = frag->next) {2210 SWAP(frag->newpos, frag->oldpos);2211 SWAP(frag->newlines, frag->oldlines);2212 }2213 }2214}22152216static const char pluses[] =2217"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2218static const char minuses[]=2219"----------------------------------------------------------------------";22202221static void show_stats(struct apply_state *state, struct patch *patch)2222{2223 struct strbuf qname = STRBUF_INIT;2224 char *cp = patch->new_name ? patch->new_name : patch->old_name;2225 int max, add, del;22262227 quote_c_style(cp, &qname, NULL, 0);22282229 /*2230 * "scale" the filename2231 */2232 max = state->max_len;2233 if (max > 50)2234 max = 50;22352236 if (qname.len > max) {2237 cp = strchr(qname.buf + qname.len + 3 - max, '/');2238 if (!cp)2239 cp = qname.buf + qname.len + 3 - max;2240 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);2241 }22422243 if (patch->is_binary) {2244 printf(" %-*s | Bin\n", max, qname.buf);2245 strbuf_release(&qname);2246 return;2247 }22482249 printf(" %-*s |", max, qname.buf);2250 strbuf_release(&qname);22512252 /*2253 * scale the add/delete2254 */2255 max = max + state->max_change > 70 ? 70 - max : state->max_change;2256 add = patch->lines_added;2257 del = patch->lines_deleted;22582259 if (state->max_change > 0) {2260 int total = ((add + del) * max + state->max_change / 2) / state->max_change;2261 add = (add * max + state->max_change / 2) / state->max_change;2262 del = total - add;2263 }2264 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2265 add, pluses, del, minuses);2266}22672268static int read_old_data(struct stat *st, struct patch *patch,2269 const char *path, struct strbuf *buf)2270{2271 int conv_flags = patch->crlf_in_old ?2272 CONV_EOL_KEEP_CRLF : CONV_EOL_RENORMALIZE;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 /*2282 * "git apply" without "--index/--cached" should never look2283 * at the index; the target file may not have been added to2284 * the index yet, and we may not even be in any Git repository.2285 * Pass NULL to convert_to_git() to stress this; the function2286 * should never look at the index when explicit crlf option2287 * is given.2288 */2289 convert_to_git(NULL, path, buf->buf, buf->len, buf, conv_flags);2290 return 0;2291 default:2292 return -1;2293 }2294}22952296/*2297 * Update the preimage, and the common lines in postimage,2298 * from buffer buf of length len. If postlen is 0 the postimage2299 * is updated in place, otherwise it's updated on a new buffer2300 * of length postlen2301 */23022303static void update_pre_post_images(struct image *preimage,2304 struct image *postimage,2305 char *buf,2306 size_t len, size_t postlen)2307{2308 int i, ctx, reduced;2309 char *new_buf, *old_buf, *fixed;2310 struct image fixed_preimage;23112312 /*2313 * Update the preimage with whitespace fixes. Note that we2314 * are not losing preimage->buf -- apply_one_fragment() will2315 * free "oldlines".2316 */2317 prepare_image(&fixed_preimage, buf, len, 1);2318 assert(postlen2319 ? fixed_preimage.nr == preimage->nr2320 : fixed_preimage.nr <= preimage->nr);2321 for (i = 0; i < fixed_preimage.nr; i++)2322 fixed_preimage.line[i].flag = preimage->line[i].flag;2323 free(preimage->line_allocated);2324 *preimage = fixed_preimage;23252326 /*2327 * Adjust the common context lines in postimage. This can be2328 * done in-place when we are shrinking it with whitespace2329 * fixing, but needs a new buffer when ignoring whitespace or2330 * expanding leading tabs to spaces.2331 *2332 * We trust the caller to tell us if the update can be done2333 * in place (postlen==0) or not.2334 */2335 old_buf = postimage->buf;2336 if (postlen)2337 new_buf = postimage->buf = xmalloc(postlen);2338 else2339 new_buf = old_buf;2340 fixed = preimage->buf;23412342 for (i = reduced = ctx = 0; i < postimage->nr; i++) {2343 size_t l_len = postimage->line[i].len;2344 if (!(postimage->line[i].flag & LINE_COMMON)) {2345 /* an added line -- no counterparts in preimage */2346 memmove(new_buf, old_buf, l_len);2347 old_buf += l_len;2348 new_buf += l_len;2349 continue;2350 }23512352 /* a common context -- skip it in the original postimage */2353 old_buf += l_len;23542355 /* and find the corresponding one in the fixed preimage */2356 while (ctx < preimage->nr &&2357 !(preimage->line[ctx].flag & LINE_COMMON)) {2358 fixed += preimage->line[ctx].len;2359 ctx++;2360 }23612362 /*2363 * preimage is expected to run out, if the caller2364 * fixed addition of trailing blank lines.2365 */2366 if (preimage->nr <= ctx) {2367 reduced++;2368 continue;2369 }23702371 /* and copy it in, while fixing the line length */2372 l_len = preimage->line[ctx].len;2373 memcpy(new_buf, fixed, l_len);2374 new_buf += l_len;2375 fixed += l_len;2376 postimage->line[i].len = l_len;2377 ctx++;2378 }23792380 if (postlen2381 ? postlen < new_buf - postimage->buf2382 : postimage->len < new_buf - postimage->buf)2383 BUG("caller miscounted postlen: asked %d, orig = %d, used = %d",2384 (int)postlen, (int) postimage->len, (int)(new_buf - postimage->buf));23852386 /* Fix the length of the whole thing */2387 postimage->len = new_buf - postimage->buf;2388 postimage->nr -= reduced;2389}23902391static int line_by_line_fuzzy_match(struct image *img,2392 struct image *preimage,2393 struct image *postimage,2394 unsigned long current,2395 int current_lno,2396 int preimage_limit)2397{2398 int i;2399 size_t imgoff = 0;2400 size_t preoff = 0;2401 size_t postlen = postimage->len;2402 size_t extra_chars;2403 char *buf;2404 char *preimage_eof;2405 char *preimage_end;2406 struct strbuf fixed;2407 char *fixed_buf;2408 size_t fixed_len;24092410 for (i = 0; i < preimage_limit; i++) {2411 size_t prelen = preimage->line[i].len;2412 size_t imglen = img->line[current_lno+i].len;24132414 if (!fuzzy_matchlines(img->buf + current + imgoff, imglen,2415 preimage->buf + preoff, prelen))2416 return 0;2417 if (preimage->line[i].flag & LINE_COMMON)2418 postlen += imglen - prelen;2419 imgoff += imglen;2420 preoff += prelen;2421 }24222423 /*2424 * Ok, the preimage matches with whitespace fuzz.2425 *2426 * imgoff now holds the true length of the target that2427 * matches the preimage before the end of the file.2428 *2429 * Count the number of characters in the preimage that fall2430 * beyond the end of the file and make sure that all of them2431 * are whitespace characters. (This can only happen if2432 * we are removing blank lines at the end of the file.)2433 */2434 buf = preimage_eof = preimage->buf + preoff;2435 for ( ; i < preimage->nr; i++)2436 preoff += preimage->line[i].len;2437 preimage_end = preimage->buf + preoff;2438 for ( ; buf < preimage_end; buf++)2439 if (!isspace(*buf))2440 return 0;24412442 /*2443 * Update the preimage and the common postimage context2444 * lines to use the same whitespace as the target.2445 * If whitespace is missing in the target (i.e.2446 * if the preimage extends beyond the end of the file),2447 * use the whitespace from the preimage.2448 */2449 extra_chars = preimage_end - preimage_eof;2450 strbuf_init(&fixed, imgoff + extra_chars);2451 strbuf_add(&fixed, img->buf + current, imgoff);2452 strbuf_add(&fixed, preimage_eof, extra_chars);2453 fixed_buf = strbuf_detach(&fixed, &fixed_len);2454 update_pre_post_images(preimage, postimage,2455 fixed_buf, fixed_len, postlen);2456 return 1;2457}24582459static int match_fragment(struct apply_state *state,2460 struct image *img,2461 struct image *preimage,2462 struct image *postimage,2463 unsigned long current,2464 int current_lno,2465 unsigned ws_rule,2466 int match_beginning, int match_end)2467{2468 int i;2469 char *fixed_buf, *buf, *orig, *target;2470 struct strbuf fixed;2471 size_t fixed_len, postlen;2472 int preimage_limit;24732474 if (preimage->nr + current_lno <= img->nr) {2475 /*2476 * The hunk falls within the boundaries of img.2477 */2478 preimage_limit = preimage->nr;2479 if (match_end && (preimage->nr + current_lno != img->nr))2480 return 0;2481 } else if (state->ws_error_action == correct_ws_error &&2482 (ws_rule & WS_BLANK_AT_EOF)) {2483 /*2484 * This hunk extends beyond the end of img, and we are2485 * removing blank lines at the end of the file. This2486 * many lines from the beginning of the preimage must2487 * match with img, and the remainder of the preimage2488 * must be blank.2489 */2490 preimage_limit = img->nr - current_lno;2491 } else {2492 /*2493 * The hunk extends beyond the end of the img and2494 * we are not removing blanks at the end, so we2495 * should reject the hunk at this position.2496 */2497 return 0;2498 }24992500 if (match_beginning && current_lno)2501 return 0;25022503 /* Quick hash check */2504 for (i = 0; i < preimage_limit; i++)2505 if ((img->line[current_lno + i].flag & LINE_PATCHED) ||2506 (preimage->line[i].hash != img->line[current_lno + i].hash))2507 return 0;25082509 if (preimage_limit == preimage->nr) {2510 /*2511 * Do we have an exact match? If we were told to match2512 * at the end, size must be exactly at current+fragsize,2513 * otherwise current+fragsize must be still within the preimage,2514 * and either case, the old piece should match the preimage2515 * exactly.2516 */2517 if ((match_end2518 ? (current + preimage->len == img->len)2519 : (current + preimage->len <= img->len)) &&2520 !memcmp(img->buf + current, preimage->buf, preimage->len))2521 return 1;2522 } else {2523 /*2524 * The preimage extends beyond the end of img, so2525 * there cannot be an exact match.2526 *2527 * There must be one non-blank context line that match2528 * a line before the end of img.2529 */2530 char *buf_end;25312532 buf = preimage->buf;2533 buf_end = buf;2534 for (i = 0; i < preimage_limit; i++)2535 buf_end += preimage->line[i].len;25362537 for ( ; buf < buf_end; buf++)2538 if (!isspace(*buf))2539 break;2540 if (buf == buf_end)2541 return 0;2542 }25432544 /*2545 * No exact match. If we are ignoring whitespace, run a line-by-line2546 * fuzzy matching. We collect all the line length information because2547 * we need it to adjust whitespace if we match.2548 */2549 if (state->ws_ignore_action == ignore_ws_change)2550 return line_by_line_fuzzy_match(img, preimage, postimage,2551 current, current_lno, preimage_limit);25522553 if (state->ws_error_action != correct_ws_error)2554 return 0;25552556 /*2557 * The hunk does not apply byte-by-byte, but the hash says2558 * it might with whitespace fuzz. We weren't asked to2559 * ignore whitespace, we were asked to correct whitespace2560 * errors, so let's try matching after whitespace correction.2561 *2562 * While checking the preimage against the target, whitespace2563 * errors in both fixed, we count how large the corresponding2564 * postimage needs to be. The postimage prepared by2565 * apply_one_fragment() has whitespace errors fixed on added2566 * lines already, but the common lines were propagated as-is,2567 * which may become longer when their whitespace errors are2568 * fixed.2569 */25702571 /* First count added lines in postimage */2572 postlen = 0;2573 for (i = 0; i < postimage->nr; i++) {2574 if (!(postimage->line[i].flag & LINE_COMMON))2575 postlen += postimage->line[i].len;2576 }25772578 /*2579 * The preimage may extend beyond the end of the file,2580 * but in this loop we will only handle the part of the2581 * preimage that falls within the file.2582 */2583 strbuf_init(&fixed, preimage->len + 1);2584 orig = preimage->buf;2585 target = img->buf + current;2586 for (i = 0; i < preimage_limit; i++) {2587 size_t oldlen = preimage->line[i].len;2588 size_t tgtlen = img->line[current_lno + i].len;2589 size_t fixstart = fixed.len;2590 struct strbuf tgtfix;2591 int match;25922593 /* Try fixing the line in the preimage */2594 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);25952596 /* Try fixing the line in the target */2597 strbuf_init(&tgtfix, tgtlen);2598 ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);25992600 /*2601 * If they match, either the preimage was based on2602 * a version before our tree fixed whitespace breakage,2603 * or we are lacking a whitespace-fix patch the tree2604 * the preimage was based on already had (i.e. target2605 * has whitespace breakage, the preimage doesn't).2606 * In either case, we are fixing the whitespace breakages2607 * so we might as well take the fix together with their2608 * real change.2609 */2610 match = (tgtfix.len == fixed.len - fixstart &&2611 !memcmp(tgtfix.buf, fixed.buf + fixstart,2612 fixed.len - fixstart));26132614 /* Add the length if this is common with the postimage */2615 if (preimage->line[i].flag & LINE_COMMON)2616 postlen += tgtfix.len;26172618 strbuf_release(&tgtfix);2619 if (!match)2620 goto unmatch_exit;26212622 orig += oldlen;2623 target += tgtlen;2624 }262526262627 /*2628 * Now handle the lines in the preimage that falls beyond the2629 * end of the file (if any). They will only match if they are2630 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2631 * false).2632 */2633 for ( ; i < preimage->nr; i++) {2634 size_t fixstart = fixed.len; /* start of the fixed preimage */2635 size_t oldlen = preimage->line[i].len;2636 int j;26372638 /* Try fixing the line in the preimage */2639 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);26402641 for (j = fixstart; j < fixed.len; j++)2642 if (!isspace(fixed.buf[j]))2643 goto unmatch_exit;26442645 orig += oldlen;2646 }26472648 /*2649 * Yes, the preimage is based on an older version that still2650 * has whitespace breakages unfixed, and fixing them makes the2651 * hunk match. Update the context lines in the postimage.2652 */2653 fixed_buf = strbuf_detach(&fixed, &fixed_len);2654 if (postlen < postimage->len)2655 postlen = 0;2656 update_pre_post_images(preimage, postimage,2657 fixed_buf, fixed_len, postlen);2658 return 1;26592660 unmatch_exit:2661 strbuf_release(&fixed);2662 return 0;2663}26642665static int find_pos(struct apply_state *state,2666 struct image *img,2667 struct image *preimage,2668 struct image *postimage,2669 int line,2670 unsigned ws_rule,2671 int match_beginning, int match_end)2672{2673 int i;2674 unsigned long backwards, forwards, current;2675 int backwards_lno, forwards_lno, current_lno;26762677 /*2678 * If match_beginning or match_end is specified, there is no2679 * point starting from a wrong line that will never match and2680 * wander around and wait for a match at the specified end.2681 */2682 if (match_beginning)2683 line = 0;2684 else if (match_end)2685 line = img->nr - preimage->nr;26862687 /*2688 * Because the comparison is unsigned, the following test2689 * will also take care of a negative line number that can2690 * result when match_end and preimage is larger than the target.2691 */2692 if ((size_t) line > img->nr)2693 line = img->nr;26942695 current = 0;2696 for (i = 0; i < line; i++)2697 current += img->line[i].len;26982699 /*2700 * There's probably some smart way to do this, but I'll leave2701 * that to the smart and beautiful people. I'm simple and stupid.2702 */2703 backwards = current;2704 backwards_lno = line;2705 forwards = current;2706 forwards_lno = line;2707 current_lno = line;27082709 for (i = 0; ; i++) {2710 if (match_fragment(state, img, preimage, postimage,2711 current, current_lno, ws_rule,2712 match_beginning, match_end))2713 return current_lno;27142715 again:2716 if (backwards_lno == 0 && forwards_lno == img->nr)2717 break;27182719 if (i & 1) {2720 if (backwards_lno == 0) {2721 i++;2722 goto again;2723 }2724 backwards_lno--;2725 backwards -= img->line[backwards_lno].len;2726 current = backwards;2727 current_lno = backwards_lno;2728 } else {2729 if (forwards_lno == img->nr) {2730 i++;2731 goto again;2732 }2733 forwards += img->line[forwards_lno].len;2734 forwards_lno++;2735 current = forwards;2736 current_lno = forwards_lno;2737 }27382739 }2740 return -1;2741}27422743static void remove_first_line(struct image *img)2744{2745 img->buf += img->line[0].len;2746 img->len -= img->line[0].len;2747 img->line++;2748 img->nr--;2749}27502751static void remove_last_line(struct image *img)2752{2753 img->len -= img->line[--img->nr].len;2754}27552756/*2757 * The change from "preimage" and "postimage" has been found to2758 * apply at applied_pos (counts in line numbers) in "img".2759 * Update "img" to remove "preimage" and replace it with "postimage".2760 */2761static void update_image(struct apply_state *state,2762 struct image *img,2763 int applied_pos,2764 struct image *preimage,2765 struct image *postimage)2766{2767 /*2768 * remove the copy of preimage at offset in img2769 * and replace it with postimage2770 */2771 int i, nr;2772 size_t remove_count, insert_count, applied_at = 0;2773 char *result;2774 int preimage_limit;27752776 /*2777 * If we are removing blank lines at the end of img,2778 * the preimage may extend beyond the end.2779 * If that is the case, we must be careful only to2780 * remove the part of the preimage that falls within2781 * the boundaries of img. Initialize preimage_limit2782 * to the number of lines in the preimage that falls2783 * within the boundaries.2784 */2785 preimage_limit = preimage->nr;2786 if (preimage_limit > img->nr - applied_pos)2787 preimage_limit = img->nr - applied_pos;27882789 for (i = 0; i < applied_pos; i++)2790 applied_at += img->line[i].len;27912792 remove_count = 0;2793 for (i = 0; i < preimage_limit; i++)2794 remove_count += img->line[applied_pos + i].len;2795 insert_count = postimage->len;27962797 /* Adjust the contents */2798 result = xmalloc(st_add3(st_sub(img->len, remove_count), insert_count, 1));2799 memcpy(result, img->buf, applied_at);2800 memcpy(result + applied_at, postimage->buf, postimage->len);2801 memcpy(result + applied_at + postimage->len,2802 img->buf + (applied_at + remove_count),2803 img->len - (applied_at + remove_count));2804 free(img->buf);2805 img->buf = result;2806 img->len += insert_count - remove_count;2807 result[img->len] = '\0';28082809 /* Adjust the line table */2810 nr = img->nr + postimage->nr - preimage_limit;2811 if (preimage_limit < postimage->nr) {2812 /*2813 * NOTE: this knows that we never call remove_first_line()2814 * on anything other than pre/post image.2815 */2816 REALLOC_ARRAY(img->line, nr);2817 img->line_allocated = img->line;2818 }2819 if (preimage_limit != postimage->nr)2820 MOVE_ARRAY(img->line + applied_pos + postimage->nr,2821 img->line + applied_pos + preimage_limit,2822 img->nr - (applied_pos + preimage_limit));2823 COPY_ARRAY(img->line + applied_pos, postimage->line, postimage->nr);2824 if (!state->allow_overlap)2825 for (i = 0; i < postimage->nr; i++)2826 img->line[applied_pos + i].flag |= LINE_PATCHED;2827 img->nr = nr;2828}28292830/*2831 * Use the patch-hunk text in "frag" to prepare two images (preimage and2832 * postimage) for the hunk. Find lines that match "preimage" in "img" and2833 * replace the part of "img" with "postimage" text.2834 */2835static int apply_one_fragment(struct apply_state *state,2836 struct image *img, struct fragment *frag,2837 int inaccurate_eof, unsigned ws_rule,2838 int nth_fragment)2839{2840 int match_beginning, match_end;2841 const char *patch = frag->patch;2842 int size = frag->size;2843 char *old, *oldlines;2844 struct strbuf newlines;2845 int new_blank_lines_at_end = 0;2846 int found_new_blank_lines_at_end = 0;2847 int hunk_linenr = frag->linenr;2848 unsigned long leading, trailing;2849 int pos, applied_pos;2850 struct image preimage;2851 struct image postimage;28522853 memset(&preimage, 0, sizeof(preimage));2854 memset(&postimage, 0, sizeof(postimage));2855 oldlines = xmalloc(size);2856 strbuf_init(&newlines, size);28572858 old = oldlines;2859 while (size > 0) {2860 char first;2861 int len = linelen(patch, size);2862 int plen;2863 int added_blank_line = 0;2864 int is_blank_context = 0;2865 size_t start;28662867 if (!len)2868 break;28692870 /*2871 * "plen" is how much of the line we should use for2872 * the actual patch data. Normally we just remove the2873 * first character on the line, but if the line is2874 * followed by "\ No newline", then we also remove the2875 * last one (which is the newline, of course).2876 */2877 plen = len - 1;2878 if (len < size && patch[len] == '\\')2879 plen--;2880 first = *patch;2881 if (state->apply_in_reverse) {2882 if (first == '-')2883 first = '+';2884 else if (first == '+')2885 first = '-';2886 }28872888 switch (first) {2889 case '\n':2890 /* Newer GNU diff, empty context line */2891 if (plen < 0)2892 /* ... followed by '\No newline'; nothing */2893 break;2894 *old++ = '\n';2895 strbuf_addch(&newlines, '\n');2896 add_line_info(&preimage, "\n", 1, LINE_COMMON);2897 add_line_info(&postimage, "\n", 1, LINE_COMMON);2898 is_blank_context = 1;2899 break;2900 case ' ':2901 if (plen && (ws_rule & WS_BLANK_AT_EOF) &&2902 ws_blank_line(patch + 1, plen, ws_rule))2903 is_blank_context = 1;2904 /* fallthrough */2905 case '-':2906 memcpy(old, patch + 1, plen);2907 add_line_info(&preimage, old, plen,2908 (first == ' ' ? LINE_COMMON : 0));2909 old += plen;2910 if (first == '-')2911 break;2912 /* fallthrough */2913 case '+':2914 /* --no-add does not add new lines */2915 if (first == '+' && state->no_add)2916 break;29172918 start = newlines.len;2919 if (first != '+' ||2920 !state->whitespace_error ||2921 state->ws_error_action != correct_ws_error) {2922 strbuf_add(&newlines, patch + 1, plen);2923 }2924 else {2925 ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &state->applied_after_fixing_ws);2926 }2927 add_line_info(&postimage, newlines.buf + start, newlines.len - start,2928 (first == '+' ? 0 : LINE_COMMON));2929 if (first == '+' &&2930 (ws_rule & WS_BLANK_AT_EOF) &&2931 ws_blank_line(patch + 1, plen, ws_rule))2932 added_blank_line = 1;2933 break;2934 case '@': case '\\':2935 /* Ignore it, we already handled it */2936 break;2937 default:2938 if (state->apply_verbosity > verbosity_normal)2939 error(_("invalid start of line: '%c'"), first);2940 applied_pos = -1;2941 goto out;2942 }2943 if (added_blank_line) {2944 if (!new_blank_lines_at_end)2945 found_new_blank_lines_at_end = hunk_linenr;2946 new_blank_lines_at_end++;2947 }2948 else if (is_blank_context)2949 ;2950 else2951 new_blank_lines_at_end = 0;2952 patch += len;2953 size -= len;2954 hunk_linenr++;2955 }2956 if (inaccurate_eof &&2957 old > oldlines && old[-1] == '\n' &&2958 newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {2959 old--;2960 strbuf_setlen(&newlines, newlines.len - 1);2961 preimage.line_allocated[preimage.nr - 1].len--;2962 postimage.line_allocated[postimage.nr - 1].len--;2963 }29642965 leading = frag->leading;2966 trailing = frag->trailing;29672968 /*2969 * A hunk to change lines at the beginning would begin with2970 * @@ -1,L +N,M @@2971 * but we need to be careful. -U0 that inserts before the second2972 * line also has this pattern.2973 *2974 * And a hunk to add to an empty file would begin with2975 * @@ -0,0 +N,M @@2976 *2977 * In other words, a hunk that is (frag->oldpos <= 1) with or2978 * without leading context must match at the beginning.2979 */2980 match_beginning = (!frag->oldpos ||2981 (frag->oldpos == 1 && !state->unidiff_zero));29822983 /*2984 * A hunk without trailing lines must match at the end.2985 * However, we simply cannot tell if a hunk must match end2986 * from the lack of trailing lines if the patch was generated2987 * with unidiff without any context.2988 */2989 match_end = !state->unidiff_zero && !trailing;29902991 pos = frag->newpos ? (frag->newpos - 1) : 0;2992 preimage.buf = oldlines;2993 preimage.len = old - oldlines;2994 postimage.buf = newlines.buf;2995 postimage.len = newlines.len;2996 preimage.line = preimage.line_allocated;2997 postimage.line = postimage.line_allocated;29982999 for (;;) {30003001 applied_pos = find_pos(state, img, &preimage, &postimage, pos,3002 ws_rule, match_beginning, match_end);30033004 if (applied_pos >= 0)3005 break;30063007 /* Am I at my context limits? */3008 if ((leading <= state->p_context) && (trailing <= state->p_context))3009 break;3010 if (match_beginning || match_end) {3011 match_beginning = match_end = 0;3012 continue;3013 }30143015 /*3016 * Reduce the number of context lines; reduce both3017 * leading and trailing if they are equal otherwise3018 * just reduce the larger context.3019 */3020 if (leading >= trailing) {3021 remove_first_line(&preimage);3022 remove_first_line(&postimage);3023 pos--;3024 leading--;3025 }3026 if (trailing > leading) {3027 remove_last_line(&preimage);3028 remove_last_line(&postimage);3029 trailing--;3030 }3031 }30323033 if (applied_pos >= 0) {3034 if (new_blank_lines_at_end &&3035 preimage.nr + applied_pos >= img->nr &&3036 (ws_rule & WS_BLANK_AT_EOF) &&3037 state->ws_error_action != nowarn_ws_error) {3038 record_ws_error(state, WS_BLANK_AT_EOF, "+", 1,3039 found_new_blank_lines_at_end);3040 if (state->ws_error_action == correct_ws_error) {3041 while (new_blank_lines_at_end--)3042 remove_last_line(&postimage);3043 }3044 /*3045 * We would want to prevent write_out_results()3046 * from taking place in apply_patch() that follows3047 * the callchain led us here, which is:3048 * apply_patch->check_patch_list->check_patch->3049 * apply_data->apply_fragments->apply_one_fragment3050 */3051 if (state->ws_error_action == die_on_ws_error)3052 state->apply = 0;3053 }30543055 if (state->apply_verbosity > verbosity_normal && applied_pos != pos) {3056 int offset = applied_pos - pos;3057 if (state->apply_in_reverse)3058 offset = 0 - offset;3059 fprintf_ln(stderr,3060 Q_("Hunk #%d succeeded at %d (offset %d line).",3061 "Hunk #%d succeeded at %d (offset %d lines).",3062 offset),3063 nth_fragment, applied_pos + 1, offset);3064 }30653066 /*3067 * Warn if it was necessary to reduce the number3068 * of context lines.3069 */3070 if ((leading != frag->leading ||3071 trailing != frag->trailing) && state->apply_verbosity > verbosity_silent)3072 fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"3073 " to apply fragment at %d"),3074 leading, trailing, applied_pos+1);3075 update_image(state, img, applied_pos, &preimage, &postimage);3076 } else {3077 if (state->apply_verbosity > verbosity_normal)3078 error(_("while searching for:\n%.*s"),3079 (int)(old - oldlines), oldlines);3080 }30813082out:3083 free(oldlines);3084 strbuf_release(&newlines);3085 free(preimage.line_allocated);3086 free(postimage.line_allocated);30873088 return (applied_pos < 0);3089}30903091static int apply_binary_fragment(struct apply_state *state,3092 struct image *img,3093 struct patch *patch)3094{3095 struct fragment *fragment = patch->fragments;3096 unsigned long len;3097 void *dst;30983099 if (!fragment)3100 return error(_("missing binary patch data for '%s'"),3101 patch->new_name ?3102 patch->new_name :3103 patch->old_name);31043105 /* Binary patch is irreversible without the optional second hunk */3106 if (state->apply_in_reverse) {3107 if (!fragment->next)3108 return error(_("cannot reverse-apply a binary patch "3109 "without the reverse hunk to '%s'"),3110 patch->new_name3111 ? patch->new_name : patch->old_name);3112 fragment = fragment->next;3113 }3114 switch (fragment->binary_patch_method) {3115 case BINARY_DELTA_DEFLATED:3116 dst = patch_delta(img->buf, img->len, fragment->patch,3117 fragment->size, &len);3118 if (!dst)3119 return -1;3120 clear_image(img);3121 img->buf = dst;3122 img->len = len;3123 return 0;3124 case BINARY_LITERAL_DEFLATED:3125 clear_image(img);3126 img->len = fragment->size;3127 img->buf = xmemdupz(fragment->patch, img->len);3128 return 0;3129 }3130 return -1;3131}31323133/*3134 * Replace "img" with the result of applying the binary patch.3135 * The binary patch data itself in patch->fragment is still kept3136 * but the preimage prepared by the caller in "img" is freed here3137 * or in the helper function apply_binary_fragment() this calls.3138 */3139static int apply_binary(struct apply_state *state,3140 struct image *img,3141 struct patch *patch)3142{3143 const char *name = patch->old_name ? patch->old_name : patch->new_name;3144 struct object_id oid;31453146 /*3147 * For safety, we require patch index line to contain3148 * full 40-byte textual SHA1 for old and new, at least for now.3149 */3150 if (strlen(patch->old_sha1_prefix) != 40 ||3151 strlen(patch->new_sha1_prefix) != 40 ||3152 get_oid_hex(patch->old_sha1_prefix, &oid) ||3153 get_oid_hex(patch->new_sha1_prefix, &oid))3154 return error(_("cannot apply binary patch to '%s' "3155 "without full index line"), name);31563157 if (patch->old_name) {3158 /*3159 * See if the old one matches what the patch3160 * applies to.3161 */3162 hash_object_file(img->buf, img->len, blob_type, &oid);3163 if (strcmp(oid_to_hex(&oid), patch->old_sha1_prefix))3164 return error(_("the patch applies to '%s' (%s), "3165 "which does not match the "3166 "current contents."),3167 name, oid_to_hex(&oid));3168 }3169 else {3170 /* Otherwise, the old one must be empty. */3171 if (img->len)3172 return error(_("the patch applies to an empty "3173 "'%s' but it is not empty"), name);3174 }31753176 get_oid_hex(patch->new_sha1_prefix, &oid);3177 if (is_null_oid(&oid)) {3178 clear_image(img);3179 return 0; /* deletion patch */3180 }31813182 if (has_sha1_file(oid.hash)) {3183 /* We already have the postimage */3184 enum object_type type;3185 unsigned long size;3186 char *result;31873188 result = read_object_file(&oid, &type, &size);3189 if (!result)3190 return error(_("the necessary postimage %s for "3191 "'%s' cannot be read"),3192 patch->new_sha1_prefix, name);3193 clear_image(img);3194 img->buf = result;3195 img->len = size;3196 } else {3197 /*3198 * We have verified buf matches the preimage;3199 * apply the patch data to it, which is stored3200 * in the patch->fragments->{patch,size}.3201 */3202 if (apply_binary_fragment(state, img, patch))3203 return error(_("binary patch does not apply to '%s'"),3204 name);32053206 /* verify that the result matches */3207 hash_object_file(img->buf, img->len, blob_type, &oid);3208 if (strcmp(oid_to_hex(&oid), patch->new_sha1_prefix))3209 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),3210 name, patch->new_sha1_prefix, oid_to_hex(&oid));3211 }32123213 return 0;3214}32153216static int apply_fragments(struct apply_state *state, struct image *img, struct patch *patch)3217{3218 struct fragment *frag = patch->fragments;3219 const char *name = patch->old_name ? patch->old_name : patch->new_name;3220 unsigned ws_rule = patch->ws_rule;3221 unsigned inaccurate_eof = patch->inaccurate_eof;3222 int nth = 0;32233224 if (patch->is_binary)3225 return apply_binary(state, img, patch);32263227 while (frag) {3228 nth++;3229 if (apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) {3230 error(_("patch failed: %s:%ld"), name, frag->oldpos);3231 if (!state->apply_with_reject)3232 return -1;3233 frag->rejected = 1;3234 }3235 frag = frag->next;3236 }3237 return 0;3238}32393240static int read_blob_object(struct strbuf *buf, const struct object_id *oid, unsigned mode)3241{3242 if (S_ISGITLINK(mode)) {3243 strbuf_grow(buf, 100);3244 strbuf_addf(buf, "Subproject commit %s\n", oid_to_hex(oid));3245 } else {3246 enum object_type type;3247 unsigned long sz;3248 char *result;32493250 result = read_object_file(oid, &type, &sz);3251 if (!result)3252 return -1;3253 /* XXX read_sha1_file NUL-terminates */3254 strbuf_attach(buf, result, sz, sz + 1);3255 }3256 return 0;3257}32583259static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf)3260{3261 if (!ce)3262 return 0;3263 return read_blob_object(buf, &ce->oid, ce->ce_mode);3264}32653266static struct patch *in_fn_table(struct apply_state *state, const char *name)3267{3268 struct string_list_item *item;32693270 if (name == NULL)3271 return NULL;32723273 item = string_list_lookup(&state->fn_table, name);3274 if (item != NULL)3275 return (struct patch *)item->util;32763277 return NULL;3278}32793280/*3281 * item->util in the filename table records the status of the path.3282 * Usually it points at a patch (whose result records the contents3283 * of it after applying it), but it could be PATH_WAS_DELETED for a3284 * path that a previously applied patch has already removed, or3285 * PATH_TO_BE_DELETED for a path that a later patch would remove.3286 *3287 * The latter is needed to deal with a case where two paths A and B3288 * are swapped by first renaming A to B and then renaming B to A;3289 * moving A to B should not be prevented due to presence of B as we3290 * will remove it in a later patch.3291 */3292#define PATH_TO_BE_DELETED ((struct patch *) -2)3293#define PATH_WAS_DELETED ((struct patch *) -1)32943295static int to_be_deleted(struct patch *patch)3296{3297 return patch == PATH_TO_BE_DELETED;3298}32993300static int was_deleted(struct patch *patch)3301{3302 return patch == PATH_WAS_DELETED;3303}33043305static void add_to_fn_table(struct apply_state *state, struct patch *patch)3306{3307 struct string_list_item *item;33083309 /*3310 * Always add new_name unless patch is a deletion3311 * This should cover the cases for normal diffs,3312 * file creations and copies3313 */3314 if (patch->new_name != NULL) {3315 item = string_list_insert(&state->fn_table, patch->new_name);3316 item->util = patch;3317 }33183319 /*3320 * store a failure on rename/deletion cases because3321 * later chunks shouldn't patch old names3322 */3323 if ((patch->new_name == NULL) || (patch->is_rename)) {3324 item = string_list_insert(&state->fn_table, patch->old_name);3325 item->util = PATH_WAS_DELETED;3326 }3327}33283329static void prepare_fn_table(struct apply_state *state, struct patch *patch)3330{3331 /*3332 * store information about incoming file deletion3333 */3334 while (patch) {3335 if ((patch->new_name == NULL) || (patch->is_rename)) {3336 struct string_list_item *item;3337 item = string_list_insert(&state->fn_table, patch->old_name);3338 item->util = PATH_TO_BE_DELETED;3339 }3340 patch = patch->next;3341 }3342}33433344static int checkout_target(struct index_state *istate,3345 struct cache_entry *ce, struct stat *st)3346{3347 struct checkout costate = CHECKOUT_INIT;33483349 costate.refresh_cache = 1;3350 costate.istate = istate;3351 if (checkout_entry(ce, &costate, NULL) || lstat(ce->name, st))3352 return error(_("cannot checkout %s"), ce->name);3353 return 0;3354}33553356static struct patch *previous_patch(struct apply_state *state,3357 struct patch *patch,3358 int *gone)3359{3360 struct patch *previous;33613362 *gone = 0;3363 if (patch->is_copy || patch->is_rename)3364 return NULL; /* "git" patches do not depend on the order */33653366 previous = in_fn_table(state, patch->old_name);3367 if (!previous)3368 return NULL;33693370 if (to_be_deleted(previous))3371 return NULL; /* the deletion hasn't happened yet */33723373 if (was_deleted(previous))3374 *gone = 1;33753376 return previous;3377}33783379static int verify_index_match(struct apply_state *state,3380 const struct cache_entry *ce,3381 struct stat *st)3382{3383 if (S_ISGITLINK(ce->ce_mode)) {3384 if (!S_ISDIR(st->st_mode))3385 return -1;3386 return 0;3387 }3388 return ie_match_stat(state->repo->index, ce, st,3389 CE_MATCH_IGNORE_VALID | CE_MATCH_IGNORE_SKIP_WORKTREE);3390}33913392#define SUBMODULE_PATCH_WITHOUT_INDEX 133933394static int load_patch_target(struct apply_state *state,3395 struct strbuf *buf,3396 const struct cache_entry *ce,3397 struct stat *st,3398 struct patch *patch,3399 const char *name,3400 unsigned expected_mode)3401{3402 if (state->cached || state->check_index) {3403 if (read_file_or_gitlink(ce, buf))3404 return error(_("failed to read %s"), name);3405 } else if (name) {3406 if (S_ISGITLINK(expected_mode)) {3407 if (ce)3408 return read_file_or_gitlink(ce, buf);3409 else3410 return SUBMODULE_PATCH_WITHOUT_INDEX;3411 } else if (has_symlink_leading_path(name, strlen(name))) {3412 return error(_("reading from '%s' beyond a symbolic link"), name);3413 } else {3414 if (read_old_data(st, patch, name, buf))3415 return error(_("failed to read %s"), name);3416 }3417 }3418 return 0;3419}34203421/*3422 * We are about to apply "patch"; populate the "image" with the3423 * current version we have, from the working tree or from the index,3424 * depending on the situation e.g. --cached/--index. If we are3425 * applying a non-git patch that incrementally updates the tree,3426 * we read from the result of a previous diff.3427 */3428static int load_preimage(struct apply_state *state,3429 struct image *image,3430 struct patch *patch, struct stat *st,3431 const struct cache_entry *ce)3432{3433 struct strbuf buf = STRBUF_INIT;3434 size_t len;3435 char *img;3436 struct patch *previous;3437 int status;34383439 previous = previous_patch(state, patch, &status);3440 if (status)3441 return error(_("path %s has been renamed/deleted"),3442 patch->old_name);3443 if (previous) {3444 /* We have a patched copy in memory; use that. */3445 strbuf_add(&buf, previous->result, previous->resultsize);3446 } else {3447 status = load_patch_target(state, &buf, ce, st, patch,3448 patch->old_name, patch->old_mode);3449 if (status < 0)3450 return status;3451 else if (status == SUBMODULE_PATCH_WITHOUT_INDEX) {3452 /*3453 * There is no way to apply subproject3454 * patch without looking at the index.3455 * NEEDSWORK: shouldn't this be flagged3456 * as an error???3457 */3458 free_fragment_list(patch->fragments);3459 patch->fragments = NULL;3460 } else if (status) {3461 return error(_("failed to read %s"), patch->old_name);3462 }3463 }34643465 img = strbuf_detach(&buf, &len);3466 prepare_image(image, img, len, !patch->is_binary);3467 return 0;3468}34693470static int three_way_merge(struct image *image,3471 char *path,3472 const struct object_id *base,3473 const struct object_id *ours,3474 const struct object_id *theirs)3475{3476 mmfile_t base_file, our_file, their_file;3477 mmbuffer_t result = { NULL };3478 int status;34793480 read_mmblob(&base_file, base);3481 read_mmblob(&our_file, ours);3482 read_mmblob(&their_file, theirs);3483 status = ll_merge(&result, path,3484 &base_file, "base",3485 &our_file, "ours",3486 &their_file, "theirs", NULL);3487 free(base_file.ptr);3488 free(our_file.ptr);3489 free(their_file.ptr);3490 if (status < 0 || !result.ptr) {3491 free(result.ptr);3492 return -1;3493 }3494 clear_image(image);3495 image->buf = result.ptr;3496 image->len = result.size;34973498 return status;3499}35003501/*3502 * When directly falling back to add/add three-way merge, we read from3503 * the current contents of the new_name. In no cases other than that3504 * this function will be called.3505 */3506static int load_current(struct apply_state *state,3507 struct image *image,3508 struct patch *patch)3509{3510 struct strbuf buf = STRBUF_INIT;3511 int status, pos;3512 size_t len;3513 char *img;3514 struct stat st;3515 struct cache_entry *ce;3516 char *name = patch->new_name;3517 unsigned mode = patch->new_mode;35183519 if (!patch->is_new)3520 BUG("patch to %s is not a creation", patch->old_name);35213522 pos = index_name_pos(state->repo->index, name, strlen(name));3523 if (pos < 0)3524 return error(_("%s: does not exist in index"), name);3525 ce = state->repo->index->cache[pos];3526 if (lstat(name, &st)) {3527 if (errno != ENOENT)3528 return error_errno("%s", name);3529 if (checkout_target(state->repo->index, ce, &st))3530 return -1;3531 }3532 if (verify_index_match(state, ce, &st))3533 return error(_("%s: does not match index"), name);35343535 status = load_patch_target(state, &buf, ce, &st, patch, name, mode);3536 if (status < 0)3537 return status;3538 else if (status)3539 return -1;3540 img = strbuf_detach(&buf, &len);3541 prepare_image(image, img, len, !patch->is_binary);3542 return 0;3543}35443545static int try_threeway(struct apply_state *state,3546 struct image *image,3547 struct patch *patch,3548 struct stat *st,3549 const struct cache_entry *ce)3550{3551 struct object_id pre_oid, post_oid, our_oid;3552 struct strbuf buf = STRBUF_INIT;3553 size_t len;3554 int status;3555 char *img;3556 struct image tmp_image;35573558 /* No point falling back to 3-way merge in these cases */3559 if (patch->is_delete ||3560 S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))3561 return -1;35623563 /* Preimage the patch was prepared for */3564 if (patch->is_new)3565 write_object_file("", 0, blob_type, &pre_oid);3566 else if (get_oid(patch->old_sha1_prefix, &pre_oid) ||3567 read_blob_object(&buf, &pre_oid, patch->old_mode))3568 return error(_("repository lacks the necessary blob to fall back on 3-way merge."));35693570 if (state->apply_verbosity > verbosity_silent)3571 fprintf(stderr, _("Falling back to three-way merge...\n"));35723573 img = strbuf_detach(&buf, &len);3574 prepare_image(&tmp_image, img, len, 1);3575 /* Apply the patch to get the post image */3576 if (apply_fragments(state, &tmp_image, patch) < 0) {3577 clear_image(&tmp_image);3578 return -1;3579 }3580 /* post_oid is theirs */3581 write_object_file(tmp_image.buf, tmp_image.len, blob_type, &post_oid);3582 clear_image(&tmp_image);35833584 /* our_oid is ours */3585 if (patch->is_new) {3586 if (load_current(state, &tmp_image, patch))3587 return error(_("cannot read the current contents of '%s'"),3588 patch->new_name);3589 } else {3590 if (load_preimage(state, &tmp_image, patch, st, ce))3591 return error(_("cannot read the current contents of '%s'"),3592 patch->old_name);3593 }3594 write_object_file(tmp_image.buf, tmp_image.len, blob_type, &our_oid);3595 clear_image(&tmp_image);35963597 /* in-core three-way merge between post and our using pre as base */3598 status = three_way_merge(image, patch->new_name,3599 &pre_oid, &our_oid, &post_oid);3600 if (status < 0) {3601 if (state->apply_verbosity > verbosity_silent)3602 fprintf(stderr,3603 _("Failed to fall back on three-way merge...\n"));3604 return status;3605 }36063607 if (status) {3608 patch->conflicted_threeway = 1;3609 if (patch->is_new)3610 oidclr(&patch->threeway_stage[0]);3611 else3612 oidcpy(&patch->threeway_stage[0], &pre_oid);3613 oidcpy(&patch->threeway_stage[1], &our_oid);3614 oidcpy(&patch->threeway_stage[2], &post_oid);3615 if (state->apply_verbosity > verbosity_silent)3616 fprintf(stderr,3617 _("Applied patch to '%s' with conflicts.\n"),3618 patch->new_name);3619 } else {3620 if (state->apply_verbosity > verbosity_silent)3621 fprintf(stderr,3622 _("Applied patch to '%s' cleanly.\n"),3623 patch->new_name);3624 }3625 return 0;3626}36273628static int apply_data(struct apply_state *state, struct patch *patch,3629 struct stat *st, const struct cache_entry *ce)3630{3631 struct image image;36323633 if (load_preimage(state, &image, patch, st, ce) < 0)3634 return -1;36353636 if (patch->direct_to_threeway ||3637 apply_fragments(state, &image, patch) < 0) {3638 /* Note: with --reject, apply_fragments() returns 0 */3639 if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0)3640 return -1;3641 }3642 patch->result = image.buf;3643 patch->resultsize = image.len;3644 add_to_fn_table(state, patch);3645 free(image.line_allocated);36463647 if (0 < patch->is_delete && patch->resultsize)3648 return error(_("removal patch leaves file contents"));36493650 return 0;3651}36523653/*3654 * If "patch" that we are looking at modifies or deletes what we have,3655 * we would want it not to lose any local modification we have, either3656 * in the working tree or in the index.3657 *3658 * This also decides if a non-git patch is a creation patch or a3659 * modification to an existing empty file. We do not check the state3660 * of the current tree for a creation patch in this function; the caller3661 * check_patch() separately makes sure (and errors out otherwise) that3662 * the path the patch creates does not exist in the current tree.3663 */3664static int check_preimage(struct apply_state *state,3665 struct patch *patch,3666 struct cache_entry **ce,3667 struct stat *st)3668{3669 const char *old_name = patch->old_name;3670 struct patch *previous = NULL;3671 int stat_ret = 0, status;3672 unsigned st_mode = 0;36733674 if (!old_name)3675 return 0;36763677 assert(patch->is_new <= 0);3678 previous = previous_patch(state, patch, &status);36793680 if (status)3681 return error(_("path %s has been renamed/deleted"), old_name);3682 if (previous) {3683 st_mode = previous->new_mode;3684 } else if (!state->cached) {3685 stat_ret = lstat(old_name, st);3686 if (stat_ret && errno != ENOENT)3687 return error_errno("%s", old_name);3688 }36893690 if (state->check_index && !previous) {3691 int pos = index_name_pos(state->repo->index, old_name,3692 strlen(old_name));3693 if (pos < 0) {3694 if (patch->is_new < 0)3695 goto is_new;3696 return error(_("%s: does not exist in index"), old_name);3697 }3698 *ce = state->repo->index->cache[pos];3699 if (stat_ret < 0) {3700 if (checkout_target(state->repo->index, *ce, st))3701 return -1;3702 }3703 if (!state->cached && verify_index_match(state, *ce, st))3704 return error(_("%s: does not match index"), old_name);3705 if (state->cached)3706 st_mode = (*ce)->ce_mode;3707 } else if (stat_ret < 0) {3708 if (patch->is_new < 0)3709 goto is_new;3710 return error_errno("%s", old_name);3711 }37123713 if (!state->cached && !previous)3714 st_mode = ce_mode_from_stat(*ce, st->st_mode);37153716 if (patch->is_new < 0)3717 patch->is_new = 0;3718 if (!patch->old_mode)3719 patch->old_mode = st_mode;3720 if ((st_mode ^ patch->old_mode) & S_IFMT)3721 return error(_("%s: wrong type"), old_name);3722 if (st_mode != patch->old_mode)3723 warning(_("%s has type %o, expected %o"),3724 old_name, st_mode, patch->old_mode);3725 if (!patch->new_mode && !patch->is_delete)3726 patch->new_mode = st_mode;3727 return 0;37283729 is_new:3730 patch->is_new = 1;3731 patch->is_delete = 0;3732 FREE_AND_NULL(patch->old_name);3733 return 0;3734}373537363737#define EXISTS_IN_INDEX 13738#define EXISTS_IN_WORKTREE 237393740static int check_to_create(struct apply_state *state,3741 const char *new_name,3742 int ok_if_exists)3743{3744 struct stat nst;37453746 if (state->check_index &&3747 index_name_pos(state->repo->index, new_name, strlen(new_name)) >= 0 &&3748 !ok_if_exists)3749 return EXISTS_IN_INDEX;3750 if (state->cached)3751 return 0;37523753 if (!lstat(new_name, &nst)) {3754 if (S_ISDIR(nst.st_mode) || ok_if_exists)3755 return 0;3756 /*3757 * A leading component of new_name might be a symlink3758 * that is going to be removed with this patch, but3759 * still pointing at somewhere that has the path.3760 * In such a case, path "new_name" does not exist as3761 * far as git is concerned.3762 */3763 if (has_symlink_leading_path(new_name, strlen(new_name)))3764 return 0;37653766 return EXISTS_IN_WORKTREE;3767 } else if (!is_missing_file_error(errno)) {3768 return error_errno("%s", new_name);3769 }3770 return 0;3771}37723773static uintptr_t register_symlink_changes(struct apply_state *state,3774 const char *path,3775 uintptr_t what)3776{3777 struct string_list_item *ent;37783779 ent = string_list_lookup(&state->symlink_changes, path);3780 if (!ent) {3781 ent = string_list_insert(&state->symlink_changes, path);3782 ent->util = (void *)0;3783 }3784 ent->util = (void *)(what | ((uintptr_t)ent->util));3785 return (uintptr_t)ent->util;3786}37873788static uintptr_t check_symlink_changes(struct apply_state *state, const char *path)3789{3790 struct string_list_item *ent;37913792 ent = string_list_lookup(&state->symlink_changes, path);3793 if (!ent)3794 return 0;3795 return (uintptr_t)ent->util;3796}37973798static void prepare_symlink_changes(struct apply_state *state, struct patch *patch)3799{3800 for ( ; patch; patch = patch->next) {3801 if ((patch->old_name && S_ISLNK(patch->old_mode)) &&3802 (patch->is_rename || patch->is_delete))3803 /* the symlink at patch->old_name is removed */3804 register_symlink_changes(state, patch->old_name, APPLY_SYMLINK_GOES_AWAY);38053806 if (patch->new_name && S_ISLNK(patch->new_mode))3807 /* the symlink at patch->new_name is created or remains */3808 register_symlink_changes(state, patch->new_name, APPLY_SYMLINK_IN_RESULT);3809 }3810}38113812static int path_is_beyond_symlink_1(struct apply_state *state, struct strbuf *name)3813{3814 do {3815 unsigned int change;38163817 while (--name->len && name->buf[name->len] != '/')3818 ; /* scan backwards */3819 if (!name->len)3820 break;3821 name->buf[name->len] = '\0';3822 change = check_symlink_changes(state, name->buf);3823 if (change & APPLY_SYMLINK_IN_RESULT)3824 return 1;3825 if (change & APPLY_SYMLINK_GOES_AWAY)3826 /*3827 * This cannot be "return 0", because we may3828 * see a new one created at a higher level.3829 */3830 continue;38313832 /* otherwise, check the preimage */3833 if (state->check_index) {3834 struct cache_entry *ce;38353836 ce = index_file_exists(state->repo->index, name->buf,3837 name->len, ignore_case);3838 if (ce && S_ISLNK(ce->ce_mode))3839 return 1;3840 } else {3841 struct stat st;3842 if (!lstat(name->buf, &st) && S_ISLNK(st.st_mode))3843 return 1;3844 }3845 } while (1);3846 return 0;3847}38483849static int path_is_beyond_symlink(struct apply_state *state, const char *name_)3850{3851 int ret;3852 struct strbuf name = STRBUF_INIT;38533854 assert(*name_ != '\0');3855 strbuf_addstr(&name, name_);3856 ret = path_is_beyond_symlink_1(state, &name);3857 strbuf_release(&name);38583859 return ret;3860}38613862static int check_unsafe_path(struct patch *patch)3863{3864 const char *old_name = NULL;3865 const char *new_name = NULL;3866 if (patch->is_delete)3867 old_name = patch->old_name;3868 else if (!patch->is_new && !patch->is_copy)3869 old_name = patch->old_name;3870 if (!patch->is_delete)3871 new_name = patch->new_name;38723873 if (old_name && !verify_path(old_name, patch->old_mode))3874 return error(_("invalid path '%s'"), old_name);3875 if (new_name && !verify_path(new_name, patch->new_mode))3876 return error(_("invalid path '%s'"), new_name);3877 return 0;3878}38793880/*3881 * Check and apply the patch in-core; leave the result in patch->result3882 * for the caller to write it out to the final destination.3883 */3884static int check_patch(struct apply_state *state, struct patch *patch)3885{3886 struct stat st;3887 const char *old_name = patch->old_name;3888 const char *new_name = patch->new_name;3889 const char *name = old_name ? old_name : new_name;3890 struct cache_entry *ce = NULL;3891 struct patch *tpatch;3892 int ok_if_exists;3893 int status;38943895 patch->rejected = 1; /* we will drop this after we succeed */38963897 status = check_preimage(state, patch, &ce, &st);3898 if (status)3899 return status;3900 old_name = patch->old_name;39013902 /*3903 * A type-change diff is always split into a patch to delete3904 * old, immediately followed by a patch to create new (see3905 * diff.c::run_diff()); in such a case it is Ok that the entry3906 * to be deleted by the previous patch is still in the working3907 * tree and in the index.3908 *3909 * A patch to swap-rename between A and B would first rename A3910 * to B and then rename B to A. While applying the first one,3911 * the presence of B should not stop A from getting renamed to3912 * B; ask to_be_deleted() about the later rename. Removal of3913 * B and rename from A to B is handled the same way by asking3914 * was_deleted().3915 */3916 if ((tpatch = in_fn_table(state, new_name)) &&3917 (was_deleted(tpatch) || to_be_deleted(tpatch)))3918 ok_if_exists = 1;3919 else3920 ok_if_exists = 0;39213922 if (new_name &&3923 ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {3924 int err = check_to_create(state, new_name, ok_if_exists);39253926 if (err && state->threeway) {3927 patch->direct_to_threeway = 1;3928 } else switch (err) {3929 case 0:3930 break; /* happy */3931 case EXISTS_IN_INDEX:3932 return error(_("%s: already exists in index"), new_name);3933 break;3934 case EXISTS_IN_WORKTREE:3935 return error(_("%s: already exists in working directory"),3936 new_name);3937 default:3938 return err;3939 }39403941 if (!patch->new_mode) {3942 if (0 < patch->is_new)3943 patch->new_mode = S_IFREG | 0644;3944 else3945 patch->new_mode = patch->old_mode;3946 }3947 }39483949 if (new_name && old_name) {3950 int same = !strcmp(old_name, new_name);3951 if (!patch->new_mode)3952 patch->new_mode = patch->old_mode;3953 if ((patch->old_mode ^ patch->new_mode) & S_IFMT) {3954 if (same)3955 return error(_("new mode (%o) of %s does not "3956 "match old mode (%o)"),3957 patch->new_mode, new_name,3958 patch->old_mode);3959 else3960 return error(_("new mode (%o) of %s does not "3961 "match old mode (%o) of %s"),3962 patch->new_mode, new_name,3963 patch->old_mode, old_name);3964 }3965 }39663967 if (!state->unsafe_paths && check_unsafe_path(patch))3968 return -128;39693970 /*3971 * An attempt to read from or delete a path that is beyond a3972 * symbolic link will be prevented by load_patch_target() that3973 * is called at the beginning of apply_data() so we do not3974 * have to worry about a patch marked with "is_delete" bit3975 * here. We however need to make sure that the patch result3976 * is not deposited to a path that is beyond a symbolic link3977 * here.3978 */3979 if (!patch->is_delete && path_is_beyond_symlink(state, patch->new_name))3980 return error(_("affected file '%s' is beyond a symbolic link"),3981 patch->new_name);39823983 if (apply_data(state, patch, &st, ce) < 0)3984 return error(_("%s: patch does not apply"), name);3985 patch->rejected = 0;3986 return 0;3987}39883989static int check_patch_list(struct apply_state *state, struct patch *patch)3990{3991 int err = 0;39923993 prepare_symlink_changes(state, patch);3994 prepare_fn_table(state, patch);3995 while (patch) {3996 int res;3997 if (state->apply_verbosity > verbosity_normal)3998 say_patch_name(stderr,3999 _("Checking patch %s..."), patch);4000 res = check_patch(state, patch);4001 if (res == -128)4002 return -128;4003 err |= res;4004 patch = patch->next;4005 }4006 return err;4007}40084009static int read_apply_cache(struct apply_state *state)4010{4011 if (state->index_file)4012 return read_index_from(state->repo->index, state->index_file,4013 get_git_dir());4014 else4015 return read_index(state->repo->index);4016}40174018/* This function tries to read the object name from the current index */4019static int get_current_oid(struct apply_state *state, const char *path,4020 struct object_id *oid)4021{4022 int pos;40234024 if (read_apply_cache(state) < 0)4025 return -1;4026 pos = index_name_pos(state->repo->index, path, strlen(path));4027 if (pos < 0)4028 return -1;4029 oidcpy(oid, &state->repo->index->cache[pos]->oid);4030 return 0;4031}40324033static int preimage_oid_in_gitlink_patch(struct patch *p, struct object_id *oid)4034{4035 /*4036 * A usable gitlink patch has only one fragment (hunk) that looks like:4037 * @@ -1 +1 @@4038 * -Subproject commit <old sha1>4039 * +Subproject commit <new sha1>4040 * or4041 * @@ -1 +0,0 @@4042 * -Subproject commit <old sha1>4043 * for a removal patch.4044 */4045 struct fragment *hunk = p->fragments;4046 static const char heading[] = "-Subproject commit ";4047 char *preimage;40484049 if (/* does the patch have only one hunk? */4050 hunk && !hunk->next &&4051 /* is its preimage one line? */4052 hunk->oldpos == 1 && hunk->oldlines == 1 &&4053 /* does preimage begin with the heading? */4054 (preimage = memchr(hunk->patch, '\n', hunk->size)) != NULL &&4055 starts_with(++preimage, heading) &&4056 /* does it record full SHA-1? */4057 !get_oid_hex(preimage + sizeof(heading) - 1, oid) &&4058 preimage[sizeof(heading) + GIT_SHA1_HEXSZ - 1] == '\n' &&4059 /* does the abbreviated name on the index line agree with it? */4060 starts_with(preimage + sizeof(heading) - 1, p->old_sha1_prefix))4061 return 0; /* it all looks fine */40624063 /* we may have full object name on the index line */4064 return get_oid_hex(p->old_sha1_prefix, oid);4065}40664067/* Build an index that contains just the files needed for a 3way merge */4068static int build_fake_ancestor(struct apply_state *state, struct patch *list)4069{4070 struct patch *patch;4071 struct index_state result = { NULL };4072 struct lock_file lock = LOCK_INIT;4073 int res;40744075 /* Once we start supporting the reverse patch, it may be4076 * worth showing the new sha1 prefix, but until then...4077 */4078 for (patch = list; patch; patch = patch->next) {4079 struct object_id oid;4080 struct cache_entry *ce;4081 const char *name;40824083 name = patch->old_name ? patch->old_name : patch->new_name;4084 if (0 < patch->is_new)4085 continue;40864087 if (S_ISGITLINK(patch->old_mode)) {4088 if (!preimage_oid_in_gitlink_patch(patch, &oid))4089 ; /* ok, the textual part looks sane */4090 else4091 return error(_("sha1 information is lacking or "4092 "useless for submodule %s"), name);4093 } else if (!get_oid_blob(patch->old_sha1_prefix, &oid)) {4094 ; /* ok */4095 } else if (!patch->lines_added && !patch->lines_deleted) {4096 /* mode-only change: update the current */4097 if (get_current_oid(state, patch->old_name, &oid))4098 return error(_("mode change for %s, which is not "4099 "in current HEAD"), name);4100 } else4101 return error(_("sha1 information is lacking or useless "4102 "(%s)."), name);41034104 ce = make_cache_entry(&result, patch->old_mode, &oid, name, 0, 0);4105 if (!ce)4106 return error(_("make_cache_entry failed for path '%s'"),4107 name);4108 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) {4109 discard_cache_entry(ce);4110 return error(_("could not add %s to temporary index"),4111 name);4112 }4113 }41144115 hold_lock_file_for_update(&lock, state->fake_ancestor, LOCK_DIE_ON_ERROR);4116 res = write_locked_index(&result, &lock, COMMIT_LOCK);4117 discard_index(&result);41184119 if (res)4120 return error(_("could not write temporary index to %s"),4121 state->fake_ancestor);41224123 return 0;4124}41254126static void stat_patch_list(struct apply_state *state, struct patch *patch)4127{4128 int files, adds, dels;41294130 for (files = adds = dels = 0 ; patch ; patch = patch->next) {4131 files++;4132 adds += patch->lines_added;4133 dels += patch->lines_deleted;4134 show_stats(state, patch);4135 }41364137 print_stat_summary(stdout, files, adds, dels);4138}41394140static void numstat_patch_list(struct apply_state *state,4141 struct patch *patch)4142{4143 for ( ; patch; patch = patch->next) {4144 const char *name;4145 name = patch->new_name ? patch->new_name : patch->old_name;4146 if (patch->is_binary)4147 printf("-\t-\t");4148 else4149 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);4150 write_name_quoted(name, stdout, state->line_termination);4151 }4152}41534154static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)4155{4156 if (mode)4157 printf(" %s mode %06o %s\n", newdelete, mode, name);4158 else4159 printf(" %s %s\n", newdelete, name);4160}41614162static void show_mode_change(struct patch *p, int show_name)4163{4164 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {4165 if (show_name)4166 printf(" mode change %06o => %06o %s\n",4167 p->old_mode, p->new_mode, p->new_name);4168 else4169 printf(" mode change %06o => %06o\n",4170 p->old_mode, p->new_mode);4171 }4172}41734174static void show_rename_copy(struct patch *p)4175{4176 const char *renamecopy = p->is_rename ? "rename" : "copy";4177 const char *old_name, *new_name;41784179 /* Find common prefix */4180 old_name = p->old_name;4181 new_name = p->new_name;4182 while (1) {4183 const char *slash_old, *slash_new;4184 slash_old = strchr(old_name, '/');4185 slash_new = strchr(new_name, '/');4186 if (!slash_old ||4187 !slash_new ||4188 slash_old - old_name != slash_new - new_name ||4189 memcmp(old_name, new_name, slash_new - new_name))4190 break;4191 old_name = slash_old + 1;4192 new_name = slash_new + 1;4193 }4194 /* p->old_name thru old_name is the common prefix, and old_name and new_name4195 * through the end of names are renames4196 */4197 if (old_name != p->old_name)4198 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,4199 (int)(old_name - p->old_name), p->old_name,4200 old_name, new_name, p->score);4201 else4202 printf(" %s %s => %s (%d%%)\n", renamecopy,4203 p->old_name, p->new_name, p->score);4204 show_mode_change(p, 0);4205}42064207static void summary_patch_list(struct patch *patch)4208{4209 struct patch *p;42104211 for (p = patch; p; p = p->next) {4212 if (p->is_new)4213 show_file_mode_name("create", p->new_mode, p->new_name);4214 else if (p->is_delete)4215 show_file_mode_name("delete", p->old_mode, p->old_name);4216 else {4217 if (p->is_rename || p->is_copy)4218 show_rename_copy(p);4219 else {4220 if (p->score) {4221 printf(" rewrite %s (%d%%)\n",4222 p->new_name, p->score);4223 show_mode_change(p, 0);4224 }4225 else4226 show_mode_change(p, 1);4227 }4228 }4229 }4230}42314232static void patch_stats(struct apply_state *state, struct patch *patch)4233{4234 int lines = patch->lines_added + patch->lines_deleted;42354236 if (lines > state->max_change)4237 state->max_change = lines;4238 if (patch->old_name) {4239 int len = quote_c_style(patch->old_name, NULL, NULL, 0);4240 if (!len)4241 len = strlen(patch->old_name);4242 if (len > state->max_len)4243 state->max_len = len;4244 }4245 if (patch->new_name) {4246 int len = quote_c_style(patch->new_name, NULL, NULL, 0);4247 if (!len)4248 len = strlen(patch->new_name);4249 if (len > state->max_len)4250 state->max_len = len;4251 }4252}42534254static int remove_file(struct apply_state *state, struct patch *patch, int rmdir_empty)4255{4256 if (state->update_index && !state->ita_only) {4257 if (remove_file_from_index(state->repo->index, patch->old_name) < 0)4258 return error(_("unable to remove %s from index"), patch->old_name);4259 }4260 if (!state->cached) {4261 if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {4262 remove_path(patch->old_name);4263 }4264 }4265 return 0;4266}42674268static int add_index_file(struct apply_state *state,4269 const char *path,4270 unsigned mode,4271 void *buf,4272 unsigned long size)4273{4274 struct stat st;4275 struct cache_entry *ce;4276 int namelen = strlen(path);42774278 ce = make_empty_cache_entry(state->repo->index, namelen);4279 memcpy(ce->name, path, namelen);4280 ce->ce_mode = create_ce_mode(mode);4281 ce->ce_flags = create_ce_flags(0);4282 ce->ce_namelen = namelen;4283 if (state->ita_only) {4284 ce->ce_flags |= CE_INTENT_TO_ADD;4285 set_object_name_for_intent_to_add_entry(ce);4286 } else if (S_ISGITLINK(mode)) {4287 const char *s;42884289 if (!skip_prefix(buf, "Subproject commit ", &s) ||4290 get_oid_hex(s, &ce->oid)) {4291 discard_cache_entry(ce);4292 return error(_("corrupt patch for submodule %s"), path);4293 }4294 } else {4295 if (!state->cached) {4296 if (lstat(path, &st) < 0) {4297 discard_cache_entry(ce);4298 return error_errno(_("unable to stat newly "4299 "created file '%s'"),4300 path);4301 }4302 fill_stat_cache_info(ce, &st);4303 }4304 if (write_object_file(buf, size, blob_type, &ce->oid) < 0) {4305 discard_cache_entry(ce);4306 return error(_("unable to create backing store "4307 "for newly created file %s"), path);4308 }4309 }4310 if (add_index_entry(state->repo->index, ce, ADD_CACHE_OK_TO_ADD) < 0) {4311 discard_cache_entry(ce);4312 return error(_("unable to add cache entry for %s"), path);4313 }43144315 return 0;4316}43174318/*4319 * Returns:4320 * -1 if an unrecoverable error happened4321 * 0 if everything went well4322 * 1 if a recoverable error happened4323 */4324static int try_create_file(struct apply_state *state, const char *path,4325 unsigned int mode, const char *buf,4326 unsigned long size)4327{4328 int fd, res;4329 struct strbuf nbuf = STRBUF_INIT;43304331 if (S_ISGITLINK(mode)) {4332 struct stat st;4333 if (!lstat(path, &st) && S_ISDIR(st.st_mode))4334 return 0;4335 return !!mkdir(path, 0777);4336 }43374338 if (has_symlinks && S_ISLNK(mode))4339 /* Although buf:size is counted string, it also is NUL4340 * terminated.4341 */4342 return !!symlink(buf, path);43434344 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);4345 if (fd < 0)4346 return 1;43474348 if (convert_to_working_tree(state->repo->index, path, buf, size, &nbuf)) {4349 size = nbuf.len;4350 buf = nbuf.buf;4351 }43524353 res = write_in_full(fd, buf, size) < 0;4354 if (res)4355 error_errno(_("failed to write to '%s'"), path);4356 strbuf_release(&nbuf);43574358 if (close(fd) < 0 && !res)4359 return error_errno(_("closing file '%s'"), path);43604361 return res ? -1 : 0;4362}43634364/*4365 * We optimistically assume that the directories exist,4366 * which is true 99% of the time anyway. If they don't,4367 * we create them and try again.4368 *4369 * Returns:4370 * -1 on error4371 * 0 otherwise4372 */4373static int create_one_file(struct apply_state *state,4374 char *path,4375 unsigned mode,4376 const char *buf,4377 unsigned long size)4378{4379 int res;43804381 if (state->cached)4382 return 0;43834384 res = try_create_file(state, path, mode, buf, size);4385 if (res < 0)4386 return -1;4387 if (!res)4388 return 0;43894390 if (errno == ENOENT) {4391 if (safe_create_leading_directories(path))4392 return 0;4393 res = try_create_file(state, path, mode, buf, size);4394 if (res < 0)4395 return -1;4396 if (!res)4397 return 0;4398 }43994400 if (errno == EEXIST || errno == EACCES) {4401 /* We may be trying to create a file where a directory4402 * used to be.4403 */4404 struct stat st;4405 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))4406 errno = EEXIST;4407 }44084409 if (errno == EEXIST) {4410 unsigned int nr = getpid();44114412 for (;;) {4413 char newpath[PATH_MAX];4414 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);4415 res = try_create_file(state, newpath, mode, buf, size);4416 if (res < 0)4417 return -1;4418 if (!res) {4419 if (!rename(newpath, path))4420 return 0;4421 unlink_or_warn(newpath);4422 break;4423 }4424 if (errno != EEXIST)4425 break;4426 ++nr;4427 }4428 }4429 return error_errno(_("unable to write file '%s' mode %o"),4430 path, mode);4431}44324433static int add_conflicted_stages_file(struct apply_state *state,4434 struct patch *patch)4435{4436 int stage, namelen;4437 unsigned mode;4438 struct cache_entry *ce;44394440 if (!state->update_index)4441 return 0;4442 namelen = strlen(patch->new_name);4443 mode = patch->new_mode ? patch->new_mode : (S_IFREG | 0644);44444445 remove_file_from_index(state->repo->index, patch->new_name);4446 for (stage = 1; stage < 4; stage++) {4447 if (is_null_oid(&patch->threeway_stage[stage - 1]))4448 continue;4449 ce = make_empty_cache_entry(state->repo->index, namelen);4450 memcpy(ce->name, patch->new_name, namelen);4451 ce->ce_mode = create_ce_mode(mode);4452 ce->ce_flags = create_ce_flags(stage);4453 ce->ce_namelen = namelen;4454 oidcpy(&ce->oid, &patch->threeway_stage[stage - 1]);4455 if (add_index_entry(state->repo->index, ce, ADD_CACHE_OK_TO_ADD) < 0) {4456 discard_cache_entry(ce);4457 return error(_("unable to add cache entry for %s"),4458 patch->new_name);4459 }4460 }44614462 return 0;4463}44644465static int create_file(struct apply_state *state, struct patch *patch)4466{4467 char *path = patch->new_name;4468 unsigned mode = patch->new_mode;4469 unsigned long size = patch->resultsize;4470 char *buf = patch->result;44714472 if (!mode)4473 mode = S_IFREG | 0644;4474 if (create_one_file(state, path, mode, buf, size))4475 return -1;44764477 if (patch->conflicted_threeway)4478 return add_conflicted_stages_file(state, patch);4479 else if (state->update_index)4480 return add_index_file(state, path, mode, buf, size);4481 return 0;4482}44834484/* phase zero is to remove, phase one is to create */4485static int write_out_one_result(struct apply_state *state,4486 struct patch *patch,4487 int phase)4488{4489 if (patch->is_delete > 0) {4490 if (phase == 0)4491 return remove_file(state, patch, 1);4492 return 0;4493 }4494 if (patch->is_new > 0 || patch->is_copy) {4495 if (phase == 1)4496 return create_file(state, patch);4497 return 0;4498 }4499 /*4500 * Rename or modification boils down to the same4501 * thing: remove the old, write the new4502 */4503 if (phase == 0)4504 return remove_file(state, patch, patch->is_rename);4505 if (phase == 1)4506 return create_file(state, patch);4507 return 0;4508}45094510static int write_out_one_reject(struct apply_state *state, struct patch *patch)4511{4512 FILE *rej;4513 char namebuf[PATH_MAX];4514 struct fragment *frag;4515 int cnt = 0;4516 struct strbuf sb = STRBUF_INIT;45174518 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {4519 if (!frag->rejected)4520 continue;4521 cnt++;4522 }45234524 if (!cnt) {4525 if (state->apply_verbosity > verbosity_normal)4526 say_patch_name(stderr,4527 _("Applied patch %s cleanly."), patch);4528 return 0;4529 }45304531 /* This should not happen, because a removal patch that leaves4532 * contents are marked "rejected" at the patch level.4533 */4534 if (!patch->new_name)4535 die(_("internal error"));45364537 /* Say this even without --verbose */4538 strbuf_addf(&sb, Q_("Applying patch %%s with %d reject...",4539 "Applying patch %%s with %d rejects...",4540 cnt),4541 cnt);4542 if (state->apply_verbosity > verbosity_silent)4543 say_patch_name(stderr, sb.buf, patch);4544 strbuf_release(&sb);45454546 cnt = strlen(patch->new_name);4547 if (ARRAY_SIZE(namebuf) <= cnt + 5) {4548 cnt = ARRAY_SIZE(namebuf) - 5;4549 warning(_("truncating .rej filename to %.*s.rej"),4550 cnt - 1, patch->new_name);4551 }4552 memcpy(namebuf, patch->new_name, cnt);4553 memcpy(namebuf + cnt, ".rej", 5);45544555 rej = fopen(namebuf, "w");4556 if (!rej)4557 return error_errno(_("cannot open %s"), namebuf);45584559 /* Normal git tools never deal with .rej, so do not pretend4560 * this is a git patch by saying --git or giving extended4561 * headers. While at it, maybe please "kompare" that wants4562 * the trailing TAB and some garbage at the end of line ;-).4563 */4564 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",4565 patch->new_name, patch->new_name);4566 for (cnt = 1, frag = patch->fragments;4567 frag;4568 cnt++, frag = frag->next) {4569 if (!frag->rejected) {4570 if (state->apply_verbosity > verbosity_silent)4571 fprintf_ln(stderr, _("Hunk #%d applied cleanly."), cnt);4572 continue;4573 }4574 if (state->apply_verbosity > verbosity_silent)4575 fprintf_ln(stderr, _("Rejected hunk #%d."), cnt);4576 fprintf(rej, "%.*s", frag->size, frag->patch);4577 if (frag->patch[frag->size-1] != '\n')4578 fputc('\n', rej);4579 }4580 fclose(rej);4581 return -1;4582}45834584/*4585 * Returns:4586 * -1 if an error happened4587 * 0 if the patch applied cleanly4588 * 1 if the patch did not apply cleanly4589 */4590static int write_out_results(struct apply_state *state, struct patch *list)4591{4592 int phase;4593 int errs = 0;4594 struct patch *l;4595 struct string_list cpath = STRING_LIST_INIT_DUP;45964597 for (phase = 0; phase < 2; phase++) {4598 l = list;4599 while (l) {4600 if (l->rejected)4601 errs = 1;4602 else {4603 if (write_out_one_result(state, l, phase)) {4604 string_list_clear(&cpath, 0);4605 return -1;4606 }4607 if (phase == 1) {4608 if (write_out_one_reject(state, l))4609 errs = 1;4610 if (l->conflicted_threeway) {4611 string_list_append(&cpath, l->new_name);4612 errs = 1;4613 }4614 }4615 }4616 l = l->next;4617 }4618 }46194620 if (cpath.nr) {4621 struct string_list_item *item;46224623 string_list_sort(&cpath);4624 if (state->apply_verbosity > verbosity_silent) {4625 for_each_string_list_item(item, &cpath)4626 fprintf(stderr, "U %s\n", item->string);4627 }4628 string_list_clear(&cpath, 0);46294630 rerere(0);4631 }46324633 return errs;4634}46354636/*4637 * Try to apply a patch.4638 *4639 * Returns:4640 * -128 if a bad error happened (like patch unreadable)4641 * -1 if patch did not apply and user cannot deal with it4642 * 0 if the patch applied4643 * 1 if the patch did not apply but user might fix it4644 */4645static int apply_patch(struct apply_state *state,4646 int fd,4647 const char *filename,4648 int options)4649{4650 size_t offset;4651 struct strbuf buf = STRBUF_INIT; /* owns the patch text */4652 struct patch *list = NULL, **listp = &list;4653 int skipped_patch = 0;4654 int res = 0;46554656 state->patch_input_file = filename;4657 if (read_patch_file(&buf, fd) < 0)4658 return -128;4659 offset = 0;4660 while (offset < buf.len) {4661 struct patch *patch;4662 int nr;46634664 patch = xcalloc(1, sizeof(*patch));4665 patch->inaccurate_eof = !!(options & APPLY_OPT_INACCURATE_EOF);4666 patch->recount = !!(options & APPLY_OPT_RECOUNT);4667 nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch);4668 if (nr < 0) {4669 free_patch(patch);4670 if (nr == -128) {4671 res = -128;4672 goto end;4673 }4674 break;4675 }4676 if (state->apply_in_reverse)4677 reverse_patches(patch);4678 if (use_patch(state, patch)) {4679 patch_stats(state, patch);4680 *listp = patch;4681 listp = &patch->next;4682 }4683 else {4684 if (state->apply_verbosity > verbosity_normal)4685 say_patch_name(stderr, _("Skipped patch '%s'."), patch);4686 free_patch(patch);4687 skipped_patch++;4688 }4689 offset += nr;4690 }46914692 if (!list && !skipped_patch) {4693 error(_("unrecognized input"));4694 res = -128;4695 goto end;4696 }46974698 if (state->whitespace_error && (state->ws_error_action == die_on_ws_error))4699 state->apply = 0;47004701 state->update_index = (state->check_index || state->ita_only) && state->apply;4702 if (state->update_index && !is_lock_file_locked(&state->lock_file)) {4703 if (state->index_file)4704 hold_lock_file_for_update(&state->lock_file,4705 state->index_file,4706 LOCK_DIE_ON_ERROR);4707 else4708 hold_locked_index(&state->lock_file, LOCK_DIE_ON_ERROR);4709 }47104711 if (state->check_index && read_apply_cache(state) < 0) {4712 error(_("unable to read index file"));4713 res = -128;4714 goto end;4715 }47164717 if (state->check || state->apply) {4718 int r = check_patch_list(state, list);4719 if (r == -128) {4720 res = -128;4721 goto end;4722 }4723 if (r < 0 && !state->apply_with_reject) {4724 res = -1;4725 goto end;4726 }4727 }47284729 if (state->apply) {4730 int write_res = write_out_results(state, list);4731 if (write_res < 0) {4732 res = -128;4733 goto end;4734 }4735 if (write_res > 0) {4736 /* with --3way, we still need to write the index out */4737 res = state->apply_with_reject ? -1 : 1;4738 goto end;4739 }4740 }47414742 if (state->fake_ancestor &&4743 build_fake_ancestor(state, list)) {4744 res = -128;4745 goto end;4746 }47474748 if (state->diffstat && state->apply_verbosity > verbosity_silent)4749 stat_patch_list(state, list);47504751 if (state->numstat && state->apply_verbosity > verbosity_silent)4752 numstat_patch_list(state, list);47534754 if (state->summary && state->apply_verbosity > verbosity_silent)4755 summary_patch_list(list);47564757end:4758 free_patch_list(list);4759 strbuf_release(&buf);4760 string_list_clear(&state->fn_table, 0);4761 return res;4762}47634764static int apply_option_parse_exclude(const struct option *opt,4765 const char *arg, int unset)4766{4767 struct apply_state *state = opt->value;4768 add_name_limit(state, arg, 1);4769 return 0;4770}47714772static int apply_option_parse_include(const struct option *opt,4773 const char *arg, int unset)4774{4775 struct apply_state *state = opt->value;4776 add_name_limit(state, arg, 0);4777 state->has_include = 1;4778 return 0;4779}47804781static int apply_option_parse_p(const struct option *opt,4782 const char *arg,4783 int unset)4784{4785 struct apply_state *state = opt->value;4786 state->p_value = atoi(arg);4787 state->p_value_known = 1;4788 return 0;4789}47904791static int apply_option_parse_space_change(const struct option *opt,4792 const char *arg, int unset)4793{4794 struct apply_state *state = opt->value;4795 if (unset)4796 state->ws_ignore_action = ignore_ws_none;4797 else4798 state->ws_ignore_action = ignore_ws_change;4799 return 0;4800}48014802static int apply_option_parse_whitespace(const struct option *opt,4803 const char *arg, int unset)4804{4805 struct apply_state *state = opt->value;4806 state->whitespace_option = arg;4807 if (parse_whitespace_option(state, arg))4808 exit(1);4809 return 0;4810}48114812static int apply_option_parse_directory(const struct option *opt,4813 const char *arg, int unset)4814{4815 struct apply_state *state = opt->value;4816 strbuf_reset(&state->root);4817 strbuf_addstr(&state->root, arg);4818 strbuf_complete(&state->root, '/');4819 return 0;4820}48214822int apply_all_patches(struct apply_state *state,4823 int argc,4824 const char **argv,4825 int options)4826{4827 int i;4828 int res;4829 int errs = 0;4830 int read_stdin = 1;48314832 for (i = 0; i < argc; i++) {4833 const char *arg = argv[i];4834 char *to_free = NULL;4835 int fd;48364837 if (!strcmp(arg, "-")) {4838 res = apply_patch(state, 0, "<stdin>", options);4839 if (res < 0)4840 goto end;4841 errs |= res;4842 read_stdin = 0;4843 continue;4844 } else4845 arg = to_free = prefix_filename(state->prefix, arg);48464847 fd = open(arg, O_RDONLY);4848 if (fd < 0) {4849 error(_("can't open patch '%s': %s"), arg, strerror(errno));4850 res = -128;4851 free(to_free);4852 goto end;4853 }4854 read_stdin = 0;4855 set_default_whitespace_mode(state);4856 res = apply_patch(state, fd, arg, options);4857 close(fd);4858 free(to_free);4859 if (res < 0)4860 goto end;4861 errs |= res;4862 }4863 set_default_whitespace_mode(state);4864 if (read_stdin) {4865 res = apply_patch(state, 0, "<stdin>", options);4866 if (res < 0)4867 goto end;4868 errs |= res;4869 }48704871 if (state->whitespace_error) {4872 if (state->squelch_whitespace_errors &&4873 state->squelch_whitespace_errors < state->whitespace_error) {4874 int squelched =4875 state->whitespace_error - state->squelch_whitespace_errors;4876 warning(Q_("squelched %d whitespace error",4877 "squelched %d whitespace errors",4878 squelched),4879 squelched);4880 }4881 if (state->ws_error_action == die_on_ws_error) {4882 error(Q_("%d line adds whitespace errors.",4883 "%d lines add whitespace errors.",4884 state->whitespace_error),4885 state->whitespace_error);4886 res = -128;4887 goto end;4888 }4889 if (state->applied_after_fixing_ws && state->apply)4890 warning(Q_("%d line applied after"4891 " fixing whitespace errors.",4892 "%d lines applied after"4893 " fixing whitespace errors.",4894 state->applied_after_fixing_ws),4895 state->applied_after_fixing_ws);4896 else if (state->whitespace_error)4897 warning(Q_("%d line adds whitespace errors.",4898 "%d lines add whitespace errors.",4899 state->whitespace_error),4900 state->whitespace_error);4901 }49024903 if (state->update_index) {4904 res = write_locked_index(state->repo->index, &state->lock_file, COMMIT_LOCK);4905 if (res) {4906 error(_("Unable to write new index file"));4907 res = -128;4908 goto end;4909 }4910 }49114912 res = !!errs;49134914end:4915 rollback_lock_file(&state->lock_file);49164917 if (state->apply_verbosity <= verbosity_silent) {4918 set_error_routine(state->saved_error_routine);4919 set_warn_routine(state->saved_warn_routine);4920 }49214922 if (res > -1)4923 return res;4924 return (res == -1 ? 1 : 128);4925}49264927int apply_parse_options(int argc, const char **argv,4928 struct apply_state *state,4929 int *force_apply, int *options,4930 const char * const *apply_usage)4931{4932 struct option builtin_apply_options[] = {4933 { OPTION_CALLBACK, 0, "exclude", state, N_("path"),4934 N_("don't apply changes matching the given path"),4935 0, apply_option_parse_exclude },4936 { OPTION_CALLBACK, 0, "include", state, N_("path"),4937 N_("apply changes matching the given path"),4938 0, apply_option_parse_include },4939 { OPTION_CALLBACK, 'p', NULL, state, N_("num"),4940 N_("remove <num> leading slashes from traditional diff paths"),4941 0, apply_option_parse_p },4942 OPT_BOOL(0, "no-add", &state->no_add,4943 N_("ignore additions made by the patch")),4944 OPT_BOOL(0, "stat", &state->diffstat,4945 N_("instead of applying the patch, output diffstat for the input")),4946 OPT_NOOP_NOARG(0, "allow-binary-replacement"),4947 OPT_NOOP_NOARG(0, "binary"),4948 OPT_BOOL(0, "numstat", &state->numstat,4949 N_("show number of added and deleted lines in decimal notation")),4950 OPT_BOOL(0, "summary", &state->summary,4951 N_("instead of applying the patch, output a summary for the input")),4952 OPT_BOOL(0, "check", &state->check,4953 N_("instead of applying the patch, see if the patch is applicable")),4954 OPT_BOOL(0, "index", &state->check_index,4955 N_("make sure the patch is applicable to the current index")),4956 OPT_BOOL('N', "intent-to-add", &state->ita_only,4957 N_("mark new files with `git add --intent-to-add`")),4958 OPT_BOOL(0, "cached", &state->cached,4959 N_("apply a patch without touching the working tree")),4960 OPT_BOOL_F(0, "unsafe-paths", &state->unsafe_paths,4961 N_("accept a patch that touches outside the working area"),4962 PARSE_OPT_NOCOMPLETE),4963 OPT_BOOL(0, "apply", force_apply,4964 N_("also apply the patch (use with --stat/--summary/--check)")),4965 OPT_BOOL('3', "3way", &state->threeway,4966 N_( "attempt three-way merge if a patch does not apply")),4967 OPT_FILENAME(0, "build-fake-ancestor", &state->fake_ancestor,4968 N_("build a temporary index based on embedded index information")),4969 /* Think twice before adding "--nul" synonym to this */4970 OPT_SET_INT('z', NULL, &state->line_termination,4971 N_("paths are separated with NUL character"), '\0'),4972 OPT_INTEGER('C', NULL, &state->p_context,4973 N_("ensure at least <n> lines of context match")),4974 { OPTION_CALLBACK, 0, "whitespace", state, N_("action"),4975 N_("detect new or modified lines that have whitespace errors"),4976 0, apply_option_parse_whitespace },4977 { OPTION_CALLBACK, 0, "ignore-space-change", state, NULL,4978 N_("ignore changes in whitespace when finding context"),4979 PARSE_OPT_NOARG, apply_option_parse_space_change },4980 { OPTION_CALLBACK, 0, "ignore-whitespace", state, NULL,4981 N_("ignore changes in whitespace when finding context"),4982 PARSE_OPT_NOARG, apply_option_parse_space_change },4983 OPT_BOOL('R', "reverse", &state->apply_in_reverse,4984 N_("apply the patch in reverse")),4985 OPT_BOOL(0, "unidiff-zero", &state->unidiff_zero,4986 N_("don't expect at least one line of context")),4987 OPT_BOOL(0, "reject", &state->apply_with_reject,4988 N_("leave the rejected hunks in corresponding *.rej files")),4989 OPT_BOOL(0, "allow-overlap", &state->allow_overlap,4990 N_("allow overlapping hunks")),4991 OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")),4992 OPT_BIT(0, "inaccurate-eof", options,4993 N_("tolerate incorrectly detected missing new-line at the end of file"),4994 APPLY_OPT_INACCURATE_EOF),4995 OPT_BIT(0, "recount", options,4996 N_("do not trust the line counts in the hunk headers"),4997 APPLY_OPT_RECOUNT),4998 { OPTION_CALLBACK, 0, "directory", state, N_("root"),4999 N_("prepend <root> to all filenames"),5000 0, apply_option_parse_directory },5001 OPT_END()5002 };50035004 return parse_options(argc, argv, state->prefix, builtin_apply_options, apply_usage, 0);5005}