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