cc3f12e5557d1b6c333c890d6d0209aee74742e5
   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 "quote.h"
  12#include "blob.h"
  13
  14//  --check turns on checking that the working tree matches the
  15//    files that are being modified, but doesn't apply the patch
  16//  --stat does just a diffstat, and doesn't actually apply
  17//  --numstat does numeric diffstat, and doesn't actually apply
  18//  --index-info shows the old and new index info for paths if available.
  19//
  20static const char *prefix;
  21static int prefix_length = -1;
  22
  23static int p_value = 1;
  24static int allow_binary_replacement = 0;
  25static int check_index = 0;
  26static int write_index = 0;
  27static int diffstat = 0;
  28static int numstat = 0;
  29static int summary = 0;
  30static int check = 0;
  31static int apply = 1;
  32static int no_add = 0;
  33static int show_index_info = 0;
  34static int line_termination = '\n';
  35static const char apply_usage[] =
  36"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
  37
  38static enum whitespace_eol {
  39        nowarn_whitespace,
  40        warn_on_whitespace,
  41        error_on_whitespace,
  42        strip_whitespace,
  43} new_whitespace = warn_on_whitespace;
  44static int whitespace_error = 0;
  45static int squelch_whitespace_errors = 5;
  46static int applied_after_stripping = 0;
  47static const char *patch_input_file = NULL;
  48
  49static void parse_whitespace_option(const char *option)
  50{
  51        if (!option) {
  52                new_whitespace = warn_on_whitespace;
  53                return;
  54        }
  55        if (!strcmp(option, "warn")) {
  56                new_whitespace = warn_on_whitespace;
  57                return;
  58        }
  59        if (!strcmp(option, "nowarn")) {
  60                new_whitespace = nowarn_whitespace;
  61                return;
  62        }
  63        if (!strcmp(option, "error")) {
  64                new_whitespace = error_on_whitespace;
  65                return;
  66        }
  67        if (!strcmp(option, "error-all")) {
  68                new_whitespace = error_on_whitespace;
  69                squelch_whitespace_errors = 0;
  70                return;
  71        }
  72        if (!strcmp(option, "strip")) {
  73                new_whitespace = strip_whitespace;
  74                return;
  75        }
  76        die("unrecognized whitespace option '%s'", option);
  77}
  78
  79static void set_default_whitespace_mode(const char *whitespace_option)
  80{
  81        if (!whitespace_option && !apply_default_whitespace) {
  82                new_whitespace = (apply
  83                                  ? warn_on_whitespace
  84                                  : nowarn_whitespace);
  85        }
  86}
  87
  88/*
  89 * For "diff-stat" like behaviour, we keep track of the biggest change
  90 * we've seen, and the longest filename. That allows us to do simple
  91 * scaling.
  92 */
  93static int max_change, max_len;
  94
  95/*
  96 * Various "current state", notably line numbers and what
  97 * file (and how) we're patching right now.. The "is_xxxx"
  98 * things are flags, where -1 means "don't know yet".
  99 */
 100static int linenr = 1;
 101
 102struct fragment {
 103        unsigned long oldpos, oldlines;
 104        unsigned long newpos, newlines;
 105        const char *patch;
 106        int size;
 107        struct fragment *next;
 108};
 109
 110struct patch {
 111        char *new_name, *old_name, *def_name;
 112        unsigned int old_mode, new_mode;
 113        int is_rename, is_copy, is_new, is_delete, is_binary;
 114        int lines_added, lines_deleted;
 115        int score;
 116        struct fragment *fragments;
 117        char *result;
 118        unsigned long resultsize;
 119        char old_sha1_prefix[41];
 120        char new_sha1_prefix[41];
 121        struct patch *next;
 122};
 123
 124#define CHUNKSIZE (8192)
 125#define SLOP (16)
 126
 127static void *read_patch_file(int fd, unsigned long *sizep)
 128{
 129        unsigned long size = 0, alloc = CHUNKSIZE;
 130        void *buffer = xmalloc(alloc);
 131
 132        for (;;) {
 133                int nr = alloc - size;
 134                if (nr < 1024) {
 135                        alloc += CHUNKSIZE;
 136                        buffer = xrealloc(buffer, alloc);
 137                        nr = alloc - size;
 138                }
 139                nr = xread(fd, buffer + size, nr);
 140                if (!nr)
 141                        break;
 142                if (nr < 0)
 143                        die("git-apply: read returned %s", strerror(errno));
 144                size += nr;
 145        }
 146        *sizep = size;
 147
 148        /*
 149         * Make sure that we have some slop in the buffer
 150         * so that we can do speculative "memcmp" etc, and
 151         * see to it that it is NUL-filled.
 152         */
 153        if (alloc < size + SLOP)
 154                buffer = xrealloc(buffer, size + SLOP);
 155        memset(buffer + size, 0, SLOP);
 156        return buffer;
 157}
 158
 159static unsigned long linelen(const char *buffer, unsigned long size)
 160{
 161        unsigned long len = 0;
 162        while (size--) {
 163                len++;
 164                if (*buffer++ == '\n')
 165                        break;
 166        }
 167        return len;
 168}
 169
 170static int is_dev_null(const char *str)
 171{
 172        return !memcmp("/dev/null", str, 9) && isspace(str[9]);
 173}
 174
 175#define TERM_SPACE      1
 176#define TERM_TAB        2
 177
 178static int name_terminate(const char *name, int namelen, int c, int terminate)
 179{
 180        if (c == ' ' && !(terminate & TERM_SPACE))
 181                return 0;
 182        if (c == '\t' && !(terminate & TERM_TAB))
 183                return 0;
 184
 185        return 1;
 186}
 187
 188static char * find_name(const char *line, char *def, int p_value, int terminate)
 189{
 190        int len;
 191        const char *start = line;
 192        char *name;
 193
 194        if (*line == '"') {
 195                /* Proposed "new-style" GNU patch/diff format; see
 196                 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
 197                 */
 198                name = unquote_c_style(line, NULL);
 199                if (name) {
 200                        char *cp = name;
 201                        while (p_value) {
 202                                cp = strchr(name, '/');
 203                                if (!cp)
 204                                        break;
 205                                cp++;
 206                                p_value--;
 207                        }
 208                        if (cp) {
 209                                /* name can later be freed, so we need
 210                                 * to memmove, not just return cp
 211                                 */
 212                                memmove(name, cp, strlen(cp) + 1);
 213                                free(def);
 214                                return name;
 215                        }
 216                        else {
 217                                free(name);
 218                                name = NULL;
 219                        }
 220                }
 221        }
 222
 223        for (;;) {
 224                char c = *line;
 225
 226                if (isspace(c)) {
 227                        if (c == '\n')
 228                                break;
 229                        if (name_terminate(start, line-start, c, terminate))
 230                                break;
 231                }
 232                line++;
 233                if (c == '/' && !--p_value)
 234                        start = line;
 235        }
 236        if (!start)
 237                return def;
 238        len = line - start;
 239        if (!len)
 240                return def;
 241
 242        /*
 243         * Generally we prefer the shorter name, especially
 244         * if the other one is just a variation of that with
 245         * something else tacked on to the end (ie "file.orig"
 246         * or "file~").
 247         */
 248        if (def) {
 249                int deflen = strlen(def);
 250                if (deflen < len && !strncmp(start, def, deflen))
 251                        return def;
 252        }
 253
 254        name = xmalloc(len + 1);
 255        memcpy(name, start, len);
 256        name[len] = 0;
 257        free(def);
 258        return name;
 259}
 260
 261/*
 262 * Get the name etc info from the --/+++ lines of a traditional patch header
 263 *
 264 * NOTE! This hardcodes "-p1" behaviour in filename detection.
 265 *
 266 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
 267 * files, we can happily check the index for a match, but for creating a
 268 * new file we should try to match whatever "patch" does. I have no idea.
 269 */
 270static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
 271{
 272        char *name;
 273
 274        first += 4;     // skip "--- "
 275        second += 4;    // skip "+++ "
 276        if (is_dev_null(first)) {
 277                patch->is_new = 1;
 278                patch->is_delete = 0;
 279                name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
 280                patch->new_name = name;
 281        } else if (is_dev_null(second)) {
 282                patch->is_new = 0;
 283                patch->is_delete = 1;
 284                name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
 285                patch->old_name = name;
 286        } else {
 287                name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
 288                name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
 289                patch->old_name = patch->new_name = name;
 290        }
 291        if (!name)
 292                die("unable to find filename in patch at line %d", linenr);
 293}
 294
 295static int gitdiff_hdrend(const char *line, struct patch *patch)
 296{
 297        return -1;
 298}
 299
 300/*
 301 * We're anal about diff header consistency, to make
 302 * sure that we don't end up having strange ambiguous
 303 * patches floating around.
 304 *
 305 * As a result, gitdiff_{old|new}name() will check
 306 * their names against any previous information, just
 307 * to make sure..
 308 */
 309static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
 310{
 311        if (!orig_name && !isnull)
 312                return find_name(line, NULL, 1, 0);
 313
 314        if (orig_name) {
 315                int len;
 316                const char *name;
 317                char *another;
 318                name = orig_name;
 319                len = strlen(name);
 320                if (isnull)
 321                        die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
 322                another = find_name(line, NULL, 1, 0);
 323                if (!another || memcmp(another, name, len))
 324                        die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
 325                free(another);
 326                return orig_name;
 327        }
 328        else {
 329                /* expect "/dev/null" */
 330                if (memcmp("/dev/null", line, 9) || line[9] != '\n')
 331                        die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
 332                return NULL;
 333        }
 334}
 335
 336static int gitdiff_oldname(const char *line, struct patch *patch)
 337{
 338        patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
 339        return 0;
 340}
 341
 342static int gitdiff_newname(const char *line, struct patch *patch)
 343{
 344        patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
 345        return 0;
 346}
 347
 348static int gitdiff_oldmode(const char *line, struct patch *patch)
 349{
 350        patch->old_mode = strtoul(line, NULL, 8);
 351        return 0;
 352}
 353
 354static int gitdiff_newmode(const char *line, struct patch *patch)
 355{
 356        patch->new_mode = strtoul(line, NULL, 8);
 357        return 0;
 358}
 359
 360static int gitdiff_delete(const char *line, struct patch *patch)
 361{
 362        patch->is_delete = 1;
 363        patch->old_name = patch->def_name;
 364        return gitdiff_oldmode(line, patch);
 365}
 366
 367static int gitdiff_newfile(const char *line, struct patch *patch)
 368{
 369        patch->is_new = 1;
 370        patch->new_name = patch->def_name;
 371        return gitdiff_newmode(line, patch);
 372}
 373
 374static int gitdiff_copysrc(const char *line, struct patch *patch)
 375{
 376        patch->is_copy = 1;
 377        patch->old_name = find_name(line, NULL, 0, 0);
 378        return 0;
 379}
 380
 381static int gitdiff_copydst(const char *line, struct patch *patch)
 382{
 383        patch->is_copy = 1;
 384        patch->new_name = find_name(line, NULL, 0, 0);
 385        return 0;
 386}
 387
 388static int gitdiff_renamesrc(const char *line, struct patch *patch)
 389{
 390        patch->is_rename = 1;
 391        patch->old_name = find_name(line, NULL, 0, 0);
 392        return 0;
 393}
 394
 395static int gitdiff_renamedst(const char *line, struct patch *patch)
 396{
 397        patch->is_rename = 1;
 398        patch->new_name = find_name(line, NULL, 0, 0);
 399        return 0;
 400}
 401
 402static int gitdiff_similarity(const char *line, struct patch *patch)
 403{
 404        if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
 405                patch->score = 0;
 406        return 0;
 407}
 408
 409static int gitdiff_dissimilarity(const char *line, struct patch *patch)
 410{
 411        if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
 412                patch->score = 0;
 413        return 0;
 414}
 415
 416static int gitdiff_index(const char *line, struct patch *patch)
 417{
 418        /* index line is N hexadecimal, "..", N hexadecimal,
 419         * and optional space with octal mode.
 420         */
 421        const char *ptr, *eol;
 422        int len;
 423
 424        ptr = strchr(line, '.');
 425        if (!ptr || ptr[1] != '.' || 40 < ptr - line)
 426                return 0;
 427        len = ptr - line;
 428        memcpy(patch->old_sha1_prefix, line, len);
 429        patch->old_sha1_prefix[len] = 0;
 430
 431        line = ptr + 2;
 432        ptr = strchr(line, ' ');
 433        eol = strchr(line, '\n');
 434
 435        if (!ptr || eol < ptr)
 436                ptr = eol;
 437        len = ptr - line;
 438
 439        if (40 < len)
 440                return 0;
 441        memcpy(patch->new_sha1_prefix, line, len);
 442        patch->new_sha1_prefix[len] = 0;
 443        if (*ptr == ' ')
 444                patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
 445        return 0;
 446}
 447
 448/*
 449 * This is normal for a diff that doesn't change anything: we'll fall through
 450 * into the next diff. Tell the parser to break out.
 451 */
 452static int gitdiff_unrecognized(const char *line, struct patch *patch)
 453{
 454        return -1;
 455}
 456
 457static const char *stop_at_slash(const char *line, int llen)
 458{
 459        int i;
 460
 461        for (i = 0; i < llen; i++) {
 462                int ch = line[i];
 463                if (ch == '/')
 464                        return line + i;
 465        }
 466        return NULL;
 467}
 468
 469/* This is to extract the same name that appears on "diff --git"
 470 * line.  We do not find and return anything if it is a rename
 471 * patch, and it is OK because we will find the name elsewhere.
 472 * We need to reliably find name only when it is mode-change only,
 473 * creation or deletion of an empty file.  In any of these cases,
 474 * both sides are the same name under a/ and b/ respectively.
 475 */
 476static char *git_header_name(char *line, int llen)
 477{
 478        int len;
 479        const char *name;
 480        const char *second = NULL;
 481
 482        line += strlen("diff --git ");
 483        llen -= strlen("diff --git ");
 484
 485        if (*line == '"') {
 486                const char *cp;
 487                char *first = unquote_c_style(line, &second);
 488                if (!first)
 489                        return NULL;
 490
 491                /* advance to the first slash */
 492                cp = stop_at_slash(first, strlen(first));
 493                if (!cp || cp == first) {
 494                        /* we do not accept absolute paths */
 495                free_first_and_fail:
 496                        free(first);
 497                        return NULL;
 498                }
 499                len = strlen(cp+1);
 500                memmove(first, cp+1, len+1); /* including NUL */
 501
 502                /* second points at one past closing dq of name.
 503                 * find the second name.
 504                 */
 505                while ((second < line + llen) && isspace(*second))
 506                        second++;
 507
 508                if (line + llen <= second)
 509                        goto free_first_and_fail;
 510                if (*second == '"') {
 511                        char *sp = unquote_c_style(second, NULL);
 512                        if (!sp)
 513                                goto free_first_and_fail;
 514                        cp = stop_at_slash(sp, strlen(sp));
 515                        if (!cp || cp == sp) {
 516                        free_both_and_fail:
 517                                free(sp);
 518                                goto free_first_and_fail;
 519                        }
 520                        /* They must match, otherwise ignore */
 521                        if (strcmp(cp+1, first))
 522                                goto free_both_and_fail;
 523                        free(sp);
 524                        return first;
 525                }
 526
 527                /* unquoted second */
 528                cp = stop_at_slash(second, line + llen - second);
 529                if (!cp || cp == second)
 530                        goto free_first_and_fail;
 531                cp++;
 532                if (line + llen - cp != len + 1 ||
 533                    memcmp(first, cp, len))
 534                        goto free_first_and_fail;
 535                return first;
 536        }
 537
 538        /* unquoted first name */
 539        name = stop_at_slash(line, llen);
 540        if (!name || name == line)
 541                return NULL;
 542
 543        name++;
 544
 545        /* since the first name is unquoted, a dq if exists must be
 546         * the beginning of the second name.
 547         */
 548        for (second = name; second < line + llen; second++) {
 549                if (*second == '"') {
 550                        const char *cp = second;
 551                        const char *np;
 552                        char *sp = unquote_c_style(second, NULL);
 553
 554                        if (!sp)
 555                                return NULL;
 556                        np = stop_at_slash(sp, strlen(sp));
 557                        if (!np || np == sp) {
 558                        free_second_and_fail:
 559                                free(sp);
 560                                return NULL;
 561                        }
 562                        np++;
 563                        len = strlen(np);
 564                        if (len < cp - name &&
 565                            !strncmp(np, name, len) &&
 566                            isspace(name[len])) {
 567                                /* Good */
 568                                memmove(sp, np, len + 1);
 569                                return sp;
 570                        }
 571                        goto free_second_and_fail;
 572                }
 573        }
 574
 575        /*
 576         * Accept a name only if it shows up twice, exactly the same
 577         * form.
 578         */
 579        for (len = 0 ; ; len++) {
 580                char c = name[len];
 581
 582                switch (c) {
 583                default:
 584                        continue;
 585                case '\n':
 586                        return NULL;
 587                case '\t': case ' ':
 588                        second = name+len;
 589                        for (;;) {
 590                                char c = *second++;
 591                                if (c == '\n')
 592                                        return NULL;
 593                                if (c == '/')
 594                                        break;
 595                        }
 596                        if (second[len] == '\n' && !memcmp(name, second, len)) {
 597                                char *ret = xmalloc(len + 1);
 598                                memcpy(ret, name, len);
 599                                ret[len] = 0;
 600                                return ret;
 601                        }
 602                }
 603        }
 604        return NULL;
 605}
 606
 607/* Verify that we recognize the lines following a git header */
 608static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
 609{
 610        unsigned long offset;
 611
 612        /* A git diff has explicit new/delete information, so we don't guess */
 613        patch->is_new = 0;
 614        patch->is_delete = 0;
 615
 616        /*
 617         * Some things may not have the old name in the
 618         * rest of the headers anywhere (pure mode changes,
 619         * or removing or adding empty files), so we get
 620         * the default name from the header.
 621         */
 622        patch->def_name = git_header_name(line, len);
 623
 624        line += len;
 625        size -= len;
 626        linenr++;
 627        for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
 628                static const struct opentry {
 629                        const char *str;
 630                        int (*fn)(const char *, struct patch *);
 631                } optable[] = {
 632                        { "@@ -", gitdiff_hdrend },
 633                        { "--- ", gitdiff_oldname },
 634                        { "+++ ", gitdiff_newname },
 635                        { "old mode ", gitdiff_oldmode },
 636                        { "new mode ", gitdiff_newmode },
 637                        { "deleted file mode ", gitdiff_delete },
 638                        { "new file mode ", gitdiff_newfile },
 639                        { "copy from ", gitdiff_copysrc },
 640                        { "copy to ", gitdiff_copydst },
 641                        { "rename old ", gitdiff_renamesrc },
 642                        { "rename new ", gitdiff_renamedst },
 643                        { "rename from ", gitdiff_renamesrc },
 644                        { "rename to ", gitdiff_renamedst },
 645                        { "similarity index ", gitdiff_similarity },
 646                        { "dissimilarity index ", gitdiff_dissimilarity },
 647                        { "index ", gitdiff_index },
 648                        { "", gitdiff_unrecognized },
 649                };
 650                int i;
 651
 652                len = linelen(line, size);
 653                if (!len || line[len-1] != '\n')
 654                        break;
 655                for (i = 0; i < ARRAY_SIZE(optable); i++) {
 656                        const struct opentry *p = optable + i;
 657                        int oplen = strlen(p->str);
 658                        if (len < oplen || memcmp(p->str, line, oplen))
 659                                continue;
 660                        if (p->fn(line + oplen, patch) < 0)
 661                                return offset;
 662                        break;
 663                }
 664        }
 665
 666        return offset;
 667}
 668
 669static int parse_num(const char *line, unsigned long *p)
 670{
 671        char *ptr;
 672
 673        if (!isdigit(*line))
 674                return 0;
 675        *p = strtoul(line, &ptr, 10);
 676        return ptr - line;
 677}
 678
 679static int parse_range(const char *line, int len, int offset, const char *expect,
 680                        unsigned long *p1, unsigned long *p2)
 681{
 682        int digits, ex;
 683
 684        if (offset < 0 || offset >= len)
 685                return -1;
 686        line += offset;
 687        len -= offset;
 688
 689        digits = parse_num(line, p1);
 690        if (!digits)
 691                return -1;
 692
 693        offset += digits;
 694        line += digits;
 695        len -= digits;
 696
 697        *p2 = 1;
 698        if (*line == ',') {
 699                digits = parse_num(line+1, p2);
 700                if (!digits)
 701                        return -1;
 702
 703                offset += digits+1;
 704                line += digits+1;
 705                len -= digits+1;
 706        }
 707
 708        ex = strlen(expect);
 709        if (ex > len)
 710                return -1;
 711        if (memcmp(line, expect, ex))
 712                return -1;
 713
 714        return offset + ex;
 715}
 716
 717/*
 718 * Parse a unified diff fragment header of the
 719 * form "@@ -a,b +c,d @@"
 720 */
 721static int parse_fragment_header(char *line, int len, struct fragment *fragment)
 722{
 723        int offset;
 724
 725        if (!len || line[len-1] != '\n')
 726                return -1;
 727
 728        /* Figure out the number of lines in a fragment */
 729        offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
 730        offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
 731
 732        return offset;
 733}
 734
 735static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
 736{
 737        unsigned long offset, len;
 738
 739        patch->is_rename = patch->is_copy = 0;
 740        patch->is_new = patch->is_delete = -1;
 741        patch->old_mode = patch->new_mode = 0;
 742        patch->old_name = patch->new_name = NULL;
 743        for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
 744                unsigned long nextlen;
 745
 746                len = linelen(line, size);
 747                if (!len)
 748                        break;
 749
 750                /* Testing this early allows us to take a few shortcuts.. */
 751                if (len < 6)
 752                        continue;
 753
 754                /*
 755                 * Make sure we don't find any unconnected patch fragmants.
 756                 * That's a sign that we didn't find a header, and that a
 757                 * patch has become corrupted/broken up.
 758                 */
 759                if (!memcmp("@@ -", line, 4)) {
 760                        struct fragment dummy;
 761                        if (parse_fragment_header(line, len, &dummy) < 0)
 762                                continue;
 763                        error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
 764                }
 765
 766                if (size < len + 6)
 767                        break;
 768
 769                /*
 770                 * Git patch? It might not have a real patch, just a rename
 771                 * or mode change, so we handle that specially
 772                 */
 773                if (!memcmp("diff --git ", line, 11)) {
 774                        int git_hdr_len = parse_git_header(line, len, size, patch);
 775                        if (git_hdr_len <= len)
 776                                continue;
 777                        if (!patch->old_name && !patch->new_name) {
 778                                if (!patch->def_name)
 779                                        die("git diff header lacks filename information (line %d)", linenr);
 780                                patch->old_name = patch->new_name = patch->def_name;
 781                        }
 782                        *hdrsize = git_hdr_len;
 783                        return offset;
 784                }
 785
 786                /** --- followed by +++ ? */
 787                if (memcmp("--- ", line,  4) || memcmp("+++ ", line + len, 4))
 788                        continue;
 789
 790                /*
 791                 * We only accept unified patches, so we want it to
 792                 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
 793                 * minimum
 794                 */
 795                nextlen = linelen(line + len, size - len);
 796                if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
 797                        continue;
 798
 799                /* Ok, we'll consider it a patch */
 800                parse_traditional_patch(line, line+len, patch);
 801                *hdrsize = len + nextlen;
 802                linenr += 2;
 803                return offset;
 804        }
 805        return -1;
 806}
 807
 808/*
 809 * Parse a unified diff. Note that this really needs
 810 * to parse each fragment separately, since the only
 811 * way to know the difference between a "---" that is
 812 * part of a patch, and a "---" that starts the next
 813 * patch is to look at the line counts..
 814 */
 815static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
 816{
 817        int added, deleted;
 818        int len = linelen(line, size), offset;
 819        unsigned long oldlines, newlines;
 820
 821        offset = parse_fragment_header(line, len, fragment);
 822        if (offset < 0)
 823                return -1;
 824        oldlines = fragment->oldlines;
 825        newlines = fragment->newlines;
 826
 827        if (patch->is_new < 0) {
 828                patch->is_new =  !oldlines;
 829                if (!oldlines)
 830                        patch->old_name = NULL;
 831        }
 832        if (patch->is_delete < 0) {
 833                patch->is_delete = !newlines;
 834                if (!newlines)
 835                        patch->new_name = NULL;
 836        }
 837
 838        if (patch->is_new && oldlines)
 839                return error("new file depends on old contents");
 840        if (patch->is_delete != !newlines) {
 841                if (newlines)
 842                        return error("deleted file still has contents");
 843                fprintf(stderr, "** warning: file %s becomes empty but is not deleted\n", patch->new_name);
 844        }
 845
 846        /* Parse the thing.. */
 847        line += len;
 848        size -= len;
 849        linenr++;
 850        added = deleted = 0;
 851        for (offset = len; size > 0; offset += len, size -= len, line += len, linenr++) {
 852                if (!oldlines && !newlines)
 853                        break;
 854                len = linelen(line, size);
 855                if (!len || line[len-1] != '\n')
 856                        return -1;
 857                switch (*line) {
 858                default:
 859                        return -1;
 860                case ' ':
 861                        oldlines--;
 862                        newlines--;
 863                        break;
 864                case '-':
 865                        deleted++;
 866                        oldlines--;
 867                        break;
 868                case '+':
 869                        /*
 870                         * We know len is at least two, since we have a '+' and
 871                         * we checked that the last character was a '\n' above.
 872                         * That is, an addition of an empty line would check
 873                         * the '+' here.  Sneaky...
 874                         */
 875                        if ((new_whitespace != nowarn_whitespace) &&
 876                            isspace(line[len-2])) {
 877                                whitespace_error++;
 878                                if (squelch_whitespace_errors &&
 879                                    squelch_whitespace_errors <
 880                                    whitespace_error)
 881                                        ;
 882                                else {
 883                                        fprintf(stderr, "Adds trailing whitespace.\n%s:%d:%.*s\n",
 884                                                patch_input_file,
 885                                                linenr, len-2, line+1);
 886                                }
 887                        }
 888                        added++;
 889                        newlines--;
 890                        break;
 891
 892                /* We allow "\ No newline at end of file". Depending
 893                 * on locale settings when the patch was produced we
 894                 * don't know what this line looks like. The only
 895                 * thing we do know is that it begins with "\ ".
 896                 * Checking for 12 is just for sanity check -- any
 897                 * l10n of "\ No newline..." is at least that long.
 898                 */
 899                case '\\':
 900                        if (len < 12 || memcmp(line, "\\ ", 2))
 901                                return -1;
 902                        break;
 903                }
 904        }
 905        if (oldlines || newlines)
 906                return -1;
 907        /* If a fragment ends with an incomplete line, we failed to include
 908         * it in the above loop because we hit oldlines == newlines == 0
 909         * before seeing it.
 910         */
 911        if (12 < size && !memcmp(line, "\\ ", 2))
 912                offset += linelen(line, size);
 913
 914        patch->lines_added += added;
 915        patch->lines_deleted += deleted;
 916        return offset;
 917}
 918
 919static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
 920{
 921        unsigned long offset = 0;
 922        struct fragment **fragp = &patch->fragments;
 923
 924        while (size > 4 && !memcmp(line, "@@ -", 4)) {
 925                struct fragment *fragment;
 926                int len;
 927
 928                fragment = xmalloc(sizeof(*fragment));
 929                memset(fragment, 0, sizeof(*fragment));
 930                len = parse_fragment(line, size, patch, fragment);
 931                if (len <= 0)
 932                        die("corrupt patch at line %d", linenr);
 933
 934                fragment->patch = line;
 935                fragment->size = len;
 936
 937                *fragp = fragment;
 938                fragp = &fragment->next;
 939
 940                offset += len;
 941                line += len;
 942                size -= len;
 943        }
 944        return offset;
 945}
 946
 947static inline int metadata_changes(struct patch *patch)
 948{
 949        return  patch->is_rename > 0 ||
 950                patch->is_copy > 0 ||
 951                patch->is_new > 0 ||
 952                patch->is_delete ||
 953                (patch->old_mode && patch->new_mode &&
 954                 patch->old_mode != patch->new_mode);
 955}
 956
 957static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
 958{
 959        int hdrsize, patchsize;
 960        int offset = find_header(buffer, size, &hdrsize, patch);
 961
 962        if (offset < 0)
 963                return offset;
 964
 965        patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
 966
 967        if (!patchsize) {
 968                static const char *binhdr[] = {
 969                        "Binary files ",
 970                        "Files ",
 971                        NULL,
 972                };
 973                int i;
 974                int hd = hdrsize + offset;
 975                unsigned long llen = linelen(buffer + hd, size - hd);
 976
 977                if (!memcmp(" differ\n", buffer + hd + llen - 8, 8))
 978                        for (i = 0; binhdr[i]; i++) {
 979                                int len = strlen(binhdr[i]);
 980                                if (len < size - hd &&
 981                                    !memcmp(binhdr[i], buffer + hd, len)) {
 982                                        patch->is_binary = 1;
 983                                        break;
 984                                }
 985                        }
 986
 987                /* Empty patch cannot be applied if:
 988                 * - it is a binary patch and we do not do binary_replace, or
 989                 * - text patch without metadata change
 990                 */
 991                if ((apply || check) &&
 992                    (patch->is_binary
 993                     ? !allow_binary_replacement
 994                     : !metadata_changes(patch)))
 995                        die("patch with only garbage at line %d", linenr);
 996        }
 997
 998        return offset + hdrsize + patchsize;
 999}
