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