Code

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