Use fstat instead of fseek
[git/mingw.git] / builtin-apply.c
blobb47ccacc2e0618476ca4816e111a97b2c46f0f4f
1 /*
2 * apply.c
4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
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"
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.
26 static const char *prefix;
27 static int prefix_length = -1;
28 static int newfd = -1;
30 static int p_value = 1;
31 static int allow_binary_replacement;
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 = -1;
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)
63 if (!option) {
64 new_whitespace = warn_on_whitespace;
65 return;
67 if (!strcmp(option, "warn")) {
68 new_whitespace = warn_on_whitespace;
69 return;
71 if (!strcmp(option, "nowarn")) {
72 new_whitespace = nowarn_whitespace;
73 return;
75 if (!strcmp(option, "error")) {
76 new_whitespace = error_on_whitespace;
77 return;
79 if (!strcmp(option, "error-all")) {
80 new_whitespace = error_on_whitespace;
81 squelch_whitespace_errors = 0;
82 return;
84 if (!strcmp(option, "strip")) {
85 new_whitespace = strip_whitespace;
86 return;
88 die("unrecognized whitespace option '%s'", option);
91 static void set_default_whitespace_mode(const char *whitespace_option)
93 if (!whitespace_option && !apply_default_whitespace) {
94 new_whitespace = (apply
95 ? warn_on_whitespace
96 : nowarn_whitespace);
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.
105 static int max_change, max_len;
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".
112 static int linenr = 1;
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.
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;
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".
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_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;
157 static void say_patch_name(FILE *output, const char *pre, struct patch *patch, const char *post)
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);
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);
172 fputs(post, output);
175 #define CHUNKSIZE (8192)
176 #define SLOP (16)
178 static void *read_patch_file(int fd, unsigned long *sizep)
180 unsigned long size = 0, alloc = CHUNKSIZE;
181 void *buffer = xmalloc(alloc);
183 for (;;) {
184 int nr = alloc - size;
185 if (nr < 1024) {
186 alloc += CHUNKSIZE;
187 buffer = xrealloc(buffer, alloc);
188 nr = alloc - size;
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;
197 *sizep = size;
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.
204 if (alloc < size + SLOP)
205 buffer = xrealloc(buffer, size + SLOP);
206 memset((char *) buffer + size, 0, SLOP);
207 return buffer;
210 static unsigned long linelen(const char *buffer, unsigned long size)
212 unsigned long len = 0;
213 while (size--) {
214 len++;
215 if (*buffer++ == '\n')
216 break;
218 return len;
221 static int is_dev_null(const char *str)
223 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
226 #define TERM_SPACE 1
227 #define TERM_TAB 2
229 static int name_terminate(const char *name, int namelen, int c, int terminate)
231 if (c == ' ' && !(terminate & TERM_SPACE))
232 return 0;
233 if (c == '\t' && !(terminate & TERM_TAB))
234 return 0;
236 return 1;
239 static char * find_name(const char *line, char *def, int p_value, int terminate)
241 int len;
242 const char *start = line;
243 char *name;
245 if (*line == '"') {
246 /* Proposed "new-style" GNU patch/diff format; see
247 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
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--;
259 if (cp) {
260 /* name can later be freed, so we need
261 * to memmove, not just return cp
263 memmove(name, cp, strlen(cp) + 1);
264 free(def);
265 return name;
267 else {
268 free(name);
269 name = NULL;
274 for (;;) {
275 char c = *line;
277 if (isspace(c)) {
278 if (c == '\n')
279 break;
280 if (name_terminate(start, line-start, c, terminate))
281 break;
283 line++;
284 if (c == '/' && !--p_value)
285 start = line;
287 if (!start)
288 return def;
289 len = line - start;
290 if (!len)
291 return def;
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~").
299 if (def) {
300 int deflen = strlen(def);
301 if (deflen < len && !strncmp(start, def, deflen))
302 return def;
305 name = xmalloc(len + 1);
306 memcpy(name, start, len);
307 name[len] = 0;
308 free(def);
309 return name;
313 * Get the name etc info from the --/+++ lines of a traditional patch header
315 * NOTE! This hardcodes "-p1" behaviour in filename detection.
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.
321 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
323 char *name;
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;
342 if (!name)
343 die("unable to find filename in patch at line %d", linenr);
346 static int gitdiff_hdrend(const char *line, struct patch *patch)
348 return -1;
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.
356 * As a result, gitdiff_{old|new}name() will check
357 * their names against any previous information, just
358 * to make sure..
360 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
362 if (!orig_name && !isnull)
363 return find_name(line, NULL, 1, 0);
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;
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;
387 static int gitdiff_oldname(const char *line, struct patch *patch)
389 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
390 return 0;
393 static int gitdiff_newname(const char *line, struct patch *patch)
395 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
396 return 0;
399 static int gitdiff_oldmode(const char *line, struct patch *patch)
401 patch->old_mode = strtoul(line, NULL, 8);
402 return 0;
405 static int gitdiff_newmode(const char *line, struct patch *patch)
407 patch->new_mode = strtoul(line, NULL, 8);
408 return 0;
411 static int gitdiff_delete(const char *line, struct patch *patch)
413 patch->is_delete = 1;
414 patch->old_name = patch->def_name;
415 return gitdiff_oldmode(line, patch);
418 static int gitdiff_newfile(const char *line, struct patch *patch)
420 patch->is_new = 1;
421 patch->new_name = patch->def_name;
422 return gitdiff_newmode(line, patch);
425 static int gitdiff_copysrc(const char *line, struct patch *patch)
427 patch->is_copy = 1;
428 patch->old_name = find_name(line, NULL, 0, 0);
429 return 0;
432 static int gitdiff_copydst(const char *line, struct patch *patch)
434 patch->is_copy = 1;
435 patch->new_name = find_name(line, NULL, 0, 0);
436 return 0;
439 static int gitdiff_renamesrc(const char *line, struct patch *patch)
441 patch->is_rename = 1;
442 patch->old_name = find_name(line, NULL, 0, 0);
443 return 0;
446 static int gitdiff_renamedst(const char *line, struct patch *patch)
448 patch->is_rename = 1;
449 patch->new_name = find_name(line, NULL, 0, 0);
450 return 0;
453 static int gitdiff_similarity(const char *line, struct patch *patch)
455 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
456 patch->score = 0;
457 return 0;
460 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
462 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
463 patch->score = 0;
464 return 0;
467 static int gitdiff_index(const char *line, struct patch *patch)
469 /* index line is N hexadecimal, "..", N hexadecimal,
470 * and optional space with octal mode.
472 const char *ptr, *eol;
473 int len;
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;
482 line = ptr + 2;
483 ptr = strchr(line, ' ');
484 eol = strchr(line, '\n');
486 if (!ptr || eol < ptr)
487 ptr = eol;
488 len = ptr - line;
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;
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.
503 static int gitdiff_unrecognized(const char *line, struct patch *patch)
505 return -1;
508 static const char *stop_at_slash(const char *line, int llen)
510 int i;
512 for (i = 0; i < llen; i++) {
513 int ch = line[i];
514 if (ch == '/')
515 return line + i;
517 return NULL;
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.
527 static char *git_header_name(char *line, int llen)
529 int len;
530 const char *name;
531 const char *second = NULL;
533 line += strlen("diff --git ");
534 llen -= strlen("diff --git ");
536 if (*line == '"') {
537 const char *cp;
538 char *first = unquote_c_style(line, &second);
539 if (!first)
540 return NULL;
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;
550 len = strlen(cp+1);
551 memmove(first, cp+1, len+1); /* including NUL */
553 /* second points at one past closing dq of name.
554 * find the second name.
556 while ((second < line + llen) && isspace(*second))
557 second++;
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;
571 /* They must match, otherwise ignore */
572 if (strcmp(cp+1, first))
573 goto free_both_and_fail;
574 free(sp);
575 return first;
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;
589 /* unquoted first name */
590 name = stop_at_slash(line, llen);
591 if (!name || name == line)
592 return NULL;
594 name++;
596 /* since the first name is unquoted, a dq if exists must be
597 * the beginning of the second name.
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);
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;
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;
622 goto free_second_and_fail;
627 * Accept a name only if it shows up twice, exactly the same
628 * form.
630 for (len = 0 ; ; len++) {
631 switch (name[len]) {
632 default:
633 continue;
634 case '\n':
635 return NULL;
636 case '\t': case ' ':
637 second = name+len;
638 for (;;) {
639 char c = *second++;
640 if (c == '\n')
641 return NULL;
642 if (c == '/')
643 break;
645 if (second[len] == '\n' && !memcmp(name, second, len)) {
646 char *ret = xmalloc(len + 1);
647 memcpy(ret, name, len);
648 ret[len] = 0;
649 return ret;
653 return NULL;
656 /* Verify that we recognize the lines following a git header */
657 static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
659 unsigned long offset;
661 /* A git diff has explicit new/delete information, so we don't guess */
662 patch->is_new = 0;
663 patch->is_delete = 0;
666 * Some things may not have the old name in the
667 * rest of the headers anywhere (pure mode changes,
668 * or removing or adding empty files), so we get
669 * the default name from the header.
671 patch->def_name = git_header_name(line, len);
673 line += len;
674 size -= len;
675 linenr++;
676 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
677 static const struct opentry {
678 const char *str;
679 int (*fn)(const char *, struct patch *);
680 } optable[] = {
681 { "@@ -", gitdiff_hdrend },
682 { "--- ", gitdiff_oldname },
683 { "+++ ", gitdiff_newname },
684 { "old mode ", gitdiff_oldmode },
685 { "new mode ", gitdiff_newmode },
686 { "deleted file mode ", gitdiff_delete },
687 { "new file mode ", gitdiff_newfile },
688 { "copy from ", gitdiff_copysrc },
689 { "copy to ", gitdiff_copydst },
690 { "rename old ", gitdiff_renamesrc },
691 { "rename new ", gitdiff_renamedst },
692 { "rename from ", gitdiff_renamesrc },
693 { "rename to ", gitdiff_renamedst },
694 { "similarity index ", gitdiff_similarity },
695 { "dissimilarity index ", gitdiff_dissimilarity },
696 { "index ", gitdiff_index },
697 { "", gitdiff_unrecognized },
699 int i;
701 len = linelen(line, size);
702 if (!len || line[len-1] != '\n')
703 break;
704 for (i = 0; i < ARRAY_SIZE(optable); i++) {
705 const struct opentry *p = optable + i;
706 int oplen = strlen(p->str);
707 if (len < oplen || memcmp(p->str, line, oplen))
708 continue;
709 if (p->fn(line + oplen, patch) < 0)
710 return offset;
711 break;
715 return offset;
718 static int parse_num(const char *line, unsigned long *p)
720 char *ptr;
722 if (!isdigit(*line))
723 return 0;
724 *p = strtoul(line, &ptr, 10);
725 return ptr - line;
728 static int parse_range(const char *line, int len, int offset, const char *expect,
729 unsigned long *p1, unsigned long *p2)
731 int digits, ex;
733 if (offset < 0 || offset >= len)
734 return -1;
735 line += offset;
736 len -= offset;
738 digits = parse_num(line, p1);
739 if (!digits)
740 return -1;
742 offset += digits;
743 line += digits;
744 len -= digits;
746 *p2 = 1;
747 if (*line == ',') {
748 digits = parse_num(line+1, p2);
749 if (!digits)
750 return -1;
752 offset += digits+1;
753 line += digits+1;
754 len -= digits+1;
757 ex = strlen(expect);
758 if (ex > len)
759 return -1;
760 if (memcmp(line, expect, ex))
761 return -1;
763 return offset + ex;
767 * Parse a unified diff fragment header of the
768 * form "@@ -a,b +c,d @@"
770 static int parse_fragment_header(char *line, int len, struct fragment *fragment)
772 int offset;
774 if (!len || line[len-1] != '\n')
775 return -1;
777 /* Figure out the number of lines in a fragment */
778 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
779 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
781 return offset;
784 static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
786 unsigned long offset, len;
788 patch->is_rename = patch->is_copy = 0;
789 patch->is_new = patch->is_delete = -1;
790 patch->old_mode = patch->new_mode = 0;
791 patch->old_name = patch->new_name = NULL;
792 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
793 unsigned long nextlen;
795 len = linelen(line, size);
796 if (!len)
797 break;
799 /* Testing this early allows us to take a few shortcuts.. */
800 if (len < 6)
801 continue;
804 * Make sure we don't find any unconnected patch fragments.
805 * That's a sign that we didn't find a header, and that a
806 * patch has become corrupted/broken up.
808 if (!memcmp("@@ -", line, 4)) {
809 struct fragment dummy;
810 if (parse_fragment_header(line, len, &dummy) < 0)
811 continue;
812 error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
815 if (size < len + 6)
816 break;
819 * Git patch? It might not have a real patch, just a rename
820 * or mode change, so we handle that specially
822 if (!memcmp("diff --git ", line, 11)) {
823 int git_hdr_len = parse_git_header(line, len, size, patch);
824 if (git_hdr_len <= len)
825 continue;
826 if (!patch->old_name && !patch->new_name) {
827 if (!patch->def_name)
828 die("git diff header lacks filename information (line %d)", linenr);
829 patch->old_name = patch->new_name = patch->def_name;
831 *hdrsize = git_hdr_len;
832 return offset;
835 /** --- followed by +++ ? */
836 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
837 continue;
840 * We only accept unified patches, so we want it to
841 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
842 * minimum
844 nextlen = linelen(line + len, size - len);
845 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
846 continue;
848 /* Ok, we'll consider it a patch */
849 parse_traditional_patch(line, line+len, patch);
850 *hdrsize = len + nextlen;
851 linenr += 2;
852 return offset;
854 return -1;
858 * Parse a unified diff. Note that this really needs
859 * to parse each fragment separately, since the only
860 * way to know the difference between a "---" that is
861 * part of a patch, and a "---" that starts the next
862 * patch is to look at the line counts..
864 static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
866 int added, deleted;
867 int len = linelen(line, size), offset;
868 unsigned long oldlines, newlines;
869 unsigned long leading, trailing;
871 offset = parse_fragment_header(line, len, fragment);
872 if (offset < 0)
873 return -1;
874 oldlines = fragment->oldlines;
875 newlines = fragment->newlines;
876 leading = 0;
877 trailing = 0;
879 if (patch->is_new < 0) {
880 patch->is_new = !oldlines;
881 if (!oldlines)
882 patch->old_name = NULL;
884 if (patch->is_delete < 0) {
885 patch->is_delete = !newlines;
886 if (!newlines)
887 patch->new_name = NULL;
890 if (patch->is_new && oldlines)
891 return error("new file depends on old contents");
892 if (patch->is_delete != !newlines) {
893 if (newlines)
894 return error("deleted file still has contents");
895 fprintf(stderr, "** warning: file %s becomes empty but is not deleted\n", patch->new_name);
898 /* Parse the thing.. */
899 line += len;
900 size -= len;
901 linenr++;
902 added = deleted = 0;
903 for (offset = len; size > 0; offset += len, size -= len, line += len, linenr++) {
904 if (!oldlines && !newlines)
905 break;
906 len = linelen(line, size);
907 if (!len || line[len-1] != '\n')
908 return -1;
909 switch (*line) {
910 default:
911 return -1;
912 case ' ':
913 oldlines--;
914 newlines--;
915 if (!deleted && !added)
916 leading++;
917 trailing++;
918 break;
919 case '-':
920 deleted++;
921 oldlines--;
922 trailing = 0;
923 break;
924 case '+':
926 * We know len is at least two, since we have a '+' and
927 * we checked that the last character was a '\n' above.
928 * That is, an addition of an empty line would check
929 * the '+' here. Sneaky...
931 if ((new_whitespace != nowarn_whitespace) &&
932 isspace(line[len-2])) {
933 whitespace_error++;
934 if (squelch_whitespace_errors &&
935 squelch_whitespace_errors <
936 whitespace_error)
938 else {
939 fprintf(stderr, "Adds trailing whitespace.\n%s:%d:%.*s\n",
940 patch_input_file,
941 linenr, len-2, line+1);
944 added++;
945 newlines--;
946 trailing = 0;
947 break;
949 /* We allow "\ No newline at end of file". Depending
950 * on locale settings when the patch was produced we
951 * don't know what this line looks like. The only
952 * thing we do know is that it begins with "\ ".
953 * Checking for 12 is just for sanity check -- any
954 * l10n of "\ No newline..." is at least that long.
956 case '\\':
957 if (len < 12 || memcmp(line, "\\ ", 2))
958 return -1;
959 break;
962 if (oldlines || newlines)
963 return -1;
964 fragment->leading = leading;
965 fragment->trailing = trailing;
967 /* If a fragment ends with an incomplete line, we failed to include
968 * it in the above loop because we hit oldlines == newlines == 0
969 * before seeing it.
971 if (12 < size && !memcmp(line, "\\ ", 2))
972 offset += linelen(line, size);
974 patch->lines_added += added;
975 patch->lines_deleted += deleted;
976 return offset;
979 static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
981 unsigned long offset = 0;
982 struct fragment **fragp = &patch->fragments;
984 while (size > 4 && !memcmp(line, "@@ -", 4)) {
985 struct fragment *fragment;
986 int len;
988 fragment = xcalloc(1, sizeof(*fragment));
989 len = parse_fragment(line, size, patch, fragment);
990 if (len <= 0)
991 die("corrupt patch at line %d", linenr);
993 fragment->patch = line;
994 fragment->size = len;
996 *fragp = fragment;
997 fragp = &fragment->next;
999 offset += len;
1000 line += len;
1001 size -= len;
1003 return offset;
1006 static inline int metadata_changes(struct patch *patch)
1008 return patch->is_rename > 0 ||
1009 patch->is_copy > 0 ||
1010 patch->is_new > 0 ||
1011 patch->is_delete ||
1012 (patch->old_mode && patch->new_mode &&
1013 patch->old_mode != patch->new_mode);
1016 static char *inflate_it(const void *data, unsigned long size,
1017 unsigned long inflated_size)
1019 z_stream stream;
1020 void *out;
1021 int st;
1023 memset(&stream, 0, sizeof(stream));
1025 stream.next_in = (unsigned char *)data;
1026 stream.avail_in = size;
1027 stream.next_out = out = xmalloc(inflated_size);
1028 stream.avail_out = inflated_size;
1029 inflateInit(&stream);
1030 st = inflate(&stream, Z_FINISH);
1031 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1032 free(out);
1033 return NULL;
1035 return out;
1038 static struct fragment *parse_binary_hunk(char **buf_p,
1039 unsigned long *sz_p,
1040 int *status_p,
1041 int *used_p)
1043 /* Expect a line that begins with binary patch method ("literal"
1044 * or "delta"), followed by the length of data before deflating.
1045 * a sequence of 'length-byte' followed by base-85 encoded data
1046 * should follow, terminated by a newline.
1048 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1049 * and we would limit the patch line to 66 characters,
1050 * so one line can fit up to 13 groups that would decode
1051 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1052 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1054 int llen, used;
1055 unsigned long size = *sz_p;
1056 char *buffer = *buf_p;
1057 int patch_method;
1058 unsigned long origlen;
1059 char *data = NULL;
1060 int hunk_size = 0;
1061 struct fragment *frag;
1063 llen = linelen(buffer, size);
1064 used = llen;
1066 *status_p = 0;
1068 if (!strncmp(buffer, "delta ", 6)) {
1069 patch_method = BINARY_DELTA_DEFLATED;
1070 origlen = strtoul(buffer + 6, NULL, 10);
1072 else if (!strncmp(buffer, "literal ", 8)) {
1073 patch_method = BINARY_LITERAL_DEFLATED;
1074 origlen = strtoul(buffer + 8, NULL, 10);
1076 else
1077 return NULL;
1079 linenr++;
1080 buffer += llen;
1081 while (1) {
1082 int byte_length, max_byte_length, newsize;
1083 llen = linelen(buffer, size);
1084 used += llen;
1085 linenr++;
1086 if (llen == 1) {
1087 /* consume the blank line */
1088 buffer++;
1089 size--;
1090 break;
1092 /* Minimum line is "A00000\n" which is 7-byte long,
1093 * and the line length must be multiple of 5 plus 2.
1095 if ((llen < 7) || (llen-2) % 5)
1096 goto corrupt;
1097 max_byte_length = (llen - 2) / 5 * 4;
1098 byte_length = *buffer;
1099 if ('A' <= byte_length && byte_length <= 'Z')
1100 byte_length = byte_length - 'A' + 1;
1101 else if ('a' <= byte_length && byte_length <= 'z')
1102 byte_length = byte_length - 'a' + 27;
1103 else
1104 goto corrupt;
1105 /* if the input length was not multiple of 4, we would
1106 * have filler at the end but the filler should never
1107 * exceed 3 bytes
1109 if (max_byte_length < byte_length ||
1110 byte_length <= max_byte_length - 4)
1111 goto corrupt;
1112 newsize = hunk_size + byte_length;
1113 data = xrealloc(data, newsize);
1114 if (decode_85(data + hunk_size, buffer + 1, byte_length))
1115 goto corrupt;
1116 hunk_size = newsize;
1117 buffer += llen;
1118 size -= llen;
1121 frag = xcalloc(1, sizeof(*frag));
1122 frag->patch = inflate_it(data, hunk_size, origlen);
1123 if (!frag->patch)
1124 goto corrupt;
1125 free(data);
1126 frag->size = origlen;
1127 *buf_p = buffer;
1128 *sz_p = size;
1129 *used_p = used;
1130 frag->binary_patch_method = patch_method;
1131 return frag;
1133 corrupt:
1134 if (data)
1135 free(data);
1136 *status_p = -1;
1137 error("corrupt binary patch at line %d: %.*s",
1138 linenr-1, llen-1, buffer);
1139 return NULL;
1142 static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1144 /* We have read "GIT binary patch\n"; what follows is a line
1145 * that says the patch method (currently, either "literal" or
1146 * "delta") and the length of data before deflating; a
1147 * sequence of 'length-byte' followed by base-85 encoded data
1148 * follows.
1150 * When a binary patch is reversible, there is another binary
1151 * hunk in the same format, starting with patch method (either
1152 * "literal" or "delta") with the length of data, and a sequence
1153 * of length-byte + base-85 encoded data, terminated with another
1154 * empty line. This data, when applied to the postimage, produces
1155 * the preimage.
1157 struct fragment *forward;
1158 struct fragment *reverse;
1159 int status;
1160 int used, used_1;
1162 forward = parse_binary_hunk(&buffer, &size, &status, &used);
1163 if (!forward && !status)
1164 /* there has to be one hunk (forward hunk) */
1165 return error("unrecognized binary patch at line %d", linenr-1);
1166 if (status)
1167 /* otherwise we already gave an error message */
1168 return status;
1170 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1171 if (reverse)
1172 used += used_1;
1173 else if (status) {
1174 /* not having reverse hunk is not an error, but having
1175 * a corrupt reverse hunk is.
1177 free((void*) forward->patch);
1178 free(forward);
1179 return status;
1181 forward->next = reverse;
1182 patch->fragments = forward;
1183 patch->is_binary = 1;
1184 return used;
1187 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
1189 int hdrsize, patchsize;
1190 int offset = find_header(buffer, size, &hdrsize, patch);
1192 if (offset < 0)
1193 return offset;
1195 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
1197 if (!patchsize) {
1198 static const char *binhdr[] = {
1199 "Binary files ",
1200 "Files ",
1201 NULL,
1203 static const char git_binary[] = "GIT binary patch\n";
1204 int i;
1205 int hd = hdrsize + offset;
1206 unsigned long llen = linelen(buffer + hd, size - hd);
1208 if (llen == sizeof(git_binary) - 1 &&
1209 !memcmp(git_binary, buffer + hd, llen)) {
1210 int used;
1211 linenr++;
1212 used = parse_binary(buffer + hd + llen,
1213 size - hd - llen, patch);
1214 if (used)
1215 patchsize = used + llen;
1216 else
1217 patchsize = 0;
1219 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
1220 for (i = 0; binhdr[i]; i++) {
1221 int len = strlen(binhdr[i]);
1222 if (len < size - hd &&
1223 !memcmp(binhdr[i], buffer + hd, len)) {
1224 linenr++;
1225 patch->is_binary = 1;
1226 patchsize = llen;
1227 break;
1232 /* Empty patch cannot be applied if:
1233 * - it is a binary patch and we do not do binary_replace, or
1234 * - text patch without metadata change
1236 if ((apply || check) &&
1237 (patch->is_binary
1238 ? !allow_binary_replacement
1239 : !metadata_changes(patch)))
1240 die("patch with only garbage at line %d", linenr);
1243 return offset + hdrsize + patchsize;
1246 #define swap(a,b) myswap((a),(b),sizeof(a))
1248 #define myswap(a, b, size) do { \
1249 unsigned char mytmp[size]; \
1250 memcpy(mytmp, &a, size); \
1251 memcpy(&a, &b, size); \
1252 memcpy(&b, mytmp, size); \
1253 } while (0)
1255 static void reverse_patches(struct patch *p)
1257 for (; p; p = p->next) {
1258 struct fragment *frag = p->fragments;
1260 swap(p->new_name, p->old_name);
1261 swap(p->new_mode, p->old_mode);
1262 swap(p->is_new, p->is_delete);
1263 swap(p->lines_added, p->lines_deleted);
1264 swap(p->old_sha1_prefix, p->new_sha1_prefix);
1266 for (; frag; frag = frag->next) {
1267 swap(frag->newpos, frag->oldpos);
1268 swap(frag->newlines, frag->oldlines);
1273 static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1274 static const char minuses[]= "----------------------------------------------------------------------";
1276 static void show_stats(struct patch *patch)
1278 const char *prefix = "";
1279 char *name = patch->new_name;
1280 char *qname = NULL;
1281 int len, max, add, del, total;
1283 if (!name)
1284 name = patch->old_name;
1286 if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
1287 qname = xmalloc(len + 1);
1288 quote_c_style(name, qname, NULL, 0);
1289 name = qname;
1293 * "scale" the filename
1295 len = strlen(name);
1296 max = max_len;
1297 if (max > 50)
1298 max = 50;
1299 if (len > max) {
1300 char *slash;
1301 prefix = "...";
1302 max -= 3;
1303 name += len - max;
1304 slash = strchr(name, '/');
1305 if (slash)
1306 name = slash;
1308 len = max;
1311 * scale the add/delete
1313 max = max_change;
1314 if (max + len > 70)
1315 max = 70 - len;
1317 add = patch->lines_added;
1318 del = patch->lines_deleted;
1319 total = add + del;
1321 if (max_change > 0) {
1322 total = (total * max + max_change / 2) / max_change;
1323 add = (add * max + max_change / 2) / max_change;
1324 del = total - add;
1326 if (patch->is_binary)
1327 printf(" %s%-*s | Bin\n", prefix, len, name);
1328 else
1329 printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
1330 len, name, patch->lines_added + patch->lines_deleted,
1331 add, pluses, del, minuses);
1332 if (qname)
1333 free(qname);
1336 static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
1338 int fd;
1339 unsigned long got;
1341 switch (st->st_mode & S_IFMT) {
1342 case S_IFLNK:
1343 return readlink(path, buf, size);
1344 case S_IFREG:
1345 fd = open(path, O_RDONLY);
1346 if (fd < 0)
1347 return error("unable to open %s", path);
1348 got = 0;
1349 for (;;) {
1350 int ret = xread(fd, (char *) buf + got, size - got);
1351 if (ret <= 0)
1352 break;
1353 got += ret;
1355 close(fd);
1356 return got;
1358 default:
1359 return -1;
1363 static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line, int *lines)
1365 int i;
1366 unsigned long start, backwards, forwards;
1368 if (fragsize > size)
1369 return -1;
1371 start = 0;
1372 if (line > 1) {
1373 unsigned long offset = 0;
1374 i = line-1;
1375 while (offset + fragsize <= size) {
1376 if (buf[offset++] == '\n') {
1377 start = offset;
1378 if (!--i)
1379 break;
1384 /* Exact line number? */
1385 if (!memcmp(buf + start, fragment, fragsize))
1386 return start;
1389 * There's probably some smart way to do this, but I'll leave
1390 * that to the smart and beautiful people. I'm simple and stupid.
1392 backwards = start;
1393 forwards = start;
1394 for (i = 0; ; i++) {
1395 unsigned long try;
1396 int n;
1398 /* "backward" */
1399 if (i & 1) {
1400 if (!backwards) {
1401 if (forwards + fragsize > size)
1402 break;
1403 continue;
1405 do {
1406 --backwards;
1407 } while (backwards && buf[backwards-1] != '\n');
1408 try = backwards;
1409 } else {
1410 while (forwards + fragsize <= size) {
1411 if (buf[forwards++] == '\n')
1412 break;
1414 try = forwards;
1417 if (try + fragsize > size)
1418 continue;
1419 if (memcmp(buf + try, fragment, fragsize))
1420 continue;
1421 n = (i >> 1)+1;
1422 if (i & 1)
1423 n = -n;
1424 *lines = n;
1425 return try;
1429 * We should start searching forward and backward.
1431 return -1;
1434 static void remove_first_line(const char **rbuf, int *rsize)
1436 const char *buf = *rbuf;
1437 int size = *rsize;
1438 unsigned long offset;
1439 offset = 0;
1440 while (offset <= size) {
1441 if (buf[offset++] == '\n')
1442 break;
1444 *rsize = size - offset;
1445 *rbuf = buf + offset;
1448 static void remove_last_line(const char **rbuf, int *rsize)
1450 const char *buf = *rbuf;
1451 int size = *rsize;
1452 unsigned long offset;
1453 offset = size - 1;
1454 while (offset > 0) {
1455 if (buf[--offset] == '\n')
1456 break;
1458 *rsize = offset + 1;
1461 struct buffer_desc {
1462 char *buffer;
1463 unsigned long size;
1464 unsigned long alloc;
1467 static int apply_line(char *output, const char *patch, int plen)
1469 /* plen is number of bytes to be copied from patch,
1470 * starting at patch+1 (patch[0] is '+'). Typically
1471 * patch[plen] is '\n'.
1473 int add_nl_to_tail = 0;
1474 if ((new_whitespace == strip_whitespace) &&
1475 1 < plen && isspace(patch[plen-1])) {
1476 if (patch[plen] == '\n')
1477 add_nl_to_tail = 1;
1478 plen--;
1479 while (0 < plen && isspace(patch[plen]))
1480 plen--;
1481 applied_after_stripping++;
1483 memcpy(output, patch + 1, plen);
1484 if (add_nl_to_tail)
1485 output[plen++] = '\n';
1486 return plen;
1489 static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag, int inaccurate_eof)
1491 int match_beginning, match_end;
1492 char *buf = desc->buffer;
1493 const char *patch = frag->patch;
1494 int offset, size = frag->size;
1495 char *old = xmalloc(size);
1496 char *new = xmalloc(size);
1497 const char *oldlines, *newlines;
1498 int oldsize = 0, newsize = 0;
1499 unsigned long leading, trailing;
1500 int pos, lines;
1502 while (size > 0) {
1503 char first;
1504 int len = linelen(patch, size);
1505 int plen;
1507 if (!len)
1508 break;
1511 * "plen" is how much of the line we should use for
1512 * the actual patch data. Normally we just remove the
1513 * first character on the line, but if the line is
1514 * followed by "\ No newline", then we also remove the
1515 * last one (which is the newline, of course).
1517 plen = len-1;
1518 if (len < size && patch[len] == '\\')
1519 plen--;
1520 first = *patch;
1521 if (apply_in_reverse) {
1522 if (first == '-')
1523 first = '+';
1524 else if (first == '+')
1525 first = '-';
1527 switch (first) {
1528 case ' ':
1529 case '-':
1530 memcpy(old + oldsize, patch + 1, plen);
1531 oldsize += plen;
1532 if (first == '-')
1533 break;
1534 /* Fall-through for ' ' */
1535 case '+':
1536 if (first != '+' || !no_add)
1537 newsize += apply_line(new + newsize, patch,
1538 plen);
1539 break;
1540 case '@': case '\\':
1541 /* Ignore it, we already handled it */
1542 break;
1543 default:
1544 return -1;
1546 patch += len;
1547 size -= len;
1550 if (inaccurate_eof && oldsize > 0 && old[oldsize - 1] == '\n' &&
1551 newsize > 0 && new[newsize - 1] == '\n') {
1552 oldsize--;
1553 newsize--;
1556 oldlines = old;
1557 newlines = new;
1558 leading = frag->leading;
1559 trailing = frag->trailing;
1562 * If we don't have any leading/trailing data in the patch,
1563 * we want it to match at the beginning/end of the file.
1565 match_beginning = !leading && (frag->oldpos == 1);
1566 match_end = !trailing;
1568 lines = 0;
1569 pos = frag->newpos;
1570 for (;;) {
1571 offset = find_offset(buf, desc->size,
1572 oldlines, oldsize, pos, &lines);
1573 if (match_end && offset + oldsize != desc->size)
1574 offset = -1;
1575 if (match_beginning && offset)
1576 offset = -1;
1577 if (offset >= 0) {
1578 int diff = newsize - oldsize;
1579 unsigned long size = desc->size + diff;
1580 unsigned long alloc = desc->alloc;
1582 /* Warn if it was necessary to reduce the number
1583 * of context lines.
1585 if ((leading != frag->leading) ||
1586 (trailing != frag->trailing))
1587 fprintf(stderr, "Context reduced to (%ld/%ld)"
1588 " to apply fragment at %d\n",
1589 leading, trailing, pos + lines);
1591 if (size > alloc) {
1592 alloc = size + 8192;
1593 desc->alloc = alloc;
1594 buf = xrealloc(buf, alloc);
1595 desc->buffer = buf;
1597 desc->size = size;
1598 memmove(buf + offset + newsize,
1599 buf + offset + oldsize,
1600 size - offset - newsize);
1601 memcpy(buf + offset, newlines, newsize);
1602 offset = 0;
1604 break;
1607 /* Am I at my context limits? */
1608 if ((leading <= p_context) && (trailing <= p_context))
1609 break;
1610 if (match_beginning || match_end) {
1611 match_beginning = match_end = 0;
1612 continue;
1614 /* Reduce the number of context lines
1615 * Reduce both leading and trailing if they are equal
1616 * otherwise just reduce the larger context.
1618 if (leading >= trailing) {
1619 remove_first_line(&oldlines, &oldsize);
1620 remove_first_line(&newlines, &newsize);
1621 pos--;
1622 leading--;
1624 if (trailing > leading) {
1625 remove_last_line(&oldlines, &oldsize);
1626 remove_last_line(&newlines, &newsize);
1627 trailing--;
1631 free(old);
1632 free(new);
1633 return offset;
1636 static int apply_binary_fragment(struct buffer_desc *desc, struct patch *patch)
1638 unsigned long dst_size;
1639 struct fragment *fragment = patch->fragments;
1640 void *data;
1641 void *result;
1643 /* Binary patch is irreversible without the optional second hunk */
1644 if (apply_in_reverse) {
1645 if (!fragment->next)
1646 return error("cannot reverse-apply a binary patch "
1647 "without the reverse hunk to '%s'",
1648 patch->new_name
1649 ? patch->new_name : patch->old_name);
1650 fragment = fragment->next;
1652 data = (void*) fragment->patch;
1653 switch (fragment->binary_patch_method) {
1654 case BINARY_DELTA_DEFLATED:
1655 result = patch_delta(desc->buffer, desc->size,
1656 data,
1657 fragment->size,
1658 &dst_size);
1659 free(desc->buffer);
1660 desc->buffer = result;
1661 break;
1662 case BINARY_LITERAL_DEFLATED:
1663 free(desc->buffer);
1664 desc->buffer = data;
1665 dst_size = fragment->size;
1666 break;
1668 if (!desc->buffer)
1669 return -1;
1670 desc->size = desc->alloc = dst_size;
1671 return 0;
1674 static int apply_binary(struct buffer_desc *desc, struct patch *patch)
1676 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1677 unsigned char sha1[20];
1678 unsigned char hdr[50];
1679 int hdrlen;
1681 if (!allow_binary_replacement)
1682 return error("cannot apply binary patch to '%s' "
1683 "without --allow-binary-replacement",
1684 name);
1686 /* For safety, we require patch index line to contain
1687 * full 40-byte textual SHA1 for old and new, at least for now.
1689 if (strlen(patch->old_sha1_prefix) != 40 ||
1690 strlen(patch->new_sha1_prefix) != 40 ||
1691 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1692 get_sha1_hex(patch->new_sha1_prefix, sha1))
1693 return error("cannot apply binary patch to '%s' "
1694 "without full index line", name);
1696 if (patch->old_name) {
1697 /* See if the old one matches what the patch
1698 * applies to.
1700 write_sha1_file_prepare(desc->buffer, desc->size,
1701 blob_type, sha1, hdr, &hdrlen);
1702 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1703 return error("the patch applies to '%s' (%s), "
1704 "which does not match the "
1705 "current contents.",
1706 name, sha1_to_hex(sha1));
1708 else {
1709 /* Otherwise, the old one must be empty. */
1710 if (desc->size)
1711 return error("the patch applies to an empty "
1712 "'%s' but it is not empty", name);
1715 get_sha1_hex(patch->new_sha1_prefix, sha1);
1716 if (is_null_sha1(sha1)) {
1717 free(desc->buffer);
1718 desc->alloc = desc->size = 0;
1719 desc->buffer = NULL;
1720 return 0; /* deletion patch */
1723 if (has_sha1_file(sha1)) {
1724 /* We already have the postimage */
1725 char type[10];
1726 unsigned long size;
1728 free(desc->buffer);
1729 desc->buffer = read_sha1_file(sha1, type, &size);
1730 if (!desc->buffer)
1731 return error("the necessary postimage %s for "
1732 "'%s' cannot be read",
1733 patch->new_sha1_prefix, name);
1734 desc->alloc = desc->size = size;
1736 else {
1737 /* We have verified desc matches the preimage;
1738 * apply the patch data to it, which is stored
1739 * in the patch->fragments->{patch,size}.
1741 if (apply_binary_fragment(desc, patch))
1742 return error("binary patch does not apply to '%s'",
1743 name);
1745 /* verify that the result matches */
1746 write_sha1_file_prepare(desc->buffer, desc->size, blob_type,
1747 sha1, hdr, &hdrlen);
1748 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
1749 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)", name, patch->new_sha1_prefix, sha1_to_hex(sha1));
1752 return 0;
1755 static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
1757 struct fragment *frag = patch->fragments;
1758 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1760 if (patch->is_binary)
1761 return apply_binary(desc, patch);
1763 while (frag) {
1764 if (apply_one_fragment(desc, frag, patch->inaccurate_eof)) {
1765 error("patch failed: %s:%ld", name, frag->oldpos);
1766 if (!apply_with_reject)
1767 return -1;
1768 frag->rejected = 1;
1770 frag = frag->next;
1772 return 0;
1775 static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
1777 char *buf;
1778 unsigned long size, alloc;
1779 struct buffer_desc desc;
1781 size = 0;
1782 alloc = 0;
1783 buf = NULL;
1784 if (cached) {
1785 if (ce) {
1786 char type[20];
1787 buf = read_sha1_file(ce->sha1, type, &size);
1788 if (!buf)
1789 return error("read of %s failed",
1790 patch->old_name);
1791 alloc = size;
1794 else if (patch->old_name) {
1795 size = st->st_size;
1796 alloc = size + 8192;
1797 buf = xmalloc(alloc);
1798 if (read_old_data(st, patch->old_name, buf, alloc) != size)
1799 return error("read of %s failed", patch->old_name);
1802 desc.size = size;
1803 desc.alloc = alloc;
1804 desc.buffer = buf;
1806 if (apply_fragments(&desc, patch) < 0)
1807 return -1; /* note with --reject this succeeds. */
1809 /* NUL terminate the result */
1810 if (desc.alloc <= desc.size)
1811 desc.buffer = xrealloc(desc.buffer, desc.size + 1);
1812 desc.buffer[desc.size] = 0;
1814 patch->result = desc.buffer;
1815 patch->resultsize = desc.size;
1817 if (patch->is_delete && patch->resultsize)
1818 return error("removal patch leaves file contents");
1820 return 0;
1823 static int check_patch(struct patch *patch, struct patch *prev_patch)
1825 struct stat st;
1826 const char *old_name = patch->old_name;
1827 const char *new_name = patch->new_name;
1828 const char *name = old_name ? old_name : new_name;
1829 struct cache_entry *ce = NULL;
1830 int ok_if_exists;
1832 patch->rejected = 1; /* we will drop this after we succeed */
1833 if (old_name) {
1834 int changed = 0;
1835 int stat_ret = 0;
1836 unsigned st_mode = 0;
1838 if (!cached)
1839 stat_ret = lstat(old_name, &st);
1840 if (check_index) {
1841 int pos = cache_name_pos(old_name, strlen(old_name));
1842 if (pos < 0)
1843 return error("%s: does not exist in index",
1844 old_name);
1845 ce = active_cache[pos];
1846 if (stat_ret < 0) {
1847 struct checkout costate;
1848 if (errno != ENOENT)
1849 return error("%s: %s", old_name,
1850 strerror(errno));
1851 /* checkout */
1852 costate.base_dir = "";
1853 costate.base_dir_len = 0;
1854 costate.force = 0;
1855 costate.quiet = 0;
1856 costate.not_new = 0;
1857 costate.refresh_cache = 1;
1858 if (checkout_entry(ce,
1859 &costate,
1860 NULL) ||
1861 lstat(old_name, &st))
1862 return -1;
1864 if (!cached)
1865 changed = ce_match_stat(ce, &st, 1);
1866 if (changed)
1867 return error("%s: does not match index",
1868 old_name);
1869 if (cached)
1870 st_mode = ntohl(ce->ce_mode);
1872 else if (stat_ret < 0)
1873 return error("%s: %s", old_name, strerror(errno));
1875 if (!cached)
1876 st_mode = ntohl(create_ce_mode(st.st_mode));
1878 if (patch->is_new < 0)
1879 patch->is_new = 0;
1880 if (!patch->old_mode)
1881 patch->old_mode = st_mode;
1882 if ((st_mode ^ patch->old_mode) & S_IFMT)
1883 return error("%s: wrong type", old_name);
1884 if (st_mode != patch->old_mode)
1885 fprintf(stderr, "warning: %s has type %o, expected %o\n",
1886 old_name, st_mode, patch->old_mode);
1889 if (new_name && prev_patch && prev_patch->is_delete &&
1890 !strcmp(prev_patch->old_name, new_name))
1891 /* A type-change diff is always split into a patch to
1892 * delete old, immediately followed by a patch to
1893 * create new (see diff.c::run_diff()); in such a case
1894 * it is Ok that the entry to be deleted by the
1895 * previous patch is still in the working tree and in
1896 * the index.
1898 ok_if_exists = 1;
1899 else
1900 ok_if_exists = 0;
1902 if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
1903 if (check_index &&
1904 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
1905 !ok_if_exists)
1906 return error("%s: already exists in index", new_name);
1907 if (!cached) {
1908 struct stat nst;
1909 if (!lstat(new_name, &nst)) {
1910 if (S_ISDIR(nst.st_mode) || ok_if_exists)
1911 ; /* ok */
1912 else
1913 return error("%s: already exists in working directory", new_name);
1915 else if ((errno != ENOENT) && (errno != ENOTDIR))
1916 return error("%s: %s", new_name, strerror(errno));
1918 if (!patch->new_mode) {
1919 if (patch->is_new)
1920 patch->new_mode = S_IFREG | 0644;
1921 else
1922 patch->new_mode = patch->old_mode;
1926 if (new_name && old_name) {
1927 int same = !strcmp(old_name, new_name);
1928 if (!patch->new_mode)
1929 patch->new_mode = patch->old_mode;
1930 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
1931 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1932 patch->new_mode, new_name, patch->old_mode,
1933 same ? "" : " of ", same ? "" : old_name);
1936 if (apply_data(patch, &st, ce) < 0)
1937 return error("%s: patch does not apply", name);
1938 patch->rejected = 0;
1939 return 0;
1942 static int check_patch_list(struct patch *patch)
1944 struct patch *prev_patch = NULL;
1945 int err = 0;
1947 for (prev_patch = NULL; patch ; patch = patch->next) {
1948 if (apply_verbosely)
1949 say_patch_name(stderr,
1950 "Checking patch ", patch, "...\n");
1951 err |= check_patch(patch, prev_patch);
1952 prev_patch = patch;
1954 return err;
1957 static void show_index_list(struct patch *list)
1959 struct patch *patch;
1961 /* Once we start supporting the reverse patch, it may be
1962 * worth showing the new sha1 prefix, but until then...
1964 for (patch = list; patch; patch = patch->next) {
1965 const unsigned char *sha1_ptr;
1966 unsigned char sha1[20];
1967 const char *name;
1969 name = patch->old_name ? patch->old_name : patch->new_name;
1970 if (patch->is_new)
1971 sha1_ptr = null_sha1;
1972 else if (get_sha1(patch->old_sha1_prefix, sha1))
1973 die("sha1 information is lacking or useless (%s).",
1974 name);
1975 else
1976 sha1_ptr = sha1;
1978 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
1979 if (line_termination && quote_c_style(name, NULL, NULL, 0))
1980 quote_c_style(name, NULL, stdout, 0);
1981 else
1982 fputs(name, stdout);
1983 putchar(line_termination);
1987 static void stat_patch_list(struct patch *patch)
1989 int files, adds, dels;
1991 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
1992 files++;
1993 adds += patch->lines_added;
1994 dels += patch->lines_deleted;
1995 show_stats(patch);
1998 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
2001 static void numstat_patch_list(struct patch *patch)
2003 for ( ; patch; patch = patch->next) {
2004 const char *name;
2005 name = patch->new_name ? patch->new_name : patch->old_name;
2006 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
2007 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2008 quote_c_style(name, NULL, stdout, 0);
2009 else
2010 fputs(name, stdout);
2011 putchar('\n');
2015 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
2017 if (mode)
2018 printf(" %s mode %06o %s\n", newdelete, mode, name);
2019 else
2020 printf(" %s %s\n", newdelete, name);
2023 static void show_mode_change(struct patch *p, int show_name)
2025 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
2026 if (show_name)
2027 printf(" mode change %06o => %06o %s\n",
2028 p->old_mode, p->new_mode, p->new_name);
2029 else
2030 printf(" mode change %06o => %06o\n",
2031 p->old_mode, p->new_mode);
2035 static void show_rename_copy(struct patch *p)
2037 const char *renamecopy = p->is_rename ? "rename" : "copy";
2038 const char *old, *new;
2040 /* Find common prefix */
2041 old = p->old_name;
2042 new = p->new_name;
2043 while (1) {
2044 const char *slash_old, *slash_new;
2045 slash_old = strchr(old, '/');
2046 slash_new = strchr(new, '/');
2047 if (!slash_old ||
2048 !slash_new ||
2049 slash_old - old != slash_new - new ||
2050 memcmp(old, new, slash_new - new))
2051 break;
2052 old = slash_old + 1;
2053 new = slash_new + 1;
2055 /* p->old_name thru old is the common prefix, and old and new
2056 * through the end of names are renames
2058 if (old != p->old_name)
2059 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
2060 (int)(old - p->old_name), p->old_name,
2061 old, new, p->score);
2062 else
2063 printf(" %s %s => %s (%d%%)\n", renamecopy,
2064 p->old_name, p->new_name, p->score);
2065 show_mode_change(p, 0);
2068 static void summary_patch_list(struct patch *patch)
2070 struct patch *p;
2072 for (p = patch; p; p = p->next) {
2073 if (p->is_new)
2074 show_file_mode_name("create", p->new_mode, p->new_name);
2075 else if (p->is_delete)
2076 show_file_mode_name("delete", p->old_mode, p->old_name);
2077 else {
2078 if (p->is_rename || p->is_copy)
2079 show_rename_copy(p);
2080 else {
2081 if (p->score) {
2082 printf(" rewrite %s (%d%%)\n",
2083 p->new_name, p->score);
2084 show_mode_change(p, 0);
2086 else
2087 show_mode_change(p, 1);
2093 static void patch_stats(struct patch *patch)
2095 int lines = patch->lines_added + patch->lines_deleted;
2097 if (lines > max_change)
2098 max_change = lines;
2099 if (patch->old_name) {
2100 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
2101 if (!len)
2102 len = strlen(patch->old_name);
2103 if (len > max_len)
2104 max_len = len;
2106 if (patch->new_name) {
2107 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
2108 if (!len)
2109 len = strlen(patch->new_name);
2110 if (len > max_len)
2111 max_len = len;
2115 static void remove_file(struct patch *patch)
2117 if (write_index) {
2118 if (remove_file_from_cache(patch->old_name) < 0)
2119 die("unable to remove %s from index", patch->old_name);
2120 cache_tree_invalidate_path(active_cache_tree, patch->old_name);
2122 if (!cached)
2123 unlink(patch->old_name);
2126 static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
2128 struct stat st;
2129 struct cache_entry *ce;
2130 int namelen = strlen(path);
2131 unsigned ce_size = cache_entry_size(namelen);
2133 if (!write_index)
2134 return;
2136 ce = xcalloc(1, ce_size);
2137 memcpy(ce->name, path, namelen);
2138 ce->ce_mode = create_ce_mode(mode);
2139 ce->ce_flags = htons(namelen);
2140 if (!cached) {
2141 if (lstat(path, &st) < 0)
2142 die("unable to stat newly created file %s", path);
2143 fill_stat_cache_info(ce, &st);
2145 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
2146 die("unable to create backing store for newly created file %s", path);
2147 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
2148 die("unable to add cache entry for %s", path);
2151 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
2153 int fd;
2155 if (S_ISLNK(mode))
2156 /* Although buf:size is counted string, it also is NUL
2157 * terminated.
2159 return symlink(buf, path);
2160 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
2161 if (fd < 0)
2162 return -1;
2163 while (size) {
2164 int written = xwrite(fd, buf, size);
2165 if (written < 0)
2166 die("writing file %s: %s", path, strerror(errno));
2167 if (!written)
2168 die("out of space writing file %s", path);
2169 buf += written;
2170 size -= written;
2172 if (close(fd) < 0)
2173 die("closing file %s: %s", path, strerror(errno));
2174 return 0;
2178 * We optimistically assume that the directories exist,
2179 * which is true 99% of the time anyway. If they don't,
2180 * we create them and try again.
2182 static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
2184 if (cached)
2185 return;
2186 if (!try_create_file(path, mode, buf, size))
2187 return;
2189 if (errno == ENOENT) {
2190 if (safe_create_leading_directories(path))
2191 return;
2192 if (!try_create_file(path, mode, buf, size))
2193 return;
2196 if (errno == EEXIST || errno == EACCES) {
2197 /* We may be trying to create a file where a directory
2198 * used to be.
2200 struct stat st;
2201 errno = 0;
2202 if (!lstat(path, &st) && S_ISDIR(st.st_mode) && !rmdir(path))
2203 errno = EEXIST;
2206 if (errno == EEXIST) {
2207 unsigned int nr = getpid();
2209 for (;;) {
2210 const char *newpath;
2211 newpath = mkpath("%s~%u", path, nr);
2212 if (!try_create_file(newpath, mode, buf, size)) {
2213 if (!rename(newpath, path))
2214 return;
2215 unlink(newpath);
2216 break;
2218 if (errno != EEXIST)
2219 break;
2220 ++nr;
2223 die("unable to write file %s mode %o", path, mode);
2226 static void create_file(struct patch *patch)
2228 char *path = patch->new_name;
2229 unsigned mode = patch->new_mode;
2230 unsigned long size = patch->resultsize;
2231 char *buf = patch->result;
2233 if (!mode)
2234 mode = S_IFREG | 0644;
2235 create_one_file(path, mode, buf, size);
2236 add_index_file(path, mode, buf, size);
2237 cache_tree_invalidate_path(active_cache_tree, path);
2240 /* phase zero is to remove, phase one is to create */
2241 static void write_out_one_result(struct patch *patch, int phase)
2243 if (patch->is_delete > 0) {
2244 if (phase == 0)
2245 remove_file(patch);
2246 return;
2248 if (patch->is_new > 0 || patch->is_copy) {
2249 if (phase == 1)
2250 create_file(patch);
2251 return;
2254 * Rename or modification boils down to the same
2255 * thing: remove the old, write the new
2257 if (phase == 0)
2258 remove_file(patch);
2259 if (phase == 1)
2260 create_file(patch);
2263 static int write_out_one_reject(struct patch *patch)
2265 FILE *rej;
2266 char namebuf[PATH_MAX];
2267 struct fragment *frag;
2268 int cnt = 0;
2270 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
2271 if (!frag->rejected)
2272 continue;
2273 cnt++;
2276 if (!cnt) {
2277 if (apply_verbosely)
2278 say_patch_name(stderr,
2279 "Applied patch ", patch, " cleanly.\n");
2280 return 0;
2283 /* This should not happen, because a removal patch that leaves
2284 * contents are marked "rejected" at the patch level.
2286 if (!patch->new_name)
2287 die("internal error");
2289 /* Say this even without --verbose */
2290 say_patch_name(stderr, "Applying patch ", patch, " with");
2291 fprintf(stderr, " %d rejects...\n", cnt);
2293 cnt = strlen(patch->new_name);
2294 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
2295 cnt = ARRAY_SIZE(namebuf) - 5;
2296 fprintf(stderr,
2297 "warning: truncating .rej filename to %.*s.rej",
2298 cnt - 1, patch->new_name);
2300 memcpy(namebuf, patch->new_name, cnt);
2301 memcpy(namebuf + cnt, ".rej", 5);
2303 rej = fopen(namebuf, "w");
2304 if (!rej)
2305 return error("cannot open %s: %s", namebuf, strerror(errno));
2307 /* Normal git tools never deal with .rej, so do not pretend
2308 * this is a git patch by saying --git nor give extended
2309 * headers. While at it, maybe please "kompare" that wants
2310 * the trailing TAB and some garbage at the end of line ;-).
2312 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
2313 patch->new_name, patch->new_name);
2314 for (cnt = 1, frag = patch->fragments;
2315 frag;
2316 cnt++, frag = frag->next) {
2317 if (!frag->rejected) {
2318 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);
2319 continue;
2321 fprintf(stderr, "Rejected hunk #%d.\n", cnt);
2322 fprintf(rej, "%.*s", frag->size, frag->patch);
2323 if (frag->patch[frag->size-1] != '\n')
2324 fputc('\n', rej);
2326 fclose(rej);
2327 return -1;
2330 static int write_out_results(struct patch *list, int skipped_patch)
2332 int phase;
2333 int errs = 0;
2334 struct patch *l;
2336 if (!list && !skipped_patch)
2337 return error("No changes");
2339 for (phase = 0; phase < 2; phase++) {
2340 l = list;
2341 while (l) {
2342 if (l->rejected)
2343 errs = 1;
2344 else {
2345 write_out_one_result(l, phase);
2346 if (phase == 1 && write_out_one_reject(l))
2347 errs = 1;
2349 l = l->next;
2352 return errs;
2355 static struct lock_file lock_file;
2357 static struct excludes {
2358 struct excludes *next;
2359 const char *path;
2360 } *excludes;
2362 static int use_patch(struct patch *p)
2364 const char *pathname = p->new_name ? p->new_name : p->old_name;
2365 struct excludes *x = excludes;
2366 while (x) {
2367 if (fnmatch(x->path, pathname, 0) == 0)
2368 return 0;
2369 x = x->next;
2371 if (0 < prefix_length) {
2372 int pathlen = strlen(pathname);
2373 if (pathlen <= prefix_length ||
2374 memcmp(prefix, pathname, prefix_length))
2375 return 0;
2377 return 1;
2380 static int apply_patch(int fd, const char *filename, int inaccurate_eof)
2382 unsigned long offset, size;
2383 char *buffer = read_patch_file(fd, &size);
2384 struct patch *list = NULL, **listp = &list;
2385 int skipped_patch = 0;
2387 patch_input_file = filename;
2388 if (!buffer)
2389 return -1;
2390 offset = 0;
2391 while (size > 0) {
2392 struct patch *patch;
2393 int nr;
2395 patch = xcalloc(1, sizeof(*patch));
2396 patch->inaccurate_eof = inaccurate_eof;
2397 nr = parse_chunk(buffer + offset, size, patch);
2398 if (nr < 0)
2399 break;
2400 if (apply_in_reverse)
2401 reverse_patches(patch);
2402 if (use_patch(patch)) {
2403 patch_stats(patch);
2404 *listp = patch;
2405 listp = &patch->next;
2406 } else {
2407 /* perhaps free it a bit better? */
2408 free(patch);
2409 skipped_patch++;
2411 offset += nr;
2412 size -= nr;
2415 if (whitespace_error && (new_whitespace == error_on_whitespace))
2416 apply = 0;
2418 write_index = check_index && apply;
2419 if (write_index && newfd < 0)
2420 newfd = hold_lock_file_for_update(&lock_file,
2421 get_index_file(), 1);
2422 if (check_index) {
2423 if (read_cache() < 0)
2424 die("unable to read index file");
2427 if ((check || apply) &&
2428 check_patch_list(list) < 0 &&
2429 !apply_with_reject)
2430 exit(1);
2432 if (apply && write_out_results(list, skipped_patch))
2433 exit(1);
2435 if (show_index_info)
2436 show_index_list(list);
2438 if (diffstat)
2439 stat_patch_list(list);
2441 if (numstat)
2442 numstat_patch_list(list);
2444 if (summary)
2445 summary_patch_list(list);
2447 free(buffer);
2448 return 0;
2451 static int git_apply_config(const char *var, const char *value)
2453 if (!strcmp(var, "apply.whitespace")) {
2454 apply_default_whitespace = strdup(value);
2455 return 0;
2457 return git_default_config(var, value);
2461 int cmd_apply(int argc, const char **argv, const char *prefix)
2463 int i;
2464 int read_stdin = 1;
2465 int inaccurate_eof = 0;
2466 int errs = 0;
2468 const char *whitespace_option = NULL;
2470 for (i = 1; i < argc; i++) {
2471 const char *arg = argv[i];
2472 char *end;
2473 int fd;
2475 if (!strcmp(arg, "-")) {
2476 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2477 read_stdin = 0;
2478 continue;
2480 if (!strncmp(arg, "--exclude=", 10)) {
2481 struct excludes *x = xmalloc(sizeof(*x));
2482 x->path = arg + 10;
2483 x->next = excludes;
2484 excludes = x;
2485 continue;
2487 if (!strncmp(arg, "-p", 2)) {
2488 p_value = atoi(arg + 2);
2489 continue;
2491 if (!strcmp(arg, "--no-add")) {
2492 no_add = 1;
2493 continue;
2495 if (!strcmp(arg, "--stat")) {
2496 apply = 0;
2497 diffstat = 1;
2498 continue;
2500 if (!strcmp(arg, "--allow-binary-replacement") ||
2501 !strcmp(arg, "--binary")) {
2502 allow_binary_replacement = 1;
2503 continue;
2505 if (!strcmp(arg, "--numstat")) {
2506 apply = 0;
2507 numstat = 1;
2508 continue;
2510 if (!strcmp(arg, "--summary")) {
2511 apply = 0;
2512 summary = 1;
2513 continue;
2515 if (!strcmp(arg, "--check")) {
2516 apply = 0;
2517 check = 1;
2518 continue;
2520 if (!strcmp(arg, "--index")) {
2521 check_index = 1;
2522 continue;
2524 if (!strcmp(arg, "--cached")) {
2525 check_index = 1;
2526 cached = 1;
2527 continue;
2529 if (!strcmp(arg, "--apply")) {
2530 apply = 1;
2531 continue;
2533 if (!strcmp(arg, "--index-info")) {
2534 apply = 0;
2535 show_index_info = 1;
2536 continue;
2538 if (!strcmp(arg, "-z")) {
2539 line_termination = 0;
2540 continue;
2542 if (!strncmp(arg, "-C", 2)) {
2543 p_context = strtoul(arg + 2, &end, 0);
2544 if (*end != '\0')
2545 die("unrecognized context count '%s'", arg + 2);
2546 continue;
2548 if (!strncmp(arg, "--whitespace=", 13)) {
2549 whitespace_option = arg + 13;
2550 parse_whitespace_option(arg + 13);
2551 continue;
2553 if (!strcmp(arg, "-R") || !strcmp(arg, "--reverse")) {
2554 apply_in_reverse = 1;
2555 continue;
2557 if (!strcmp(arg, "--reject")) {
2558 apply = apply_with_reject = apply_verbosely = 1;
2559 continue;
2561 if (!strcmp(arg, "--verbose")) {
2562 apply_verbosely = 1;
2563 continue;
2565 if (!strcmp(arg, "--inaccurate-eof")) {
2566 inaccurate_eof = 1;
2567 continue;
2570 if (check_index && prefix_length < 0) {
2571 prefix = setup_git_directory();
2572 prefix_length = prefix ? strlen(prefix) : 0;
2573 git_config(git_apply_config);
2574 if (!whitespace_option && apply_default_whitespace)
2575 parse_whitespace_option(apply_default_whitespace);
2577 if (0 < prefix_length)
2578 arg = prefix_filename(prefix, prefix_length, arg);
2580 fd = open(arg, O_RDONLY);
2581 if (fd < 0)
2582 usage(apply_usage);
2583 read_stdin = 0;
2584 set_default_whitespace_mode(whitespace_option);
2585 errs |= apply_patch(fd, arg, inaccurate_eof);
2586 close(fd);
2588 set_default_whitespace_mode(whitespace_option);
2589 if (read_stdin)
2590 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2591 if (whitespace_error) {
2592 if (squelch_whitespace_errors &&
2593 squelch_whitespace_errors < whitespace_error) {
2594 int squelched =
2595 whitespace_error - squelch_whitespace_errors;
2596 fprintf(stderr, "warning: squelched %d "
2597 "whitespace error%s\n",
2598 squelched,
2599 squelched == 1 ? "" : "s");
2601 if (new_whitespace == error_on_whitespace)
2602 die("%d line%s add%s trailing whitespaces.",
2603 whitespace_error,
2604 whitespace_error == 1 ? "" : "s",
2605 whitespace_error == 1 ? "s" : "");
2606 if (applied_after_stripping)
2607 fprintf(stderr, "warning: %d line%s applied after"
2608 " stripping trailing whitespaces.\n",
2609 applied_after_stripping,
2610 applied_after_stripping == 1 ? "" : "s");
2611 else if (whitespace_error)
2612 fprintf(stderr, "warning: %d line%s add%s trailing"
2613 " whitespaces.\n",
2614 whitespace_error,
2615 whitespace_error == 1 ? "" : "s",
2616 whitespace_error == 1 ? "s" : "");
2619 if (write_index) {
2620 if (write_cache(newfd, active_cache, active_nr) ||
2621 close(newfd) || commit_lock_file(&lock_file))
2622 die("Unable to write new index file");
2625 return !!errs;