Merge branch 'maint-1.6.1' into maint
[alt-git.git] / builtin-apply.c
blobf312798af38553e0badeda9732736a62460eae05
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 "cache.h"
10 #include "cache-tree.h"
11 #include "quote.h"
12 #include "blob.h"
13 #include "delta.h"
14 #include "builtin.h"
15 #include "string-list.h"
16 #include "dir.h"
17 #include "parse-options.h"
20 * --check turns on checking that the working tree matches the
21 * files that are being modified, but doesn't apply the patch
22 * --stat does just a diffstat, and doesn't actually apply
23 * --numstat does numeric diffstat, and doesn't actually apply
24 * --index-info shows the old and new index info for paths if available.
25 * --index updates the cache as well.
26 * --cached updates only the cache without ever touching the working tree.
28 static const char *prefix;
29 static int prefix_length = -1;
30 static int newfd = -1;
32 static int unidiff_zero;
33 static int p_value = 1;
34 static int p_value_known;
35 static int check_index;
36 static int update_index;
37 static int cached;
38 static int diffstat;
39 static int numstat;
40 static int summary;
41 static int check;
42 static int apply = 1;
43 static int apply_in_reverse;
44 static int apply_with_reject;
45 static int apply_verbosely;
46 static int no_add;
47 static const char *fake_ancestor;
48 static int line_termination = '\n';
49 static unsigned int p_context = UINT_MAX;
50 static const char * const apply_usage[] = {
51 "git apply [options] [<patch>...]",
52 NULL
55 static enum ws_error_action {
56 nowarn_ws_error,
57 warn_on_ws_error,
58 die_on_ws_error,
59 correct_ws_error,
60 } ws_error_action = warn_on_ws_error;
61 static int whitespace_error;
62 static int squelch_whitespace_errors = 5;
63 static int applied_after_fixing_ws;
64 static const char *patch_input_file;
65 static const char *root;
66 static int root_len;
67 static int read_stdin = 1;
68 static int options;
70 static void parse_whitespace_option(const char *option)
72 if (!option) {
73 ws_error_action = warn_on_ws_error;
74 return;
76 if (!strcmp(option, "warn")) {
77 ws_error_action = warn_on_ws_error;
78 return;
80 if (!strcmp(option, "nowarn")) {
81 ws_error_action = nowarn_ws_error;
82 return;
84 if (!strcmp(option, "error")) {
85 ws_error_action = die_on_ws_error;
86 return;
88 if (!strcmp(option, "error-all")) {
89 ws_error_action = die_on_ws_error;
90 squelch_whitespace_errors = 0;
91 return;
93 if (!strcmp(option, "strip") || !strcmp(option, "fix")) {
94 ws_error_action = correct_ws_error;
95 return;
97 die("unrecognized whitespace option '%s'", option);
100 static void set_default_whitespace_mode(const char *whitespace_option)
102 if (!whitespace_option && !apply_default_whitespace)
103 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error);
107 * For "diff-stat" like behaviour, we keep track of the biggest change
108 * we've seen, and the longest filename. That allows us to do simple
109 * scaling.
111 static int max_change, max_len;
114 * Various "current state", notably line numbers and what
115 * file (and how) we're patching right now.. The "is_xxxx"
116 * things are flags, where -1 means "don't know yet".
118 static int linenr = 1;
121 * This represents one "hunk" from a patch, starting with
122 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
123 * patch text is pointed at by patch, and its byte length
124 * is stored in size. leading and trailing are the number
125 * of context lines.
127 struct fragment {
128 unsigned long leading, trailing;
129 unsigned long oldpos, oldlines;
130 unsigned long newpos, newlines;
131 const char *patch;
132 int size;
133 int rejected;
134 struct fragment *next;
138 * When dealing with a binary patch, we reuse "leading" field
139 * to store the type of the binary hunk, either deflated "delta"
140 * or deflated "literal".
142 #define binary_patch_method leading
143 #define BINARY_DELTA_DEFLATED 1
144 #define BINARY_LITERAL_DEFLATED 2
147 * This represents a "patch" to a file, both metainfo changes
148 * such as creation/deletion, filemode and content changes represented
149 * as a series of fragments.
151 struct patch {
152 char *new_name, *old_name, *def_name;
153 unsigned int old_mode, new_mode;
154 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
155 int rejected;
156 unsigned ws_rule;
157 unsigned long deflate_origlen;
158 int lines_added, lines_deleted;
159 int score;
160 unsigned int is_toplevel_relative:1;
161 unsigned int inaccurate_eof:1;
162 unsigned int is_binary:1;
163 unsigned int is_copy:1;
164 unsigned int is_rename:1;
165 unsigned int recount:1;
166 struct fragment *fragments;
167 char *result;
168 size_t resultsize;
169 char old_sha1_prefix[41];
170 char new_sha1_prefix[41];
171 struct patch *next;
175 * A line in a file, len-bytes long (includes the terminating LF,
176 * except for an incomplete line at the end if the file ends with
177 * one), and its contents hashes to 'hash'.
179 struct line {
180 size_t len;
181 unsigned hash : 24;
182 unsigned flag : 8;
183 #define LINE_COMMON 1
187 * This represents a "file", which is an array of "lines".
189 struct image {
190 char *buf;
191 size_t len;
192 size_t nr;
193 size_t alloc;
194 struct line *line_allocated;
195 struct line *line;
199 * Records filenames that have been touched, in order to handle
200 * the case where more than one patches touch the same file.
203 static struct string_list fn_table;
205 static uint32_t hash_line(const char *cp, size_t len)
207 size_t i;
208 uint32_t h;
209 for (i = 0, h = 0; i < len; i++) {
210 if (!isspace(cp[i])) {
211 h = h * 3 + (cp[i] & 0xff);
214 return h;
217 static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag)
219 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc);
220 img->line_allocated[img->nr].len = len;
221 img->line_allocated[img->nr].hash = hash_line(bol, len);
222 img->line_allocated[img->nr].flag = flag;
223 img->nr++;
226 static void prepare_image(struct image *image, char *buf, size_t len,
227 int prepare_linetable)
229 const char *cp, *ep;
231 memset(image, 0, sizeof(*image));
232 image->buf = buf;
233 image->len = len;
235 if (!prepare_linetable)
236 return;
238 ep = image->buf + image->len;
239 cp = image->buf;
240 while (cp < ep) {
241 const char *next;
242 for (next = cp; next < ep && *next != '\n'; next++)
244 if (next < ep)
245 next++;
246 add_line_info(image, cp, next - cp, 0);
247 cp = next;
249 image->line = image->line_allocated;
252 static void clear_image(struct image *image)
254 free(image->buf);
255 image->buf = NULL;
256 image->len = 0;
259 static void say_patch_name(FILE *output, const char *pre,
260 struct patch *patch, const char *post)
262 fputs(pre, output);
263 if (patch->old_name && patch->new_name &&
264 strcmp(patch->old_name, patch->new_name)) {
265 quote_c_style(patch->old_name, NULL, output, 0);
266 fputs(" => ", output);
267 quote_c_style(patch->new_name, NULL, output, 0);
268 } else {
269 const char *n = patch->new_name;
270 if (!n)
271 n = patch->old_name;
272 quote_c_style(n, NULL, output, 0);
274 fputs(post, output);
277 #define CHUNKSIZE (8192)
278 #define SLOP (16)
280 static void read_patch_file(struct strbuf *sb, int fd)
282 if (strbuf_read(sb, fd, 0) < 0)
283 die("git apply: read returned %s", strerror(errno));
286 * Make sure that we have some slop in the buffer
287 * so that we can do speculative "memcmp" etc, and
288 * see to it that it is NUL-filled.
290 strbuf_grow(sb, SLOP);
291 memset(sb->buf + sb->len, 0, SLOP);
294 static unsigned long linelen(const char *buffer, unsigned long size)
296 unsigned long len = 0;
297 while (size--) {
298 len++;
299 if (*buffer++ == '\n')
300 break;
302 return len;
305 static int is_dev_null(const char *str)
307 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
310 #define TERM_SPACE 1
311 #define TERM_TAB 2
313 static int name_terminate(const char *name, int namelen, int c, int terminate)
315 if (c == ' ' && !(terminate & TERM_SPACE))
316 return 0;
317 if (c == '\t' && !(terminate & TERM_TAB))
318 return 0;
320 return 1;
323 static char *find_name(const char *line, char *def, int p_value, int terminate)
325 int len;
326 const char *start = line;
328 if (*line == '"') {
329 struct strbuf name = STRBUF_INIT;
332 * Proposed "new-style" GNU patch/diff format; see
333 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
335 if (!unquote_c_style(&name, line, NULL)) {
336 char *cp;
338 for (cp = name.buf; p_value; p_value--) {
339 cp = strchr(cp, '/');
340 if (!cp)
341 break;
342 cp++;
344 if (cp) {
345 /* name can later be freed, so we need
346 * to memmove, not just return cp
348 strbuf_remove(&name, 0, cp - name.buf);
349 free(def);
350 if (root)
351 strbuf_insert(&name, 0, root, root_len);
352 return strbuf_detach(&name, NULL);
355 strbuf_release(&name);
358 for (;;) {
359 char c = *line;
361 if (isspace(c)) {
362 if (c == '\n')
363 break;
364 if (name_terminate(start, line-start, c, terminate))
365 break;
367 line++;
368 if (c == '/' && !--p_value)
369 start = line;
371 if (!start)
372 return def;
373 len = line - start;
374 if (!len)
375 return def;
378 * Generally we prefer the shorter name, especially
379 * if the other one is just a variation of that with
380 * something else tacked on to the end (ie "file.orig"
381 * or "file~").
383 if (def) {
384 int deflen = strlen(def);
385 if (deflen < len && !strncmp(start, def, deflen))
386 return def;
387 free(def);
390 if (root) {
391 char *ret = xmalloc(root_len + len + 1);
392 strcpy(ret, root);
393 memcpy(ret + root_len, start, len);
394 ret[root_len + len] = '\0';
395 return ret;
398 return xmemdupz(start, len);
401 static int count_slashes(const char *cp)
403 int cnt = 0;
404 char ch;
406 while ((ch = *cp++))
407 if (ch == '/')
408 cnt++;
409 return cnt;
413 * Given the string after "--- " or "+++ ", guess the appropriate
414 * p_value for the given patch.
416 static int guess_p_value(const char *nameline)
418 char *name, *cp;
419 int val = -1;
421 if (is_dev_null(nameline))
422 return -1;
423 name = find_name(nameline, NULL, 0, TERM_SPACE | TERM_TAB);
424 if (!name)
425 return -1;
426 cp = strchr(name, '/');
427 if (!cp)
428 val = 0;
429 else if (prefix) {
431 * Does it begin with "a/$our-prefix" and such? Then this is
432 * very likely to apply to our directory.
434 if (!strncmp(name, prefix, prefix_length))
435 val = count_slashes(prefix);
436 else {
437 cp++;
438 if (!strncmp(cp, prefix, prefix_length))
439 val = count_slashes(prefix) + 1;
442 free(name);
443 return val;
447 * Get the name etc info from the ---/+++ lines of a traditional patch header
449 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
450 * files, we can happily check the index for a match, but for creating a
451 * new file we should try to match whatever "patch" does. I have no idea.
453 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
455 char *name;
457 first += 4; /* skip "--- " */
458 second += 4; /* skip "+++ " */
459 if (!p_value_known) {
460 int p, q;
461 p = guess_p_value(first);
462 q = guess_p_value(second);
463 if (p < 0) p = q;
464 if (0 <= p && p == q) {
465 p_value = p;
466 p_value_known = 1;
469 if (is_dev_null(first)) {
470 patch->is_new = 1;
471 patch->is_delete = 0;
472 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
473 patch->new_name = name;
474 } else if (is_dev_null(second)) {
475 patch->is_new = 0;
476 patch->is_delete = 1;
477 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
478 patch->old_name = name;
479 } else {
480 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
481 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
482 patch->old_name = patch->new_name = name;
484 if (!name)
485 die("unable to find filename in patch at line %d", linenr);
488 static int gitdiff_hdrend(const char *line, struct patch *patch)
490 return -1;
494 * We're anal about diff header consistency, to make
495 * sure that we don't end up having strange ambiguous
496 * patches floating around.
498 * As a result, gitdiff_{old|new}name() will check
499 * their names against any previous information, just
500 * to make sure..
502 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
504 if (!orig_name && !isnull)
505 return find_name(line, NULL, p_value, TERM_TAB);
507 if (orig_name) {
508 int len;
509 const char *name;
510 char *another;
511 name = orig_name;
512 len = strlen(name);
513 if (isnull)
514 die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
515 another = find_name(line, NULL, p_value, TERM_TAB);
516 if (!another || memcmp(another, name, len))
517 die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
518 free(another);
519 return orig_name;
521 else {
522 /* expect "/dev/null" */
523 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
524 die("git apply: bad git-diff - expected /dev/null on line %d", linenr);
525 return NULL;
529 static int gitdiff_oldname(const char *line, struct patch *patch)
531 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
532 return 0;
535 static int gitdiff_newname(const char *line, struct patch *patch)
537 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
538 return 0;
541 static int gitdiff_oldmode(const char *line, struct patch *patch)
543 patch->old_mode = strtoul(line, NULL, 8);
544 return 0;
547 static int gitdiff_newmode(const char *line, struct patch *patch)
549 patch->new_mode = strtoul(line, NULL, 8);
550 return 0;
553 static int gitdiff_delete(const char *line, struct patch *patch)
555 patch->is_delete = 1;
556 patch->old_name = patch->def_name;
557 return gitdiff_oldmode(line, patch);
560 static int gitdiff_newfile(const char *line, struct patch *patch)
562 patch->is_new = 1;
563 patch->new_name = patch->def_name;
564 return gitdiff_newmode(line, patch);
567 static int gitdiff_copysrc(const char *line, struct patch *patch)
569 patch->is_copy = 1;
570 patch->old_name = find_name(line, NULL, 0, 0);
571 return 0;
574 static int gitdiff_copydst(const char *line, struct patch *patch)
576 patch->is_copy = 1;
577 patch->new_name = find_name(line, NULL, 0, 0);
578 return 0;
581 static int gitdiff_renamesrc(const char *line, struct patch *patch)
583 patch->is_rename = 1;
584 patch->old_name = find_name(line, NULL, 0, 0);
585 return 0;
588 static int gitdiff_renamedst(const char *line, struct patch *patch)
590 patch->is_rename = 1;
591 patch->new_name = find_name(line, NULL, 0, 0);
592 return 0;
595 static int gitdiff_similarity(const char *line, struct patch *patch)
597 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
598 patch->score = 0;
599 return 0;
602 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
604 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
605 patch->score = 0;
606 return 0;
609 static int gitdiff_index(const char *line, struct patch *patch)
612 * index line is N hexadecimal, "..", N hexadecimal,
613 * and optional space with octal mode.
615 const char *ptr, *eol;
616 int len;
618 ptr = strchr(line, '.');
619 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
620 return 0;
621 len = ptr - line;
622 memcpy(patch->old_sha1_prefix, line, len);
623 patch->old_sha1_prefix[len] = 0;
625 line = ptr + 2;
626 ptr = strchr(line, ' ');
627 eol = strchr(line, '\n');
629 if (!ptr || eol < ptr)
630 ptr = eol;
631 len = ptr - line;
633 if (40 < len)
634 return 0;
635 memcpy(patch->new_sha1_prefix, line, len);
636 patch->new_sha1_prefix[len] = 0;
637 if (*ptr == ' ')
638 patch->old_mode = strtoul(ptr+1, NULL, 8);
639 return 0;
643 * This is normal for a diff that doesn't change anything: we'll fall through
644 * into the next diff. Tell the parser to break out.
646 static int gitdiff_unrecognized(const char *line, struct patch *patch)
648 return -1;
651 static const char *stop_at_slash(const char *line, int llen)
653 int i;
655 for (i = 0; i < llen; i++) {
656 int ch = line[i];
657 if (ch == '/')
658 return line + i;
660 return NULL;
664 * This is to extract the same name that appears on "diff --git"
665 * line. We do not find and return anything if it is a rename
666 * patch, and it is OK because we will find the name elsewhere.
667 * We need to reliably find name only when it is mode-change only,
668 * creation or deletion of an empty file. In any of these cases,
669 * both sides are the same name under a/ and b/ respectively.
671 static char *git_header_name(char *line, int llen)
673 const char *name;
674 const char *second = NULL;
675 size_t len;
677 line += strlen("diff --git ");
678 llen -= strlen("diff --git ");
680 if (*line == '"') {
681 const char *cp;
682 struct strbuf first = STRBUF_INIT;
683 struct strbuf sp = STRBUF_INIT;
685 if (unquote_c_style(&first, line, &second))
686 goto free_and_fail1;
688 /* advance to the first slash */
689 cp = stop_at_slash(first.buf, first.len);
690 /* we do not accept absolute paths */
691 if (!cp || cp == first.buf)
692 goto free_and_fail1;
693 strbuf_remove(&first, 0, cp + 1 - first.buf);
696 * second points at one past closing dq of name.
697 * find the second name.
699 while ((second < line + llen) && isspace(*second))
700 second++;
702 if (line + llen <= second)
703 goto free_and_fail1;
704 if (*second == '"') {
705 if (unquote_c_style(&sp, second, NULL))
706 goto free_and_fail1;
707 cp = stop_at_slash(sp.buf, sp.len);
708 if (!cp || cp == sp.buf)
709 goto free_and_fail1;
710 /* They must match, otherwise ignore */
711 if (strcmp(cp + 1, first.buf))
712 goto free_and_fail1;
713 strbuf_release(&sp);
714 return strbuf_detach(&first, NULL);
717 /* unquoted second */
718 cp = stop_at_slash(second, line + llen - second);
719 if (!cp || cp == second)
720 goto free_and_fail1;
721 cp++;
722 if (line + llen - cp != first.len + 1 ||
723 memcmp(first.buf, cp, first.len))
724 goto free_and_fail1;
725 return strbuf_detach(&first, NULL);
727 free_and_fail1:
728 strbuf_release(&first);
729 strbuf_release(&sp);
730 return NULL;
733 /* unquoted first name */
734 name = stop_at_slash(line, llen);
735 if (!name || name == line)
736 return NULL;
737 name++;
740 * since the first name is unquoted, a dq if exists must be
741 * the beginning of the second name.
743 for (second = name; second < line + llen; second++) {
744 if (*second == '"') {
745 struct strbuf sp = STRBUF_INIT;
746 const char *np;
748 if (unquote_c_style(&sp, second, NULL))
749 goto free_and_fail2;
751 np = stop_at_slash(sp.buf, sp.len);
752 if (!np || np == sp.buf)
753 goto free_and_fail2;
754 np++;
756 len = sp.buf + sp.len - np;
757 if (len < second - name &&
758 !strncmp(np, name, len) &&
759 isspace(name[len])) {
760 /* Good */
761 strbuf_remove(&sp, 0, np - sp.buf);
762 return strbuf_detach(&sp, NULL);
765 free_and_fail2:
766 strbuf_release(&sp);
767 return NULL;
772 * Accept a name only if it shows up twice, exactly the same
773 * form.
775 for (len = 0 ; ; len++) {
776 switch (name[len]) {
777 default:
778 continue;
779 case '\n':
780 return NULL;
781 case '\t': case ' ':
782 second = name+len;
783 for (;;) {
784 char c = *second++;
785 if (c == '\n')
786 return NULL;
787 if (c == '/')
788 break;
790 if (second[len] == '\n' && !memcmp(name, second, len)) {
791 return xmemdupz(name, len);
797 /* Verify that we recognize the lines following a git header */
798 static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
800 unsigned long offset;
802 /* A git diff has explicit new/delete information, so we don't guess */
803 patch->is_new = 0;
804 patch->is_delete = 0;
807 * Some things may not have the old name in the
808 * rest of the headers anywhere (pure mode changes,
809 * or removing or adding empty files), so we get
810 * the default name from the header.
812 patch->def_name = git_header_name(line, len);
813 if (patch->def_name && root) {
814 char *s = xmalloc(root_len + strlen(patch->def_name) + 1);
815 strcpy(s, root);
816 strcpy(s + root_len, patch->def_name);
817 free(patch->def_name);
818 patch->def_name = s;
821 line += len;
822 size -= len;
823 linenr++;
824 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
825 static const struct opentry {
826 const char *str;
827 int (*fn)(const char *, struct patch *);
828 } optable[] = {
829 { "@@ -", gitdiff_hdrend },
830 { "--- ", gitdiff_oldname },
831 { "+++ ", gitdiff_newname },
832 { "old mode ", gitdiff_oldmode },
833 { "new mode ", gitdiff_newmode },
834 { "deleted file mode ", gitdiff_delete },
835 { "new file mode ", gitdiff_newfile },
836 { "copy from ", gitdiff_copysrc },
837 { "copy to ", gitdiff_copydst },
838 { "rename old ", gitdiff_renamesrc },
839 { "rename new ", gitdiff_renamedst },
840 { "rename from ", gitdiff_renamesrc },
841 { "rename to ", gitdiff_renamedst },
842 { "similarity index ", gitdiff_similarity },
843 { "dissimilarity index ", gitdiff_dissimilarity },
844 { "index ", gitdiff_index },
845 { "", gitdiff_unrecognized },
847 int i;
849 len = linelen(line, size);
850 if (!len || line[len-1] != '\n')
851 break;
852 for (i = 0; i < ARRAY_SIZE(optable); i++) {
853 const struct opentry *p = optable + i;
854 int oplen = strlen(p->str);
855 if (len < oplen || memcmp(p->str, line, oplen))
856 continue;
857 if (p->fn(line + oplen, patch) < 0)
858 return offset;
859 break;
863 return offset;
866 static int parse_num(const char *line, unsigned long *p)
868 char *ptr;
870 if (!isdigit(*line))
871 return 0;
872 *p = strtoul(line, &ptr, 10);
873 return ptr - line;
876 static int parse_range(const char *line, int len, int offset, const char *expect,
877 unsigned long *p1, unsigned long *p2)
879 int digits, ex;
881 if (offset < 0 || offset >= len)
882 return -1;
883 line += offset;
884 len -= offset;
886 digits = parse_num(line, p1);
887 if (!digits)
888 return -1;
890 offset += digits;
891 line += digits;
892 len -= digits;
894 *p2 = 1;
895 if (*line == ',') {
896 digits = parse_num(line+1, p2);
897 if (!digits)
898 return -1;
900 offset += digits+1;
901 line += digits+1;
902 len -= digits+1;
905 ex = strlen(expect);
906 if (ex > len)
907 return -1;
908 if (memcmp(line, expect, ex))
909 return -1;
911 return offset + ex;
914 static void recount_diff(char *line, int size, struct fragment *fragment)
916 int oldlines = 0, newlines = 0, ret = 0;
918 if (size < 1) {
919 warning("recount: ignore empty hunk");
920 return;
923 for (;;) {
924 int len = linelen(line, size);
925 size -= len;
926 line += len;
928 if (size < 1)
929 break;
931 switch (*line) {
932 case ' ': case '\n':
933 newlines++;
934 /* fall through */
935 case '-':
936 oldlines++;
937 continue;
938 case '+':
939 newlines++;
940 continue;
941 case '\\':
942 continue;
943 case '@':
944 ret = size < 3 || prefixcmp(line, "@@ ");
945 break;
946 case 'd':
947 ret = size < 5 || prefixcmp(line, "diff ");
948 break;
949 default:
950 ret = -1;
951 break;
953 if (ret) {
954 warning("recount: unexpected line: %.*s",
955 (int)linelen(line, size), line);
956 return;
958 break;
960 fragment->oldlines = oldlines;
961 fragment->newlines = newlines;
965 * Parse a unified diff fragment header of the
966 * form "@@ -a,b +c,d @@"
968 static int parse_fragment_header(char *line, int len, struct fragment *fragment)
970 int offset;
972 if (!len || line[len-1] != '\n')
973 return -1;
975 /* Figure out the number of lines in a fragment */
976 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
977 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
979 return offset;
982 static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
984 unsigned long offset, len;
986 patch->is_toplevel_relative = 0;
987 patch->is_rename = patch->is_copy = 0;
988 patch->is_new = patch->is_delete = -1;
989 patch->old_mode = patch->new_mode = 0;
990 patch->old_name = patch->new_name = NULL;
991 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
992 unsigned long nextlen;
994 len = linelen(line, size);
995 if (!len)
996 break;
998 /* Testing this early allows us to take a few shortcuts.. */
999 if (len < 6)
1000 continue;
1003 * Make sure we don't find any unconnected patch fragments.
1004 * That's a sign that we didn't find a header, and that a
1005 * patch has become corrupted/broken up.
1007 if (!memcmp("@@ -", line, 4)) {
1008 struct fragment dummy;
1009 if (parse_fragment_header(line, len, &dummy) < 0)
1010 continue;
1011 die("patch fragment without header at line %d: %.*s",
1012 linenr, (int)len-1, line);
1015 if (size < len + 6)
1016 break;
1019 * Git patch? It might not have a real patch, just a rename
1020 * or mode change, so we handle that specially
1022 if (!memcmp("diff --git ", line, 11)) {
1023 int git_hdr_len = parse_git_header(line, len, size, patch);
1024 if (git_hdr_len <= len)
1025 continue;
1026 if (!patch->old_name && !patch->new_name) {
1027 if (!patch->def_name)
1028 die("git diff header lacks filename information (line %d)", linenr);
1029 patch->old_name = patch->new_name = patch->def_name;
1031 patch->is_toplevel_relative = 1;
1032 *hdrsize = git_hdr_len;
1033 return offset;
1036 /* --- followed by +++ ? */
1037 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
1038 continue;
1041 * We only accept unified patches, so we want it to
1042 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1043 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1045 nextlen = linelen(line + len, size - len);
1046 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
1047 continue;
1049 /* Ok, we'll consider it a patch */
1050 parse_traditional_patch(line, line+len, patch);
1051 *hdrsize = len + nextlen;
1052 linenr += 2;
1053 return offset;
1055 return -1;
1058 static void check_whitespace(const char *line, int len, unsigned ws_rule)
1060 char *err;
1061 unsigned result = ws_check(line + 1, len - 1, ws_rule);
1062 if (!result)
1063 return;
1065 whitespace_error++;
1066 if (squelch_whitespace_errors &&
1067 squelch_whitespace_errors < whitespace_error)
1069 else {
1070 err = whitespace_error_string(result);
1071 fprintf(stderr, "%s:%d: %s.\n%.*s\n",
1072 patch_input_file, linenr, err, len - 2, line + 1);
1073 free(err);
1078 * Parse a unified diff. Note that this really needs to parse each
1079 * fragment separately, since the only way to know the difference
1080 * between a "---" that is part of a patch, and a "---" that starts
1081 * the next patch is to look at the line counts..
1083 static int parse_fragment(char *line, unsigned long size,
1084 struct patch *patch, struct fragment *fragment)
1086 int added, deleted;
1087 int len = linelen(line, size), offset;
1088 unsigned long oldlines, newlines;
1089 unsigned long leading, trailing;
1091 offset = parse_fragment_header(line, len, fragment);
1092 if (offset < 0)
1093 return -1;
1094 if (offset > 0 && patch->recount)
1095 recount_diff(line + offset, size - offset, fragment);
1096 oldlines = fragment->oldlines;
1097 newlines = fragment->newlines;
1098 leading = 0;
1099 trailing = 0;
1101 /* Parse the thing.. */
1102 line += len;
1103 size -= len;
1104 linenr++;
1105 added = deleted = 0;
1106 for (offset = len;
1107 0 < size;
1108 offset += len, size -= len, line += len, linenr++) {
1109 if (!oldlines && !newlines)
1110 break;
1111 len = linelen(line, size);
1112 if (!len || line[len-1] != '\n')
1113 return -1;
1114 switch (*line) {
1115 default:
1116 return -1;
1117 case '\n': /* newer GNU diff, an empty context line */
1118 case ' ':
1119 oldlines--;
1120 newlines--;
1121 if (!deleted && !added)
1122 leading++;
1123 trailing++;
1124 break;
1125 case '-':
1126 if (apply_in_reverse &&
1127 ws_error_action != nowarn_ws_error)
1128 check_whitespace(line, len, patch->ws_rule);
1129 deleted++;
1130 oldlines--;
1131 trailing = 0;
1132 break;
1133 case '+':
1134 if (!apply_in_reverse &&
1135 ws_error_action != nowarn_ws_error)
1136 check_whitespace(line, len, patch->ws_rule);
1137 added++;
1138 newlines--;
1139 trailing = 0;
1140 break;
1143 * We allow "\ No newline at end of file". Depending
1144 * on locale settings when the patch was produced we
1145 * don't know what this line looks like. The only
1146 * thing we do know is that it begins with "\ ".
1147 * Checking for 12 is just for sanity check -- any
1148 * l10n of "\ No newline..." is at least that long.
1150 case '\\':
1151 if (len < 12 || memcmp(line, "\\ ", 2))
1152 return -1;
1153 break;
1156 if (oldlines || newlines)
1157 return -1;
1158 fragment->leading = leading;
1159 fragment->trailing = trailing;
1162 * If a fragment ends with an incomplete line, we failed to include
1163 * it in the above loop because we hit oldlines == newlines == 0
1164 * before seeing it.
1166 if (12 < size && !memcmp(line, "\\ ", 2))
1167 offset += linelen(line, size);
1169 patch->lines_added += added;
1170 patch->lines_deleted += deleted;
1172 if (0 < patch->is_new && oldlines)
1173 return error("new file depends on old contents");
1174 if (0 < patch->is_delete && newlines)
1175 return error("deleted file still has contents");
1176 return offset;
1179 static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
1181 unsigned long offset = 0;
1182 unsigned long oldlines = 0, newlines = 0, context = 0;
1183 struct fragment **fragp = &patch->fragments;
1185 while (size > 4 && !memcmp(line, "@@ -", 4)) {
1186 struct fragment *fragment;
1187 int len;
1189 fragment = xcalloc(1, sizeof(*fragment));
1190 len = parse_fragment(line, size, patch, fragment);
1191 if (len <= 0)
1192 die("corrupt patch at line %d", linenr);
1193 fragment->patch = line;
1194 fragment->size = len;
1195 oldlines += fragment->oldlines;
1196 newlines += fragment->newlines;
1197 context += fragment->leading + fragment->trailing;
1199 *fragp = fragment;
1200 fragp = &fragment->next;
1202 offset += len;
1203 line += len;
1204 size -= len;
1208 * If something was removed (i.e. we have old-lines) it cannot
1209 * be creation, and if something was added it cannot be
1210 * deletion. However, the reverse is not true; --unified=0
1211 * patches that only add are not necessarily creation even
1212 * though they do not have any old lines, and ones that only
1213 * delete are not necessarily deletion.
1215 * Unfortunately, a real creation/deletion patch do _not_ have
1216 * any context line by definition, so we cannot safely tell it
1217 * apart with --unified=0 insanity. At least if the patch has
1218 * more than one hunk it is not creation or deletion.
1220 if (patch->is_new < 0 &&
1221 (oldlines || (patch->fragments && patch->fragments->next)))
1222 patch->is_new = 0;
1223 if (patch->is_delete < 0 &&
1224 (newlines || (patch->fragments && patch->fragments->next)))
1225 patch->is_delete = 0;
1227 if (0 < patch->is_new && oldlines)
1228 die("new file %s depends on old contents", patch->new_name);
1229 if (0 < patch->is_delete && newlines)
1230 die("deleted file %s still has contents", patch->old_name);
1231 if (!patch->is_delete && !newlines && context)
1232 fprintf(stderr, "** warning: file %s becomes empty but "
1233 "is not deleted\n", patch->new_name);
1235 return offset;
1238 static inline int metadata_changes(struct patch *patch)
1240 return patch->is_rename > 0 ||
1241 patch->is_copy > 0 ||
1242 patch->is_new > 0 ||
1243 patch->is_delete ||
1244 (patch->old_mode && patch->new_mode &&
1245 patch->old_mode != patch->new_mode);
1248 static char *inflate_it(const void *data, unsigned long size,
1249 unsigned long inflated_size)
1251 z_stream stream;
1252 void *out;
1253 int st;
1255 memset(&stream, 0, sizeof(stream));
1257 stream.next_in = (unsigned char *)data;
1258 stream.avail_in = size;
1259 stream.next_out = out = xmalloc(inflated_size);
1260 stream.avail_out = inflated_size;
1261 git_inflate_init(&stream);
1262 st = git_inflate(&stream, Z_FINISH);
1263 git_inflate_end(&stream);
1264 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1265 free(out);
1266 return NULL;
1268 return out;
1271 static struct fragment *parse_binary_hunk(char **buf_p,
1272 unsigned long *sz_p,
1273 int *status_p,
1274 int *used_p)
1277 * Expect a line that begins with binary patch method ("literal"
1278 * or "delta"), followed by the length of data before deflating.
1279 * a sequence of 'length-byte' followed by base-85 encoded data
1280 * should follow, terminated by a newline.
1282 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1283 * and we would limit the patch line to 66 characters,
1284 * so one line can fit up to 13 groups that would decode
1285 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1286 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1288 int llen, used;
1289 unsigned long size = *sz_p;
1290 char *buffer = *buf_p;
1291 int patch_method;
1292 unsigned long origlen;
1293 char *data = NULL;
1294 int hunk_size = 0;
1295 struct fragment *frag;
1297 llen = linelen(buffer, size);
1298 used = llen;
1300 *status_p = 0;
1302 if (!prefixcmp(buffer, "delta ")) {
1303 patch_method = BINARY_DELTA_DEFLATED;
1304 origlen = strtoul(buffer + 6, NULL, 10);
1306 else if (!prefixcmp(buffer, "literal ")) {
1307 patch_method = BINARY_LITERAL_DEFLATED;
1308 origlen = strtoul(buffer + 8, NULL, 10);
1310 else
1311 return NULL;
1313 linenr++;
1314 buffer += llen;
1315 while (1) {
1316 int byte_length, max_byte_length, newsize;
1317 llen = linelen(buffer, size);
1318 used += llen;
1319 linenr++;
1320 if (llen == 1) {
1321 /* consume the blank line */
1322 buffer++;
1323 size--;
1324 break;
1327 * Minimum line is "A00000\n" which is 7-byte long,
1328 * and the line length must be multiple of 5 plus 2.
1330 if ((llen < 7) || (llen-2) % 5)
1331 goto corrupt;
1332 max_byte_length = (llen - 2) / 5 * 4;
1333 byte_length = *buffer;
1334 if ('A' <= byte_length && byte_length <= 'Z')
1335 byte_length = byte_length - 'A' + 1;
1336 else if ('a' <= byte_length && byte_length <= 'z')
1337 byte_length = byte_length - 'a' + 27;
1338 else
1339 goto corrupt;
1340 /* if the input length was not multiple of 4, we would
1341 * have filler at the end but the filler should never
1342 * exceed 3 bytes
1344 if (max_byte_length < byte_length ||
1345 byte_length <= max_byte_length - 4)
1346 goto corrupt;
1347 newsize = hunk_size + byte_length;
1348 data = xrealloc(data, newsize);
1349 if (decode_85(data + hunk_size, buffer + 1, byte_length))
1350 goto corrupt;
1351 hunk_size = newsize;
1352 buffer += llen;
1353 size -= llen;
1356 frag = xcalloc(1, sizeof(*frag));
1357 frag->patch = inflate_it(data, hunk_size, origlen);
1358 if (!frag->patch)
1359 goto corrupt;
1360 free(data);
1361 frag->size = origlen;
1362 *buf_p = buffer;
1363 *sz_p = size;
1364 *used_p = used;
1365 frag->binary_patch_method = patch_method;
1366 return frag;
1368 corrupt:
1369 free(data);
1370 *status_p = -1;
1371 error("corrupt binary patch at line %d: %.*s",
1372 linenr-1, llen-1, buffer);
1373 return NULL;
1376 static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1379 * We have read "GIT binary patch\n"; what follows is a line
1380 * that says the patch method (currently, either "literal" or
1381 * "delta") and the length of data before deflating; a
1382 * sequence of 'length-byte' followed by base-85 encoded data
1383 * follows.
1385 * When a binary patch is reversible, there is another binary
1386 * hunk in the same format, starting with patch method (either
1387 * "literal" or "delta") with the length of data, and a sequence
1388 * of length-byte + base-85 encoded data, terminated with another
1389 * empty line. This data, when applied to the postimage, produces
1390 * the preimage.
1392 struct fragment *forward;
1393 struct fragment *reverse;
1394 int status;
1395 int used, used_1;
1397 forward = parse_binary_hunk(&buffer, &size, &status, &used);
1398 if (!forward && !status)
1399 /* there has to be one hunk (forward hunk) */
1400 return error("unrecognized binary patch at line %d", linenr-1);
1401 if (status)
1402 /* otherwise we already gave an error message */
1403 return status;
1405 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1406 if (reverse)
1407 used += used_1;
1408 else if (status) {
1410 * Not having reverse hunk is not an error, but having
1411 * a corrupt reverse hunk is.
1413 free((void*) forward->patch);
1414 free(forward);
1415 return status;
1417 forward->next = reverse;
1418 patch->fragments = forward;
1419 patch->is_binary = 1;
1420 return used;
1423 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
1425 int hdrsize, patchsize;
1426 int offset = find_header(buffer, size, &hdrsize, patch);
1428 if (offset < 0)
1429 return offset;
1431 patch->ws_rule = whitespace_rule(patch->new_name
1432 ? patch->new_name
1433 : patch->old_name);
1435 patchsize = parse_single_patch(buffer + offset + hdrsize,
1436 size - offset - hdrsize, patch);
1438 if (!patchsize) {
1439 static const char *binhdr[] = {
1440 "Binary files ",
1441 "Files ",
1442 NULL,
1444 static const char git_binary[] = "GIT binary patch\n";
1445 int i;
1446 int hd = hdrsize + offset;
1447 unsigned long llen = linelen(buffer + hd, size - hd);
1449 if (llen == sizeof(git_binary) - 1 &&
1450 !memcmp(git_binary, buffer + hd, llen)) {
1451 int used;
1452 linenr++;
1453 used = parse_binary(buffer + hd + llen,
1454 size - hd - llen, patch);
1455 if (used)
1456 patchsize = used + llen;
1457 else
1458 patchsize = 0;
1460 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
1461 for (i = 0; binhdr[i]; i++) {
1462 int len = strlen(binhdr[i]);
1463 if (len < size - hd &&
1464 !memcmp(binhdr[i], buffer + hd, len)) {
1465 linenr++;
1466 patch->is_binary = 1;
1467 patchsize = llen;
1468 break;
1473 /* Empty patch cannot be applied if it is a text patch
1474 * without metadata change. A binary patch appears
1475 * empty to us here.
1477 if ((apply || check) &&
1478 (!patch->is_binary && !metadata_changes(patch)))
1479 die("patch with only garbage at line %d", linenr);
1482 return offset + hdrsize + patchsize;
1485 #define swap(a,b) myswap((a),(b),sizeof(a))
1487 #define myswap(a, b, size) do { \
1488 unsigned char mytmp[size]; \
1489 memcpy(mytmp, &a, size); \
1490 memcpy(&a, &b, size); \
1491 memcpy(&b, mytmp, size); \
1492 } while (0)
1494 static void reverse_patches(struct patch *p)
1496 for (; p; p = p->next) {
1497 struct fragment *frag = p->fragments;
1499 swap(p->new_name, p->old_name);
1500 swap(p->new_mode, p->old_mode);
1501 swap(p->is_new, p->is_delete);
1502 swap(p->lines_added, p->lines_deleted);
1503 swap(p->old_sha1_prefix, p->new_sha1_prefix);
1505 for (; frag; frag = frag->next) {
1506 swap(frag->newpos, frag->oldpos);
1507 swap(frag->newlines, frag->oldlines);
1512 static const char pluses[] =
1513 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1514 static const char minuses[]=
1515 "----------------------------------------------------------------------";
1517 static void show_stats(struct patch *patch)
1519 struct strbuf qname = STRBUF_INIT;
1520 char *cp = patch->new_name ? patch->new_name : patch->old_name;
1521 int max, add, del;
1523 quote_c_style(cp, &qname, NULL, 0);
1526 * "scale" the filename
1528 max = max_len;
1529 if (max > 50)
1530 max = 50;
1532 if (qname.len > max) {
1533 cp = strchr(qname.buf + qname.len + 3 - max, '/');
1534 if (!cp)
1535 cp = qname.buf + qname.len + 3 - max;
1536 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);
1539 if (patch->is_binary) {
1540 printf(" %-*s | Bin\n", max, qname.buf);
1541 strbuf_release(&qname);
1542 return;
1545 printf(" %-*s |", max, qname.buf);
1546 strbuf_release(&qname);
1549 * scale the add/delete
1551 max = max + max_change > 70 ? 70 - max : max_change;
1552 add = patch->lines_added;
1553 del = patch->lines_deleted;
1555 if (max_change > 0) {
1556 int total = ((add + del) * max + max_change / 2) / max_change;
1557 add = (add * max + max_change / 2) / max_change;
1558 del = total - add;
1560 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,
1561 add, pluses, del, minuses);
1564 static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
1566 switch (st->st_mode & S_IFMT) {
1567 case S_IFLNK:
1568 if (strbuf_readlink(buf, path, st->st_size) < 0)
1569 return error("unable to read symlink %s", path);
1570 return 0;
1571 case S_IFREG:
1572 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
1573 return error("unable to open or read %s", path);
1574 convert_to_git(path, buf->buf, buf->len, buf, 0);
1575 return 0;
1576 default:
1577 return -1;
1581 static void update_pre_post_images(struct image *preimage,
1582 struct image *postimage,
1583 char *buf,
1584 size_t len)
1586 int i, ctx;
1587 char *new, *old, *fixed;
1588 struct image fixed_preimage;
1591 * Update the preimage with whitespace fixes. Note that we
1592 * are not losing preimage->buf -- apply_one_fragment() will
1593 * free "oldlines".
1595 prepare_image(&fixed_preimage, buf, len, 1);
1596 assert(fixed_preimage.nr == preimage->nr);
1597 for (i = 0; i < preimage->nr; i++)
1598 fixed_preimage.line[i].flag = preimage->line[i].flag;
1599 free(preimage->line_allocated);
1600 *preimage = fixed_preimage;
1603 * Adjust the common context lines in postimage, in place.
1604 * This is possible because whitespace fixing does not make
1605 * the string grow.
1607 new = old = postimage->buf;
1608 fixed = preimage->buf;
1609 for (i = ctx = 0; i < postimage->nr; i++) {
1610 size_t len = postimage->line[i].len;
1611 if (!(postimage->line[i].flag & LINE_COMMON)) {
1612 /* an added line -- no counterparts in preimage */
1613 memmove(new, old, len);
1614 old += len;
1615 new += len;
1616 continue;
1619 /* a common context -- skip it in the original postimage */
1620 old += len;
1622 /* and find the corresponding one in the fixed preimage */
1623 while (ctx < preimage->nr &&
1624 !(preimage->line[ctx].flag & LINE_COMMON)) {
1625 fixed += preimage->line[ctx].len;
1626 ctx++;
1628 if (preimage->nr <= ctx)
1629 die("oops");
1631 /* and copy it in, while fixing the line length */
1632 len = preimage->line[ctx].len;
1633 memcpy(new, fixed, len);
1634 new += len;
1635 fixed += len;
1636 postimage->line[i].len = len;
1637 ctx++;
1640 /* Fix the length of the whole thing */
1641 postimage->len = new - postimage->buf;
1644 static int match_fragment(struct image *img,
1645 struct image *preimage,
1646 struct image *postimage,
1647 unsigned long try,
1648 int try_lno,
1649 unsigned ws_rule,
1650 int match_beginning, int match_end)
1652 int i;
1653 char *fixed_buf, *buf, *orig, *target;
1655 if (preimage->nr + try_lno > img->nr)
1656 return 0;
1658 if (match_beginning && try_lno)
1659 return 0;
1661 if (match_end && preimage->nr + try_lno != img->nr)
1662 return 0;
1664 /* Quick hash check */
1665 for (i = 0; i < preimage->nr; i++)
1666 if (preimage->line[i].hash != img->line[try_lno + i].hash)
1667 return 0;
1670 * Do we have an exact match? If we were told to match
1671 * at the end, size must be exactly at try+fragsize,
1672 * otherwise try+fragsize must be still within the preimage,
1673 * and either case, the old piece should match the preimage
1674 * exactly.
1676 if ((match_end
1677 ? (try + preimage->len == img->len)
1678 : (try + preimage->len <= img->len)) &&
1679 !memcmp(img->buf + try, preimage->buf, preimage->len))
1680 return 1;
1682 if (ws_error_action != correct_ws_error)
1683 return 0;
1686 * The hunk does not apply byte-by-byte, but the hash says
1687 * it might with whitespace fuzz.
1689 fixed_buf = xmalloc(preimage->len + 1);
1690 buf = fixed_buf;
1691 orig = preimage->buf;
1692 target = img->buf + try;
1693 for (i = 0; i < preimage->nr; i++) {
1694 size_t fixlen; /* length after fixing the preimage */
1695 size_t oldlen = preimage->line[i].len;
1696 size_t tgtlen = img->line[try_lno + i].len;
1697 size_t tgtfixlen; /* length after fixing the target line */
1698 char tgtfixbuf[1024], *tgtfix;
1699 int match;
1701 /* Try fixing the line in the preimage */
1702 fixlen = ws_fix_copy(buf, orig, oldlen, ws_rule, NULL);
1704 /* Try fixing the line in the target */
1705 if (sizeof(tgtfixbuf) > tgtlen)
1706 tgtfix = tgtfixbuf;
1707 else
1708 tgtfix = xmalloc(tgtlen);
1709 tgtfixlen = ws_fix_copy(tgtfix, target, tgtlen, ws_rule, NULL);
1712 * If they match, either the preimage was based on
1713 * a version before our tree fixed whitespace breakage,
1714 * or we are lacking a whitespace-fix patch the tree
1715 * the preimage was based on already had (i.e. target
1716 * has whitespace breakage, the preimage doesn't).
1717 * In either case, we are fixing the whitespace breakages
1718 * so we might as well take the fix together with their
1719 * real change.
1721 match = (tgtfixlen == fixlen && !memcmp(tgtfix, buf, fixlen));
1723 if (tgtfix != tgtfixbuf)
1724 free(tgtfix);
1725 if (!match)
1726 goto unmatch_exit;
1728 orig += oldlen;
1729 buf += fixlen;
1730 target += tgtlen;
1734 * Yes, the preimage is based on an older version that still
1735 * has whitespace breakages unfixed, and fixing them makes the
1736 * hunk match. Update the context lines in the postimage.
1738 update_pre_post_images(preimage, postimage,
1739 fixed_buf, buf - fixed_buf);
1740 return 1;
1742 unmatch_exit:
1743 free(fixed_buf);
1744 return 0;
1747 static int find_pos(struct image *img,
1748 struct image *preimage,
1749 struct image *postimage,
1750 int line,
1751 unsigned ws_rule,
1752 int match_beginning, int match_end)
1754 int i;
1755 unsigned long backwards, forwards, try;
1756 int backwards_lno, forwards_lno, try_lno;
1758 if (preimage->nr > img->nr)
1759 return -1;
1762 * If match_begining or match_end is specified, there is no
1763 * point starting from a wrong line that will never match and
1764 * wander around and wait for a match at the specified end.
1766 if (match_beginning)
1767 line = 0;
1768 else if (match_end)
1769 line = img->nr - preimage->nr;
1771 if (line > img->nr)
1772 line = img->nr;
1774 try = 0;
1775 for (i = 0; i < line; i++)
1776 try += img->line[i].len;
1779 * There's probably some smart way to do this, but I'll leave
1780 * that to the smart and beautiful people. I'm simple and stupid.
1782 backwards = try;
1783 backwards_lno = line;
1784 forwards = try;
1785 forwards_lno = line;
1786 try_lno = line;
1788 for (i = 0; ; i++) {
1789 if (match_fragment(img, preimage, postimage,
1790 try, try_lno, ws_rule,
1791 match_beginning, match_end))
1792 return try_lno;
1794 again:
1795 if (backwards_lno == 0 && forwards_lno == img->nr)
1796 break;
1798 if (i & 1) {
1799 if (backwards_lno == 0) {
1800 i++;
1801 goto again;
1803 backwards_lno--;
1804 backwards -= img->line[backwards_lno].len;
1805 try = backwards;
1806 try_lno = backwards_lno;
1807 } else {
1808 if (forwards_lno == img->nr) {
1809 i++;
1810 goto again;
1812 forwards += img->line[forwards_lno].len;
1813 forwards_lno++;
1814 try = forwards;
1815 try_lno = forwards_lno;
1819 return -1;
1822 static void remove_first_line(struct image *img)
1824 img->buf += img->line[0].len;
1825 img->len -= img->line[0].len;
1826 img->line++;
1827 img->nr--;
1830 static void remove_last_line(struct image *img)
1832 img->len -= img->line[--img->nr].len;
1835 static void update_image(struct image *img,
1836 int applied_pos,
1837 struct image *preimage,
1838 struct image *postimage)
1841 * remove the copy of preimage at offset in img
1842 * and replace it with postimage
1844 int i, nr;
1845 size_t remove_count, insert_count, applied_at = 0;
1846 char *result;
1848 for (i = 0; i < applied_pos; i++)
1849 applied_at += img->line[i].len;
1851 remove_count = 0;
1852 for (i = 0; i < preimage->nr; i++)
1853 remove_count += img->line[applied_pos + i].len;
1854 insert_count = postimage->len;
1856 /* Adjust the contents */
1857 result = xmalloc(img->len + insert_count - remove_count + 1);
1858 memcpy(result, img->buf, applied_at);
1859 memcpy(result + applied_at, postimage->buf, postimage->len);
1860 memcpy(result + applied_at + postimage->len,
1861 img->buf + (applied_at + remove_count),
1862 img->len - (applied_at + remove_count));
1863 free(img->buf);
1864 img->buf = result;
1865 img->len += insert_count - remove_count;
1866 result[img->len] = '\0';
1868 /* Adjust the line table */
1869 nr = img->nr + postimage->nr - preimage->nr;
1870 if (preimage->nr < postimage->nr) {
1872 * NOTE: this knows that we never call remove_first_line()
1873 * on anything other than pre/post image.
1875 img->line = xrealloc(img->line, nr * sizeof(*img->line));
1876 img->line_allocated = img->line;
1878 if (preimage->nr != postimage->nr)
1879 memmove(img->line + applied_pos + postimage->nr,
1880 img->line + applied_pos + preimage->nr,
1881 (img->nr - (applied_pos + preimage->nr)) *
1882 sizeof(*img->line));
1883 memcpy(img->line + applied_pos,
1884 postimage->line,
1885 postimage->nr * sizeof(*img->line));
1886 img->nr = nr;
1889 static int apply_one_fragment(struct image *img, struct fragment *frag,
1890 int inaccurate_eof, unsigned ws_rule)
1892 int match_beginning, match_end;
1893 const char *patch = frag->patch;
1894 int size = frag->size;
1895 char *old, *new, *oldlines, *newlines;
1896 int new_blank_lines_at_end = 0;
1897 unsigned long leading, trailing;
1898 int pos, applied_pos;
1899 struct image preimage;
1900 struct image postimage;
1902 memset(&preimage, 0, sizeof(preimage));
1903 memset(&postimage, 0, sizeof(postimage));
1904 oldlines = xmalloc(size);
1905 newlines = xmalloc(size);
1907 old = oldlines;
1908 new = newlines;
1909 while (size > 0) {
1910 char first;
1911 int len = linelen(patch, size);
1912 int plen, added;
1913 int added_blank_line = 0;
1915 if (!len)
1916 break;
1919 * "plen" is how much of the line we should use for
1920 * the actual patch data. Normally we just remove the
1921 * first character on the line, but if the line is
1922 * followed by "\ No newline", then we also remove the
1923 * last one (which is the newline, of course).
1925 plen = len - 1;
1926 if (len < size && patch[len] == '\\')
1927 plen--;
1928 first = *patch;
1929 if (apply_in_reverse) {
1930 if (first == '-')
1931 first = '+';
1932 else if (first == '+')
1933 first = '-';
1936 switch (first) {
1937 case '\n':
1938 /* Newer GNU diff, empty context line */
1939 if (plen < 0)
1940 /* ... followed by '\No newline'; nothing */
1941 break;
1942 *old++ = '\n';
1943 *new++ = '\n';
1944 add_line_info(&preimage, "\n", 1, LINE_COMMON);
1945 add_line_info(&postimage, "\n", 1, LINE_COMMON);
1946 break;
1947 case ' ':
1948 case '-':
1949 memcpy(old, patch + 1, plen);
1950 add_line_info(&preimage, old, plen,
1951 (first == ' ' ? LINE_COMMON : 0));
1952 old += plen;
1953 if (first == '-')
1954 break;
1955 /* Fall-through for ' ' */
1956 case '+':
1957 /* --no-add does not add new lines */
1958 if (first == '+' && no_add)
1959 break;
1961 if (first != '+' ||
1962 !whitespace_error ||
1963 ws_error_action != correct_ws_error) {
1964 memcpy(new, patch + 1, plen);
1965 added = plen;
1967 else {
1968 added = ws_fix_copy(new, patch + 1, plen, ws_rule, &applied_after_fixing_ws);
1970 add_line_info(&postimage, new, added,
1971 (first == '+' ? 0 : LINE_COMMON));
1972 new += added;
1973 if (first == '+' &&
1974 added == 1 && new[-1] == '\n')
1975 added_blank_line = 1;
1976 break;
1977 case '@': case '\\':
1978 /* Ignore it, we already handled it */
1979 break;
1980 default:
1981 if (apply_verbosely)
1982 error("invalid start of line: '%c'", first);
1983 return -1;
1985 if (added_blank_line)
1986 new_blank_lines_at_end++;
1987 else
1988 new_blank_lines_at_end = 0;
1989 patch += len;
1990 size -= len;
1992 if (inaccurate_eof &&
1993 old > oldlines && old[-1] == '\n' &&
1994 new > newlines && new[-1] == '\n') {
1995 old--;
1996 new--;
1999 leading = frag->leading;
2000 trailing = frag->trailing;
2003 * A hunk to change lines at the beginning would begin with
2004 * @@ -1,L +N,M @@
2005 * but we need to be careful. -U0 that inserts before the second
2006 * line also has this pattern.
2008 * And a hunk to add to an empty file would begin with
2009 * @@ -0,0 +N,M @@
2011 * In other words, a hunk that is (frag->oldpos <= 1) with or
2012 * without leading context must match at the beginning.
2014 match_beginning = (!frag->oldpos ||
2015 (frag->oldpos == 1 && !unidiff_zero));
2018 * A hunk without trailing lines must match at the end.
2019 * However, we simply cannot tell if a hunk must match end
2020 * from the lack of trailing lines if the patch was generated
2021 * with unidiff without any context.
2023 match_end = !unidiff_zero && !trailing;
2025 pos = frag->newpos ? (frag->newpos - 1) : 0;
2026 preimage.buf = oldlines;
2027 preimage.len = old - oldlines;
2028 postimage.buf = newlines;
2029 postimage.len = new - newlines;
2030 preimage.line = preimage.line_allocated;
2031 postimage.line = postimage.line_allocated;
2033 for (;;) {
2035 applied_pos = find_pos(img, &preimage, &postimage, pos,
2036 ws_rule, match_beginning, match_end);
2038 if (applied_pos >= 0)
2039 break;
2041 /* Am I at my context limits? */
2042 if ((leading <= p_context) && (trailing <= p_context))
2043 break;
2044 if (match_beginning || match_end) {
2045 match_beginning = match_end = 0;
2046 continue;
2050 * Reduce the number of context lines; reduce both
2051 * leading and trailing if they are equal otherwise
2052 * just reduce the larger context.
2054 if (leading >= trailing) {
2055 remove_first_line(&preimage);
2056 remove_first_line(&postimage);
2057 pos--;
2058 leading--;
2060 if (trailing > leading) {
2061 remove_last_line(&preimage);
2062 remove_last_line(&postimage);
2063 trailing--;
2067 if (applied_pos >= 0) {
2068 if (ws_error_action == correct_ws_error &&
2069 new_blank_lines_at_end &&
2070 postimage.nr + applied_pos == img->nr) {
2072 * If the patch application adds blank lines
2073 * at the end, and if the patch applies at the
2074 * end of the image, remove those added blank
2075 * lines.
2077 while (new_blank_lines_at_end--)
2078 remove_last_line(&postimage);
2082 * Warn if it was necessary to reduce the number
2083 * of context lines.
2085 if ((leading != frag->leading) ||
2086 (trailing != frag->trailing))
2087 fprintf(stderr, "Context reduced to (%ld/%ld)"
2088 " to apply fragment at %d\n",
2089 leading, trailing, applied_pos+1);
2090 update_image(img, applied_pos, &preimage, &postimage);
2091 } else {
2092 if (apply_verbosely)
2093 error("while searching for:\n%.*s",
2094 (int)(old - oldlines), oldlines);
2097 free(oldlines);
2098 free(newlines);
2099 free(preimage.line_allocated);
2100 free(postimage.line_allocated);
2102 return (applied_pos < 0);
2105 static int apply_binary_fragment(struct image *img, struct patch *patch)
2107 struct fragment *fragment = patch->fragments;
2108 unsigned long len;
2109 void *dst;
2111 /* Binary patch is irreversible without the optional second hunk */
2112 if (apply_in_reverse) {
2113 if (!fragment->next)
2114 return error("cannot reverse-apply a binary patch "
2115 "without the reverse hunk to '%s'",
2116 patch->new_name
2117 ? patch->new_name : patch->old_name);
2118 fragment = fragment->next;
2120 switch (fragment->binary_patch_method) {
2121 case BINARY_DELTA_DEFLATED:
2122 dst = patch_delta(img->buf, img->len, fragment->patch,
2123 fragment->size, &len);
2124 if (!dst)
2125 return -1;
2126 clear_image(img);
2127 img->buf = dst;
2128 img->len = len;
2129 return 0;
2130 case BINARY_LITERAL_DEFLATED:
2131 clear_image(img);
2132 img->len = fragment->size;
2133 img->buf = xmalloc(img->len+1);
2134 memcpy(img->buf, fragment->patch, img->len);
2135 img->buf[img->len] = '\0';
2136 return 0;
2138 return -1;
2141 static int apply_binary(struct image *img, struct patch *patch)
2143 const char *name = patch->old_name ? patch->old_name : patch->new_name;
2144 unsigned char sha1[20];
2147 * For safety, we require patch index line to contain
2148 * full 40-byte textual SHA1 for old and new, at least for now.
2150 if (strlen(patch->old_sha1_prefix) != 40 ||
2151 strlen(patch->new_sha1_prefix) != 40 ||
2152 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
2153 get_sha1_hex(patch->new_sha1_prefix, sha1))
2154 return error("cannot apply binary patch to '%s' "
2155 "without full index line", name);
2157 if (patch->old_name) {
2159 * See if the old one matches what the patch
2160 * applies to.
2162 hash_sha1_file(img->buf, img->len, blob_type, sha1);
2163 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
2164 return error("the patch applies to '%s' (%s), "
2165 "which does not match the "
2166 "current contents.",
2167 name, sha1_to_hex(sha1));
2169 else {
2170 /* Otherwise, the old one must be empty. */
2171 if (img->len)
2172 return error("the patch applies to an empty "
2173 "'%s' but it is not empty", name);
2176 get_sha1_hex(patch->new_sha1_prefix, sha1);
2177 if (is_null_sha1(sha1)) {
2178 clear_image(img);
2179 return 0; /* deletion patch */
2182 if (has_sha1_file(sha1)) {
2183 /* We already have the postimage */
2184 enum object_type type;
2185 unsigned long size;
2186 char *result;
2188 result = read_sha1_file(sha1, &type, &size);
2189 if (!result)
2190 return error("the necessary postimage %s for "
2191 "'%s' cannot be read",
2192 patch->new_sha1_prefix, name);
2193 clear_image(img);
2194 img->buf = result;
2195 img->len = size;
2196 } else {
2198 * We have verified buf matches the preimage;
2199 * apply the patch data to it, which is stored
2200 * in the patch->fragments->{patch,size}.
2202 if (apply_binary_fragment(img, patch))
2203 return error("binary patch does not apply to '%s'",
2204 name);
2206 /* verify that the result matches */
2207 hash_sha1_file(img->buf, img->len, blob_type, sha1);
2208 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
2209 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",
2210 name, patch->new_sha1_prefix, sha1_to_hex(sha1));
2213 return 0;
2216 static int apply_fragments(struct image *img, struct patch *patch)
2218 struct fragment *frag = patch->fragments;
2219 const char *name = patch->old_name ? patch->old_name : patch->new_name;
2220 unsigned ws_rule = patch->ws_rule;
2221 unsigned inaccurate_eof = patch->inaccurate_eof;
2223 if (patch->is_binary)
2224 return apply_binary(img, patch);
2226 while (frag) {
2227 if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule)) {
2228 error("patch failed: %s:%ld", name, frag->oldpos);
2229 if (!apply_with_reject)
2230 return -1;
2231 frag->rejected = 1;
2233 frag = frag->next;
2235 return 0;
2238 static int read_file_or_gitlink(struct cache_entry *ce, struct strbuf *buf)
2240 if (!ce)
2241 return 0;
2243 if (S_ISGITLINK(ce->ce_mode)) {
2244 strbuf_grow(buf, 100);
2245 strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(ce->sha1));
2246 } else {
2247 enum object_type type;
2248 unsigned long sz;
2249 char *result;
2251 result = read_sha1_file(ce->sha1, &type, &sz);
2252 if (!result)
2253 return -1;
2254 /* XXX read_sha1_file NUL-terminates */
2255 strbuf_attach(buf, result, sz, sz + 1);
2257 return 0;
2260 static struct patch *in_fn_table(const char *name)
2262 struct string_list_item *item;
2264 if (name == NULL)
2265 return NULL;
2267 item = string_list_lookup(name, &fn_table);
2268 if (item != NULL)
2269 return (struct patch *)item->util;
2271 return NULL;
2274 static void add_to_fn_table(struct patch *patch)
2276 struct string_list_item *item;
2279 * Always add new_name unless patch is a deletion
2280 * This should cover the cases for normal diffs,
2281 * file creations and copies
2283 if (patch->new_name != NULL) {
2284 item = string_list_insert(patch->new_name, &fn_table);
2285 item->util = patch;
2289 * store a failure on rename/deletion cases because
2290 * later chunks shouldn't patch old names
2292 if ((patch->new_name == NULL) || (patch->is_rename)) {
2293 item = string_list_insert(patch->old_name, &fn_table);
2294 item->util = (struct patch *) -1;
2298 static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
2300 struct strbuf buf = STRBUF_INIT;
2301 struct image image;
2302 size_t len;
2303 char *img;
2304 struct patch *tpatch;
2306 if (!(patch->is_copy || patch->is_rename) &&
2307 ((tpatch = in_fn_table(patch->old_name)) != NULL)) {
2308 if (tpatch == (struct patch *) -1) {
2309 return error("patch %s has been renamed/deleted",
2310 patch->old_name);
2312 /* We have a patched copy in memory use that */
2313 strbuf_add(&buf, tpatch->result, tpatch->resultsize);
2314 } else if (cached) {
2315 if (read_file_or_gitlink(ce, &buf))
2316 return error("read of %s failed", patch->old_name);
2317 } else if (patch->old_name) {
2318 if (S_ISGITLINK(patch->old_mode)) {
2319 if (ce) {
2320 read_file_or_gitlink(ce, &buf);
2321 } else {
2323 * There is no way to apply subproject
2324 * patch without looking at the index.
2326 patch->fragments = NULL;
2328 } else {
2329 if (read_old_data(st, patch->old_name, &buf))
2330 return error("read of %s failed", patch->old_name);
2334 img = strbuf_detach(&buf, &len);
2335 prepare_image(&image, img, len, !patch->is_binary);
2337 if (apply_fragments(&image, patch) < 0)
2338 return -1; /* note with --reject this succeeds. */
2339 patch->result = image.buf;
2340 patch->resultsize = image.len;
2341 add_to_fn_table(patch);
2342 free(image.line_allocated);
2344 if (0 < patch->is_delete && patch->resultsize)
2345 return error("removal patch leaves file contents");
2347 return 0;
2350 static int check_to_create_blob(const char *new_name, int ok_if_exists)
2352 struct stat nst;
2353 if (!lstat(new_name, &nst)) {
2354 if (S_ISDIR(nst.st_mode) || ok_if_exists)
2355 return 0;
2357 * A leading component of new_name might be a symlink
2358 * that is going to be removed with this patch, but
2359 * still pointing at somewhere that has the path.
2360 * In such a case, path "new_name" does not exist as
2361 * far as git is concerned.
2363 if (has_symlink_leading_path(strlen(new_name), new_name))
2364 return 0;
2366 return error("%s: already exists in working directory", new_name);
2368 else if ((errno != ENOENT) && (errno != ENOTDIR))
2369 return error("%s: %s", new_name, strerror(errno));
2370 return 0;
2373 static int verify_index_match(struct cache_entry *ce, struct stat *st)
2375 if (S_ISGITLINK(ce->ce_mode)) {
2376 if (!S_ISDIR(st->st_mode))
2377 return -1;
2378 return 0;
2380 return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID);
2383 static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)
2385 const char *old_name = patch->old_name;
2386 struct patch *tpatch = NULL;
2387 int stat_ret = 0;
2388 unsigned st_mode = 0;
2391 * Make sure that we do not have local modifications from the
2392 * index when we are looking at the index. Also make sure
2393 * we have the preimage file to be patched in the work tree,
2394 * unless --cached, which tells git to apply only in the index.
2396 if (!old_name)
2397 return 0;
2399 assert(patch->is_new <= 0);
2401 if (!(patch->is_copy || patch->is_rename) &&
2402 (tpatch = in_fn_table(old_name)) != NULL) {
2403 if (tpatch == (struct patch *) -1) {
2404 return error("%s: has been deleted/renamed", old_name);
2406 st_mode = tpatch->new_mode;
2407 } else if (!cached) {
2408 stat_ret = lstat(old_name, st);
2409 if (stat_ret && errno != ENOENT)
2410 return error("%s: %s", old_name, strerror(errno));
2413 if (check_index && !tpatch) {
2414 int pos = cache_name_pos(old_name, strlen(old_name));
2415 if (pos < 0) {
2416 if (patch->is_new < 0)
2417 goto is_new;
2418 return error("%s: does not exist in index", old_name);
2420 *ce = active_cache[pos];
2421 if (stat_ret < 0) {
2422 struct checkout costate;
2423 /* checkout */
2424 costate.base_dir = "";
2425 costate.base_dir_len = 0;
2426 costate.force = 0;
2427 costate.quiet = 0;
2428 costate.not_new = 0;
2429 costate.refresh_cache = 1;
2430 if (checkout_entry(*ce, &costate, NULL) ||
2431 lstat(old_name, st))
2432 return -1;
2434 if (!cached && verify_index_match(*ce, st))
2435 return error("%s: does not match index", old_name);
2436 if (cached)
2437 st_mode = (*ce)->ce_mode;
2438 } else if (stat_ret < 0) {
2439 if (patch->is_new < 0)
2440 goto is_new;
2441 return error("%s: %s", old_name, strerror(errno));
2444 if (!cached && !tpatch)
2445 st_mode = ce_mode_from_stat(*ce, st->st_mode);
2447 if (patch->is_new < 0)
2448 patch->is_new = 0;
2449 if (!patch->old_mode)
2450 patch->old_mode = st_mode;
2451 if ((st_mode ^ patch->old_mode) & S_IFMT)
2452 return error("%s: wrong type", old_name);
2453 if (st_mode != patch->old_mode)
2454 fprintf(stderr, "warning: %s has type %o, expected %o\n",
2455 old_name, st_mode, patch->old_mode);
2456 if (!patch->new_mode && !patch->is_delete)
2457 patch->new_mode = st_mode;
2458 return 0;
2460 is_new:
2461 patch->is_new = 1;
2462 patch->is_delete = 0;
2463 patch->old_name = NULL;
2464 return 0;
2467 static int check_patch(struct patch *patch)
2469 struct stat st;
2470 const char *old_name = patch->old_name;
2471 const char *new_name = patch->new_name;
2472 const char *name = old_name ? old_name : new_name;
2473 struct cache_entry *ce = NULL;
2474 int ok_if_exists;
2475 int status;
2477 patch->rejected = 1; /* we will drop this after we succeed */
2479 status = check_preimage(patch, &ce, &st);
2480 if (status)
2481 return status;
2482 old_name = patch->old_name;
2484 if (in_fn_table(new_name) == (struct patch *) -1)
2486 * A type-change diff is always split into a patch to
2487 * delete old, immediately followed by a patch to
2488 * create new (see diff.c::run_diff()); in such a case
2489 * it is Ok that the entry to be deleted by the
2490 * previous patch is still in the working tree and in
2491 * the index.
2493 ok_if_exists = 1;
2494 else
2495 ok_if_exists = 0;
2497 if (new_name &&
2498 ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {
2499 if (check_index &&
2500 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
2501 !ok_if_exists)
2502 return error("%s: already exists in index", new_name);
2503 if (!cached) {
2504 int err = check_to_create_blob(new_name, ok_if_exists);
2505 if (err)
2506 return err;
2508 if (!patch->new_mode) {
2509 if (0 < patch->is_new)
2510 patch->new_mode = S_IFREG | 0644;
2511 else
2512 patch->new_mode = patch->old_mode;
2516 if (new_name && old_name) {
2517 int same = !strcmp(old_name, new_name);
2518 if (!patch->new_mode)
2519 patch->new_mode = patch->old_mode;
2520 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
2521 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2522 patch->new_mode, new_name, patch->old_mode,
2523 same ? "" : " of ", same ? "" : old_name);
2526 if (apply_data(patch, &st, ce) < 0)
2527 return error("%s: patch does not apply", name);
2528 patch->rejected = 0;
2529 return 0;
2532 static int check_patch_list(struct patch *patch)
2534 int err = 0;
2536 while (patch) {
2537 if (apply_verbosely)
2538 say_patch_name(stderr,
2539 "Checking patch ", patch, "...\n");
2540 err |= check_patch(patch);
2541 patch = patch->next;
2543 return err;
2546 /* This function tries to read the sha1 from the current index */
2547 static int get_current_sha1(const char *path, unsigned char *sha1)
2549 int pos;
2551 if (read_cache() < 0)
2552 return -1;
2553 pos = cache_name_pos(path, strlen(path));
2554 if (pos < 0)
2555 return -1;
2556 hashcpy(sha1, active_cache[pos]->sha1);
2557 return 0;
2560 /* Build an index that contains the just the files needed for a 3way merge */
2561 static void build_fake_ancestor(struct patch *list, const char *filename)
2563 struct patch *patch;
2564 struct index_state result = { 0 };
2565 int fd;
2567 /* Once we start supporting the reverse patch, it may be
2568 * worth showing the new sha1 prefix, but until then...
2570 for (patch = list; patch; patch = patch->next) {
2571 const unsigned char *sha1_ptr;
2572 unsigned char sha1[20];
2573 struct cache_entry *ce;
2574 const char *name;
2576 name = patch->old_name ? patch->old_name : patch->new_name;
2577 if (0 < patch->is_new)
2578 continue;
2579 else if (get_sha1(patch->old_sha1_prefix, sha1))
2580 /* git diff has no index line for mode/type changes */
2581 if (!patch->lines_added && !patch->lines_deleted) {
2582 if (get_current_sha1(patch->new_name, sha1) ||
2583 get_current_sha1(patch->old_name, sha1))
2584 die("mode change for %s, which is not "
2585 "in current HEAD", name);
2586 sha1_ptr = sha1;
2587 } else
2588 die("sha1 information is lacking or useless "
2589 "(%s).", name);
2590 else
2591 sha1_ptr = sha1;
2593 ce = make_cache_entry(patch->old_mode, sha1_ptr, name, 0, 0);
2594 if (!ce)
2595 die("make_cache_entry failed for path '%s'", name);
2596 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))
2597 die ("Could not add %s to temporary index", name);
2600 fd = open(filename, O_WRONLY | O_CREAT, 0666);
2601 if (fd < 0 || write_index(&result, fd) || close(fd))
2602 die ("Could not write temporary index to %s", filename);
2604 discard_index(&result);
2607 static void stat_patch_list(struct patch *patch)
2609 int files, adds, dels;
2611 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
2612 files++;
2613 adds += patch->lines_added;
2614 dels += patch->lines_deleted;
2615 show_stats(patch);
2618 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
2621 static void numstat_patch_list(struct patch *patch)
2623 for ( ; patch; patch = patch->next) {
2624 const char *name;
2625 name = patch->new_name ? patch->new_name : patch->old_name;
2626 if (patch->is_binary)
2627 printf("-\t-\t");
2628 else
2629 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
2630 write_name_quoted(name, stdout, line_termination);
2634 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
2636 if (mode)
2637 printf(" %s mode %06o %s\n", newdelete, mode, name);
2638 else
2639 printf(" %s %s\n", newdelete, name);
2642 static void show_mode_change(struct patch *p, int show_name)
2644 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
2645 if (show_name)
2646 printf(" mode change %06o => %06o %s\n",
2647 p->old_mode, p->new_mode, p->new_name);
2648 else
2649 printf(" mode change %06o => %06o\n",
2650 p->old_mode, p->new_mode);
2654 static void show_rename_copy(struct patch *p)
2656 const char *renamecopy = p->is_rename ? "rename" : "copy";
2657 const char *old, *new;
2659 /* Find common prefix */
2660 old = p->old_name;
2661 new = p->new_name;
2662 while (1) {
2663 const char *slash_old, *slash_new;
2664 slash_old = strchr(old, '/');
2665 slash_new = strchr(new, '/');
2666 if (!slash_old ||
2667 !slash_new ||
2668 slash_old - old != slash_new - new ||
2669 memcmp(old, new, slash_new - new))
2670 break;
2671 old = slash_old + 1;
2672 new = slash_new + 1;
2674 /* p->old_name thru old is the common prefix, and old and new
2675 * through the end of names are renames
2677 if (old != p->old_name)
2678 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
2679 (int)(old - p->old_name), p->old_name,
2680 old, new, p->score);
2681 else
2682 printf(" %s %s => %s (%d%%)\n", renamecopy,
2683 p->old_name, p->new_name, p->score);
2684 show_mode_change(p, 0);
2687 static void summary_patch_list(struct patch *patch)
2689 struct patch *p;
2691 for (p = patch; p; p = p->next) {
2692 if (p->is_new)
2693 show_file_mode_name("create", p->new_mode, p->new_name);
2694 else if (p->is_delete)
2695 show_file_mode_name("delete", p->old_mode, p->old_name);
2696 else {
2697 if (p->is_rename || p->is_copy)
2698 show_rename_copy(p);
2699 else {
2700 if (p->score) {
2701 printf(" rewrite %s (%d%%)\n",
2702 p->new_name, p->score);
2703 show_mode_change(p, 0);
2705 else
2706 show_mode_change(p, 1);
2712 static void patch_stats(struct patch *patch)
2714 int lines = patch->lines_added + patch->lines_deleted;
2716 if (lines > max_change)
2717 max_change = lines;
2718 if (patch->old_name) {
2719 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
2720 if (!len)
2721 len = strlen(patch->old_name);
2722 if (len > max_len)
2723 max_len = len;
2725 if (patch->new_name) {
2726 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
2727 if (!len)
2728 len = strlen(patch->new_name);
2729 if (len > max_len)
2730 max_len = len;
2734 static void remove_file(struct patch *patch, int rmdir_empty)
2736 if (update_index) {
2737 if (remove_file_from_cache(patch->old_name) < 0)
2738 die("unable to remove %s from index", patch->old_name);
2740 if (!cached) {
2741 if (S_ISGITLINK(patch->old_mode)) {
2742 if (rmdir(patch->old_name))
2743 warning("unable to remove submodule %s",
2744 patch->old_name);
2745 } else if (!unlink(patch->old_name) && rmdir_empty) {
2746 remove_path(patch->old_name);
2751 static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
2753 struct stat st;
2754 struct cache_entry *ce;
2755 int namelen = strlen(path);
2756 unsigned ce_size = cache_entry_size(namelen);
2758 if (!update_index)
2759 return;
2761 ce = xcalloc(1, ce_size);
2762 memcpy(ce->name, path, namelen);
2763 ce->ce_mode = create_ce_mode(mode);
2764 ce->ce_flags = namelen;
2765 if (S_ISGITLINK(mode)) {
2766 const char *s = buf;
2768 if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))
2769 die("corrupt patch for subproject %s", path);
2770 } else {
2771 if (!cached) {
2772 if (lstat(path, &st) < 0)
2773 die("unable to stat newly created file %s",
2774 path);
2775 fill_stat_cache_info(ce, &st);
2777 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
2778 die("unable to create backing store for newly created file %s", path);
2780 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
2781 die("unable to add cache entry for %s", path);
2784 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
2786 int fd;
2787 struct strbuf nbuf = STRBUF_INIT;
2789 if (S_ISGITLINK(mode)) {
2790 struct stat st;
2791 if (!lstat(path, &st) && S_ISDIR(st.st_mode))
2792 return 0;
2793 return mkdir(path, 0777);
2796 if (has_symlinks && S_ISLNK(mode))
2797 /* Although buf:size is counted string, it also is NUL
2798 * terminated.
2800 return symlink(buf, path);
2802 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
2803 if (fd < 0)
2804 return -1;
2806 if (convert_to_working_tree(path, buf, size, &nbuf)) {
2807 size = nbuf.len;
2808 buf = nbuf.buf;
2810 write_or_die(fd, buf, size);
2811 strbuf_release(&nbuf);
2813 if (close(fd) < 0)
2814 die("closing file %s: %s", path, strerror(errno));
2815 return 0;
2819 * We optimistically assume that the directories exist,
2820 * which is true 99% of the time anyway. If they don't,
2821 * we create them and try again.
2823 static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
2825 if (cached)
2826 return;
2827 if (!try_create_file(path, mode, buf, size))
2828 return;
2830 if (errno == ENOENT) {
2831 if (safe_create_leading_directories(path))
2832 return;
2833 if (!try_create_file(path, mode, buf, size))
2834 return;
2837 if (errno == EEXIST || errno == EACCES) {
2838 /* We may be trying to create a file where a directory
2839 * used to be.
2841 struct stat st;
2842 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))
2843 errno = EEXIST;
2846 if (errno == EEXIST) {
2847 unsigned int nr = getpid();
2849 for (;;) {
2850 char newpath[PATH_MAX];
2851 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);
2852 if (!try_create_file(newpath, mode, buf, size)) {
2853 if (!rename(newpath, path))
2854 return;
2855 unlink(newpath);
2856 break;
2858 if (errno != EEXIST)
2859 break;
2860 ++nr;
2863 die("unable to write file %s mode %o", path, mode);
2866 static void create_file(struct patch *patch)
2868 char *path = patch->new_name;
2869 unsigned mode = patch->new_mode;
2870 unsigned long size = patch->resultsize;
2871 char *buf = patch->result;
2873 if (!mode)
2874 mode = S_IFREG | 0644;
2875 create_one_file(path, mode, buf, size);
2876 add_index_file(path, mode, buf, size);
2879 /* phase zero is to remove, phase one is to create */
2880 static void write_out_one_result(struct patch *patch, int phase)
2882 if (patch->is_delete > 0) {
2883 if (phase == 0)
2884 remove_file(patch, 1);
2885 return;
2887 if (patch->is_new > 0 || patch->is_copy) {
2888 if (phase == 1)
2889 create_file(patch);
2890 return;
2893 * Rename or modification boils down to the same
2894 * thing: remove the old, write the new
2896 if (phase == 0)
2897 remove_file(patch, patch->is_rename);
2898 if (phase == 1)
2899 create_file(patch);
2902 static int write_out_one_reject(struct patch *patch)
2904 FILE *rej;
2905 char namebuf[PATH_MAX];
2906 struct fragment *frag;
2907 int cnt = 0;
2909 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
2910 if (!frag->rejected)
2911 continue;
2912 cnt++;
2915 if (!cnt) {
2916 if (apply_verbosely)
2917 say_patch_name(stderr,
2918 "Applied patch ", patch, " cleanly.\n");
2919 return 0;
2922 /* This should not happen, because a removal patch that leaves
2923 * contents are marked "rejected" at the patch level.
2925 if (!patch->new_name)
2926 die("internal error");
2928 /* Say this even without --verbose */
2929 say_patch_name(stderr, "Applying patch ", patch, " with");
2930 fprintf(stderr, " %d rejects...\n", cnt);
2932 cnt = strlen(patch->new_name);
2933 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
2934 cnt = ARRAY_SIZE(namebuf) - 5;
2935 fprintf(stderr,
2936 "warning: truncating .rej filename to %.*s.rej",
2937 cnt - 1, patch->new_name);
2939 memcpy(namebuf, patch->new_name, cnt);
2940 memcpy(namebuf + cnt, ".rej", 5);
2942 rej = fopen(namebuf, "w");
2943 if (!rej)
2944 return error("cannot open %s: %s", namebuf, strerror(errno));
2946 /* Normal git tools never deal with .rej, so do not pretend
2947 * this is a git patch by saying --git nor give extended
2948 * headers. While at it, maybe please "kompare" that wants
2949 * the trailing TAB and some garbage at the end of line ;-).
2951 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
2952 patch->new_name, patch->new_name);
2953 for (cnt = 1, frag = patch->fragments;
2954 frag;
2955 cnt++, frag = frag->next) {
2956 if (!frag->rejected) {
2957 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);
2958 continue;
2960 fprintf(stderr, "Rejected hunk #%d.\n", cnt);
2961 fprintf(rej, "%.*s", frag->size, frag->patch);
2962 if (frag->patch[frag->size-1] != '\n')
2963 fputc('\n', rej);
2965 fclose(rej);
2966 return -1;
2969 static int write_out_results(struct patch *list, int skipped_patch)
2971 int phase;
2972 int errs = 0;
2973 struct patch *l;
2975 if (!list && !skipped_patch)
2976 return error("No changes");
2978 for (phase = 0; phase < 2; phase++) {
2979 l = list;
2980 while (l) {
2981 if (l->rejected)
2982 errs = 1;
2983 else {
2984 write_out_one_result(l, phase);
2985 if (phase == 1 && write_out_one_reject(l))
2986 errs = 1;
2988 l = l->next;
2991 return errs;
2994 static struct lock_file lock_file;
2996 static struct string_list limit_by_name;
2997 static int has_include;
2998 static void add_name_limit(const char *name, int exclude)
3000 struct string_list_item *it;
3002 it = string_list_append(name, &limit_by_name);
3003 it->util = exclude ? NULL : (void *) 1;
3006 static int use_patch(struct patch *p)
3008 const char *pathname = p->new_name ? p->new_name : p->old_name;
3009 int i;
3011 /* Paths outside are not touched regardless of "--include" */
3012 if (0 < prefix_length) {
3013 int pathlen = strlen(pathname);
3014 if (pathlen <= prefix_length ||
3015 memcmp(prefix, pathname, prefix_length))
3016 return 0;
3019 /* See if it matches any of exclude/include rule */
3020 for (i = 0; i < limit_by_name.nr; i++) {
3021 struct string_list_item *it = &limit_by_name.items[i];
3022 if (!fnmatch(it->string, pathname, 0))
3023 return (it->util != NULL);
3027 * If we had any include, a path that does not match any rule is
3028 * not used. Otherwise, we saw bunch of exclude rules (or none)
3029 * and such a path is used.
3031 return !has_include;
3035 static void prefix_one(char **name)
3037 char *old_name = *name;
3038 if (!old_name)
3039 return;
3040 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));
3041 free(old_name);
3044 static void prefix_patches(struct patch *p)
3046 if (!prefix || p->is_toplevel_relative)
3047 return;
3048 for ( ; p; p = p->next) {
3049 if (p->new_name == p->old_name) {
3050 char *prefixed = p->new_name;
3051 prefix_one(&prefixed);
3052 p->new_name = p->old_name = prefixed;
3054 else {
3055 prefix_one(&p->new_name);
3056 prefix_one(&p->old_name);
3061 #define INACCURATE_EOF (1<<0)
3062 #define RECOUNT (1<<1)
3064 static int apply_patch(int fd, const char *filename, int options)
3066 size_t offset;
3067 struct strbuf buf = STRBUF_INIT;
3068 struct patch *list = NULL, **listp = &list;
3069 int skipped_patch = 0;
3071 /* FIXME - memory leak when using multiple patch files as inputs */
3072 memset(&fn_table, 0, sizeof(struct string_list));
3073 patch_input_file = filename;
3074 read_patch_file(&buf, fd);
3075 offset = 0;
3076 while (offset < buf.len) {
3077 struct patch *patch;
3078 int nr;
3080 patch = xcalloc(1, sizeof(*patch));
3081 patch->inaccurate_eof = !!(options & INACCURATE_EOF);
3082 patch->recount = !!(options & RECOUNT);
3083 nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);
3084 if (nr < 0)
3085 break;
3086 if (apply_in_reverse)
3087 reverse_patches(patch);
3088 if (prefix)
3089 prefix_patches(patch);
3090 if (use_patch(patch)) {
3091 patch_stats(patch);
3092 *listp = patch;
3093 listp = &patch->next;
3095 else {
3096 /* perhaps free it a bit better? */
3097 free(patch);
3098 skipped_patch++;
3100 offset += nr;
3103 if (whitespace_error && (ws_error_action == die_on_ws_error))
3104 apply = 0;
3106 update_index = check_index && apply;
3107 if (update_index && newfd < 0)
3108 newfd = hold_locked_index(&lock_file, 1);
3110 if (check_index) {
3111 if (read_cache() < 0)
3112 die("unable to read index file");
3115 if ((check || apply) &&
3116 check_patch_list(list) < 0 &&
3117 !apply_with_reject)
3118 exit(1);
3120 if (apply && write_out_results(list, skipped_patch))
3121 exit(1);
3123 if (fake_ancestor)
3124 build_fake_ancestor(list, fake_ancestor);
3126 if (diffstat)
3127 stat_patch_list(list);
3129 if (numstat)
3130 numstat_patch_list(list);
3132 if (summary)
3133 summary_patch_list(list);
3135 strbuf_release(&buf);
3136 return 0;
3139 static int git_apply_config(const char *var, const char *value, void *cb)
3141 if (!strcmp(var, "apply.whitespace"))
3142 return git_config_string(&apply_default_whitespace, var, value);
3143 return git_default_config(var, value, cb);
3146 static int option_parse_exclude(const struct option *opt,
3147 const char *arg, int unset)
3149 add_name_limit(arg, 1);
3150 return 0;
3153 static int option_parse_include(const struct option *opt,
3154 const char *arg, int unset)
3156 add_name_limit(arg, 0);
3157 has_include = 1;
3158 return 0;
3161 static int option_parse_p(const struct option *opt,
3162 const char *arg, int unset)
3164 p_value = atoi(arg);
3165 p_value_known = 1;
3166 return 0;
3169 static int option_parse_z(const struct option *opt,
3170 const char *arg, int unset)
3172 if (unset)
3173 line_termination = '\n';
3174 else
3175 line_termination = 0;
3176 return 0;
3179 static int option_parse_whitespace(const struct option *opt,
3180 const char *arg, int unset)
3182 const char **whitespace_option = opt->value;
3184 *whitespace_option = arg;
3185 parse_whitespace_option(arg);
3186 return 0;
3189 static int option_parse_directory(const struct option *opt,
3190 const char *arg, int unset)
3192 root_len = strlen(arg);
3193 if (root_len && arg[root_len - 1] != '/') {
3194 char *new_root;
3195 root = new_root = xmalloc(root_len + 2);
3196 strcpy(new_root, arg);
3197 strcpy(new_root + root_len++, "/");
3198 } else
3199 root = arg;
3200 return 0;
3203 int cmd_apply(int argc, const char **argv, const char *unused_prefix)
3205 int i;
3206 int errs = 0;
3207 int is_not_gitdir;
3208 int binary;
3209 int force_apply = 0;
3211 const char *whitespace_option = NULL;
3213 struct option builtin_apply_options[] = {
3214 { OPTION_CALLBACK, 0, "exclude", NULL, "path",
3215 "donĀ“t apply changes matching the given path",
3216 0, option_parse_exclude },
3217 { OPTION_CALLBACK, 0, "include", NULL, "path",
3218 "apply changes matching the given path",
3219 0, option_parse_include },
3220 { OPTION_CALLBACK, 'p', NULL, NULL, "num",
3221 "remove <num> leading slashes from traditional diff paths",
3222 0, option_parse_p },
3223 OPT_BOOLEAN(0, "no-add", &no_add,
3224 "ignore additions made by the patch"),
3225 OPT_BOOLEAN(0, "stat", &diffstat,
3226 "instead of applying the patch, output diffstat for the input"),
3227 OPT_BOOLEAN(0, "allow-binary-replacement", &binary,
3228 "now no-op"),
3229 OPT_BOOLEAN(0, "binary", &binary,
3230 "now no-op"),
3231 OPT_BOOLEAN(0, "numstat", &numstat,
3232 "shows number of added and deleted lines in decimal notation"),
3233 OPT_BOOLEAN(0, "summary", &summary,
3234 "instead of applying the patch, output a summary for the input"),
3235 OPT_BOOLEAN(0, "check", &check,
3236 "instead of applying the patch, see if the patch is applicable"),
3237 OPT_BOOLEAN(0, "index", &check_index,
3238 "make sure the patch is applicable to the current index"),
3239 OPT_BOOLEAN(0, "cached", &cached,
3240 "apply a patch without touching the working tree"),
3241 OPT_BOOLEAN(0, "apply", &force_apply,
3242 "also apply the patch (use with --stat/--summary/--check)"),
3243 OPT_STRING(0, "build-fake-ancestor", &fake_ancestor, "file",
3244 "build a temporary index based on embedded index information"),
3245 { OPTION_CALLBACK, 'z', NULL, NULL, NULL,
3246 "paths are separated with NUL character",
3247 PARSE_OPT_NOARG, option_parse_z },
3248 OPT_INTEGER('C', NULL, &p_context,
3249 "ensure at least <n> lines of context match"),
3250 { OPTION_CALLBACK, 0, "whitespace", &whitespace_option, "action",
3251 "detect new or modified lines that have whitespace errors",
3252 0, option_parse_whitespace },
3253 OPT_BOOLEAN('R', "reverse", &apply_in_reverse,
3254 "apply the patch in reverse"),
3255 OPT_BOOLEAN(0, "unidiff-zero", &unidiff_zero,
3256 "don't expect at least one line of context"),
3257 OPT_BOOLEAN(0, "reject", &apply_with_reject,
3258 "leave the rejected hunks in corresponding *.rej files"),
3259 OPT__VERBOSE(&apply_verbosely),
3260 OPT_BIT(0, "inaccurate-eof", &options,
3261 "tolerate incorrectly detected missing new-line at the end of file",
3262 INACCURATE_EOF),
3263 OPT_BIT(0, "recount", &options,
3264 "do not trust the line counts in the hunk headers",
3265 RECOUNT),
3266 { OPTION_CALLBACK, 0, "directory", NULL, "root",
3267 "prepend <root> to all filenames",
3268 0, option_parse_directory },
3269 OPT_END()
3272 prefix = setup_git_directory_gently(&is_not_gitdir);
3273 prefix_length = prefix ? strlen(prefix) : 0;
3274 git_config(git_apply_config, NULL);
3275 if (apply_default_whitespace)
3276 parse_whitespace_option(apply_default_whitespace);
3278 argc = parse_options(argc, argv, builtin_apply_options,
3279 apply_usage, 0);
3280 if (apply_with_reject)
3281 apply = apply_verbosely = 1;
3282 if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor))
3283 apply = 0;
3284 if (check_index && is_not_gitdir)
3285 die("--index outside a repository");
3286 if (cached) {
3287 if (is_not_gitdir)
3288 die("--cached outside a repository");
3289 check_index = 1;
3291 for (i = 0; i < argc; i++) {
3292 const char *arg = argv[i];
3293 int fd;
3295 if (!strcmp(arg, "-")) {
3296 errs |= apply_patch(0, "<stdin>", options);
3297 read_stdin = 0;
3298 continue;
3299 } else if (0 < prefix_length)
3300 arg = prefix_filename(prefix, prefix_length, arg);
3302 fd = open(arg, O_RDONLY);
3303 if (fd < 0)
3304 die("can't open patch '%s': %s", arg, strerror(errno));
3305 read_stdin = 0;
3306 set_default_whitespace_mode(whitespace_option);
3307 errs |= apply_patch(fd, arg, options);
3308 close(fd);
3310 set_default_whitespace_mode(whitespace_option);
3311 if (read_stdin)
3312 errs |= apply_patch(0, "<stdin>", options);
3313 if (whitespace_error) {
3314 if (squelch_whitespace_errors &&
3315 squelch_whitespace_errors < whitespace_error) {
3316 int squelched =
3317 whitespace_error - squelch_whitespace_errors;
3318 fprintf(stderr, "warning: squelched %d "
3319 "whitespace error%s\n",
3320 squelched,
3321 squelched == 1 ? "" : "s");
3323 if (ws_error_action == die_on_ws_error)
3324 die("%d line%s add%s whitespace errors.",
3325 whitespace_error,
3326 whitespace_error == 1 ? "" : "s",
3327 whitespace_error == 1 ? "s" : "");
3328 if (applied_after_fixing_ws && apply)
3329 fprintf(stderr, "warning: %d line%s applied after"
3330 " fixing whitespace errors.\n",
3331 applied_after_fixing_ws,
3332 applied_after_fixing_ws == 1 ? "" : "s");
3333 else if (whitespace_error)
3334 fprintf(stderr, "warning: %d line%s add%s whitespace errors.\n",
3335 whitespace_error,
3336 whitespace_error == 1 ? "" : "s",
3337 whitespace_error == 1 ? "s" : "");
3340 if (update_index) {
3341 if (write_cache(newfd, active_cache, active_nr) ||
3342 commit_locked_index(&lock_file))
3343 die("Unable to write new index file");
3346 return !!errs;