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