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