builtin-apply.con commit apply --whitespace=error: correctly report new blank lines at end (8557263)
   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
  18/*
  19 *  --check turns on checking that the working tree matches the
  20 *    files that are being modified, but doesn't apply the patch
  21 *  --stat does just a diffstat, and doesn't actually apply
  22 *  --numstat does numeric diffstat, and doesn't actually apply
  23 *  --index-info shows the old and new index info for paths if available.
  24 *  --index updates the cache as well.
  25 *  --cached updates only the cache without ever touching the working tree.
  26 */
  27static const char *prefix;
  28static int prefix_length = -1;
  29static int newfd = -1;
  30
  31static int unidiff_zero;
  32static int p_value = 1;
  33static int p_value_known;
  34static int check_index;
  35static int update_index;
  36static int cached;
  37static int diffstat;
  38static int numstat;
  39static int summary;
  40static int check;
  41static int apply = 1;
  42static int apply_in_reverse;
  43static int apply_with_reject;
  44static int apply_verbosely;
  45static int no_add;
  46static const char *fake_ancestor;
  47static int line_termination = '\n';
  48static unsigned long p_context = ULONG_MAX;
  49static const char apply_usage[] =
  50"git apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|fix|error|error-all>] <patch>...";
  51
  52static enum ws_error_action {
  53        nowarn_ws_error,
  54        warn_on_ws_error,
  55        die_on_ws_error,
  56        correct_ws_error,
  57} ws_error_action = warn_on_ws_error;
  58static int whitespace_error;
  59static int squelch_whitespace_errors = 5;
  60static int applied_after_fixing_ws;
  61static const char *patch_input_file;
  62static const char *root;
  63static int root_len;
  64
  65static void parse_whitespace_option(const char *option)
  66{
  67        if (!option) {
  68                ws_error_action = warn_on_ws_error;
  69                return;
  70        }
  71        if (!strcmp(option, "warn")) {
  72                ws_error_action = warn_on_ws_error;
  73                return;
  74        }
  75        if (!strcmp(option, "nowarn")) {
  76                ws_error_action = nowarn_ws_error;
  77                return;
  78        }
  79        if (!strcmp(option, "error")) {
  80                ws_error_action = die_on_ws_error;
  81                return;
  82        }
  83        if (!strcmp(option, "error-all")) {
  84                ws_error_action = die_on_ws_error;
  85                squelch_whitespace_errors = 0;
  86                return;
  87        }
  88        if (!strcmp(option, "strip") || !strcmp(option, "fix")) {
  89                ws_error_action = correct_ws_error;
  90                return;
  91        }
  92        die("unrecognized whitespace option '%s'", option);
  93}
  94
  95static void set_default_whitespace_mode(const char *whitespace_option)
  96{
  97        if (!whitespace_option && !apply_default_whitespace)
  98                ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error);
  99}
 100
 101/*
 102 * For "diff-stat" like behaviour, we keep track of the biggest change
 103 * we've seen, and the longest filename. That allows us to do simple
 104 * scaling.
 105 */
 106static int max_change, max_len;
 107
 108/*
 109 * Various "current state", notably line numbers and what
 110 * file (and how) we're patching right now.. The "is_xxxx"
 111 * things are flags, where -1 means "don't know yet".
 112 */
 113static int linenr = 1;
 114
 115/*
 116 * This represents one "hunk" from a patch, starting with
 117 * "@@ -oldpos,oldlines +newpos,newlines @@" marker.  The
 118 * patch text is pointed at by patch, and its byte length
 119 * is stored in size.  leading and trailing are the number
 120 * of context lines.
 121 */
 122struct fragment {
 123        unsigned long leading, trailing;
 124        unsigned long oldpos, oldlines;
 125        unsigned long newpos, newlines;
 126        const char *patch;
 127        int size;
 128        int rejected;
 129        int linenr;
 130        struct fragment *next;
 131};
 132
 133/*
 134 * When dealing with a binary patch, we reuse "leading" field
 135 * to store the type of the binary hunk, either deflated "delta"
 136 * or deflated "literal".
 137 */
 138#define binary_patch_method leading
 139#define BINARY_DELTA_DEFLATED   1
 140#define BINARY_LITERAL_DEFLATED 2
 141
 142/*
 143 * This represents a "patch" to a file, both metainfo changes
 144 * such as creation/deletion, filemode and content changes represented
 145 * as a series of fragments.
 146 */
 147struct patch {
 148        char *new_name, *old_name, *def_name;
 149        unsigned int old_mode, new_mode;
 150        int is_new, is_delete;  /* -1 = unknown, 0 = false, 1 = true */
 151        int rejected;
 152        unsigned ws_rule;
 153        unsigned long deflate_origlen;
 154        int lines_added, lines_deleted;
 155        int score;
 156        unsigned int is_toplevel_relative:1;
 157        unsigned int inaccurate_eof:1;
 158        unsigned int is_binary:1;
 159        unsigned int is_copy:1;
 160        unsigned int is_rename:1;
 161        unsigned int recount:1;
 162        struct fragment *fragments;
 163        char *result;
 164        size_t resultsize;
 165        char old_sha1_prefix[41];
 166        char new_sha1_prefix[41];
 167        struct patch *next;
 168};
 169
 170/*
 171 * A line in a file, len-bytes long (includes the terminating LF,
 172 * except for an incomplete line at the end if the file ends with
 173 * one), and its contents hashes to 'hash'.
 174 */
 175struct line {
 176        size_t len;
 177        unsigned hash : 24;
 178        unsigned flag : 8;
 179#define LINE_COMMON     1
 180};
 181
 182/*
 183 * This represents a "file", which is an array of "lines".
 184 */
 185struct image {
 186        char *buf;
 187        size_t len;
 188        size_t nr;
 189        size_t alloc;
 190        struct line *line_allocated;
 191        struct line *line;
 192};
 193
 194/*
 195 * Records filenames that have been touched, in order to handle
 196 * the case where more than one patches touch the same file.
 197 */
 198
 199static struct string_list fn_table;
 200
 201static uint32_t hash_line(const char *cp, size_t len)
 202{
 203        size_t i;
 204        uint32_t h;
 205        for (i = 0, h = 0; i < len; i++) {
 206                if (!isspace(cp[i])) {
 207                        h = h * 3 + (cp[i] & 0xff);
 208                }
 209        }
 210        return h;
 211}
 212
 213static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag)
 214{
 215        ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc);
 216        img->line_allocated[img->nr].len = len;
 217        img->line_allocated[img->nr].hash = hash_line(bol, len);
 218        img->line_allocated[img->nr].flag = flag;
 219        img->nr++;
 220}
 221
 222static void prepare_image(struct image *image, char *buf, size_t len,
 223                          int prepare_linetable)
 224{
 225        const char *cp, *ep;
 226
 227        memset(image, 0, sizeof(*image));
 228        image->buf = buf;
 229        image->len = len;
 230
 231        if (!prepare_linetable)
 232                return;
 233
 234        ep = image->buf + image->len;
 235        cp = image->buf;
 236        while (cp < ep) {
 237                const char *next;
 238                for (next = cp; next < ep && *next != '\n'; next++)
 239                        ;
 240                if (next < ep)
 241                        next++;
 242                add_line_info(image, cp, next - cp, 0);
 243                cp = next;
 244        }
 245        image->line = image->line_allocated;
 246}
 247
 248static void clear_image(struct image *image)
 249{
 250        free(image->buf);
 251        image->buf = NULL;
 252        image->len = 0;
 253}
 254
 255static void say_patch_name(FILE *output, const char *pre,
 256                           struct patch *patch, const char *post)
 257{
 258        fputs(pre, output);
 259        if (patch->old_name && patch->new_name &&
 260            strcmp(patch->old_name, patch->new_name)) {
 261                quote_c_style(patch->old_name, NULL, output, 0);
 262                fputs(" => ", output);
 263                quote_c_style(patch->new_name, NULL, output, 0);
 264        } else {
 265                const char *n = patch->new_name;
 266                if (!n)
 267                        n = patch->old_name;
 268                quote_c_style(n, NULL, output, 0);
 269        }
 270        fputs(post, output);
 271}
 272
 273#define CHUNKSIZE (8192)
 274#define SLOP (16)
 275
 276static void read_patch_file(struct strbuf *sb, int fd)
 277{
 278        if (strbuf_read(sb, fd, 0) < 0)
 279                die("git apply: read returned %s", strerror(errno));
 280
 281        /*
 282         * Make sure that we have some slop in the buffer
 283         * so that we can do speculative "memcmp" etc, and
 284         * see to it that it is NUL-filled.
 285         */
 286        strbuf_grow(sb, SLOP);
 287        memset(sb->buf + sb->len, 0, SLOP);
 288}
 289
 290static unsigned long linelen(const char *buffer, unsigned long size)
 291{
 292        unsigned long len = 0;
 293        while (size--) {
 294                len++;
 295                if (*buffer++ == '\n')
 296                        break;
 297        }
 298        return len;
 299}
 300
 301static int is_dev_null(const char *str)
 302{
 303        return !memcmp("/dev/null", str, 9) && isspace(str[9]);
 304}
 305
 306#define TERM_SPACE      1
 307#define TERM_TAB        2
 308
 309static int name_terminate(const char *name, int namelen, int c, int terminate)
 310{
 311        if (c == ' ' && !(terminate & TERM_SPACE))
 312                return 0;
 313        if (c == '\t' && !(terminate & TERM_TAB))
 314                return 0;
 315
 316        return 1;
 317}
 318
 319static char *find_name(const char *line, char *def, int p_value, int terminate)
 320{
 321        int len;
 322        const char *start = line;
 323
 324        if (*line == '"') {
 325                struct strbuf name;
 326
 327                /*
 328                 * Proposed "new-style" GNU patch/diff format; see
 329                 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
 330                 */
 331                strbuf_init(&name, 0);
 332                if (!unquote_c_style(&name, line, NULL)) {
 333                        char *cp;
 334
 335                        for (cp = name.buf; p_value; p_value--) {
 336                                cp = strchr(cp, '/');
 337                                if (!cp)
 338                                        break;
 339                                cp++;
 340                        }
 341                        if (cp) {
 342                                /* name can later be freed, so we need
 343                                 * to memmove, not just return cp
 344                                 */
 345                                strbuf_remove(&name, 0, cp - name.buf);
 346                                free(def);
 347                                if (root)
 348                                        strbuf_insert(&name, 0, root, root_len);
 349                                return strbuf_detach(&name, NULL);
 350                        }
 351                }
 352                strbuf_release(&name);
 353        }
 354
 355        for (;;) {
 356                char c = *line;
 357
 358                if (isspace(c)) {
 359                        if (c == '\n')
 360                                break;
 361                        if (name_terminate(start, line-start, c, terminate))
 362                                break;
 363                }
 364                line++;
 365                if (c == '/' && !--p_value)
 366                        start = line;
 367        }
 368        if (!start)
 369                return def;
 370        len = line - start;
 371        if (!len)
 372                return def;
 373
 374        /*
 375         * Generally we prefer the shorter name, especially
 376         * if the other one is just a variation of that with
 377         * something else tacked on to the end (ie "file.orig"
 378         * or "file~").
 379         */
 380        if (def) {
 381                int deflen = strlen(def);
 382                if (deflen < len && !strncmp(start, def, deflen))
 383                        return def;
 384                free(def);
 385        }
 386
 387        if (root) {
 388                char *ret = xmalloc(root_len + len + 1);
 389                strcpy(ret, root);
 390                memcpy(ret + root_len, start, len);
 391                ret[root_len + len] = '\0';
 392                return ret;
 393        }
 394
 395        return xmemdupz(start, len);
 396}
 397
 398static int count_slashes(const char *cp)
 399{
 400        int cnt = 0;
 401        char ch;
 402
 403        while ((ch = *cp++))
 404                if (ch == '/')
 405                        cnt++;
 406        return cnt;
 407}
 408
 409/*
 410 * Given the string after "--- " or "+++ ", guess the appropriate
 411 * p_value for the given patch.
 412 */
 413static int guess_p_value(const char *nameline)
 414{
 415        char *name, *cp;
 416        int val = -1;
 417
 418        if (is_dev_null(nameline))
 419                return -1;
 420        name = find_name(nameline, NULL, 0, TERM_SPACE | TERM_TAB);
 421        if (!name)
 422                return -1;
 423        cp = strchr(name, '/');
 424        if (!cp)
 425                val = 0;
 426        else if (prefix) {
 427                /*
 428                 * Does it begin with "a/$our-prefix" and such?  Then this is
 429                 * very likely to apply to our directory.
 430                 */
 431                if (!strncmp(name, prefix, prefix_length))
 432                        val = count_slashes(prefix);
 433                else {
 434                        cp++;
 435                        if (!strncmp(cp, prefix, prefix_length))
 436                                val = count_slashes(prefix) + 1;
 437                }
 438        }
 439        free(name);
 440        return val;
 441}
 442
 443/*
 444 * Get the name etc info from the ---/+++ lines of a traditional patch header
 445 *
 446 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
 447 * files, we can happily check the index for a match, but for creating a
 448 * new file we should try to match whatever "patch" does. I have no idea.
 449 */
 450static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
 451{
 452        char *name;
 453
 454        first += 4;     /* skip "--- " */
 455        second += 4;    /* skip "+++ " */
 456        if (!p_value_known) {
 457                int p, q;
 458                p = guess_p_value(first);
 459                q = guess_p_value(second);
 460                if (p < 0) p = q;
 461                if (0 <= p && p == q) {
 462                        p_value = p;
 463                        p_value_known = 1;
 464                }
 465        }
 466        if (is_dev_null(first)) {
 467                patch->is_new = 1;
 468                patch->is_delete = 0;
 469                name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
 470                patch->new_name = name;
 471        } else if (is_dev_null(second)) {
 472                patch->is_new = 0;
 473                patch->is_delete = 1;
 474                name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
 475                patch->old_name = name;
 476        } else {
 477                name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
 478                name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
 479                patch->old_name = patch->new_name = name;
 480        }
 481        if (!name)
 482                die("unable to find filename in patch at line %d", linenr);
 483}
 484
 485static int gitdiff_hdrend(const char *line, struct patch *patch)
 486{
 487        return -1;
 488}
 489
 490/*
 491 * We're anal about diff header consistency, to make
 492 * sure that we don't end up having strange ambiguous
 493 * patches floating around.
 494 *
 495 * As a result, gitdiff_{old|new}name() will check
 496 * their names against any previous information, just
 497 * to make sure..
 498 */
 499static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
 500{
 501        if (!orig_name && !isnull)
 502                return find_name(line, NULL, p_value, TERM_TAB);
 503
 504        if (orig_name) {
 505                int len;
 506                const char *name;
 507                char *another;
 508                name = orig_name;
 509                len = strlen(name);
 510                if (isnull)
 511                        die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
 512                another = find_name(line, NULL, p_value, TERM_TAB);
 513                if (!another || memcmp(another, name, len))
 514                        die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
 515                free(another);
 516                return orig_name;
 517        }
 518        else {
 519                /* expect "/dev/null" */
 520                if (memcmp("/dev/null", line, 9) || line[9] != '\n')
 521                        die("git apply: bad git-diff - expected /dev/null on line %d", linenr);
 522                return NULL;
 523        }
 524}
 525
 526static int gitdiff_oldname(const char *line, struct patch *patch)
 527{
 528        patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
 529        return 0;
 530}
 531
 532static int gitdiff_newname(const char *line, struct patch *patch)
 533{
 534        patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
 535        return 0;
 536}
 537
 538static int gitdiff_oldmode(const char *line, struct patch *patch)
 539{
 540        patch->old_mode = strtoul(line, NULL, 8);
 541        return 0;
 542}
 543
 544static int gitdiff_newmode(const char *line, struct patch *patch)
 545{
 546        patch->new_mode = strtoul(line, NULL, 8);
 547        return 0;
 548}
 549
 550static int gitdiff_delete(const char *line, struct patch *patch)
 551{
 552        patch->is_delete = 1;
 553        patch->old_name = patch->def_name;
 554        return gitdiff_oldmode(line, patch);
 555}
 556
 557static int gitdiff_newfile(const char *line, struct patch *patch)
 558{
 559        patch->is_new = 1;
 560        patch->new_name = patch->def_name;
 561        return gitdiff_newmode(line, patch);
 562}
 563
 564static int gitdiff_copysrc(const char *line, struct patch *patch)
 565{
 566        patch->is_copy = 1;
 567        patch->old_name = find_name(line, NULL, 0, 0);
 568        return 0;
 569}
 570
 571static int gitdiff_copydst(const char *line, struct patch *patch)
 572{
 573        patch->is_copy = 1;
 574        patch->new_name = find_name(line, NULL, 0, 0);
 575        return 0;
 576}
 577
 578static int gitdiff_renamesrc(const char *line, struct patch *patch)
 579{
 580        patch->is_rename = 1;
 581        patch->old_name = find_name(line, NULL, 0, 0);
 582        return 0;
 583}
 584
 585static int gitdiff_renamedst(const char *line, struct patch *patch)
 586{
 587        patch->is_rename = 1;
 588        patch->new_name = find_name(line, NULL, 0, 0);
 589        return 0;
 590}
 591
 592static int gitdiff_similarity(const char *line, struct patch *patch)
 593{
 594        if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
 595                patch->score = 0;
 596        return 0;
 597}
 598
 599static int gitdiff_dissimilarity(const char *line, struct patch *patch)
 600{
 601        if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
 602                patch->score = 0;
 603        return 0;
 604}
 605
 606static int gitdiff_index(const char *line, struct patch *patch)
 607{
 608        /*
 609         * index line is N hexadecimal, "..", N hexadecimal,
 610         * and optional space with octal mode.
 611         */
 612        const char *ptr, *eol;
 613        int len;
 614
 615        ptr = strchr(line, '.');
 616        if (!ptr || ptr[1] != '.' || 40 < ptr - line)
 617                return 0;
 618        len = ptr - line;
 619        memcpy(patch->old_sha1_prefix, line, len);
 620        patch->old_sha1_prefix[len] = 0;
 621
 622        line = ptr + 2;
 623        ptr = strchr(line, ' ');
 624        eol = strchr(line, '\n');
 625
 626        if (!ptr || eol < ptr)
 627                ptr = eol;
 628        len = ptr - line;
 629
 630        if (40 < len)
 631                return 0;
 632        memcpy(patch->new_sha1_prefix, line, len);
 633        patch->new_sha1_prefix[len] = 0;
 634        if (*ptr == ' ')
 635                patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
 636        return 0;
 637}
 638
 639/*
 640 * This is normal for a diff that doesn't change anything: we'll fall through
 641 * into the next diff. Tell the parser to break out.
 642 */
 643static int gitdiff_unrecognized(const char *line, struct patch *patch)
 644{
 645        return -1;
 646}
 647
 648static const char *stop_at_slash(const char *line, int llen)
 649{
 650        int i;
 651
 652        for (i = 0; i < llen; i++) {
 653                int ch = line[i];
 654                if (ch == '/')
 655                        return line + i;
 656        }
 657        return NULL;
 658}
 659
 660/*
 661 * This is to extract the same name that appears on "diff --git"
 662 * line.  We do not find and return anything if it is a rename
 663 * patch, and it is OK because we will find the name elsewhere.
 664 * We need to reliably find name only when it is mode-change only,
 665 * creation or deletion of an empty file.  In any of these cases,
 666 * both sides are the same name under a/ and b/ respectively.
 667 */
 668static char *git_header_name(char *line, int llen)
 669{
 670        const char *name;
 671        const char *second = NULL;
 672        size_t len;
 673
 674        line += strlen("diff --git ");
 675        llen -= strlen("diff --git ");
 676
 677        if (*line == '"') {
 678                const char *cp;
 679                struct strbuf first;
 680                struct strbuf sp;
 681
 682                strbuf_init(&first, 0);
 683                strbuf_init(&sp, 0);
 684
 685                if (unquote_c_style(&first, line, &second))
 686                        goto free_and_fail1;
 687
 688                /* advance to the first slash */
 689                cp = stop_at_slash(first.buf, first.len);
 690                /* we do not accept absolute paths */
 691                if (!cp || cp == first.buf)
 692                        goto free_and_fail1;
 693                strbuf_remove(&first, 0, cp + 1 - first.buf);
 694
 695                /*
 696                 * second points at one past closing dq of name.
 697                 * find the second name.
 698                 */
 699                while ((second < line + llen) && isspace(*second))
 700                        second++;
 701
 702                if (line + llen <= second)
 703                        goto free_and_fail1;
 704                if (*second == '"') {
 705                        if (unquote_c_style(&sp, second, NULL))
 706                                goto free_and_fail1;
 707                        cp = stop_at_slash(sp.buf, sp.len);
 708                        if (!cp || cp == sp.buf)
 709                                goto free_and_fail1;
 710                        /* They must match, otherwise ignore */
 711                        if (strcmp(cp + 1, first.buf))
 712                                goto free_and_fail1;
 713                        strbuf_release(&sp);
 714                        return strbuf_detach(&first, NULL);
 715                }
 716
 717                /* unquoted second */
 718                cp = stop_at_slash(second, line + llen - second);
 719                if (!cp || cp == second)
 720                        goto free_and_fail1;
 721                cp++;
 722                if (line + llen - cp != first.len + 1 ||
 723                    memcmp(first.buf, cp, first.len))
 724                        goto free_and_fail1;
 725                return strbuf_detach(&first, NULL);
 726
 727        free_and_fail1:
 728                strbuf_release(&first);
 729                strbuf_release(&sp);
 730                return NULL;
 731        }
 732
 733        /* unquoted first name */
 734        name = stop_at_slash(line, llen);
 735        if (!name || name == line)
 736                return NULL;
 737        name++;
 738
 739        /*
 740         * since the first name is unquoted, a dq if exists must be
 741         * the beginning of the second name.
 742         */
 743        for (second = name; second < line + llen; second++) {
 744                if (*second == '"') {
 745                        struct strbuf sp;
 746                        const char *np;
 747
 748                        strbuf_init(&sp, 0);
 749                        if (unquote_c_style(&sp, second, NULL))
 750                                goto free_and_fail2;
 751
 752                        np = stop_at_slash(sp.buf, sp.len);
 753                        if (!np || np == sp.buf)
 754                                goto free_and_fail2;
 755                        np++;
 756
 757                        len = sp.buf + sp.len - np;
 758                        if (len < second - name &&
 759                            !strncmp(np, name, len) &&
 760                            isspace(name[len])) {
 761                                /* Good */
 762                                strbuf_remove(&sp, 0, np - sp.buf);
 763                                return strbuf_detach(&sp, NULL);
 764                        }
 765
 766                free_and_fail2:
 767                        strbuf_release(&sp);
 768                        return NULL;
 769                }
 770        }
 771
 772        /*
 773         * Accept a name only if it shows up twice, exactly the same
 774         * form.
 775         */
 776        for (len = 0 ; ; len++) {
 777                switch (name[len]) {
 778                default:
 779                        continue;
 780                case '\n':
 781                        return NULL;
 782                case '\t': case ' ':
 783                        second = name+len;
 784                        for (;;) {
 785                                char c = *second++;
 786                                if (c == '\n')
 787                                        return NULL;
 788                                if (c == '/')
 789                                        break;
 790                        }
 791                        if (second[len] == '\n' && !memcmp(name, second, len)) {
 792                                return xmemdupz(name, len);
 793                        }
 794                }
 795        }
 796}
 797
 798/* Verify that we recognize the lines following a git header */
 799static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
 800{
 801        unsigned long offset;
 802
 803        /* A git diff has explicit new/delete information, so we don't guess */
 804        patch->is_new = 0;
 805        patch->is_delete = 0;
 806
 807        /*
 808         * Some things may not have the old name in the
 809         * rest of the headers anywhere (pure mode changes,
 810         * or removing or adding empty files), so we get
 811         * the default name from the header.
 812         */
 813        patch->def_name = git_header_name(line, len);
 814        if (patch->def_name && root) {
 815                char *s = xmalloc(root_len + strlen(patch->def_name) + 1);
 816                strcpy(s, root);
 817                strcpy(s + root_len, patch->def_name);
 818                free(patch->def_name);
 819                patch->def_name = s;
 820        }
 821
 822        line += len;
 823        size -= len;
 824        linenr++;
 825        for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
 826                static const struct opentry {
 827                        const char *str;
 828                        int (*fn)(const char *, struct patch *);
 829                } optable[] = {
 830                        { "@@ -", gitdiff_hdrend },
 831                        { "--- ", gitdiff_oldname },
 832                        { "+++ ", gitdiff_newname },
 833                        { "old mode ", gitdiff_oldmode },
 834                        { "new mode ", gitdiff_newmode },
 835                        { "deleted file mode ", gitdiff_delete },
 836                        { "new file mode ", gitdiff_newfile },
 837                        { "copy from ", gitdiff_copysrc },
 838                        { "copy to ", gitdiff_copydst },
 839                        { "rename old ", gitdiff_renamesrc },
 840                        { "rename new ", gitdiff_renamedst },
 841                        { "rename from ", gitdiff_renamesrc },
 842                        { "rename to ", gitdiff_renamedst },
 843                        { "similarity index ", gitdiff_similarity },
 844                        { "dissimilarity index ", gitdiff_dissimilarity },
 845                        { "index ", gitdiff_index },
 846                        { "", gitdiff_unrecognized },
 847                };
 848                int i;
 849
 850                len = linelen(line, size);
 851                if (!len || line[len-1] != '\n')
 852                        break;
 853                for (i = 0; i < ARRAY_SIZE(optable); i++) {
 854                        const struct opentry *p = optable + i;
 855                        int oplen = strlen(p->str);
 856                        if (len < oplen || memcmp(p->str, line, oplen))
 857                                continue;
 858                        if (p->fn(line + oplen, patch) < 0)
 859                                return offset;
 860                        break;
 861                }
 862        }
 863
 864        return offset;
 865}
 866
 867static int parse_num(const char *line, unsigned long *p)
 868{
 869        char *ptr;
 870
 871        if (!isdigit(*line))
 872                return 0;
 873        *p = strtoul(line, &ptr, 10);
 874        return ptr - line;
 875}
 876
 877static int parse_range(const char *line, int len, int offset, const char *expect,
 878                       unsigned long *p1, unsigned long *p2)
 879{
 880        int digits, ex;
 881
 882        if (offset < 0 || offset >= len)
 883                return -1;
 884        line += offset;
 885        len -= offset;
 886
 887        digits = parse_num(line, p1);
 888        if (!digits)
 889                return -1;
 890
 891        offset += digits;
 892        line += digits;
 893        len -= digits;
 894
 895        *p2 = 1;
 896        if (*line == ',') {
 897                digits = parse_num(line+1, p2);
 898                if (!digits)
 899                        return -1;
 900
 901                offset += digits+1;
 902                line += digits+1;
 903                len -= digits+1;
 904        }
 905
 906        ex = strlen(expect);
 907        if (ex > len)
 908                return -1;
 909        if (memcmp(line, expect, ex))
 910                return -1;
 911
 912        return offset + ex;
 913}
 914
 915static void recount_diff(char *line, int size, struct fragment *fragment)
 916{
 917        int oldlines = 0, newlines = 0, ret = 0;
 918
 919        if (size < 1) {
 920                warning("recount: ignore empty hunk");
 921                return;
 922        }
 923
 924        for (;;) {
 925                int len = linelen(line, size);
 926                size -= len;
 927                line += len;
 928
 929                if (size < 1)
 930                        break;
 931
 932                switch (*line) {
 933                case ' ': case '\n':
 934                        newlines++;
 935                        /* fall through */
 936                case '-':
 937                        oldlines++;
 938                        continue;
 939                case '+':
 940                        newlines++;
 941                        continue;
 942                case '\\':
 943                        continue;
 944                case '@':
 945                        ret = size < 3 || prefixcmp(line, "@@ ");
 946                        break;
 947                case 'd':
 948                        ret = size < 5 || prefixcmp(line, "diff ");
 949                        break;
 950                default:
 951                        ret = -1;
 952                        break;
 953                }
 954                if (ret) {
 955                        warning("recount: unexpected line: %.*s",
 956                                (int)linelen(line, size), line);
 957                        return;
 958                }
 959                break;
 960        }
 961        fragment->oldlines = oldlines;
 962        fragment->newlines = newlines;
 963}
 964
 965/*
 966 * Parse a unified diff fragment header of the
 967 * form "@@ -a,b +c,d @@"
 968 */
 969static int parse_fragment_header(char *line, int len, struct fragment *fragment)
 970{
 971        int offset;
 972
 973        if (!len || line[len-1] != '\n')
 974                return -1;
 975
 976        /* Figure out the number of lines in a fragment */
 977        offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
 978        offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
 979
 980        return offset;
 981}
 982
 983static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
 984{
 985        unsigned long offset, len;
 986
 987        patch->is_toplevel_relative = 0;
 988        patch->is_rename = patch->is_copy = 0;
 989        patch->is_new = patch->is_delete = -1;
 990        patch->old_mode = patch->new_mode = 0;
 991        patch->old_name = patch->new_name = NULL;
 992        for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
 993                unsigned long nextlen;
 994
 995                len = linelen(line, size);
 996                if (!len)
 997                        break;
 998
 999                /* Testing this early allows us to take a few shortcuts.. */
1000                if (len < 6)
1001                        continue;
1002
1003                /*
1004                 * Make sure we don't find any unconnected patch fragments.
1005                 * That's a sign that we didn't find a header, and that a
1006                 * patch has become corrupted/broken up.
1007                 */
1008                if (!memcmp("@@ -", line, 4)) {
1009                        struct fragment dummy;
1010                        if (parse_fragment_header(line, len, &dummy) < 0)
1011                                continue;
1012                        die("patch fragment without header at line %d: %.*s",
1013                            linenr, (int)len-1, line);
1014                }
1015
1016                if (size < len + 6)
1017                        break;
1018
1019                /*
1020                 * Git patch? It might not have a real patch, just a rename
1021                 * or mode change, so we handle that specially
1022                 */
1023                if (!memcmp("diff --git ", line, 11)) {
1024                        int git_hdr_len = parse_git_header(line, len, size, patch);
1025                        if (git_hdr_len <= len)
1026                                continue;
1027                        if (!patch->old_name && !patch->new_name) {
1028                                if (!patch->def_name)
1029                                        die("git diff header lacks filename information (line %d)", linenr);
1030                                patch->old_name = patch->new_name = patch->def_name;
1031                        }
1032                        patch->is_toplevel_relative = 1;
1033                        *hdrsize = git_hdr_len;
1034                        return offset;
1035                }
1036
1037                /* --- followed by +++ ? */
1038                if (memcmp("--- ", line,  4) || memcmp("+++ ", line + len, 4))
1039                        continue;
1040
1041                /*
1042                 * We only accept unified patches, so we want it to
1043                 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1044                 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1045                 */
1046                nextlen = linelen(line + len, size - len);
1047                if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
1048                        continue;
1049
1050                /* Ok, we'll consider it a patch */
1051                parse_traditional_patch(line, line+len, patch);
1052                *hdrsize = len + nextlen;
1053                linenr += 2;
1054                return offset;
1055        }
1056        return -1;
1057}
1058
1059static void record_ws_error(unsigned result, const char *line, int len, int linenr)
1060{
1061        char *err;
1062
1063        if (!result)
1064                return;
1065
1066        whitespace_error++;
1067        if (squelch_whitespace_errors &&
1068            squelch_whitespace_errors < whitespace_error)
1069                return;
1070
1071        err = whitespace_error_string(result);
1072        fprintf(stderr, "%s:%d: %s.\n%.*s\n",
1073                patch_input_file, linenr, err, len, line);
1074        free(err);
1075}
1076
1077static void check_whitespace(const char *line, int len, unsigned ws_rule)
1078{
1079        unsigned result = ws_check(line + 1, len - 1, ws_rule);
1080
1081        record_ws_error(result, line + 1, len - 2, linenr);
1082}
1083
1084/*
1085 * Parse a unified diff. Note that this really needs to parse each
1086 * fragment separately, since the only way to know the difference
1087 * between a "---" that is part of a patch, and a "---" that starts
1088 * the next patch is to look at the line counts..
1089 */
1090static int parse_fragment(char *line, unsigned long size,
1091                          struct patch *patch, struct fragment *fragment)
1092{
1093        int added, deleted;
1094        int len = linelen(line, size), offset;
1095        unsigned long oldlines, newlines;
1096        unsigned long leading, trailing;
1097
1098        offset = parse_fragment_header(line, len, fragment);
1099        if (offset < 0)
1100                return -1;
1101        if (offset > 0 && patch->recount)
1102                recount_diff(line + offset, size - offset, fragment);
1103        oldlines = fragment->oldlines;
1104        newlines = fragment->newlines;
1105        leading = 0;
1106        trailing = 0;
1107
1108        /* Parse the thing.. */
1109        line += len;
1110        size -= len;
1111        linenr++;
1112        added = deleted = 0;
1113        for (offset = len;
1114             0 < size;
1115             offset += len, size -= len, line += len, linenr++) {
1116                if (!oldlines && !newlines)
1117                        break;
1118                len = linelen(line, size);
1119                if (!len || line[len-1] != '\n')
1120                        return -1;
1121                switch (*line) {
1122                default:
1123                        return -1;
1124                case '\n': /* newer GNU diff, an empty context line */
1125                case ' ':
1126                        oldlines--;
1127                        newlines--;
1128                        if (!deleted && !added)
1129                                leading++;
1130                        trailing++;
1131                        break;
1132                case '-':
1133                        if (apply_in_reverse &&
1134                            ws_error_action != nowarn_ws_error)
1135                                check_whitespace(line, len, patch->ws_rule);
1136                        deleted++;
1137                        oldlines--;
1138                        trailing = 0;
1139                        break;
1140                case '+':
1141                        if (!apply_in_reverse &&
1142                            ws_error_action != nowarn_ws_error)
1143                                check_whitespace(line, len, patch->ws_rule);
1144                        added++;
1145                        newlines--;
1146                        trailing = 0;
1147                        break;
1148
1149                /*
1150                 * We allow "\ No newline at end of file". Depending
1151                 * on locale settings when the patch was produced we
1152                 * don't know what this line looks like. The only
1153                 * thing we do know is that it begins with "\ ".
1154                 * Checking for 12 is just for sanity check -- any
1155                 * l10n of "\ No newline..." is at least that long.
1156                 */
1157                case '\\':
1158                        if (len < 12 || memcmp(line, "\\ ", 2))
1159                                return -1;
1160                        break;
1161                }
1162        }
1163        if (oldlines || newlines)
1164                return -1;
1165        fragment->leading = leading;
1166        fragment->trailing = trailing;
1167
1168        /*
1169         * If a fragment ends with an incomplete line, we failed to include
1170         * it in the above loop because we hit oldlines == newlines == 0
1171         * before seeing it.
1172         */
1173        if (12 < size && !memcmp(line, "\\ ", 2))
1174                offset += linelen(line, size);
1175
1176        patch->lines_added += added;
1177        patch->lines_deleted += deleted;
1178
1179        if (0 < patch->is_new && oldlines)
1180                return error("new file depends on old contents");
1181        if (0 < patch->is_delete && newlines)
1182                return error("deleted file still has contents");
1183        return offset;
1184}
1185
1186static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
1187{
1188        unsigned long offset = 0;
1189        unsigned long oldlines = 0, newlines = 0, context = 0;
1190        struct fragment **fragp = &patch->fragments;
1191
1192        while (size > 4 && !memcmp(line, "@@ -", 4)) {
1193                struct fragment *fragment;
1194                int len;
1195
1196                fragment = xcalloc(1, sizeof(*fragment));
1197                fragment->linenr = linenr;
1198                len = parse_fragment(line, size, patch, fragment);
1199                if (len <= 0)
1200                        die("corrupt patch at line %d", linenr);
1201                fragment->patch = line;
1202                fragment->size = len;
1203                oldlines += fragment->oldlines;
1204                newlines += fragment->newlines;
1205                context += fragment->leading + fragment->trailing;
1206
1207                *fragp = fragment;
1208                fragp = &fragment->next;
1209
1210                offset += len;
1211                line += len;
1212                size -= len;
1213        }
1214
1215        /*
1216         * If something was removed (i.e. we have old-lines) it cannot
1217         * be creation, and if something was added it cannot be
1218         * deletion.  However, the reverse is not true; --unified=0
1219         * patches that only add are not necessarily creation even
1220         * though they do not have any old lines, and ones that only
1221         * delete are not necessarily deletion.
1222         *
1223         * Unfortunately, a real creation/deletion patch do _not_ have
1224         * any context line by definition, so we cannot safely tell it
1225         * apart with --unified=0 insanity.  At least if the patch has
1226         * more than one hunk it is not creation or deletion.
1227         */
1228        if (patch->is_new < 0 &&
1229            (oldlines || (patch->fragments && patch->fragments->next)))
1230                patch->is_new = 0;
1231        if (patch->is_delete < 0 &&
1232            (newlines || (patch->fragments && patch->fragments->next)))
1233                patch->is_delete = 0;
1234
1235        if (0 < patch->is_new && oldlines)
1236                die("new file %s depends on old contents", patch->new_name);
1237        if (0 < patch->is_delete && newlines)
1238                die("deleted file %s still has contents", patch->old_name);
1239        if (!patch->is_delete && !newlines && context)
1240                fprintf(stderr, "** warning: file %s becomes empty but "
1241                        "is not deleted\n", patch->new_name);
1242
1243        return offset;
1244}
1245
1246static inline int metadata_changes(struct patch *patch)
1247{
1248        return  patch->is_rename > 0 ||
1249                patch->is_copy > 0 ||
1250                patch->is_new > 0 ||
1251                patch->is_delete ||
1252                (patch->old_mode && patch->new_mode &&
1253                 patch->old_mode != patch->new_mode);
1254}
1255
1256static char *inflate_it(const void *data, unsigned long size,
1257                        unsigned long inflated_size)
1258{
1259        z_stream stream;
1260        void *out;
1261        int st;
1262
1263        memset(&stream, 0, sizeof(stream));
1264
1265        stream.next_in = (unsigned char *)data;
1266        stream.avail_in = size;
1267        stream.next_out = out = xmalloc(inflated_size);
1268        stream.avail_out = inflated_size;
1269        inflateInit(&stream);
1270        st = inflate(&stream, Z_FINISH);
1271        if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1272                free(out);
1273                return NULL;
1274        }
1275        return out;
1276}
1277
1278static struct fragment *parse_binary_hunk(char **buf_p,
1279                                          unsigned long *sz_p,
1280                                          int *status_p,
1281                                          int *used_p)
1282{
1283        /*
1284         * Expect a line that begins with binary patch method ("literal"
1285         * or "delta"), followed by the length of data before deflating.
1286         * a sequence of 'length-byte' followed by base-85 encoded data
1287         * should follow, terminated by a newline.
1288         *
1289         * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1290         * and we would limit the patch line to 66 characters,
1291         * so one line can fit up to 13 groups that would decode
1292         * to 52 bytes max.  The length byte 'A'-'Z' corresponds
1293         * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1294         */
1295        int llen, used;
1296        unsigned long size = *sz_p;
1297        char *buffer = *buf_p;
1298        int patch_method;
1299        unsigned long origlen;
1300        char *data = NULL;
1301        int hunk_size = 0;
1302        struct fragment *frag;
1303
1304        llen = linelen(buffer, size);
1305        used = llen;
1306
1307        *status_p = 0;
1308
1309        if (!prefixcmp(buffer, "delta ")) {
1310                patch_method = BINARY_DELTA_DEFLATED;
1311                origlen = strtoul(buffer + 6, NULL, 10);
1312        }
1313        else if (!prefixcmp(buffer, "literal ")) {
1314                patch_method = BINARY_LITERAL_DEFLATED;
1315                origlen = strtoul(buffer + 8, NULL, 10);
1316        }
1317        else
1318                return NULL;
1319
1320        linenr++;
1321        buffer += llen;
1322        while (1) {
1323                int byte_length, max_byte_length, newsize;
1324                llen = linelen(buffer, size);
1325                used += llen;
1326                linenr++;
1327                if (llen == 1) {
1328                        /* consume the blank line */
1329                        buffer++;
1330                        size--;
1331                        break;
1332                }
1333                /*
1334                 * Minimum line is "A00000\n" which is 7-byte long,
1335                 * and the line length must be multiple of 5 plus 2.
1336                 */
1337                if ((llen < 7) || (llen-2) % 5)
1338                        goto corrupt;
1339                max_byte_length = (llen - 2) / 5 * 4;
1340                byte_length = *buffer;
1341                if ('A' <= byte_length && byte_length <= 'Z')
1342                        byte_length = byte_length - 'A' + 1;
1343                else if ('a' <= byte_length && byte_length <= 'z')
1344                        byte_length = byte_length - 'a' + 27;
1345                else
1346                        goto corrupt;
1347                /* if the input length was not multiple of 4, we would
1348                 * have filler at the end but the filler should never
1349                 * exceed 3 bytes
1350                 */
1351                if (max_byte_length < byte_length ||
1352                    byte_length <= max_byte_length - 4)
1353                        goto corrupt;
1354                newsize = hunk_size + byte_length;
1355                data = xrealloc(data, newsize);
1356                if (decode_85(data + hunk_size, buffer + 1, byte_length))
1357                        goto corrupt;
1358                hunk_size = newsize;
1359                buffer += llen;
1360                size -= llen;
1361        }
1362
1363        frag = xcalloc(1, sizeof(*frag));
1364        frag->patch = inflate_it(data, hunk_size, origlen);
1365        if (!frag->patch)
1366                goto corrupt;
1367        free(data);
1368        frag->size = origlen;
1369        *buf_p = buffer;
1370        *sz_p = size;
1371        *used_p = used;
1372        frag->binary_patch_method = patch_method;
1373        return frag;
1374
1375 corrupt:
1376        free(data);
1377        *status_p = -1;
1378        error("corrupt binary patch at line %d: %.*s",
1379              linenr-1, llen-1, buffer);
1380        return NULL;
1381}
1382
1383static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1384{
1385        /*
1386         * We have read "GIT binary patch\n"; what follows is a line
1387         * that says the patch method (currently, either "literal" or
1388         * "delta") and the length of data before deflating; a
1389         * sequence of 'length-byte' followed by base-85 encoded data
1390         * follows.
1391         *
1392         * When a binary patch is reversible, there is another binary
1393         * hunk in the same format, starting with patch method (either
1394         * "literal" or "delta") with the length of data, and a sequence
1395         * of length-byte + base-85 encoded data, terminated with another
1396         * empty line.  This data, when applied to the postimage, produces
1397         * the preimage.
1398         */
1399        struct fragment *forward;
1400        struct fragment *reverse;
1401        int status;
1402        int used, used_1;
1403
1404        forward = parse_binary_hunk(&buffer, &size, &status, &used);
1405        if (!forward && !status)
1406                /* there has to be one hunk (forward hunk) */
1407                return error("unrecognized binary patch at line %d", linenr-1);
1408        if (status)
1409                /* otherwise we already gave an error message */
1410                return status;
1411
1412        reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1413        if (reverse)
1414                used += used_1;
1415        else if (status) {
1416                /*
1417                 * Not having reverse hunk is not an error, but having
1418                 * a corrupt reverse hunk is.
1419                 */
1420                free((void*) forward->patch);
1421                free(forward);
1422                return status;
1423        }
1424        forward->next = reverse;
1425        patch->fragments = forward;
1426        patch->is_binary = 1;
1427        return used;
1428}
1429
1430static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
1431{
1432        int hdrsize, patchsize;
1433        int offset = find_header(buffer, size, &hdrsize, patch);
1434
1435        if (offset < 0)
1436                return offset;
1437
1438        patch->ws_rule = whitespace_rule(patch->new_name
1439                                         ? patch->new_name
1440                                         : patch->old_name);
1441
1442        patchsize = parse_single_patch(buffer + offset + hdrsize,
1443                                       size - offset - hdrsize, patch);
1444
1445        if (!patchsize) {
1446                static const char *binhdr[] = {
1447                        "Binary files ",
1448                        "Files ",
1449                        NULL,
1450                };
1451                static const char git_binary[] = "GIT binary patch\n";
1452                int i;
1453                int hd = hdrsize + offset;
1454                unsigned long llen = linelen(buffer + hd, size - hd);
1455
1456                if (llen == sizeof(git_binary) - 1 &&
1457                    !memcmp(git_binary, buffer + hd, llen)) {
1458                        int used;
1459                        linenr++;
1460                        used = parse_binary(buffer + hd + llen,
1461                                            size - hd - llen, patch);
1462                        if (used)
1463                                patchsize = used + llen;
1464                        else
1465                                patchsize = 0;
1466                }
1467                else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
1468                        for (i = 0; binhdr[i]; i++) {
1469                                int len = strlen(binhdr[i]);
1470                                if (len < size - hd &&
1471                                    !memcmp(binhdr[i], buffer + hd, len)) {
1472                                        linenr++;
1473                                        patch->is_binary = 1;
1474                                        patchsize = llen;
1475                                        break;
1476                                }
1477                        }
1478                }
1479
1480                /* Empty patch cannot be applied if it is a text patch
1481                 * without metadata change.  A binary patch appears
1482                 * empty to us here.
1483                 */
1484                if ((apply || check) &&
1485                    (!patch->is_binary && !metadata_changes(patch)))
1486                        die("patch with only garbage at line %d", linenr);
1487        }
1488
1489        return offset + hdrsize + patchsize;
1490}
1491
1492#define swap(a,b) myswap((a),(b),sizeof(a))
1493
1494#define myswap(a, b, size) do {         \
1495        unsigned char mytmp[size];      \
1496        memcpy(mytmp, &a, size);                \
1497        memcpy(&a, &b, size);           \
1498        memcpy(&b, mytmp, size);                \
1499} while (0)
1500
1501static void reverse_patches(struct patch *p)
1502{
1503        for (; p; p = p->next) {
1504                struct fragment *frag = p->fragments;
1505
1506                swap(p->new_name, p->old_name);
1507                swap(p->new_mode, p->old_mode);
1508                swap(p->is_new, p->is_delete);
1509                swap(p->lines_added, p->lines_deleted);
1510                swap(p->old_sha1_prefix, p->new_sha1_prefix);
1511
1512                for (; frag; frag = frag->next) {
1513                        swap(frag->newpos, frag->oldpos);
1514                        swap(frag->newlines, frag->oldlines);
1515                }
1516        }
1517}
1518
1519static const char pluses[] =
1520"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1521static const char minuses[]=
1522"----------------------------------------------------------------------";
1523
1524static void show_stats(struct patch *patch)
1525{
1526        struct strbuf qname;
1527        char *cp = patch->new_name ? patch->new_name : patch->old_name;
1528        int max, add, del;
1529
1530        strbuf_init(&qname, 0);
1531        quote_c_style(cp, &qname, NULL, 0);
1532
1533        /*
1534         * "scale" the filename
1535         */
1536        max = max_len;
1537        if (max > 50)
1538                max = 50;
1539
1540        if (qname.len > max) {
1541                cp = strchr(qname.buf + qname.len + 3 - max, '/');
1542                if (!cp)
1543                        cp = qname.buf + qname.len + 3 - max;
1544                strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);
1545        }
1546
1547        if (patch->is_binary) {
1548                printf(" %-*s |  Bin\n", max, qname.buf);
1549                strbuf_release(&qname);
1550                return;
1551        }
1552
1553        printf(" %-*s |", max, qname.buf);
1554        strbuf_release(&qname);
1555
1556        /*
1557         * scale the add/delete
1558         */
1559        max = max + max_change > 70 ? 70 - max : max_change;
1560        add = patch->lines_added;
1561        del = patch->lines_deleted;
1562
1563        if (max_change > 0) {
1564                int total = ((add + del) * max + max_change / 2) / max_change;
1565                add = (add * max + max_change / 2) / max_change;
1566                del = total - add;
1567        }
1568        printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,
1569                add, pluses, del, minuses);
1570}
1571
1572static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
1573{
1574        switch (st->st_mode & S_IFMT) {
1575        case S_IFLNK:
1576                strbuf_grow(buf, st->st_size);
1577                if (readlink(path, buf->buf, st->st_size) != st->st_size)
1578                        return -1;
1579                strbuf_setlen(buf, st->st_size);
1580                return 0;
1581        case S_IFREG:
1582                if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
1583                        return error("unable to open or read %s", path);
1584                convert_to_git(path, buf->buf, buf->len, buf, 0);
1585                return 0;
1586        default:
1587                return -1;
1588        }
1589}
1590
1591static void update_pre_post_images(struct image *preimage,
1592                                   struct image *postimage,
1593                                   char *buf,
1594                                   size_t len)
1595{
1596        int i, ctx;
1597        char *new, *old, *fixed;
1598        struct image fixed_preimage;
1599
1600        /*
1601         * Update the preimage with whitespace fixes.  Note that we
1602         * are not losing preimage->buf -- apply_one_fragment() will
1603         * free "oldlines".
1604         */
1605        prepare_image(&fixed_preimage, buf, len, 1);
1606        assert(fixed_preimage.nr == preimage->nr);
1607        for (i = 0; i < preimage->nr; i++)
1608                fixed_preimage.line[i].flag = preimage->line[i].flag;
1609        free(preimage->line_allocated);
1610        *preimage = fixed_preimage;
1611
1612        /*
1613         * Adjust the common context lines in postimage, in place.
1614         * This is possible because whitespace fixing does not make
1615         * the string grow.
1616         */
1617        new = old = postimage->buf;
1618        fixed = preimage->buf;
1619        for (i = ctx = 0; i < postimage->nr; i++) {
1620                size_t len = postimage->line[i].len;
1621                if (!(postimage->line[i].flag & LINE_COMMON)) {
1622                        /* an added line -- no counterparts in preimage */
1623                        memmove(new, old, len);
1624                        old += len;
1625                        new += len;
1626                        continue;
1627                }
1628
1629                /* a common context -- skip it in the original postimage */
1630                old += len;
1631
1632                /* and find the corresponding one in the fixed preimage */
1633                while (ctx < preimage->nr &&
1634                       !(preimage->line[ctx].flag & LINE_COMMON)) {
1635                        fixed += preimage->line[ctx].len;
1636                        ctx++;
1637                }
1638                if (preimage->nr <= ctx)
1639                        die("oops");
1640
1641                /* and copy it in, while fixing the line length */
1642                len = preimage->line[ctx].len;
1643                memcpy(new, fixed, len);
1644                new += len;
1645                fixed += len;
1646                postimage->line[i].len = len;
1647                ctx++;
1648        }
1649
1650        /* Fix the length of the whole thing */
1651        postimage->len = new - postimage->buf;
1652}
1653
1654static int match_fragment(struct image *img,
1655                          struct image *preimage,
1656                          struct image *postimage,
1657                          unsigned long try,
1658                          int try_lno,
1659                          unsigned ws_rule,
1660                          int match_beginning, int match_end)
1661{
1662        int i;
1663        char *fixed_buf, *buf, *orig, *target;
1664
1665        if (preimage->nr + try_lno > img->nr)
1666                return 0;
1667
1668        if (match_beginning && try_lno)
1669                return 0;
1670
1671        if (match_end && preimage->nr + try_lno != img->nr)
1672                return 0;
1673
1674        /* Quick hash check */
1675        for (i = 0; i < preimage->nr; i++)
1676                if (preimage->line[i].hash != img->line[try_lno + i].hash)
1677                        return 0;
1678
1679        /*
1680         * Do we have an exact match?  If we were told to match
1681         * at the end, size must be exactly at try+fragsize,
1682         * otherwise try+fragsize must be still within the preimage,
1683         * and either case, the old piece should match the preimage
1684         * exactly.
1685         */
1686        if ((match_end
1687             ? (try + preimage->len == img->len)
1688             : (try + preimage->len <= img->len)) &&
1689            !memcmp(img->buf + try, preimage->buf, preimage->len))
1690                return 1;
1691
1692        if (ws_error_action != correct_ws_error)
1693                return 0;
1694
1695        /*
1696         * The hunk does not apply byte-by-byte, but the hash says
1697         * it might with whitespace fuzz.
1698         */
1699        fixed_buf = xmalloc(preimage->len + 1);
1700        buf = fixed_buf;
1701        orig = preimage->buf;
1702        target = img->buf + try;
1703        for (i = 0; i < preimage->nr; i++) {
1704                size_t fixlen; /* length after fixing the preimage */
1705                size_t oldlen = preimage->line[i].len;
1706                size_t tgtlen = img->line[try_lno + i].len;
1707                size_t tgtfixlen; /* length after fixing the target line */
1708                char tgtfixbuf[1024], *tgtfix;
1709                int match;
1710
1711                /* Try fixing the line in the preimage */
1712                fixlen = ws_fix_copy(buf, orig, oldlen, ws_rule, NULL);
1713
1714                /* Try fixing the line in the target */
1715                if (sizeof(tgtfixbuf) > tgtlen)
1716                        tgtfix = tgtfixbuf;
1717                else
1718                        tgtfix = xmalloc(tgtlen);
1719                tgtfixlen = ws_fix_copy(tgtfix, target, tgtlen, ws_rule, NULL);
1720
1721                /*
1722                 * If they match, either the preimage was based on
1723                 * a version before our tree fixed whitespace breakage,
1724                 * or we are lacking a whitespace-fix patch the tree
1725                 * the preimage was based on already had (i.e. target
1726                 * has whitespace breakage, the preimage doesn't).
1727                 * In either case, we are fixing the whitespace breakages
1728                 * so we might as well take the fix together with their
1729                 * real change.
1730                 */
1731                match = (tgtfixlen == fixlen && !memcmp(tgtfix, buf, fixlen));
1732
1733                if (tgtfix != tgtfixbuf)
1734                        free(tgtfix);
1735                if (!match)
1736                        goto unmatch_exit;
1737
1738                orig += oldlen;
1739                buf += fixlen;
1740                target += tgtlen;
1741        }
1742
1743        /*
1744         * Yes, the preimage is based on an older version that still
1745         * has whitespace breakages unfixed, and fixing them makes the
1746         * hunk match.  Update the context lines in the postimage.
1747         */
1748        update_pre_post_images(preimage, postimage,
1749                               fixed_buf, buf - fixed_buf);
1750        return 1;
1751
1752 unmatch_exit:
1753        free(fixed_buf);
1754        return 0;
1755}
1756
1757static int find_pos(struct image *img,
1758                    struct image *preimage,
1759                    struct image *postimage,
1760                    int line,
1761                    unsigned ws_rule,
1762                    int match_beginning, int match_end)
1763{
1764        int i;
1765        unsigned long backwards, forwards, try;
1766        int backwards_lno, forwards_lno, try_lno;
1767
1768        if (preimage->nr > img->nr)
1769                return -1;
1770
1771        /*
1772         * If match_begining or match_end is specified, there is no
1773         * point starting from a wrong line that will never match and
1774         * wander around and wait for a match at the specified end.
1775         */
1776        if (match_beginning)
1777                line = 0;
1778        else if (match_end)
1779                line = img->nr - preimage->nr;
1780
1781        if (line > img->nr)
1782                line = img->nr;
1783
1784        try = 0;
1785        for (i = 0; i < line; i++)
1786                try += img->line[i].len;
1787
1788        /*
1789         * There's probably some smart way to do this, but I'll leave
1790         * that to the smart and beautiful people. I'm simple and stupid.
1791         */
1792        backwards = try;
1793        backwards_lno = line;
1794        forwards = try;
1795        forwards_lno = line;
1796        try_lno = line;
1797
1798        for (i = 0; ; i++) {
1799                if (match_fragment(img, preimage, postimage,
1800                                   try, try_lno, ws_rule,
1801                                   match_beginning, match_end))
1802                        return try_lno;
1803
1804        again:
1805                if (backwards_lno == 0 && forwards_lno == img->nr)
1806                        break;
1807
1808                if (i & 1) {
1809                        if (backwards_lno == 0) {
1810                                i++;
1811                                goto again;
1812                        }
1813                        backwards_lno--;
1814                        backwards -= img->line[backwards_lno].len;
1815                        try = backwards;
1816                        try_lno = backwards_lno;
1817                } else {
1818                        if (forwards_lno == img->nr) {
1819                                i++;
1820                                goto again;
1821                        }
1822                        forwards += img->line[forwards_lno].len;
1823                        forwards_lno++;
1824                        try = forwards;
1825                        try_lno = forwards_lno;
1826                }
1827
1828        }
1829        return -1;
1830}
1831
1832static void remove_first_line(struct image *img)
1833{
1834        img->buf += img->line[0].len;
1835        img->len -= img->line[0].len;
1836        img->line++;
1837        img->nr--;
1838}
1839
1840static void remove_last_line(struct image *img)
1841{
1842        img->len -= img->line[--img->nr].len;
1843}
1844
1845static void update_image(struct image *img,
1846                         int applied_pos,
1847                         struct image *preimage,
1848                         struct image *postimage)
1849{
1850        /*
1851         * remove the copy of preimage at offset in img
1852         * and replace it with postimage
1853         */
1854        int i, nr;
1855        size_t remove_count, insert_count, applied_at = 0;
1856        char *result;
1857
1858        for (i = 0; i < applied_pos; i++)
1859                applied_at += img->line[i].len;
1860
1861        remove_count = 0;
1862        for (i = 0; i < preimage->nr; i++)
1863                remove_count += img->line[applied_pos + i].len;
1864        insert_count = postimage->len;
1865
1866        /* Adjust the contents */
1867        result = xmalloc(img->len + insert_count - remove_count + 1);
1868        memcpy(result, img->buf, applied_at);
1869        memcpy(result + applied_at, postimage->buf, postimage->len);
1870        memcpy(result + applied_at + postimage->len,
1871               img->buf + (applied_at + remove_count),
1872               img->len - (applied_at + remove_count));
1873        free(img->buf);
1874        img->buf = result;
1875        img->len += insert_count - remove_count;
1876        result[img->len] = '\0';
1877
1878        /* Adjust the line table */
1879        nr = img->nr + postimage->nr - preimage->nr;
1880        if (preimage->nr < postimage->nr) {
1881                /*
1882                 * NOTE: this knows that we never call remove_first_line()
1883                 * on anything other than pre/post image.
1884                 */
1885                img->line = xrealloc(img->line, nr * sizeof(*img->line));
1886                img->line_allocated = img->line;
1887        }
1888        if (preimage->nr != postimage->nr)
1889                memmove(img->line + applied_pos + postimage->nr,
1890                        img->line + applied_pos + preimage->nr,
1891                        (img->nr - (applied_pos + preimage->nr)) *
1892                        sizeof(*img->line));
1893        memcpy(img->line + applied_pos,
1894               postimage->line,
1895               postimage->nr * sizeof(*img->line));
1896        img->nr = nr;
1897}
1898
1899static int apply_one_fragment(struct image *img, struct fragment *frag,
1900                              int inaccurate_eof, unsigned ws_rule)
1901{
1902        int match_beginning, match_end;
1903        const char *patch = frag->patch;
1904        int size = frag->size;
1905        char *old, *new, *oldlines, *newlines;
1906        int new_blank_lines_at_end = 0;
1907        int found_new_blank_lines_at_end = 0;
1908        int hunk_linenr = frag->linenr;
1909        unsigned long leading, trailing;
1910        int pos, applied_pos;
1911        struct image preimage;
1912        struct image postimage;
1913
1914        memset(&preimage, 0, sizeof(preimage));
1915        memset(&postimage, 0, sizeof(postimage));
1916        oldlines = xmalloc(size);
1917        newlines = xmalloc(size);
1918
1919        old = oldlines;
1920        new = newlines;
1921        while (size > 0) {
1922                char first;
1923                int len = linelen(patch, size);
1924                int plen, added;
1925                int added_blank_line = 0;
1926                int is_blank_context = 0;
1927
1928                if (!len)
1929                        break;
1930
1931                /*
1932                 * "plen" is how much of the line we should use for
1933                 * the actual patch data. Normally we just remove the
1934                 * first character on the line, but if the line is
1935                 * followed by "\ No newline", then we also remove the
1936                 * last one (which is the newline, of course).
1937                 */
1938                plen = len - 1;
1939                if (len < size && patch[len] == '\\')
1940                        plen--;
1941                first = *patch;
1942                if (apply_in_reverse) {
1943                        if (first == '-')
1944                                first = '+';
1945                        else if (first == '+')
1946                                first = '-';
1947                }
1948
1949                switch (first) {
1950                case '\n':
1951                        /* Newer GNU diff, empty context line */
1952                        if (plen < 0)
1953                                /* ... followed by '\No newline'; nothing */
1954                                break;
1955                        *old++ = '\n';
1956                        *new++ = '\n';
1957                        add_line_info(&preimage, "\n", 1, LINE_COMMON);
1958                        add_line_info(&postimage, "\n", 1, LINE_COMMON);
1959                        is_blank_context = 1;
1960                        break;
1961                case ' ':
1962                        if (plen && patch[1] == '\n')
1963                                is_blank_context = 1;
1964                case '-':
1965                        memcpy(old, patch + 1, plen);
1966                        add_line_info(&preimage, old, plen,
1967                                      (first == ' ' ? LINE_COMMON : 0));
1968                        old += plen;
1969                        if (first == '-')
1970                                break;
1971                /* Fall-through for ' ' */
1972                case '+':
1973                        /* --no-add does not add new lines */
1974                        if (first == '+' && no_add)
1975                                break;
1976
1977                        if (first != '+' ||
1978                            !whitespace_error ||
1979                            ws_error_action != correct_ws_error) {
1980                                memcpy(new, patch + 1, plen);
1981                                added = plen;
1982                        }
1983                        else {
1984                                added = ws_fix_copy(new, patch + 1, plen, ws_rule, &applied_after_fixing_ws);
1985                        }
1986                        add_line_info(&postimage, new, added,
1987                                      (first == '+' ? 0 : LINE_COMMON));
1988                        new += added;
1989                        if (first == '+' &&
1990                            added == 1 && new[-1] == '\n')
1991                                added_blank_line = 1;
1992                        break;
1993                case '@': case '\\':
1994                        /* Ignore it, we already handled it */
1995                        break;
1996                default:
1997                        if (apply_verbosely)
1998                                error("invalid start of line: '%c'", first);
1999                        return -1;
2000                }
2001                if (added_blank_line) {
2002                        if (!new_blank_lines_at_end)
2003                                found_new_blank_lines_at_end = hunk_linenr;
2004                        new_blank_lines_at_end++;
2005                }
2006                else if (is_blank_context)
2007                        ;
2008                else
2009                        new_blank_lines_at_end = 0;
2010                patch += len;
2011                size -= len;
2012                hunk_linenr++;
2013        }
2014        if (inaccurate_eof &&
2015            old > oldlines && old[-1] == '\n' &&
2016            new > newlines && new[-1] == '\n') {
2017                old--;
2018                new--;
2019        }
2020
2021        leading = frag->leading;
2022        trailing = frag->trailing;
2023
2024        /*
2025         * A hunk to change lines at the beginning would begin with
2026         * @@ -1,L +N,M @@
2027         * but we need to be careful.  -U0 that inserts before the second
2028         * line also has this pattern.
2029         *
2030         * And a hunk to add to an empty file would begin with
2031         * @@ -0,0 +N,M @@
2032         *
2033         * In other words, a hunk that is (frag->oldpos <= 1) with or
2034         * without leading context must match at the beginning.
2035         */
2036        match_beginning = (!frag->oldpos ||
2037                           (frag->oldpos == 1 && !unidiff_zero));
2038
2039        /*
2040         * A hunk without trailing lines must match at the end.
2041         * However, we simply cannot tell if a hunk must match end
2042         * from the lack of trailing lines if the patch was generated
2043         * with unidiff without any context.
2044         */
2045        match_end = !unidiff_zero && !trailing;
2046
2047        pos = frag->newpos ? (frag->newpos - 1) : 0;
2048        preimage.buf = oldlines;
2049        preimage.len = old - oldlines;
2050        postimage.buf = newlines;
2051        postimage.len = new - newlines;
2052        preimage.line = preimage.line_allocated;
2053        postimage.line = postimage.line_allocated;
2054
2055        for (;;) {
2056
2057                applied_pos = find_pos(img, &preimage, &postimage, pos,
2058                                       ws_rule, match_beginning, match_end);
2059
2060                if (applied_pos >= 0)
2061                        break;
2062
2063                /* Am I at my context limits? */
2064                if ((leading <= p_context) && (trailing <= p_context))
2065                        break;
2066                if (match_beginning || match_end) {
2067                        match_beginning = match_end = 0;
2068                        continue;
2069                }
2070
2071                /*
2072                 * Reduce the number of context lines; reduce both
2073                 * leading and trailing if they are equal otherwise
2074                 * just reduce the larger context.
2075                 */
2076                if (leading >= trailing) {
2077                        remove_first_line(&preimage);
2078                        remove_first_line(&postimage);
2079                        pos--;
2080                        leading--;
2081                }
2082                if (trailing > leading) {
2083                        remove_last_line(&preimage);
2084                        remove_last_line(&postimage);
2085                        trailing--;
2086                }
2087        }
2088
2089        if (applied_pos >= 0) {
2090                if (new_blank_lines_at_end &&
2091                    preimage.nr + applied_pos == img->nr &&
2092                    (ws_rule & WS_BLANK_AT_EOF) &&
2093                    ws_error_action != nowarn_ws_error) {
2094                        record_ws_error(WS_BLANK_AT_EOF, "+", 1,
2095                                        found_new_blank_lines_at_end);
2096                        if (ws_error_action == correct_ws_error) {
2097                                while (new_blank_lines_at_end--)
2098                                        remove_last_line(&postimage);
2099                        }
2100                        /*
2101                         * We would want to prevent write_out_results()
2102                         * from taking place in apply_patch() that follows
2103                         * the callchain led us here, which is:
2104                         * apply_patch->check_patch_list->check_patch->
2105                         * apply_data->apply_fragments->apply_one_fragment
2106                         */
2107                        if (ws_error_action == die_on_ws_error)
2108                                apply = 0;
2109                }
2110
2111                /*
2112                 * Warn if it was necessary to reduce the number
2113                 * of context lines.
2114                 */
2115                if ((leading != frag->leading) ||
2116                    (trailing != frag->trailing))
2117                        fprintf(stderr, "Context reduced to (%ld/%ld)"
2118                                " to apply fragment at %d\n",
2119                                leading, trailing, applied_pos+1);
2120                update_image(img, applied_pos, &preimage, &postimage);
2121        } else {
2122                if (apply_verbosely)
2123                        error("while searching for:\n%.*s",
2124                              (int)(old - oldlines), oldlines);
2125        }
2126
2127        free(oldlines);
2128        free(newlines);
2129        free(preimage.line_allocated);
2130        free(postimage.line_allocated);
2131
2132        return (applied_pos < 0);
2133}
2134
2135static int apply_binary_fragment(struct image *img, struct patch *patch)
2136{
2137        struct fragment *fragment = patch->fragments;
2138        unsigned long len;
2139        void *dst;
2140
2141        /* Binary patch is irreversible without the optional second hunk */
2142        if (apply_in_reverse) {
2143                if (!fragment->next)
2144                        return error("cannot reverse-apply a binary patch "
2145                                     "without the reverse hunk to '%s'",
2146                                     patch->new_name
2147                                     ? patch->new_name : patch->old_name);
2148                fragment = fragment->next;
2149        }
2150        switch (fragment->binary_patch_method) {
2151        case BINARY_DELTA_DEFLATED:
2152                dst = patch_delta(img->buf, img->len, fragment->patch,
2153                                  fragment->size, &len);
2154                if (!dst)
2155                        return -1;
2156                clear_image(img);
2157                img->buf = dst;
2158                img->len = len;
2159                return 0;
2160        case BINARY_LITERAL_DEFLATED:
2161                clear_image(img);
2162                img->len = fragment->size;
2163                img->buf = xmalloc(img->len+1);
2164                memcpy(img->buf, fragment->patch, img->len);
2165                img->buf[img->len] = '\0';
2166                return 0;
2167        }
2168        return -1;
2169}
2170
2171static int apply_binary(struct image *img, struct patch *patch)
2172{
2173        const char *name = patch->old_name ? patch->old_name : patch->new_name;
2174        unsigned char sha1[20];
2175
2176        /*
2177         * For safety, we require patch index line to contain
2178         * full 40-byte textual SHA1 for old and new, at least for now.
2179         */
2180        if (strlen(patch->old_sha1_prefix) != 40 ||
2181            strlen(patch->new_sha1_prefix) != 40 ||
2182            get_sha1_hex(patch->old_sha1_prefix, sha1) ||
2183            get_sha1_hex(patch->new_sha1_prefix, sha1))
2184                return error("cannot apply binary patch to '%s' "
2185                             "without full index line", name);
2186
2187        if (patch->old_name) {
2188                /*
2189                 * See if the old one matches what the patch
2190                 * applies to.
2191                 */
2192                hash_sha1_file(img->buf, img->len, blob_type, sha1);
2193                if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
2194                        return error("the patch applies to '%s' (%s), "
2195                                     "which does not match the "
2196                                     "current contents.",
2197                                     name, sha1_to_hex(sha1));
2198        }
2199        else {
2200                /* Otherwise, the old one must be empty. */
2201                if (img->len)
2202                        return error("the patch applies to an empty "
2203                                     "'%s' but it is not empty", name);
2204        }
2205
2206        get_sha1_hex(patch->new_sha1_prefix, sha1);
2207        if (is_null_sha1(sha1)) {
2208                clear_image(img);
2209                return 0; /* deletion patch */
2210        }
2211
2212        if (has_sha1_file(sha1)) {
2213                /* We already have the postimage */
2214                enum object_type type;
2215                unsigned long size;
2216                char *result;
2217
2218                result = read_sha1_file(sha1, &type, &size);
2219                if (!result)
2220                        return error("the necessary postimage %s for "
2221                                     "'%s' cannot be read",
2222                                     patch->new_sha1_prefix, name);
2223                clear_image(img);
2224                img->buf = result;
2225                img->len = size;
2226        } else {
2227                /*
2228                 * We have verified buf matches the preimage;
2229                 * apply the patch data to it, which is stored
2230                 * in the patch->fragments->{patch,size}.
2231                 */
2232                if (apply_binary_fragment(img, patch))
2233                        return error("binary patch does not apply to '%s'",
2234                                     name);
2235
2236                /* verify that the result matches */
2237                hash_sha1_file(img->buf, img->len, blob_type, sha1);
2238                if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
2239                        return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",
2240                                name, patch->new_sha1_prefix, sha1_to_hex(sha1));
2241        }
2242
2243        return 0;
2244}
2245
2246static int apply_fragments(struct image *img, struct patch *patch)
2247{
2248        struct fragment *frag = patch->fragments;
2249        const char *name = patch->old_name ? patch->old_name : patch->new_name;
2250        unsigned ws_rule = patch->ws_rule;
2251        unsigned inaccurate_eof = patch->inaccurate_eof;
2252
2253        if (patch->is_binary)
2254                return apply_binary(img, patch);
2255
2256        while (frag) {
2257                if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule)) {
2258                        error("patch failed: %s:%ld", name, frag->oldpos);
2259                        if (!apply_with_reject)
2260                                return -1;
2261                        frag->rejected = 1;
2262                }
2263                frag = frag->next;
2264        }
2265        return 0;
2266}
2267
2268static int read_file_or_gitlink(struct cache_entry *ce, struct strbuf *buf)
2269{
2270        if (!ce)
2271                return 0;
2272
2273        if (S_ISGITLINK(ce->ce_mode)) {
2274                strbuf_grow(buf, 100);
2275                strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(ce->sha1));
2276        } else {
2277                enum object_type type;
2278                unsigned long sz;
2279                char *result;
2280
2281                result = read_sha1_file(ce->sha1, &type, &sz);
2282                if (!result)
2283                        return -1;
2284                /* XXX read_sha1_file NUL-terminates */
2285                strbuf_attach(buf, result, sz, sz + 1);
2286        }
2287        return 0;
2288}
2289
2290static struct patch *in_fn_table(const char *name)
2291{
2292        struct string_list_item *item;
2293
2294        if (name == NULL)
2295                return NULL;
2296
2297        item = string_list_lookup(name, &fn_table);
2298        if (item != NULL)
2299                return (struct patch *)item->util;
2300
2301        return NULL;
2302}
2303
2304static void add_to_fn_table(struct patch *patch)
2305{
2306        struct string_list_item *item;
2307
2308        /*
2309         * Always add new_name unless patch is a deletion
2310         * This should cover the cases for normal diffs,
2311         * file creations and copies
2312         */
2313        if (patch->new_name != NULL) {
2314                item = string_list_insert(patch->new_name, &fn_table);
2315                item->util = patch;
2316        }
2317
2318        /*
2319         * store a failure on rename/deletion cases because
2320         * later chunks shouldn't patch old names
2321         */
2322        if ((patch->new_name == NULL) || (patch->is_rename)) {
2323                item = string_list_insert(patch->old_name, &fn_table);
2324                item->util = (struct patch *) -1;
2325        }
2326}
2327
2328static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
2329{
2330        struct strbuf buf;
2331        struct image image;
2332        size_t len;
2333        char *img;
2334        struct patch *tpatch;
2335
2336        strbuf_init(&buf, 0);
2337
2338        if (!(patch->is_copy || patch->is_rename) &&
2339            ((tpatch = in_fn_table(patch->old_name)) != NULL)) {
2340                if (tpatch == (struct patch *) -1) {
2341                        return error("patch %s has been renamed/deleted",
2342                                patch->old_name);
2343                }
2344                /* We have a patched copy in memory use that */
2345                strbuf_add(&buf, tpatch->result, tpatch->resultsize);
2346        } else if (cached) {
2347                if (read_file_or_gitlink(ce, &buf))
2348                        return error("read of %s failed", patch->old_name);
2349        } else if (patch->old_name) {
2350                if (S_ISGITLINK(patch->old_mode)) {
2351                        if (ce) {
2352                                read_file_or_gitlink(ce, &buf);
2353                        } else {
2354                                /*
2355                                 * There is no way to apply subproject
2356                                 * patch without looking at the index.
2357                                 */
2358                                patch->fragments = NULL;
2359                        }
2360                } else {
2361                        if (read_old_data(st, patch->old_name, &buf))
2362                                return error("read of %s failed", patch->old_name);
2363                }
2364        }
2365
2366        img = strbuf_detach(&buf, &len);
2367        prepare_image(&image, img, len, !patch->is_binary);
2368
2369        if (apply_fragments(&image, patch) < 0)
2370                return -1; /* note with --reject this succeeds. */
2371        patch->result = image.buf;
2372        patch->resultsize = image.len;
2373        add_to_fn_table(patch);
2374        free(image.line_allocated);
2375
2376        if (0 < patch->is_delete && patch->resultsize)
2377                return error("removal patch leaves file contents");
2378
2379        return 0;
2380}
2381
2382static int check_to_create_blob(const char *new_name, int ok_if_exists)
2383{
2384        struct stat nst;
2385        if (!lstat(new_name, &nst)) {
2386                if (S_ISDIR(nst.st_mode) || ok_if_exists)
2387                        return 0;
2388                /*
2389                 * A leading component of new_name might be a symlink
2390                 * that is going to be removed with this patch, but
2391                 * still pointing at somewhere that has the path.
2392                 * In such a case, path "new_name" does not exist as
2393                 * far as git is concerned.
2394                 */
2395                if (has_symlink_leading_path(strlen(new_name), new_name))
2396                        return 0;
2397
2398                return error("%s: already exists in working directory", new_name);
2399        }
2400        else if ((errno != ENOENT) && (errno != ENOTDIR))
2401                return error("%s: %s", new_name, strerror(errno));
2402        return 0;
2403}
2404
2405static int verify_index_match(struct cache_entry *ce, struct stat *st)
2406{
2407        if (S_ISGITLINK(ce->ce_mode)) {
2408                if (!S_ISDIR(st->st_mode))
2409                        return -1;
2410                return 0;
2411        }
2412        return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID);
2413}
2414
2415static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)
2416{
2417        const char *old_name = patch->old_name;
2418        struct patch *tpatch = NULL;
2419        int stat_ret = 0;
2420        unsigned st_mode = 0;
2421
2422        /*
2423         * Make sure that we do not have local modifications from the
2424         * index when we are looking at the index.  Also make sure
2425         * we have the preimage file to be patched in the work tree,
2426         * unless --cached, which tells git to apply only in the index.
2427         */
2428        if (!old_name)
2429                return 0;
2430
2431        assert(patch->is_new <= 0);
2432
2433        if (!(patch->is_copy || patch->is_rename) &&
2434            (tpatch = in_fn_table(old_name)) != NULL) {
2435                if (tpatch == (struct patch *) -1) {
2436                        return error("%s: has been deleted/renamed", old_name);
2437                }
2438                st_mode = tpatch->new_mode;
2439        } else if (!cached) {
2440                stat_ret = lstat(old_name, st);
2441                if (stat_ret && errno != ENOENT)
2442                        return error("%s: %s", old_name, strerror(errno));
2443        }
2444
2445        if (check_index && !tpatch) {
2446                int pos = cache_name_pos(old_name, strlen(old_name));
2447                if (pos < 0) {
2448                        if (patch->is_new < 0)
2449                                goto is_new;
2450                        return error("%s: does not exist in index", old_name);
2451                }
2452                *ce = active_cache[pos];
2453                if (stat_ret < 0) {
2454                        struct checkout costate;
2455                        /* checkout */
2456                        costate.base_dir = "";
2457                        costate.base_dir_len = 0;
2458                        costate.force = 0;
2459                        costate.quiet = 0;
2460                        costate.not_new = 0;
2461                        costate.refresh_cache = 1;
2462                        if (checkout_entry(*ce, &costate, NULL) ||
2463                            lstat(old_name, st))
2464                                return -1;
2465                }
2466                if (!cached && verify_index_match(*ce, st))
2467                        return error("%s: does not match index", old_name);
2468                if (cached)
2469                        st_mode = (*ce)->ce_mode;
2470        } else if (stat_ret < 0) {
2471                if (patch->is_new < 0)
2472                        goto is_new;
2473                return error("%s: %s", old_name, strerror(errno));
2474        }
2475
2476        if (!cached && !tpatch)
2477                st_mode = ce_mode_from_stat(*ce, st->st_mode);
2478
2479        if (patch->is_new < 0)
2480                patch->is_new = 0;
2481        if (!patch->old_mode)
2482                patch->old_mode = st_mode;
2483        if ((st_mode ^ patch->old_mode) & S_IFMT)
2484                return error("%s: wrong type", old_name);
2485        if (st_mode != patch->old_mode)
2486                fprintf(stderr, "warning: %s has type %o, expected %o\n",
2487                        old_name, st_mode, patch->old_mode);
2488        return 0;
2489
2490 is_new:
2491        patch->is_new = 1;
2492        patch->is_delete = 0;
2493        patch->old_name = NULL;
2494        return 0;
2495}
2496
2497static int check_patch(struct patch *patch)
2498{
2499        struct stat st;
2500        const char *old_name = patch->old_name;
2501        const char *new_name = patch->new_name;
2502        const char *name = old_name ? old_name : new_name;
2503        struct cache_entry *ce = NULL;
2504        int ok_if_exists;
2505        int status;
2506
2507        patch->rejected = 1; /* we will drop this after we succeed */
2508
2509        status = check_preimage(patch, &ce, &st);
2510        if (status)
2511                return status;
2512        old_name = patch->old_name;
2513
2514        if (in_fn_table(new_name) == (struct patch *) -1)
2515                /*
2516                 * A type-change diff is always split into a patch to
2517                 * delete old, immediately followed by a patch to
2518                 * create new (see diff.c::run_diff()); in such a case
2519                 * it is Ok that the entry to be deleted by the
2520                 * previous patch is still in the working tree and in
2521                 * the index.
2522                 */
2523                ok_if_exists = 1;
2524        else
2525                ok_if_exists = 0;
2526
2527        if (new_name &&
2528            ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {
2529                if (check_index &&
2530                    cache_name_pos(new_name, strlen(new_name)) >= 0 &&
2531                    !ok_if_exists)
2532                        return error("%s: already exists in index", new_name);
2533                if (!cached) {
2534                        int err = check_to_create_blob(new_name, ok_if_exists);
2535                        if (err)
2536                                return err;
2537                }
2538                if (!patch->new_mode) {
2539                        if (0 < patch->is_new)
2540                                patch->new_mode = S_IFREG | 0644;
2541                        else
2542                                patch->new_mode = patch->old_mode;
2543                }
2544        }
2545
2546        if (new_name && old_name) {
2547                int same = !strcmp(old_name, new_name);
2548                if (!patch->new_mode)
2549                        patch->new_mode = patch->old_mode;
2550                if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
2551                        return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2552                                patch->new_mode, new_name, patch->old_mode,
2553                                same ? "" : " of ", same ? "" : old_name);
2554        }
2555
2556        if (apply_data(patch, &st, ce) < 0)
2557                return error("%s: patch does not apply", name);
2558        patch->rejected = 0;
2559        return 0;
2560}
2561
2562static int check_patch_list(struct patch *patch)
2563{
2564        int err = 0;
2565
2566        while (patch) {
2567                if (apply_verbosely)
2568                        say_patch_name(stderr,
2569                                       "Checking patch ", patch, "...\n");
2570                err |= check_patch(patch);
2571                patch = patch->next;
2572        }
2573        return err;
2574}
2575
2576/* This function tries to read the sha1 from the current index */
2577static int get_current_sha1(const char *path, unsigned char *sha1)
2578{
2579        int pos;
2580
2581        if (read_cache() < 0)
2582                return -1;
2583        pos = cache_name_pos(path, strlen(path));
2584        if (pos < 0)
2585                return -1;
2586        hashcpy(sha1, active_cache[pos]->sha1);
2587        return 0;
2588}
2589
2590/* Build an index that contains the just the files needed for a 3way merge */
2591static void build_fake_ancestor(struct patch *list, const char *filename)
2592{
2593        struct patch *patch;
2594        struct index_state result = { 0 };
2595        int fd;
2596
2597        /* Once we start supporting the reverse patch, it may be
2598         * worth showing the new sha1 prefix, but until then...
2599         */
2600        for (patch = list; patch; patch = patch->next) {
2601                const unsigned char *sha1_ptr;
2602                unsigned char sha1[20];
2603                struct cache_entry *ce;
2604                const char *name;
2605
2606                name = patch->old_name ? patch->old_name : patch->new_name;
2607                if (0 < patch->is_new)
2608                        continue;
2609                else if (get_sha1(patch->old_sha1_prefix, sha1))
2610                        /* git diff has no index line for mode/type changes */
2611                        if (!patch->lines_added && !patch->lines_deleted) {
2612                                if (get_current_sha1(patch->new_name, sha1) ||
2613                                    get_current_sha1(patch->old_name, sha1))
2614                                        die("mode change for %s, which is not "
2615                                                "in current HEAD", name);
2616                                sha1_ptr = sha1;
2617                        } else
2618                                die("sha1 information is lacking or useless "
2619                                        "(%s).", name);
2620                else
2621                        sha1_ptr = sha1;
2622
2623                ce = make_cache_entry(patch->old_mode, sha1_ptr, name, 0, 0);
2624                if (!ce)
2625                        die("make_cache_entry failed for path '%s'", name);
2626                if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))
2627                        die ("Could not add %s to temporary index", name);
2628        }
2629
2630        fd = open(filename, O_WRONLY | O_CREAT, 0666);
2631        if (fd < 0 || write_index(&result, fd) || close(fd))
2632                die ("Could not write temporary index to %s", filename);
2633
2634        discard_index(&result);
2635}
2636
2637static void stat_patch_list(struct patch *patch)
2638{
2639        int files, adds, dels;
2640
2641        for (files = adds = dels = 0 ; patch ; patch = patch->next) {
2642                files++;
2643                adds += patch->lines_added;
2644                dels += patch->lines_deleted;
2645                show_stats(patch);
2646        }
2647
2648        printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
2649}
2650
2651static void numstat_patch_list(struct patch *patch)
2652{
2653        for ( ; patch; patch = patch->next) {
2654                const char *name;
2655                name = patch->new_name ? patch->new_name : patch->old_name;
2656                if (patch->is_binary)
2657                        printf("-\t-\t");
2658                else
2659                        printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
2660                write_name_quoted(name, stdout, line_termination);
2661        }
2662}
2663
2664static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
2665{
2666        if (mode)
2667                printf(" %s mode %06o %s\n", newdelete, mode, name);
2668        else
2669                printf(" %s %s\n", newdelete, name);
2670}
2671
2672static void show_mode_change(struct patch *p, int show_name)
2673{
2674        if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
2675                if (show_name)
2676                        printf(" mode change %06o => %06o %s\n",
2677                               p->old_mode, p->new_mode, p->new_name);
2678                else
2679                        printf(" mode change %06o => %06o\n",
2680                               p->old_mode, p->new_mode);
2681        }
2682}
2683
2684static void show_rename_copy(struct patch *p)
2685{
2686        const char *renamecopy = p->is_rename ? "rename" : "copy";
2687        const char *old, *new;
2688
2689        /* Find common prefix */
2690        old = p->old_name;
2691        new = p->new_name;
2692        while (1) {
2693                const char *slash_old, *slash_new;
2694                slash_old = strchr(old, '/');
2695                slash_new = strchr(new, '/');
2696                if (!slash_old ||
2697                    !slash_new ||
2698                    slash_old - old != slash_new - new ||
2699                    memcmp(old, new, slash_new - new))
2700                        break;
2701                old = slash_old + 1;
2702                new = slash_new + 1;
2703        }
2704        /* p->old_name thru old is the common prefix, and old and new
2705         * through the end of names are renames
2706         */
2707        if (old != p->old_name)
2708                printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
2709                       (int)(old - p->old_name), p->old_name,
2710                       old, new, p->score);
2711        else
2712                printf(" %s %s => %s (%d%%)\n", renamecopy,
2713                       p->old_name, p->new_name, p->score);
2714        show_mode_change(p, 0);
2715}
2716
2717static void summary_patch_list(struct patch *patch)
2718{
2719        struct patch *p;
2720
2721        for (p = patch; p; p = p->next) {
2722                if (p->is_new)
2723                        show_file_mode_name("create", p->new_mode, p->new_name);
2724                else if (p->is_delete)
2725                        show_file_mode_name("delete", p->old_mode, p->old_name);
2726                else {
2727                        if (p->is_rename || p->is_copy)
2728                                show_rename_copy(p);
2729                        else {
2730                                if (p->score) {
2731                                        printf(" rewrite %s (%d%%)\n",
2732                                               p->new_name, p->score);
2733                                        show_mode_change(p, 0);
2734                                }
2735                                else
2736                                        show_mode_change(p, 1);
2737                        }
2738                }
2739        }
2740}
2741
2742static void patch_stats(struct patch *patch)
2743{
2744        int lines = patch->lines_added + patch->lines_deleted;
2745
2746        if (lines > max_change)
2747                max_change = lines;
2748        if (patch->old_name) {
2749                int len = quote_c_style(patch->old_name, NULL, NULL, 0);
2750                if (!len)
2751                        len = strlen(patch->old_name);
2752                if (len > max_len)
2753                        max_len = len;
2754        }
2755        if (patch->new_name) {
2756                int len = quote_c_style(patch->new_name, NULL, NULL, 0);
2757                if (!len)
2758                        len = strlen(patch->new_name);
2759                if (len > max_len)
2760                        max_len = len;
2761        }
2762}
2763
2764static void remove_file(struct patch *patch, int rmdir_empty)
2765{
2766        if (update_index) {
2767                if (remove_file_from_cache(patch->old_name) < 0)
2768                        die("unable to remove %s from index", patch->old_name);
2769        }
2770        if (!cached) {
2771                if (S_ISGITLINK(patch->old_mode)) {
2772                        if (rmdir(patch->old_name))
2773                                warning("unable to remove submodule %s",
2774                                        patch->old_name);
2775                } else if (!unlink(patch->old_name) && rmdir_empty) {
2776                        remove_path(patch->old_name);
2777                }
2778        }
2779}
2780
2781static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
2782{
2783        struct stat st;
2784        struct cache_entry *ce;
2785        int namelen = strlen(path);
2786        unsigned ce_size = cache_entry_size(namelen);
2787
2788        if (!update_index)
2789                return;
2790
2791        ce = xcalloc(1, ce_size);
2792        memcpy(ce->name, path, namelen);
2793        ce->ce_mode = create_ce_mode(mode);
2794        ce->ce_flags = namelen;
2795        if (S_ISGITLINK(mode)) {
2796                const char *s = buf;
2797
2798                if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))
2799                        die("corrupt patch for subproject %s", path);
2800        } else {
2801                if (!cached) {
2802                        if (lstat(path, &st) < 0)
2803                                die("unable to stat newly created file %s",
2804                                    path);
2805                        fill_stat_cache_info(ce, &st);
2806                }
2807                if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
2808                        die("unable to create backing store for newly created file %s", path);
2809        }
2810        if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
2811                die("unable to add cache entry for %s", path);
2812}
2813
2814static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
2815{
2816        int fd;
2817        struct strbuf nbuf;
2818
2819        if (S_ISGITLINK(mode)) {
2820                struct stat st;
2821                if (!lstat(path, &st) && S_ISDIR(st.st_mode))
2822                        return 0;
2823                return mkdir(path, 0777);
2824        }
2825
2826        if (has_symlinks && S_ISLNK(mode))
2827                /* Although buf:size is counted string, it also is NUL
2828                 * terminated.
2829                 */
2830                return symlink(buf, path);
2831
2832        fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
2833        if (fd < 0)
2834                return -1;
2835
2836        strbuf_init(&nbuf, 0);
2837        if (convert_to_working_tree(path, buf, size, &nbuf)) {
2838                size = nbuf.len;
2839                buf  = nbuf.buf;
2840        }
2841        write_or_die(fd, buf, size);
2842        strbuf_release(&nbuf);
2843
2844        if (close(fd) < 0)
2845                die("closing file %s: %s", path, strerror(errno));
2846        return 0;
2847}
2848
2849/*
2850 * We optimistically assume that the directories exist,
2851 * which is true 99% of the time anyway. If they don't,
2852 * we create them and try again.
2853 */
2854static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
2855{
2856        if (cached)
2857                return;
2858        if (!try_create_file(path, mode, buf, size))
2859                return;
2860
2861        if (errno == ENOENT) {
2862                if (safe_create_leading_directories(path))
2863                        return;
2864                if (!try_create_file(path, mode, buf, size))
2865                        return;
2866        }
2867
2868        if (errno == EEXIST || errno == EACCES) {
2869                /* We may be trying to create a file where a directory
2870                 * used to be.
2871                 */
2872                struct stat st;
2873                if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))
2874                        errno = EEXIST;
2875        }
2876
2877        if (errno == EEXIST) {
2878                unsigned int nr = getpid();
2879
2880                for (;;) {
2881                        char newpath[PATH_MAX];
2882                        mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);
2883                        if (!try_create_file(newpath, mode, buf, size)) {
2884                                if (!rename(newpath, path))
2885                                        return;
2886                                unlink(newpath);
2887                                break;
2888                        }
2889                        if (errno != EEXIST)
2890                                break;
2891                        ++nr;
2892                }
2893        }
2894        die("unable to write file %s mode %o", path, mode);
2895}
2896
2897static void create_file(struct patch *patch)
2898{
2899        char *path = patch->new_name;
2900        unsigned mode = patch->new_mode;
2901        unsigned long size = patch->resultsize;
2902        char *buf = patch->result;
2903
2904        if (!mode)
2905                mode = S_IFREG | 0644;
2906        create_one_file(path, mode, buf, size);
2907        add_index_file(path, mode, buf, size);
2908}
2909
2910/* phase zero is to remove, phase one is to create */
2911static void write_out_one_result(struct patch *patch, int phase)
2912{
2913        if (patch->is_delete > 0) {
2914                if (phase == 0)
2915                        remove_file(patch, 1);
2916                return;
2917        }
2918        if (patch->is_new > 0 || patch->is_copy) {
2919                if (phase == 1)
2920                        create_file(patch);
2921                return;
2922        }
2923        /*
2924         * Rename or modification boils down to the same
2925         * thing: remove the old, write the new
2926         */
2927        if (phase == 0)
2928                remove_file(patch, patch->is_rename);
2929        if (phase == 1)
2930                create_file(patch);
2931}
2932
2933static int write_out_one_reject(struct patch *patch)
2934{
2935        FILE *rej;
2936        char namebuf[PATH_MAX];
2937        struct fragment *frag;
2938        int cnt = 0;
2939
2940        for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
2941                if (!frag->rejected)
2942                        continue;
2943                cnt++;
2944        }
2945
2946        if (!cnt) {
2947                if (apply_verbosely)
2948                        say_patch_name(stderr,
2949                                       "Applied patch ", patch, " cleanly.\n");
2950                return 0;
2951        }
2952
2953        /* This should not happen, because a removal patch that leaves
2954         * contents are marked "rejected" at the patch level.
2955         */
2956        if (!patch->new_name)
2957                die("internal error");
2958
2959        /* Say this even without --verbose */
2960        say_patch_name(stderr, "Applying patch ", patch, " with");
2961        fprintf(stderr, " %d rejects...\n", cnt);
2962
2963        cnt = strlen(patch->new_name);
2964        if (ARRAY_SIZE(namebuf) <= cnt + 5) {
2965                cnt = ARRAY_SIZE(namebuf) - 5;
2966                fprintf(stderr,
2967                        "warning: truncating .rej filename to %.*s.rej",
2968                        cnt - 1, patch->new_name);
2969        }
2970        memcpy(namebuf, patch->new_name, cnt);
2971        memcpy(namebuf + cnt, ".rej", 5);
2972
2973        rej = fopen(namebuf, "w");
2974        if (!rej)
2975                return error("cannot open %s: %s", namebuf, strerror(errno));
2976
2977        /* Normal git tools never deal with .rej, so do not pretend
2978         * this is a git patch by saying --git nor give extended
2979         * headers.  While at it, maybe please "kompare" that wants
2980         * the trailing TAB and some garbage at the end of line ;-).
2981         */
2982        fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
2983                patch->new_name, patch->new_name);
2984        for (cnt = 1, frag = patch->fragments;
2985             frag;
2986             cnt++, frag = frag->next) {
2987                if (!frag->rejected) {
2988                        fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);
2989                        continue;
2990                }
2991                fprintf(stderr, "Rejected hunk #%d.\n", cnt);
2992                fprintf(rej, "%.*s", frag->size, frag->patch);
2993                if (frag->patch[frag->size-1] != '\n')
2994                        fputc('\n', rej);
2995        }
2996        fclose(rej);
2997        return -1;
2998}
2999
3000static int write_out_results(struct patch *list, int skipped_patch)
3001{
3002        int phase;
3003        int errs = 0;
3004        struct patch *l;
3005
3006        if (!list && !skipped_patch)
3007                return error("No changes");
3008
3009        for (phase = 0; phase < 2; phase++) {
3010                l = list;
3011                while (l) {
3012                        if (l->rejected)
3013                                errs = 1;
3014                        else {
3015                                write_out_one_result(l, phase);
3016                                if (phase == 1 && write_out_one_reject(l))
3017                                        errs = 1;
3018                        }
3019                        l = l->next;
3020                }
3021        }
3022        return errs;
3023}
3024
3025static struct lock_file lock_file;
3026
3027static struct excludes {
3028        struct excludes *next;
3029        const char *path;
3030} *excludes;
3031
3032static int use_patch(struct patch *p)
3033{
3034        const char *pathname = p->new_name ? p->new_name : p->old_name;
3035        struct excludes *x = excludes;
3036        while (x) {
3037                if (fnmatch(x->path, pathname, 0) == 0)
3038                        return 0;
3039                x = x->next;
3040        }
3041        if (0 < prefix_length) {
3042                int pathlen = strlen(pathname);
3043                if (pathlen <= prefix_length ||
3044                    memcmp(prefix, pathname, prefix_length))
3045                        return 0;
3046        }
3047        return 1;
3048}
3049
3050static void prefix_one(char **name)
3051{
3052        char *old_name = *name;
3053        if (!old_name)
3054                return;
3055        *name = xstrdup(prefix_filename(prefix, prefix_length, *name));
3056        free(old_name);
3057}
3058
3059static void prefix_patches(struct patch *p)
3060{
3061        if (!prefix || p->is_toplevel_relative)
3062                return;
3063        for ( ; p; p = p->next) {
3064                if (p->new_name == p->old_name) {
3065                        char *prefixed = p->new_name;
3066                        prefix_one(&prefixed);
3067                        p->new_name = p->old_name = prefixed;
3068                }
3069                else {
3070                        prefix_one(&p->new_name);
3071                        prefix_one(&p->old_name);
3072                }
3073        }
3074}
3075
3076#define INACCURATE_EOF  (1<<0)
3077#define RECOUNT         (1<<1)
3078
3079static int apply_patch(int fd, const char *filename, int options)
3080{
3081        size_t offset;
3082        struct strbuf buf;
3083        struct patch *list = NULL, **listp = &list;
3084        int skipped_patch = 0;
3085
3086        /* FIXME - memory leak when using multiple patch files as inputs */
3087        memset(&fn_table, 0, sizeof(struct string_list));
3088        strbuf_init(&buf, 0);
3089        patch_input_file = filename;
3090        read_patch_file(&buf, fd);
3091        offset = 0;
3092        while (offset < buf.len) {
3093                struct patch *patch;
3094                int nr;
3095
3096                patch = xcalloc(1, sizeof(*patch));
3097                patch->inaccurate_eof = !!(options & INACCURATE_EOF);
3098                patch->recount =  !!(options & RECOUNT);
3099                nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);
3100                if (nr < 0)
3101                        break;
3102                if (apply_in_reverse)
3103                        reverse_patches(patch);
3104                if (prefix)
3105                        prefix_patches(patch);
3106                if (use_patch(patch)) {
3107                        patch_stats(patch);
3108                        *listp = patch;
3109                        listp = &patch->next;
3110                }
3111                else {
3112                        /* perhaps free it a bit better? */
3113                        free(patch);
3114                        skipped_patch++;
3115                }
3116                offset += nr;
3117        }
3118
3119        if (whitespace_error && (ws_error_action == die_on_ws_error))
3120                apply = 0;
3121
3122        update_index = check_index && apply;
3123        if (update_index && newfd < 0)
3124                newfd = hold_locked_index(&lock_file, 1);
3125
3126        if (check_index) {
3127                if (read_cache() < 0)
3128                        die("unable to read index file");
3129        }
3130
3131        if ((check || apply) &&
3132            check_patch_list(list) < 0 &&
3133            !apply_with_reject)
3134                exit(1);
3135
3136        if (apply && write_out_results(list, skipped_patch))
3137                exit(1);
3138
3139        if (fake_ancestor)
3140                build_fake_ancestor(list, fake_ancestor);
3141
3142        if (diffstat)
3143                stat_patch_list(list);
3144
3145        if (numstat)
3146                numstat_patch_list(list);
3147
3148        if (summary)
3149                summary_patch_list(list);
3150
3151        strbuf_release(&buf);
3152        return 0;
3153}
3154
3155static int git_apply_config(const char *var, const char *value, void *cb)
3156{
3157        if (!strcmp(var, "apply.whitespace"))
3158                return git_config_string(&apply_default_whitespace, var, value);
3159        return git_default_config(var, value, cb);
3160}
3161
3162
3163int cmd_apply(int argc, const char **argv, const char *unused_prefix)
3164{
3165        int i;
3166        int read_stdin = 1;
3167        int options = 0;
3168        int errs = 0;
3169        int is_not_gitdir;
3170
3171        const char *whitespace_option = NULL;
3172
3173        prefix = setup_git_directory_gently(&is_not_gitdir);
3174        prefix_length = prefix ? strlen(prefix) : 0;
3175        git_config(git_apply_config, NULL);
3176        if (apply_default_whitespace)
3177                parse_whitespace_option(apply_default_whitespace);
3178
3179        for (i = 1; i < argc; i++) {
3180                const char *arg = argv[i];
3181                char *end;
3182                int fd;
3183
3184                if (!strcmp(arg, "-")) {
3185                        errs |= apply_patch(0, "<stdin>", options);
3186                        read_stdin = 0;
3187                        continue;
3188                }
3189                if (!prefixcmp(arg, "--exclude=")) {
3190                        struct excludes *x = xmalloc(sizeof(*x));
3191                        x->path = arg + 10;
3192                        x->next = excludes;
3193                        excludes = x;
3194                        continue;
3195                }
3196                if (!prefixcmp(arg, "-p")) {
3197                        p_value = atoi(arg + 2);
3198                        p_value_known = 1;
3199                        continue;
3200                }
3201                if (!strcmp(arg, "--no-add")) {
3202                        no_add = 1;
3203                        continue;
3204                }
3205                if (!strcmp(arg, "--stat")) {
3206                        apply = 0;
3207                        diffstat = 1;
3208                        continue;
3209                }
3210                if (!strcmp(arg, "--allow-binary-replacement") ||
3211                    !strcmp(arg, "--binary")) {
3212                        continue; /* now no-op */
3213                }
3214                if (!strcmp(arg, "--numstat")) {
3215                        apply = 0;
3216                        numstat = 1;
3217                        continue;
3218                }
3219                if (!strcmp(arg, "--summary")) {
3220                        apply = 0;
3221                        summary = 1;
3222                        continue;
3223                }
3224                if (!strcmp(arg, "--check")) {
3225                        apply = 0;
3226                        check = 1;
3227                        continue;
3228                }
3229                if (!strcmp(arg, "--index")) {
3230                        if (is_not_gitdir)
3231                                die("--index outside a repository");
3232                        check_index = 1;
3233                        continue;
3234                }
3235                if (!strcmp(arg, "--cached")) {
3236                        if (is_not_gitdir)
3237                                die("--cached outside a repository");
3238                        check_index = 1;
3239                        cached = 1;
3240                        continue;
3241                }
3242                if (!strcmp(arg, "--apply")) {
3243                        apply = 1;
3244                        continue;
3245                }
3246                if (!strcmp(arg, "--build-fake-ancestor")) {
3247                        apply = 0;
3248                        if (++i >= argc)
3249                                die ("need a filename");
3250                        fake_ancestor = argv[i];
3251                        continue;
3252                }
3253                if (!strcmp(arg, "-z")) {
3254                        line_termination = 0;
3255                        continue;
3256                }
3257                if (!prefixcmp(arg, "-C")) {
3258                        p_context = strtoul(arg + 2, &end, 0);
3259                        if (*end != '\0')
3260                                die("unrecognized context count '%s'", arg + 2);
3261                        continue;
3262                }
3263                if (!prefixcmp(arg, "--whitespace=")) {
3264                        whitespace_option = arg + 13;
3265                        parse_whitespace_option(arg + 13);
3266                        continue;
3267                }
3268                if (!strcmp(arg, "-R") || !strcmp(arg, "--reverse")) {
3269                        apply_in_reverse = 1;
3270                        continue;
3271                }
3272                if (!strcmp(arg, "--unidiff-zero")) {
3273                        unidiff_zero = 1;
3274                        continue;
3275                }
3276                if (!strcmp(arg, "--reject")) {
3277                        apply = apply_with_reject = apply_verbosely = 1;
3278                        continue;
3279                }
3280                if (!strcmp(arg, "-v") || !strcmp(arg, "--verbose")) {
3281                        apply_verbosely = 1;
3282                        continue;
3283                }
3284                if (!strcmp(arg, "--inaccurate-eof")) {
3285                        options |= INACCURATE_EOF;
3286                        continue;
3287                }
3288                if (!strcmp(arg, "--recount")) {
3289                        options |= RECOUNT;
3290                        continue;
3291                }
3292                if (!prefixcmp(arg, "--directory=")) {
3293                        arg += strlen("--directory=");
3294                        root_len = strlen(arg);
3295                        if (root_len && arg[root_len - 1] != '/') {
3296                                char *new_root;
3297                                root = new_root = xmalloc(root_len + 2);
3298                                strcpy(new_root, arg);
3299                                strcpy(new_root + root_len++, "/");
3300                        } else
3301                                root = arg;
3302                        continue;
3303                }
3304                if (0 < prefix_length)
3305                        arg = prefix_filename(prefix, prefix_length, arg);
3306
3307                fd = open(arg, O_RDONLY);
3308                if (fd < 0)
3309                        die("can't open patch '%s': %s", arg, strerror(errno));
3310                read_stdin = 0;
3311                set_default_whitespace_mode(whitespace_option);
3312                errs |= apply_patch(fd, arg, options);
3313                close(fd);
3314        }
3315        set_default_whitespace_mode(whitespace_option);
3316        if (read_stdin)
3317                errs |= apply_patch(0, "<stdin>", options);
3318        if (whitespace_error) {
3319                if (squelch_whitespace_errors &&
3320                    squelch_whitespace_errors < whitespace_error) {
3321                        int squelched =
3322                                whitespace_error - squelch_whitespace_errors;
3323                        fprintf(stderr, "warning: squelched %d "
3324                                "whitespace error%s\n",
3325                                squelched,
3326                                squelched == 1 ? "" : "s");
3327                }
3328                if (ws_error_action == die_on_ws_error)
3329                        die("%d line%s add%s whitespace errors.",
3330                            whitespace_error,
3331                            whitespace_error == 1 ? "" : "s",
3332                            whitespace_error == 1 ? "s" : "");
3333                if (applied_after_fixing_ws && apply)
3334                        fprintf(stderr, "warning: %d line%s applied after"
3335                                " fixing whitespace errors.\n",
3336                                applied_after_fixing_ws,
3337                                applied_after_fixing_ws == 1 ? "" : "s");
3338                else if (whitespace_error)
3339                        fprintf(stderr, "warning: %d line%s add%s whitespace errors.\n",
3340                                whitespace_error,
3341                                whitespace_error == 1 ? "" : "s",
3342                                whitespace_error == 1 ? "s" : "");
3343        }
3344
3345        if (update_index) {
3346                if (write_cache(newfd, active_cache, active_nr) ||
3347                    commit_locked_index(&lock_file))
3348                        die("Unable to write new index file");
3349        }
3350
3351        return !!errs;
3352}