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