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