apply.con commit Document "git cherry-pick" and "git revert" (de2b82c)
   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 * NOTE! It does all its work in the index file, and only cares about
   9 * the files in the working directory if you tell it to "merge" the
  10 * patch apply.
  11 *
  12 * Even when merging it always takes the source from the index, and
  13 * uses the working tree as a "branch" for a 3-way merge.
  14 */
  15#include <ctype.h>
  16#include <fnmatch.h>
  17#include "cache.h"
  18
  19// We default to the merge behaviour, since that's what most people would
  20// expect.
  21//
  22//  --check turns on checking that the working tree matches the
  23//    files that are being modified, but doesn't apply the patch
  24//  --stat does just a diffstat, and doesn't actually apply
  25//  --show-files shows the directory changes
  26//
  27static int merge_patch = 1;
  28static int check_index = 0;
  29static int write_index = 0;
  30static int diffstat = 0;
  31static int summary = 0;
  32static int check = 0;
  33static int apply = 1;
  34static int show_files = 0;
  35static const char apply_usage[] =
  36"git-apply [--no-merge] [--stat] [--summary] [--check] [--index] [--apply] [--show-files] <patch>...";
  37
  38/*
  39 * For "diff-stat" like behaviour, we keep track of the biggest change
  40 * we've seen, and the longest filename. That allows us to do simple
  41 * scaling.
  42 */
  43static int max_change, max_len;
  44
  45/*
  46 * Various "current state", notably line numbers and what
  47 * file (and how) we're patching right now.. The "is_xxxx"
  48 * things are flags, where -1 means "don't know yet".
  49 */
  50static int linenr = 1;
  51
  52struct fragment {
  53        unsigned long oldpos, oldlines;
  54        unsigned long newpos, newlines;
  55        const char *patch;
  56        int size;
  57        struct fragment *next;
  58};
  59
  60struct patch {
  61        char *new_name, *old_name, *def_name;
  62        unsigned int old_mode, new_mode;
  63        int is_rename, is_copy, is_new, is_delete;
  64        int lines_added, lines_deleted;
  65        int score;
  66        struct fragment *fragments;
  67        char *result;
  68        unsigned long resultsize;
  69        struct patch *next;
  70};
  71
  72#define CHUNKSIZE (8192)
  73#define SLOP (16)
  74
  75static void *read_patch_file(int fd, unsigned long *sizep)
  76{
  77        unsigned long size = 0, alloc = CHUNKSIZE;
  78        void *buffer = xmalloc(alloc);
  79
  80        for (;;) {
  81                int nr = alloc - size;
  82                if (nr < 1024) {
  83                        alloc += CHUNKSIZE;
  84                        buffer = xrealloc(buffer, alloc);
  85                        nr = alloc - size;
  86                }
  87                nr = read(fd, buffer + size, nr);
  88                if (!nr)
  89                        break;
  90                if (nr < 0) {
  91                        if (errno == EAGAIN)
  92                                continue;
  93                        die("git-apply: read returned %s", strerror(errno));
  94                }
  95                size += nr;
  96        }
  97        *sizep = size;
  98
  99        /*
 100         * Make sure that we have some slop in the buffer
 101         * so that we can do speculative "memcmp" etc, and
 102         * see to it that it is NUL-filled.
 103         */
 104        if (alloc < size + SLOP)
 105                buffer = xrealloc(buffer, size + SLOP);
 106        memset(buffer + size, 0, SLOP);
 107        return buffer;
 108}
 109
 110static unsigned long linelen(const char *buffer, unsigned long size)
 111{
 112        unsigned long len = 0;
 113        while (size--) {
 114                len++;
 115                if (*buffer++ == '\n')
 116                        break;
 117        }
 118        return len;
 119}
 120
 121static int is_dev_null(const char *str)
 122{
 123        return !memcmp("/dev/null", str, 9) && isspace(str[9]);
 124}
 125
 126#define TERM_SPACE      1
 127#define TERM_TAB        2
 128
 129static int name_terminate(const char *name, int namelen, int c, int terminate)
 130{
 131        if (c == ' ' && !(terminate & TERM_SPACE))
 132                return 0;
 133        if (c == '\t' && !(terminate & TERM_TAB))
 134                return 0;
 135
 136        return 1;
 137}
 138
 139static char * find_name(const char *line, char *def, int p_value, int terminate)
 140{
 141        int len;
 142        const char *start = line;
 143        char *name;
 144
 145        for (;;) {
 146                char c = *line;
 147
 148                if (isspace(c)) {
 149                        if (c == '\n')
 150                                break;
 151                        if (name_terminate(start, line-start, c, terminate))
 152                                break;
 153                }
 154                line++;
 155                if (c == '/' && !--p_value)
 156                        start = line;
 157        }
 158        if (!start)
 159                return def;
 160        len = line - start;
 161        if (!len)
 162                return def;
 163
 164        /*
 165         * Generally we prefer the shorter name, especially
 166         * if the other one is just a variation of that with
 167         * something else tacked on to the end (ie "file.orig"
 168         * or "file~").
 169         */
 170        if (def) {
 171                int deflen = strlen(def);
 172                if (deflen < len && !strncmp(start, def, deflen))
 173                        return def;
 174        }
 175
 176        name = xmalloc(len + 1);
 177        memcpy(name, start, len);
 178        name[len] = 0;
 179        free(def);
 180        return name;
 181}
 182
 183/*
 184 * Get the name etc info from the --/+++ lines of a traditional patch header
 185 *
 186 * NOTE! This hardcodes "-p1" behaviour in filename detection.
 187 *
 188 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
 189 * files, we can happily check the index for a match, but for creating a
 190 * new file we should try to match whatever "patch" does. I have no idea.
 191 */
 192static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
 193{
 194        int p_value = 1;
 195        char *name;
 196
 197        first += 4;     // skip "--- "
 198        second += 4;    // skip "+++ "
 199        if (is_dev_null(first)) {
 200                patch->is_new = 1;
 201                patch->is_delete = 0;
 202                name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
 203                patch->new_name = name;
 204        } else if (is_dev_null(second)) {
 205                patch->is_new = 0;
 206                patch->is_delete = 1;
 207                name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
 208                patch->old_name = name;
 209        } else {
 210                name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
 211                name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
 212                patch->old_name = patch->new_name = name;
 213        }
 214        if (!name)
 215                die("unable to find filename in patch at line %d", linenr);
 216}
 217
 218static int gitdiff_hdrend(const char *line, struct patch *patch)
 219{
 220        return -1;
 221}
 222
 223/*
 224 * We're anal about diff header consistency, to make
 225 * sure that we don't end up having strange ambiguous
 226 * patches floating around.
 227 *
 228 * As a result, gitdiff_{old|new}name() will check
 229 * their names against any previous information, just
 230 * to make sure..
 231 */
 232static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
 233{
 234        int len;
 235        const char *name;
 236
 237        if (!orig_name && !isnull)
 238                return find_name(line, NULL, 1, 0);
 239
 240        name = "/dev/null";
 241        len = 9;
 242        if (orig_name) {
 243                name = orig_name;
 244                len = strlen(name);
 245                if (isnull)
 246                        die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
 247        }
 248
 249        if (*name == '/')
 250                goto absolute_path;
 251
 252        for (;;) {
 253                char c = *line++;
 254                if (c == '\n')
 255                        break;
 256                if (c != '/')
 257                        continue;
 258absolute_path:
 259                if (memcmp(line, name, len) || line[len] != '\n')
 260                        break;
 261                return orig_name;
 262        }
 263        die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
 264        return NULL;
 265}
 266
 267static int gitdiff_oldname(const char *line, struct patch *patch)
 268{
 269        patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
 270        return 0;
 271}
 272
 273static int gitdiff_newname(const char *line, struct patch *patch)
 274{
 275        patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
 276        return 0;
 277}
 278
 279static int gitdiff_oldmode(const char *line, struct patch *patch)
 280{
 281        patch->old_mode = strtoul(line, NULL, 8);
 282        return 0;
 283}
 284
 285static int gitdiff_newmode(const char *line, struct patch *patch)
 286{
 287        patch->new_mode = strtoul(line, NULL, 8);
 288        return 0;
 289}
 290
 291static int gitdiff_delete(const char *line, struct patch *patch)
 292{
 293        patch->is_delete = 1;
 294        patch->old_name = patch->def_name;
 295        return gitdiff_oldmode(line, patch);
 296}
 297
 298static int gitdiff_newfile(const char *line, struct patch *patch)
 299{
 300        patch->is_new = 1;
 301        patch->new_name = patch->def_name;
 302        return gitdiff_newmode(line, patch);
 303}
 304
 305static int gitdiff_copysrc(const char *line, struct patch *patch)
 306{
 307        patch->is_copy = 1;
 308        patch->old_name = find_name(line, NULL, 0, 0);
 309        return 0;
 310}
 311
 312static int gitdiff_copydst(const char *line, struct patch *patch)
 313{
 314        patch->is_copy = 1;
 315        patch->new_name = find_name(line, NULL, 0, 0);
 316        return 0;
 317}
 318
 319static int gitdiff_renamesrc(const char *line, struct patch *patch)
 320{
 321        patch->is_rename = 1;
 322        patch->old_name = find_name(line, NULL, 0, 0);
 323        return 0;
 324}
 325
 326static int gitdiff_renamedst(const char *line, struct patch *patch)
 327{
 328        patch->is_rename = 1;
 329        patch->new_name = find_name(line, NULL, 0, 0);
 330        return 0;
 331}
 332
 333static int gitdiff_similarity(const char *line, struct patch *patch)
 334{
 335        if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
 336                patch->score = 0;
 337        return 0;
 338}
 339
 340static int gitdiff_dissimilarity(const char *line, struct patch *patch)
 341{
 342        if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
 343                patch->score = 0;
 344        return 0;
 345}
 346
 347/*
 348 * This is normal for a diff that doesn't change anything: we'll fall through
 349 * into the next diff. Tell the parser to break out.
 350 */
 351static int gitdiff_unrecognized(const char *line, struct patch *patch)
 352{
 353        return -1;
 354}
 355
 356static char *git_header_name(char *line)
 357{
 358        int len;
 359        char *name, *second;
 360
 361        /*
 362         * Find the first '/'
 363         */
 364        name = line;
 365        for (;;) {
 366                char c = *name++;
 367                if (c == '\n')
 368                        return NULL;
 369                if (c == '/')
 370                        break;
 371        }
 372
 373        /*
 374         * We don't accept absolute paths (/dev/null) as possibly valid
 375         */
 376        if (name == line+1)
 377                return NULL;
 378
 379        /*
 380         * Accept a name only if it shows up twice, exactly the same
 381         * form.
 382         */
 383        for (len = 0 ; ; len++) {
 384                char c = name[len];
 385
 386                switch (c) {
 387                default:
 388                        continue;
 389                case '\n':
 390                        return NULL;
 391                case '\t': case ' ':
 392                        second = name+len;
 393                        for (;;) {
 394                                char c = *second++;
 395                                if (c == '\n')
 396                                        return NULL;
 397                                if (c == '/')
 398                                        break;
 399                        }
 400                        if (second[len] == '\n' && !memcmp(name, second, len)) {
 401                                char *ret = xmalloc(len + 1);
 402                                memcpy(ret, name, len);
 403                                ret[len] = 0;
 404                                return ret;
 405                        }
 406                }
 407        }
 408        return NULL;
 409}
 410
 411/* Verify that we recognize the lines following a git header */
 412static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
 413{
 414        unsigned long offset;
 415
 416        /* A git diff has explicit new/delete information, so we don't guess */
 417        patch->is_new = 0;
 418        patch->is_delete = 0;
 419
 420        /*
 421         * Some things may not have the old name in the
 422         * rest of the headers anywhere (pure mode changes,
 423         * or removing or adding empty files), so we get
 424         * the default name from the header.
 425         */
 426        patch->def_name = git_header_name(line + strlen("diff --git "));
 427
 428        line += len;
 429        size -= len;
 430        linenr++;
 431        for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
 432                static const struct opentry {
 433                        const char *str;
 434                        int (*fn)(const char *, struct patch *);
 435                } optable[] = {
 436                        { "@@ -", gitdiff_hdrend },
 437                        { "--- ", gitdiff_oldname },
 438                        { "+++ ", gitdiff_newname },
 439                        { "old mode ", gitdiff_oldmode },
 440                        { "new mode ", gitdiff_newmode },
 441                        { "deleted file mode ", gitdiff_delete },
 442                        { "new file mode ", gitdiff_newfile },
 443                        { "copy from ", gitdiff_copysrc },
 444                        { "copy to ", gitdiff_copydst },
 445                        { "rename old ", gitdiff_renamesrc },
 446                        { "rename new ", gitdiff_renamedst },
 447                        { "rename from ", gitdiff_renamesrc },
 448                        { "rename to ", gitdiff_renamedst },
 449                        { "similarity index ", gitdiff_similarity },
 450                        { "dissimilarity index ", gitdiff_dissimilarity },
 451                        { "", gitdiff_unrecognized },
 452                };
 453                int i;
 454
 455                len = linelen(line, size);
 456                if (!len || line[len-1] != '\n')
 457                        break;
 458                for (i = 0; i < sizeof(optable) / sizeof(optable[0]); i++) {
 459                        const struct opentry *p = optable + i;
 460                        int oplen = strlen(p->str);
 461                        if (len < oplen || memcmp(p->str, line, oplen))
 462                                continue;
 463                        if (p->fn(line + oplen, patch) < 0)
 464                                return offset;
 465                        break;
 466                }
 467        }
 468
 469        return offset;
 470}
 471
 472static int parse_num(const char *line, unsigned long *p)
 473{
 474        char *ptr;
 475
 476        if (!isdigit(*line))
 477                return 0;
 478        *p = strtoul(line, &ptr, 10);
 479        return ptr - line;
 480}
 481
 482static int parse_range(const char *line, int len, int offset, const char *expect,
 483                        unsigned long *p1, unsigned long *p2)
 484{
 485        int digits, ex;
 486
 487        if (offset < 0 || offset >= len)
 488                return -1;
 489        line += offset;
 490        len -= offset;
 491
 492        digits = parse_num(line, p1);
 493        if (!digits)
 494                return -1;
 495
 496        offset += digits;
 497        line += digits;
 498        len -= digits;
 499
 500        *p2 = *p1;
 501        if (*line == ',') {
 502                digits = parse_num(line+1, p2);
 503                if (!digits)
 504                        return -1;
 505
 506                offset += digits+1;
 507                line += digits+1;
 508                len -= digits+1;
 509        }
 510
 511        ex = strlen(expect);
 512        if (ex > len)
 513                return -1;
 514        if (memcmp(line, expect, ex))
 515                return -1;
 516
 517        return offset + ex;
 518}
 519
 520/*
 521 * Parse a unified diff fragment header of the
 522 * form "@@ -a,b +c,d @@"
 523 */
 524static int parse_fragment_header(char *line, int len, struct fragment *fragment)
 525{
 526        int offset;
 527
 528        if (!len || line[len-1] != '\n')
 529                return -1;
 530
 531        /* Figure out the number of lines in a fragment */
 532        offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
 533        offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
 534
 535        return offset;
 536}
 537
 538static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
 539{
 540        unsigned long offset, len;
 541
 542        patch->is_rename = patch->is_copy = 0;
 543        patch->is_new = patch->is_delete = -1;
 544        patch->old_mode = patch->new_mode = 0;
 545        patch->old_name = patch->new_name = NULL;
 546        for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
 547                unsigned long nextlen;
 548
 549                len = linelen(line, size);
 550                if (!len)
 551                        break;
 552
 553                /* Testing this early allows us to take a few shortcuts.. */
 554                if (len < 6)
 555                        continue;
 556
 557                /*
 558                 * Make sure we don't find any unconnected patch fragmants.
 559                 * That's a sign that we didn't find a header, and that a
 560                 * patch has become corrupted/broken up.
 561                 */
 562                if (!memcmp("@@ -", line, 4)) {
 563                        struct fragment dummy;
 564                        if (parse_fragment_header(line, len, &dummy) < 0)
 565                                continue;
 566                        error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
 567                }
 568
 569                if (size < len + 6)
 570                        break;
 571
 572                /*
 573                 * Git patch? It might not have a real patch, just a rename
 574                 * or mode change, so we handle that specially
 575                 */
 576                if (!memcmp("diff --git ", line, 11)) {
 577                        int git_hdr_len = parse_git_header(line, len, size, patch);
 578                        if (git_hdr_len <= len)
 579                                continue;
 580                        if (!patch->old_name && !patch->new_name) {
 581                                if (!patch->def_name)
 582                                        die("git diff header lacks filename information (line %d)", linenr);
 583                                patch->old_name = patch->new_name = patch->def_name;
 584                        }
 585                        *hdrsize = git_hdr_len;
 586                        return offset;
 587                }
 588
 589                /** --- followed by +++ ? */
 590                if (memcmp("--- ", line,  4) || memcmp("+++ ", line + len, 4))
 591                        continue;
 592
 593                /*
 594                 * We only accept unified patches, so we want it to
 595                 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
 596                 * minimum
 597                 */
 598                nextlen = linelen(line + len, size - len);
 599                if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
 600                        continue;
 601
 602                /* Ok, we'll consider it a patch */
 603                parse_traditional_patch(line, line+len, patch);
 604                *hdrsize = len + nextlen;
 605                linenr += 2;
 606                return offset;
 607        }
 608        return -1;
 609}
 610
 611/*
 612 * Parse a unified diff. Note that this really needs
 613 * to parse each fragment separately, since the only
 614 * way to know the difference between a "---" that is
 615 * part of a patch, and a "---" that starts the next
 616 * patch is to look at the line counts..
 617 */
 618static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
 619{
 620        int added, deleted;
 621        int len = linelen(line, size), offset;
 622        unsigned long oldlines, newlines;
 623
 624        offset = parse_fragment_header(line, len, fragment);
 625        if (offset < 0)
 626                return -1;
 627        oldlines = fragment->oldlines;
 628        newlines = fragment->newlines;
 629
 630        if (patch->is_new < 0) {
 631                patch->is_new =  !oldlines;
 632                if (!oldlines)
 633                        patch->old_name = NULL;
 634        }
 635        if (patch->is_delete < 0) {
 636                patch->is_delete = !newlines;
 637                if (!newlines)
 638                        patch->new_name = NULL;
 639        }
 640
 641        if (patch->is_new != !oldlines)
 642                return error("new file depends on old contents");
 643        if (patch->is_delete != !newlines) {
 644                if (newlines)
 645                        return error("deleted file still has contents");
 646                fprintf(stderr, "** warning: file %s becomes empty but is not deleted\n", patch->new_name);
 647        }
 648
 649        /* Parse the thing.. */
 650        line += len;
 651        size -= len;
 652        linenr++;
 653        added = deleted = 0;
 654        for (offset = len; size > 0; offset += len, size -= len, line += len, linenr++) {
 655                if (!oldlines && !newlines)
 656                        break;
 657                len = linelen(line, size);
 658                if (!len || line[len-1] != '\n')
 659                        return -1;
 660                switch (*line) {
 661                default:
 662                        return -1;
 663                case ' ':
 664                        oldlines--;
 665                        newlines--;
 666                        break;
 667                case '-':
 668                        deleted++;
 669                        oldlines--;
 670                        break;
 671                case '+':
 672                        added++;
 673                        newlines--;
 674                        break;
 675                /* We allow "\ No newline at end of file" */
 676                case '\\':
 677                        if (len < 12 || memcmp(line, "\\ No newline", 12))
 678                                return -1;
 679                        break;
 680                }
 681        }
 682        /* If a fragment ends with an incomplete line, we failed to include
 683         * it in the above loop because we hit oldlines == newlines == 0
 684         * before seeing it.
 685         */
 686        if (12 < size && !memcmp(line, "\\ No newline", 12))
 687                offset += linelen(line, size);
 688
 689        patch->lines_added += added;
 690        patch->lines_deleted += deleted;
 691        return offset;
 692}
 693
 694static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
 695{
 696        unsigned long offset = 0;
 697        struct fragment **fragp = &patch->fragments;
 698
 699        while (size > 4 && !memcmp(line, "@@ -", 4)) {
 700                struct fragment *fragment;
 701                int len;
 702
 703                fragment = xmalloc(sizeof(*fragment));
 704                memset(fragment, 0, sizeof(*fragment));
 705                len = parse_fragment(line, size, patch, fragment);
 706                if (len <= 0)
 707                        die("corrupt patch at line %d", linenr);
 708
 709                fragment->patch = line;
 710                fragment->size = len;
 711
 712                *fragp = fragment;
 713                fragp = &fragment->next;
 714
 715                offset += len;
 716                line += len;
 717                size -= len;
 718        }
 719        return offset;
 720}
 721
 722static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
 723{
 724        int hdrsize, patchsize;
 725        int offset = find_header(buffer, size, &hdrsize, patch);
 726
 727        if (offset < 0)
 728                return offset;
 729
 730        patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
 731
 732        return offset + hdrsize + patchsize;
 733}
 734
 735static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
 736static const char minuses[]= "----------------------------------------------------------------------";
 737
 738static void show_stats(struct patch *patch)
 739{
 740        const char *prefix = "";
 741        char *name = patch->new_name;
 742        int len, max, add, del, total;
 743
 744        if (!name)
 745                name = patch->old_name;
 746
 747        /*
 748         * "scale" the filename
 749         */
 750        len = strlen(name);
 751        max = max_len;
 752        if (max > 50)
 753                max = 50;
 754        if (len > max) {
 755                char *slash;
 756                prefix = "...";
 757                max -= 3;
 758                name += len - max;
 759                slash = strchr(name, '/');
 760                if (slash)
 761                        name = slash;
 762        }
 763        len = max;
 764
 765        /*
 766         * scale the add/delete
 767         */
 768        max = max_change;
 769        if (max + len > 70)
 770                max = 70 - len;
 771
 772        add = patch->lines_added;
 773        del = patch->lines_deleted;
 774        total = add + del;
 775
 776        if (max_change > 0) {
 777                total = (total * max + max_change / 2) / max_change;
 778                add = (add * max + max_change / 2) / max_change;
 779                del = total - add;
 780        }
 781        printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
 782                len, name, patch->lines_added + patch->lines_deleted,
 783                add, pluses, del, minuses);
 784}
 785
 786static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
 787{
 788        int fd;
 789        unsigned long got;
 790
 791        switch (st->st_mode & S_IFMT) {
 792        case S_IFLNK:
 793                return readlink(path, buf, size);
 794        case S_IFREG:
 795                fd = open(path, O_RDONLY);
 796                if (fd < 0)
 797                        return error("unable to open %s", path);
 798                got = 0;
 799                for (;;) {
 800                        int ret = read(fd, buf + got, size - got);
 801                        if (ret < 0) {
 802                                if (errno == EAGAIN)
 803                                        continue;
 804                                break;
 805                        }
 806                        if (!ret)
 807                                break;
 808                        got += ret;
 809                }
 810                close(fd);
 811                return got;
 812
 813        default:
 814                return -1;
 815        }
 816}
 817
 818static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line)
 819{
 820        int i;
 821        unsigned long start, backwards, forwards;
 822
 823        if (fragsize > size)
 824                return -1;
 825
 826        start = 0;
 827        if (line > 1) {
 828                unsigned long offset = 0;
 829                i = line-1;
 830                while (offset + fragsize <= size) {
 831                        if (buf[offset++] == '\n') {
 832                                start = offset;
 833                                if (!--i)
 834                                        break;
 835                        }
 836                }
 837        }
 838
 839        /* Exact line number? */
 840        if (!memcmp(buf + start, fragment, fragsize))
 841                return start;
 842
 843        /*
 844         * There's probably some smart way to do this, but I'll leave
 845         * that to the smart and beautiful people. I'm simple and stupid.
 846         */
 847        backwards = start;
 848        forwards = start;
 849        for (i = 0; ; i++) {
 850                unsigned long try;
 851                int n;
 852
 853                /* "backward" */
 854                if (i & 1) {
 855                        if (!backwards) {
 856                                if (forwards + fragsize > size)
 857                                        break;
 858                                continue;
 859                        }
 860                        do {
 861                                --backwards;
 862                        } while (backwards && buf[backwards-1] != '\n');
 863                        try = backwards;
 864                } else {
 865                        while (forwards + fragsize <= size) {
 866                                if (buf[forwards++] == '\n')
 867                                        break;
 868                        }
 869                        try = forwards;
 870                }
 871
 872                if (try + fragsize > size)
 873                        continue;
 874                if (memcmp(buf + try, fragment, fragsize))
 875                        continue;
 876                n = (i >> 1)+1;
 877                if (i & 1)
 878                        n = -n;
 879                return try;
 880        }
 881
 882        /*
 883         * We should start searching forward and backward.
 884         */
 885        return -1;
 886}
 887
 888struct buffer_desc {
 889        char *buffer;
 890        unsigned long size;
 891        unsigned long alloc;
 892};
 893
 894static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
 895{
 896        char *buf = desc->buffer;
 897        const char *patch = frag->patch;
 898        int offset, size = frag->size;
 899        char *old = xmalloc(size);
 900        char *new = xmalloc(size);
 901        int oldsize = 0, newsize = 0;
 902
 903        while (size > 0) {
 904                int len = linelen(patch, size);
 905                int plen;
 906
 907                if (!len)
 908                        break;
 909
 910                /*
 911                 * "plen" is how much of the line we should use for
 912                 * the actual patch data. Normally we just remove the
 913                 * first character on the line, but if the line is
 914                 * followed by "\ No newline", then we also remove the
 915                 * last one (which is the newline, of course).
 916                 */
 917                plen = len-1;
 918                if (len < size && patch[len] == '\\')
 919                        plen--;
 920                switch (*patch) {
 921                case ' ':
 922                case '-':
 923                        memcpy(old + oldsize, patch + 1, plen);
 924                        oldsize += plen;
 925                        if (*patch == '-')
 926                                break;
 927                /* Fall-through for ' ' */
 928                case '+':
 929                        memcpy(new + newsize, patch + 1, plen);
 930                        newsize += plen;
 931                        break;
 932                case '@': case '\\':
 933                        /* Ignore it, we already handled it */
 934                        break;
 935                default:
 936                        return -1;
 937                }
 938                patch += len;
 939                size -= len;
 940        }
 941
 942        offset = find_offset(buf, desc->size, old, oldsize, frag->newpos);
 943        if (offset >= 0) {
 944                int diff = newsize - oldsize;
 945                unsigned long size = desc->size + diff;
 946                unsigned long alloc = desc->alloc;
 947
 948                if (size > alloc) {
 949                        alloc = size + 8192;
 950                        desc->alloc = alloc;
 951                        buf = xrealloc(buf, alloc);
 952                        desc->buffer = buf;
 953                }
 954                desc->size = size;
 955                memmove(buf + offset + newsize, buf + offset + oldsize, size - offset - newsize);
 956                memcpy(buf + offset, new, newsize);
 957                offset = 0;
 958        }
 959
 960        free(old);
 961        free(new);
 962        return offset;
 963}
 964
 965static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
 966{
 967        struct fragment *frag = patch->fragments;
 968
 969        while (frag) {
 970                if (apply_one_fragment(desc, frag) < 0)
 971                        return error("patch failed: %s:%ld", patch->old_name, frag->oldpos);
 972                frag = frag->next;
 973        }
 974        return 0;
 975}
 976
 977static int apply_data(struct patch *patch, struct stat *st)
 978{
 979        char *buf;
 980        unsigned long size, alloc;
 981        struct buffer_desc desc;
 982
 983        size = 0;
 984        alloc = 0;
 985        buf = NULL;
 986        if (patch->old_name) {
 987                size = st->st_size;
 988                alloc = size + 8192;
 989                buf = xmalloc(alloc);
 990                if (read_old_data(st, patch->old_name, buf, alloc) != size)
 991                        return error("read of %s failed", patch->old_name);
 992        }
 993
 994        desc.size = size;
 995        desc.alloc = alloc;
 996        desc.buffer = buf;
 997        if (apply_fragments(&desc, patch) < 0)
 998                return -1;
 999        patch->result = desc.buffer;
1000        patch->resultsize = desc.size;
1001
1002        if (patch->is_delete && patch->resultsize)
1003                return error("removal patch leaves file contents");
1004
1005        return 0;
1006}
1007
1008static int check_patch(struct patch *patch)
1009{
1010        struct stat st;
1011        const char *old_name = patch->old_name;
1012        const char *new_name = patch->new_name;
1013
1014        if (old_name) {
1015                int changed;
1016
1017                if (lstat(old_name, &st) < 0)
1018                        return error("%s: %s", old_name, strerror(errno));
1019                if (check_index) {
1020                        int pos = cache_name_pos(old_name, strlen(old_name));
1021                        if (pos < 0)
1022                                return error("%s: does not exist in index", old_name);
1023                        changed = ce_match_stat(active_cache[pos], &st);
1024                        if (changed)
1025                                return error("%s: does not match index", old_name);
1026                }
1027                if (patch->is_new < 0)
1028                        patch->is_new = 0;
1029                st.st_mode = ntohl(create_ce_mode(st.st_mode));
1030                if (!patch->old_mode)
1031                        patch->old_mode = st.st_mode;
1032                if ((st.st_mode ^ patch->old_mode) & S_IFMT)
1033                        return error("%s: wrong type", old_name);
1034                if (st.st_mode != patch->old_mode)
1035                        fprintf(stderr, "warning: %s has type %o, expected %o\n",
1036                                old_name, st.st_mode, patch->old_mode);
1037        }
1038
1039        if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
1040                if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0)
1041                        return error("%s: already exists in index", new_name);
1042                if (!lstat(new_name, &st))
1043                        return error("%s: already exists in working directory", new_name);
1044                if (errno != ENOENT)
1045                        return error("%s: %s", new_name, strerror(errno));
1046                if (!patch->new_mode) {
1047                        if (patch->is_new)
1048                                patch->new_mode = S_IFREG | 0644;
1049                        else
1050                                patch->new_mode = patch->old_mode;
1051                }
1052        }
1053
1054        if (new_name && old_name) {
1055                int same = !strcmp(old_name, new_name);
1056                if (!patch->new_mode)
1057                        patch->new_mode = patch->old_mode;
1058                if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
1059                        return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1060                                patch->new_mode, new_name, patch->old_mode,
1061                                same ? "" : " of ", same ? "" : old_name);
1062        }       
1063
1064        if (apply_data(patch, &st) < 0)
1065                return error("%s: patch does not apply", old_name);
1066        return 0;
1067}
1068
1069static int check_patch_list(struct patch *patch)
1070{
1071        int error = 0;
1072
1073        for (;patch ; patch = patch->next)
1074                error |= check_patch(patch);
1075        return error;
1076}
1077
1078static void show_file(int c, unsigned int mode, const char *name)
1079{
1080        printf("%c %o %s\n", c, mode, name);
1081}
1082
1083static void show_file_list(struct patch *patch)
1084{
1085        for (;patch ; patch = patch->next) {
1086                if (patch->is_rename) {
1087                        show_file('-', patch->old_mode, patch->old_name);
1088                        show_file('+', patch->new_mode, patch->new_name);
1089                        continue;
1090                }
1091                if (patch->is_copy || patch->is_new) {
1092                        show_file('+', patch->new_mode, patch->new_name);
1093                        continue;
1094                }
1095                if (patch->is_delete) {
1096                        show_file('-', patch->old_mode, patch->old_name);
1097                        continue;
1098                }
1099                if (patch->old_mode && patch->new_mode && patch->old_mode != patch->new_mode) {
1100                        printf("M %o:%o %s\n", patch->old_mode, patch->new_mode, patch->old_name);
1101                        continue;
1102                }
1103                printf("M %o %s\n", patch->old_mode, patch->old_name);
1104        }
1105}
1106
1107static void stat_patch_list(struct patch *patch)
1108{
1109        int files, adds, dels;
1110
1111        for (files = adds = dels = 0 ; patch ; patch = patch->next) {
1112                files++;
1113                adds += patch->lines_added;
1114                dels += patch->lines_deleted;
1115                show_stats(patch);
1116        }
1117
1118        printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
1119}
1120
1121static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
1122{
1123        if (mode)
1124                printf(" %s mode %06o %s\n", newdelete, mode, name);
1125        else
1126                printf(" %s %s\n", newdelete, name);
1127}
1128
1129static void show_mode_change(struct patch *p, int show_name)
1130{
1131        if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
1132                if (show_name)
1133                        printf(" mode change %06o => %06o %s\n",
1134                               p->old_mode, p->new_mode, p->new_name);
1135                else
1136                        printf(" mode change %06o => %06o\n",
1137                               p->old_mode, p->new_mode);
1138        }
1139}
1140
1141static void show_rename_copy(struct patch *p)
1142{
1143        const char *renamecopy = p->is_rename ? "rename" : "copy";
1144        const char *old, *new;
1145
1146        /* Find common prefix */
1147        old = p->old_name;
1148        new = p->new_name;
1149        while (1) {
1150                const char *slash_old, *slash_new;
1151                slash_old = strchr(old, '/');
1152                slash_new = strchr(new, '/');
1153                if (!slash_old ||
1154                    !slash_new ||
1155                    slash_old - old != slash_new - new ||
1156                    memcmp(old, new, slash_new - new))
1157                        break;
1158                old = slash_old + 1;
1159                new = slash_new + 1;
1160        }
1161        /* p->old_name thru old is the common prefix, and old and new
1162         * through the end of names are renames
1163         */
1164        if (old != p->old_name)
1165                printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
1166                       (int)(old - p->old_name), p->old_name,
1167                       old, new, p->score);
1168        else
1169                printf(" %s %s => %s (%d%%)\n", renamecopy,
1170                       p->old_name, p->new_name, p->score);
1171        show_mode_change(p, 0);
1172}
1173
1174static void summary_patch_list(struct patch *patch)
1175{
1176        struct patch *p;
1177
1178        for (p = patch; p; p = p->next) {
1179                if (p->is_new)
1180                        show_file_mode_name("create", p->new_mode, p->new_name);
1181                else if (p->is_delete)
1182                        show_file_mode_name("delete", p->old_mode, p->old_name);
1183                else {
1184                        if (p->is_rename || p->is_copy)
1185                                show_rename_copy(p);
1186                        else {
1187                                if (p->score) {
1188                                        printf(" rewrite %s (%d%%)\n",
1189                                               p->new_name, p->score);
1190                                        show_mode_change(p, 0);
1191                                }
1192                                else
1193                                        show_mode_change(p, 1);
1194                        }
1195                }
1196        }
1197}
1198
1199static void patch_stats(struct patch *patch)
1200{
1201        int lines = patch->lines_added + patch->lines_deleted;
1202
1203        if (lines > max_change)
1204                max_change = lines;
1205        if (patch->old_name) {
1206                int len = strlen(patch->old_name);
1207                if (len > max_len)
1208                        max_len = len;
1209        }
1210        if (patch->new_name) {
1211                int len = strlen(patch->new_name);
1212                if (len > max_len)
1213                        max_len = len;
1214        }
1215}
1216
1217static void remove_file(struct patch *patch)
1218{
1219        if (write_index) {
1220                if (remove_file_from_cache(patch->old_name) < 0)
1221                        die("unable to remove %s from index", patch->old_name);
1222        }
1223        unlink(patch->old_name);
1224}
1225
1226static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
1227{
1228        struct stat st;
1229        struct cache_entry *ce;
1230        int namelen = strlen(path);
1231        unsigned ce_size = cache_entry_size(namelen);
1232
1233        if (!write_index)
1234                return;
1235
1236        ce = xmalloc(ce_size);
1237        memset(ce, 0, ce_size);
1238        memcpy(ce->name, path, namelen);
1239        ce->ce_mode = create_ce_mode(mode);
1240        ce->ce_flags = htons(namelen);
1241        if (lstat(path, &st) < 0)
1242                die("unable to stat newly created file %s", path);
1243        fill_stat_cache_info(ce, &st);
1244        if (write_sha1_file(buf, size, "blob", ce->sha1) < 0)
1245                die("unable to create backing store for newly created file %s", path);
1246        if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
1247                die("unable to add cache entry for %s", path);
1248}
1249
1250static void create_subdirectories(const char *path)
1251{
1252        int len = strlen(path);
1253        char *buf = xmalloc(len + 1);
1254        const char *slash = path;
1255
1256        while ((slash = strchr(slash+1, '/')) != NULL) {
1257                len = slash - path;
1258                memcpy(buf, path, len);
1259                buf[len] = 0;
1260                if (mkdir(buf, 0777) < 0) {
1261                        if (errno != EEXIST)
1262                                break;
1263                }
1264        }
1265        free(buf);
1266}
1267
1268static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
1269{
1270        int fd;
1271
1272        if (S_ISLNK(mode))
1273                return symlink(buf, path);
1274        fd = open(path, O_CREAT | O_EXCL | O_WRONLY | O_TRUNC, (mode & 0100) ? 0777 : 0666);
1275        if (fd < 0)
1276                return -1;
1277        while (size) {
1278                int written = write(fd, buf, size);
1279                if (written < 0) {
1280                        if (errno == EINTR || errno == EAGAIN)
1281                                continue;
1282                        die("writing file %s: %s", path, strerror(errno));
1283                }
1284                if (!written)
1285                        die("out of space writing file %s", path);
1286                buf += written;
1287                size -= written;
1288        }
1289        if (close(fd) < 0)
1290                die("closing file %s: %s", path, strerror(errno));
1291        return 0;
1292}
1293
1294/*
1295 * We optimistically assume that the directories exist,
1296 * which is true 99% of the time anyway. If they don't,
1297 * we create them and try again.
1298 */
1299static void create_one_file(const char *path, unsigned mode, const char *buf, unsigned long size)
1300{
1301        if (!try_create_file(path, mode, buf, size))
1302                return;
1303
1304        if (errno == ENOENT) {
1305                create_subdirectories(path);
1306                if (!try_create_file(path, mode, buf, size))
1307                        return;
1308        }
1309
1310        if (errno == EEXIST) {
1311                unsigned int nr = getpid();
1312
1313                for (;;) {
1314                        const char *newpath;
1315                        newpath = mkpath("%s~%u", path, nr);
1316                        if (!try_create_file(newpath, mode, buf, size)) {
1317                                if (!rename(newpath, path))
1318                                        return;
1319                                unlink(newpath);
1320                                break;
1321                        }
1322                        if (errno != EEXIST)
1323                                break;
1324                }                       
1325        }
1326        die("unable to write file %s mode %o", path, mode);
1327}
1328
1329static void create_file(struct patch *patch)
1330{
1331        const char *path = patch->new_name;
1332        unsigned mode = patch->new_mode;
1333        unsigned long size = patch->resultsize;
1334        char *buf = patch->result;
1335
1336        if (!mode)
1337                mode = S_IFREG | 0644;
1338        create_one_file(path, mode, buf, size); 
1339        add_index_file(path, mode, buf, size);
1340}
1341
1342static void write_out_one_result(struct patch *patch)
1343{
1344        if (patch->is_delete > 0) {
1345                remove_file(patch);
1346                return;
1347        }
1348        if (patch->is_new > 0 || patch->is_copy) {
1349                create_file(patch);
1350                return;
1351        }
1352        /*
1353         * Rename or modification boils down to the same
1354         * thing: remove the old, write the new
1355         */
1356        remove_file(patch);
1357        create_file(patch);
1358}
1359
1360static void write_out_results(struct patch *list, int skipped_patch)
1361{
1362        if (!list && !skipped_patch)
1363                die("No changes");
1364
1365        while (list) {
1366                write_out_one_result(list);
1367                list = list->next;
1368        }
1369}
1370
1371static struct cache_file cache_file;
1372
1373static struct excludes {
1374        struct excludes *next;
1375        const char *path;
1376} *excludes;
1377
1378static int use_patch(struct patch *p)
1379{
1380        const char *pathname = p->new_name ? p->new_name : p->old_name;
1381        struct excludes *x = excludes;
1382        while (x) {
1383                if (fnmatch(x->path, pathname, 0) == 0)
1384                        return 0;
1385                x = x->next;
1386        }
1387        return 1;
1388}
1389
1390static int apply_patch(int fd)
1391{
1392        int newfd;
1393        unsigned long offset, size;
1394        char *buffer = read_patch_file(fd, &size);
1395        struct patch *list = NULL, **listp = &list;
1396        int skipped_patch = 0;
1397
1398        if (!buffer)
1399                return -1;
1400        offset = 0;
1401        while (size > 0) {
1402                struct patch *patch;
1403                int nr;
1404
1405                patch = xmalloc(sizeof(*patch));
1406                memset(patch, 0, sizeof(*patch));
1407                nr = parse_chunk(buffer + offset, size, patch);
1408                if (nr < 0)
1409                        break;
1410                if (use_patch(patch)) {
1411                        patch_stats(patch);
1412                        *listp = patch;
1413                        listp = &patch->next;
1414                } else {
1415                        /* perhaps free it a bit better? */
1416                        free(patch);
1417                        skipped_patch++;
1418                }
1419                offset += nr;
1420                size -= nr;
1421        }
1422
1423        newfd = -1;
1424        write_index = check_index && apply;
1425        if (write_index)
1426                newfd = hold_index_file_for_update(&cache_file, get_index_file());
1427        if (check_index) {
1428                if (read_cache() < 0)
1429                        die("unable to read index file");
1430        }
1431
1432        if ((check || apply) && check_patch_list(list) < 0)
1433                exit(1);
1434
1435        if (apply)
1436                write_out_results(list, skipped_patch);
1437
1438        if (write_index) {
1439                if (write_cache(newfd, active_cache, active_nr) ||
1440                    commit_index_file(&cache_file))
1441                        die("Unable to write new cachefile");
1442        }
1443
1444        if (show_files)
1445                show_file_list(list);
1446
1447        if (diffstat)
1448                stat_patch_list(list);
1449
1450        if (summary)
1451                summary_patch_list(list);
1452
1453        free(buffer);
1454        return 0;
1455}
1456
1457int main(int argc, char **argv)
1458{
1459        int i;
1460        int read_stdin = 1;
1461
1462        for (i = 1; i < argc; i++) {
1463                const char *arg = argv[i];
1464                int fd;
1465
1466                if (!strcmp(arg, "-")) {
1467                        apply_patch(0);
1468                        read_stdin = 0;
1469                        continue;
1470                }
1471                if (!strncmp(arg, "--exclude=", 10)) {
1472                        struct excludes *x = xmalloc(sizeof(*x));
1473                        x->path = arg + 10;
1474                        x->next = excludes;
1475                        excludes = x;
1476                        continue;
1477                }
1478                /* NEEDSWORK: this does not do anything at this moment. */
1479                if (!strcmp(arg, "--no-merge")) {
1480                        merge_patch = 0;
1481                        continue;
1482                }
1483                if (!strcmp(arg, "--stat")) {
1484                        apply = 0;
1485                        diffstat = 1;
1486                        continue;
1487                }
1488                if (!strcmp(arg, "--summary")) {
1489                        apply = 0;
1490                        summary = 1;
1491                        continue;
1492                }
1493                if (!strcmp(arg, "--check")) {
1494                        apply = 0;
1495                        check = 1;
1496                        continue;
1497                }
1498                if (!strcmp(arg, "--index")) {
1499                        check_index = 1;
1500                        continue;
1501                }
1502                if (!strcmp(arg, "--apply")) {
1503                        apply = 1;
1504                        continue;
1505                }
1506                if (!strcmp(arg, "--show-files")) {
1507                        show_files = 1;
1508                        continue;
1509                }
1510                fd = open(arg, O_RDONLY);
1511                if (fd < 0)
1512                        usage(apply_usage);
1513                read_stdin = 0;
1514                apply_patch(fd);
1515                close(fd);
1516        }
1517        if (read_stdin)
1518                apply_patch(0);
1519        return 0;
1520}