builtin-apply.c

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