builtin / apply.con commit Merge branch 'mm/complete-rebase-autostash' (1e7ef5d)
   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#include "cache.h"
  10#include "lockfile.h"
  11#include "cache-tree.h"
  12#include "quote.h"
  13#include "blob.h"
  14#include "delta.h"
  15#include "builtin.h"
  16#include "string-list.h"
  17#include "dir.h"
  18#include "diff.h"
  19#include "parse-options.h"
  20#include "xdiff-interface.h"
  21#include "ll-merge.h"
  22#include "rerere.h"
  23
  24/*
  25 *  --check turns on checking that the working tree matches the
  26 *    files that are being modified, but doesn't apply the patch
  27 *  --stat does just a diffstat, and doesn't actually apply
  28 *  --numstat does numeric diffstat, and doesn't actually apply
  29 *  --index-info shows the old and new index info for paths if available.
  30 *  --index updates the cache as well.
  31 *  --cached updates only the cache without ever touching the working tree.
  32 */
  33static const char *prefix;
  34static int prefix_length = -1;
  35static int newfd = -1;
  36
  37static int unidiff_zero;
  38static int p_value = 1;
  39static int p_value_known;
  40static int check_index;
  41static int update_index;
  42static int cached;
  43static int diffstat;
  44static int numstat;
  45static int summary;
  46static int check;
  47static int apply = 1;
  48static int apply_in_reverse;
  49static int apply_with_reject;
  50static int apply_verbosely;
  51static int allow_overlap;
  52static int no_add;
  53static int threeway;
  54static const char *fake_ancestor;
  55static int line_termination = '\n';
  56static unsigned int p_context = UINT_MAX;
  57static const char * const apply_usage[] = {
  58        N_("git apply [options] [<patch>...]"),
  59        NULL
  60};
  61
  62static enum ws_error_action {
  63        nowarn_ws_error,
  64        warn_on_ws_error,
  65        die_on_ws_error,
  66        correct_ws_error
  67} ws_error_action = warn_on_ws_error;
  68static int whitespace_error;
  69static int squelch_whitespace_errors = 5;
  70static int applied_after_fixing_ws;
  71
  72static enum ws_ignore {
  73        ignore_ws_none,
  74        ignore_ws_change
  75} ws_ignore_action = ignore_ws_none;
  76
  77
  78static const char *patch_input_file;
  79static const char *root;
  80static int root_len;
  81static int read_stdin = 1;
  82static int options;
  83
  84static void parse_whitespace_option(const char *option)
  85{
  86        if (!option) {
  87                ws_error_action = warn_on_ws_error;
  88                return;
  89        }
  90        if (!strcmp(option, "warn")) {
  91                ws_error_action = warn_on_ws_error;
  92                return;
  93        }
  94        if (!strcmp(option, "nowarn")) {
  95                ws_error_action = nowarn_ws_error;
  96                return;
  97        }
  98        if (!strcmp(option, "error")) {
  99                ws_error_action = die_on_ws_error;
 100                return;
 101        }
 102        if (!strcmp(option, "error-all")) {
 103                ws_error_action = die_on_ws_error;
 104                squelch_whitespace_errors = 0;
 105                return;
 106        }
 107        if (!strcmp(option, "strip") || !strcmp(option, "fix")) {
 108                ws_error_action = correct_ws_error;
 109                return;
 110        }
 111        die(_("unrecognized whitespace option '%s'"), option);
 112}
 113
 114static void parse_ignorewhitespace_option(const char *option)
 115{
 116        if (!option || !strcmp(option, "no") ||
 117            !strcmp(option, "false") || !strcmp(option, "never") ||
 118            !strcmp(option, "none")) {
 119                ws_ignore_action = ignore_ws_none;
 120                return;
 121        }
 122        if (!strcmp(option, "change")) {
 123                ws_ignore_action = ignore_ws_change;
 124                return;
 125        }
 126        die(_("unrecognized whitespace ignore option '%s'"), option);
 127}
 128
 129static void set_default_whitespace_mode(const char *whitespace_option)
 130{
 131        if (!whitespace_option && !apply_default_whitespace)
 132                ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error);
 133}
 134
 135/*
 136 * For "diff-stat" like behaviour, we keep track of the biggest change
 137 * we've seen, and the longest filename. That allows us to do simple
 138 * scaling.
 139 */
 140static int max_change, max_len;
 141
 142/*
 143 * Various "current state", notably line numbers and what
 144 * file (and how) we're patching right now.. The "is_xxxx"
 145 * things are flags, where -1 means "don't know yet".
 146 */
 147static int linenr = 1;
 148
 149/*
 150 * This represents one "hunk" from a patch, starting with
 151 * "@@ -oldpos,oldlines +newpos,newlines @@" marker.  The
 152 * patch text is pointed at by patch, and its byte length
 153 * is stored in size.  leading and trailing are the number
 154 * of context lines.
 155 */
 156struct fragment {
 157        unsigned long leading, trailing;
 158        unsigned long oldpos, oldlines;
 159        unsigned long newpos, newlines;
 160        /*
 161         * 'patch' is usually borrowed from buf in apply_patch(),
 162         * but some codepaths store an allocated buffer.
 163         */
 164        const char *patch;
 165        unsigned free_patch:1,
 166                rejected:1;
 167        int size;
 168        int linenr;
 169        struct fragment *next;
 170};
 171
 172/*
 173 * When dealing with a binary patch, we reuse "leading" field
 174 * to store the type of the binary hunk, either deflated "delta"
 175 * or deflated "literal".
 176 */
 177#define binary_patch_method leading
 178#define BINARY_DELTA_DEFLATED   1
 179#define BINARY_LITERAL_DEFLATED 2
 180
 181/*
 182 * This represents a "patch" to a file, both metainfo changes
 183 * such as creation/deletion, filemode and content changes represented
 184 * as a series of fragments.
 185 */
 186struct patch {
 187        char *new_name, *old_name, *def_name;
 188        unsigned int old_mode, new_mode;
 189        int is_new, is_delete;  /* -1 = unknown, 0 = false, 1 = true */
 190        int rejected;
 191        unsigned ws_rule;
 192        int lines_added, lines_deleted;
 193        int score;
 194        unsigned int is_toplevel_relative:1;
 195        unsigned int inaccurate_eof:1;
 196        unsigned int is_binary:1;
 197        unsigned int is_copy:1;
 198        unsigned int is_rename:1;
 199        unsigned int recount:1;
 200        unsigned int conflicted_threeway:1;
 201        unsigned int direct_to_threeway:1;
 202        struct fragment *fragments;
 203        char *result;
 204        size_t resultsize;
 205        char old_sha1_prefix[41];
 206        char new_sha1_prefix[41];
 207        struct patch *next;
 208
 209        /* three-way fallback result */
 210        unsigned char threeway_stage[3][20];
 211};
 212
 213static void free_fragment_list(struct fragment *list)
 214{
 215        while (list) {
 216                struct fragment *next = list->next;
 217                if (list->free_patch)
 218                        free((char *)list->patch);
 219                free(list);
 220                list = next;
 221        }
 222}
 223
 224static void free_patch(struct patch *patch)
 225{
 226        free_fragment_list(patch->fragments);
 227        free(patch->def_name);
 228        free(patch->old_name);
 229        free(patch->new_name);
 230        free(patch->result);
 231        free(patch);
 232}
 233
 234static void free_patch_list(struct patch *list)
 235{
 236        while (list) {
 237                struct patch *next = list->next;
 238                free_patch(list);
 239                list = next;
 240        }
 241}
 242
 243/*
 244 * A line in a file, len-bytes long (includes the terminating LF,
 245 * except for an incomplete line at the end if the file ends with
 246 * one), and its contents hashes to 'hash'.
 247 */
 248struct line {
 249        size_t len;
 250        unsigned hash : 24;
 251        unsigned flag : 8;
 252#define LINE_COMMON     1
 253#define LINE_PATCHED    2
 254};
 255
 256/*
 257 * This represents a "file", which is an array of "lines".
 258 */
 259struct image {
 260        char *buf;
 261        size_t len;
 262        size_t nr;
 263        size_t alloc;
 264        struct line *line_allocated;
 265        struct line *line;
 266};
 267
 268/*
 269 * Records filenames that have been touched, in order to handle
 270 * the case where more than one patches touch the same file.
 271 */
 272
 273static struct string_list fn_table;
 274
 275static uint32_t hash_line(const char *cp, size_t len)
 276{
 277        size_t i;
 278        uint32_t h;
 279        for (i = 0, h = 0; i < len; i++) {
 280                if (!isspace(cp[i])) {
 281                        h = h * 3 + (cp[i] & 0xff);
 282                }
 283        }
 284        return h;
 285}
 286
 287/*
 288 * Compare lines s1 of length n1 and s2 of length n2, ignoring
 289 * whitespace difference. Returns 1 if they match, 0 otherwise
 290 */
 291static int fuzzy_matchlines(const char *s1, size_t n1,
 292                            const char *s2, size_t n2)
 293{
 294        const char *last1 = s1 + n1 - 1;
 295        const char *last2 = s2 + n2 - 1;
 296        int result = 0;
 297
 298        /* ignore line endings */
 299        while ((*last1 == '\r') || (*last1 == '\n'))
 300                last1--;
 301        while ((*last2 == '\r') || (*last2 == '\n'))
 302                last2--;
 303
 304        /* skip leading whitespaces, if both begin with whitespace */
 305        if (s1 <= last1 && s2 <= last2 && isspace(*s1) && isspace(*s2)) {
 306                while (isspace(*s1) && (s1 <= last1))
 307                        s1++;
 308                while (isspace(*s2) && (s2 <= last2))
 309                        s2++;
 310        }
 311        /* early return if both lines are empty */
 312        if ((s1 > last1) && (s2 > last2))
 313                return 1;
 314        while (!result) {
 315                result = *s1++ - *s2++;
 316                /*
 317                 * Skip whitespace inside. We check for whitespace on
 318                 * both buffers because we don't want "a b" to match
 319                 * "ab"
 320                 */
 321                if (isspace(*s1) && isspace(*s2)) {
 322                        while (isspace(*s1) && s1 <= last1)
 323                                s1++;
 324                        while (isspace(*s2) && s2 <= last2)
 325                                s2++;
 326                }
 327                /*
 328                 * If we reached the end on one side only,
 329                 * lines don't match
 330                 */
 331                if (
 332                    ((s2 > last2) && (s1 <= last1)) ||
 333                    ((s1 > last1) && (s2 <= last2)))
 334                        return 0;
 335                if ((s1 > last1) && (s2 > last2))
 336                        break;
 337        }
 338
 339        return !result;
 340}
 341
 342static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag)
 343{
 344        ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc);
 345        img->line_allocated[img->nr].len = len;
 346        img->line_allocated[img->nr].hash = hash_line(bol, len);
 347        img->line_allocated[img->nr].flag = flag;
 348        img->nr++;
 349}
 350
 351/*
 352 * "buf" has the file contents to be patched (read from various sources).
 353 * attach it to "image" and add line-based index to it.
 354 * "image" now owns the "buf".
 355 */
 356static void prepare_image(struct image *image, char *buf, size_t len,
 357                          int prepare_linetable)
 358{
 359        const char *cp, *ep;
 360
 361        memset(image, 0, sizeof(*image));
 362        image->buf = buf;
 363        image->len = len;
 364
 365        if (!prepare_linetable)
 366                return;
 367
 368        ep = image->buf + image->len;
 369        cp = image->buf;
 370        while (cp < ep) {
 371                const char *next;
 372                for (next = cp; next < ep && *next != '\n'; next++)
 373                        ;
 374                if (next < ep)
 375                        next++;
 376                add_line_info(image, cp, next - cp, 0);
 377                cp = next;
 378        }
 379        image->line = image->line_allocated;
 380}
 381
 382static void clear_image(struct image *image)
 383{
 384        free(image->buf);
 385        free(image->line_allocated);
 386        memset(image, 0, sizeof(*image));
 387}
 388
 389/* fmt must contain _one_ %s and no other substitution */
 390static void say_patch_name(FILE *output, const char *fmt, struct patch *patch)
 391{
 392        struct strbuf sb = STRBUF_INIT;
 393
 394        if (patch->old_name && patch->new_name &&
 395            strcmp(patch->old_name, patch->new_name)) {
 396                quote_c_style(patch->old_name, &sb, NULL, 0);
 397                strbuf_addstr(&sb, " => ");
 398                quote_c_style(patch->new_name, &sb, NULL, 0);
 399        } else {
 400                const char *n = patch->new_name;
 401                if (!n)
 402                        n = patch->old_name;
 403                quote_c_style(n, &sb, NULL, 0);
 404        }
 405        fprintf(output, fmt, sb.buf);
 406        fputc('\n', output);
 407        strbuf_release(&sb);
 408}
 409
 410#define SLOP (16)
 411
 412static void read_patch_file(struct strbuf *sb, int fd)
 413{
 414        if (strbuf_read(sb, fd, 0) < 0)
 415                die_errno("git apply: failed to read");
 416
 417        /*
 418         * Make sure that we have some slop in the buffer
 419         * so that we can do speculative "memcmp" etc, and
 420         * see to it that it is NUL-filled.
 421         */
 422        strbuf_grow(sb, SLOP);
 423        memset(sb->buf + sb->len, 0, SLOP);
 424}
 425
 426static unsigned long linelen(const char *buffer, unsigned long size)
 427{
 428        unsigned long len = 0;
 429        while (size--) {
 430                len++;
 431                if (*buffer++ == '\n')
 432                        break;
 433        }
 434        return len;
 435}
 436
 437static int is_dev_null(const char *str)
 438{
 439        return skip_prefix(str, "/dev/null", &str) && isspace(*str);
 440}
 441
 442#define TERM_SPACE      1
 443#define TERM_TAB        2
 444
 445static int name_terminate(const char *name, int namelen, int c, int terminate)
 446{
 447        if (c == ' ' && !(terminate & TERM_SPACE))
 448                return 0;
 449        if (c == '\t' && !(terminate & TERM_TAB))
 450                return 0;
 451
 452        return 1;
 453}
 454
 455/* remove double slashes to make --index work with such filenames */
 456static char *squash_slash(char *name)
 457{
 458        int i = 0, j = 0;
 459
 460        if (!name)
 461                return NULL;
 462
 463        while (name[i]) {
 464                if ((name[j++] = name[i++]) == '/')
 465                        while (name[i] == '/')
 466                                i++;
 467        }
 468        name[j] = '\0';
 469        return name;
 470}
 471
 472static char *find_name_gnu(const char *line, const char *def, int p_value)
 473{
 474        struct strbuf name = STRBUF_INIT;
 475        char *cp;
 476
 477        /*
 478         * Proposed "new-style" GNU patch/diff format; see
 479         * http://marc.info/?l=git&m=112927316408690&w=2
 480         */
 481        if (unquote_c_style(&name, line, NULL)) {
 482                strbuf_release(&name);
 483                return NULL;
 484        }
 485
 486        for (cp = name.buf; p_value; p_value--) {
 487                cp = strchr(cp, '/');
 488                if (!cp) {
 489                        strbuf_release(&name);
 490                        return NULL;
 491                }
 492                cp++;
 493        }
 494
 495        strbuf_remove(&name, 0, cp - name.buf);
 496        if (root)
 497                strbuf_insert(&name, 0, root, root_len);
 498        return squash_slash(strbuf_detach(&name, NULL));
 499}
 500
 501static size_t sane_tz_len(const char *line, size_t len)
 502{
 503        const char *tz, *p;
 504
 505        if (len < strlen(" +0500") || line[len-strlen(" +0500")] != ' ')
 506                return 0;
 507        tz = line + len - strlen(" +0500");
 508
 509        if (tz[1] != '+' && tz[1] != '-')
 510                return 0;
 511
 512        for (p = tz + 2; p != line + len; p++)
 513                if (!isdigit(*p))
 514                        return 0;
 515
 516        return line + len - tz;
 517}
 518
 519static size_t tz_with_colon_len(const char *line, size_t len)
 520{
 521        const char *tz, *p;
 522
 523        if (len < strlen(" +08:00") || line[len - strlen(":00")] != ':')
 524                return 0;
 525        tz = line + len - strlen(" +08:00");
 526
 527        if (tz[0] != ' ' || (tz[1] != '+' && tz[1] != '-'))
 528                return 0;
 529        p = tz + 2;
 530        if (!isdigit(*p++) || !isdigit(*p++) || *p++ != ':' ||
 531            !isdigit(*p++) || !isdigit(*p++))
 532                return 0;
 533
 534        return line + len - tz;
 535}
 536
 537static size_t date_len(const char *line, size_t len)
 538{
 539        const char *date, *p;
 540
 541        if (len < strlen("72-02-05") || line[len-strlen("-05")] != '-')
 542                return 0;
 543        p = date = line + len - strlen("72-02-05");
 544
 545        if (!isdigit(*p++) || !isdigit(*p++) || *p++ != '-' ||
 546            !isdigit(*p++) || !isdigit(*p++) || *p++ != '-' ||
 547            !isdigit(*p++) || !isdigit(*p++))   /* Not a date. */
 548                return 0;
 549
 550        if (date - line >= strlen("19") &&
 551            isdigit(date[-1]) && isdigit(date[-2]))     /* 4-digit year */
 552                date -= strlen("19");
 553
 554        return line + len - date;
 555}
 556
 557static size_t short_time_len(const char *line, size_t len)
 558{
 559        const char *time, *p;
 560
 561        if (len < strlen(" 07:01:32") || line[len-strlen(":32")] != ':')
 562                return 0;
 563        p = time = line + len - strlen(" 07:01:32");
 564
 565        /* Permit 1-digit hours? */
 566        if (*p++ != ' ' ||
 567            !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' ||
 568            !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' ||
 569            !isdigit(*p++) || !isdigit(*p++))   /* Not a time. */
 570                return 0;
 571
 572        return line + len - time;
 573}
 574
 575static size_t fractional_time_len(const char *line, size_t len)
 576{
 577        const char *p;
 578        size_t n;
 579
 580        /* Expected format: 19:41:17.620000023 */
 581        if (!len || !isdigit(line[len - 1]))
 582                return 0;
 583        p = line + len - 1;
 584
 585        /* Fractional seconds. */
 586        while (p > line && isdigit(*p))
 587                p--;
 588        if (*p != '.')
 589                return 0;
 590
 591        /* Hours, minutes, and whole seconds. */
 592        n = short_time_len(line, p - line);
 593        if (!n)
 594                return 0;
 595
 596        return line + len - p + n;
 597}
 598
 599static size_t trailing_spaces_len(const char *line, size_t len)
 600{
 601        const char *p;
 602
 603        /* Expected format: ' ' x (1 or more)  */
 604        if (!len || line[len - 1] != ' ')
 605                return 0;
 606
 607        p = line + len;
 608        while (p != line) {
 609                p--;
 610                if (*p != ' ')
 611                        return line + len - (p + 1);
 612        }
 613
 614        /* All spaces! */
 615        return len;
 616}
 617
 618static size_t diff_timestamp_len(const char *line, size_t len)
 619{
 620        const char *end = line + len;
 621        size_t n;
 622
 623        /*
 624         * Posix: 2010-07-05 19:41:17
 625         * GNU: 2010-07-05 19:41:17.620000023 -0500
 626         */
 627
 628        if (!isdigit(end[-1]))
 629                return 0;
 630
 631        n = sane_tz_len(line, end - line);
 632        if (!n)
 633                n = tz_with_colon_len(line, end - line);
 634        end -= n;
 635
 636        n = short_time_len(line, end - line);
 637        if (!n)
 638                n = fractional_time_len(line, end - line);
 639        end -= n;
 640
 641        n = date_len(line, end - line);
 642        if (!n) /* No date.  Too bad. */
 643                return 0;
 644        end -= n;
 645
 646        if (end == line)        /* No space before date. */
 647                return 0;
 648        if (end[-1] == '\t') {  /* Success! */
 649                end--;
 650                return line + len - end;
 651        }
 652        if (end[-1] != ' ')     /* No space before date. */
 653                return 0;
 654
 655        /* Whitespace damage. */
 656        end -= trailing_spaces_len(line, end - line);
 657        return line + len - end;
 658}
 659
 660static char *null_strdup(const char *s)
 661{
 662        return s ? xstrdup(s) : NULL;
 663}
 664
 665static char *find_name_common(const char *line, const char *def,
 666                              int p_value, const char *end, int terminate)
 667{
 668        int len;
 669        const char *start = NULL;
 670
 671        if (p_value == 0)
 672                start = line;
 673        while (line != end) {
 674                char c = *line;
 675
 676                if (!end && isspace(c)) {
 677                        if (c == '\n')
 678                                break;
 679                        if (name_terminate(start, line-start, c, terminate))
 680                                break;
 681                }
 682                line++;
 683                if (c == '/' && !--p_value)
 684                        start = line;
 685        }
 686        if (!start)
 687                return squash_slash(null_strdup(def));
 688        len = line - start;
 689        if (!len)
 690                return squash_slash(null_strdup(def));
 691
 692        /*
 693         * Generally we prefer the shorter name, especially
 694         * if the other one is just a variation of that with
 695         * something else tacked on to the end (ie "file.orig"
 696         * or "file~").
 697         */
 698        if (def) {
 699                int deflen = strlen(def);
 700                if (deflen < len && !strncmp(start, def, deflen))
 701                        return squash_slash(xstrdup(def));
 702        }
 703
 704        if (root) {
 705                char *ret = xmalloc(root_len + len + 1);
 706                strcpy(ret, root);
 707                memcpy(ret + root_len, start, len);
 708                ret[root_len + len] = '\0';
 709                return squash_slash(ret);
 710        }
 711
 712        return squash_slash(xmemdupz(start, len));
 713}
 714
 715static char *find_name(const char *line, char *def, int p_value, int terminate)
 716{
 717        if (*line == '"') {
 718                char *name = find_name_gnu(line, def, p_value);
 719                if (name)
 720                        return name;
 721        }
 722
 723        return find_name_common(line, def, p_value, NULL, terminate);
 724}
 725
 726static char *find_name_traditional(const char *line, char *def, int p_value)
 727{
 728        size_t len;
 729        size_t date_len;
 730
 731        if (*line == '"') {
 732                char *name = find_name_gnu(line, def, p_value);
 733                if (name)
 734                        return name;
 735        }
 736
 737        len = strchrnul(line, '\n') - line;
 738        date_len = diff_timestamp_len(line, len);
 739        if (!date_len)
 740                return find_name_common(line, def, p_value, NULL, TERM_TAB);
 741        len -= date_len;
 742
 743        return find_name_common(line, def, p_value, line + len, 0);
 744}
 745
 746static int count_slashes(const char *cp)
 747{
 748        int cnt = 0;
 749        char ch;
 750
 751        while ((ch = *cp++))
 752                if (ch == '/')
 753                        cnt++;
 754        return cnt;
 755}
 756
 757/*
 758 * Given the string after "--- " or "+++ ", guess the appropriate
 759 * p_value for the given patch.
 760 */
 761static int guess_p_value(const char *nameline)
 762{
 763        char *name, *cp;
 764        int val = -1;
 765
 766        if (is_dev_null(nameline))
 767                return -1;
 768        name = find_name_traditional(nameline, NULL, 0);
 769        if (!name)
 770                return -1;
 771        cp = strchr(name, '/');
 772        if (!cp)
 773                val = 0;
 774        else if (prefix) {
 775                /*
 776                 * Does it begin with "a/$our-prefix" and such?  Then this is
 777                 * very likely to apply to our directory.
 778                 */
 779                if (!strncmp(name, prefix, prefix_length))
 780                        val = count_slashes(prefix);
 781                else {
 782                        cp++;
 783                        if (!strncmp(cp, prefix, prefix_length))
 784                                val = count_slashes(prefix) + 1;
 785                }
 786        }
 787        free(name);
 788        return val;
 789}
 790
 791/*
 792 * Does the ---/+++ line has the POSIX timestamp after the last HT?
 793 * GNU diff puts epoch there to signal a creation/deletion event.  Is
 794 * this such a timestamp?
 795 */
 796static int has_epoch_timestamp(const char *nameline)
 797{
 798        /*
 799         * We are only interested in epoch timestamp; any non-zero
 800         * fraction cannot be one, hence "(\.0+)?" in the regexp below.
 801         * For the same reason, the date must be either 1969-12-31 or
 802         * 1970-01-01, and the seconds part must be "00".
 803         */
 804        const char stamp_regexp[] =
 805                "^(1969-12-31|1970-01-01)"
 806                " "
 807                "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?"
 808                " "
 809                "([-+][0-2][0-9]:?[0-5][0-9])\n";
 810        const char *timestamp = NULL, *cp, *colon;
 811        static regex_t *stamp;
 812        regmatch_t m[10];
 813        int zoneoffset;
 814        int hourminute;
 815        int status;
 816
 817        for (cp = nameline; *cp != '\n'; cp++) {
 818                if (*cp == '\t')
 819                        timestamp = cp + 1;
 820        }
 821        if (!timestamp)
 822                return 0;
 823        if (!stamp) {
 824                stamp = xmalloc(sizeof(*stamp));
 825                if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) {
 826                        warning(_("Cannot prepare timestamp regexp %s"),
 827                                stamp_regexp);
 828                        return 0;
 829                }
 830        }
 831
 832        status = regexec(stamp, timestamp, ARRAY_SIZE(m), m, 0);
 833        if (status) {
 834                if (status != REG_NOMATCH)
 835                        warning(_("regexec returned %d for input: %s"),
 836                                status, timestamp);
 837                return 0;
 838        }
 839
 840        zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10);
 841        if (*colon == ':')
 842                zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10);
 843        else
 844                zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100);
 845        if (timestamp[m[3].rm_so] == '-')
 846                zoneoffset = -zoneoffset;
 847
 848        /*
 849         * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
 850         * (west of GMT) or 1970-01-01 (east of GMT)
 851         */
 852        if ((zoneoffset < 0 && memcmp(timestamp, "1969-12-31", 10)) ||
 853            (0 <= zoneoffset && memcmp(timestamp, "1970-01-01", 10)))
 854                return 0;
 855
 856        hourminute = (strtol(timestamp + 11, NULL, 10) * 60 +
 857                      strtol(timestamp + 14, NULL, 10) -
 858                      zoneoffset);
 859
 860        return ((zoneoffset < 0 && hourminute == 1440) ||
 861                (0 <= zoneoffset && !hourminute));
 862}
 863
 864/*
 865 * Get the name etc info from the ---/+++ lines of a traditional patch header
 866 *
 867 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
 868 * files, we can happily check the index for a match, but for creating a
 869 * new file we should try to match whatever "patch" does. I have no idea.
 870 */
 871static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
 872{
 873        char *name;
 874
 875        first += 4;     /* skip "--- " */
 876        second += 4;    /* skip "+++ " */
 877        if (!p_value_known) {
 878                int p, q;
 879                p = guess_p_value(first);
 880                q = guess_p_value(second);
 881                if (p < 0) p = q;
 882                if (0 <= p && p == q) {
 883                        p_value = p;
 884                        p_value_known = 1;
 885                }
 886        }
 887        if (is_dev_null(first)) {
 888                patch->is_new = 1;
 889                patch->is_delete = 0;
 890                name = find_name_traditional(second, NULL, p_value);
 891                patch->new_name = name;
 892        } else if (is_dev_null(second)) {
 893                patch->is_new = 0;
 894                patch->is_delete = 1;
 895                name = find_name_traditional(first, NULL, p_value);
 896                patch->old_name = name;
 897        } else {
 898                char *first_name;
 899                first_name = find_name_traditional(first, NULL, p_value);
 900                name = find_name_traditional(second, first_name, p_value);
 901                free(first_name);
 902                if (has_epoch_timestamp(first)) {
 903                        patch->is_new = 1;
 904                        patch->is_delete = 0;
 905                        patch->new_name = name;
 906                } else if (has_epoch_timestamp(second)) {
 907                        patch->is_new = 0;
 908                        patch->is_delete = 1;
 909                        patch->old_name = name;
 910                } else {
 911                        patch->old_name = name;
 912                        patch->new_name = null_strdup(name);
 913                }
 914        }
 915        if (!name)
 916                die(_("unable to find filename in patch at line %d"), linenr);
 917}
 918
 919static int gitdiff_hdrend(const char *line, struct patch *patch)
 920{
 921        return -1;
 922}
 923
 924/*
 925 * We're anal about diff header consistency, to make
 926 * sure that we don't end up having strange ambiguous
 927 * patches floating around.
 928 *
 929 * As a result, gitdiff_{old|new}name() will check
 930 * their names against any previous information, just
 931 * to make sure..
 932 */
 933#define DIFF_OLD_NAME 0
 934#define DIFF_NEW_NAME 1
 935
 936static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, int side)
 937{
 938        if (!orig_name && !isnull)
 939                return find_name(line, NULL, p_value, TERM_TAB);
 940
 941        if (orig_name) {
 942                int len;
 943                const char *name;
 944                char *another;
 945                name = orig_name;
 946                len = strlen(name);
 947                if (isnull)
 948                        die(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), name, linenr);
 949                another = find_name(line, NULL, p_value, TERM_TAB);
 950                if (!another || memcmp(another, name, len + 1))
 951                        die((side == DIFF_NEW_NAME) ?
 952                            _("git apply: bad git-diff - inconsistent new filename on line %d") :
 953                            _("git apply: bad git-diff - inconsistent old filename on line %d"), linenr);
 954                free(another);
 955                return orig_name;
 956        }
 957        else {
 958                /* expect "/dev/null" */
 959                if (memcmp("/dev/null", line, 9) || line[9] != '\n')
 960                        die(_("git apply: bad git-diff - expected /dev/null on line %d"), linenr);
 961                return NULL;
 962        }
 963}
 964
 965static int gitdiff_oldname(const char *line, struct patch *patch)
 966{
 967        char *orig = patch->old_name;
 968        patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name,
 969                                              DIFF_OLD_NAME);
 970        if (orig != patch->old_name)
 971                free(orig);
 972        return 0;
 973}
 974
 975static int gitdiff_newname(const char *line, struct patch *patch)
 976{
 977        char *orig = patch->new_name;
 978        patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name,
 979                                              DIFF_NEW_NAME);
 980        if (orig != patch->new_name)
 981                free(orig);
 982        return 0;
 983}
 984
 985static int gitdiff_oldmode(const char *line, struct patch *patch)
 986{
 987        patch->old_mode = strtoul(line, NULL, 8);
 988        return 0;
 989}
 990
 991static int gitdiff_newmode(const char *line, struct patch *patch)
 992{
 993        patch->new_mode = strtoul(line, NULL, 8);
 994        return 0;
 995}
 996
 997static int gitdiff_delete(const char *line, struct patch *patch)
 998{
 999        patch->is_delete = 1;
1000        free(patch->old_name);
1001        patch->old_name = null_strdup(patch->def_name);
1002        return gitdiff_oldmode(line, patch);
1003}
1004
1005static int gitdiff_newfile(const char *line, struct patch *patch)
1006{
1007        patch->is_new = 1;
1008        free(patch->new_name);
1009        patch->new_name = null_strdup(patch->def_name);
1010        return gitdiff_newmode(line, patch);
1011}
1012
1013static int gitdiff_copysrc(const char *line, struct patch *patch)
1014{
1015        patch->is_copy = 1;
1016        free(patch->old_name);
1017        patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
1018        return 0;
1019}
1020
1021static int gitdiff_copydst(const char *line, struct patch *patch)
1022{
1023        patch->is_copy = 1;
1024        free(patch->new_name);
1025        patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
1026        return 0;
1027}
1028
1029static int gitdiff_renamesrc(const char *line, struct patch *patch)
1030{
1031        patch->is_rename = 1;
1032        free(patch->old_name);
1033        patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
1034        return 0;
1035}
1036
1037static int gitdiff_renamedst(const char *line, struct patch *patch)
1038{
1039        patch->is_rename = 1;
1040        free(patch->new_name);
1041        patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
1042        return 0;
1043}
1044
1045static int gitdiff_similarity(const char *line, struct patch *patch)
1046{
1047        unsigned long val = strtoul(line, NULL, 10);
1048        if (val <= 100)
1049                patch->score = val;
1050        return 0;
1051}
1052
1053static int gitdiff_dissimilarity(const char *line, struct patch *patch)
1054{
1055        unsigned long val = strtoul(line, NULL, 10);
1056        if (val <= 100)
1057                patch->score = val;
1058        return 0;
1059}
1060
1061static int gitdiff_index(const char *line, struct patch *patch)
1062{
1063        /*
1064         * index line is N hexadecimal, "..", N hexadecimal,
1065         * and optional space with octal mode.
1066         */
1067        const char *ptr, *eol;
1068        int len;
1069
1070        ptr = strchr(line, '.');
1071        if (!ptr || ptr[1] != '.' || 40 < ptr - line)
1072                return 0;
1073        len = ptr - line;
1074        memcpy(patch->old_sha1_prefix, line, len);
1075        patch->old_sha1_prefix[len] = 0;
1076
1077        line = ptr + 2;
1078        ptr = strchr(line, ' ');
1079        eol = strchrnul(line, '\n');
1080
1081        if (!ptr || eol < ptr)
1082                ptr = eol;
1083        len = ptr - line;
1084
1085        if (40 < len)
1086                return 0;
1087        memcpy(patch->new_sha1_prefix, line, len);
1088        patch->new_sha1_prefix[len] = 0;
1089        if (*ptr == ' ')
1090                patch->old_mode = strtoul(ptr+1, NULL, 8);
1091        return 0;
1092}
1093
1094/*
1095 * This is normal for a diff that doesn't change anything: we'll fall through
1096 * into the next diff. Tell the parser to break out.
1097 */
1098static int gitdiff_unrecognized(const char *line, struct patch *patch)
1099{
1100        return -1;
1101}
1102
1103/*
1104 * Skip p_value leading components from "line"; as we do not accept
1105 * absolute paths, return NULL in that case.
1106 */
1107static const char *skip_tree_prefix(const char *line, int llen)
1108{
1109        int nslash;
1110        int i;
1111
1112        if (!p_value)
1113                return (llen && line[0] == '/') ? NULL : line;
1114
1115        nslash = p_value;
1116        for (i = 0; i < llen; i++) {
1117                int ch = line[i];
1118                if (ch == '/' && --nslash <= 0)
1119                        return (i == 0) ? NULL : &line[i + 1];
1120        }
1121        return NULL;
1122}
1123
1124/*
1125 * This is to extract the same name that appears on "diff --git"
1126 * line.  We do not find and return anything if it is a rename
1127 * patch, and it is OK because we will find the name elsewhere.
1128 * We need to reliably find name only when it is mode-change only,
1129 * creation or deletion of an empty file.  In any of these cases,
1130 * both sides are the same name under a/ and b/ respectively.
1131 */
1132static char *git_header_name(const char *line, int llen)
1133{
1134        const char *name;
1135        const char *second = NULL;
1136        size_t len, line_len;
1137
1138        line += strlen("diff --git ");
1139        llen -= strlen("diff --git ");
1140
1141        if (*line == '"') {
1142                const char *cp;
1143                struct strbuf first = STRBUF_INIT;
1144                struct strbuf sp = STRBUF_INIT;
1145
1146                if (unquote_c_style(&first, line, &second))
1147                        goto free_and_fail1;
1148
1149                /* strip the a/b prefix including trailing slash */
1150                cp = skip_tree_prefix(first.buf, first.len);
1151                if (!cp)
1152                        goto free_and_fail1;
1153                strbuf_remove(&first, 0, cp - first.buf);
1154
1155                /*
1156                 * second points at one past closing dq of name.
1157                 * find the second name.
1158                 */
1159                while ((second < line + llen) && isspace(*second))
1160                        second++;
1161
1162                if (line + llen <= second)
1163                        goto free_and_fail1;
1164                if (*second == '"') {
1165                        if (unquote_c_style(&sp, second, NULL))
1166                                goto free_and_fail1;
1167                        cp = skip_tree_prefix(sp.buf, sp.len);
1168                        if (!cp)
1169                                goto free_and_fail1;
1170                        /* They must match, otherwise ignore */
1171                        if (strcmp(cp, first.buf))
1172                                goto free_and_fail1;
1173                        strbuf_release(&sp);
1174                        return strbuf_detach(&first, NULL);
1175                }
1176
1177                /* unquoted second */
1178                cp = skip_tree_prefix(second, line + llen - second);
1179                if (!cp)
1180                        goto free_and_fail1;
1181                if (line + llen - cp != first.len ||
1182                    memcmp(first.buf, cp, first.len))
1183                        goto free_and_fail1;
1184                return strbuf_detach(&first, NULL);
1185
1186        free_and_fail1:
1187                strbuf_release(&first);
1188                strbuf_release(&sp);
1189                return NULL;
1190        }
1191
1192        /* unquoted first name */
1193        name = skip_tree_prefix(line, llen);
1194        if (!name)
1195                return NULL;
1196
1197        /*
1198         * since the first name is unquoted, a dq if exists must be
1199         * the beginning of the second name.
1200         */
1201        for (second = name; second < line + llen; second++) {
1202                if (*second == '"') {
1203                        struct strbuf sp = STRBUF_INIT;
1204                        const char *np;
1205
1206                        if (unquote_c_style(&sp, second, NULL))
1207                                goto free_and_fail2;
1208
1209                        np = skip_tree_prefix(sp.buf, sp.len);
1210                        if (!np)
1211                                goto free_and_fail2;
1212
1213                        len = sp.buf + sp.len - np;
1214                        if (len < second - name &&
1215                            !strncmp(np, name, len) &&
1216                            isspace(name[len])) {
1217                                /* Good */
1218                                strbuf_remove(&sp, 0, np - sp.buf);
1219                                return strbuf_detach(&sp, NULL);
1220                        }
1221
1222                free_and_fail2:
1223                        strbuf_release(&sp);
1224                        return NULL;
1225                }
1226        }
1227
1228        /*
1229         * Accept a name only if it shows up twice, exactly the same
1230         * form.
1231         */
1232        second = strchr(name, '\n');
1233        if (!second)
1234                return NULL;
1235        line_len = second - name;
1236        for (len = 0 ; ; len++) {
1237                switch (name[len]) {
1238                default:
1239                        continue;
1240                case '\n':
1241                        return NULL;
1242                case '\t': case ' ':
1243                        /*
1244                         * Is this the separator between the preimage
1245                         * and the postimage pathname?  Again, we are
1246                         * only interested in the case where there is
1247                         * no rename, as this is only to set def_name
1248                         * and a rename patch has the names elsewhere
1249                         * in an unambiguous form.
1250                         */
1251                        if (!name[len + 1])
1252                                return NULL; /* no postimage name */
1253                        second = skip_tree_prefix(name + len + 1,
1254                                                  line_len - (len + 1));
1255                        if (!second)
1256                                return NULL;
1257                        /*
1258                         * Does len bytes starting at "name" and "second"
1259                         * (that are separated by one HT or SP we just
1260                         * found) exactly match?
1261                         */
1262                        if (second[len] == '\n' && !strncmp(name, second, len))
1263                                return xmemdupz(name, len);
1264                }
1265        }
1266}
1267
1268/* Verify that we recognize the lines following a git header */
1269static int parse_git_header(const char *line, int len, unsigned int size, struct patch *patch)
1270{
1271        unsigned long offset;
1272
1273        /* A git diff has explicit new/delete information, so we don't guess */
1274        patch->is_new = 0;
1275        patch->is_delete = 0;
1276
1277        /*
1278         * Some things may not have the old name in the
1279         * rest of the headers anywhere (pure mode changes,
1280         * or removing or adding empty files), so we get
1281         * the default name from the header.
1282         */
1283        patch->def_name = git_header_name(line, len);
1284        if (patch->def_name && root) {
1285                char *s = xstrfmt("%s%s", root, patch->def_name);
1286                free(patch->def_name);
1287                patch->def_name = s;
1288        }
1289
1290        line += len;
1291        size -= len;
1292        linenr++;
1293        for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
1294                static const struct opentry {
1295                        const char *str;
1296                        int (*fn)(const char *, struct patch *);
1297                } optable[] = {
1298                        { "@@ -", gitdiff_hdrend },
1299                        { "--- ", gitdiff_oldname },
1300                        { "+++ ", gitdiff_newname },
1301                        { "old mode ", gitdiff_oldmode },
1302                        { "new mode ", gitdiff_newmode },
1303                        { "deleted file mode ", gitdiff_delete },
1304                        { "new file mode ", gitdiff_newfile },
1305                        { "copy from ", gitdiff_copysrc },
1306                        { "copy to ", gitdiff_copydst },
1307                        { "rename old ", gitdiff_renamesrc },
1308                        { "rename new ", gitdiff_renamedst },
1309                        { "rename from ", gitdiff_renamesrc },
1310                        { "rename to ", gitdiff_renamedst },
1311                        { "similarity index ", gitdiff_similarity },
1312                        { "dissimilarity index ", gitdiff_dissimilarity },
1313                        { "index ", gitdiff_index },
1314                        { "", gitdiff_unrecognized },
1315                };
1316                int i;
1317
1318                len = linelen(line, size);
1319                if (!len || line[len-1] != '\n')
1320                        break;
1321                for (i = 0; i < ARRAY_SIZE(optable); i++) {
1322                        const struct opentry *p = optable + i;
1323                        int oplen = strlen(p->str);
1324                        if (len < oplen || memcmp(p->str, line, oplen))
1325                                continue;
1326                        if (p->fn(line + oplen, patch) < 0)
1327                                return offset;
1328                        break;
1329                }
1330        }
1331
1332        return offset;
1333}
1334
1335static int parse_num(const char *line, unsigned long *p)
1336{
1337        char *ptr;
1338
1339        if (!isdigit(*line))
1340                return 0;
1341        *p = strtoul(line, &ptr, 10);
1342        return ptr - line;
1343}
1344
1345static int parse_range(const char *line, int len, int offset, const char *expect,
1346                       unsigned long *p1, unsigned long *p2)
1347{
1348        int digits, ex;
1349
1350        if (offset < 0 || offset >= len)
1351                return -1;
1352        line += offset;
1353        len -= offset;
1354
1355        digits = parse_num(line, p1);
1356        if (!digits)
1357                return -1;
1358
1359        offset += digits;
1360        line += digits;
1361        len -= digits;
1362
1363        *p2 = 1;
1364        if (*line == ',') {
1365                digits = parse_num(line+1, p2);
1366                if (!digits)
1367                        return -1;
1368
1369                offset += digits+1;
1370                line += digits+1;
1371                len -= digits+1;
1372        }
1373
1374        ex = strlen(expect);
1375        if (ex > len)
1376                return -1;
1377        if (memcmp(line, expect, ex))
1378                return -1;
1379
1380        return offset + ex;
1381}
1382
1383static void recount_diff(const char *line, int size, struct fragment *fragment)
1384{
1385        int oldlines = 0, newlines = 0, ret = 0;
1386
1387        if (size < 1) {
1388                warning("recount: ignore empty hunk");
1389                return;
1390        }
1391
1392        for (;;) {
1393                int len = linelen(line, size);
1394                size -= len;
1395                line += len;
1396
1397                if (size < 1)
1398                        break;
1399
1400                switch (*line) {
1401                case ' ': case '\n':
1402                        newlines++;
1403                        /* fall through */
1404                case '-':
1405                        oldlines++;
1406                        continue;
1407                case '+':
1408                        newlines++;
1409                        continue;
1410                case '\\':
1411                        continue;
1412                case '@':
1413                        ret = size < 3 || !starts_with(line, "@@ ");
1414                        break;
1415                case 'd':
1416                        ret = size < 5 || !starts_with(line, "diff ");
1417                        break;
1418                default:
1419                        ret = -1;
1420                        break;
1421                }
1422                if (ret) {
1423                        warning(_("recount: unexpected line: %.*s"),
1424                                (int)linelen(line, size), line);
1425                        return;
1426                }
1427                break;
1428        }
1429        fragment->oldlines = oldlines;
1430        fragment->newlines = newlines;
1431}
1432
1433/*
1434 * Parse a unified diff fragment header of the
1435 * form "@@ -a,b +c,d @@"
1436 */
1437static int parse_fragment_header(const char *line, int len, struct fragment *fragment)
1438{
1439        int offset;
1440
1441        if (!len || line[len-1] != '\n')
1442                return -1;
1443
1444        /* Figure out the number of lines in a fragment */
1445        offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
1446        offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
1447
1448        return offset;
1449}
1450
1451static int find_header(const char *line, unsigned long size, int *hdrsize, struct patch *patch)
1452{
1453        unsigned long offset, len;
1454
1455        patch->is_toplevel_relative = 0;
1456        patch->is_rename = patch->is_copy = 0;
1457        patch->is_new = patch->is_delete = -1;
1458        patch->old_mode = patch->new_mode = 0;
1459        patch->old_name = patch->new_name = NULL;
1460        for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
1461                unsigned long nextlen;
1462
1463                len = linelen(line, size);
1464                if (!len)
1465                        break;
1466
1467                /* Testing this early allows us to take a few shortcuts.. */
1468                if (len < 6)
1469                        continue;
1470
1471                /*
1472                 * Make sure we don't find any unconnected patch fragments.
1473                 * That's a sign that we didn't find a header, and that a
1474                 * patch has become corrupted/broken up.
1475                 */
1476                if (!memcmp("@@ -", line, 4)) {
1477                        struct fragment dummy;
1478                        if (parse_fragment_header(line, len, &dummy) < 0)
1479                                continue;
1480                        die(_("patch fragment without header at line %d: %.*s"),
1481                            linenr, (int)len-1, line);
1482                }
1483
1484                if (size < len + 6)
1485                        break;
1486
1487                /*
1488                 * Git patch? It might not have a real patch, just a rename
1489                 * or mode change, so we handle that specially
1490                 */
1491                if (!memcmp("diff --git ", line, 11)) {
1492                        int git_hdr_len = parse_git_header(line, len, size, patch);
1493                        if (git_hdr_len <= len)
1494                                continue;
1495                        if (!patch->old_name && !patch->new_name) {
1496                                if (!patch->def_name)
1497                                        die(Q_("git diff header lacks filename information when removing "
1498                                               "%d leading pathname component (line %d)",
1499                                               "git diff header lacks filename information when removing "
1500                                               "%d leading pathname components (line %d)",
1501                                               p_value),
1502                                            p_value, linenr);
1503                                patch->old_name = xstrdup(patch->def_name);
1504                                patch->new_name = xstrdup(patch->def_name);
1505                        }
1506                        if (!patch->is_delete && !patch->new_name)
1507                                die("git diff header lacks filename information "
1508                                    "(line %d)", linenr);
1509                        patch->is_toplevel_relative = 1;
1510                        *hdrsize = git_hdr_len;
1511                        return offset;
1512                }
1513
1514                /* --- followed by +++ ? */
1515                if (memcmp("--- ", line,  4) || memcmp("+++ ", line + len, 4))
1516                        continue;
1517
1518                /*
1519                 * We only accept unified patches, so we want it to
1520                 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1521                 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1522                 */
1523                nextlen = linelen(line + len, size - len);
1524                if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
1525                        continue;
1526
1527                /* Ok, we'll consider it a patch */
1528                parse_traditional_patch(line, line+len, patch);
1529                *hdrsize = len + nextlen;
1530                linenr += 2;
1531                return offset;
1532        }
1533        return -1;
1534}
1535
1536static void record_ws_error(unsigned result, const char *line, int len, int linenr)
1537{
1538        char *err;
1539
1540        if (!result)
1541                return;
1542
1543        whitespace_error++;
1544        if (squelch_whitespace_errors &&
1545            squelch_whitespace_errors < whitespace_error)
1546                return;
1547
1548        err = whitespace_error_string(result);
1549        fprintf(stderr, "%s:%d: %s.\n%.*s\n",
1550                patch_input_file, linenr, err, len, line);
1551        free(err);
1552}
1553
1554static void check_whitespace(const char *line, int len, unsigned ws_rule)
1555{
1556        unsigned result = ws_check(line + 1, len - 1, ws_rule);
1557
1558        record_ws_error(result, line + 1, len - 2, linenr);
1559}
1560
1561/*
1562 * Parse a unified diff. Note that this really needs to parse each
1563 * fragment separately, since the only way to know the difference
1564 * between a "---" that is part of a patch, and a "---" that starts
1565 * the next patch is to look at the line counts..
1566 */
1567static int parse_fragment(const char *line, unsigned long size,
1568                          struct patch *patch, struct fragment *fragment)
1569{
1570        int added, deleted;
1571        int len = linelen(line, size), offset;
1572        unsigned long oldlines, newlines;
1573        unsigned long leading, trailing;
1574
1575        offset = parse_fragment_header(line, len, fragment);
1576        if (offset < 0)
1577                return -1;
1578        if (offset > 0 && patch->recount)
1579                recount_diff(line + offset, size - offset, fragment);
1580        oldlines = fragment->oldlines;
1581        newlines = fragment->newlines;
1582        leading = 0;
1583        trailing = 0;
1584
1585        /* Parse the thing.. */
1586        line += len;
1587        size -= len;
1588        linenr++;
1589        added = deleted = 0;
1590        for (offset = len;
1591             0 < size;
1592             offset += len, size -= len, line += len, linenr++) {
1593                if (!oldlines && !newlines)
1594                        break;
1595                len = linelen(line, size);
1596                if (!len || line[len-1] != '\n')
1597                        return -1;
1598                switch (*line) {
1599                default:
1600                        return -1;
1601                case '\n': /* newer GNU diff, an empty context line */
1602                case ' ':
1603                        oldlines--;
1604                        newlines--;
1605                        if (!deleted && !added)
1606                                leading++;
1607                        trailing++;
1608                        break;
1609                case '-':
1610                        if (apply_in_reverse &&
1611                            ws_error_action != nowarn_ws_error)
1612                                check_whitespace(line, len, patch->ws_rule);
1613                        deleted++;
1614                        oldlines--;
1615                        trailing = 0;
1616                        break;
1617                case '+':
1618                        if (!apply_in_reverse &&
1619                            ws_error_action != nowarn_ws_error)
1620                                check_whitespace(line, len, patch->ws_rule);
1621                        added++;
1622                        newlines--;
1623                        trailing = 0;
1624                        break;
1625
1626                /*
1627                 * We allow "\ No newline at end of file". Depending
1628                 * on locale settings when the patch was produced we
1629                 * don't know what this line looks like. The only
1630                 * thing we do know is that it begins with "\ ".
1631                 * Checking for 12 is just for sanity check -- any
1632                 * l10n of "\ No newline..." is at least that long.
1633                 */
1634                case '\\':
1635                        if (len < 12 || memcmp(line, "\\ ", 2))
1636                                return -1;
1637                        break;
1638                }
1639        }
1640        if (oldlines || newlines)
1641                return -1;
1642        fragment->leading = leading;
1643        fragment->trailing = trailing;
1644
1645        /*
1646         * If a fragment ends with an incomplete line, we failed to include
1647         * it in the above loop because we hit oldlines == newlines == 0
1648         * before seeing it.
1649         */
1650        if (12 < size && !memcmp(line, "\\ ", 2))
1651                offset += linelen(line, size);
1652
1653        patch->lines_added += added;
1654        patch->lines_deleted += deleted;
1655
1656        if (0 < patch->is_new && oldlines)
1657                return error(_("new file depends on old contents"));
1658        if (0 < patch->is_delete && newlines)
1659                return error(_("deleted file still has contents"));
1660        return offset;
1661}
1662
1663/*
1664 * We have seen "diff --git a/... b/..." header (or a traditional patch
1665 * header).  Read hunks that belong to this patch into fragments and hang
1666 * them to the given patch structure.
1667 *
1668 * The (fragment->patch, fragment->size) pair points into the memory given
1669 * by the caller, not a copy, when we return.
1670 */
1671static int parse_single_patch(const char *line, unsigned long size, struct patch *patch)
1672{
1673        unsigned long offset = 0;
1674        unsigned long oldlines = 0, newlines = 0, context = 0;
1675        struct fragment **fragp = &patch->fragments;
1676
1677        while (size > 4 && !memcmp(line, "@@ -", 4)) {
1678                struct fragment *fragment;
1679                int len;
1680
1681                fragment = xcalloc(1, sizeof(*fragment));
1682                fragment->linenr = linenr;
1683                len = parse_fragment(line, size, patch, fragment);
1684                if (len <= 0)
1685                        die(_("corrupt patch at line %d"), linenr);
1686                fragment->patch = line;
1687                fragment->size = len;
1688                oldlines += fragment->oldlines;
1689                newlines += fragment->newlines;
1690                context += fragment->leading + fragment->trailing;
1691
1692                *fragp = fragment;
1693                fragp = &fragment->next;
1694
1695                offset += len;
1696                line += len;
1697                size -= len;
1698        }
1699
1700        /*
1701         * If something was removed (i.e. we have old-lines) it cannot
1702         * be creation, and if something was added it cannot be
1703         * deletion.  However, the reverse is not true; --unified=0
1704         * patches that only add are not necessarily creation even
1705         * though they do not have any old lines, and ones that only
1706         * delete are not necessarily deletion.
1707         *
1708         * Unfortunately, a real creation/deletion patch do _not_ have
1709         * any context line by definition, so we cannot safely tell it
1710         * apart with --unified=0 insanity.  At least if the patch has
1711         * more than one hunk it is not creation or deletion.
1712         */
1713        if (patch->is_new < 0 &&
1714            (oldlines || (patch->fragments && patch->fragments->next)))
1715                patch->is_new = 0;
1716        if (patch->is_delete < 0 &&
1717            (newlines || (patch->fragments && patch->fragments->next)))
1718                patch->is_delete = 0;
1719
1720        if (0 < patch->is_new && oldlines)
1721                die(_("new file %s depends on old contents"), patch->new_name);
1722        if (0 < patch->is_delete && newlines)
1723                die(_("deleted file %s still has contents"), patch->old_name);
1724        if (!patch->is_delete && !newlines && context)
1725                fprintf_ln(stderr,
1726                           _("** warning: "
1727                             "file %s becomes empty but is not deleted"),
1728                           patch->new_name);
1729
1730        return offset;
1731}
1732
1733static inline int metadata_changes(struct patch *patch)
1734{
1735        return  patch->is_rename > 0 ||
1736                patch->is_copy > 0 ||
1737                patch->is_new > 0 ||
1738                patch->is_delete ||
1739                (patch->old_mode && patch->new_mode &&
1740                 patch->old_mode != patch->new_mode);
1741}
1742
1743static char *inflate_it(const void *data, unsigned long size,
1744                        unsigned long inflated_size)
1745{
1746        git_zstream stream;
1747        void *out;
1748        int st;
1749
1750        memset(&stream, 0, sizeof(stream));
1751
1752        stream.next_in = (unsigned char *)data;
1753        stream.avail_in = size;
1754        stream.next_out = out = xmalloc(inflated_size);
1755        stream.avail_out = inflated_size;
1756        git_inflate_init(&stream);
1757        st = git_inflate(&stream, Z_FINISH);
1758        git_inflate_end(&stream);
1759        if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1760                free(out);
1761                return NULL;
1762        }
1763        return out;
1764}
1765
1766/*
1767 * Read a binary hunk and return a new fragment; fragment->patch
1768 * points at an allocated memory that the caller must free, so
1769 * it is marked as "->free_patch = 1".
1770 */
1771static struct fragment *parse_binary_hunk(char **buf_p,
1772                                          unsigned long *sz_p,
1773                                          int *status_p,
1774                                          int *used_p)
1775{
1776        /*
1777         * Expect a line that begins with binary patch method ("literal"
1778         * or "delta"), followed by the length of data before deflating.
1779         * a sequence of 'length-byte' followed by base-85 encoded data
1780         * should follow, terminated by a newline.
1781         *
1782         * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1783         * and we would limit the patch line to 66 characters,
1784         * so one line can fit up to 13 groups that would decode
1785         * to 52 bytes max.  The length byte 'A'-'Z' corresponds
1786         * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1787         */
1788        int llen, used;
1789        unsigned long size = *sz_p;
1790        char *buffer = *buf_p;
1791        int patch_method;
1792        unsigned long origlen;
1793        char *data = NULL;
1794        int hunk_size = 0;
1795        struct fragment *frag;
1796
1797        llen = linelen(buffer, size);
1798        used = llen;
1799
1800        *status_p = 0;
1801
1802        if (starts_with(buffer, "delta ")) {
1803                patch_method = BINARY_DELTA_DEFLATED;
1804                origlen = strtoul(buffer + 6, NULL, 10);
1805        }
1806        else if (starts_with(buffer, "literal ")) {
1807                patch_method = BINARY_LITERAL_DEFLATED;
1808                origlen = strtoul(buffer + 8, NULL, 10);
1809        }
1810        else
1811                return NULL;
1812
1813        linenr++;
1814        buffer += llen;
1815        while (1) {
1816                int byte_length, max_byte_length, newsize;
1817                llen = linelen(buffer, size);
1818                used += llen;
1819                linenr++;
1820                if (llen == 1) {
1821                        /* consume the blank line */
1822                        buffer++;
1823                        size--;
1824                        break;
1825                }
1826                /*
1827                 * Minimum line is "A00000\n" which is 7-byte long,
1828                 * and the line length must be multiple of 5 plus 2.
1829                 */
1830                if ((llen < 7) || (llen-2) % 5)
1831                        goto corrupt;
1832                max_byte_length = (llen - 2) / 5 * 4;
1833                byte_length = *buffer;
1834                if ('A' <= byte_length && byte_length <= 'Z')
1835                        byte_length = byte_length - 'A' + 1;
1836                else if ('a' <= byte_length && byte_length <= 'z')
1837                        byte_length = byte_length - 'a' + 27;
1838                else
1839                        goto corrupt;
1840                /* if the input length was not multiple of 4, we would
1841                 * have filler at the end but the filler should never
1842                 * exceed 3 bytes
1843                 */
1844                if (max_byte_length < byte_length ||
1845                    byte_length <= max_byte_length - 4)
1846                        goto corrupt;
1847                newsize = hunk_size + byte_length;
1848                data = xrealloc(data, newsize);
1849                if (decode_85(data + hunk_size, buffer + 1, byte_length))
1850                        goto corrupt;
1851                hunk_size = newsize;
1852                buffer += llen;
1853                size -= llen;
1854        }
1855
1856        frag = xcalloc(1, sizeof(*frag));
1857        frag->patch = inflate_it(data, hunk_size, origlen);
1858        frag->free_patch = 1;
1859        if (!frag->patch)
1860                goto corrupt;
1861        free(data);
1862        frag->size = origlen;
1863        *buf_p = buffer;
1864        *sz_p = size;
1865        *used_p = used;
1866        frag->binary_patch_method = patch_method;
1867        return frag;
1868
1869 corrupt:
1870        free(data);
1871        *status_p = -1;
1872        error(_("corrupt binary patch at line %d: %.*s"),
1873              linenr-1, llen-1, buffer);
1874        return NULL;
1875}
1876
1877static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1878{
1879        /*
1880         * We have read "GIT binary patch\n"; what follows is a line
1881         * that says the patch method (currently, either "literal" or
1882         * "delta") and the length of data before deflating; a
1883         * sequence of 'length-byte' followed by base-85 encoded data
1884         * follows.
1885         *
1886         * When a binary patch is reversible, there is another binary
1887         * hunk in the same format, starting with patch method (either
1888         * "literal" or "delta") with the length of data, and a sequence
1889         * of length-byte + base-85 encoded data, terminated with another
1890         * empty line.  This data, when applied to the postimage, produces
1891         * the preimage.
1892         */
1893        struct fragment *forward;
1894        struct fragment *reverse;
1895        int status;
1896        int used, used_1;
1897
1898        forward = parse_binary_hunk(&buffer, &size, &status, &used);
1899        if (!forward && !status)
1900                /* there has to be one hunk (forward hunk) */
1901                return error(_("unrecognized binary patch at line %d"), linenr-1);
1902        if (status)
1903                /* otherwise we already gave an error message */
1904                return status;
1905
1906        reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1907        if (reverse)
1908                used += used_1;
1909        else if (status) {
1910                /*
1911                 * Not having reverse hunk is not an error, but having
1912                 * a corrupt reverse hunk is.
1913                 */
1914                free((void*) forward->patch);
1915                free(forward);
1916                return status;
1917        }
1918        forward->next = reverse;
1919        patch->fragments = forward;
1920        patch->is_binary = 1;
1921        return used;
1922}
1923
1924static void prefix_one(char **name)
1925{
1926        char *old_name = *name;
1927        if (!old_name)
1928                return;
1929        *name = xstrdup(prefix_filename(prefix, prefix_length, *name));
1930        free(old_name);
1931}
1932
1933static void prefix_patch(struct patch *p)
1934{
1935        if (!prefix || p->is_toplevel_relative)
1936                return;
1937        prefix_one(&p->new_name);
1938        prefix_one(&p->old_name);
1939}
1940
1941/*
1942 * include/exclude
1943 */
1944
1945static struct string_list limit_by_name;
1946static int has_include;
1947static void add_name_limit(const char *name, int exclude)
1948{
1949        struct string_list_item *it;
1950
1951        it = string_list_append(&limit_by_name, name);
1952        it->util = exclude ? NULL : (void *) 1;
1953}
1954
1955static int use_patch(struct patch *p)
1956{
1957        const char *pathname = p->new_name ? p->new_name : p->old_name;
1958        int i;
1959
1960        /* Paths outside are not touched regardless of "--include" */
1961        if (0 < prefix_length) {
1962                int pathlen = strlen(pathname);
1963                if (pathlen <= prefix_length ||
1964                    memcmp(prefix, pathname, prefix_length))
1965                        return 0;
1966        }
1967
1968        /* See if it matches any of exclude/include rule */
1969        for (i = 0; i < limit_by_name.nr; i++) {
1970                struct string_list_item *it = &limit_by_name.items[i];
1971                if (!wildmatch(it->string, pathname, 0, NULL))
1972                        return (it->util != NULL);
1973        }
1974
1975        /*
1976         * If we had any include, a path that does not match any rule is
1977         * not used.  Otherwise, we saw bunch of exclude rules (or none)
1978         * and such a path is used.
1979         */
1980        return !has_include;
1981}
1982
1983
1984/*
1985 * Read the patch text in "buffer" that extends for "size" bytes; stop
1986 * reading after seeing a single patch (i.e. changes to a single file).
1987 * Create fragments (i.e. patch hunks) and hang them to the given patch.
1988 * Return the number of bytes consumed, so that the caller can call us
1989 * again for the next patch.
1990 */
1991static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
1992{
1993        int hdrsize, patchsize;
1994        int offset = find_header(buffer, size, &hdrsize, patch);
1995
1996        if (offset < 0)
1997                return offset;
1998
1999        prefix_patch(patch);
2000
2001        if (!use_patch(patch))
2002                patch->ws_rule = 0;
2003        else
2004                patch->ws_rule = whitespace_rule(patch->new_name
2005                                                 ? patch->new_name
2006                                                 : patch->old_name);
2007
2008        patchsize = parse_single_patch(buffer + offset + hdrsize,
2009                                       size - offset - hdrsize, patch);
2010
2011        if (!patchsize) {
2012                static const char git_binary[] = "GIT binary patch\n";
2013                int hd = hdrsize + offset;
2014                unsigned long llen = linelen(buffer + hd, size - hd);
2015
2016                if (llen == sizeof(git_binary) - 1 &&
2017                    !memcmp(git_binary, buffer + hd, llen)) {
2018                        int used;
2019                        linenr++;
2020                        used = parse_binary(buffer + hd + llen,
2021                                            size - hd - llen, patch);
2022                        if (used)
2023                                patchsize = used + llen;
2024                        else
2025                                patchsize = 0;
2026                }
2027                else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
2028                        static const char *binhdr[] = {
2029                                "Binary files ",
2030                                "Files ",
2031                                NULL,
2032                        };
2033                        int i;
2034                        for (i = 0; binhdr[i]; i++) {
2035                                int len = strlen(binhdr[i]);
2036                                if (len < size - hd &&
2037                                    !memcmp(binhdr[i], buffer + hd, len)) {
2038                                        linenr++;
2039                                        patch->is_binary = 1;
2040                                        patchsize = llen;
2041                                        break;
2042                                }
2043                        }
2044                }
2045
2046                /* Empty patch cannot be applied if it is a text patch
2047                 * without metadata change.  A binary patch appears
2048                 * empty to us here.
2049                 */
2050                if ((apply || check) &&
2051                    (!patch->is_binary && !metadata_changes(patch)))
2052                        die(_("patch with only garbage at line %d"), linenr);
2053        }
2054
2055        return offset + hdrsize + patchsize;
2056}
2057
2058#define swap(a,b) myswap((a),(b),sizeof(a))
2059
2060#define myswap(a, b, size) do {         \
2061        unsigned char mytmp[size];      \
2062        memcpy(mytmp, &a, size);                \
2063        memcpy(&a, &b, size);           \
2064        memcpy(&b, mytmp, size);                \
2065} while (0)
2066
2067static void reverse_patches(struct patch *p)
2068{
2069        for (; p; p = p->next) {
2070                struct fragment *frag = p->fragments;
2071
2072                swap(p->new_name, p->old_name);
2073                swap(p->new_mode, p->old_mode);
2074                swap(p->is_new, p->is_delete);
2075                swap(p->lines_added, p->lines_deleted);
2076                swap(p->old_sha1_prefix, p->new_sha1_prefix);
2077
2078                for (; frag; frag = frag->next) {
2079                        swap(frag->newpos, frag->oldpos);
2080                        swap(frag->newlines, frag->oldlines);
2081                }
2082        }
2083}
2084
2085static const char pluses[] =
2086"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
2087static const char minuses[]=
2088"----------------------------------------------------------------------";
2089
2090static void show_stats(struct patch *patch)
2091{
2092        struct strbuf qname = STRBUF_INIT;
2093        char *cp = patch->new_name ? patch->new_name : patch->old_name;
2094        int max, add, del;
2095
2096        quote_c_style(cp, &qname, NULL, 0);
2097
2098        /*
2099         * "scale" the filename
2100         */
2101        max = max_len;
2102        if (max > 50)
2103                max = 50;
2104
2105        if (qname.len > max) {
2106                cp = strchr(qname.buf + qname.len + 3 - max, '/');
2107                if (!cp)
2108                        cp = qname.buf + qname.len + 3 - max;
2109                strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);
2110        }
2111
2112        if (patch->is_binary) {
2113                printf(" %-*s |  Bin\n", max, qname.buf);
2114                strbuf_release(&qname);
2115                return;
2116        }
2117
2118        printf(" %-*s |", max, qname.buf);
2119        strbuf_release(&qname);
2120
2121        /*
2122         * scale the add/delete
2123         */
2124        max = max + max_change > 70 ? 70 - max : max_change;
2125        add = patch->lines_added;
2126        del = patch->lines_deleted;
2127
2128        if (max_change > 0) {
2129                int total = ((add + del) * max + max_change / 2) / max_change;
2130                add = (add * max + max_change / 2) / max_change;
2131                del = total - add;
2132        }
2133        printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,
2134                add, pluses, del, minuses);
2135}
2136
2137static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
2138{
2139        switch (st->st_mode & S_IFMT) {
2140        case S_IFLNK:
2141                if (strbuf_readlink(buf, path, st->st_size) < 0)
2142                        return error(_("unable to read symlink %s"), path);
2143                return 0;
2144        case S_IFREG:
2145                if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
2146                        return error(_("unable to open or read %s"), path);
2147                convert_to_git(path, buf->buf, buf->len, buf, 0);
2148                return 0;
2149        default:
2150                return -1;
2151        }
2152}
2153
2154/*
2155 * Update the preimage, and the common lines in postimage,
2156 * from buffer buf of length len. If postlen is 0 the postimage
2157 * is updated in place, otherwise it's updated on a new buffer
2158 * of length postlen
2159 */
2160
2161static void update_pre_post_images(struct image *preimage,
2162                                   struct image *postimage,
2163                                   char *buf,
2164                                   size_t len, size_t postlen)
2165{
2166        int i, ctx, reduced;
2167        char *new, *old, *fixed;
2168        struct image fixed_preimage;
2169
2170        /*
2171         * Update the preimage with whitespace fixes.  Note that we
2172         * are not losing preimage->buf -- apply_one_fragment() will
2173         * free "oldlines".
2174         */
2175        prepare_image(&fixed_preimage, buf, len, 1);
2176        assert(postlen
2177               ? fixed_preimage.nr == preimage->nr
2178               : fixed_preimage.nr <= preimage->nr);
2179        for (i = 0; i < fixed_preimage.nr; i++)
2180                fixed_preimage.line[i].flag = preimage->line[i].flag;
2181        free(preimage->line_allocated);
2182        *preimage = fixed_preimage;
2183
2184        /*
2185         * Adjust the common context lines in postimage. This can be
2186         * done in-place when we are shrinking it with whitespace
2187         * fixing, but needs a new buffer when ignoring whitespace or
2188         * expanding leading tabs to spaces.
2189         *
2190         * We trust the caller to tell us if the update can be done
2191         * in place (postlen==0) or not.
2192         */
2193        old = postimage->buf;
2194        if (postlen)
2195                new = postimage->buf = xmalloc(postlen);
2196        else
2197                new = old;
2198        fixed = preimage->buf;
2199
2200        for (i = reduced = ctx = 0; i < postimage->nr; i++) {
2201                size_t len = postimage->line[i].len;
2202                if (!(postimage->line[i].flag & LINE_COMMON)) {
2203                        /* an added line -- no counterparts in preimage */
2204                        memmove(new, old, len);
2205                        old += len;
2206                        new += len;
2207                        continue;
2208                }
2209
2210                /* a common context -- skip it in the original postimage */
2211                old += len;
2212
2213                /* and find the corresponding one in the fixed preimage */
2214                while (ctx < preimage->nr &&
2215                       !(preimage->line[ctx].flag & LINE_COMMON)) {
2216                        fixed += preimage->line[ctx].len;
2217                        ctx++;
2218                }
2219
2220                /*
2221                 * preimage is expected to run out, if the caller
2222                 * fixed addition of trailing blank lines.
2223                 */
2224                if (preimage->nr <= ctx) {
2225                        reduced++;
2226                        continue;
2227                }
2228
2229                /* and copy it in, while fixing the line length */
2230                len = preimage->line[ctx].len;
2231                memcpy(new, fixed, len);
2232                new += len;
2233                fixed += len;
2234                postimage->line[i].len = len;
2235                ctx++;
2236        }
2237
2238        /* Fix the length of the whole thing */
2239        postimage->len = new - postimage->buf;
2240        postimage->nr -= reduced;
2241}
2242
2243static int match_fragment(struct image *img,
2244                          struct image *preimage,
2245                          struct image *postimage,
2246                          unsigned long try,
2247                          int try_lno,
2248                          unsigned ws_rule,
2249                          int match_beginning, int match_end)
2250{
2251        int i;
2252        char *fixed_buf, *buf, *orig, *target;
2253        struct strbuf fixed;
2254        size_t fixed_len, postlen;
2255        int preimage_limit;
2256
2257        if (preimage->nr + try_lno <= img->nr) {
2258                /*
2259                 * The hunk falls within the boundaries of img.
2260                 */
2261                preimage_limit = preimage->nr;
2262                if (match_end && (preimage->nr + try_lno != img->nr))
2263                        return 0;
2264        } else if (ws_error_action == correct_ws_error &&
2265                   (ws_rule & WS_BLANK_AT_EOF)) {
2266                /*
2267                 * This hunk extends beyond the end of img, and we are
2268                 * removing blank lines at the end of the file.  This
2269                 * many lines from the beginning of the preimage must
2270                 * match with img, and the remainder of the preimage
2271                 * must be blank.
2272                 */
2273                preimage_limit = img->nr - try_lno;
2274        } else {
2275                /*
2276                 * The hunk extends beyond the end of the img and
2277                 * we are not removing blanks at the end, so we
2278                 * should reject the hunk at this position.
2279                 */
2280                return 0;
2281        }
2282
2283        if (match_beginning && try_lno)
2284                return 0;
2285
2286        /* Quick hash check */
2287        for (i = 0; i < preimage_limit; i++)
2288                if ((img->line[try_lno + i].flag & LINE_PATCHED) ||
2289                    (preimage->line[i].hash != img->line[try_lno + i].hash))
2290                        return 0;
2291
2292        if (preimage_limit == preimage->nr) {
2293                /*
2294                 * Do we have an exact match?  If we were told to match
2295                 * at the end, size must be exactly at try+fragsize,
2296                 * otherwise try+fragsize must be still within the preimage,
2297                 * and either case, the old piece should match the preimage
2298                 * exactly.
2299                 */
2300                if ((match_end
2301                     ? (try + preimage->len == img->len)
2302                     : (try + preimage->len <= img->len)) &&
2303                    !memcmp(img->buf + try, preimage->buf, preimage->len))
2304                        return 1;
2305        } else {
2306                /*
2307                 * The preimage extends beyond the end of img, so
2308                 * there cannot be an exact match.
2309                 *
2310                 * There must be one non-blank context line that match
2311                 * a line before the end of img.
2312                 */
2313                char *buf_end;
2314
2315                buf = preimage->buf;
2316                buf_end = buf;
2317                for (i = 0; i < preimage_limit; i++)
2318                        buf_end += preimage->line[i].len;
2319
2320                for ( ; buf < buf_end; buf++)
2321                        if (!isspace(*buf))
2322                                break;
2323                if (buf == buf_end)
2324                        return 0;
2325        }
2326
2327        /*
2328         * No exact match. If we are ignoring whitespace, run a line-by-line
2329         * fuzzy matching. We collect all the line length information because
2330         * we need it to adjust whitespace if we match.
2331         */
2332        if (ws_ignore_action == ignore_ws_change) {
2333                size_t imgoff = 0;
2334                size_t preoff = 0;
2335                size_t postlen = postimage->len;
2336                size_t extra_chars;
2337                char *preimage_eof;
2338                char *preimage_end;
2339                for (i = 0; i < preimage_limit; i++) {
2340                        size_t prelen = preimage->line[i].len;
2341                        size_t imglen = img->line[try_lno+i].len;
2342
2343                        if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,
2344                                              preimage->buf + preoff, prelen))
2345                                return 0;
2346                        if (preimage->line[i].flag & LINE_COMMON)
2347                                postlen += imglen - prelen;
2348                        imgoff += imglen;
2349                        preoff += prelen;
2350                }
2351
2352                /*
2353                 * Ok, the preimage matches with whitespace fuzz.
2354                 *
2355                 * imgoff now holds the true length of the target that
2356                 * matches the preimage before the end of the file.
2357                 *
2358                 * Count the number of characters in the preimage that fall
2359                 * beyond the end of the file and make sure that all of them
2360                 * are whitespace characters. (This can only happen if
2361                 * we are removing blank lines at the end of the file.)
2362                 */
2363                buf = preimage_eof = preimage->buf + preoff;
2364                for ( ; i < preimage->nr; i++)
2365                        preoff += preimage->line[i].len;
2366                preimage_end = preimage->buf + preoff;
2367                for ( ; buf < preimage_end; buf++)
2368                        if (!isspace(*buf))
2369                                return 0;
2370
2371                /*
2372                 * Update the preimage and the common postimage context
2373                 * lines to use the same whitespace as the target.
2374                 * If whitespace is missing in the target (i.e.
2375                 * if the preimage extends beyond the end of the file),
2376                 * use the whitespace from the preimage.
2377                 */
2378                extra_chars = preimage_end - preimage_eof;
2379                strbuf_init(&fixed, imgoff + extra_chars);
2380                strbuf_add(&fixed, img->buf + try, imgoff);
2381                strbuf_add(&fixed, preimage_eof, extra_chars);
2382                fixed_buf = strbuf_detach(&fixed, &fixed_len);
2383                update_pre_post_images(preimage, postimage,
2384                                fixed_buf, fixed_len, postlen);
2385                return 1;
2386        }
2387
2388        if (ws_error_action != correct_ws_error)
2389                return 0;
2390
2391        /*
2392         * The hunk does not apply byte-by-byte, but the hash says
2393         * it might with whitespace fuzz. We haven't been asked to
2394         * ignore whitespace, we were asked to correct whitespace
2395         * errors, so let's try matching after whitespace correction.
2396         *
2397         * The preimage may extend beyond the end of the file,
2398         * but in this loop we will only handle the part of the
2399         * preimage that falls within the file.
2400         */
2401        strbuf_init(&fixed, preimage->len + 1);
2402        orig = preimage->buf;
2403        target = img->buf + try;
2404        postlen = 0;
2405        for (i = 0; i < preimage_limit; i++) {
2406                size_t oldlen = preimage->line[i].len;
2407                size_t tgtlen = img->line[try_lno + i].len;
2408                size_t fixstart = fixed.len;
2409                struct strbuf tgtfix;
2410                int match;
2411
2412                /* Try fixing the line in the preimage */
2413                ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);
2414
2415                /* Try fixing the line in the target */
2416                strbuf_init(&tgtfix, tgtlen);
2417                ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);
2418
2419                /*
2420                 * If they match, either the preimage was based on
2421                 * a version before our tree fixed whitespace breakage,
2422                 * or we are lacking a whitespace-fix patch the tree
2423                 * the preimage was based on already had (i.e. target
2424                 * has whitespace breakage, the preimage doesn't).
2425                 * In either case, we are fixing the whitespace breakages
2426                 * so we might as well take the fix together with their
2427                 * real change.
2428                 */
2429                match = (tgtfix.len == fixed.len - fixstart &&
2430                         !memcmp(tgtfix.buf, fixed.buf + fixstart,
2431                                             fixed.len - fixstart));
2432                postlen += tgtfix.len;
2433
2434                strbuf_release(&tgtfix);
2435                if (!match)
2436                        goto unmatch_exit;
2437
2438                orig += oldlen;
2439                target += tgtlen;
2440        }
2441
2442
2443        /*
2444         * Now handle the lines in the preimage that falls beyond the
2445         * end of the file (if any). They will only match if they are
2446         * empty or only contain whitespace (if WS_BLANK_AT_EOL is
2447         * false).
2448         */
2449        for ( ; i < preimage->nr; i++) {
2450                size_t fixstart = fixed.len; /* start of the fixed preimage */
2451                size_t oldlen = preimage->line[i].len;
2452                int j;
2453
2454                /* Try fixing the line in the preimage */
2455                ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);
2456
2457                for (j = fixstart; j < fixed.len; j++)
2458                        if (!isspace(fixed.buf[j]))
2459                                goto unmatch_exit;
2460
2461                orig += oldlen;
2462        }
2463
2464        /*
2465         * Yes, the preimage is based on an older version that still
2466         * has whitespace breakages unfixed, and fixing them makes the
2467         * hunk match.  Update the context lines in the postimage.
2468         */
2469        fixed_buf = strbuf_detach(&fixed, &fixed_len);
2470        if (postlen < postimage->len)
2471                postlen = 0;
2472        update_pre_post_images(preimage, postimage,
2473                               fixed_buf, fixed_len, postlen);
2474        return 1;
2475
2476 unmatch_exit:
2477        strbuf_release(&fixed);
2478        return 0;
2479}
2480
2481static int find_pos(struct image *img,
2482                    struct image *preimage,
2483                    struct image *postimage,
2484                    int line,
2485                    unsigned ws_rule,
2486                    int match_beginning, int match_end)
2487{
2488        int i;
2489        unsigned long backwards, forwards, try;
2490        int backwards_lno, forwards_lno, try_lno;
2491
2492        /*
2493         * If match_beginning or match_end is specified, there is no
2494         * point starting from a wrong line that will never match and
2495         * wander around and wait for a match at the specified end.
2496         */
2497        if (match_beginning)
2498                line = 0;
2499        else if (match_end)
2500                line = img->nr - preimage->nr;
2501
2502        /*
2503         * Because the comparison is unsigned, the following test
2504         * will also take care of a negative line number that can
2505         * result when match_end and preimage is larger than the target.
2506         */
2507        if ((size_t) line > img->nr)
2508                line = img->nr;
2509
2510        try = 0;
2511        for (i = 0; i < line; i++)
2512                try += img->line[i].len;
2513
2514        /*
2515         * There's probably some smart way to do this, but I'll leave
2516         * that to the smart and beautiful people. I'm simple and stupid.
2517         */
2518        backwards = try;
2519        backwards_lno = line;
2520        forwards = try;
2521        forwards_lno = line;
2522        try_lno = line;
2523
2524        for (i = 0; ; i++) {
2525                if (match_fragment(img, preimage, postimage,
2526                                   try, try_lno, ws_rule,
2527                                   match_beginning, match_end))
2528                        return try_lno;
2529
2530        again:
2531                if (backwards_lno == 0 && forwards_lno == img->nr)
2532                        break;
2533
2534                if (i & 1) {
2535                        if (backwards_lno == 0) {
2536                                i++;
2537                                goto again;
2538                        }
2539                        backwards_lno--;
2540                        backwards -= img->line[backwards_lno].len;
2541                        try = backwards;
2542                        try_lno = backwards_lno;
2543                } else {
2544                        if (forwards_lno == img->nr) {
2545                                i++;
2546                                goto again;
2547                        }
2548                        forwards += img->line[forwards_lno].len;
2549                        forwards_lno++;
2550                        try = forwards;
2551                        try_lno = forwards_lno;
2552                }
2553
2554        }
2555        return -1;
2556}
2557
2558static void remove_first_line(struct image *img)
2559{
2560        img->buf += img->line[0].len;
2561        img->len -= img->line[0].len;
2562        img->line++;
2563        img->nr--;
2564}
2565
2566static void remove_last_line(struct image *img)
2567{
2568        img->len -= img->line[--img->nr].len;
2569}
2570
2571/*
2572 * The change from "preimage" and "postimage" has been found to
2573 * apply at applied_pos (counts in line numbers) in "img".
2574 * Update "img" to remove "preimage" and replace it with "postimage".
2575 */
2576static void update_image(struct image *img,
2577                         int applied_pos,
2578                         struct image *preimage,
2579                         struct image *postimage)
2580{
2581        /*
2582         * remove the copy of preimage at offset in img
2583         * and replace it with postimage
2584         */
2585        int i, nr;
2586        size_t remove_count, insert_count, applied_at = 0;
2587        char *result;
2588        int preimage_limit;
2589
2590        /*
2591         * If we are removing blank lines at the end of img,
2592         * the preimage may extend beyond the end.
2593         * If that is the case, we must be careful only to
2594         * remove the part of the preimage that falls within
2595         * the boundaries of img. Initialize preimage_limit
2596         * to the number of lines in the preimage that falls
2597         * within the boundaries.
2598         */
2599        preimage_limit = preimage->nr;
2600        if (preimage_limit > img->nr - applied_pos)
2601                preimage_limit = img->nr - applied_pos;
2602
2603        for (i = 0; i < applied_pos; i++)
2604                applied_at += img->line[i].len;
2605
2606        remove_count = 0;
2607        for (i = 0; i < preimage_limit; i++)
2608                remove_count += img->line[applied_pos + i].len;
2609        insert_count = postimage->len;
2610
2611        /* Adjust the contents */
2612        result = xmalloc(img->len + insert_count - remove_count + 1);
2613        memcpy(result, img->buf, applied_at);
2614        memcpy(result + applied_at, postimage->buf, postimage->len);
2615        memcpy(result + applied_at + postimage->len,
2616               img->buf + (applied_at + remove_count),
2617               img->len - (applied_at + remove_count));
2618        free(img->buf);
2619        img->buf = result;
2620        img->len += insert_count - remove_count;
2621        result[img->len] = '\0';
2622
2623        /* Adjust the line table */
2624        nr = img->nr + postimage->nr - preimage_limit;
2625        if (preimage_limit < postimage->nr) {
2626                /*
2627                 * NOTE: this knows that we never call remove_first_line()
2628                 * on anything other than pre/post image.
2629                 */
2630                REALLOC_ARRAY(img->line, nr);
2631                img->line_allocated = img->line;
2632        }
2633        if (preimage_limit != postimage->nr)
2634                memmove(img->line + applied_pos + postimage->nr,
2635                        img->line + applied_pos + preimage_limit,
2636                        (img->nr - (applied_pos + preimage_limit)) *
2637                        sizeof(*img->line));
2638        memcpy(img->line + applied_pos,
2639               postimage->line,
2640               postimage->nr * sizeof(*img->line));
2641        if (!allow_overlap)
2642                for (i = 0; i < postimage->nr; i++)
2643                        img->line[applied_pos + i].flag |= LINE_PATCHED;
2644        img->nr = nr;
2645}
2646
2647/*
2648 * Use the patch-hunk text in "frag" to prepare two images (preimage and
2649 * postimage) for the hunk.  Find lines that match "preimage" in "img" and
2650 * replace the part of "img" with "postimage" text.
2651 */
2652static int apply_one_fragment(struct image *img, struct fragment *frag,
2653                              int inaccurate_eof, unsigned ws_rule,
2654                              int nth_fragment)
2655{
2656        int match_beginning, match_end;
2657        const char *patch = frag->patch;
2658        int size = frag->size;
2659        char *old, *oldlines;
2660        struct strbuf newlines;
2661        int new_blank_lines_at_end = 0;
2662        int found_new_blank_lines_at_end = 0;
2663        int hunk_linenr = frag->linenr;
2664        unsigned long leading, trailing;
2665        int pos, applied_pos;
2666        struct image preimage;
2667        struct image postimage;
2668
2669        memset(&preimage, 0, sizeof(preimage));
2670        memset(&postimage, 0, sizeof(postimage));
2671        oldlines = xmalloc(size);
2672        strbuf_init(&newlines, size);
2673
2674        old = oldlines;
2675        while (size > 0) {
2676                char first;
2677                int len = linelen(patch, size);
2678                int plen;
2679                int added_blank_line = 0;
2680                int is_blank_context = 0;
2681                size_t start;
2682
2683                if (!len)
2684                        break;
2685
2686                /*
2687                 * "plen" is how much of the line we should use for
2688                 * the actual patch data. Normally we just remove the
2689                 * first character on the line, but if the line is
2690                 * followed by "\ No newline", then we also remove the
2691                 * last one (which is the newline, of course).
2692                 */
2693                plen = len - 1;
2694                if (len < size && patch[len] == '\\')
2695                        plen--;
2696                first = *patch;
2697                if (apply_in_reverse) {
2698                        if (first == '-')
2699                                first = '+';
2700                        else if (first == '+')
2701                                first = '-';
2702                }
2703
2704                switch (first) {
2705                case '\n':
2706                        /* Newer GNU diff, empty context line */
2707                        if (plen < 0)
2708                                /* ... followed by '\No newline'; nothing */
2709                                break;
2710                        *old++ = '\n';
2711                        strbuf_addch(&newlines, '\n');
2712                        add_line_info(&preimage, "\n", 1, LINE_COMMON);
2713                        add_line_info(&postimage, "\n", 1, LINE_COMMON);
2714                        is_blank_context = 1;
2715                        break;
2716                case ' ':
2717                        if (plen && (ws_rule & WS_BLANK_AT_EOF) &&
2718                            ws_blank_line(patch + 1, plen, ws_rule))
2719                                is_blank_context = 1;
2720                case '-':
2721                        memcpy(old, patch + 1, plen);
2722                        add_line_info(&preimage, old, plen,
2723                                      (first == ' ' ? LINE_COMMON : 0));
2724                        old += plen;
2725                        if (first == '-')
2726                                break;
2727                /* Fall-through for ' ' */
2728                case '+':
2729                        /* --no-add does not add new lines */
2730                        if (first == '+' && no_add)
2731                                break;
2732
2733                        start = newlines.len;
2734                        if (first != '+' ||
2735                            !whitespace_error ||
2736                            ws_error_action != correct_ws_error) {
2737                                strbuf_add(&newlines, patch + 1, plen);
2738                        }
2739                        else {
2740                                ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &applied_after_fixing_ws);
2741                        }
2742                        add_line_info(&postimage, newlines.buf + start, newlines.len - start,
2743                                      (first == '+' ? 0 : LINE_COMMON));
2744                        if (first == '+' &&
2745                            (ws_rule & WS_BLANK_AT_EOF) &&
2746                            ws_blank_line(patch + 1, plen, ws_rule))
2747                                added_blank_line = 1;
2748                        break;
2749                case '@': case '\\':
2750                        /* Ignore it, we already handled it */
2751                        break;
2752                default:
2753                        if (apply_verbosely)
2754                                error(_("invalid start of line: '%c'"), first);
2755                        return -1;
2756                }
2757                if (added_blank_line) {
2758                        if (!new_blank_lines_at_end)
2759                                found_new_blank_lines_at_end = hunk_linenr;
2760                        new_blank_lines_at_end++;
2761                }
2762                else if (is_blank_context)
2763                        ;
2764                else
2765                        new_blank_lines_at_end = 0;
2766                patch += len;
2767                size -= len;
2768                hunk_linenr++;
2769        }
2770        if (inaccurate_eof &&
2771            old > oldlines && old[-1] == '\n' &&
2772            newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {
2773                old--;
2774                strbuf_setlen(&newlines, newlines.len - 1);
2775        }
2776
2777        leading = frag->leading;
2778        trailing = frag->trailing;
2779
2780        /*
2781         * A hunk to change lines at the beginning would begin with
2782         * @@ -1,L +N,M @@
2783         * but we need to be careful.  -U0 that inserts before the second
2784         * line also has this pattern.
2785         *
2786         * And a hunk to add to an empty file would begin with
2787         * @@ -0,0 +N,M @@
2788         *
2789         * In other words, a hunk that is (frag->oldpos <= 1) with or
2790         * without leading context must match at the beginning.
2791         */
2792        match_beginning = (!frag->oldpos ||
2793                           (frag->oldpos == 1 && !unidiff_zero));
2794
2795        /*
2796         * A hunk without trailing lines must match at the end.
2797         * However, we simply cannot tell if a hunk must match end
2798         * from the lack of trailing lines if the patch was generated
2799         * with unidiff without any context.
2800         */
2801        match_end = !unidiff_zero && !trailing;
2802
2803        pos = frag->newpos ? (frag->newpos - 1) : 0;
2804        preimage.buf = oldlines;
2805        preimage.len = old - oldlines;
2806        postimage.buf = newlines.buf;
2807        postimage.len = newlines.len;
2808        preimage.line = preimage.line_allocated;
2809        postimage.line = postimage.line_allocated;
2810
2811        for (;;) {
2812
2813                applied_pos = find_pos(img, &preimage, &postimage, pos,
2814                                       ws_rule, match_beginning, match_end);
2815
2816                if (applied_pos >= 0)
2817                        break;
2818
2819                /* Am I at my context limits? */
2820                if ((leading <= p_context) && (trailing <= p_context))
2821                        break;
2822                if (match_beginning || match_end) {
2823                        match_beginning = match_end = 0;
2824                        continue;
2825                }
2826
2827                /*
2828                 * Reduce the number of context lines; reduce both
2829                 * leading and trailing if they are equal otherwise
2830                 * just reduce the larger context.
2831                 */
2832                if (leading >= trailing) {
2833                        remove_first_line(&preimage);
2834                        remove_first_line(&postimage);
2835                        pos--;
2836                        leading--;
2837                }
2838                if (trailing > leading) {
2839                        remove_last_line(&preimage);
2840                        remove_last_line(&postimage);
2841                        trailing--;
2842                }
2843        }
2844
2845        if (applied_pos >= 0) {
2846                if (new_blank_lines_at_end &&
2847                    preimage.nr + applied_pos >= img->nr &&
2848                    (ws_rule & WS_BLANK_AT_EOF) &&
2849                    ws_error_action != nowarn_ws_error) {
2850                        record_ws_error(WS_BLANK_AT_EOF, "+", 1,
2851                                        found_new_blank_lines_at_end);
2852                        if (ws_error_action == correct_ws_error) {
2853                                while (new_blank_lines_at_end--)
2854                                        remove_last_line(&postimage);
2855                        }
2856                        /*
2857                         * We would want to prevent write_out_results()
2858                         * from taking place in apply_patch() that follows
2859                         * the callchain led us here, which is:
2860                         * apply_patch->check_patch_list->check_patch->
2861                         * apply_data->apply_fragments->apply_one_fragment
2862                         */
2863                        if (ws_error_action == die_on_ws_error)
2864                                apply = 0;
2865                }
2866
2867                if (apply_verbosely && applied_pos != pos) {
2868                        int offset = applied_pos - pos;
2869                        if (apply_in_reverse)
2870                                offset = 0 - offset;
2871                        fprintf_ln(stderr,
2872                                   Q_("Hunk #%d succeeded at %d (offset %d line).",
2873                                      "Hunk #%d succeeded at %d (offset %d lines).",
2874                                      offset),
2875                                   nth_fragment, applied_pos + 1, offset);
2876                }
2877
2878                /*
2879                 * Warn if it was necessary to reduce the number
2880                 * of context lines.
2881                 */
2882                if ((leading != frag->leading) ||
2883                    (trailing != frag->trailing))
2884                        fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"
2885                                             " to apply fragment at %d"),
2886                                   leading, trailing, applied_pos+1);
2887                update_image(img, applied_pos, &preimage, &postimage);
2888        } else {
2889                if (apply_verbosely)
2890                        error(_("while searching for:\n%.*s"),
2891                              (int)(old - oldlines), oldlines);
2892        }
2893
2894        free(oldlines);
2895        strbuf_release(&newlines);
2896        free(preimage.line_allocated);
2897        free(postimage.line_allocated);
2898
2899        return (applied_pos < 0);
2900}
2901
2902static int apply_binary_fragment(struct image *img, struct patch *patch)
2903{
2904        struct fragment *fragment = patch->fragments;
2905        unsigned long len;
2906        void *dst;
2907
2908        if (!fragment)
2909                return error(_("missing binary patch data for '%s'"),
2910                             patch->new_name ?
2911                             patch->new_name :
2912                             patch->old_name);
2913
2914        /* Binary patch is irreversible without the optional second hunk */
2915        if (apply_in_reverse) {
2916                if (!fragment->next)
2917                        return error("cannot reverse-apply a binary patch "
2918                                     "without the reverse hunk to '%s'",
2919                                     patch->new_name
2920                                     ? patch->new_name : patch->old_name);
2921                fragment = fragment->next;
2922        }
2923        switch (fragment->binary_patch_method) {
2924        case BINARY_DELTA_DEFLATED:
2925                dst = patch_delta(img->buf, img->len, fragment->patch,
2926                                  fragment->size, &len);
2927                if (!dst)
2928                        return -1;
2929                clear_image(img);
2930                img->buf = dst;
2931                img->len = len;
2932                return 0;
2933        case BINARY_LITERAL_DEFLATED:
2934                clear_image(img);
2935                img->len = fragment->size;
2936                img->buf = xmemdupz(fragment->patch, img->len);
2937                return 0;
2938        }
2939        return -1;
2940}
2941
2942/*
2943 * Replace "img" with the result of applying the binary patch.
2944 * The binary patch data itself in patch->fragment is still kept
2945 * but the preimage prepared by the caller in "img" is freed here
2946 * or in the helper function apply_binary_fragment() this calls.
2947 */
2948static int apply_binary(struct image *img, struct patch *patch)
2949{
2950        const char *name = patch->old_name ? patch->old_name : patch->new_name;
2951        unsigned char sha1[20];
2952
2953        /*
2954         * For safety, we require patch index line to contain
2955         * full 40-byte textual SHA1 for old and new, at least for now.
2956         */
2957        if (strlen(patch->old_sha1_prefix) != 40 ||
2958            strlen(patch->new_sha1_prefix) != 40 ||
2959            get_sha1_hex(patch->old_sha1_prefix, sha1) ||
2960            get_sha1_hex(patch->new_sha1_prefix, sha1))
2961                return error("cannot apply binary patch to '%s' "
2962                             "without full index line", name);
2963
2964        if (patch->old_name) {
2965                /*
2966                 * See if the old one matches what the patch
2967                 * applies to.
2968                 */
2969                hash_sha1_file(img->buf, img->len, blob_type, sha1);
2970                if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
2971                        return error("the patch applies to '%s' (%s), "
2972                                     "which does not match the "
2973                                     "current contents.",
2974                                     name, sha1_to_hex(sha1));
2975        }
2976        else {
2977                /* Otherwise, the old one must be empty. */
2978                if (img->len)
2979                        return error("the patch applies to an empty "
2980                                     "'%s' but it is not empty", name);
2981        }
2982
2983        get_sha1_hex(patch->new_sha1_prefix, sha1);
2984        if (is_null_sha1(sha1)) {
2985                clear_image(img);
2986                return 0; /* deletion patch */
2987        }
2988
2989        if (has_sha1_file(sha1)) {
2990                /* We already have the postimage */
2991                enum object_type type;
2992                unsigned long size;
2993                char *result;
2994
2995                result = read_sha1_file(sha1, &type, &size);
2996                if (!result)
2997                        return error("the necessary postimage %s for "
2998                                     "'%s' cannot be read",
2999                                     patch->new_sha1_prefix, name);
3000                clear_image(img);
3001                img->buf = result;
3002                img->len = size;
3003        } else {
3004                /*
3005                 * We have verified buf matches the preimage;
3006                 * apply the patch data to it, which is stored
3007                 * in the patch->fragments->{patch,size}.
3008                 */
3009                if (apply_binary_fragment(img, patch))
3010                        return error(_("binary patch does not apply to '%s'"),
3011                                     name);
3012
3013                /* verify that the result matches */
3014                hash_sha1_file(img->buf, img->len, blob_type, sha1);
3015                if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
3016                        return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
3017                                name, patch->new_sha1_prefix, sha1_to_hex(sha1));
3018        }
3019
3020        return 0;
3021}
3022
3023static int apply_fragments(struct image *img, struct patch *patch)
3024{
3025        struct fragment *frag = patch->fragments;
3026        const char *name = patch->old_name ? patch->old_name : patch->new_name;
3027        unsigned ws_rule = patch->ws_rule;
3028        unsigned inaccurate_eof = patch->inaccurate_eof;
3029        int nth = 0;
3030
3031        if (patch->is_binary)
3032                return apply_binary(img, patch);
3033
3034        while (frag) {
3035                nth++;
3036                if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {
3037                        error(_("patch failed: %s:%ld"), name, frag->oldpos);
3038                        if (!apply_with_reject)
3039                                return -1;
3040                        frag->rejected = 1;
3041                }
3042                frag = frag->next;
3043        }
3044        return 0;
3045}
3046
3047static int read_blob_object(struct strbuf *buf, const unsigned char *sha1, unsigned mode)
3048{
3049        if (S_ISGITLINK(mode)) {
3050                strbuf_grow(buf, 100);
3051                strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(sha1));
3052        } else {
3053                enum object_type type;
3054                unsigned long sz;
3055                char *result;
3056
3057                result = read_sha1_file(sha1, &type, &sz);
3058                if (!result)
3059                        return -1;
3060                /* XXX read_sha1_file NUL-terminates */
3061                strbuf_attach(buf, result, sz, sz + 1);
3062        }
3063        return 0;
3064}
3065
3066static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf)
3067{
3068        if (!ce)
3069                return 0;
3070        return read_blob_object(buf, ce->sha1, ce->ce_mode);
3071}
3072
3073static struct patch *in_fn_table(const char *name)
3074{
3075        struct string_list_item *item;
3076
3077        if (name == NULL)
3078                return NULL;
3079
3080        item = string_list_lookup(&fn_table, name);
3081        if (item != NULL)
3082                return (struct patch *)item->util;
3083
3084        return NULL;
3085}
3086
3087/*
3088 * item->util in the filename table records the status of the path.
3089 * Usually it points at a patch (whose result records the contents
3090 * of it after applying it), but it could be PATH_WAS_DELETED for a
3091 * path that a previously applied patch has already removed, or
3092 * PATH_TO_BE_DELETED for a path that a later patch would remove.
3093 *
3094 * The latter is needed to deal with a case where two paths A and B
3095 * are swapped by first renaming A to B and then renaming B to A;
3096 * moving A to B should not be prevented due to presence of B as we
3097 * will remove it in a later patch.
3098 */
3099#define PATH_TO_BE_DELETED ((struct patch *) -2)
3100#define PATH_WAS_DELETED ((struct patch *) -1)
3101
3102static int to_be_deleted(struct patch *patch)
3103{
3104        return patch == PATH_TO_BE_DELETED;
3105}
3106
3107static int was_deleted(struct patch *patch)
3108{
3109        return patch == PATH_WAS_DELETED;
3110}
3111
3112static void add_to_fn_table(struct patch *patch)
3113{
3114        struct string_list_item *item;
3115
3116        /*
3117         * Always add new_name unless patch is a deletion
3118         * This should cover the cases for normal diffs,
3119         * file creations and copies
3120         */
3121        if (patch->new_name != NULL) {
3122                item = string_list_insert(&fn_table, patch->new_name);
3123                item->util = patch;
3124        }
3125
3126        /*
3127         * store a failure on rename/deletion cases because
3128         * later chunks shouldn't patch old names
3129         */
3130        if ((patch->new_name == NULL) || (patch->is_rename)) {
3131                item = string_list_insert(&fn_table, patch->old_name);
3132                item->util = PATH_WAS_DELETED;
3133        }
3134}
3135
3136static void prepare_fn_table(struct patch *patch)
3137{
3138        /*
3139         * store information about incoming file deletion
3140         */
3141        while (patch) {
3142                if ((patch->new_name == NULL) || (patch->is_rename)) {
3143                        struct string_list_item *item;
3144                        item = string_list_insert(&fn_table, patch->old_name);
3145                        item->util = PATH_TO_BE_DELETED;
3146                }
3147                patch = patch->next;
3148        }
3149}
3150
3151static int checkout_target(struct index_state *istate,
3152                           struct cache_entry *ce, struct stat *st)
3153{
3154        struct checkout costate;
3155
3156        memset(&costate, 0, sizeof(costate));
3157        costate.base_dir = "";
3158        costate.refresh_cache = 1;
3159        costate.istate = istate;
3160        if (checkout_entry(ce, &costate, NULL) || lstat(ce->name, st))
3161                return error(_("cannot checkout %s"), ce->name);
3162        return 0;
3163}
3164
3165static struct patch *previous_patch(struct patch *patch, int *gone)
3166{
3167        struct patch *previous;
3168
3169        *gone = 0;
3170        if (patch->is_copy || patch->is_rename)
3171                return NULL; /* "git" patches do not depend on the order */
3172
3173        previous = in_fn_table(patch->old_name);
3174        if (!previous)
3175                return NULL;
3176
3177        if (to_be_deleted(previous))
3178                return NULL; /* the deletion hasn't happened yet */
3179
3180        if (was_deleted(previous))
3181                *gone = 1;
3182
3183        return previous;
3184}
3185
3186static int verify_index_match(const struct cache_entry *ce, struct stat *st)
3187{
3188        if (S_ISGITLINK(ce->ce_mode)) {
3189                if (!S_ISDIR(st->st_mode))
3190                        return -1;
3191                return 0;
3192        }
3193        return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
3194}
3195
3196#define SUBMODULE_PATCH_WITHOUT_INDEX 1
3197
3198static int load_patch_target(struct strbuf *buf,
3199                             const struct cache_entry *ce,
3200                             struct stat *st,
3201                             const char *name,
3202                             unsigned expected_mode)
3203{
3204        if (cached) {
3205                if (read_file_or_gitlink(ce, buf))
3206                        return error(_("read of %s failed"), name);
3207        } else if (name) {
3208                if (S_ISGITLINK(expected_mode)) {
3209                        if (ce)
3210                                return read_file_or_gitlink(ce, buf);
3211                        else
3212                                return SUBMODULE_PATCH_WITHOUT_INDEX;
3213                } else {
3214                        if (read_old_data(st, name, buf))
3215                                return error(_("read of %s failed"), name);
3216                }
3217        }
3218        return 0;
3219}
3220
3221/*
3222 * We are about to apply "patch"; populate the "image" with the
3223 * current version we have, from the working tree or from the index,
3224 * depending on the situation e.g. --cached/--index.  If we are
3225 * applying a non-git patch that incrementally updates the tree,
3226 * we read from the result of a previous diff.
3227 */
3228static int load_preimage(struct image *image,
3229                         struct patch *patch, struct stat *st,
3230                         const struct cache_entry *ce)
3231{
3232        struct strbuf buf = STRBUF_INIT;
3233        size_t len;
3234        char *img;
3235        struct patch *previous;
3236        int status;
3237
3238        previous = previous_patch(patch, &status);
3239        if (status)
3240                return error(_("path %s has been renamed/deleted"),
3241                             patch->old_name);
3242        if (previous) {
3243                /* We have a patched copy in memory; use that. */
3244                strbuf_add(&buf, previous->result, previous->resultsize);
3245        } else {
3246                status = load_patch_target(&buf, ce, st,
3247                                           patch->old_name, patch->old_mode);
3248                if (status < 0)
3249                        return status;
3250                else if (status == SUBMODULE_PATCH_WITHOUT_INDEX) {
3251                        /*
3252                         * There is no way to apply subproject
3253                         * patch without looking at the index.
3254                         * NEEDSWORK: shouldn't this be flagged
3255                         * as an error???
3256                         */
3257                        free_fragment_list(patch->fragments);
3258                        patch->fragments = NULL;
3259                } else if (status) {
3260                        return error(_("read of %s failed"), patch->old_name);
3261                }
3262        }
3263
3264        img = strbuf_detach(&buf, &len);
3265        prepare_image(image, img, len, !patch->is_binary);
3266        return 0;
3267}
3268
3269static int three_way_merge(struct image *image,
3270                           char *path,
3271                           const unsigned char *base,
3272                           const unsigned char *ours,
3273                           const unsigned char *theirs)
3274{
3275        mmfile_t base_file, our_file, their_file;
3276        mmbuffer_t result = { NULL };
3277        int status;
3278
3279        read_mmblob(&base_file, base);
3280        read_mmblob(&our_file, ours);
3281        read_mmblob(&their_file, theirs);
3282        status = ll_merge(&result, path,
3283                          &base_file, "base",
3284                          &our_file, "ours",
3285                          &their_file, "theirs", NULL);
3286        free(base_file.ptr);
3287        free(our_file.ptr);
3288        free(their_file.ptr);
3289        if (status < 0 || !result.ptr) {
3290                free(result.ptr);
3291                return -1;
3292        }
3293        clear_image(image);
3294        image->buf = result.ptr;
3295        image->len = result.size;
3296
3297        return status;
3298}
3299
3300/*
3301 * When directly falling back to add/add three-way merge, we read from
3302 * the current contents of the new_name.  In no cases other than that
3303 * this function will be called.
3304 */
3305static int load_current(struct image *image, struct patch *patch)
3306{
3307        struct strbuf buf = STRBUF_INIT;
3308        int status, pos;
3309        size_t len;
3310        char *img;
3311        struct stat st;
3312        struct cache_entry *ce;
3313        char *name = patch->new_name;
3314        unsigned mode = patch->new_mode;
3315
3316        if (!patch->is_new)
3317                die("BUG: patch to %s is not a creation", patch->old_name);
3318
3319        pos = cache_name_pos(name, strlen(name));
3320        if (pos < 0)
3321                return error(_("%s: does not exist in index"), name);
3322        ce = active_cache[pos];
3323        if (lstat(name, &st)) {
3324                if (errno != ENOENT)
3325                        return error(_("%s: %s"), name, strerror(errno));
3326                if (checkout_target(&the_index, ce, &st))
3327                        return -1;
3328        }
3329        if (verify_index_match(ce, &st))
3330                return error(_("%s: does not match index"), name);
3331
3332        status = load_patch_target(&buf, ce, &st, name, mode);
3333        if (status < 0)
3334                return status;
3335        else if (status)
3336                return -1;
3337        img = strbuf_detach(&buf, &len);
3338        prepare_image(image, img, len, !patch->is_binary);
3339        return 0;
3340}
3341
3342static int try_threeway(struct image *image, struct patch *patch,
3343                        struct stat *st, const struct cache_entry *ce)
3344{
3345        unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];
3346        struct strbuf buf = STRBUF_INIT;
3347        size_t len;
3348        int status;
3349        char *img;
3350        struct image tmp_image;
3351
3352        /* No point falling back to 3-way merge in these cases */
3353        if (patch->is_delete ||
3354            S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))
3355                return -1;
3356
3357        /* Preimage the patch was prepared for */
3358        if (patch->is_new)
3359                write_sha1_file("", 0, blob_type, pre_sha1);
3360        else if (get_sha1(patch->old_sha1_prefix, pre_sha1) ||
3361                 read_blob_object(&buf, pre_sha1, patch->old_mode))
3362                return error("repository lacks the necessary blob to fall back on 3-way merge.");
3363
3364        fprintf(stderr, "Falling back to three-way merge...\n");
3365
3366        img = strbuf_detach(&buf, &len);
3367        prepare_image(&tmp_image, img, len, 1);
3368        /* Apply the patch to get the post image */
3369        if (apply_fragments(&tmp_image, patch) < 0) {
3370                clear_image(&tmp_image);
3371                return -1;
3372        }
3373        /* post_sha1[] is theirs */
3374        write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_sha1);
3375        clear_image(&tmp_image);
3376
3377        /* our_sha1[] is ours */
3378        if (patch->is_new) {
3379                if (load_current(&tmp_image, patch))
3380                        return error("cannot read the current contents of '%s'",
3381                                     patch->new_name);
3382        } else {
3383                if (load_preimage(&tmp_image, patch, st, ce))
3384                        return error("cannot read the current contents of '%s'",
3385                                     patch->old_name);
3386        }
3387        write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);
3388        clear_image(&tmp_image);
3389
3390        /* in-core three-way merge between post and our using pre as base */
3391        status = three_way_merge(image, patch->new_name,
3392                                 pre_sha1, our_sha1, post_sha1);
3393        if (status < 0) {
3394                fprintf(stderr, "Failed to fall back on three-way merge...\n");
3395                return status;
3396        }
3397
3398        if (status) {
3399                patch->conflicted_threeway = 1;
3400                if (patch->is_new)
3401                        hashclr(patch->threeway_stage[0]);
3402                else
3403                        hashcpy(patch->threeway_stage[0], pre_sha1);
3404                hashcpy(patch->threeway_stage[1], our_sha1);
3405                hashcpy(patch->threeway_stage[2], post_sha1);
3406                fprintf(stderr, "Applied patch to '%s' with conflicts.\n", patch->new_name);
3407        } else {
3408                fprintf(stderr, "Applied patch to '%s' cleanly.\n", patch->new_name);
3409        }
3410        return 0;
3411}
3412
3413static int apply_data(struct patch *patch, struct stat *st, const struct cache_entry *ce)
3414{
3415        struct image image;
3416
3417        if (load_preimage(&image, patch, st, ce) < 0)
3418                return -1;
3419
3420        if (patch->direct_to_threeway ||
3421            apply_fragments(&image, patch) < 0) {
3422                /* Note: with --reject, apply_fragments() returns 0 */
3423                if (!threeway || try_threeway(&image, patch, st, ce) < 0)
3424                        return -1;
3425        }
3426        patch->result = image.buf;
3427        patch->resultsize = image.len;
3428        add_to_fn_table(patch);
3429        free(image.line_allocated);
3430
3431        if (0 < patch->is_delete && patch->resultsize)
3432                return error(_("removal patch leaves file contents"));
3433
3434        return 0;
3435}
3436
3437/*
3438 * If "patch" that we are looking at modifies or deletes what we have,
3439 * we would want it not to lose any local modification we have, either
3440 * in the working tree or in the index.
3441 *
3442 * This also decides if a non-git patch is a creation patch or a
3443 * modification to an existing empty file.  We do not check the state
3444 * of the current tree for a creation patch in this function; the caller
3445 * check_patch() separately makes sure (and errors out otherwise) that
3446 * the path the patch creates does not exist in the current tree.
3447 */
3448static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)
3449{
3450        const char *old_name = patch->old_name;
3451        struct patch *previous = NULL;
3452        int stat_ret = 0, status;
3453        unsigned st_mode = 0;
3454
3455        if (!old_name)
3456                return 0;
3457
3458        assert(patch->is_new <= 0);
3459        previous = previous_patch(patch, &status);
3460
3461        if (status)
3462                return error(_("path %s has been renamed/deleted"), old_name);
3463        if (previous) {
3464                st_mode = previous->new_mode;
3465        } else if (!cached) {
3466                stat_ret = lstat(old_name, st);
3467                if (stat_ret && errno != ENOENT)
3468                        return error(_("%s: %s"), old_name, strerror(errno));
3469        }
3470
3471        if (check_index && !previous) {
3472                int pos = cache_name_pos(old_name, strlen(old_name));
3473                if (pos < 0) {
3474                        if (patch->is_new < 0)
3475                                goto is_new;
3476                        return error(_("%s: does not exist in index"), old_name);
3477                }
3478                *ce = active_cache[pos];
3479                if (stat_ret < 0) {
3480                        if (checkout_target(&the_index, *ce, st))
3481                                return -1;
3482                }
3483                if (!cached && verify_index_match(*ce, st))
3484                        return error(_("%s: does not match index"), old_name);
3485                if (cached)
3486                        st_mode = (*ce)->ce_mode;
3487        } else if (stat_ret < 0) {
3488                if (patch->is_new < 0)
3489                        goto is_new;
3490                return error(_("%s: %s"), old_name, strerror(errno));
3491        }
3492
3493        if (!cached && !previous)
3494                st_mode = ce_mode_from_stat(*ce, st->st_mode);
3495
3496        if (patch->is_new < 0)
3497                patch->is_new = 0;
3498        if (!patch->old_mode)
3499                patch->old_mode = st_mode;
3500        if ((st_mode ^ patch->old_mode) & S_IFMT)
3501                return error(_("%s: wrong type"), old_name);
3502        if (st_mode != patch->old_mode)
3503                warning(_("%s has type %o, expected %o"),
3504                        old_name, st_mode, patch->old_mode);
3505        if (!patch->new_mode && !patch->is_delete)
3506                patch->new_mode = st_mode;
3507        return 0;
3508
3509 is_new:
3510        patch->is_new = 1;
3511        patch->is_delete = 0;
3512        free(patch->old_name);
3513        patch->old_name = NULL;
3514        return 0;
3515}
3516
3517
3518#define EXISTS_IN_INDEX 1
3519#define EXISTS_IN_WORKTREE 2
3520
3521static int check_to_create(const char *new_name, int ok_if_exists)
3522{
3523        struct stat nst;
3524
3525        if (check_index &&
3526            cache_name_pos(new_name, strlen(new_name)) >= 0 &&
3527            !ok_if_exists)
3528                return EXISTS_IN_INDEX;
3529        if (cached)
3530                return 0;
3531
3532        if (!lstat(new_name, &nst)) {
3533                if (S_ISDIR(nst.st_mode) || ok_if_exists)
3534                        return 0;
3535                /*
3536                 * A leading component of new_name might be a symlink
3537                 * that is going to be removed with this patch, but
3538                 * still pointing at somewhere that has the path.
3539                 * In such a case, path "new_name" does not exist as
3540                 * far as git is concerned.
3541                 */
3542                if (has_symlink_leading_path(new_name, strlen(new_name)))
3543                        return 0;
3544
3545                return EXISTS_IN_WORKTREE;
3546        } else if ((errno != ENOENT) && (errno != ENOTDIR)) {
3547                return error("%s: %s", new_name, strerror(errno));
3548        }
3549        return 0;
3550}
3551
3552/*
3553 * Check and apply the patch in-core; leave the result in patch->result
3554 * for the caller to write it out to the final destination.
3555 */
3556static int check_patch(struct patch *patch)
3557{
3558        struct stat st;
3559        const char *old_name = patch->old_name;
3560        const char *new_name = patch->new_name;
3561        const char *name = old_name ? old_name : new_name;
3562        struct cache_entry *ce = NULL;
3563        struct patch *tpatch;
3564        int ok_if_exists;
3565        int status;
3566
3567        patch->rejected = 1; /* we will drop this after we succeed */
3568
3569        status = check_preimage(patch, &ce, &st);
3570        if (status)
3571                return status;
3572        old_name = patch->old_name;
3573
3574        /*
3575         * A type-change diff is always split into a patch to delete
3576         * old, immediately followed by a patch to create new (see
3577         * diff.c::run_diff()); in such a case it is Ok that the entry
3578         * to be deleted by the previous patch is still in the working
3579         * tree and in the index.
3580         *
3581         * A patch to swap-rename between A and B would first rename A
3582         * to B and then rename B to A.  While applying the first one,
3583         * the presence of B should not stop A from getting renamed to
3584         * B; ask to_be_deleted() about the later rename.  Removal of
3585         * B and rename from A to B is handled the same way by asking
3586         * was_deleted().
3587         */
3588        if ((tpatch = in_fn_table(new_name)) &&
3589            (was_deleted(tpatch) || to_be_deleted(tpatch)))
3590                ok_if_exists = 1;
3591        else
3592                ok_if_exists = 0;
3593
3594        if (new_name &&
3595            ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {
3596                int err = check_to_create(new_name, ok_if_exists);
3597
3598                if (err && threeway) {
3599                        patch->direct_to_threeway = 1;
3600                } else switch (err) {
3601                case 0:
3602                        break; /* happy */
3603                case EXISTS_IN_INDEX:
3604                        return error(_("%s: already exists in index"), new_name);
3605                        break;
3606                case EXISTS_IN_WORKTREE:
3607                        return error(_("%s: already exists in working directory"),
3608                                     new_name);
3609                default:
3610                        return err;
3611                }
3612
3613                if (!patch->new_mode) {
3614                        if (0 < patch->is_new)
3615                                patch->new_mode = S_IFREG | 0644;
3616                        else
3617                                patch->new_mode = patch->old_mode;
3618                }
3619        }
3620
3621        if (new_name && old_name) {
3622                int same = !strcmp(old_name, new_name);
3623                if (!patch->new_mode)
3624                        patch->new_mode = patch->old_mode;
3625                if ((patch->old_mode ^ patch->new_mode) & S_IFMT) {
3626                        if (same)
3627                                return error(_("new mode (%o) of %s does not "
3628                                               "match old mode (%o)"),
3629                                        patch->new_mode, new_name,
3630                                        patch->old_mode);
3631                        else
3632                                return error(_("new mode (%o) of %s does not "
3633                                               "match old mode (%o) of %s"),
3634                                        patch->new_mode, new_name,
3635                                        patch->old_mode, old_name);
3636                }
3637        }
3638
3639        if (apply_data(patch, &st, ce) < 0)
3640                return error(_("%s: patch does not apply"), name);
3641        patch->rejected = 0;
3642        return 0;
3643}
3644
3645static int check_patch_list(struct patch *patch)
3646{
3647        int err = 0;
3648
3649        prepare_fn_table(patch);
3650        while (patch) {
3651                if (apply_verbosely)
3652                        say_patch_name(stderr,
3653                                       _("Checking patch %s..."), patch);
3654                err |= check_patch(patch);
3655                patch = patch->next;
3656        }
3657        return err;
3658}
3659
3660/* This function tries to read the sha1 from the current index */
3661static int get_current_sha1(const char *path, unsigned char *sha1)
3662{
3663        int pos;
3664
3665        if (read_cache() < 0)
3666                return -1;
3667        pos = cache_name_pos(path, strlen(path));
3668        if (pos < 0)
3669                return -1;
3670        hashcpy(sha1, active_cache[pos]->sha1);
3671        return 0;
3672}
3673
3674static int preimage_sha1_in_gitlink_patch(struct patch *p, unsigned char sha1[20])
3675{
3676        /*
3677         * A usable gitlink patch has only one fragment (hunk) that looks like:
3678         * @@ -1 +1 @@
3679         * -Subproject commit <old sha1>
3680         * +Subproject commit <new sha1>
3681         * or
3682         * @@ -1 +0,0 @@
3683         * -Subproject commit <old sha1>
3684         * for a removal patch.
3685         */
3686        struct fragment *hunk = p->fragments;
3687        static const char heading[] = "-Subproject commit ";
3688        char *preimage;
3689
3690        if (/* does the patch have only one hunk? */
3691            hunk && !hunk->next &&
3692            /* is its preimage one line? */
3693            hunk->oldpos == 1 && hunk->oldlines == 1 &&
3694            /* does preimage begin with the heading? */
3695            (preimage = memchr(hunk->patch, '\n', hunk->size)) != NULL &&
3696            starts_with(++preimage, heading) &&
3697            /* does it record full SHA-1? */
3698            !get_sha1_hex(preimage + sizeof(heading) - 1, sha1) &&
3699            preimage[sizeof(heading) + 40 - 1] == '\n' &&
3700            /* does the abbreviated name on the index line agree with it? */
3701            starts_with(preimage + sizeof(heading) - 1, p->old_sha1_prefix))
3702                return 0; /* it all looks fine */
3703
3704        /* we may have full object name on the index line */
3705        return get_sha1_hex(p->old_sha1_prefix, sha1);
3706}
3707
3708/* Build an index that contains the just the files needed for a 3way merge */
3709static void build_fake_ancestor(struct patch *list, const char *filename)
3710{
3711        struct patch *patch;
3712        struct index_state result = { NULL };
3713        static struct lock_file lock;
3714
3715        /* Once we start supporting the reverse patch, it may be
3716         * worth showing the new sha1 prefix, but until then...
3717         */
3718        for (patch = list; patch; patch = patch->next) {
3719                unsigned char sha1[20];
3720                struct cache_entry *ce;
3721                const char *name;
3722
3723                name = patch->old_name ? patch->old_name : patch->new_name;
3724                if (0 < patch->is_new)
3725                        continue;
3726
3727                if (S_ISGITLINK(patch->old_mode)) {
3728                        if (!preimage_sha1_in_gitlink_patch(patch, sha1))
3729                                ; /* ok, the textual part looks sane */
3730                        else
3731                                die("sha1 information is lacking or useless for submodule %s",
3732                                    name);
3733                } else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {
3734                        ; /* ok */
3735                } else if (!patch->lines_added && !patch->lines_deleted) {
3736                        /* mode-only change: update the current */
3737                        if (get_current_sha1(patch->old_name, sha1))
3738                                die("mode change for %s, which is not "
3739                                    "in current HEAD", name);
3740                } else
3741                        die("sha1 information is lacking or useless "
3742                            "(%s).", name);
3743
3744                ce = make_cache_entry(patch->old_mode, sha1, name, 0, 0);
3745                if (!ce)
3746                        die(_("make_cache_entry failed for path '%s'"), name);
3747                if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))
3748                        die ("Could not add %s to temporary index", name);
3749        }
3750
3751        hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);
3752        if (write_locked_index(&result, &lock, COMMIT_LOCK))
3753                die ("Could not write temporary index to %s", filename);
3754
3755        discard_index(&result);
3756}
3757
3758static void stat_patch_list(struct patch *patch)
3759{
3760        int files, adds, dels;
3761
3762        for (files = adds = dels = 0 ; patch ; patch = patch->next) {
3763                files++;
3764                adds += patch->lines_added;
3765                dels += patch->lines_deleted;
3766                show_stats(patch);
3767        }
3768
3769        print_stat_summary(stdout, files, adds, dels);
3770}
3771
3772static void numstat_patch_list(struct patch *patch)
3773{
3774        for ( ; patch; patch = patch->next) {
3775                const char *name;
3776                name = patch->new_name ? patch->new_name : patch->old_name;
3777                if (patch->is_binary)
3778                        printf("-\t-\t");
3779                else
3780                        printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
3781                write_name_quoted(name, stdout, line_termination);
3782        }
3783}
3784
3785static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
3786{
3787        if (mode)
3788                printf(" %s mode %06o %s\n", newdelete, mode, name);
3789        else
3790                printf(" %s %s\n", newdelete, name);
3791}
3792
3793static void show_mode_change(struct patch *p, int show_name)
3794{
3795        if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
3796                if (show_name)
3797                        printf(" mode change %06o => %06o %s\n",
3798                               p->old_mode, p->new_mode, p->new_name);
3799                else
3800                        printf(" mode change %06o => %06o\n",
3801                               p->old_mode, p->new_mode);
3802        }
3803}
3804
3805static void show_rename_copy(struct patch *p)
3806{
3807        const char *renamecopy = p->is_rename ? "rename" : "copy";
3808        const char *old, *new;
3809
3810        /* Find common prefix */
3811        old = p->old_name;
3812        new = p->new_name;
3813        while (1) {
3814                const char *slash_old, *slash_new;
3815                slash_old = strchr(old, '/');
3816                slash_new = strchr(new, '/');
3817                if (!slash_old ||
3818                    !slash_new ||
3819                    slash_old - old != slash_new - new ||
3820                    memcmp(old, new, slash_new - new))
3821                        break;
3822                old = slash_old + 1;
3823                new = slash_new + 1;
3824        }
3825        /* p->old_name thru old is the common prefix, and old and new
3826         * through the end of names are renames
3827         */
3828        if (old != p->old_name)
3829                printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
3830                       (int)(old - p->old_name), p->old_name,
3831                       old, new, p->score);
3832        else
3833                printf(" %s %s => %s (%d%%)\n", renamecopy,
3834                       p->old_name, p->new_name, p->score);
3835        show_mode_change(p, 0);
3836}
3837
3838static void summary_patch_list(struct patch *patch)
3839{
3840        struct patch *p;
3841
3842        for (p = patch; p; p = p->next) {
3843                if (p->is_new)
3844                        show_file_mode_name("create", p->new_mode, p->new_name);
3845                else if (p->is_delete)
3846                        show_file_mode_name("delete", p->old_mode, p->old_name);
3847                else {
3848                        if (p->is_rename || p->is_copy)
3849                                show_rename_copy(p);
3850                        else {
3851                                if (p->score) {
3852                                        printf(" rewrite %s (%d%%)\n",
3853                                               p->new_name, p->score);
3854                                        show_mode_change(p, 0);
3855                                }
3856                                else
3857                                        show_mode_change(p, 1);
3858                        }
3859                }
3860        }
3861}
3862
3863static void patch_stats(struct patch *patch)
3864{
3865        int lines = patch->lines_added + patch->lines_deleted;
3866
3867        if (lines > max_change)
3868                max_change = lines;
3869        if (patch->old_name) {
3870                int len = quote_c_style(patch->old_name, NULL, NULL, 0);
3871                if (!len)
3872                        len = strlen(patch->old_name);
3873                if (len > max_len)
3874                        max_len = len;
3875        }
3876        if (patch->new_name) {
3877                int len = quote_c_style(patch->new_name, NULL, NULL, 0);
3878                if (!len)
3879                        len = strlen(patch->new_name);
3880                if (len > max_len)
3881                        max_len = len;
3882        }
3883}
3884
3885static void remove_file(struct patch *patch, int rmdir_empty)
3886{
3887        if (update_index) {
3888                if (remove_file_from_cache(patch->old_name) < 0)
3889                        die(_("unable to remove %s from index"), patch->old_name);
3890        }
3891        if (!cached) {
3892                if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {
3893                        remove_path(patch->old_name);
3894                }
3895        }
3896}
3897
3898static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
3899{
3900        struct stat st;
3901        struct cache_entry *ce;
3902        int namelen = strlen(path);
3903        unsigned ce_size = cache_entry_size(namelen);
3904
3905        if (!update_index)
3906                return;
3907
3908        ce = xcalloc(1, ce_size);
3909        memcpy(ce->name, path, namelen);
3910        ce->ce_mode = create_ce_mode(mode);
3911        ce->ce_flags = create_ce_flags(0);
3912        ce->ce_namelen = namelen;
3913        if (S_ISGITLINK(mode)) {
3914                const char *s;
3915
3916                if (!skip_prefix(buf, "Subproject commit ", &s) ||
3917                    get_sha1_hex(s, ce->sha1))
3918                        die(_("corrupt patch for submodule %s"), path);
3919        } else {
3920                if (!cached) {
3921                        if (lstat(path, &st) < 0)
3922                                die_errno(_("unable to stat newly created file '%s'"),
3923                                          path);
3924                        fill_stat_cache_info(ce, &st);
3925                }
3926                if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
3927                        die(_("unable to create backing store for newly created file %s"), path);
3928        }
3929        if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
3930                die(_("unable to add cache entry for %s"), path);
3931}
3932
3933static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
3934{
3935        int fd;
3936        struct strbuf nbuf = STRBUF_INIT;
3937
3938        if (S_ISGITLINK(mode)) {
3939                struct stat st;
3940                if (!lstat(path, &st) && S_ISDIR(st.st_mode))
3941                        return 0;
3942                return mkdir(path, 0777);
3943        }
3944
3945        if (has_symlinks && S_ISLNK(mode))
3946                /* Although buf:size is counted string, it also is NUL
3947                 * terminated.
3948                 */
3949                return symlink(buf, path);
3950
3951        fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
3952        if (fd < 0)
3953                return -1;
3954
3955        if (convert_to_working_tree(path, buf, size, &nbuf)) {
3956                size = nbuf.len;
3957                buf  = nbuf.buf;
3958        }
3959        write_or_die(fd, buf, size);
3960        strbuf_release(&nbuf);
3961
3962        if (close(fd) < 0)
3963                die_errno(_("closing file '%s'"), path);
3964        return 0;
3965}
3966
3967/*
3968 * We optimistically assume that the directories exist,
3969 * which is true 99% of the time anyway. If they don't,
3970 * we create them and try again.
3971 */
3972static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
3973{
3974        if (cached)
3975                return;
3976        if (!try_create_file(path, mode, buf, size))
3977                return;
3978
3979        if (errno == ENOENT) {
3980                if (safe_create_leading_directories(path))
3981                        return;
3982                if (!try_create_file(path, mode, buf, size))
3983                        return;
3984        }
3985
3986        if (errno == EEXIST || errno == EACCES) {
3987                /* We may be trying to create a file where a directory
3988                 * used to be.
3989                 */
3990                struct stat st;
3991                if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))
3992                        errno = EEXIST;
3993        }
3994
3995        if (errno == EEXIST) {
3996                unsigned int nr = getpid();
3997
3998                for (;;) {
3999                        char newpath[PATH_MAX];
4000                        mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);
4001                        if (!try_create_file(newpath, mode, buf, size)) {
4002                                if (!rename(newpath, path))
4003                                        return;
4004                                unlink_or_warn(newpath);
4005                                break;
4006                        }
4007                        if (errno != EEXIST)
4008                                break;
4009                        ++nr;
4010                }
4011        }
4012        die_errno(_("unable to write file '%s' mode %o"), path, mode);
4013}
4014
4015static void add_conflicted_stages_file(struct patch *patch)
4016{
4017        int stage, namelen;
4018        unsigned ce_size, mode;
4019        struct cache_entry *ce;
4020
4021        if (!update_index)
4022                return;
4023        namelen = strlen(patch->new_name);
4024        ce_size = cache_entry_size(namelen);
4025        mode = patch->new_mode ? patch->new_mode : (S_IFREG | 0644);
4026
4027        remove_file_from_cache(patch->new_name);
4028        for (stage = 1; stage < 4; stage++) {
4029                if (is_null_sha1(patch->threeway_stage[stage - 1]))
4030                        continue;
4031                ce = xcalloc(1, ce_size);
4032                memcpy(ce->name, patch->new_name, namelen);
4033                ce->ce_mode = create_ce_mode(mode);
4034                ce->ce_flags = create_ce_flags(stage);
4035                ce->ce_namelen = namelen;
4036                hashcpy(ce->sha1, patch->threeway_stage[stage - 1]);
4037                if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
4038                        die(_("unable to add cache entry for %s"), patch->new_name);
4039        }
4040}
4041
4042static void create_file(struct patch *patch)
4043{
4044        char *path = patch->new_name;
4045        unsigned mode = patch->new_mode;
4046        unsigned long size = patch->resultsize;
4047        char *buf = patch->result;
4048
4049        if (!mode)
4050                mode = S_IFREG | 0644;
4051        create_one_file(path, mode, buf, size);
4052
4053        if (patch->conflicted_threeway)
4054                add_conflicted_stages_file(patch);
4055        else
4056                add_index_file(path, mode, buf, size);
4057}
4058
4059/* phase zero is to remove, phase one is to create */
4060static void write_out_one_result(struct patch *patch, int phase)
4061{
4062        if (patch->is_delete > 0) {
4063                if (phase == 0)
4064                        remove_file(patch, 1);
4065                return;
4066        }
4067        if (patch->is_new > 0 || patch->is_copy) {
4068                if (phase == 1)
4069                        create_file(patch);
4070                return;
4071        }
4072        /*
4073         * Rename or modification boils down to the same
4074         * thing: remove the old, write the new
4075         */
4076        if (phase == 0)
4077                remove_file(patch, patch->is_rename);
4078        if (phase == 1)
4079                create_file(patch);
4080}
4081
4082static int write_out_one_reject(struct patch *patch)
4083{
4084        FILE *rej;
4085        char namebuf[PATH_MAX];
4086        struct fragment *frag;
4087        int cnt = 0;
4088        struct strbuf sb = STRBUF_INIT;
4089
4090        for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
4091                if (!frag->rejected)
4092                        continue;
4093                cnt++;
4094        }
4095
4096        if (!cnt) {
4097                if (apply_verbosely)
4098                        say_patch_name(stderr,
4099                                       _("Applied patch %s cleanly."), patch);
4100                return 0;
4101        }
4102
4103        /* This should not happen, because a removal patch that leaves
4104         * contents are marked "rejected" at the patch level.
4105         */
4106        if (!patch->new_name)
4107                die(_("internal error"));
4108
4109        /* Say this even without --verbose */
4110        strbuf_addf(&sb, Q_("Applying patch %%s with %d reject...",
4111                            "Applying patch %%s with %d rejects...",
4112                            cnt),
4113                    cnt);
4114        say_patch_name(stderr, sb.buf, patch);
4115        strbuf_release(&sb);
4116
4117        cnt = strlen(patch->new_name);
4118        if (ARRAY_SIZE(namebuf) <= cnt + 5) {
4119                cnt = ARRAY_SIZE(namebuf) - 5;
4120                warning(_("truncating .rej filename to %.*s.rej"),
4121                        cnt - 1, patch->new_name);
4122        }
4123        memcpy(namebuf, patch->new_name, cnt);
4124        memcpy(namebuf + cnt, ".rej", 5);
4125
4126        rej = fopen(namebuf, "w");
4127        if (!rej)
4128                return error(_("cannot open %s: %s"), namebuf, strerror(errno));
4129
4130        /* Normal git tools never deal with .rej, so do not pretend
4131         * this is a git patch by saying --git or giving extended
4132         * headers.  While at it, maybe please "kompare" that wants
4133         * the trailing TAB and some garbage at the end of line ;-).
4134         */
4135        fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
4136                patch->new_name, patch->new_name);
4137        for (cnt = 1, frag = patch->fragments;
4138             frag;
4139             cnt++, frag = frag->next) {
4140                if (!frag->rejected) {
4141                        fprintf_ln(stderr, _("Hunk #%d applied cleanly."), cnt);
4142                        continue;
4143                }
4144                fprintf_ln(stderr, _("Rejected hunk #%d."), cnt);
4145                fprintf(rej, "%.*s", frag->size, frag->patch);
4146                if (frag->patch[frag->size-1] != '\n')
4147                        fputc('\n', rej);
4148        }
4149        fclose(rej);
4150        return -1;
4151}
4152
4153static int write_out_results(struct patch *list)
4154{
4155        int phase;
4156        int errs = 0;
4157        struct patch *l;
4158        struct string_list cpath = STRING_LIST_INIT_DUP;
4159
4160        for (phase = 0; phase < 2; phase++) {
4161                l = list;
4162                while (l) {
4163                        if (l->rejected)
4164                                errs = 1;
4165                        else {
4166                                write_out_one_result(l, phase);
4167                                if (phase == 1) {
4168                                        if (write_out_one_reject(l))
4169                                                errs = 1;
4170                                        if (l->conflicted_threeway) {
4171                                                string_list_append(&cpath, l->new_name);
4172                                                errs = 1;
4173                                        }
4174                                }
4175                        }
4176                        l = l->next;
4177                }
4178        }
4179
4180        if (cpath.nr) {
4181                struct string_list_item *item;
4182
4183                string_list_sort(&cpath);
4184                for_each_string_list_item(item, &cpath)
4185                        fprintf(stderr, "U %s\n", item->string);
4186                string_list_clear(&cpath, 0);
4187
4188                rerere(0);
4189        }
4190
4191        return errs;
4192}
4193
4194static struct lock_file lock_file;
4195
4196#define INACCURATE_EOF  (1<<0)
4197#define RECOUNT         (1<<1)
4198
4199static int apply_patch(int fd, const char *filename, int options)
4200{
4201        size_t offset;
4202        struct strbuf buf = STRBUF_INIT; /* owns the patch text */
4203        struct patch *list = NULL, **listp = &list;
4204        int skipped_patch = 0;
4205
4206        patch_input_file = filename;
4207        read_patch_file(&buf, fd);
4208        offset = 0;
4209        while (offset < buf.len) {
4210                struct patch *patch;
4211                int nr;
4212
4213                patch = xcalloc(1, sizeof(*patch));
4214                patch->inaccurate_eof = !!(options & INACCURATE_EOF);
4215                patch->recount =  !!(options & RECOUNT);
4216                nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);
4217                if (nr < 0)
4218                        break;
4219                if (apply_in_reverse)
4220                        reverse_patches(patch);
4221                if (use_patch(patch)) {
4222                        patch_stats(patch);
4223                        *listp = patch;
4224                        listp = &patch->next;
4225                }
4226                else {
4227                        free_patch(patch);
4228                        skipped_patch++;
4229                }
4230                offset += nr;
4231        }
4232
4233        if (!list && !skipped_patch)
4234                die(_("unrecognized input"));
4235
4236        if (whitespace_error && (ws_error_action == die_on_ws_error))
4237                apply = 0;
4238
4239        update_index = check_index && apply;
4240        if (update_index && newfd < 0)
4241                newfd = hold_locked_index(&lock_file, 1);
4242
4243        if (check_index) {
4244                if (read_cache() < 0)
4245                        die(_("unable to read index file"));
4246        }
4247
4248        if ((check || apply) &&
4249            check_patch_list(list) < 0 &&
4250            !apply_with_reject)
4251                exit(1);
4252
4253        if (apply && write_out_results(list)) {
4254                if (apply_with_reject)
4255                        exit(1);
4256                /* with --3way, we still need to write the index out */
4257                return 1;
4258        }
4259
4260        if (fake_ancestor)
4261                build_fake_ancestor(list, fake_ancestor);
4262
4263        if (diffstat)
4264                stat_patch_list(list);
4265
4266        if (numstat)
4267                numstat_patch_list(list);
4268
4269        if (summary)
4270                summary_patch_list(list);
4271
4272        free_patch_list(list);
4273        strbuf_release(&buf);
4274        string_list_clear(&fn_table, 0);
4275        return 0;
4276}
4277
4278static void git_apply_config(void)
4279{
4280        git_config_get_string_const("apply.whitespace", &apply_default_whitespace);
4281        git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);
4282        git_config(git_default_config, NULL);
4283}
4284
4285static int option_parse_exclude(const struct option *opt,
4286                                const char *arg, int unset)
4287{
4288        add_name_limit(arg, 1);
4289        return 0;
4290}
4291
4292static int option_parse_include(const struct option *opt,
4293                                const char *arg, int unset)
4294{
4295        add_name_limit(arg, 0);
4296        has_include = 1;
4297        return 0;
4298}
4299
4300static int option_parse_p(const struct option *opt,
4301                          const char *arg, int unset)
4302{
4303        p_value = atoi(arg);
4304        p_value_known = 1;
4305        return 0;
4306}
4307
4308static int option_parse_z(const struct option *opt,
4309                          const char *arg, int unset)
4310{
4311        if (unset)
4312                line_termination = '\n';
4313        else
4314                line_termination = 0;
4315        return 0;
4316}
4317
4318static int option_parse_space_change(const struct option *opt,
4319                          const char *arg, int unset)
4320{
4321        if (unset)
4322                ws_ignore_action = ignore_ws_none;
4323        else
4324                ws_ignore_action = ignore_ws_change;
4325        return 0;
4326}
4327
4328static int option_parse_whitespace(const struct option *opt,
4329                                   const char *arg, int unset)
4330{
4331        const char **whitespace_option = opt->value;
4332
4333        *whitespace_option = arg;
4334        parse_whitespace_option(arg);
4335        return 0;
4336}
4337
4338static int option_parse_directory(const struct option *opt,
4339                                  const char *arg, int unset)
4340{
4341        root_len = strlen(arg);
4342        if (root_len && arg[root_len - 1] != '/') {
4343                char *new_root;
4344                root = new_root = xmalloc(root_len + 2);
4345                strcpy(new_root, arg);
4346                strcpy(new_root + root_len++, "/");
4347        } else
4348                root = arg;
4349        return 0;
4350}
4351
4352int cmd_apply(int argc, const char **argv, const char *prefix_)
4353{
4354        int i;
4355        int errs = 0;
4356        int is_not_gitdir = !startup_info->have_repository;
4357        int force_apply = 0;
4358
4359        const char *whitespace_option = NULL;
4360
4361        struct option builtin_apply_options[] = {
4362                { OPTION_CALLBACK, 0, "exclude", NULL, N_("path"),
4363                        N_("don't apply changes matching the given path"),
4364                        0, option_parse_exclude },
4365                { OPTION_CALLBACK, 0, "include", NULL, N_("path"),
4366                        N_("apply changes matching the given path"),
4367                        0, option_parse_include },
4368                { OPTION_CALLBACK, 'p', NULL, NULL, N_("num"),
4369                        N_("remove <num> leading slashes from traditional diff paths"),
4370                        0, option_parse_p },
4371                OPT_BOOL(0, "no-add", &no_add,
4372                        N_("ignore additions made by the patch")),
4373                OPT_BOOL(0, "stat", &diffstat,
4374                        N_("instead of applying the patch, output diffstat for the input")),
4375                OPT_NOOP_NOARG(0, "allow-binary-replacement"),
4376                OPT_NOOP_NOARG(0, "binary"),
4377                OPT_BOOL(0, "numstat", &numstat,
4378                        N_("show number of added and deleted lines in decimal notation")),
4379                OPT_BOOL(0, "summary", &summary,
4380                        N_("instead of applying the patch, output a summary for the input")),
4381                OPT_BOOL(0, "check", &check,
4382                        N_("instead of applying the patch, see if the patch is applicable")),
4383                OPT_BOOL(0, "index", &check_index,
4384                        N_("make sure the patch is applicable to the current index")),
4385                OPT_BOOL(0, "cached", &cached,
4386                        N_("apply a patch without touching the working tree")),
4387                OPT_BOOL(0, "apply", &force_apply,
4388                        N_("also apply the patch (use with --stat/--summary/--check)")),
4389                OPT_BOOL('3', "3way", &threeway,
4390                         N_( "attempt three-way merge if a patch does not apply")),
4391                OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor,
4392                        N_("build a temporary index based on embedded index information")),
4393                { OPTION_CALLBACK, 'z', NULL, NULL, NULL,
4394                        N_("paths are separated with NUL character"),
4395                        PARSE_OPT_NOARG, option_parse_z },
4396                OPT_INTEGER('C', NULL, &p_context,
4397                                N_("ensure at least <n> lines of context match")),
4398                { OPTION_CALLBACK, 0, "whitespace", &whitespace_option, N_("action"),
4399                        N_("detect new or modified lines that have whitespace errors"),
4400                        0, option_parse_whitespace },
4401                { OPTION_CALLBACK, 0, "ignore-space-change", NULL, NULL,
4402                        N_("ignore changes in whitespace when finding context"),
4403                        PARSE_OPT_NOARG, option_parse_space_change },
4404                { OPTION_CALLBACK, 0, "ignore-whitespace", NULL, NULL,
4405                        N_("ignore changes in whitespace when finding context"),
4406                        PARSE_OPT_NOARG, option_parse_space_change },
4407                OPT_BOOL('R', "reverse", &apply_in_reverse,
4408                        N_("apply the patch in reverse")),
4409                OPT_BOOL(0, "unidiff-zero", &unidiff_zero,
4410                        N_("don't expect at least one line of context")),
4411                OPT_BOOL(0, "reject", &apply_with_reject,
4412                        N_("leave the rejected hunks in corresponding *.rej files")),
4413                OPT_BOOL(0, "allow-overlap", &allow_overlap,
4414                        N_("allow overlapping hunks")),
4415                OPT__VERBOSE(&apply_verbosely, N_("be verbose")),
4416                OPT_BIT(0, "inaccurate-eof", &options,
4417                        N_("tolerate incorrectly detected missing new-line at the end of file"),
4418                        INACCURATE_EOF),
4419                OPT_BIT(0, "recount", &options,
4420                        N_("do not trust the line counts in the hunk headers"),
4421                        RECOUNT),
4422                { OPTION_CALLBACK, 0, "directory", NULL, N_("root"),
4423                        N_("prepend <root> to all filenames"),
4424                        0, option_parse_directory },
4425                OPT_END()
4426        };
4427
4428        prefix = prefix_;
4429        prefix_length = prefix ? strlen(prefix) : 0;
4430        git_apply_config();
4431        if (apply_default_whitespace)
4432                parse_whitespace_option(apply_default_whitespace);
4433        if (apply_default_ignorewhitespace)
4434                parse_ignorewhitespace_option(apply_default_ignorewhitespace);
4435
4436        argc = parse_options(argc, argv, prefix, builtin_apply_options,
4437                        apply_usage, 0);
4438
4439        if (apply_with_reject && threeway)
4440                die("--reject and --3way cannot be used together.");
4441        if (cached && threeway)
4442                die("--cached and --3way cannot be used together.");
4443        if (threeway) {
4444                if (is_not_gitdir)
4445                        die(_("--3way outside a repository"));
4446                check_index = 1;
4447        }
4448        if (apply_with_reject)
4449                apply = apply_verbosely = 1;
4450        if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor))
4451                apply = 0;
4452        if (check_index && is_not_gitdir)
4453                die(_("--index outside a repository"));
4454        if (cached) {
4455                if (is_not_gitdir)
4456                        die(_("--cached outside a repository"));
4457                check_index = 1;
4458        }
4459        for (i = 0; i < argc; i++) {
4460                const char *arg = argv[i];
4461                int fd;
4462
4463                if (!strcmp(arg, "-")) {
4464                        errs |= apply_patch(0, "<stdin>", options);
4465                        read_stdin = 0;
4466                        continue;
4467                } else if (0 < prefix_length)
4468                        arg = prefix_filename(prefix, prefix_length, arg);
4469
4470                fd = open(arg, O_RDONLY);
4471                if (fd < 0)
4472                        die_errno(_("can't open patch '%s'"), arg);
4473                read_stdin = 0;
4474                set_default_whitespace_mode(whitespace_option);
4475                errs |= apply_patch(fd, arg, options);
4476                close(fd);
4477        }
4478        set_default_whitespace_mode(whitespace_option);
4479        if (read_stdin)
4480                errs |= apply_patch(0, "<stdin>", options);
4481        if (whitespace_error) {
4482                if (squelch_whitespace_errors &&
4483                    squelch_whitespace_errors < whitespace_error) {
4484                        int squelched =
4485                                whitespace_error - squelch_whitespace_errors;
4486                        warning(Q_("squelched %d whitespace error",
4487                                   "squelched %d whitespace errors",
4488                                   squelched),
4489                                squelched);
4490                }
4491                if (ws_error_action == die_on_ws_error)
4492                        die(Q_("%d line adds whitespace errors.",
4493                               "%d lines add whitespace errors.",
4494                               whitespace_error),
4495                            whitespace_error);
4496                if (applied_after_fixing_ws && apply)
4497                        warning("%d line%s applied after"
4498                                " fixing whitespace errors.",
4499                                applied_after_fixing_ws,
4500                                applied_after_fixing_ws == 1 ? "" : "s");
4501                else if (whitespace_error)
4502                        warning(Q_("%d line adds whitespace errors.",
4503                                   "%d lines add whitespace errors.",
4504                                   whitespace_error),
4505                                whitespace_error);
4506        }
4507
4508        if (update_index) {
4509                if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
4510                        die(_("Unable to write new index file"));
4511        }
4512
4513        return !!errs;
4514}