1000
1001static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1002static const char minuses[]= "----------------------------------------------------------------------";
1003
1004static void show_stats(struct patch *patch)
1005{
1006        const char *prefix = "";
1007        char *name = patch->new_name;
1008        char *qname = NULL;
1009        int len, max, add, del, total;
1010
1011        if (!name)
1012                name = patch->old_name;
1013
1014        if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
1015                qname = xmalloc(len + 1);
1016                quote_c_style(name, qname, NULL, 0);
1017                name = qname;
1018        }
1019
1020        /*
1021         * "scale" the filename
1022         */
1023        len = strlen(name);
1024        max = max_len;
1025        if (max > 50)
1026                max = 50;
1027        if (len > max) {
1028                char *slash;
1029                prefix = "...";
1030                max -= 3;
1031                name += len - max;
1032                slash = strchr(name, '/');
1033                if (slash)
1034                        name = slash;
1035        }
1036        len = max;
1037
1038        /*
1039         * scale the add/delete
1040         */
1041        max = max_change;
1042        if (max + len > 70)
1043                max = 70 - len;
1044
1045        add = patch->lines_added;
1046        del = patch->lines_deleted;
1047        total = add + del;
1048
1049        if (max_change > 0) {
1050                total = (total * max + max_change / 2) / max_change;
1051                add = (add * max + max_change / 2) / max_change;
1052                del = total - add;
1053        }
1054        if (patch->is_binary)
1055                printf(" %s%-*s |  Bin\n", prefix, len, name);
1056        else
1057                printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
1058                       len, name, patch->lines_added + patch->lines_deleted,
1059                       add, pluses, del, minuses);
1060        if (qname)
1061                free(qname);
1062}
1063
1064static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
1065{
1066        int fd;
1067        unsigned long got;
1068
1069        switch (st->st_mode & S_IFMT) {
1070        case S_IFLNK:
1071                return readlink(path, buf, size);
1072        case S_IFREG:
1073                fd = open(path, O_RDONLY);
1074                if (fd < 0)
1075                        return error("unable to open %s", path);
1076                got = 0;
1077                for (;;) {
1078                        int ret = xread(fd, buf + got, size - got);
1079                        if (ret <= 0)
1080                                break;
1081                        got += ret;
1082                }
1083                close(fd);
1084                return got;
1085
1086        default:
1087                return -1;
1088        }
1089}
1090
1091static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line)
1092{
1093        int i;
1094        unsigned long start, backwards, forwards;
1095
1096        if (fragsize > size)
1097                return -1;
1098
1099        start = 0;
1100        if (line > 1) {
1101                unsigned long offset = 0;
1102                i = line-1;
1103                while (offset + fragsize <= size) {
1104                        if (buf[offset++] == '\n') {
1105                                start = offset;
1106                                if (!--i)
1107                                        break;
1108                        }
1109                }
1110        }
1111
1112        /* Exact line number? */
1113        if (!memcmp(buf + start, fragment, fragsize))
1114                return start;
1115
1116        /*
1117         * There's probably some smart way to do this, but I'll leave
1118         * that to the smart and beautiful people. I'm simple and stupid.
1119         */
1120        backwards = start;
1121        forwards = start;
1122        for (i = 0; ; i++) {
1123                unsigned long try;
1124                int n;
1125
1126                /* "backward" */
1127                if (i & 1) {
1128                        if (!backwards) {
1129                                if (forwards + fragsize > size)
1130                                        break;
1131                                continue;
1132                        }
1133                        do {
1134                                --backwards;
1135                        } while (backwards && buf[backwards-1] != '\n');
1136                        try = backwards;
1137                } else {
1138                        while (forwards + fragsize <= size) {
1139                                if (buf[forwards++] == '\n')
1140                                        break;
1141                        }
1142                        try = forwards;
1143                }
1144
1145                if (try + fragsize > size)
1146                        continue;
1147                if (memcmp(buf + try, fragment, fragsize))
1148                        continue;
1149                n = (i >> 1)+1;
1150                if (i & 1)
1151                        n = -n;
1152                return try;
1153        }
1154
1155        /*
1156         * We should start searching forward and backward.
1157         */
1158        return -1;
1159}
1160
1161struct buffer_desc {
1162        char *buffer;
1163        unsigned long size;
1164        unsigned long alloc;
1165};
1166
1167static int apply_line(char *output, const char *patch, int plen)
1168{
1169        /* plen is number of bytes to be copied from patch,
1170         * starting at patch+1 (patch[0] is '+').  Typically
1171         * patch[plen] is '\n'.
1172         */
1173        int add_nl_to_tail = 0;
1174        if ((new_whitespace == strip_whitespace) &&
1175            1 < plen && isspace(patch[plen-1])) {
1176                if (patch[plen] == '\n')
1177                        add_nl_to_tail = 1;
1178                plen--;
1179                while (0 < plen && isspace(patch[plen]))
1180                        plen--;
1181                applied_after_stripping++;
1182        }
1183        memcpy(output, patch + 1, plen);
1184        if (add_nl_to_tail)
1185                output[plen++] = '\n';
1186        return plen;
1187}
1188
1189static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
1190{
1191        char *buf = desc->buffer;
1192        const char *patch = frag->patch;
1193        int offset, size = frag->size;
1194        char *old = xmalloc(size);
1195        char *new = xmalloc(size);
1196        int oldsize = 0, newsize = 0;
1197
1198        while (size > 0) {
1199                int len = linelen(patch, size);
1200                int plen;
1201
1202                if (!len)
1203                        break;
1204
1205                /*
1206                 * "plen" is how much of the line we should use for
1207                 * the actual patch data. Normally we just remove the
1208                 * first character on the line, but if the line is
1209                 * followed by "\ No newline", then we also remove the
1210                 * last one (which is the newline, of course).
1211                 */
1212                plen = len-1;
1213                if (len < size && patch[len] == '\\')
1214                        plen--;
1215                switch (*patch) {
1216                case ' ':
1217                case '-':
1218                        memcpy(old + oldsize, patch + 1, plen);
1219                        oldsize += plen;
1220                        if (*patch == '-')
1221                                break;
1222                /* Fall-through for ' ' */
1223                case '+':
1224                        if (*patch != '+' || !no_add)
1225                                newsize += apply_line(new + newsize, patch,
1226                                                      plen);
1227                        break;
1228                case '@': case '\\':
1229                        /* Ignore it, we already handled it */
1230                        break;
1231                default:
1232                        return -1;
1233                }
1234                patch += len;
1235                size -= len;
1236        }
1237
1238#ifdef NO_ACCURATE_DIFF
1239        if (oldsize > 0 && old[oldsize - 1] == '\n' &&
1240                        newsize > 0 && new[newsize - 1] == '\n') {
1241                oldsize--;
1242                newsize--;
1243        }
1244#endif
1245                        
1246        offset = find_offset(buf, desc->size, old, oldsize, frag->newpos);
1247        if (offset >= 0) {
1248                int diff = newsize - oldsize;
1249                unsigned long size = desc->size + diff;
1250                unsigned long alloc = desc->alloc;
1251
1252                if (size > alloc) {
1253                        alloc = size + 8192;
1254                        desc->alloc = alloc;
1255                        buf = xrealloc(buf, alloc);
1256                        desc->buffer = buf;
1257                }
1258                desc->size = size;
1259                memmove(buf + offset + newsize, buf + offset + oldsize, size - offset - newsize);
1260                memcpy(buf + offset, new, newsize);
1261                offset = 0;
1262        }
1263
1264        free(old);
1265        free(new);
1266        return offset;
1267}
1268
1269static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
1270{
1271        struct fragment *frag = patch->fragments;
1272        const char *name = patch->old_name ? patch->old_name : patch->new_name;
1273
1274        if (patch->is_binary) {
1275                unsigned char sha1[20];
1276
1277                if (!allow_binary_replacement)
1278                        return error("cannot apply binary patch to '%s' "
1279                                     "without --allow-binary-replacement",
1280                                     name);
1281
1282                /* For safety, we require patch index line to contain
1283                 * full 40-byte textual SHA1 for old and new, at least for now.
1284                 */
1285                if (strlen(patch->old_sha1_prefix) != 40 ||
1286                    strlen(patch->new_sha1_prefix) != 40 ||
1287                    get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1288                    get_sha1_hex(patch->new_sha1_prefix, sha1))
1289                        return error("cannot apply binary patch to '%s' "
1290                                     "without full index line", name);
1291
1292                if (patch->old_name) {
1293                        unsigned char hdr[50];
1294                        int hdrlen;
1295
1296                        /* See if the old one matches what the patch
1297                         * applies to.
1298                         */
1299                        write_sha1_file_prepare(desc->buffer, desc->size,
1300                                                blob_type, sha1, hdr, &hdrlen);
1301                        if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1302                                return error("the patch applies to '%s' (%s), "
1303                                             "which does not match the "
1304                                             "current contents.",
1305                                             name, sha1_to_hex(sha1));
1306                }
1307                else {
1308                        /* Otherwise, the old one must be empty. */
1309                        if (desc->size)
1310                                return error("the patch applies to an empty "
1311                                             "'%s' but it is not empty", name);
1312                }
1313
1314                /* For now, we do not record post-image data in the patch,
1315                 * and require the object already present in the recipient's
1316                 * object database.
1317                 */
1318                if (desc->buffer) {
1319                        free(desc->buffer);
1320                        desc->alloc = desc->size = 0;
1321                }
1322                get_sha1_hex(patch->new_sha1_prefix, sha1);
1323
1324                if (memcmp(sha1, null_sha1, 20)) {
1325                        char type[10];
1326                        unsigned long size;
1327
1328                        desc->buffer = read_sha1_file(sha1, type, &size);
1329                        if (!desc->buffer)
1330                                return error("the necessary postimage %s for "
1331                                             "'%s' does not exist",
1332                                             patch->new_sha1_prefix, name);
1333                        desc->alloc = desc->size = size;
1334                }
1335
1336                return 0;
1337        }
1338
1339        while (frag) {
1340                if (apply_one_fragment(desc, frag) < 0)
1341                        return error("patch failed: %s:%ld",
1342                                     name, frag->oldpos);
1343                frag = frag->next;
1344        }
1345        return 0;
1346}
1347
1348static int apply_data(struct patch *patch, struct stat *st)
1349{
1350        char *buf;
1351        unsigned long size, alloc;
1352        struct buffer_desc desc;
1353
1354        size = 0;
1355        alloc = 0;
1356        buf = NULL;
1357        if (patch->old_name) {
1358                size = st->st_size;
1359                alloc = size + 8192;
1360                buf = xmalloc(alloc);
1361                if (read_old_data(st, patch->old_name, buf, alloc) != size)
1362                        return error("read of %s failed", patch->old_name);
1363        }
1364
1365        desc.size = size;
1366        desc.alloc = alloc;
1367        desc.buffer = buf;
1368        if (apply_fragments(&desc, patch) < 0)
1369                return -1;
1370        patch->result = desc.buffer;
1371        patch->resultsize = desc.size;
1372
1373        if (patch->is_delete && patch->resultsize)
1374                return error("removal patch leaves file contents");
1375
1376        return 0;
1377}
1378
1379static int check_patch(struct patch *patch)
1380{
1381        struct stat st;
1382        const char *old_name = patch->old_name;
1383        const char *new_name = patch->new_name;
1384        const char *name = old_name ? old_name : new_name;
1385
1386        if (old_name) {
1387                int changed;
1388                int stat_ret = lstat(old_name, &st);
1389
1390                if (check_index) {
1391                        int pos = cache_name_pos(old_name, strlen(old_name));
1392                        if (pos < 0)
1393                                return error("%s: does not exist in index",
1394                                             old_name);
1395                        if (stat_ret < 0) {
1396                                struct checkout costate;
1397                                if (errno != ENOENT)
1398                                        return error("%s: %s", old_name,
1399                                                     strerror(errno));
1400                                /* checkout */
1401                                costate.base_dir = "";
1402                                costate.base_dir_len = 0;
1403                                costate.force = 0;
1404                                costate.quiet = 0;
1405                                costate.not_new = 0;
1406                                costate.refresh_cache = 1;
1407                                if (checkout_entry(active_cache[pos],
1408                                                   &costate,
1409                                                   NULL) ||
1410                                    lstat(old_name, &st))
1411                                        return -1;
1412                        }
1413
1414                        changed = ce_match_stat(active_cache[pos], &st, 1);
1415                        if (changed)
1416                                return error("%s: does not match index",
1417                                             old_name);
1418                }
1419                else if (stat_ret < 0)
1420                        return error("%s: %s", old_name, strerror(errno));
1421
1422                if (patch->is_new < 0)
1423                        patch->is_new = 0;
1424                st.st_mode = ntohl(create_ce_mode(st.st_mode));
1425                if (!patch->old_mode)
1426                        patch->old_mode = st.st_mode;
1427                if ((st.st_mode ^ patch->old_mode) & S_IFMT)
1428                        return error("%s: wrong type", old_name);
1429                if (st.st_mode != patch->old_mode)
1430                        fprintf(stderr, "warning: %s has type %o, expected %o\n",
1431                                old_name, st.st_mode, patch->old_mode);
1432        }
1433
1434        if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
1435                if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0)
1436                        return error("%s: already exists in index", new_name);
1437                if (!lstat(new_name, &st))
1438                        return error("%s: already exists in working directory", new_name);
1439                if (errno != ENOENT)
1440                        return error("%s: %s", new_name, strerror(errno));
1441                if (!patch->new_mode) {
1442                        if (patch->is_new)
1443                                patch->new_mode = S_IFREG | 0644;
1444                        else
1445                                patch->new_mode = patch->old_mode;
1446                }
1447        }
1448
1449        if (new_name && old_name) {
1450                int same = !strcmp(old_name, new_name);
1451                if (!patch->new_mode)
1452                        patch->new_mode = patch->old_mode;
1453                if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
1454                        return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1455                                patch->new_mode, new_name, patch->old_mode,
1456                                same ? "" : " of ", same ? "" : old_name);
1457        }       
1458
1459        if (apply_data(patch, &st) < 0)
1460                return error("%s: patch does not apply", name);
1461        return 0;
1462}
1463
1464static int check_patch_list(struct patch *patch)
1465{
1466        int error = 0;
1467
1468        for (;patch ; patch = patch->next)
1469                error |= check_patch(patch);
1470        return error;
1471}
1472
1473static inline int is_null_sha1(const unsigned char *sha1)
1474{
1475        return !memcmp(sha1, null_sha1, 20);
1476}
1477
1478static void show_index_list(struct patch *list)
1479{
1480        struct patch *patch;
1481
1482        /* Once we start supporting the reverse patch, it may be
1483         * worth showing the new sha1 prefix, but until then...
1484         */
1485        for (patch = list; patch; patch = patch->next) {
1486                const unsigned char *sha1_ptr;
1487                unsigned char sha1[20];
1488                const char *name;
1489
1490                name = patch->old_name ? patch->old_name : patch->new_name;
1491                if (patch->is_new)
1492                        sha1_ptr = null_sha1;
1493                else if (get_sha1(patch->old_sha1_prefix, sha1))
1494                        die("sha1 information is lacking or useless (%s).",
1495                            name);
1496                else
1497                        sha1_ptr = sha1;
1498
1499                printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
1500                if (line_termination && quote_c_style(name, NULL, NULL, 0))
1501                        quote_c_style(name, NULL, stdout, 0);
1502                else
1503                        fputs(name, stdout);
1504                putchar(line_termination);
1505        }
1506}
1507
1508static void stat_patch_list(struct patch *patch)
1509{
1510        int files, adds, dels;
1511
1512        for (files = adds = dels = 0 ; patch ; patch = patch->next) {
1513                files++;
1514                adds += patch->lines_added;
1515                dels += patch->lines_deleted;
1516                show_stats(patch);
1517        }
1518
1519        printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
1520}
1521
1522static void numstat_patch_list(struct patch *patch)
1523{
1524        for ( ; patch; patch = patch->next) {
1525                const char *name;
1526                name = patch->old_name ? patch->old_name : patch->new_name;
1527                printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
1528                if (line_termination && quote_c_style(name, NULL, NULL, 0))
1529                        quote_c_style(name, NULL, stdout, 0);
1530                else
1531                        fputs(name, stdout);
1532                putchar('\n');
1533        }
1534}
1535
1536static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
1537{
1538        if (mode)
1539                printf(" %s mode %06o %s\n", newdelete, mode, name);
1540        else
1541                printf(" %s %s\n", newdelete, name);
1542}
1543
1544static void show_mode_change(struct patch *p, int show_name)
1545{
1546        if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
1547                if (show_name)
1548                        printf(" mode change %06o => %06o %s\n",
1549                               p->old_mode, p->new_mode, p->new_name);
1550                else
1551                        printf(" mode change %06o => %06o\n",
1552                               p->old_mode, p->new_mode);
1553        }
1554}
1555
1556static void show_rename_copy(struct patch *p)
1557{
1558        const char *renamecopy = p->is_rename ? "rename" : "copy";
1559        const char *old, *new;
1560
1561        /* Find common prefix */
1562        old = p->old_name;
1563        new = p->new_name;
1564        while (1) {
1565                const char *slash_old, *slash_new;
1566                slash_old = strchr(old, '/');
1567                slash_new = strchr(new, '/');
1568                if (!slash_old ||
1569                    !slash_new ||
1570                    slash_old - old != slash_new - new ||
1571                    memcmp(old, new, slash_new - new))
1572                        break;
1573                old = slash_old + 1;
1574                new = slash_new + 1;
1575        }
1576        /* p->old_name thru old is the common prefix, and old and new
1577         * through the end of names are renames
1578         */
1579        if (old != p->old_name)
1580                printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
1581                       (int)(old - p->old_name), p->old_name,
1582                       old, new, p->score);
1583        else
1584                printf(" %s %s => %s (%d%%)\n", renamecopy,
1585                       p->old_name, p->new_name, p->score);
1586        show_mode_change(p, 0);
1587}
1588
1589static void summary_patch_list(struct patch *patch)
1590{
1591        struct patch *p;
1592
1593        for (p = patch; p; p = p->next) {
1594                if (p->is_new)
1595                        show_file_mode_name("create", p->new_mode, p->new_name);
1596                else if (p->is_delete)
1597                        show_file_mode_name("delete", p->old_mode, p->old_name);
1598                else {
1599                        if (p->is_rename || p->is_copy)
1600                                show_rename_copy(p);
1601                        else {
1602                                if (p->score) {
1603                                        printf(" rewrite %s (%d%%)\n",
1604                                               p->new_name, p->score);
1605                                        show_mode_change(p, 0);
1606                                }
1607                                else
1608                                        show_mode_change(p, 1);
1609                        }
1610                }
1611        }
1612}
1613
1614static void patch_stats(struct patch *patch)
1615{
1616        int lines = patch->lines_added + patch->lines_deleted;
1617
1618        if (lines > max_change)
1619                max_change = lines;
1620        if (patch->old_name) {
1621                int len = quote_c_style(patch->old_name, NULL, NULL, 0);
1622                if (!len)
1623                        len = strlen(patch->old_name);
1624                if (len > max_len)
1625                        max_len = len;
1626        }
1627        if (patch->new_name) {
1628                int len = quote_c_style(patch->new_name, NULL, NULL, 0);
1629                if (!len)
1630                        len = strlen(patch->new_name);
1631                if (len > max_len)
1632                        max_len = len;
1633        }
1634}
1635
1636static void remove_file(struct patch *patch)
1637{
1638        if (write_index) {
1639                if (remove_file_from_cache(patch->old_name) < 0)
1640                        die("unable to remove %s from index", patch->old_name);
1641        }
1642        unlink(patch->old_name);
1643}
1644
1645static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
1646{
1647        struct stat st;
1648        struct cache_entry *ce;
1649        int namelen = strlen(path);
1650        unsigned ce_size = cache_entry_size(namelen);
1651
1652        if (!write_index)
1653                return;
1654
1655        ce = xmalloc(ce_size);
1656        memset(ce, 0, ce_size);
1657        memcpy(ce->name, path, namelen);
1658        ce->ce_mode = create_ce_mode(mode);
1659        ce->ce_flags = htons(namelen);
1660        if (lstat(path, &st) < 0)
1661                die("unable to stat newly created file %s", path);
1662        fill_stat_cache_info(ce, &st);
1663        if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
1664                die("unable to create backing store for newly created file %s", path);
1665        if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
1666                die("unable to add cache entry for %s", path);
1667}
1668
1669static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
1670{
1671        int fd;
1672
1673        if (S_ISLNK(mode))
1674                return symlink(buf, path);
1675        fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
1676        if (fd < 0)
1677                return -1;
1678        while (size) {
1679                int written = xwrite(fd, buf, size);
1680                if (written < 0)
1681                        die("writing file %s: %s", path, strerror(errno));
1682                if (!written)
1683                        die("out of space writing file %s", path);
1684                buf += written;
1685                size -= written;
1686        }
1687        if (close(fd) < 0)
1688                die("closing file %s: %s", path, strerror(errno));
1689        return 0;
1690}
1691
1692/*
1693 * We optimistically assume that the directories exist,
1694 * which is true 99% of the time anyway. If they don't,
1695 * we create them and try again.
1696 */
1697static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
1698{
1699        if (!try_create_file(path, mode, buf, size))
1700                return;
1701
1702        if (errno == ENOENT) {
1703                if (safe_create_leading_directories(path))
1704                        return;
1705                if (!try_create_file(path, mode, buf, size))
1706                        return;
1707        }
1708
1709        if (errno == EEXIST) {
1710                unsigned int nr = getpid();
1711
1712                for (;;) {
1713                        const char *newpath;
1714                        newpath = mkpath("%s~%u", path, nr);
1715                        if (!try_create_file(newpath, mode, buf, size)) {
1716                                if (!rename(newpath, path))
1717                                        return;
1718                                unlink(newpath);
1719                                break;
1720                        }
1721                        if (errno != EEXIST)
1722                                break;
1723                        ++nr;
1724                }
1725        }
1726        die("unable to write file %s mode %o", path, mode);
1727}
1728
1729static void create_file(struct patch *patch)
1730{
1731        char *path = patch->new_name;
1732        unsigned mode = patch->new_mode;
1733        unsigned long size = patch->resultsize;
1734        char *buf = patch->result;
1735
1736        if (!mode)
1737                mode = S_IFREG | 0644;
1738        create_one_file(path, mode, buf, size); 
1739        add_index_file(path, mode, buf, size);
1740}
1741
1742static void write_out_one_result(struct patch *patch)
1743{
1744        if (patch->is_delete > 0) {
1745                remove_file(patch);
1746                return;
1747        }
1748        if (patch->is_new > 0 || patch->is_copy) {
1749                create_file(patch);
1750                return;
1751        }
1752        /*
1753         * Rename or modification boils down to the same
1754         * thing: remove the old, write the new
1755         */
1756        remove_file(patch);
1757        create_file(patch);
1758}
1759
1760static void write_out_results(struct patch *list, int skipped_patch)
1761{
1762        if (!list && !skipped_patch)
1763                die("No changes");
1764
1765        while (list) {
1766                write_out_one_result(list);
1767                list = list->next;
1768        }
1769}
1770
1771static struct cache_file cache_file;
1772
1773static struct excludes {
1774        struct excludes *next;
1775        const char *path;
1776} *excludes;
1777
1778static int use_patch(struct patch *p)
1779{
1780        const char *pathname = p->new_name ? p->new_name : p->old_name;
1781        struct excludes *x = excludes;
1782        while (x) {
1783                if (fnmatch(x->path, pathname, 0) == 0)
1784                        return 0;
1785                x = x->next;
1786        }
1787        if (0 < prefix_length) {
1788                int pathlen = strlen(pathname);
1789                if (pathlen <= prefix_length ||
1790                    memcmp(prefix, pathname, prefix_length))
1791                        return 0;
1792        }
1793        return 1;
1794}
1795
1796static int apply_patch(int fd, const char *filename)
1797{
1798        int newfd;
1799        unsigned long offset, size;
1800        char *buffer = read_patch_file(fd, &size);
1801        struct patch *list = NULL, **listp = &list;
1802        int skipped_patch = 0;
1803
1804        patch_input_file = filename;
1805        if (!buffer)
1806                return -1;
1807        offset = 0;
1808        while (size > 0) {
1809                struct patch *patch;
1810                int nr;
1811
1812                patch = xmalloc(sizeof(*patch));
1813                memset(patch, 0, sizeof(*patch));
1814                nr = parse_chunk(buffer + offset, size, patch);
1815                if (nr < 0)
1816                        break;
1817                if (use_patch(patch)) {
1818                        patch_stats(patch);
1819                        *listp = patch;
1820                        listp = &patch->next;
1821                } else {
1822                        /* perhaps free it a bit better? */
1823                        free(patch);
1824                        skipped_patch++;
1825                }
1826                offset += nr;
1827                size -= nr;
1828        }
1829
1830        newfd = -1;
1831        if (whitespace_error && (new_whitespace == error_on_whitespace))
1832                apply = 0;
1833
1834        write_index = check_index && apply;
1835        if (write_index)
1836                newfd = hold_index_file_for_update(&cache_file, get_index_file());
1837        if (check_index) {
1838                if (read_cache() < 0)
1839                        die("unable to read index file");
1840        }
1841
1842        if ((check || apply) && check_patch_list(list) < 0)
1843                exit(1);
1844
1845        if (apply)
1846                write_out_results(list, skipped_patch);
1847
1848        if (write_index) {
1849                if (write_cache(newfd, active_cache, active_nr) ||
1850                    commit_index_file(&cache_file))
1851                        die("Unable to write new cachefile");
1852        }
1853
1854        if (show_index_info)
1855                show_index_list(list);
1856
1857        if (diffstat)
1858                stat_patch_list(list);
1859
1860        if (numstat)
1861                numstat_patch_list(list);
1862
1863        if (summary)
1864                summary_patch_list(list);
1865
1866        free(buffer);
1867        return 0;
1868}
1869
1870static int git_apply_config(const char *var, const char *value)
1871{
1872        if (!strcmp(var, "apply.whitespace")) {
1873                apply_default_whitespace = strdup(value);
1874                return 0;
1875        }
1876        return git_default_config(var, value);
1877}
1878
1879
1880int main(int argc, char **argv)
1881{
1882        int i;
1883        int read_stdin = 1;
1884        const char *whitespace_option = NULL;
1885
1886        for (i = 1; i < argc; i++) {
1887                const char *arg = argv[i];
1888                int fd;
1889
1890                if (!strcmp(arg, "-")) {
1891                        apply_patch(0, "<stdin>");
1892                        read_stdin = 0;
1893                        continue;
1894                }
1895                if (!strncmp(arg, "--exclude=", 10)) {
1896                        struct excludes *x = xmalloc(sizeof(*x));
1897                        x->path = arg + 10;
1898                        x->next = excludes;
1899                        excludes = x;
1900                        continue;
1901                }
1902                if (!strncmp(arg, "-p", 2)) {
1903                        p_value = atoi(arg + 2);
1904                        continue;
1905                }
1906                if (!strcmp(arg, "--no-add")) {
1907                        no_add = 1;
1908                        continue;
1909                }
1910                if (!strcmp(arg, "--stat")) {
1911                        apply = 0;
1912                        diffstat = 1;
1913                        continue;
1914                }
1915                if (!strcmp(arg, "--allow-binary-replacement")) {
1916                        allow_binary_replacement = 1;
1917                        continue;
1918                }
1919                if (!strcmp(arg, "--numstat")) {
1920                        apply = 0;
1921                        numstat = 1;
1922                        continue;
1923                }
1924                if (!strcmp(arg, "--summary")) {
1925                        apply = 0;
1926                        summary = 1;
1927                        continue;
1928                }
1929                if (!strcmp(arg, "--check")) {
1930                        apply = 0;
1931                        check = 1;
1932                        continue;
1933                }
1934                if (!strcmp(arg, "--index")) {
1935                        check_index = 1;
1936                        continue;
1937                }
1938                if (!strcmp(arg, "--apply")) {
1939                        apply = 1;
1940                        continue;
1941                }
1942                if (!strcmp(arg, "--index-info")) {
1943                        apply = 0;
1944                        show_index_info = 1;
1945                        continue;
1946                }
1947                if (!strcmp(arg, "-z")) {
1948                        line_termination = 0;
1949                        continue;
1950                }
1951                if (!strncmp(arg, "--whitespace=", 13)) {
1952                        whitespace_option = arg + 13;
1953                        parse_whitespace_option(arg + 13);
1954                        continue;
1955                }
1956
1957                if (check_index && prefix_length < 0) {
1958                        prefix = setup_git_directory();
1959                        prefix_length = prefix ? strlen(prefix) : 0;
1960                        git_config(git_apply_config);
1961                        if (!whitespace_option && apply_default_whitespace)
1962                                parse_whitespace_option(apply_default_whitespace);
1963                }
1964                if (0 < prefix_length)
1965                        arg = prefix_filename(prefix, prefix_length, arg);
1966
1967                fd = open(arg, O_RDONLY);
1968                if (fd < 0)
1969                        usage(apply_usage);
1970                read_stdin = 0;
1971                set_default_whitespace_mode(whitespace_option);
1972                apply_patch(fd, arg);
1973                close(fd);
1974        }
1975        set_default_whitespace_mode(whitespace_option);
1976        if (read_stdin)
1977                apply_patch(0, "<stdin>");
1978        if (whitespace_error) {
1979                if (squelch_whitespace_errors &&
1980                    squelch_whitespace_errors < whitespace_error) {
1981                        int squelched =
1982                                whitespace_error - squelch_whitespace_errors;
1983                        fprintf(stderr, "warning: squelched %d whitespace error%s\n",
1984                                squelched,
1985                                squelched == 1 ? "" : "s");
1986                }
1987                if (new_whitespace == error_on_whitespace)
1988                        die("%d line%s add%s trailing whitespaces.",
1989                            whitespace_error,
1990                            whitespace_error == 1 ? "" : "s",
1991                            whitespace_error == 1 ? "s" : "");
1992                if (applied_after_stripping)
1993                        fprintf(stderr, "warning: %d line%s applied after"
1994                                " stripping trailing whitespaces.\n",
1995                                applied_after_stripping,
1996                                applied_after_stripping == 1 ? "" : "s");
1997                else if (whitespace_error)
1998                        fprintf(stderr, "warning: %d line%s add%s trailing"
1999                                " whitespaces.\n",
2000                                whitespace_error,
2001                                whitespace_error == 1 ? "" : "s",
2002                                whitespace_error == 1 ? "s" : "");
2003        }
2004        return 0;
2005}