1 /*
2 * apply.c
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 *
6 * This applies patches on top of some (arbitrary) version of the SCM.
7 *
8 */
9 #include "cache.h"
10 #include "cache-tree.h"
11 #include "quote.h"
12 #include "blob.h"
13 #include "delta.h"
14 #include "builtin.h"
15 #include "string-list.h"
16 #include "dir.h"
18 /*
19 * --check turns on checking that the working tree matches the
20 * files that are being modified, but doesn't apply the patch
21 * --stat does just a diffstat, and doesn't actually apply
22 * --numstat does numeric diffstat, and doesn't actually apply
23 * --index-info shows the old and new index info for paths if available.
24 * --index updates the cache as well.
25 * --cached updates only the cache without ever touching the working tree.
26 */
27 static const char *prefix;
28 static int prefix_length = -1;
29 static int newfd = -1;
31 static int unidiff_zero;
32 static int p_value = 1;
33 static int p_value_known;
34 static int check_index;
35 static int update_index;
36 static int cached;
37 static int diffstat;
38 static int numstat;
39 static int summary;
40 static int check;
41 static int apply = 1;
42 static int apply_in_reverse;
43 static int apply_with_reject;
44 static int apply_verbosely;
45 static int no_add;
46 static const char *fake_ancestor;
47 static int line_termination = '\n';
48 static unsigned long p_context = ULONG_MAX;
49 static const char apply_usage[] =
50 "git apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|fix|error|error-all>] <patch>...";
52 static enum ws_error_action {
53 nowarn_ws_error,
54 warn_on_ws_error,
55 die_on_ws_error,
56 correct_ws_error,
57 } ws_error_action = warn_on_ws_error;
58 static int whitespace_error;
59 static int squelch_whitespace_errors = 5;
60 static int applied_after_fixing_ws;
61 static const char *patch_input_file;
62 static const char *root;
63 static int root_len;
65 static void parse_whitespace_option(const char *option)
66 {
67 if (!option) {
68 ws_error_action = warn_on_ws_error;
69 return;
70 }
71 if (!strcmp(option, "warn")) {
72 ws_error_action = warn_on_ws_error;
73 return;
74 }
75 if (!strcmp(option, "nowarn")) {
76 ws_error_action = nowarn_ws_error;
77 return;
78 }
79 if (!strcmp(option, "error")) {
80 ws_error_action = die_on_ws_error;
81 return;
82 }
83 if (!strcmp(option, "error-all")) {
84 ws_error_action = die_on_ws_error;
85 squelch_whitespace_errors = 0;
86 return;
87 }
88 if (!strcmp(option, "strip") || !strcmp(option, "fix")) {
89 ws_error_action = correct_ws_error;
90 return;
91 }
92 die("unrecognized whitespace option '%s'", option);
93 }
95 static void set_default_whitespace_mode(const char *whitespace_option)
96 {
97 if (!whitespace_option && !apply_default_whitespace)
98 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error);
99 }
101 /*
102 * For "diff-stat" like behaviour, we keep track of the biggest change
103 * we've seen, and the longest filename. That allows us to do simple
104 * scaling.
105 */
106 static int max_change, max_len;
108 /*
109 * Various "current state", notably line numbers and what
110 * file (and how) we're patching right now.. The "is_xxxx"
111 * things are flags, where -1 means "don't know yet".
112 */
113 static int linenr = 1;
115 /*
116 * This represents one "hunk" from a patch, starting with
117 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
118 * patch text is pointed at by patch, and its byte length
119 * is stored in size. leading and trailing are the number
120 * of context lines.
121 */
122 struct fragment {
123 unsigned long leading, trailing;
124 unsigned long oldpos, oldlines;
125 unsigned long newpos, newlines;
126 const char *patch;
127 int size;
128 int rejected;
129 struct fragment *next;
130 };
132 /*
133 * When dealing with a binary patch, we reuse "leading" field
134 * to store the type of the binary hunk, either deflated "delta"
135 * or deflated "literal".
136 */
137 #define binary_patch_method leading
138 #define BINARY_DELTA_DEFLATED 1
139 #define BINARY_LITERAL_DEFLATED 2
141 /*
142 * This represents a "patch" to a file, both metainfo changes
143 * such as creation/deletion, filemode and content changes represented
144 * as a series of fragments.
145 */
146 struct patch {
147 char *new_name, *old_name, *def_name;
148 unsigned int old_mode, new_mode;
149 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
150 int rejected;
151 unsigned ws_rule;
152 unsigned long deflate_origlen;
153 int lines_added, lines_deleted;
154 int score;
155 unsigned int is_toplevel_relative:1;
156 unsigned int inaccurate_eof:1;
157 unsigned int is_binary:1;
158 unsigned int is_copy:1;
159 unsigned int is_rename:1;
160 unsigned int recount:1;
161 struct fragment *fragments;
162 char *result;
163 size_t resultsize;
164 char old_sha1_prefix[41];
165 char new_sha1_prefix[41];
166 struct patch *next;
167 };
169 /*
170 * A line in a file, len-bytes long (includes the terminating LF,
171 * except for an incomplete line at the end if the file ends with
172 * one), and its contents hashes to 'hash'.
173 */
174 struct line {
175 size_t len;
176 unsigned hash : 24;
177 unsigned flag : 8;
178 #define LINE_COMMON 1
179 };
181 /*
182 * This represents a "file", which is an array of "lines".
183 */
184 struct image {
185 char *buf;
186 size_t len;
187 size_t nr;
188 size_t alloc;
189 struct line *line_allocated;
190 struct line *line;
191 };
193 /*
194 * Records filenames that have been touched, in order to handle
195 * the case where more than one patches touch the same file.
196 */
198 static struct string_list fn_table;
200 static uint32_t hash_line(const char *cp, size_t len)
201 {
202 size_t i;
203 uint32_t h;
204 for (i = 0, h = 0; i < len; i++) {
205 if (!isspace(cp[i])) {
206 h = h * 3 + (cp[i] & 0xff);
207 }
208 }
209 return h;
210 }
212 static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag)
213 {
214 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc);
215 img->line_allocated[img->nr].len = len;
216 img->line_allocated[img->nr].hash = hash_line(bol, len);
217 img->line_allocated[img->nr].flag = flag;
218 img->nr++;
219 }
221 static void prepare_image(struct image *image, char *buf, size_t len,
222 int prepare_linetable)
223 {
224 const char *cp, *ep;
226 memset(image, 0, sizeof(*image));
227 image->buf = buf;
228 image->len = len;
230 if (!prepare_linetable)
231 return;
233 ep = image->buf + image->len;
234 cp = image->buf;
235 while (cp < ep) {
236 const char *next;
237 for (next = cp; next < ep && *next != '\n'; next++)
238 ;
239 if (next < ep)
240 next++;
241 add_line_info(image, cp, next - cp, 0);
242 cp = next;
243 }
244 image->line = image->line_allocated;
245 }
247 static void clear_image(struct image *image)
248 {
249 free(image->buf);
250 image->buf = NULL;
251 image->len = 0;
252 }
254 static void say_patch_name(FILE *output, const char *pre,
255 struct patch *patch, const char *post)
256 {
257 fputs(pre, output);
258 if (patch->old_name && patch->new_name &&
259 strcmp(patch->old_name, patch->new_name)) {
260 quote_c_style(patch->old_name, NULL, output, 0);
261 fputs(" => ", output);
262 quote_c_style(patch->new_name, NULL, output, 0);
263 } else {
264 const char *n = patch->new_name;
265 if (!n)
266 n = patch->old_name;
267 quote_c_style(n, NULL, output, 0);
268 }
269 fputs(post, output);
270 }
272 #define CHUNKSIZE (8192)
273 #define SLOP (16)
275 static void read_patch_file(struct strbuf *sb, int fd)
276 {
277 if (strbuf_read(sb, fd, 0) < 0)
278 die("git apply: read returned %s", strerror(errno));
280 /*
281 * Make sure that we have some slop in the buffer
282 * so that we can do speculative "memcmp" etc, and
283 * see to it that it is NUL-filled.
284 */
285 strbuf_grow(sb, SLOP);
286 memset(sb->buf + sb->len, 0, SLOP);
287 }
289 static unsigned long linelen(const char *buffer, unsigned long size)
290 {
291 unsigned long len = 0;
292 while (size--) {
293 len++;
294 if (*buffer++ == '\n')
295 break;
296 }
297 return len;
298 }
300 static int is_dev_null(const char *str)
301 {
302 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
303 }
305 #define TERM_SPACE 1
306 #define TERM_TAB 2
308 static int name_terminate(const char *name, int namelen, int c, int terminate)
309 {
310 if (c == ' ' && !(terminate & TERM_SPACE))
311 return 0;
312 if (c == '\t' && !(terminate & TERM_TAB))
313 return 0;
315 return 1;
316 }
318 static char *find_name(const char *line, char *def, int p_value, int terminate)
319 {
320 int len;
321 const char *start = line;
323 if (*line == '"') {
324 struct strbuf name;
326 /*
327 * Proposed "new-style" GNU patch/diff format; see
328 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
329 */
330 strbuf_init(&name, 0);
331 if (!unquote_c_style(&name, line, NULL)) {
332 char *cp;
334 for (cp = name.buf; p_value; p_value--) {
335 cp = strchr(cp, '/');
336 if (!cp)
337 break;
338 cp++;
339 }
340 if (cp) {
341 /* name can later be freed, so we need
342 * to memmove, not just return cp
343 */
344 strbuf_remove(&name, 0, cp - name.buf);
345 free(def);
346 if (root)
347 strbuf_insert(&name, 0, root, root_len);
348 return strbuf_detach(&name, NULL);
349 }
350 }
351 strbuf_release(&name);
352 }
354 for (;;) {
355 char c = *line;
357 if (isspace(c)) {
358 if (c == '\n')
359 break;
360 if (name_terminate(start, line-start, c, terminate))
361 break;
362 }
363 line++;
364 if (c == '/' && !--p_value)
365 start = line;
366 }
367 if (!start)
368 return def;
369 len = line - start;
370 if (!len)
371 return def;
373 /*
374 * Generally we prefer the shorter name, especially
375 * if the other one is just a variation of that with
376 * something else tacked on to the end (ie "file.orig"
377 * or "file~").
378 */
379 if (def) {
380 int deflen = strlen(def);
381 if (deflen < len && !strncmp(start, def, deflen))
382 return def;
383 free(def);
384 }
386 if (root) {
387 char *ret = xmalloc(root_len + len + 1);
388 strcpy(ret, root);
389 memcpy(ret + root_len, start, len);
390 ret[root_len + len] = '\0';
391 return ret;
392 }
394 return xmemdupz(start, len);
395 }
397 static int count_slashes(const char *cp)
398 {
399 int cnt = 0;
400 char ch;
402 while ((ch = *cp++))
403 if (ch == '/')
404 cnt++;
405 return cnt;
406 }
408 /*
409 * Given the string after "--- " or "+++ ", guess the appropriate
410 * p_value for the given patch.
411 */
412 static int guess_p_value(const char *nameline)
413 {
414 char *name, *cp;
415 int val = -1;
417 if (is_dev_null(nameline))
418 return -1;
419 name = find_name(nameline, NULL, 0, TERM_SPACE | TERM_TAB);
420 if (!name)
421 return -1;
422 cp = strchr(name, '/');
423 if (!cp)
424 val = 0;
425 else if (prefix) {
426 /*
427 * Does it begin with "a/$our-prefix" and such? Then this is
428 * very likely to apply to our directory.
429 */
430 if (!strncmp(name, prefix, prefix_length))
431 val = count_slashes(prefix);
432 else {
433 cp++;
434 if (!strncmp(cp, prefix, prefix_length))
435 val = count_slashes(prefix) + 1;
436 }
437 }
438 free(name);
439 return val;
440 }
442 /*
443 * Get the name etc info from the ---/+++ lines of a traditional patch header
444 *
445 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
446 * files, we can happily check the index for a match, but for creating a
447 * new file we should try to match whatever "patch" does. I have no idea.
448 */
449 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
450 {
451 char *name;
453 first += 4; /* skip "--- " */
454 second += 4; /* skip "+++ " */
455 if (!p_value_known) {
456 int p, q;
457 p = guess_p_value(first);
458 q = guess_p_value(second);
459 if (p < 0) p = q;
460 if (0 <= p && p == q) {
461 p_value = p;
462 p_value_known = 1;
463 }
464 }
465 if (is_dev_null(first)) {
466 patch->is_new = 1;
467 patch->is_delete = 0;
468 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
469 patch->new_name = name;
470 } else if (is_dev_null(second)) {
471 patch->is_new = 0;
472 patch->is_delete = 1;
473 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
474 patch->old_name = name;
475 } else {
476 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
477 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
478 patch->old_name = patch->new_name = name;
479 }
480 if (!name)
481 die("unable to find filename in patch at line %d", linenr);
482 }
484 static int gitdiff_hdrend(const char *line, struct patch *patch)
485 {
486 return -1;
487 }
489 /*
490 * We're anal about diff header consistency, to make
491 * sure that we don't end up having strange ambiguous
492 * patches floating around.
493 *
494 * As a result, gitdiff_{old|new}name() will check
495 * their names against any previous information, just
496 * to make sure..
497 */
498 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
499 {
500 if (!orig_name && !isnull)
501 return find_name(line, NULL, p_value, TERM_TAB);
503 if (orig_name) {
504 int len;
505 const char *name;
506 char *another;
507 name = orig_name;
508 len = strlen(name);
509 if (isnull)
510 die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
511 another = find_name(line, NULL, p_value, TERM_TAB);
512 if (!another || memcmp(another, name, len))
513 die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
514 free(another);
515 return orig_name;
516 }
517 else {
518 /* expect "/dev/null" */
519 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
520 die("git apply: bad git-diff - expected /dev/null on line %d", linenr);
521 return NULL;
522 }
523 }
525 static int gitdiff_oldname(const char *line, struct patch *patch)
526 {
527 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
528 return 0;
529 }
531 static int gitdiff_newname(const char *line, struct patch *patch)
532 {
533 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
534 return 0;
535 }
537 static int gitdiff_oldmode(const char *line, struct patch *patch)
538 {
539 patch->old_mode = strtoul(line, NULL, 8);
540 return 0;
541 }
543 static int gitdiff_newmode(const char *line, struct patch *patch)
544 {
545 patch->new_mode = strtoul(line, NULL, 8);
546 return 0;
547 }
549 static int gitdiff_delete(const char *line, struct patch *patch)
550 {
551 patch->is_delete = 1;
552 patch->old_name = patch->def_name;
553 return gitdiff_oldmode(line, patch);
554 }
556 static int gitdiff_newfile(const char *line, struct patch *patch)
557 {
558 patch->is_new = 1;
559 patch->new_name = patch->def_name;
560 return gitdiff_newmode(line, patch);
561 }
563 static int gitdiff_copysrc(const char *line, struct patch *patch)
564 {
565 patch->is_copy = 1;
566 patch->old_name = find_name(line, NULL, 0, 0);
567 return 0;
568 }
570 static int gitdiff_copydst(const char *line, struct patch *patch)
571 {
572 patch->is_copy = 1;
573 patch->new_name = find_name(line, NULL, 0, 0);
574 return 0;
575 }
577 static int gitdiff_renamesrc(const char *line, struct patch *patch)
578 {
579 patch->is_rename = 1;
580 patch->old_name = find_name(line, NULL, 0, 0);
581 return 0;
582 }
584 static int gitdiff_renamedst(const char *line, struct patch *patch)
585 {
586 patch->is_rename = 1;
587 patch->new_name = find_name(line, NULL, 0, 0);
588 return 0;
589 }
591 static int gitdiff_similarity(const char *line, struct patch *patch)
592 {
593 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
594 patch->score = 0;
595 return 0;
596 }
598 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
599 {
600 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
601 patch->score = 0;
602 return 0;
603 }
605 static int gitdiff_index(const char *line, struct patch *patch)
606 {
607 /*
608 * index line is N hexadecimal, "..", N hexadecimal,
609 * and optional space with octal mode.
610 */
611 const char *ptr, *eol;
612 int len;
614 ptr = strchr(line, '.');
615 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
616 return 0;
617 len = ptr - line;
618 memcpy(patch->old_sha1_prefix, line, len);
619 patch->old_sha1_prefix[len] = 0;
621 line = ptr + 2;
622 ptr = strchr(line, ' ');
623 eol = strchr(line, '\n');
625 if (!ptr || eol < ptr)
626 ptr = eol;
627 len = ptr - line;
629 if (40 < len)
630 return 0;
631 memcpy(patch->new_sha1_prefix, line, len);
632 patch->new_sha1_prefix[len] = 0;
633 if (*ptr == ' ')
634 patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
635 return 0;
636 }
638 /*
639 * This is normal for a diff that doesn't change anything: we'll fall through
640 * into the next diff. Tell the parser to break out.
641 */
642 static int gitdiff_unrecognized(const char *line, struct patch *patch)
643 {
644 return -1;
645 }
647 static const char *stop_at_slash(const char *line, int llen)
648 {
649 int i;
651 for (i = 0; i < llen; i++) {
652 int ch = line[i];
653 if (ch == '/')
654 return line + i;
655 }
656 return NULL;
657 }
659 /*
660 * This is to extract the same name that appears on "diff --git"
661 * line. We do not find and return anything if it is a rename
662 * patch, and it is OK because we will find the name elsewhere.
663 * We need to reliably find name only when it is mode-change only,
664 * creation or deletion of an empty file. In any of these cases,
665 * both sides are the same name under a/ and b/ respectively.
666 */
667 static char *git_header_name(char *line, int llen)
668 {
669 const char *name;
670 const char *second = NULL;
671 size_t len;
673 line += strlen("diff --git ");
674 llen -= strlen("diff --git ");
676 if (*line == '"') {
677 const char *cp;
678 struct strbuf first;
679 struct strbuf sp;
681 strbuf_init(&first, 0);
682 strbuf_init(&sp, 0);
684 if (unquote_c_style(&first, line, &second))
685 goto free_and_fail1;
687 /* advance to the first slash */
688 cp = stop_at_slash(first.buf, first.len);
689 /* we do not accept absolute paths */
690 if (!cp || cp == first.buf)
691 goto free_and_fail1;
692 strbuf_remove(&first, 0, cp + 1 - first.buf);
694 /*
695 * second points at one past closing dq of name.
696 * find the second name.
697 */
698 while ((second < line + llen) && isspace(*second))
699 second++;
701 if (line + llen <= second)
702 goto free_and_fail1;
703 if (*second == '"') {
704 if (unquote_c_style(&sp, second, NULL))
705 goto free_and_fail1;
706 cp = stop_at_slash(sp.buf, sp.len);
707 if (!cp || cp == sp.buf)
708 goto free_and_fail1;
709 /* They must match, otherwise ignore */
710 if (strcmp(cp + 1, first.buf))
711 goto free_and_fail1;
712 strbuf_release(&sp);
713 return strbuf_detach(&first, NULL);
714 }
716 /* unquoted second */
717 cp = stop_at_slash(second, line + llen - second);
718 if (!cp || cp == second)
719 goto free_and_fail1;
720 cp++;
721 if (line + llen - cp != first.len + 1 ||
722 memcmp(first.buf, cp, first.len))
723 goto free_and_fail1;
724 return strbuf_detach(&first, NULL);
726 free_and_fail1:
727 strbuf_release(&first);
728 strbuf_release(&sp);
729 return NULL;
730 }
732 /* unquoted first name */
733 name = stop_at_slash(line, llen);
734 if (!name || name == line)
735 return NULL;
736 name++;
738 /*
739 * since the first name is unquoted, a dq if exists must be
740 * the beginning of the second name.
741 */
742 for (second = name; second < line + llen; second++) {
743 if (*second == '"') {
744 struct strbuf sp;
745 const char *np;
747 strbuf_init(&sp, 0);
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);
763 }
765 free_and_fail2:
766 strbuf_release(&sp);
767 return NULL;
768 }
769 }
771 /*
772 * Accept a name only if it shows up twice, exactly the same
773 * form.
774 */
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;
789 }
790 if (second[len] == '\n' && !memcmp(name, second, len)) {
791 return xmemdupz(name, len);
792 }
793 }
794 }
795 }
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)
799 {
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;
806 /*
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.
811 */
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;
819 }
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 },
846 };
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;
860 }
861 }
863 return offset;
864 }
866 static int parse_num(const char *line, unsigned long *p)
867 {
868 char *ptr;
870 if (!isdigit(*line))
871 return 0;
872 *p = strtoul(line, &ptr, 10);
873 return ptr - line;
874 }
876 static int parse_range(const char *line, int len, int offset, const char *expect,
877 unsigned long *p1, unsigned long *p2)
878 {
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;
903 }
905 ex = strlen(expect);
906 if (ex > len)
907 return -1;
908 if (memcmp(line, expect, ex))
909 return -1;
911 return offset + ex;
912 }
914 static void recount_diff(char *line, int size, struct fragment *fragment)
915 {
916 int oldlines = 0, newlines = 0, ret = 0;
918 if (size < 1) {
919 warning("recount: ignore empty hunk");
920 return;
921 }
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;
952 }
953 if (ret) {
954 warning("recount: unexpected line: %.*s",
955 (int)linelen(line, size), line);
956 return;
957 }
958 break;
959 }
960 fragment->oldlines = oldlines;
961 fragment->newlines = newlines;
962 }
964 /*
965 * Parse a unified diff fragment header of the
966 * form "@@ -a,b +c,d @@"
967 */
968 static int parse_fragment_header(char *line, int len, struct fragment *fragment)
969 {
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;
980 }
982 static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
983 {
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;
1002 /*
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.
1006 */
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);
1013 }
1015 if (size < len + 6)
1016 break;
1018 /*
1019 * Git patch? It might not have a real patch, just a rename
1020 * or mode change, so we handle that specially
1021 */
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;
1030 }
1031 patch->is_toplevel_relative = 1;
1032 *hdrsize = git_hdr_len;
1033 return offset;
1034 }
1036 /* --- followed by +++ ? */
1037 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
1038 continue;
1040 /*
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).
1044 */
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;
1054 }
1055 return -1;
1056 }
1058 static void record_ws_error(unsigned result, const char *line, int len, int linenr)
1059 {
1060 char *err;
1062 if (!result)
1063 return;
1065 whitespace_error++;
1066 if (squelch_whitespace_errors &&
1067 squelch_whitespace_errors < whitespace_error)
1068 return;
1070 err = whitespace_error_string(result);
1071 fprintf(stderr, "%s:%d: %s.\n%.*s\n",
1072 patch_input_file, linenr, err, len, line);
1073 free(err);
1074 }
1076 static void check_whitespace(const char *line, int len, unsigned ws_rule)
1077 {
1078 unsigned result = ws_check(line + 1, len - 1, ws_rule);
1080 record_ws_error(result, line + 1, len - 2, linenr);
1081 }
1083 /*
1084 * Parse a unified diff. Note that this really needs to parse each
1085 * fragment separately, since the only way to know the difference
1086 * between a "---" that is part of a patch, and a "---" that starts
1087 * the next patch is to look at the line counts..
1088 */
1089 static int parse_fragment(char *line, unsigned long size,
1090 struct patch *patch, struct fragment *fragment)
1091 {
1092 int added, deleted;
1093 int len = linelen(line, size), offset;
1094 unsigned long oldlines, newlines;
1095 unsigned long leading, trailing;
1097 offset = parse_fragment_header(line, len, fragment);
1098 if (offset < 0)
1099 return -1;
1100 if (offset > 0 && patch->recount)
1101 recount_diff(line + offset, size - offset, fragment);
1102 oldlines = fragment->oldlines;
1103 newlines = fragment->newlines;
1104 leading = 0;
1105 trailing = 0;
1107 /* Parse the thing.. */
1108 line += len;
1109 size -= len;
1110 linenr++;
1111 added = deleted = 0;
1112 for (offset = len;
1113 0 < size;
1114 offset += len, size -= len, line += len, linenr++) {
1115 if (!oldlines && !newlines)
1116 break;
1117 len = linelen(line, size);
1118 if (!len || line[len-1] != '\n')
1119 return -1;
1120 switch (*line) {
1121 default:
1122 return -1;
1123 case '\n': /* newer GNU diff, an empty context line */
1124 case ' ':
1125 oldlines--;
1126 newlines--;
1127 if (!deleted && !added)
1128 leading++;
1129 trailing++;
1130 break;
1131 case '-':
1132 if (apply_in_reverse &&
1133 ws_error_action != nowarn_ws_error)
1134 check_whitespace(line, len, patch->ws_rule);
1135 deleted++;
1136 oldlines--;
1137 trailing = 0;
1138 break;
1139 case '+':
1140 if (!apply_in_reverse &&
1141 ws_error_action != nowarn_ws_error)
1142 check_whitespace(line, len, patch->ws_rule);
1143 added++;
1144 newlines--;
1145 trailing = 0;
1146 break;
1148 /*
1149 * We allow "\ No newline at end of file". Depending
1150 * on locale settings when the patch was produced we
1151 * don't know what this line looks like. The only
1152 * thing we do know is that it begins with "\ ".
1153 * Checking for 12 is just for sanity check -- any
1154 * l10n of "\ No newline..." is at least that long.
1155 */
1156 case '\\':
1157 if (len < 12 || memcmp(line, "\\ ", 2))
1158 return -1;
1159 break;
1160 }
1161 }
1162 if (oldlines || newlines)
1163 return -1;
1164 fragment->leading = leading;
1165 fragment->trailing = trailing;
1167 /*
1168 * If a fragment ends with an incomplete line, we failed to include
1169 * it in the above loop because we hit oldlines == newlines == 0
1170 * before seeing it.
1171 */
1172 if (12 < size && !memcmp(line, "\\ ", 2))
1173 offset += linelen(line, size);
1175 patch->lines_added += added;
1176 patch->lines_deleted += deleted;
1178 if (0 < patch->is_new && oldlines)
1179 return error("new file depends on old contents");
1180 if (0 < patch->is_delete && newlines)
1181 return error("deleted file still has contents");
1182 return offset;
1183 }
1185 static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
1186 {
1187 unsigned long offset = 0;
1188 unsigned long oldlines = 0, newlines = 0, context = 0;
1189 struct fragment **fragp = &patch->fragments;
1191 while (size > 4 && !memcmp(line, "@@ -", 4)) {
1192 struct fragment *fragment;
1193 int len;
1195 fragment = xcalloc(1, sizeof(*fragment));
1196 len = parse_fragment(line, size, patch, fragment);
1197 if (len <= 0)
1198 die("corrupt patch at line %d", linenr);
1199 fragment->patch = line;
1200 fragment->size = len;
1201 oldlines += fragment->oldlines;
1202 newlines += fragment->newlines;
1203 context += fragment->leading + fragment->trailing;
1205 *fragp = fragment;
1206 fragp = &fragment->next;
1208 offset += len;
1209 line += len;
1210 size -= len;
1211 }
1213 /*
1214 * If something was removed (i.e. we have old-lines) it cannot
1215 * be creation, and if something was added it cannot be
1216 * deletion. However, the reverse is not true; --unified=0
1217 * patches that only add are not necessarily creation even
1218 * though they do not have any old lines, and ones that only
1219 * delete are not necessarily deletion.
1220 *
1221 * Unfortunately, a real creation/deletion patch do _not_ have
1222 * any context line by definition, so we cannot safely tell it
1223 * apart with --unified=0 insanity. At least if the patch has
1224 * more than one hunk it is not creation or deletion.
1225 */
1226 if (patch->is_new < 0 &&
1227 (oldlines || (patch->fragments && patch->fragments->next)))
1228 patch->is_new = 0;
1229 if (patch->is_delete < 0 &&
1230 (newlines || (patch->fragments && patch->fragments->next)))
1231 patch->is_delete = 0;
1233 if (0 < patch->is_new && oldlines)
1234 die("new file %s depends on old contents", patch->new_name);
1235 if (0 < patch->is_delete && newlines)
1236 die("deleted file %s still has contents", patch->old_name);
1237 if (!patch->is_delete && !newlines && context)
1238 fprintf(stderr, "** warning: file %s becomes empty but "
1239 "is not deleted\n", patch->new_name);
1241 return offset;
1242 }
1244 static inline int metadata_changes(struct patch *patch)
1245 {
1246 return patch->is_rename > 0 ||
1247 patch->is_copy > 0 ||
1248 patch->is_new > 0 ||
1249 patch->is_delete ||
1250 (patch->old_mode && patch->new_mode &&
1251 patch->old_mode != patch->new_mode);
1252 }
1254 static char *inflate_it(const void *data, unsigned long size,
1255 unsigned long inflated_size)
1256 {
1257 z_stream stream;
1258 void *out;
1259 int st;
1261 memset(&stream, 0, sizeof(stream));
1263 stream.next_in = (unsigned char *)data;
1264 stream.avail_in = size;
1265 stream.next_out = out = xmalloc(inflated_size);
1266 stream.avail_out = inflated_size;
1267 inflateInit(&stream);
1268 st = inflate(&stream, Z_FINISH);
1269 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1270 free(out);
1271 return NULL;
1272 }
1273 return out;
1274 }
1276 static struct fragment *parse_binary_hunk(char **buf_p,
1277 unsigned long *sz_p,
1278 int *status_p,
1279 int *used_p)
1280 {
1281 /*
1282 * Expect a line that begins with binary patch method ("literal"
1283 * or "delta"), followed by the length of data before deflating.
1284 * a sequence of 'length-byte' followed by base-85 encoded data
1285 * should follow, terminated by a newline.
1286 *
1287 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1288 * and we would limit the patch line to 66 characters,
1289 * so one line can fit up to 13 groups that would decode
1290 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1291 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1292 */
1293 int llen, used;
1294 unsigned long size = *sz_p;
1295 char *buffer = *buf_p;
1296 int patch_method;
1297 unsigned long origlen;
1298 char *data = NULL;
1299 int hunk_size = 0;
1300 struct fragment *frag;
1302 llen = linelen(buffer, size);
1303 used = llen;
1305 *status_p = 0;
1307 if (!prefixcmp(buffer, "delta ")) {
1308 patch_method = BINARY_DELTA_DEFLATED;
1309 origlen = strtoul(buffer + 6, NULL, 10);
1310 }
1311 else if (!prefixcmp(buffer, "literal ")) {
1312 patch_method = BINARY_LITERAL_DEFLATED;
1313 origlen = strtoul(buffer + 8, NULL, 10);
1314 }
1315 else
1316 return NULL;
1318 linenr++;
1319 buffer += llen;
1320 while (1) {
1321 int byte_length, max_byte_length, newsize;
1322 llen = linelen(buffer, size);
1323 used += llen;
1324 linenr++;
1325 if (llen == 1) {
1326 /* consume the blank line */
1327 buffer++;
1328 size--;
1329 break;
1330 }
1331 /*
1332 * Minimum line is "A00000\n" which is 7-byte long,
1333 * and the line length must be multiple of 5 plus 2.
1334 */
1335 if ((llen < 7) || (llen-2) % 5)
1336 goto corrupt;
1337 max_byte_length = (llen - 2) / 5 * 4;
1338 byte_length = *buffer;
1339 if ('A' <= byte_length && byte_length <= 'Z')
1340 byte_length = byte_length - 'A' + 1;
1341 else if ('a' <= byte_length && byte_length <= 'z')
1342 byte_length = byte_length - 'a' + 27;
1343 else
1344 goto corrupt;
1345 /* if the input length was not multiple of 4, we would
1346 * have filler at the end but the filler should never
1347 * exceed 3 bytes
1348 */
1349 if (max_byte_length < byte_length ||
1350 byte_length <= max_byte_length - 4)
1351 goto corrupt;
1352 newsize = hunk_size + byte_length;
1353 data = xrealloc(data, newsize);
1354 if (decode_85(data + hunk_size, buffer + 1, byte_length))
1355 goto corrupt;
1356 hunk_size = newsize;
1357 buffer += llen;
1358 size -= llen;
1359 }
1361 frag = xcalloc(1, sizeof(*frag));
1362 frag->patch = inflate_it(data, hunk_size, origlen);
1363 if (!frag->patch)
1364 goto corrupt;
1365 free(data);
1366 frag->size = origlen;
1367 *buf_p = buffer;
1368 *sz_p = size;
1369 *used_p = used;
1370 frag->binary_patch_method = patch_method;
1371 return frag;
1373 corrupt:
1374 free(data);
1375 *status_p = -1;
1376 error("corrupt binary patch at line %d: %.*s",
1377 linenr-1, llen-1, buffer);
1378 return NULL;
1379 }
1381 static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1382 {
1383 /*
1384 * We have read "GIT binary patch\n"; what follows is a line
1385 * that says the patch method (currently, either "literal" or
1386 * "delta") and the length of data before deflating; a
1387 * sequence of 'length-byte' followed by base-85 encoded data
1388 * follows.
1389 *
1390 * When a binary patch is reversible, there is another binary
1391 * hunk in the same format, starting with patch method (either
1392 * "literal" or "delta") with the length of data, and a sequence
1393 * of length-byte + base-85 encoded data, terminated with another
1394 * empty line. This data, when applied to the postimage, produces
1395 * the preimage.
1396 */
1397 struct fragment *forward;
1398 struct fragment *reverse;
1399 int status;
1400 int used, used_1;
1402 forward = parse_binary_hunk(&buffer, &size, &status, &used);
1403 if (!forward && !status)
1404 /* there has to be one hunk (forward hunk) */
1405 return error("unrecognized binary patch at line %d", linenr-1);
1406 if (status)
1407 /* otherwise we already gave an error message */
1408 return status;
1410 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1411 if (reverse)
1412 used += used_1;
1413 else if (status) {
1414 /*
1415 * Not having reverse hunk is not an error, but having
1416 * a corrupt reverse hunk is.
1417 */
1418 free((void*) forward->patch);
1419 free(forward);
1420 return status;
1421 }
1422 forward->next = reverse;
1423 patch->fragments = forward;
1424 patch->is_binary = 1;
1425 return used;
1426 }
1428 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
1429 {
1430 int hdrsize, patchsize;
1431 int offset = find_header(buffer, size, &hdrsize, patch);
1433 if (offset < 0)
1434 return offset;
1436 patch->ws_rule = whitespace_rule(patch->new_name
1437 ? patch->new_name
1438 : patch->old_name);
1440 patchsize = parse_single_patch(buffer + offset + hdrsize,
1441 size - offset - hdrsize, patch);
1443 if (!patchsize) {
1444 static const char *binhdr[] = {
1445 "Binary files ",
1446 "Files ",
1447 NULL,
1448 };
1449 static const char git_binary[] = "GIT binary patch\n";
1450 int i;
1451 int hd = hdrsize + offset;
1452 unsigned long llen = linelen(buffer + hd, size - hd);
1454 if (llen == sizeof(git_binary) - 1 &&
1455 !memcmp(git_binary, buffer + hd, llen)) {
1456 int used;
1457 linenr++;
1458 used = parse_binary(buffer + hd + llen,
1459 size - hd - llen, patch);
1460 if (used)
1461 patchsize = used + llen;
1462 else
1463 patchsize = 0;
1464 }
1465 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
1466 for (i = 0; binhdr[i]; i++) {
1467 int len = strlen(binhdr[i]);
1468 if (len < size - hd &&
1469 !memcmp(binhdr[i], buffer + hd, len)) {
1470 linenr++;
1471 patch->is_binary = 1;
1472 patchsize = llen;
1473 break;
1474 }
1475 }
1476 }
1478 /* Empty patch cannot be applied if it is a text patch
1479 * without metadata change. A binary patch appears
1480 * empty to us here.
1481 */
1482 if ((apply || check) &&
1483 (!patch->is_binary && !metadata_changes(patch)))
1484 die("patch with only garbage at line %d", linenr);
1485 }
1487 return offset + hdrsize + patchsize;
1488 }
1490 #define swap(a,b) myswap((a),(b),sizeof(a))
1492 #define myswap(a, b, size) do { \
1493 unsigned char mytmp[size]; \
1494 memcpy(mytmp, &a, size); \
1495 memcpy(&a, &b, size); \
1496 memcpy(&b, mytmp, size); \
1497 } while (0)
1499 static void reverse_patches(struct patch *p)
1500 {
1501 for (; p; p = p->next) {
1502 struct fragment *frag = p->fragments;
1504 swap(p->new_name, p->old_name);
1505 swap(p->new_mode, p->old_mode);
1506 swap(p->is_new, p->is_delete);
1507 swap(p->lines_added, p->lines_deleted);
1508 swap(p->old_sha1_prefix, p->new_sha1_prefix);
1510 for (; frag; frag = frag->next) {
1511 swap(frag->newpos, frag->oldpos);
1512 swap(frag->newlines, frag->oldlines);
1513 }
1514 }
1515 }
1517 static const char pluses[] =
1518 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1519 static const char minuses[]=
1520 "----------------------------------------------------------------------";
1522 static void show_stats(struct patch *patch)
1523 {
1524 struct strbuf qname;
1525 char *cp = patch->new_name ? patch->new_name : patch->old_name;
1526 int max, add, del;
1528 strbuf_init(&qname, 0);
1529 quote_c_style(cp, &qname, NULL, 0);
1531 /*
1532 * "scale" the filename
1533 */
1534 max = max_len;
1535 if (max > 50)
1536 max = 50;
1538 if (qname.len > max) {
1539 cp = strchr(qname.buf + qname.len + 3 - max, '/');
1540 if (!cp)
1541 cp = qname.buf + qname.len + 3 - max;
1542 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);
1543 }
1545 if (patch->is_binary) {
1546 printf(" %-*s | Bin\n", max, qname.buf);
1547 strbuf_release(&qname);
1548 return;
1549 }
1551 printf(" %-*s |", max, qname.buf);
1552 strbuf_release(&qname);
1554 /*
1555 * scale the add/delete
1556 */
1557 max = max + max_change > 70 ? 70 - max : max_change;
1558 add = patch->lines_added;
1559 del = patch->lines_deleted;
1561 if (max_change > 0) {
1562 int total = ((add + del) * max + max_change / 2) / max_change;
1563 add = (add * max + max_change / 2) / max_change;
1564 del = total - add;
1565 }
1566 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,
1567 add, pluses, del, minuses);
1568 }
1570 static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
1571 {
1572 switch (st->st_mode & S_IFMT) {
1573 case S_IFLNK:
1574 strbuf_grow(buf, st->st_size);
1575 if (readlink(path, buf->buf, st->st_size) != st->st_size)
1576 return -1;
1577 strbuf_setlen(buf, st->st_size);
1578 return 0;
1579 case S_IFREG:
1580 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
1581 return error("unable to open or read %s", path);
1582 convert_to_git(path, buf->buf, buf->len, buf, 0);
1583 return 0;
1584 default:
1585 return -1;
1586 }
1587 }
1589 static void update_pre_post_images(struct image *preimage,
1590 struct image *postimage,
1591 char *buf,
1592 size_t len)
1593 {
1594 int i, ctx;
1595 char *new, *old, *fixed;
1596 struct image fixed_preimage;
1598 /*
1599 * Update the preimage with whitespace fixes. Note that we
1600 * are not losing preimage->buf -- apply_one_fragment() will
1601 * free "oldlines".
1602 */
1603 prepare_image(&fixed_preimage, buf, len, 1);
1604 assert(fixed_preimage.nr == preimage->nr);
1605 for (i = 0; i < preimage->nr; i++)
1606 fixed_preimage.line[i].flag = preimage->line[i].flag;
1607 free(preimage->line_allocated);
1608 *preimage = fixed_preimage;
1610 /*
1611 * Adjust the common context lines in postimage, in place.
1612 * This is possible because whitespace fixing does not make
1613 * the string grow.
1614 */
1615 new = old = postimage->buf;
1616 fixed = preimage->buf;
1617 for (i = ctx = 0; i < postimage->nr; i++) {
1618 size_t len = postimage->line[i].len;
1619 if (!(postimage->line[i].flag & LINE_COMMON)) {
1620 /* an added line -- no counterparts in preimage */
1621 memmove(new, old, len);
1622 old += len;
1623 new += len;
1624 continue;
1625 }
1627 /* a common context -- skip it in the original postimage */
1628 old += len;
1630 /* and find the corresponding one in the fixed preimage */
1631 while (ctx < preimage->nr &&
1632 !(preimage->line[ctx].flag & LINE_COMMON)) {
1633 fixed += preimage->line[ctx].len;
1634 ctx++;
1635 }
1636 if (preimage->nr <= ctx)
1637 die("oops");
1639 /* and copy it in, while fixing the line length */
1640 len = preimage->line[ctx].len;
1641 memcpy(new, fixed, len);
1642 new += len;
1643 fixed += len;
1644 postimage->line[i].len = len;
1645 ctx++;
1646 }
1648 /* Fix the length of the whole thing */
1649 postimage->len = new - postimage->buf;
1650 }
1652 static int match_fragment(struct image *img,
1653 struct image *preimage,
1654 struct image *postimage,
1655 unsigned long try,
1656 int try_lno,
1657 unsigned ws_rule,
1658 int match_beginning, int match_end)
1659 {
1660 int i;
1661 char *fixed_buf, *buf, *orig, *target;
1663 if (preimage->nr + try_lno > img->nr)
1664 return 0;
1666 if (match_beginning && try_lno)
1667 return 0;
1669 if (match_end && preimage->nr + try_lno != img->nr)
1670 return 0;
1672 /* Quick hash check */
1673 for (i = 0; i < preimage->nr; i++)
1674 if (preimage->line[i].hash != img->line[try_lno + i].hash)
1675 return 0;
1677 /*
1678 * Do we have an exact match? If we were told to match
1679 * at the end, size must be exactly at try+fragsize,
1680 * otherwise try+fragsize must be still within the preimage,
1681 * and either case, the old piece should match the preimage
1682 * exactly.
1683 */
1684 if ((match_end
1685 ? (try + preimage->len == img->len)
1686 : (try + preimage->len <= img->len)) &&
1687 !memcmp(img->buf + try, preimage->buf, preimage->len))
1688 return 1;
1690 if (ws_error_action != correct_ws_error)
1691 return 0;
1693 /*
1694 * The hunk does not apply byte-by-byte, but the hash says
1695 * it might with whitespace fuzz.
1696 */
1697 fixed_buf = xmalloc(preimage->len + 1);
1698 buf = fixed_buf;
1699 orig = preimage->buf;
1700 target = img->buf + try;
1701 for (i = 0; i < preimage->nr; i++) {
1702 size_t fixlen; /* length after fixing the preimage */
1703 size_t oldlen = preimage->line[i].len;
1704 size_t tgtlen = img->line[try_lno + i].len;
1705 size_t tgtfixlen; /* length after fixing the target line */
1706 char tgtfixbuf[1024], *tgtfix;
1707 int match;
1709 /* Try fixing the line in the preimage */
1710 fixlen = ws_fix_copy(buf, orig, oldlen, ws_rule, NULL);
1712 /* Try fixing the line in the target */
1713 if (sizeof(tgtfixbuf) > tgtlen)
1714 tgtfix = tgtfixbuf;
1715 else
1716 tgtfix = xmalloc(tgtlen);
1717 tgtfixlen = ws_fix_copy(tgtfix, target, tgtlen, ws_rule, NULL);
1719 /*
1720 * If they match, either the preimage was based on
1721 * a version before our tree fixed whitespace breakage,
1722 * or we are lacking a whitespace-fix patch the tree
1723 * the preimage was based on already had (i.e. target
1724 * has whitespace breakage, the preimage doesn't).
1725 * In either case, we are fixing the whitespace breakages
1726 * so we might as well take the fix together with their
1727 * real change.
1728 */
1729 match = (tgtfixlen == fixlen && !memcmp(tgtfix, buf, fixlen));
1731 if (tgtfix != tgtfixbuf)
1732 free(tgtfix);
1733 if (!match)
1734 goto unmatch_exit;
1736 orig += oldlen;
1737 buf += fixlen;
1738 target += tgtlen;
1739 }
1741 /*
1742 * Yes, the preimage is based on an older version that still
1743 * has whitespace breakages unfixed, and fixing them makes the
1744 * hunk match. Update the context lines in the postimage.
1745 */
1746 update_pre_post_images(preimage, postimage,
1747 fixed_buf, buf - fixed_buf);
1748 return 1;
1750 unmatch_exit:
1751 free(fixed_buf);
1752 return 0;
1753 }
1755 static int find_pos(struct image *img,
1756 struct image *preimage,
1757 struct image *postimage,
1758 int line,
1759 unsigned ws_rule,
1760 int match_beginning, int match_end)
1761 {
1762 int i;
1763 unsigned long backwards, forwards, try;
1764 int backwards_lno, forwards_lno, try_lno;
1766 if (preimage->nr > img->nr)
1767 return -1;
1769 /*
1770 * If match_begining or match_end is specified, there is no
1771 * point starting from a wrong line that will never match and
1772 * wander around and wait for a match at the specified end.
1773 */
1774 if (match_beginning)
1775 line = 0;
1776 else if (match_end)
1777 line = img->nr - preimage->nr;
1779 if (line > img->nr)
1780 line = img->nr;
1782 try = 0;
1783 for (i = 0; i < line; i++)
1784 try += img->line[i].len;
1786 /*
1787 * There's probably some smart way to do this, but I'll leave
1788 * that to the smart and beautiful people. I'm simple and stupid.
1789 */
1790 backwards = try;
1791 backwards_lno = line;
1792 forwards = try;
1793 forwards_lno = line;
1794 try_lno = line;
1796 for (i = 0; ; i++) {
1797 if (match_fragment(img, preimage, postimage,
1798 try, try_lno, ws_rule,
1799 match_beginning, match_end))
1800 return try_lno;
1802 again:
1803 if (backwards_lno == 0 && forwards_lno == img->nr)
1804 break;
1806 if (i & 1) {
1807 if (backwards_lno == 0) {
1808 i++;
1809 goto again;
1810 }
1811 backwards_lno--;
1812 backwards -= img->line[backwards_lno].len;
1813 try = backwards;
1814 try_lno = backwards_lno;
1815 } else {
1816 if (forwards_lno == img->nr) {
1817 i++;
1818 goto again;
1819 }
1820 forwards += img->line[forwards_lno].len;
1821 forwards_lno++;
1822 try = forwards;
1823 try_lno = forwards_lno;
1824 }
1826 }
1827 return -1;
1828 }
1830 static void remove_first_line(struct image *img)
1831 {
1832 img->buf += img->line[0].len;
1833 img->len -= img->line[0].len;
1834 img->line++;
1835 img->nr--;
1836 }
1838 static void remove_last_line(struct image *img)
1839 {
1840 img->len -= img->line[--img->nr].len;
1841 }
1843 static void update_image(struct image *img,
1844 int applied_pos,
1845 struct image *preimage,
1846 struct image *postimage)
1847 {
1848 /*
1849 * remove the copy of preimage at offset in img
1850 * and replace it with postimage
1851 */
1852 int i, nr;
1853 size_t remove_count, insert_count, applied_at = 0;
1854 char *result;
1856 for (i = 0; i < applied_pos; i++)
1857 applied_at += img->line[i].len;
1859 remove_count = 0;
1860 for (i = 0; i < preimage->nr; i++)
1861 remove_count += img->line[applied_pos + i].len;
1862 insert_count = postimage->len;
1864 /* Adjust the contents */
1865 result = xmalloc(img->len + insert_count - remove_count + 1);
1866 memcpy(result, img->buf, applied_at);
1867 memcpy(result + applied_at, postimage->buf, postimage->len);
1868 memcpy(result + applied_at + postimage->len,
1869 img->buf + (applied_at + remove_count),
1870 img->len - (applied_at + remove_count));
1871 free(img->buf);
1872 img->buf = result;
1873 img->len += insert_count - remove_count;
1874 result[img->len] = '\0';
1876 /* Adjust the line table */
1877 nr = img->nr + postimage->nr - preimage->nr;
1878 if (preimage->nr < postimage->nr) {
1879 /*
1880 * NOTE: this knows that we never call remove_first_line()
1881 * on anything other than pre/post image.
1882 */
1883 img->line = xrealloc(img->line, nr * sizeof(*img->line));
1884 img->line_allocated = img->line;
1885 }
1886 if (preimage->nr != postimage->nr)
1887 memmove(img->line + applied_pos + postimage->nr,
1888 img->line + applied_pos + preimage->nr,
1889 (img->nr - (applied_pos + preimage->nr)) *
1890 sizeof(*img->line));
1891 memcpy(img->line + applied_pos,
1892 postimage->line,
1893 postimage->nr * sizeof(*img->line));
1894 img->nr = nr;
1895 }
1897 static int apply_one_fragment(struct image *img, struct fragment *frag,
1898 int inaccurate_eof, unsigned ws_rule)
1899 {
1900 int match_beginning, match_end;
1901 const char *patch = frag->patch;
1902 int size = frag->size;
1903 char *old, *new, *oldlines, *newlines;
1904 int new_blank_lines_at_end = 0;
1905 unsigned long leading, trailing;
1906 int pos, applied_pos;
1907 struct image preimage;
1908 struct image postimage;
1910 memset(&preimage, 0, sizeof(preimage));
1911 memset(&postimage, 0, sizeof(postimage));
1912 oldlines = xmalloc(size);
1913 newlines = xmalloc(size);
1915 old = oldlines;
1916 new = newlines;
1917 while (size > 0) {
1918 char first;
1919 int len = linelen(patch, size);
1920 int plen, added;
1921 int added_blank_line = 0;
1922 int is_blank_context = 0;
1924 if (!len)
1925 break;
1927 /*
1928 * "plen" is how much of the line we should use for
1929 * the actual patch data. Normally we just remove the
1930 * first character on the line, but if the line is
1931 * followed by "\ No newline", then we also remove the
1932 * last one (which is the newline, of course).
1933 */
1934 plen = len - 1;
1935 if (len < size && patch[len] == '\\')
1936 plen--;
1937 first = *patch;
1938 if (apply_in_reverse) {
1939 if (first == '-')
1940 first = '+';
1941 else if (first == '+')
1942 first = '-';
1943 }
1945 switch (first) {
1946 case '\n':
1947 /* Newer GNU diff, empty context line */
1948 if (plen < 0)
1949 /* ... followed by '\No newline'; nothing */
1950 break;
1951 *old++ = '\n';
1952 *new++ = '\n';
1953 add_line_info(&preimage, "\n", 1, LINE_COMMON);
1954 add_line_info(&postimage, "\n", 1, LINE_COMMON);
1955 is_blank_context = 1;
1956 break;
1957 case ' ':
1958 if (plen && patch[1] == '\n')
1959 is_blank_context = 1;
1960 case '-':
1961 memcpy(old, patch + 1, plen);
1962 add_line_info(&preimage, old, plen,
1963 (first == ' ' ? LINE_COMMON : 0));
1964 old += plen;
1965 if (first == '-')
1966 break;
1967 /* Fall-through for ' ' */
1968 case '+':
1969 /* --no-add does not add new lines */
1970 if (first == '+' && no_add)
1971 break;
1973 if (first != '+' ||
1974 !whitespace_error ||
1975 ws_error_action != correct_ws_error) {
1976 memcpy(new, patch + 1, plen);
1977 added = plen;
1978 }
1979 else {
1980 added = ws_fix_copy(new, patch + 1, plen, ws_rule, &applied_after_fixing_ws);
1981 }
1982 add_line_info(&postimage, new, added,
1983 (first == '+' ? 0 : LINE_COMMON));
1984 new += added;
1985 if (first == '+' &&
1986 added == 1 && new[-1] == '\n')
1987 added_blank_line = 1;
1988 break;
1989 case '@': case '\\':
1990 /* Ignore it, we already handled it */
1991 break;
1992 default:
1993 if (apply_verbosely)
1994 error("invalid start of line: '%c'", first);
1995 return -1;
1996 }
1997 if (added_blank_line)
1998 new_blank_lines_at_end++;
1999 else if (is_blank_context)
2000 ;
2001 else
2002 new_blank_lines_at_end = 0;
2003 patch += len;
2004 size -= len;
2005 }
2006 if (inaccurate_eof &&
2007 old > oldlines && old[-1] == '\n' &&
2008 new > newlines && new[-1] == '\n') {
2009 old--;
2010 new--;
2011 }
2013 leading = frag->leading;
2014 trailing = frag->trailing;
2016 /*
2017 * A hunk to change lines at the beginning would begin with
2018 * @@ -1,L +N,M @@
2019 * but we need to be careful. -U0 that inserts before the second
2020 * line also has this pattern.
2021 *
2022 * And a hunk to add to an empty file would begin with
2023 * @@ -0,0 +N,M @@
2024 *
2025 * In other words, a hunk that is (frag->oldpos <= 1) with or
2026 * without leading context must match at the beginning.
2027 */
2028 match_beginning = (!frag->oldpos ||
2029 (frag->oldpos == 1 && !unidiff_zero));
2031 /*
2032 * A hunk without trailing lines must match at the end.
2033 * However, we simply cannot tell if a hunk must match end
2034 * from the lack of trailing lines if the patch was generated
2035 * with unidiff without any context.
2036 */
2037 match_end = !unidiff_zero && !trailing;
2039 pos = frag->newpos ? (frag->newpos - 1) : 0;
2040 preimage.buf = oldlines;
2041 preimage.len = old - oldlines;
2042 postimage.buf = newlines;
2043 postimage.len = new - newlines;
2044 preimage.line = preimage.line_allocated;
2045 postimage.line = postimage.line_allocated;
2047 for (;;) {
2049 applied_pos = find_pos(img, &preimage, &postimage, pos,
2050 ws_rule, match_beginning, match_end);
2052 if (applied_pos >= 0)
2053 break;
2055 /* Am I at my context limits? */
2056 if ((leading <= p_context) && (trailing <= p_context))
2057 break;
2058 if (match_beginning || match_end) {
2059 match_beginning = match_end = 0;
2060 continue;
2061 }
2063 /*
2064 * Reduce the number of context lines; reduce both
2065 * leading and trailing if they are equal otherwise
2066 * just reduce the larger context.
2067 */
2068 if (leading >= trailing) {
2069 remove_first_line(&preimage);
2070 remove_first_line(&postimage);
2071 pos--;
2072 leading--;
2073 }
2074 if (trailing > leading) {
2075 remove_last_line(&preimage);
2076 remove_last_line(&postimage);
2077 trailing--;
2078 }
2079 }
2081 if (applied_pos >= 0) {
2082 if (ws_error_action == correct_ws_error &&
2083 new_blank_lines_at_end &&
2084 preimage.nr + applied_pos == img->nr) {
2085 /*
2086 * If the patch application adds blank lines
2087 * at the end, and if the patch applies at the
2088 * end of the image, remove those added blank
2089 * lines.
2090 */
2091 while (new_blank_lines_at_end--)
2092 remove_last_line(&postimage);
2093 }
2095 /*
2096 * Warn if it was necessary to reduce the number
2097 * of context lines.
2098 */
2099 if ((leading != frag->leading) ||
2100 (trailing != frag->trailing))
2101 fprintf(stderr, "Context reduced to (%ld/%ld)"
2102 " to apply fragment at %d\n",
2103 leading, trailing, applied_pos+1);
2104 update_image(img, applied_pos, &preimage, &postimage);
2105 } else {
2106 if (apply_verbosely)
2107 error("while searching for:\n%.*s",
2108 (int)(old - oldlines), oldlines);
2109 }
2111 free(oldlines);
2112 free(newlines);
2113 free(preimage.line_allocated);
2114 free(postimage.line_allocated);
2116 return (applied_pos < 0);
2117 }
2119 static int apply_binary_fragment(struct image *img, struct patch *patch)
2120 {
2121 struct fragment *fragment = patch->fragments;
2122 unsigned long len;
2123 void *dst;
2125 /* Binary patch is irreversible without the optional second hunk */
2126 if (apply_in_reverse) {
2127 if (!fragment->next)
2128 return error("cannot reverse-apply a binary patch "
2129 "without the reverse hunk to '%s'",
2130 patch->new_name
2131 ? patch->new_name : patch->old_name);
2132 fragment = fragment->next;
2133 }
2134 switch (fragment->binary_patch_method) {
2135 case BINARY_DELTA_DEFLATED:
2136 dst = patch_delta(img->buf, img->len, fragment->patch,
2137 fragment->size, &len);
2138 if (!dst)
2139 return -1;
2140 clear_image(img);
2141 img->buf = dst;
2142 img->len = len;
2143 return 0;
2144 case BINARY_LITERAL_DEFLATED:
2145 clear_image(img);
2146 img->len = fragment->size;
2147 img->buf = xmalloc(img->len+1);
2148 memcpy(img->buf, fragment->patch, img->len);
2149 img->buf[img->len] = '\0';
2150 return 0;
2151 }
2152 return -1;
2153 }
2155 static int apply_binary(struct image *img, struct patch *patch)
2156 {
2157 const char *name = patch->old_name ? patch->old_name : patch->new_name;
2158 unsigned char sha1[20];
2160 /*
2161 * For safety, we require patch index line to contain
2162 * full 40-byte textual SHA1 for old and new, at least for now.
2163 */
2164 if (strlen(patch->old_sha1_prefix) != 40 ||
2165 strlen(patch->new_sha1_prefix) != 40 ||
2166 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
2167 get_sha1_hex(patch->new_sha1_prefix, sha1))
2168 return error("cannot apply binary patch to '%s' "
2169 "without full index line", name);
2171 if (patch->old_name) {
2172 /*
2173 * See if the old one matches what the patch
2174 * applies to.
2175 */
2176 hash_sha1_file(img->buf, img->len, blob_type, sha1);
2177 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
2178 return error("the patch applies to '%s' (%s), "
2179 "which does not match the "
2180 "current contents.",
2181 name, sha1_to_hex(sha1));
2182 }
2183 else {
2184 /* Otherwise, the old one must be empty. */
2185 if (img->len)
2186 return error("the patch applies to an empty "
2187 "'%s' but it is not empty", name);
2188 }
2190 get_sha1_hex(patch->new_sha1_prefix, sha1);
2191 if (is_null_sha1(sha1)) {
2192 clear_image(img);
2193 return 0; /* deletion patch */
2194 }
2196 if (has_sha1_file(sha1)) {
2197 /* We already have the postimage */
2198 enum object_type type;
2199 unsigned long size;
2200 char *result;
2202 result = read_sha1_file(sha1, &type, &size);
2203 if (!result)
2204 return error("the necessary postimage %s for "
2205 "'%s' cannot be read",
2206 patch->new_sha1_prefix, name);
2207 clear_image(img);
2208 img->buf = result;
2209 img->len = size;
2210 } else {
2211 /*
2212 * We have verified buf matches the preimage;
2213 * apply the patch data to it, which is stored
2214 * in the patch->fragments->{patch,size}.
2215 */
2216 if (apply_binary_fragment(img, patch))
2217 return error("binary patch does not apply to '%s'",
2218 name);
2220 /* verify that the result matches */
2221 hash_sha1_file(img->buf, img->len, blob_type, sha1);
2222 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
2223 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",
2224 name, patch->new_sha1_prefix, sha1_to_hex(sha1));
2225 }
2227 return 0;
2228 }
2230 static int apply_fragments(struct image *img, struct patch *patch)
2231 {
2232 struct fragment *frag = patch->fragments;
2233 const char *name = patch->old_name ? patch->old_name : patch->new_name;
2234 unsigned ws_rule = patch->ws_rule;
2235 unsigned inaccurate_eof = patch->inaccurate_eof;
2237 if (patch->is_binary)
2238 return apply_binary(img, patch);
2240 while (frag) {
2241 if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule)) {
2242 error("patch failed: %s:%ld", name, frag->oldpos);
2243 if (!apply_with_reject)
2244 return -1;
2245 frag->rejected = 1;
2246 }
2247 frag = frag->next;
2248 }
2249 return 0;
2250 }
2252 static int read_file_or_gitlink(struct cache_entry *ce, struct strbuf *buf)
2253 {
2254 if (!ce)
2255 return 0;
2257 if (S_ISGITLINK(ce->ce_mode)) {
2258 strbuf_grow(buf, 100);
2259 strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(ce->sha1));
2260 } else {
2261 enum object_type type;
2262 unsigned long sz;
2263 char *result;
2265 result = read_sha1_file(ce->sha1, &type, &sz);
2266 if (!result)
2267 return -1;
2268 /* XXX read_sha1_file NUL-terminates */
2269 strbuf_attach(buf, result, sz, sz + 1);
2270 }
2271 return 0;
2272 }
2274 static struct patch *in_fn_table(const char *name)
2275 {
2276 struct string_list_item *item;
2278 if (name == NULL)
2279 return NULL;
2281 item = string_list_lookup(name, &fn_table);
2282 if (item != NULL)
2283 return (struct patch *)item->util;
2285 return NULL;
2286 }
2288 static void add_to_fn_table(struct patch *patch)
2289 {
2290 struct string_list_item *item;
2292 /*
2293 * Always add new_name unless patch is a deletion
2294 * This should cover the cases for normal diffs,
2295 * file creations and copies
2296 */
2297 if (patch->new_name != NULL) {
2298 item = string_list_insert(patch->new_name, &fn_table);
2299 item->util = patch;
2300 }
2302 /*
2303 * store a failure on rename/deletion cases because
2304 * later chunks shouldn't patch old names
2305 */
2306 if ((patch->new_name == NULL) || (patch->is_rename)) {
2307 item = string_list_insert(patch->old_name, &fn_table);
2308 item->util = (struct patch *) -1;
2309 }
2310 }
2312 static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
2313 {
2314 struct strbuf buf;
2315 struct image image;
2316 size_t len;
2317 char *img;
2318 struct patch *tpatch;
2320 strbuf_init(&buf, 0);
2322 if (!(patch->is_copy || patch->is_rename) &&
2323 ((tpatch = in_fn_table(patch->old_name)) != NULL)) {
2324 if (tpatch == (struct patch *) -1) {
2325 return error("patch %s has been renamed/deleted",
2326 patch->old_name);
2327 }
2328 /* We have a patched copy in memory use that */
2329 strbuf_add(&buf, tpatch->result, tpatch->resultsize);
2330 } else if (cached) {
2331 if (read_file_or_gitlink(ce, &buf))
2332 return error("read of %s failed", patch->old_name);
2333 } else if (patch->old_name) {
2334 if (S_ISGITLINK(patch->old_mode)) {
2335 if (ce) {
2336 read_file_or_gitlink(ce, &buf);
2337 } else {
2338 /*
2339 * There is no way to apply subproject
2340 * patch without looking at the index.
2341 */
2342 patch->fragments = NULL;
2343 }
2344 } else {
2345 if (read_old_data(st, patch->old_name, &buf))
2346 return error("read of %s failed", patch->old_name);
2347 }
2348 }
2350 img = strbuf_detach(&buf, &len);
2351 prepare_image(&image, img, len, !patch->is_binary);
2353 if (apply_fragments(&image, patch) < 0)
2354 return -1; /* note with --reject this succeeds. */
2355 patch->result = image.buf;
2356 patch->resultsize = image.len;
2357 add_to_fn_table(patch);
2358 free(image.line_allocated);
2360 if (0 < patch->is_delete && patch->resultsize)
2361 return error("removal patch leaves file contents");
2363 return 0;
2364 }
2366 static int check_to_create_blob(const char *new_name, int ok_if_exists)
2367 {
2368 struct stat nst;
2369 if (!lstat(new_name, &nst)) {
2370 if (S_ISDIR(nst.st_mode) || ok_if_exists)
2371 return 0;
2372 /*
2373 * A leading component of new_name might be a symlink
2374 * that is going to be removed with this patch, but
2375 * still pointing at somewhere that has the path.
2376 * In such a case, path "new_name" does not exist as
2377 * far as git is concerned.
2378 */
2379 if (has_symlink_leading_path(strlen(new_name), new_name))
2380 return 0;
2382 return error("%s: already exists in working directory", new_name);
2383 }
2384 else if ((errno != ENOENT) && (errno != ENOTDIR))
2385 return error("%s: %s", new_name, strerror(errno));
2386 return 0;
2387 }
2389 static int verify_index_match(struct cache_entry *ce, struct stat *st)
2390 {
2391 if (S_ISGITLINK(ce->ce_mode)) {
2392 if (!S_ISDIR(st->st_mode))
2393 return -1;
2394 return 0;
2395 }
2396 return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID);
2397 }
2399 static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)
2400 {
2401 const char *old_name = patch->old_name;
2402 struct patch *tpatch = NULL;
2403 int stat_ret = 0;
2404 unsigned st_mode = 0;
2406 /*
2407 * Make sure that we do not have local modifications from the
2408 * index when we are looking at the index. Also make sure
2409 * we have the preimage file to be patched in the work tree,
2410 * unless --cached, which tells git to apply only in the index.
2411 */
2412 if (!old_name)
2413 return 0;
2415 assert(patch->is_new <= 0);
2417 if (!(patch->is_copy || patch->is_rename) &&
2418 (tpatch = in_fn_table(old_name)) != NULL) {
2419 if (tpatch == (struct patch *) -1) {
2420 return error("%s: has been deleted/renamed", old_name);
2421 }
2422 st_mode = tpatch->new_mode;
2423 } else if (!cached) {
2424 stat_ret = lstat(old_name, st);
2425 if (stat_ret && errno != ENOENT)
2426 return error("%s: %s", old_name, strerror(errno));
2427 }
2429 if (check_index && !tpatch) {
2430 int pos = cache_name_pos(old_name, strlen(old_name));
2431 if (pos < 0) {
2432 if (patch->is_new < 0)
2433 goto is_new;
2434 return error("%s: does not exist in index", old_name);
2435 }
2436 *ce = active_cache[pos];
2437 if (stat_ret < 0) {
2438 struct checkout costate;
2439 /* checkout */
2440 costate.base_dir = "";
2441 costate.base_dir_len = 0;
2442 costate.force = 0;
2443 costate.quiet = 0;
2444 costate.not_new = 0;
2445 costate.refresh_cache = 1;
2446 if (checkout_entry(*ce, &costate, NULL) ||
2447 lstat(old_name, st))
2448 return -1;
2449 }
2450 if (!cached && verify_index_match(*ce, st))
2451 return error("%s: does not match index", old_name);
2452 if (cached)
2453 st_mode = (*ce)->ce_mode;
2454 } else if (stat_ret < 0) {
2455 if (patch->is_new < 0)
2456 goto is_new;
2457 return error("%s: %s", old_name, strerror(errno));
2458 }
2460 if (!cached && !tpatch)
2461 st_mode = ce_mode_from_stat(*ce, st->st_mode);
2463 if (patch->is_new < 0)
2464 patch->is_new = 0;
2465 if (!patch->old_mode)
2466 patch->old_mode = st_mode;
2467 if ((st_mode ^ patch->old_mode) & S_IFMT)
2468 return error("%s: wrong type", old_name);
2469 if (st_mode != patch->old_mode)
2470 fprintf(stderr, "warning: %s has type %o, expected %o\n",
2471 old_name, st_mode, patch->old_mode);
2472 return 0;
2474 is_new:
2475 patch->is_new = 1;
2476 patch->is_delete = 0;
2477 patch->old_name = NULL;
2478 return 0;
2479 }
2481 static int check_patch(struct patch *patch)
2482 {
2483 struct stat st;
2484 const char *old_name = patch->old_name;
2485 const char *new_name = patch->new_name;
2486 const char *name = old_name ? old_name : new_name;
2487 struct cache_entry *ce = NULL;
2488 int ok_if_exists;
2489 int status;
2491 patch->rejected = 1; /* we will drop this after we succeed */
2493 status = check_preimage(patch, &ce, &st);
2494 if (status)
2495 return status;
2496 old_name = patch->old_name;
2498 if (in_fn_table(new_name) == (struct patch *) -1)
2499 /*
2500 * A type-change diff is always split into a patch to
2501 * delete old, immediately followed by a patch to
2502 * create new (see diff.c::run_diff()); in such a case
2503 * it is Ok that the entry to be deleted by the
2504 * previous patch is still in the working tree and in
2505 * the index.
2506 */
2507 ok_if_exists = 1;
2508 else
2509 ok_if_exists = 0;
2511 if (new_name &&
2512 ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {
2513 if (check_index &&
2514 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
2515 !ok_if_exists)
2516 return error("%s: already exists in index", new_name);
2517 if (!cached) {
2518 int err = check_to_create_blob(new_name, ok_if_exists);
2519 if (err)
2520 return err;
2521 }
2522 if (!patch->new_mode) {
2523 if (0 < patch->is_new)
2524 patch->new_mode = S_IFREG | 0644;
2525 else
2526 patch->new_mode = patch->old_mode;
2527 }
2528 }
2530 if (new_name && old_name) {
2531 int same = !strcmp(old_name, new_name);
2532 if (!patch->new_mode)
2533 patch->new_mode = patch->old_mode;
2534 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
2535 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2536 patch->new_mode, new_name, patch->old_mode,
2537 same ? "" : " of ", same ? "" : old_name);
2538 }
2540 if (apply_data(patch, &st, ce) < 0)
2541 return error("%s: patch does not apply", name);
2542 patch->rejected = 0;
2543 return 0;
2544 }
2546 static int check_patch_list(struct patch *patch)
2547 {
2548 int err = 0;
2550 while (patch) {
2551 if (apply_verbosely)
2552 say_patch_name(stderr,
2553 "Checking patch ", patch, "...\n");
2554 err |= check_patch(patch);
2555 patch = patch->next;
2556 }
2557 return err;
2558 }
2560 /* This function tries to read the sha1 from the current index */
2561 static int get_current_sha1(const char *path, unsigned char *sha1)
2562 {
2563 int pos;
2565 if (read_cache() < 0)
2566 return -1;
2567 pos = cache_name_pos(path, strlen(path));
2568 if (pos < 0)
2569 return -1;
2570 hashcpy(sha1, active_cache[pos]->sha1);
2571 return 0;
2572 }
2574 /* Build an index that contains the just the files needed for a 3way merge */
2575 static void build_fake_ancestor(struct patch *list, const char *filename)
2576 {
2577 struct patch *patch;
2578 struct index_state result = { 0 };
2579 int fd;
2581 /* Once we start supporting the reverse patch, it may be
2582 * worth showing the new sha1 prefix, but until then...
2583 */
2584 for (patch = list; patch; patch = patch->next) {
2585 const unsigned char *sha1_ptr;
2586 unsigned char sha1[20];
2587 struct cache_entry *ce;
2588 const char *name;
2590 name = patch->old_name ? patch->old_name : patch->new_name;
2591 if (0 < patch->is_new)
2592 continue;
2593 else if (get_sha1(patch->old_sha1_prefix, sha1))
2594 /* git diff has no index line for mode/type changes */
2595 if (!patch->lines_added && !patch->lines_deleted) {
2596 if (get_current_sha1(patch->new_name, sha1) ||
2597 get_current_sha1(patch->old_name, sha1))
2598 die("mode change for %s, which is not "
2599 "in current HEAD", name);
2600 sha1_ptr = sha1;
2601 } else
2602 die("sha1 information is lacking or useless "
2603 "(%s).", name);
2604 else
2605 sha1_ptr = sha1;
2607 ce = make_cache_entry(patch->old_mode, sha1_ptr, name, 0, 0);
2608 if (!ce)
2609 die("make_cache_entry failed for path '%s'", name);
2610 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))
2611 die ("Could not add %s to temporary index", name);
2612 }
2614 fd = open(filename, O_WRONLY | O_CREAT, 0666);
2615 if (fd < 0 || write_index(&result, fd) || close(fd))
2616 die ("Could not write temporary index to %s", filename);
2618 discard_index(&result);
2619 }
2621 static void stat_patch_list(struct patch *patch)
2622 {
2623 int files, adds, dels;
2625 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
2626 files++;
2627 adds += patch->lines_added;
2628 dels += patch->lines_deleted;
2629 show_stats(patch);
2630 }
2632 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
2633 }
2635 static void numstat_patch_list(struct patch *patch)
2636 {
2637 for ( ; patch; patch = patch->next) {
2638 const char *name;
2639 name = patch->new_name ? patch->new_name : patch->old_name;
2640 if (patch->is_binary)
2641 printf("-\t-\t");
2642 else
2643 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
2644 write_name_quoted(name, stdout, line_termination);
2645 }
2646 }
2648 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
2649 {
2650 if (mode)
2651 printf(" %s mode %06o %s\n", newdelete, mode, name);
2652 else
2653 printf(" %s %s\n", newdelete, name);
2654 }
2656 static void show_mode_change(struct patch *p, int show_name)
2657 {
2658 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
2659 if (show_name)
2660 printf(" mode change %06o => %06o %s\n",
2661 p->old_mode, p->new_mode, p->new_name);
2662 else
2663 printf(" mode change %06o => %06o\n",
2664 p->old_mode, p->new_mode);
2665 }
2666 }
2668 static void show_rename_copy(struct patch *p)
2669 {
2670 const char *renamecopy = p->is_rename ? "rename" : "copy";
2671 const char *old, *new;
2673 /* Find common prefix */
2674 old = p->old_name;
2675 new = p->new_name;
2676 while (1) {
2677 const char *slash_old, *slash_new;
2678 slash_old = strchr(old, '/');
2679 slash_new = strchr(new, '/');
2680 if (!slash_old ||
2681 !slash_new ||
2682 slash_old - old != slash_new - new ||
2683 memcmp(old, new, slash_new - new))
2684 break;
2685 old = slash_old + 1;
2686 new = slash_new + 1;
2687 }
2688 /* p->old_name thru old is the common prefix, and old and new
2689 * through the end of names are renames
2690 */
2691 if (old != p->old_name)
2692 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
2693 (int)(old - p->old_name), p->old_name,
2694 old, new, p->score);
2695 else
2696 printf(" %s %s => %s (%d%%)\n", renamecopy,
2697 p->old_name, p->new_name, p->score);
2698 show_mode_change(p, 0);
2699 }
2701 static void summary_patch_list(struct patch *patch)
2702 {
2703 struct patch *p;
2705 for (p = patch; p; p = p->next) {
2706 if (p->is_new)
2707 show_file_mode_name("create", p->new_mode, p->new_name);
2708 else if (p->is_delete)
2709 show_file_mode_name("delete", p->old_mode, p->old_name);
2710 else {
2711 if (p->is_rename || p->is_copy)
2712 show_rename_copy(p);
2713 else {
2714 if (p->score) {
2715 printf(" rewrite %s (%d%%)\n",
2716 p->new_name, p->score);
2717 show_mode_change(p, 0);
2718 }
2719 else
2720 show_mode_change(p, 1);
2721 }
2722 }
2723 }
2724 }
2726 static void patch_stats(struct patch *patch)
2727 {
2728 int lines = patch->lines_added + patch->lines_deleted;
2730 if (lines > max_change)
2731 max_change = lines;
2732 if (patch->old_name) {
2733 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
2734 if (!len)
2735 len = strlen(patch->old_name);
2736 if (len > max_len)
2737 max_len = len;
2738 }
2739 if (patch->new_name) {
2740 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
2741 if (!len)
2742 len = strlen(patch->new_name);
2743 if (len > max_len)
2744 max_len = len;
2745 }
2746 }
2748 static void remove_file(struct patch *patch, int rmdir_empty)
2749 {
2750 if (update_index) {
2751 if (remove_file_from_cache(patch->old_name) < 0)
2752 die("unable to remove %s from index", patch->old_name);
2753 }
2754 if (!cached) {
2755 if (S_ISGITLINK(patch->old_mode)) {
2756 if (rmdir(patch->old_name))
2757 warning("unable to remove submodule %s",
2758 patch->old_name);
2759 } else if (!unlink(patch->old_name) && rmdir_empty) {
2760 remove_path(patch->old_name);
2761 }
2762 }
2763 }
2765 static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
2766 {
2767 struct stat st;
2768 struct cache_entry *ce;
2769 int namelen = strlen(path);
2770 unsigned ce_size = cache_entry_size(namelen);
2772 if (!update_index)
2773 return;
2775 ce = xcalloc(1, ce_size);
2776 memcpy(ce->name, path, namelen);
2777 ce->ce_mode = create_ce_mode(mode);
2778 ce->ce_flags = namelen;
2779 if (S_ISGITLINK(mode)) {
2780 const char *s = buf;
2782 if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))
2783 die("corrupt patch for subproject %s", path);
2784 } else {
2785 if (!cached) {
2786 if (lstat(path, &st) < 0)
2787 die("unable to stat newly created file %s",
2788 path);
2789 fill_stat_cache_info(ce, &st);
2790 }
2791 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
2792 die("unable to create backing store for newly created file %s", path);
2793 }
2794 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
2795 die("unable to add cache entry for %s", path);
2796 }
2798 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
2799 {
2800 int fd;
2801 struct strbuf nbuf;
2803 if (S_ISGITLINK(mode)) {
2804 struct stat st;
2805 if (!lstat(path, &st) && S_ISDIR(st.st_mode))
2806 return 0;
2807 return mkdir(path, 0777);
2808 }
2810 if (has_symlinks && S_ISLNK(mode))
2811 /* Although buf:size is counted string, it also is NUL
2812 * terminated.
2813 */
2814 return symlink(buf, path);
2816 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
2817 if (fd < 0)
2818 return -1;
2820 strbuf_init(&nbuf, 0);
2821 if (convert_to_working_tree(path, buf, size, &nbuf)) {
2822 size = nbuf.len;
2823 buf = nbuf.buf;
2824 }
2825 write_or_die(fd, buf, size);
2826 strbuf_release(&nbuf);
2828 if (close(fd) < 0)
2829 die("closing file %s: %s", path, strerror(errno));
2830 return 0;
2831 }
2833 /*
2834 * We optimistically assume that the directories exist,
2835 * which is true 99% of the time anyway. If they don't,
2836 * we create them and try again.
2837 */
2838 static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
2839 {
2840 if (cached)
2841 return;
2842 if (!try_create_file(path, mode, buf, size))
2843 return;
2845 if (errno == ENOENT) {
2846 if (safe_create_leading_directories(path))
2847 return;
2848 if (!try_create_file(path, mode, buf, size))
2849 return;
2850 }
2852 if (errno == EEXIST || errno == EACCES) {
2853 /* We may be trying to create a file where a directory
2854 * used to be.
2855 */
2856 struct stat st;
2857 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))
2858 errno = EEXIST;
2859 }
2861 if (errno == EEXIST) {
2862 unsigned int nr = getpid();
2864 for (;;) {
2865 char newpath[PATH_MAX];
2866 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);
2867 if (!try_create_file(newpath, mode, buf, size)) {
2868 if (!rename(newpath, path))
2869 return;
2870 unlink(newpath);
2871 break;
2872 }
2873 if (errno != EEXIST)
2874 break;
2875 ++nr;
2876 }
2877 }
2878 die("unable to write file %s mode %o", path, mode);
2879 }
2881 static void create_file(struct patch *patch)
2882 {
2883 char *path = patch->new_name;
2884 unsigned mode = patch->new_mode;
2885 unsigned long size = patch->resultsize;
2886 char *buf = patch->result;
2888 if (!mode)
2889 mode = S_IFREG | 0644;
2890 create_one_file(path, mode, buf, size);
2891 add_index_file(path, mode, buf, size);
2892 }
2894 /* phase zero is to remove, phase one is to create */
2895 static void write_out_one_result(struct patch *patch, int phase)
2896 {
2897 if (patch->is_delete > 0) {
2898 if (phase == 0)
2899 remove_file(patch, 1);
2900 return;
2901 }
2902 if (patch->is_new > 0 || patch->is_copy) {
2903 if (phase == 1)
2904 create_file(patch);
2905 return;
2906 }
2907 /*
2908 * Rename or modification boils down to the same
2909 * thing: remove the old, write the new
2910 */
2911 if (phase == 0)
2912 remove_file(patch, patch->is_rename);
2913 if (phase == 1)
2914 create_file(patch);
2915 }
2917 static int write_out_one_reject(struct patch *patch)
2918 {
2919 FILE *rej;
2920 char namebuf[PATH_MAX];
2921 struct fragment *frag;
2922 int cnt = 0;
2924 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
2925 if (!frag->rejected)
2926 continue;
2927 cnt++;
2928 }
2930 if (!cnt) {
2931 if (apply_verbosely)
2932 say_patch_name(stderr,
2933 "Applied patch ", patch, " cleanly.\n");
2934 return 0;
2935 }
2937 /* This should not happen, because a removal patch that leaves
2938 * contents are marked "rejected" at the patch level.
2939 */
2940 if (!patch->new_name)
2941 die("internal error");
2943 /* Say this even without --verbose */
2944 say_patch_name(stderr, "Applying patch ", patch, " with");
2945 fprintf(stderr, " %d rejects...\n", cnt);
2947 cnt = strlen(patch->new_name);
2948 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
2949 cnt = ARRAY_SIZE(namebuf) - 5;
2950 fprintf(stderr,
2951 "warning: truncating .rej filename to %.*s.rej",
2952 cnt - 1, patch->new_name);
2953 }
2954 memcpy(namebuf, patch->new_name, cnt);
2955 memcpy(namebuf + cnt, ".rej", 5);
2957 rej = fopen(namebuf, "w");
2958 if (!rej)
2959 return error("cannot open %s: %s", namebuf, strerror(errno));
2961 /* Normal git tools never deal with .rej, so do not pretend
2962 * this is a git patch by saying --git nor give extended
2963 * headers. While at it, maybe please "kompare" that wants
2964 * the trailing TAB and some garbage at the end of line ;-).
2965 */
2966 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
2967 patch->new_name, patch->new_name);
2968 for (cnt = 1, frag = patch->fragments;
2969 frag;
2970 cnt++, frag = frag->next) {
2971 if (!frag->rejected) {
2972 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);
2973 continue;
2974 }
2975 fprintf(stderr, "Rejected hunk #%d.\n", cnt);
2976 fprintf(rej, "%.*s", frag->size, frag->patch);
2977 if (frag->patch[frag->size-1] != '\n')
2978 fputc('\n', rej);
2979 }
2980 fclose(rej);
2981 return -1;
2982 }
2984 static int write_out_results(struct patch *list, int skipped_patch)
2985 {
2986 int phase;
2987 int errs = 0;
2988 struct patch *l;
2990 if (!list && !skipped_patch)
2991 return error("No changes");
2993 for (phase = 0; phase < 2; phase++) {
2994 l = list;
2995 while (l) {
2996 if (l->rejected)
2997 errs = 1;
2998 else {
2999 write_out_one_result(l, phase);
3000 if (phase == 1 && write_out_one_reject(l))
3001 errs = 1;
3002 }
3003 l = l->next;
3004 }
3005 }
3006 return errs;
3007 }
3009 static struct lock_file lock_file;
3011 static struct excludes {
3012 struct excludes *next;
3013 const char *path;
3014 } *excludes;
3016 static int use_patch(struct patch *p)
3017 {
3018 const char *pathname = p->new_name ? p->new_name : p->old_name;
3019 struct excludes *x = excludes;
3020 while (x) {
3021 if (fnmatch(x->path, pathname, 0) == 0)
3022 return 0;
3023 x = x->next;
3024 }
3025 if (0 < prefix_length) {
3026 int pathlen = strlen(pathname);
3027 if (pathlen <= prefix_length ||
3028 memcmp(prefix, pathname, prefix_length))
3029 return 0;
3030 }
3031 return 1;
3032 }
3034 static void prefix_one(char **name)
3035 {
3036 char *old_name = *name;
3037 if (!old_name)
3038 return;
3039 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));
3040 free(old_name);
3041 }
3043 static void prefix_patches(struct patch *p)
3044 {
3045 if (!prefix || p->is_toplevel_relative)
3046 return;
3047 for ( ; p; p = p->next) {
3048 if (p->new_name == p->old_name) {
3049 char *prefixed = p->new_name;
3050 prefix_one(&prefixed);
3051 p->new_name = p->old_name = prefixed;
3052 }
3053 else {
3054 prefix_one(&p->new_name);
3055 prefix_one(&p->old_name);
3056 }
3057 }
3058 }
3060 #define INACCURATE_EOF (1<<0)
3061 #define RECOUNT (1<<1)
3063 static int apply_patch(int fd, const char *filename, int options)
3064 {
3065 size_t offset;
3066 struct strbuf buf;
3067 struct patch *list = NULL, **listp = &list;
3068 int skipped_patch = 0;
3070 /* FIXME - memory leak when using multiple patch files as inputs */
3071 memset(&fn_table, 0, sizeof(struct string_list));
3072 strbuf_init(&buf, 0);
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;
3094 }
3095 else {
3096 /* perhaps free it a bit better? */
3097 free(patch);
3098 skipped_patch++;
3099 }
3100 offset += nr;
3101 }
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");
3113 }
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;
3137 }
3139 static int git_apply_config(const char *var, const char *value, void *cb)
3140 {
3141 if (!strcmp(var, "apply.whitespace"))
3142 return git_config_string(&apply_default_whitespace, var, value);
3143 return git_default_config(var, value, cb);
3144 }
3147 int cmd_apply(int argc, const char **argv, const char *unused_prefix)
3148 {
3149 int i;
3150 int read_stdin = 1;
3151 int options = 0;
3152 int errs = 0;
3153 int is_not_gitdir;
3155 const char *whitespace_option = NULL;
3157 prefix = setup_git_directory_gently(&is_not_gitdir);
3158 prefix_length = prefix ? strlen(prefix) : 0;
3159 git_config(git_apply_config, NULL);
3160 if (apply_default_whitespace)
3161 parse_whitespace_option(apply_default_whitespace);
3163 for (i = 1; i < argc; i++) {
3164 const char *arg = argv[i];
3165 char *end;
3166 int fd;
3168 if (!strcmp(arg, "-")) {
3169 errs |= apply_patch(0, "<stdin>", options);
3170 read_stdin = 0;
3171 continue;
3172 }
3173 if (!prefixcmp(arg, "--exclude=")) {
3174 struct excludes *x = xmalloc(sizeof(*x));
3175 x->path = arg + 10;
3176 x->next = excludes;
3177 excludes = x;
3178 continue;
3179 }
3180 if (!prefixcmp(arg, "-p")) {
3181 p_value = atoi(arg + 2);
3182 p_value_known = 1;
3183 continue;
3184 }
3185 if (!strcmp(arg, "--no-add")) {
3186 no_add = 1;
3187 continue;
3188 }
3189 if (!strcmp(arg, "--stat")) {
3190 apply = 0;
3191 diffstat = 1;
3192 continue;
3193 }
3194 if (!strcmp(arg, "--allow-binary-replacement") ||
3195 !strcmp(arg, "--binary")) {
3196 continue; /* now no-op */
3197 }
3198 if (!strcmp(arg, "--numstat")) {
3199 apply = 0;
3200 numstat = 1;
3201 continue;
3202 }
3203 if (!strcmp(arg, "--summary")) {
3204 apply = 0;
3205 summary = 1;
3206 continue;
3207 }
3208 if (!strcmp(arg, "--check")) {
3209 apply = 0;
3210 check = 1;
3211 continue;
3212 }
3213 if (!strcmp(arg, "--index")) {
3214 if (is_not_gitdir)
3215 die("--index outside a repository");
3216 check_index = 1;
3217 continue;
3218 }
3219 if (!strcmp(arg, "--cached")) {
3220 if (is_not_gitdir)
3221 die("--cached outside a repository");
3222 check_index = 1;
3223 cached = 1;
3224 continue;
3225 }
3226 if (!strcmp(arg, "--apply")) {
3227 apply = 1;
3228 continue;
3229 }
3230 if (!strcmp(arg, "--build-fake-ancestor")) {
3231 apply = 0;
3232 if (++i >= argc)
3233 die ("need a filename");
3234 fake_ancestor = argv[i];
3235 continue;
3236 }
3237 if (!strcmp(arg, "-z")) {
3238 line_termination = 0;
3239 continue;
3240 }
3241 if (!prefixcmp(arg, "-C")) {
3242 p_context = strtoul(arg + 2, &end, 0);
3243 if (*end != '\0')
3244 die("unrecognized context count '%s'", arg + 2);
3245 continue;
3246 }
3247 if (!prefixcmp(arg, "--whitespace=")) {
3248 whitespace_option = arg + 13;
3249 parse_whitespace_option(arg + 13);
3250 continue;
3251 }
3252 if (!strcmp(arg, "-R") || !strcmp(arg, "--reverse")) {
3253 apply_in_reverse = 1;
3254 continue;
3255 }
3256 if (!strcmp(arg, "--unidiff-zero")) {
3257 unidiff_zero = 1;
3258 continue;
3259 }
3260 if (!strcmp(arg, "--reject")) {
3261 apply = apply_with_reject = apply_verbosely = 1;
3262 continue;
3263 }
3264 if (!strcmp(arg, "-v") || !strcmp(arg, "--verbose")) {
3265 apply_verbosely = 1;
3266 continue;
3267 }
3268 if (!strcmp(arg, "--inaccurate-eof")) {
3269 options |= INACCURATE_EOF;
3270 continue;
3271 }
3272 if (!strcmp(arg, "--recount")) {
3273 options |= RECOUNT;
3274 continue;
3275 }
3276 if (!prefixcmp(arg, "--directory=")) {
3277 arg += strlen("--directory=");
3278 root_len = strlen(arg);
3279 if (root_len && arg[root_len - 1] != '/') {
3280 char *new_root;
3281 root = new_root = xmalloc(root_len + 2);
3282 strcpy(new_root, arg);
3283 strcpy(new_root + root_len++, "/");
3284 } else
3285 root = arg;
3286 continue;
3287 }
3288 if (0 < prefix_length)
3289 arg = prefix_filename(prefix, prefix_length, arg);
3291 fd = open(arg, O_RDONLY);
3292 if (fd < 0)
3293 die("can't open patch '%s': %s", arg, strerror(errno));
3294 read_stdin = 0;
3295 set_default_whitespace_mode(whitespace_option);
3296 errs |= apply_patch(fd, arg, options);
3297 close(fd);
3298 }
3299 set_default_whitespace_mode(whitespace_option);
3300 if (read_stdin)
3301 errs |= apply_patch(0, "<stdin>", options);
3302 if (whitespace_error) {
3303 if (squelch_whitespace_errors &&
3304 squelch_whitespace_errors < whitespace_error) {
3305 int squelched =
3306 whitespace_error - squelch_whitespace_errors;
3307 fprintf(stderr, "warning: squelched %d "
3308 "whitespace error%s\n",
3309 squelched,
3310 squelched == 1 ? "" : "s");
3311 }
3312 if (ws_error_action == die_on_ws_error)
3313 die("%d line%s add%s whitespace errors.",
3314 whitespace_error,
3315 whitespace_error == 1 ? "" : "s",
3316 whitespace_error == 1 ? "s" : "");
3317 if (applied_after_fixing_ws && apply)
3318 fprintf(stderr, "warning: %d line%s applied after"
3319 " fixing whitespace errors.\n",
3320 applied_after_fixing_ws,
3321 applied_after_fixing_ws == 1 ? "" : "s");
3322 else if (whitespace_error)
3323 fprintf(stderr, "warning: %d line%s add%s whitespace errors.\n",
3324 whitespace_error,
3325 whitespace_error == 1 ? "" : "s",
3326 whitespace_error == 1 ? "s" : "");
3327 }
3329 if (update_index) {
3330 if (write_cache(newfd, active_cache, active_nr) ||
3331 commit_locked_index(&lock_file))
3332 die("Unable to write new index file");
3333 }
3335 return !!errs;
3336 }