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