Merge branch 'sg/lock-file-commit-error' into maint
[git/git.git] / builtin / apply.c
1 /*
2 * apply.c
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 *
6 * This applies patches on top of some (arbitrary) version of the SCM.
7 *
8 */
9 #include "cache.h"
10 #include "lockfile.h"
11 #include "cache-tree.h"
12 #include "quote.h"
13 #include "blob.h"
14 #include "delta.h"
15 #include "builtin.h"
16 #include "string-list.h"
17 #include "dir.h"
18 #include "diff.h"
19 #include "parse-options.h"
20 #include "xdiff-interface.h"
21 #include "ll-merge.h"
22 #include "rerere.h"
23
24 /*
25 * --check turns on checking that the working tree matches the
26 * files that are being modified, but doesn't apply the patch
27 * --stat does just a diffstat, and doesn't actually apply
28 * --numstat does numeric diffstat, and doesn't actually apply
29 * --index-info shows the old and new index info for paths if available.
30 * --index updates the cache as well.
31 * --cached updates only the cache without ever touching the working tree.
32 */
33 static const char *prefix;
34 static int prefix_length = -1;
35 static int newfd = -1;
36
37 static int unidiff_zero;
38 static int p_value = 1;
39 static int p_value_known;
40 static int check_index;
41 static int update_index;
42 static int cached;
43 static int diffstat;
44 static int numstat;
45 static int summary;
46 static int check;
47 static int apply = 1;
48 static int apply_in_reverse;
49 static int apply_with_reject;
50 static int apply_verbosely;
51 static int allow_overlap;
52 static int no_add;
53 static int threeway;
54 static int unsafe_paths;
55 static const char *fake_ancestor;
56 static int line_termination = '\n';
57 static unsigned int p_context = UINT_MAX;
58 static const char * const apply_usage[] = {
59 N_("git apply [<options>] [<patch>...]"),
60 NULL
61 };
62
63 static enum ws_error_action {
64 nowarn_ws_error,
65 warn_on_ws_error,
66 die_on_ws_error,
67 correct_ws_error
68 } ws_error_action = warn_on_ws_error;
69 static int whitespace_error;
70 static int squelch_whitespace_errors = 5;
71 static int applied_after_fixing_ws;
72
73 static enum ws_ignore {
74 ignore_ws_none,
75 ignore_ws_change
76 } ws_ignore_action = ignore_ws_none;
77
78
79 static const char *patch_input_file;
80 static const char *root;
81 static int root_len;
82 static int read_stdin = 1;
83 static int options;
84
85 static void parse_whitespace_option(const char *option)
86 {
87 if (!option) {
88 ws_error_action = warn_on_ws_error;
89 return;
90 }
91 if (!strcmp(option, "warn")) {
92 ws_error_action = warn_on_ws_error;
93 return;
94 }
95 if (!strcmp(option, "nowarn")) {
96 ws_error_action = nowarn_ws_error;
97 return;
98 }
99 if (!strcmp(option, "error")) {
100 ws_error_action = die_on_ws_error;
101 return;
102 }
103 if (!strcmp(option, "error-all")) {
104 ws_error_action = die_on_ws_error;
105 squelch_whitespace_errors = 0;
106 return;
107 }
108 if (!strcmp(option, "strip") || !strcmp(option, "fix")) {
109 ws_error_action = correct_ws_error;
110 return;
111 }
112 die(_("unrecognized whitespace option '%s'"), option);
113 }
114
115 static void parse_ignorewhitespace_option(const char *option)
116 {
117 if (!option || !strcmp(option, "no") ||
118 !strcmp(option, "false") || !strcmp(option, "never") ||
119 !strcmp(option, "none")) {
120 ws_ignore_action = ignore_ws_none;
121 return;
122 }
123 if (!strcmp(option, "change")) {
124 ws_ignore_action = ignore_ws_change;
125 return;
126 }
127 die(_("unrecognized whitespace ignore option '%s'"), option);
128 }
129
130 static void set_default_whitespace_mode(const char *whitespace_option)
131 {
132 if (!whitespace_option && !apply_default_whitespace)
133 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error);
134 }
135
136 /*
137 * For "diff-stat" like behaviour, we keep track of the biggest change
138 * we've seen, and the longest filename. That allows us to do simple
139 * scaling.
140 */
141 static int max_change, max_len;
142
143 /*
144 * Various "current state", notably line numbers and what
145 * file (and how) we're patching right now.. The "is_xxxx"
146 * things are flags, where -1 means "don't know yet".
147 */
148 static int linenr = 1;
149
150 /*
151 * This represents one "hunk" from a patch, starting with
152 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
153 * patch text is pointed at by patch, and its byte length
154 * is stored in size. leading and trailing are the number
155 * of context lines.
156 */
157 struct fragment {
158 unsigned long leading, trailing;
159 unsigned long oldpos, oldlines;
160 unsigned long newpos, newlines;
161 /*
162 * 'patch' is usually borrowed from buf in apply_patch(),
163 * but some codepaths store an allocated buffer.
164 */
165 const char *patch;
166 unsigned free_patch:1,
167 rejected:1;
168 int size;
169 int linenr;
170 struct fragment *next;
171 };
172
173 /*
174 * When dealing with a binary patch, we reuse "leading" field
175 * to store the type of the binary hunk, either deflated "delta"
176 * or deflated "literal".
177 */
178 #define binary_patch_method leading
179 #define BINARY_DELTA_DEFLATED 1
180 #define BINARY_LITERAL_DEFLATED 2
181
182 /*
183 * This represents a "patch" to a file, both metainfo changes
184 * such as creation/deletion, filemode and content changes represented
185 * as a series of fragments.
186 */
187 struct patch {
188 char *new_name, *old_name, *def_name;
189 unsigned int old_mode, new_mode;
190 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
191 int rejected;
192 unsigned ws_rule;
193 int lines_added, lines_deleted;
194 int score;
195 unsigned int is_toplevel_relative:1;
196 unsigned int inaccurate_eof:1;
197 unsigned int is_binary:1;
198 unsigned int is_copy:1;
199 unsigned int is_rename:1;
200 unsigned int recount:1;
201 unsigned int conflicted_threeway:1;
202 unsigned int direct_to_threeway:1;
203 struct fragment *fragments;
204 char *result;
205 size_t resultsize;
206 char old_sha1_prefix[41];
207 char new_sha1_prefix[41];
208 struct patch *next;
209
210 /* three-way fallback result */
211 struct object_id threeway_stage[3];
212 };
213
214 static void free_fragment_list(struct fragment *list)
215 {
216 while (list) {
217 struct fragment *next = list->next;
218 if (list->free_patch)
219 free((char *)list->patch);
220 free(list);
221 list = next;
222 }
223 }
224
225 static void free_patch(struct patch *patch)
226 {
227 free_fragment_list(patch->fragments);
228 free(patch->def_name);
229 free(patch->old_name);
230 free(patch->new_name);
231 free(patch->result);
232 free(patch);
233 }
234
235 static void free_patch_list(struct patch *list)
236 {
237 while (list) {
238 struct patch *next = list->next;
239 free_patch(list);
240 list = next;
241 }
242 }
243
244 /*
245 * A line in a file, len-bytes long (includes the terminating LF,
246 * except for an incomplete line at the end if the file ends with
247 * one), and its contents hashes to 'hash'.
248 */
249 struct line {
250 size_t len;
251 unsigned hash : 24;
252 unsigned flag : 8;
253 #define LINE_COMMON 1
254 #define LINE_PATCHED 2
255 };
256
257 /*
258 * This represents a "file", which is an array of "lines".
259 */
260 struct image {
261 char *buf;
262 size_t len;
263 size_t nr;
264 size_t alloc;
265 struct line *line_allocated;
266 struct line *line;
267 };
268
269 /*
270 * Records filenames that have been touched, in order to handle
271 * the case where more than one patches touch the same file.
272 */
273
274 static struct string_list fn_table;
275
276 static uint32_t hash_line(const char *cp, size_t len)
277 {
278 size_t i;
279 uint32_t h;
280 for (i = 0, h = 0; i < len; i++) {
281 if (!isspace(cp[i])) {
282 h = h * 3 + (cp[i] & 0xff);
283 }
284 }
285 return h;
286 }
287
288 /*
289 * Compare lines s1 of length n1 and s2 of length n2, ignoring
290 * whitespace difference. Returns 1 if they match, 0 otherwise
291 */
292 static int fuzzy_matchlines(const char *s1, size_t n1,
293 const char *s2, size_t n2)
294 {
295 const char *last1 = s1 + n1 - 1;
296 const char *last2 = s2 + n2 - 1;
297 int result = 0;
298
299 /* ignore line endings */
300 while ((*last1 == '\r') || (*last1 == '\n'))
301 last1--;
302 while ((*last2 == '\r') || (*last2 == '\n'))
303 last2--;
304
305 /* skip leading whitespaces, if both begin with whitespace */
306 if (s1 <= last1 && s2 <= last2 && isspace(*s1) && isspace(*s2)) {
307 while (isspace(*s1) && (s1 <= last1))
308 s1++;
309 while (isspace(*s2) && (s2 <= last2))
310 s2++;
311 }
312 /* early return if both lines are empty */
313 if ((s1 > last1) && (s2 > last2))
314 return 1;
315 while (!result) {
316 result = *s1++ - *s2++;
317 /*
318 * Skip whitespace inside. We check for whitespace on
319 * both buffers because we don't want "a b" to match
320 * "ab"
321 */
322 if (isspace(*s1) && isspace(*s2)) {
323 while (isspace(*s1) && s1 <= last1)
324 s1++;
325 while (isspace(*s2) && s2 <= last2)
326 s2++;
327 }
328 /*
329 * If we reached the end on one side only,
330 * lines don't match
331 */
332 if (
333 ((s2 > last2) && (s1 <= last1)) ||
334 ((s1 > last1) && (s2 <= last2)))
335 return 0;
336 if ((s1 > last1) && (s2 > last2))
337 break;
338 }
339
340 return !result;
341 }
342
343 static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag)
344 {
345 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc);
346 img->line_allocated[img->nr].len = len;
347 img->line_allocated[img->nr].hash = hash_line(bol, len);
348 img->line_allocated[img->nr].flag = flag;
349 img->nr++;
350 }
351
352 /*
353 * "buf" has the file contents to be patched (read from various sources).
354 * attach it to "image" and add line-based index to it.
355 * "image" now owns the "buf".
356 */
357 static void prepare_image(struct image *image, char *buf, size_t len,
358 int prepare_linetable)
359 {
360 const char *cp, *ep;
361
362 memset(image, 0, sizeof(*image));
363 image->buf = buf;
364 image->len = len;
365
366 if (!prepare_linetable)
367 return;
368
369 ep = image->buf + image->len;
370 cp = image->buf;
371 while (cp < ep) {
372 const char *next;
373 for (next = cp; next < ep && *next != '\n'; next++)
374 ;
375 if (next < ep)
376 next++;
377 add_line_info(image, cp, next - cp, 0);
378 cp = next;
379 }
380 image->line = image->line_allocated;
381 }
382
383 static void clear_image(struct image *image)
384 {
385 free(image->buf);
386 free(image->line_allocated);
387 memset(image, 0, sizeof(*image));
388 }
389
390 /* fmt must contain _one_ %s and no other substitution */
391 static void say_patch_name(FILE *output, const char *fmt, struct patch *patch)
392 {
393 struct strbuf sb = STRBUF_INIT;
394
395 if (patch->old_name && patch->new_name &&
396 strcmp(patch->old_name, patch->new_name)) {
397 quote_c_style(patch->old_name, &sb, NULL, 0);
398 strbuf_addstr(&sb, " => ");
399 quote_c_style(patch->new_name, &sb, NULL, 0);
400 } else {
401 const char *n = patch->new_name;
402 if (!n)
403 n = patch->old_name;
404 quote_c_style(n, &sb, NULL, 0);
405 }
406 fprintf(output, fmt, sb.buf);
407 fputc('\n', output);
408 strbuf_release(&sb);
409 }
410
411 #define SLOP (16)
412
413 static void read_patch_file(struct strbuf *sb, int fd)
414 {
415 if (strbuf_read(sb, fd, 0) < 0)
416 die_errno("git apply: failed to read");
417
418 /*
419 * Make sure that we have some slop in the buffer
420 * so that we can do speculative "memcmp" etc, and
421 * see to it that it is NUL-filled.
422 */
423 strbuf_grow(sb, SLOP);
424 memset(sb->buf + sb->len, 0, SLOP);
425 }
426
427 static unsigned long linelen(const char *buffer, unsigned long size)
428 {
429 unsigned long len = 0;
430 while (size--) {
431 len++;
432 if (*buffer++ == '\n')
433 break;
434 }
435 return len;
436 }
437
438 static int is_dev_null(const char *str)
439 {
440 return skip_prefix(str, "/dev/null", &str) && isspace(*str);
441 }
442
443 #define TERM_SPACE 1
444 #define TERM_TAB 2
445
446 static int name_terminate(const char *name, int namelen, int c, int terminate)
447 {
448 if (c == ' ' && !(terminate & TERM_SPACE))
449 return 0;
450 if (c == '\t' && !(terminate & TERM_TAB))
451 return 0;
452
453 return 1;
454 }
455
456 /* remove double slashes to make --index work with such filenames */
457 static char *squash_slash(char *name)
458 {
459 int i = 0, j = 0;
460
461 if (!name)
462 return NULL;
463
464 while (name[i]) {
465 if ((name[j++] = name[i++]) == '/')
466 while (name[i] == '/')
467 i++;
468 }
469 name[j] = '\0';
470 return name;
471 }
472
473 static char *find_name_gnu(const char *line, const char *def, int p_value)
474 {
475 struct strbuf name = STRBUF_INIT;
476 char *cp;
477
478 /*
479 * Proposed "new-style" GNU patch/diff format; see
480 * http://marc.info/?l=git&m=112927316408690&w=2
481 */
482 if (unquote_c_style(&name, line, NULL)) {
483 strbuf_release(&name);
484 return NULL;
485 }
486
487 for (cp = name.buf; p_value; p_value--) {
488 cp = strchr(cp, '/');
489 if (!cp) {
490 strbuf_release(&name);
491 return NULL;
492 }
493 cp++;
494 }
495
496 strbuf_remove(&name, 0, cp - name.buf);
497 if (root)
498 strbuf_insert(&name, 0, root, root_len);
499 return squash_slash(strbuf_detach(&name, NULL));
500 }
501
502 static size_t sane_tz_len(const char *line, size_t len)
503 {
504 const char *tz, *p;
505
506 if (len < strlen(" +0500") || line[len-strlen(" +0500")] != ' ')
507 return 0;
508 tz = line + len - strlen(" +0500");
509
510 if (tz[1] != '+' && tz[1] != '-')
511 return 0;
512
513 for (p = tz + 2; p != line + len; p++)
514 if (!isdigit(*p))
515 return 0;
516
517 return line + len - tz;
518 }
519
520 static size_t tz_with_colon_len(const char *line, size_t len)
521 {
522 const char *tz, *p;
523
524 if (len < strlen(" +08:00") || line[len - strlen(":00")] != ':')
525 return 0;
526 tz = line + len - strlen(" +08:00");
527
528 if (tz[0] != ' ' || (tz[1] != '+' && tz[1] != '-'))
529 return 0;
530 p = tz + 2;
531 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != ':' ||
532 !isdigit(*p++) || !isdigit(*p++))
533 return 0;
534
535 return line + len - tz;
536 }
537
538 static size_t date_len(const char *line, size_t len)
539 {
540 const char *date, *p;
541
542 if (len < strlen("72-02-05") || line[len-strlen("-05")] != '-')
543 return 0;
544 p = date = line + len - strlen("72-02-05");
545
546 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != '-' ||
547 !isdigit(*p++) || !isdigit(*p++) || *p++ != '-' ||
548 !isdigit(*p++) || !isdigit(*p++)) /* Not a date. */
549 return 0;
550
551 if (date - line >= strlen("19") &&
552 isdigit(date[-1]) && isdigit(date[-2])) /* 4-digit year */
553 date -= strlen("19");
554
555 return line + len - date;
556 }
557
558 static size_t short_time_len(const char *line, size_t len)
559 {
560 const char *time, *p;
561
562 if (len < strlen(" 07:01:32") || line[len-strlen(":32")] != ':')
563 return 0;
564 p = time = line + len - strlen(" 07:01:32");
565
566 /* Permit 1-digit hours? */
567 if (*p++ != ' ' ||
568 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' ||
569 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' ||
570 !isdigit(*p++) || !isdigit(*p++)) /* Not a time. */
571 return 0;
572
573 return line + len - time;
574 }
575
576 static size_t fractional_time_len(const char *line, size_t len)
577 {
578 const char *p;
579 size_t n;
580
581 /* Expected format: 19:41:17.620000023 */
582 if (!len || !isdigit(line[len - 1]))
583 return 0;
584 p = line + len - 1;
585
586 /* Fractional seconds. */
587 while (p > line && isdigit(*p))
588 p--;
589 if (*p != '.')
590 return 0;
591
592 /* Hours, minutes, and whole seconds. */
593 n = short_time_len(line, p - line);
594 if (!n)
595 return 0;
596
597 return line + len - p + n;
598 }
599
600 static size_t trailing_spaces_len(const char *line, size_t len)
601 {
602 const char *p;
603
604 /* Expected format: ' ' x (1 or more) */
605 if (!len || line[len - 1] != ' ')
606 return 0;
607
608 p = line + len;
609 while (p != line) {
610 p--;
611 if (*p != ' ')
612 return line + len - (p + 1);
613 }
614
615 /* All spaces! */
616 return len;
617 }
618
619 static size_t diff_timestamp_len(const char *line, size_t len)
620 {
621 const char *end = line + len;
622 size_t n;
623
624 /*
625 * Posix: 2010-07-05 19:41:17
626 * GNU: 2010-07-05 19:41:17.620000023 -0500
627 */
628
629 if (!isdigit(end[-1]))
630 return 0;
631
632 n = sane_tz_len(line, end - line);
633 if (!n)
634 n = tz_with_colon_len(line, end - line);
635 end -= n;
636
637 n = short_time_len(line, end - line);
638 if (!n)
639 n = fractional_time_len(line, end - line);
640 end -= n;
641
642 n = date_len(line, end - line);
643 if (!n) /* No date. Too bad. */
644 return 0;
645 end -= n;
646
647 if (end == line) /* No space before date. */
648 return 0;
649 if (end[-1] == '\t') { /* Success! */
650 end--;
651 return line + len - end;
652 }
653 if (end[-1] != ' ') /* No space before date. */
654 return 0;
655
656 /* Whitespace damage. */
657 end -= trailing_spaces_len(line, end - line);
658 return line + len - end;
659 }
660
661 static char *find_name_common(const char *line, const char *def,
662 int p_value, const char *end, int terminate)
663 {
664 int len;
665 const char *start = NULL;
666
667 if (p_value == 0)
668 start = line;
669 while (line != end) {
670 char c = *line;
671
672 if (!end && isspace(c)) {
673 if (c == '\n')
674 break;
675 if (name_terminate(start, line-start, c, terminate))
676 break;
677 }
678 line++;
679 if (c == '/' && !--p_value)
680 start = line;
681 }
682 if (!start)
683 return squash_slash(xstrdup_or_null(def));
684 len = line - start;
685 if (!len)
686 return squash_slash(xstrdup_or_null(def));
687
688 /*
689 * Generally we prefer the shorter name, especially
690 * if the other one is just a variation of that with
691 * something else tacked on to the end (ie "file.orig"
692 * or "file~").
693 */
694 if (def) {
695 int deflen = strlen(def);
696 if (deflen < len && !strncmp(start, def, deflen))
697 return squash_slash(xstrdup(def));
698 }
699
700 if (root) {
701 char *ret = xmalloc(root_len + len + 1);
702 strcpy(ret, root);
703 memcpy(ret + root_len, start, len);
704 ret[root_len + len] = '\0';
705 return squash_slash(ret);
706 }
707
708 return squash_slash(xmemdupz(start, len));
709 }
710
711 static char *find_name(const char *line, char *def, int p_value, int terminate)
712 {
713 if (*line == '"') {
714 char *name = find_name_gnu(line, def, p_value);
715 if (name)
716 return name;
717 }
718
719 return find_name_common(line, def, p_value, NULL, terminate);
720 }
721
722 static char *find_name_traditional(const char *line, char *def, int p_value)
723 {
724 size_t len;
725 size_t date_len;
726
727 if (*line == '"') {
728 char *name = find_name_gnu(line, def, p_value);
729 if (name)
730 return name;
731 }
732
733 len = strchrnul(line, '\n') - line;
734 date_len = diff_timestamp_len(line, len);
735 if (!date_len)
736 return find_name_common(line, def, p_value, NULL, TERM_TAB);
737 len -= date_len;
738
739 return find_name_common(line, def, p_value, line + len, 0);
740 }
741
742 static int count_slashes(const char *cp)
743 {
744 int cnt = 0;
745 char ch;
746
747 while ((ch = *cp++))
748 if (ch == '/')
749 cnt++;
750 return cnt;
751 }
752
753 /*
754 * Given the string after "--- " or "+++ ", guess the appropriate
755 * p_value for the given patch.
756 */
757 static int guess_p_value(const char *nameline)
758 {
759 char *name, *cp;
760 int val = -1;
761
762 if (is_dev_null(nameline))
763 return -1;
764 name = find_name_traditional(nameline, NULL, 0);
765 if (!name)
766 return -1;
767 cp = strchr(name, '/');
768 if (!cp)
769 val = 0;
770 else if (prefix) {
771 /*
772 * Does it begin with "a/$our-prefix" and such? Then this is
773 * very likely to apply to our directory.
774 */
775 if (!strncmp(name, prefix, prefix_length))
776 val = count_slashes(prefix);
777 else {
778 cp++;
779 if (!strncmp(cp, prefix, prefix_length))
780 val = count_slashes(prefix) + 1;
781 }
782 }
783 free(name);
784 return val;
785 }
786
787 /*
788 * Does the ---/+++ line have the POSIX timestamp after the last HT?
789 * GNU diff puts epoch there to signal a creation/deletion event. Is
790 * this such a timestamp?
791 */
792 static int has_epoch_timestamp(const char *nameline)
793 {
794 /*
795 * We are only interested in epoch timestamp; any non-zero
796 * fraction cannot be one, hence "(\.0+)?" in the regexp below.
797 * For the same reason, the date must be either 1969-12-31 or
798 * 1970-01-01, and the seconds part must be "00".
799 */
800 const char stamp_regexp[] =
801 "^(1969-12-31|1970-01-01)"
802 " "
803 "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?"
804 " "
805 "([-+][0-2][0-9]:?[0-5][0-9])\n";
806 const char *timestamp = NULL, *cp, *colon;
807 static regex_t *stamp;
808 regmatch_t m[10];
809 int zoneoffset;
810 int hourminute;
811 int status;
812
813 for (cp = nameline; *cp != '\n'; cp++) {
814 if (*cp == '\t')
815 timestamp = cp + 1;
816 }
817 if (!timestamp)
818 return 0;
819 if (!stamp) {
820 stamp = xmalloc(sizeof(*stamp));
821 if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) {
822 warning(_("Cannot prepare timestamp regexp %s"),
823 stamp_regexp);
824 return 0;
825 }
826 }
827
828 status = regexec(stamp, timestamp, ARRAY_SIZE(m), m, 0);
829 if (status) {
830 if (status != REG_NOMATCH)
831 warning(_("regexec returned %d for input: %s"),
832 status, timestamp);
833 return 0;
834 }
835
836 zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10);
837 if (*colon == ':')
838 zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10);
839 else
840 zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100);
841 if (timestamp[m[3].rm_so] == '-')
842 zoneoffset = -zoneoffset;
843
844 /*
845 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
846 * (west of GMT) or 1970-01-01 (east of GMT)
847 */
848 if ((zoneoffset < 0 && memcmp(timestamp, "1969-12-31", 10)) ||
849 (0 <= zoneoffset && memcmp(timestamp, "1970-01-01", 10)))
850 return 0;
851
852 hourminute = (strtol(timestamp + 11, NULL, 10) * 60 +
853 strtol(timestamp + 14, NULL, 10) -
854 zoneoffset);
855
856 return ((zoneoffset < 0 && hourminute == 1440) ||
857 (0 <= zoneoffset && !hourminute));
858 }
859
860 /*
861 * Get the name etc info from the ---/+++ lines of a traditional patch header
862 *
863 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
864 * files, we can happily check the index for a match, but for creating a
865 * new file we should try to match whatever "patch" does. I have no idea.
866 */
867 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
868 {
869 char *name;
870
871 first += 4; /* skip "--- " */
872 second += 4; /* skip "+++ " */
873 if (!p_value_known) {
874 int p, q;
875 p = guess_p_value(first);
876 q = guess_p_value(second);
877 if (p < 0) p = q;
878 if (0 <= p && p == q) {
879 p_value = p;
880 p_value_known = 1;
881 }
882 }
883 if (is_dev_null(first)) {
884 patch->is_new = 1;
885 patch->is_delete = 0;
886 name = find_name_traditional(second, NULL, p_value);
887 patch->new_name = name;
888 } else if (is_dev_null(second)) {
889 patch->is_new = 0;
890 patch->is_delete = 1;
891 name = find_name_traditional(first, NULL, p_value);
892 patch->old_name = name;
893 } else {
894 char *first_name;
895 first_name = find_name_traditional(first, NULL, p_value);
896 name = find_name_traditional(second, first_name, p_value);
897 free(first_name);
898 if (has_epoch_timestamp(first)) {
899 patch->is_new = 1;
900 patch->is_delete = 0;
901 patch->new_name = name;
902 } else if (has_epoch_timestamp(second)) {
903 patch->is_new = 0;
904 patch->is_delete = 1;
905 patch->old_name = name;
906 } else {
907 patch->old_name = name;
908 patch->new_name = xstrdup_or_null(name);
909 }
910 }
911 if (!name)
912 die(_("unable to find filename in patch at line %d"), linenr);
913 }
914
915 static int gitdiff_hdrend(const char *line, struct patch *patch)
916 {
917 return -1;
918 }
919
920 /*
921 * We're anal about diff header consistency, to make
922 * sure that we don't end up having strange ambiguous
923 * patches floating around.
924 *
925 * As a result, gitdiff_{old|new}name() will check
926 * their names against any previous information, just
927 * to make sure..
928 */
929 #define DIFF_OLD_NAME 0
930 #define DIFF_NEW_NAME 1
931
932 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, int side)
933 {
934 if (!orig_name && !isnull)
935 return find_name(line, NULL, p_value, TERM_TAB);
936
937 if (orig_name) {
938 int len;
939 const char *name;
940 char *another;
941 name = orig_name;
942 len = strlen(name);
943 if (isnull)
944 die(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), name, linenr);
945 another = find_name(line, NULL, p_value, TERM_TAB);
946 if (!another || memcmp(another, name, len + 1))
947 die((side == DIFF_NEW_NAME) ?
948 _("git apply: bad git-diff - inconsistent new filename on line %d") :
949 _("git apply: bad git-diff - inconsistent old filename on line %d"), linenr);
950 free(another);
951 return orig_name;
952 }
953 else {
954 /* expect "/dev/null" */
955 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
956 die(_("git apply: bad git-diff - expected /dev/null on line %d"), linenr);
957 return NULL;
958 }
959 }
960
961 static int gitdiff_oldname(const char *line, struct patch *patch)
962 {
963 char *orig = patch->old_name;
964 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name,
965 DIFF_OLD_NAME);
966 if (orig != patch->old_name)
967 free(orig);
968 return 0;
969 }
970
971 static int gitdiff_newname(const char *line, struct patch *patch)
972 {
973 char *orig = patch->new_name;
974 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name,
975 DIFF_NEW_NAME);
976 if (orig != patch->new_name)
977 free(orig);
978 return 0;
979 }
980
981 static int gitdiff_oldmode(const char *line, struct patch *patch)
982 {
983 patch->old_mode = strtoul(line, NULL, 8);
984 return 0;
985 }
986
987 static int gitdiff_newmode(const char *line, struct patch *patch)
988 {
989 patch->new_mode = strtoul(line, NULL, 8);
990 return 0;
991 }
992
993 static int gitdiff_delete(const char *line, struct patch *patch)
994 {
995 patch->is_delete = 1;
996 free(patch->old_name);
997 patch->old_name = xstrdup_or_null(patch->def_name);
998 return gitdiff_oldmode(line, patch);
999 }
1000
1001 static int gitdiff_newfile(const char *line, struct patch *patch)
1002 {
1003 patch->is_new = 1;
1004 free(patch->new_name);
1005 patch->new_name = xstrdup_or_null(patch->def_name);
1006 return gitdiff_newmode(line, patch);
1007 }
1008
1009 static int gitdiff_copysrc(const char *line, struct patch *patch)
1010 {
1011 patch->is_copy = 1;
1012 free(patch->old_name);
1013 patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
1014 return 0;
1015 }
1016
1017 static int gitdiff_copydst(const char *line, struct patch *patch)
1018 {
1019 patch->is_copy = 1;
1020 free(patch->new_name);
1021 patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
1022 return 0;
1023 }
1024
1025 static int gitdiff_renamesrc(const char *line, struct patch *patch)
1026 {
1027 patch->is_rename = 1;
1028 free(patch->old_name);
1029 patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
1030 return 0;
1031 }
1032
1033 static int gitdiff_renamedst(const char *line, struct patch *patch)
1034 {
1035 patch->is_rename = 1;
1036 free(patch->new_name);
1037 patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);
1038 return 0;
1039 }
1040
1041 static int gitdiff_similarity(const char *line, struct patch *patch)
1042 {
1043 unsigned long val = strtoul(line, NULL, 10);
1044 if (val <= 100)
1045 patch->score = val;
1046 return 0;
1047 }
1048
1049 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
1050 {
1051 unsigned long val = strtoul(line, NULL, 10);
1052 if (val <= 100)
1053 patch->score = val;
1054 return 0;
1055 }
1056
1057 static int gitdiff_index(const char *line, struct patch *patch)
1058 {
1059 /*
1060 * index line is N hexadecimal, "..", N hexadecimal,
1061 * and optional space with octal mode.
1062 */
1063 const char *ptr, *eol;
1064 int len;
1065
1066 ptr = strchr(line, '.');
1067 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
1068 return 0;
1069 len = ptr - line;
1070 memcpy(patch->old_sha1_prefix, line, len);
1071 patch->old_sha1_prefix[len] = 0;
1072
1073 line = ptr + 2;
1074 ptr = strchr(line, ' ');
1075 eol = strchrnul(line, '\n');
1076
1077 if (!ptr || eol < ptr)
1078 ptr = eol;
1079 len = ptr - line;
1080
1081 if (40 < len)
1082 return 0;
1083 memcpy(patch->new_sha1_prefix, line, len);
1084 patch->new_sha1_prefix[len] = 0;
1085 if (*ptr == ' ')
1086 patch->old_mode = strtoul(ptr+1, NULL, 8);
1087 return 0;
1088 }
1089
1090 /*
1091 * This is normal for a diff that doesn't change anything: we'll fall through
1092 * into the next diff. Tell the parser to break out.
1093 */
1094 static int gitdiff_unrecognized(const char *line, struct patch *patch)
1095 {
1096 return -1;
1097 }
1098
1099 /*
1100 * Skip p_value leading components from "line"; as we do not accept
1101 * absolute paths, return NULL in that case.
1102 */
1103 static const char *skip_tree_prefix(const char *line, int llen)
1104 {
1105 int nslash;
1106 int i;
1107
1108 if (!p_value)
1109 return (llen && line[0] == '/') ? NULL : line;
1110
1111 nslash = p_value;
1112 for (i = 0; i < llen; i++) {
1113 int ch = line[i];
1114 if (ch == '/' && --nslash <= 0)
1115 return (i == 0) ? NULL : &line[i + 1];
1116 }
1117 return NULL;
1118 }
1119
1120 /*
1121 * This is to extract the same name that appears on "diff --git"
1122 * line. We do not find and return anything if it is a rename
1123 * patch, and it is OK because we will find the name elsewhere.
1124 * We need to reliably find name only when it is mode-change only,
1125 * creation or deletion of an empty file. In any of these cases,
1126 * both sides are the same name under a/ and b/ respectively.
1127 */
1128 static char *git_header_name(const char *line, int llen)
1129 {
1130 const char *name;
1131 const char *second = NULL;
1132 size_t len, line_len;
1133
1134 line += strlen("diff --git ");
1135 llen -= strlen("diff --git ");
1136
1137 if (*line == '"') {
1138 const char *cp;
1139 struct strbuf first = STRBUF_INIT;
1140 struct strbuf sp = STRBUF_INIT;
1141
1142 if (unquote_c_style(&first, line, &second))
1143 goto free_and_fail1;
1144
1145 /* strip the a/b prefix including trailing slash */
1146 cp = skip_tree_prefix(first.buf, first.len);
1147 if (!cp)
1148 goto free_and_fail1;
1149 strbuf_remove(&first, 0, cp - first.buf);
1150
1151 /*
1152 * second points at one past closing dq of name.
1153 * find the second name.
1154 */
1155 while ((second < line + llen) && isspace(*second))
1156 second++;
1157
1158 if (line + llen <= second)
1159 goto free_and_fail1;
1160 if (*second == '"') {
1161 if (unquote_c_style(&sp, second, NULL))
1162 goto free_and_fail1;
1163 cp = skip_tree_prefix(sp.buf, sp.len);
1164 if (!cp)
1165 goto free_and_fail1;
1166 /* They must match, otherwise ignore */
1167 if (strcmp(cp, first.buf))
1168 goto free_and_fail1;
1169 strbuf_release(&sp);
1170 return strbuf_detach(&first, NULL);
1171 }
1172
1173 /* unquoted second */
1174 cp = skip_tree_prefix(second, line + llen - second);
1175 if (!cp)
1176 goto free_and_fail1;
1177 if (line + llen - cp != first.len ||
1178 memcmp(first.buf, cp, first.len))
1179 goto free_and_fail1;
1180 return strbuf_detach(&first, NULL);
1181
1182 free_and_fail1:
1183 strbuf_release(&first);
1184 strbuf_release(&sp);
1185 return NULL;
1186 }
1187
1188 /* unquoted first name */
1189 name = skip_tree_prefix(line, llen);
1190 if (!name)
1191 return NULL;
1192
1193 /*
1194 * since the first name is unquoted, a dq if exists must be
1195 * the beginning of the second name.
1196 */
1197 for (second = name; second < line + llen; second++) {
1198 if (*second == '"') {
1199 struct strbuf sp = STRBUF_INIT;
1200 const char *np;
1201
1202 if (unquote_c_style(&sp, second, NULL))
1203 goto free_and_fail2;
1204
1205 np = skip_tree_prefix(sp.buf, sp.len);
1206 if (!np)
1207 goto free_and_fail2;
1208
1209 len = sp.buf + sp.len - np;
1210 if (len < second - name &&
1211 !strncmp(np, name, len) &&
1212 isspace(name[len])) {
1213 /* Good */
1214 strbuf_remove(&sp, 0, np - sp.buf);
1215 return strbuf_detach(&sp, NULL);
1216 }
1217
1218 free_and_fail2:
1219 strbuf_release(&sp);
1220 return NULL;
1221 }
1222 }
1223
1224 /*
1225 * Accept a name only if it shows up twice, exactly the same
1226 * form.
1227 */
1228 second = strchr(name, '\n');
1229 if (!second)
1230 return NULL;
1231 line_len = second - name;
1232 for (len = 0 ; ; len++) {
1233 switch (name[len]) {
1234 default:
1235 continue;
1236 case '\n':
1237 return NULL;
1238 case '\t': case ' ':
1239 /*
1240 * Is this the separator between the preimage
1241 * and the postimage pathname? Again, we are
1242 * only interested in the case where there is
1243 * no rename, as this is only to set def_name
1244 * and a rename patch has the names elsewhere
1245 * in an unambiguous form.
1246 */
1247 if (!name[len + 1])
1248 return NULL; /* no postimage name */
1249 second = skip_tree_prefix(name + len + 1,
1250 line_len - (len + 1));
1251 if (!second)
1252 return NULL;
1253 /*
1254 * Does len bytes starting at "name" and "second"
1255 * (that are separated by one HT or SP we just
1256 * found) exactly match?
1257 */
1258 if (second[len] == '\n' && !strncmp(name, second, len))
1259 return xmemdupz(name, len);
1260 }
1261 }
1262 }
1263
1264 /* Verify that we recognize the lines following a git header */
1265 static int parse_git_header(const char *line, int len, unsigned int size, struct patch *patch)
1266 {
1267 unsigned long offset;
1268
1269 /* A git diff has explicit new/delete information, so we don't guess */
1270 patch->is_new = 0;
1271 patch->is_delete = 0;
1272
1273 /*
1274 * Some things may not have the old name in the
1275 * rest of the headers anywhere (pure mode changes,
1276 * or removing or adding empty files), so we get
1277 * the default name from the header.
1278 */
1279 patch->def_name = git_header_name(line, len);
1280 if (patch->def_name && root) {
1281 char *s = xstrfmt("%s%s", root, patch->def_name);
1282 free(patch->def_name);
1283 patch->def_name = s;
1284 }
1285
1286 line += len;
1287 size -= len;
1288 linenr++;
1289 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
1290 static const struct opentry {
1291 const char *str;
1292 int (*fn)(const char *, struct patch *);
1293 } optable[] = {
1294 { "@@ -", gitdiff_hdrend },
1295 { "--- ", gitdiff_oldname },
1296 { "+++ ", gitdiff_newname },
1297 { "old mode ", gitdiff_oldmode },
1298 { "new mode ", gitdiff_newmode },
1299 { "deleted file mode ", gitdiff_delete },
1300 { "new file mode ", gitdiff_newfile },
1301 { "copy from ", gitdiff_copysrc },
1302 { "copy to ", gitdiff_copydst },
1303 { "rename old ", gitdiff_renamesrc },
1304 { "rename new ", gitdiff_renamedst },
1305 { "rename from ", gitdiff_renamesrc },
1306 { "rename to ", gitdiff_renamedst },
1307 { "similarity index ", gitdiff_similarity },
1308 { "dissimilarity index ", gitdiff_dissimilarity },
1309 { "index ", gitdiff_index },
1310 { "", gitdiff_unrecognized },
1311 };
1312 int i;
1313
1314 len = linelen(line, size);
1315 if (!len || line[len-1] != '\n')
1316 break;
1317 for (i = 0; i < ARRAY_SIZE(optable); i++) {
1318 const struct opentry *p = optable + i;
1319 int oplen = strlen(p->str);
1320 if (len < oplen || memcmp(p->str, line, oplen))
1321 continue;
1322 if (p->fn(line + oplen, patch) < 0)
1323 return offset;
1324 break;
1325 }
1326 }
1327
1328 return offset;
1329 }
1330
1331 static int parse_num(const char *line, unsigned long *p)
1332 {
1333 char *ptr;
1334
1335 if (!isdigit(*line))
1336 return 0;
1337 *p = strtoul(line, &ptr, 10);
1338 return ptr - line;
1339 }
1340
1341 static int parse_range(const char *line, int len, int offset, const char *expect,
1342 unsigned long *p1, unsigned long *p2)
1343 {
1344 int digits, ex;
1345
1346 if (offset < 0 || offset >= len)
1347 return -1;
1348 line += offset;
1349 len -= offset;
1350
1351 digits = parse_num(line, p1);
1352 if (!digits)
1353 return -1;
1354
1355 offset += digits;
1356 line += digits;
1357 len -= digits;
1358
1359 *p2 = 1;
1360 if (*line == ',') {
1361 digits = parse_num(line+1, p2);
1362 if (!digits)
1363 return -1;
1364
1365 offset += digits+1;
1366 line += digits+1;
1367 len -= digits+1;
1368 }
1369
1370 ex = strlen(expect);
1371 if (ex > len)
1372 return -1;
1373 if (memcmp(line, expect, ex))
1374 return -1;
1375
1376 return offset + ex;
1377 }
1378
1379 static void recount_diff(const char *line, int size, struct fragment *fragment)
1380 {
1381 int oldlines = 0, newlines = 0, ret = 0;
1382
1383 if (size < 1) {
1384 warning("recount: ignore empty hunk");
1385 return;
1386 }
1387
1388 for (;;) {
1389 int len = linelen(line, size);
1390 size -= len;
1391 line += len;
1392
1393 if (size < 1)
1394 break;
1395
1396 switch (*line) {
1397 case ' ': case '\n':
1398 newlines++;
1399 /* fall through */
1400 case '-':
1401 oldlines++;
1402 continue;
1403 case '+':
1404 newlines++;
1405 continue;
1406 case '\\':
1407 continue;
1408 case '@':
1409 ret = size < 3 || !starts_with(line, "@@ ");
1410 break;
1411 case 'd':
1412 ret = size < 5 || !starts_with(line, "diff ");
1413 break;
1414 default:
1415 ret = -1;
1416 break;
1417 }
1418 if (ret) {
1419 warning(_("recount: unexpected line: %.*s"),
1420 (int)linelen(line, size), line);
1421 return;
1422 }
1423 break;
1424 }
1425 fragment->oldlines = oldlines;
1426 fragment->newlines = newlines;
1427 }
1428
1429 /*
1430 * Parse a unified diff fragment header of the
1431 * form "@@ -a,b +c,d @@"
1432 */
1433 static int parse_fragment_header(const char *line, int len, struct fragment *fragment)
1434 {
1435 int offset;
1436
1437 if (!len || line[len-1] != '\n')
1438 return -1;
1439
1440 /* Figure out the number of lines in a fragment */
1441 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
1442 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
1443
1444 return offset;
1445 }
1446
1447 static int find_header(const char *line, unsigned long size, int *hdrsize, struct patch *patch)
1448 {
1449 unsigned long offset, len;
1450
1451 patch->is_toplevel_relative = 0;
1452 patch->is_rename = patch->is_copy = 0;
1453 patch->is_new = patch->is_delete = -1;
1454 patch->old_mode = patch->new_mode = 0;
1455 patch->old_name = patch->new_name = NULL;
1456 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
1457 unsigned long nextlen;
1458
1459 len = linelen(line, size);
1460 if (!len)
1461 break;
1462
1463 /* Testing this early allows us to take a few shortcuts.. */
1464 if (len < 6)
1465 continue;
1466
1467 /*
1468 * Make sure we don't find any unconnected patch fragments.
1469 * That's a sign that we didn't find a header, and that a
1470 * patch has become corrupted/broken up.
1471 */
1472 if (!memcmp("@@ -", line, 4)) {
1473 struct fragment dummy;
1474 if (parse_fragment_header(line, len, &dummy) < 0)
1475 continue;
1476 die(_("patch fragment without header at line %d: %.*s"),
1477 linenr, (int)len-1, line);
1478 }
1479
1480 if (size < len + 6)
1481 break;
1482
1483 /*
1484 * Git patch? It might not have a real patch, just a rename
1485 * or mode change, so we handle that specially
1486 */
1487 if (!memcmp("diff --git ", line, 11)) {
1488 int git_hdr_len = parse_git_header(line, len, size, patch);
1489 if (git_hdr_len <= len)
1490 continue;
1491 if (!patch->old_name && !patch->new_name) {
1492 if (!patch->def_name)
1493 die(Q_("git diff header lacks filename information when removing "
1494 "%d leading pathname component (line %d)",
1495 "git diff header lacks filename information when removing "
1496 "%d leading pathname components (line %d)",
1497 p_value),
1498 p_value, linenr);
1499 patch->old_name = xstrdup(patch->def_name);
1500 patch->new_name = xstrdup(patch->def_name);
1501 }
1502 if (!patch->is_delete && !patch->new_name)
1503 die("git diff header lacks filename information "
1504 "(line %d)", linenr);
1505 patch->is_toplevel_relative = 1;
1506 *hdrsize = git_hdr_len;
1507 return offset;
1508 }
1509
1510 /* --- followed by +++ ? */
1511 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
1512 continue;
1513
1514 /*
1515 * We only accept unified patches, so we want it to
1516 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1517 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1518 */
1519 nextlen = linelen(line + len, size - len);
1520 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
1521 continue;
1522
1523 /* Ok, we'll consider it a patch */
1524 parse_traditional_patch(line, line+len, patch);
1525 *hdrsize = len + nextlen;
1526 linenr += 2;
1527 return offset;
1528 }
1529 return -1;
1530 }
1531
1532 static void record_ws_error(unsigned result, const char *line, int len, int linenr)
1533 {
1534 char *err;
1535
1536 if (!result)
1537 return;
1538
1539 whitespace_error++;
1540 if (squelch_whitespace_errors &&
1541 squelch_whitespace_errors < whitespace_error)
1542 return;
1543
1544 err = whitespace_error_string(result);
1545 fprintf(stderr, "%s:%d: %s.\n%.*s\n",
1546 patch_input_file, linenr, err, len, line);
1547 free(err);
1548 }
1549
1550 static void check_whitespace(const char *line, int len, unsigned ws_rule)
1551 {
1552 unsigned result = ws_check(line + 1, len - 1, ws_rule);
1553
1554 record_ws_error(result, line + 1, len - 2, linenr);
1555 }
1556
1557 /*
1558 * Parse a unified diff. Note that this really needs to parse each
1559 * fragment separately, since the only way to know the difference
1560 * between a "---" that is part of a patch, and a "---" that starts
1561 * the next patch is to look at the line counts..
1562 */
1563 static int parse_fragment(const char *line, unsigned long size,
1564 struct patch *patch, struct fragment *fragment)
1565 {
1566 int added, deleted;
1567 int len = linelen(line, size), offset;
1568 unsigned long oldlines, newlines;
1569 unsigned long leading, trailing;
1570
1571 offset = parse_fragment_header(line, len, fragment);
1572 if (offset < 0)
1573 return -1;
1574 if (offset > 0 && patch->recount)
1575 recount_diff(line + offset, size - offset, fragment);
1576 oldlines = fragment->oldlines;
1577 newlines = fragment->newlines;
1578 leading = 0;
1579 trailing = 0;
1580
1581 /* Parse the thing.. */
1582 line += len;
1583 size -= len;
1584 linenr++;
1585 added = deleted = 0;
1586 for (offset = len;
1587 0 < size;
1588 offset += len, size -= len, line += len, linenr++) {
1589 if (!oldlines && !newlines)
1590 break;
1591 len = linelen(line, size);
1592 if (!len || line[len-1] != '\n')
1593 return -1;
1594 switch (*line) {
1595 default:
1596 return -1;
1597 case '\n': /* newer GNU diff, an empty context line */
1598 case ' ':
1599 oldlines--;
1600 newlines--;
1601 if (!deleted && !added)
1602 leading++;
1603 trailing++;
1604 if (!apply_in_reverse &&
1605 ws_error_action == correct_ws_error)
1606 check_whitespace(line, len, patch->ws_rule);
1607 break;
1608 case '-':
1609 if (apply_in_reverse &&
1610 ws_error_action != nowarn_ws_error)
1611 check_whitespace(line, len, patch->ws_rule);
1612 deleted++;
1613 oldlines--;
1614 trailing = 0;
1615 break;
1616 case '+':
1617 if (!apply_in_reverse &&
1618 ws_error_action != nowarn_ws_error)
1619 check_whitespace(line, len, patch->ws_rule);
1620 added++;
1621 newlines--;
1622 trailing = 0;
1623 break;
1624
1625 /*
1626 * We allow "\ No newline at end of file". Depending
1627 * on locale settings when the patch was produced we
1628 * don't know what this line looks like. The only
1629 * thing we do know is that it begins with "\ ".
1630 * Checking for 12 is just for sanity check -- any
1631 * l10n of "\ No newline..." is at least that long.
1632 */
1633 case '\\':
1634 if (len < 12 || memcmp(line, "\\ ", 2))
1635 return -1;
1636 break;
1637 }
1638 }
1639 if (oldlines || newlines)
1640 return -1;
1641 if (!deleted && !added)
1642 return -1;
1643
1644 fragment->leading = leading;
1645 fragment->trailing = trailing;
1646
1647 /*
1648 * If a fragment ends with an incomplete line, we failed to include
1649 * it in the above loop because we hit oldlines == newlines == 0
1650 * before seeing it.
1651 */
1652 if (12 < size && !memcmp(line, "\\ ", 2))
1653 offset += linelen(line, size);
1654
1655 patch->lines_added += added;
1656 patch->lines_deleted += deleted;
1657
1658 if (0 < patch->is_new && oldlines)
1659 return error(_("new file depends on old contents"));
1660 if (0 < patch->is_delete && newlines)
1661 return error(_("deleted file still has contents"));
1662 return offset;
1663 }
1664
1665 /*
1666 * We have seen "diff --git a/... b/..." header (or a traditional patch
1667 * header). Read hunks that belong to this patch into fragments and hang
1668 * them to the given patch structure.
1669 *
1670 * The (fragment->patch, fragment->size) pair points into the memory given
1671 * by the caller, not a copy, when we return.
1672 */
1673 static int parse_single_patch(const char *line, unsigned long size, struct patch *patch)
1674 {
1675 unsigned long offset = 0;
1676 unsigned long oldlines = 0, newlines = 0, context = 0;
1677 struct fragment **fragp = &patch->fragments;
1678
1679 while (size > 4 && !memcmp(line, "@@ -", 4)) {
1680 struct fragment *fragment;
1681 int len;
1682
1683 fragment = xcalloc(1, sizeof(*fragment));
1684 fragment->linenr = linenr;
1685 len = parse_fragment(line, size, patch, fragment);
1686 if (len <= 0)
1687 die(_("corrupt patch at line %d"), linenr);
1688 fragment->patch = line;
1689 fragment->size = len;
1690 oldlines += fragment->oldlines;
1691 newlines += fragment->newlines;
1692 context += fragment->leading + fragment->trailing;
1693
1694 *fragp = fragment;
1695 fragp = &fragment->next;
1696
1697 offset += len;
1698 line += len;
1699 size -= len;
1700 }
1701
1702 /*
1703 * If something was removed (i.e. we have old-lines) it cannot
1704 * be creation, and if something was added it cannot be
1705 * deletion. However, the reverse is not true; --unified=0
1706 * patches that only add are not necessarily creation even
1707 * though they do not have any old lines, and ones that only
1708 * delete are not necessarily deletion.
1709 *
1710 * Unfortunately, a real creation/deletion patch do _not_ have
1711 * any context line by definition, so we cannot safely tell it
1712 * apart with --unified=0 insanity. At least if the patch has
1713 * more than one hunk it is not creation or deletion.
1714 */
1715 if (patch->is_new < 0 &&
1716 (oldlines || (patch->fragments && patch->fragments->next)))
1717 patch->is_new = 0;
1718 if (patch->is_delete < 0 &&
1719 (newlines || (patch->fragments && patch->fragments->next)))
1720 patch->is_delete = 0;
1721
1722 if (0 < patch->is_new && oldlines)
1723 die(_("new file %s depends on old contents"), patch->new_name);
1724 if (0 < patch->is_delete && newlines)
1725 die(_("deleted file %s still has contents"), patch->old_name);
1726 if (!patch->is_delete && !newlines && context)
1727 fprintf_ln(stderr,
1728 _("** warning: "
1729 "file %s becomes empty but is not deleted"),
1730 patch->new_name);
1731
1732 return offset;
1733 }
1734
1735 static inline int metadata_changes(struct patch *patch)
1736 {
1737 return patch->is_rename > 0 ||
1738 patch->is_copy > 0 ||
1739 patch->is_new > 0 ||
1740 patch->is_delete ||
1741 (patch->old_mode && patch->new_mode &&
1742 patch->old_mode != patch->new_mode);
1743 }
1744
1745 static char *inflate_it(const void *data, unsigned long size,
1746 unsigned long inflated_size)
1747 {
1748 git_zstream stream;
1749 void *out;
1750 int st;
1751
1752 memset(&stream, 0, sizeof(stream));
1753
1754 stream.next_in = (unsigned char *)data;
1755 stream.avail_in = size;
1756 stream.next_out = out = xmalloc(inflated_size);
1757 stream.avail_out = inflated_size;
1758 git_inflate_init(&stream);
1759 st = git_inflate(&stream, Z_FINISH);
1760 git_inflate_end(&stream);
1761 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1762 free(out);
1763 return NULL;
1764 }
1765 return out;
1766 }
1767
1768 /*
1769 * Read a binary hunk and return a new fragment; fragment->patch
1770 * points at an allocated memory that the caller must free, so
1771 * it is marked as "->free_patch = 1".
1772 */
1773 static struct fragment *parse_binary_hunk(char **buf_p,
1774 unsigned long *sz_p,
1775 int *status_p,
1776 int *used_p)
1777 {
1778 /*
1779 * Expect a line that begins with binary patch method ("literal"
1780 * or "delta"), followed by the length of data before deflating.
1781 * a sequence of 'length-byte' followed by base-85 encoded data
1782 * should follow, terminated by a newline.
1783 *
1784 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1785 * and we would limit the patch line to 66 characters,
1786 * so one line can fit up to 13 groups that would decode
1787 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1788 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1789 */
1790 int llen, used;
1791 unsigned long size = *sz_p;
1792 char *buffer = *buf_p;
1793 int patch_method;
1794 unsigned long origlen;
1795 char *data = NULL;
1796 int hunk_size = 0;
1797 struct fragment *frag;
1798
1799 llen = linelen(buffer, size);
1800 used = llen;
1801
1802 *status_p = 0;
1803
1804 if (starts_with(buffer, "delta ")) {
1805 patch_method = BINARY_DELTA_DEFLATED;
1806 origlen = strtoul(buffer + 6, NULL, 10);
1807 }
1808 else if (starts_with(buffer, "literal ")) {
1809 patch_method = BINARY_LITERAL_DEFLATED;
1810 origlen = strtoul(buffer + 8, NULL, 10);
1811 }
1812 else
1813 return NULL;
1814
1815 linenr++;
1816 buffer += llen;
1817 while (1) {
1818 int byte_length, max_byte_length, newsize;
1819 llen = linelen(buffer, size);
1820 used += llen;
1821 linenr++;
1822 if (llen == 1) {
1823 /* consume the blank line */
1824 buffer++;
1825 size--;
1826 break;
1827 }
1828 /*
1829 * Minimum line is "A00000\n" which is 7-byte long,
1830 * and the line length must be multiple of 5 plus 2.
1831 */
1832 if ((llen < 7) || (llen-2) % 5)
1833 goto corrupt;
1834 max_byte_length = (llen - 2) / 5 * 4;
1835 byte_length = *buffer;
1836 if ('A' <= byte_length && byte_length <= 'Z')
1837 byte_length = byte_length - 'A' + 1;
1838 else if ('a' <= byte_length && byte_length <= 'z')
1839 byte_length = byte_length - 'a' + 27;
1840 else
1841 goto corrupt;
1842 /* if the input length was not multiple of 4, we would
1843 * have filler at the end but the filler should never
1844 * exceed 3 bytes
1845 */
1846 if (max_byte_length < byte_length ||
1847 byte_length <= max_byte_length - 4)
1848 goto corrupt;
1849 newsize = hunk_size + byte_length;
1850 data = xrealloc(data, newsize);
1851 if (decode_85(data + hunk_size, buffer + 1, byte_length))
1852 goto corrupt;
1853 hunk_size = newsize;
1854 buffer += llen;
1855 size -= llen;
1856 }
1857
1858 frag = xcalloc(1, sizeof(*frag));
1859 frag->patch = inflate_it(data, hunk_size, origlen);
1860 frag->free_patch = 1;
1861 if (!frag->patch)
1862 goto corrupt;
1863 free(data);
1864 frag->size = origlen;
1865 *buf_p = buffer;
1866 *sz_p = size;
1867 *used_p = used;
1868 frag->binary_patch_method = patch_method;
1869 return frag;
1870
1871 corrupt:
1872 free(data);
1873 *status_p = -1;
1874 error(_("corrupt binary patch at line %d: %.*s"),
1875 linenr-1, llen-1, buffer);
1876 return NULL;
1877 }
1878
1879 static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1880 {
1881 /*
1882 * We have read "GIT binary patch\n"; what follows is a line
1883 * that says the patch method (currently, either "literal" or
1884 * "delta") and the length of data before deflating; a
1885 * sequence of 'length-byte' followed by base-85 encoded data
1886 * follows.
1887 *
1888 * When a binary patch is reversible, there is another binary
1889 * hunk in the same format, starting with patch method (either
1890 * "literal" or "delta") with the length of data, and a sequence
1891 * of length-byte + base-85 encoded data, terminated with another
1892 * empty line. This data, when applied to the postimage, produces
1893 * the preimage.
1894 */
1895 struct fragment *forward;
1896 struct fragment *reverse;
1897 int status;
1898 int used, used_1;
1899
1900 forward = parse_binary_hunk(&buffer, &size, &status, &used);
1901 if (!forward && !status)
1902 /* there has to be one hunk (forward hunk) */
1903 return error(_("unrecognized binary patch at line %d"), linenr-1);
1904 if (status)
1905 /* otherwise we already gave an error message */
1906 return status;
1907
1908 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1909 if (reverse)
1910 used += used_1;
1911 else if (status) {
1912 /*
1913 * Not having reverse hunk is not an error, but having
1914 * a corrupt reverse hunk is.
1915 */
1916 free((void*) forward->patch);
1917 free(forward);
1918 return status;
1919 }
1920 forward->next = reverse;
1921 patch->fragments = forward;
1922 patch->is_binary = 1;
1923 return used;
1924 }
1925
1926 static void prefix_one(char **name)
1927 {
1928 char *old_name = *name;
1929 if (!old_name)
1930 return;
1931 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));
1932 free(old_name);
1933 }
1934
1935 static void prefix_patch(struct patch *p)
1936 {
1937 if (!prefix || p->is_toplevel_relative)
1938 return;
1939 prefix_one(&p->new_name);
1940 prefix_one(&p->old_name);
1941 }
1942
1943 /*
1944 * include/exclude
1945 */
1946
1947 static struct string_list limit_by_name;
1948 static int has_include;
1949 static void add_name_limit(const char *name, int exclude)
1950 {
1951 struct string_list_item *it;
1952
1953 it = string_list_append(&limit_by_name, name);
1954 it->util = exclude ? NULL : (void *) 1;
1955 }
1956
1957 static int use_patch(struct patch *p)
1958 {
1959 const char *pathname = p->new_name ? p->new_name : p->old_name;
1960 int i;
1961
1962 /* Paths outside are not touched regardless of "--include" */
1963 if (0 < prefix_length) {
1964 int pathlen = strlen(pathname);
1965 if (pathlen <= prefix_length ||
1966 memcmp(prefix, pathname, prefix_length))
1967 return 0;
1968 }
1969
1970 /* See if it matches any of exclude/include rule */
1971 for (i = 0; i < limit_by_name.nr; i++) {
1972 struct string_list_item *it = &limit_by_name.items[i];
1973 if (!wildmatch(it->string, pathname, 0, NULL))
1974 return (it->util != NULL);
1975 }
1976
1977 /*
1978 * If we had any include, a path that does not match any rule is
1979 * not used. Otherwise, we saw bunch of exclude rules (or none)
1980 * and such a path is used.
1981 */
1982 return !has_include;
1983 }
1984
1985
1986 /*
1987 * Read the patch text in "buffer" that extends for "size" bytes; stop
1988 * reading after seeing a single patch (i.e. changes to a single file).
1989 * Create fragments (i.e. patch hunks) and hang them to the given patch.
1990 * Return the number of bytes consumed, so that the caller can call us
1991 * again for the next patch.
1992 */
1993 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
1994 {
1995 int hdrsize, patchsize;
1996 int offset = find_header(buffer, size, &hdrsize, patch);
1997
1998 if (offset < 0)
1999 return offset;
2000
2001 prefix_patch(patch);
2002
2003 if (!use_patch(patch))
2004 patch->ws_rule = 0;
2005 else
2006 patch->ws_rule = whitespace_rule(patch->new_name
2007 ? patch->new_name
2008 : patch->old_name);
2009
2010 patchsize = parse_single_patch(buffer + offset + hdrsize,
2011 size - offset - hdrsize, patch);
2012
2013 if (!patchsize) {
2014 static const char git_binary[] = "GIT binary patch\n";
2015 int hd = hdrsize + offset;
2016 unsigned long llen = linelen(buffer + hd, size - hd);
2017
2018 if (llen == sizeof(git_binary) - 1 &&
2019 !memcmp(git_binary, buffer + hd, llen)) {
2020 int used;
2021 linenr++;
2022 used = parse_binary(buffer + hd + llen,
2023 size - hd - llen, patch);
2024 if (used)
2025 patchsize = used + llen;
2026 else
2027 patchsize = 0;
2028 }
2029 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
2030 static const char *binhdr[] = {
2031 "Binary files ",
2032 "Files ",
2033 NULL,
2034 };
2035 int i;
2036 for (i = 0; binhdr[i]; i++) {
2037 int len = strlen(binhdr[i]);
2038 if (len < size - hd &&
2039 !memcmp(binhdr[i], buffer + hd, len)) {
2040 linenr++;
2041 patch->is_binary = 1;
2042 patchsize = llen;
2043 break;
2044 }
2045 }
2046 }
2047
2048 /* Empty patch cannot be applied if it is a text patch
2049 * without metadata change. A binary patch appears
2050 * empty to us here.
2051 */
2052 if ((apply || check) &&
2053 (!patch->is_binary && !metadata_changes(patch)))
2054 die(_("patch with only garbage at line %d"), linenr);
2055 }
2056
2057 return offset + hdrsize + patchsize;
2058 }
2059
2060 #define swap(a,b) myswap((a),(b),sizeof(a))
2061
2062 #define myswap(a, b, size) do { \
2063 unsigned char mytmp[size]; \
2064 memcpy(mytmp, &a, size); \
2065 memcpy(&a, &b, size); \
2066 memcpy(&b, mytmp, size); \
2067 } while (0)
2068
2069 static void reverse_patches(struct patch *p)
2070 {
2071 for (; p; p = p->next) {
2072 struct fragment *frag = p->fragments;
2073
2074 swap(p->new_name, p->old_name);
2075 swap(p->new_mode, p->old_mode);
2076 swap(p->is_new, p->is_delete);
2077 swap(p->lines_added, p->lines_deleted);
2078 swap(p->old_sha1_prefix, p->new_sha1_prefix);
2079
2080 for (; frag; frag = frag->next) {
2081 swap(frag->newpos, frag->oldpos);
2082 swap(frag->newlines, frag->oldlines);
2083 }
2084 }
2085 }
2086
2087 static const char pluses[] =
2088 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
2089 static const char minuses[]=
2090 "----------------------------------------------------------------------";
2091
2092 static void show_stats(struct patch *patch)
2093 {
2094 struct strbuf qname = STRBUF_INIT;
2095 char *cp = patch->new_name ? patch->new_name : patch->old_name;
2096 int max, add, del;
2097
2098 quote_c_style(cp, &qname, NULL, 0);
2099
2100 /*
2101 * "scale" the filename
2102 */
2103 max = max_len;
2104 if (max > 50)
2105 max = 50;
2106
2107 if (qname.len > max) {
2108 cp = strchr(qname.buf + qname.len + 3 - max, '/');
2109 if (!cp)
2110 cp = qname.buf + qname.len + 3 - max;
2111 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);
2112 }
2113
2114 if (patch->is_binary) {
2115 printf(" %-*s | Bin\n", max, qname.buf);
2116 strbuf_release(&qname);
2117 return;
2118 }
2119
2120 printf(" %-*s |", max, qname.buf);
2121 strbuf_release(&qname);
2122
2123 /*
2124 * scale the add/delete
2125 */
2126 max = max + max_change > 70 ? 70 - max : max_change;
2127 add = patch->lines_added;
2128 del = patch->lines_deleted;
2129
2130 if (max_change > 0) {
2131 int total = ((add + del) * max + max_change / 2) / max_change;
2132 add = (add * max + max_change / 2) / max_change;
2133 del = total - add;
2134 }
2135 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,
2136 add, pluses, del, minuses);
2137 }
2138
2139 static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
2140 {
2141 switch (st->st_mode & S_IFMT) {
2142 case S_IFLNK:
2143 if (strbuf_readlink(buf, path, st->st_size) < 0)
2144 return error(_("unable to read symlink %s"), path);
2145 return 0;
2146 case S_IFREG:
2147 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
2148 return error(_("unable to open or read %s"), path);
2149 convert_to_git(path, buf->buf, buf->len, buf, 0);
2150 return 0;
2151 default:
2152 return -1;
2153 }
2154 }
2155
2156 /*
2157 * Update the preimage, and the common lines in postimage,
2158 * from buffer buf of length len. If postlen is 0 the postimage
2159 * is updated in place, otherwise it's updated on a new buffer
2160 * of length postlen
2161 */
2162
2163 static void update_pre_post_images(struct image *preimage,
2164 struct image *postimage,
2165 char *buf,
2166 size_t len, size_t postlen)
2167 {
2168 int i, ctx, reduced;
2169 char *new, *old, *fixed;
2170 struct image fixed_preimage;
2171
2172 /*
2173 * Update the preimage with whitespace fixes. Note that we
2174 * are not losing preimage->buf -- apply_one_fragment() will
2175 * free "oldlines".
2176 */
2177 prepare_image(&fixed_preimage, buf, len, 1);
2178 assert(postlen
2179 ? fixed_preimage.nr == preimage->nr
2180 : fixed_preimage.nr <= preimage->nr);
2181 for (i = 0; i < fixed_preimage.nr; i++)
2182 fixed_preimage.line[i].flag = preimage->line[i].flag;
2183 free(preimage->line_allocated);
2184 *preimage = fixed_preimage;
2185
2186 /*
2187 * Adjust the common context lines in postimage. This can be
2188 * done in-place when we are shrinking it with whitespace
2189 * fixing, but needs a new buffer when ignoring whitespace or
2190 * expanding leading tabs to spaces.
2191 *
2192 * We trust the caller to tell us if the update can be done
2193 * in place (postlen==0) or not.
2194 */
2195 old = postimage->buf;
2196 if (postlen)
2197 new = postimage->buf = xmalloc(postlen);
2198 else
2199 new = old;
2200 fixed = preimage->buf;
2201
2202 for (i = reduced = ctx = 0; i < postimage->nr; i++) {
2203 size_t len = postimage->line[i].len;
2204 if (!(postimage->line[i].flag & LINE_COMMON)) {
2205 /* an added line -- no counterparts in preimage */
2206 memmove(new, old, len);
2207 old += len;
2208 new += len;
2209 continue;
2210 }
2211
2212 /* a common context -- skip it in the original postimage */
2213 old += len;
2214
2215 /* and find the corresponding one in the fixed preimage */
2216 while (ctx < preimage->nr &&
2217 !(preimage->line[ctx].flag & LINE_COMMON)) {
2218 fixed += preimage->line[ctx].len;
2219 ctx++;
2220 }
2221
2222 /*
2223 * preimage is expected to run out, if the caller
2224 * fixed addition of trailing blank lines.
2225 */
2226 if (preimage->nr <= ctx) {
2227 reduced++;
2228 continue;
2229 }
2230
2231 /* and copy it in, while fixing the line length */
2232 len = preimage->line[ctx].len;
2233 memcpy(new, fixed, len);
2234 new += len;
2235 fixed += len;
2236 postimage->line[i].len = len;
2237 ctx++;
2238 }
2239
2240 if (postlen
2241 ? postlen < new - postimage->buf
2242 : postimage->len < new - postimage->buf)
2243 die("BUG: caller miscounted postlen: asked %d, orig = %d, used = %d",
2244 (int)postlen, (int) postimage->len, (int)(new - postimage->buf));
2245
2246 /* Fix the length of the whole thing */
2247 postimage->len = new - postimage->buf;
2248 postimage->nr -= reduced;
2249 }
2250
2251 static int match_fragment(struct image *img,
2252 struct image *preimage,
2253 struct image *postimage,
2254 unsigned long try,
2255 int try_lno,
2256 unsigned ws_rule,
2257 int match_beginning, int match_end)
2258 {
2259 int i;
2260 char *fixed_buf, *buf, *orig, *target;
2261 struct strbuf fixed;
2262 size_t fixed_len, postlen;
2263 int preimage_limit;
2264
2265 if (preimage->nr + try_lno <= img->nr) {
2266 /*
2267 * The hunk falls within the boundaries of img.
2268 */
2269 preimage_limit = preimage->nr;
2270 if (match_end && (preimage->nr + try_lno != img->nr))
2271 return 0;
2272 } else if (ws_error_action == correct_ws_error &&
2273 (ws_rule & WS_BLANK_AT_EOF)) {
2274 /*
2275 * This hunk extends beyond the end of img, and we are
2276 * removing blank lines at the end of the file. This
2277 * many lines from the beginning of the preimage must
2278 * match with img, and the remainder of the preimage
2279 * must be blank.
2280 */
2281 preimage_limit = img->nr - try_lno;
2282 } else {
2283 /*
2284 * The hunk extends beyond the end of the img and
2285 * we are not removing blanks at the end, so we
2286 * should reject the hunk at this position.
2287 */
2288 return 0;
2289 }
2290
2291 if (match_beginning && try_lno)
2292 return 0;
2293
2294 /* Quick hash check */
2295 for (i = 0; i < preimage_limit; i++)
2296 if ((img->line[try_lno + i].flag & LINE_PATCHED) ||
2297 (preimage->line[i].hash != img->line[try_lno + i].hash))
2298 return 0;
2299
2300 if (preimage_limit == preimage->nr) {
2301 /*
2302 * Do we have an exact match? If we were told to match
2303 * at the end, size must be exactly at try+fragsize,
2304 * otherwise try+fragsize must be still within the preimage,
2305 * and either case, the old piece should match the preimage
2306 * exactly.
2307 */
2308 if ((match_end
2309 ? (try + preimage->len == img->len)
2310 : (try + preimage->len <= img->len)) &&
2311 !memcmp(img->buf + try, preimage->buf, preimage->len))
2312 return 1;
2313 } else {
2314 /*
2315 * The preimage extends beyond the end of img, so
2316 * there cannot be an exact match.
2317 *
2318 * There must be one non-blank context line that match
2319 * a line before the end of img.
2320 */
2321 char *buf_end;
2322
2323 buf = preimage->buf;
2324 buf_end = buf;
2325 for (i = 0; i < preimage_limit; i++)
2326 buf_end += preimage->line[i].len;
2327
2328 for ( ; buf < buf_end; buf++)
2329 if (!isspace(*buf))
2330 break;
2331 if (buf == buf_end)
2332 return 0;
2333 }
2334
2335 /*
2336 * No exact match. If we are ignoring whitespace, run a line-by-line
2337 * fuzzy matching. We collect all the line length information because
2338 * we need it to adjust whitespace if we match.
2339 */
2340 if (ws_ignore_action == ignore_ws_change) {
2341 size_t imgoff = 0;
2342 size_t preoff = 0;
2343 size_t postlen = postimage->len;
2344 size_t extra_chars;
2345 char *preimage_eof;
2346 char *preimage_end;
2347 for (i = 0; i < preimage_limit; i++) {
2348 size_t prelen = preimage->line[i].len;
2349 size_t imglen = img->line[try_lno+i].len;
2350
2351 if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,
2352 preimage->buf + preoff, prelen))
2353 return 0;
2354 if (preimage->line[i].flag & LINE_COMMON)
2355 postlen += imglen - prelen;
2356 imgoff += imglen;
2357 preoff += prelen;
2358 }
2359
2360 /*
2361 * Ok, the preimage matches with whitespace fuzz.
2362 *
2363 * imgoff now holds the true length of the target that
2364 * matches the preimage before the end of the file.
2365 *
2366 * Count the number of characters in the preimage that fall
2367 * beyond the end of the file and make sure that all of them
2368 * are whitespace characters. (This can only happen if
2369 * we are removing blank lines at the end of the file.)
2370 */
2371 buf = preimage_eof = preimage->buf + preoff;
2372 for ( ; i < preimage->nr; i++)
2373 preoff += preimage->line[i].len;
2374 preimage_end = preimage->buf + preoff;
2375 for ( ; buf < preimage_end; buf++)
2376 if (!isspace(*buf))
2377 return 0;
2378
2379 /*
2380 * Update the preimage and the common postimage context
2381 * lines to use the same whitespace as the target.
2382 * If whitespace is missing in the target (i.e.
2383 * if the preimage extends beyond the end of the file),
2384 * use the whitespace from the preimage.
2385 */
2386 extra_chars = preimage_end - preimage_eof;
2387 strbuf_init(&fixed, imgoff + extra_chars);
2388 strbuf_add(&fixed, img->buf + try, imgoff);
2389 strbuf_add(&fixed, preimage_eof, extra_chars);
2390 fixed_buf = strbuf_detach(&fixed, &fixed_len);
2391 update_pre_post_images(preimage, postimage,
2392 fixed_buf, fixed_len, postlen);
2393 return 1;
2394 }
2395
2396 if (ws_error_action != correct_ws_error)
2397 return 0;
2398
2399 /*
2400 * The hunk does not apply byte-by-byte, but the hash says
2401 * it might with whitespace fuzz. We weren't asked to
2402 * ignore whitespace, we were asked to correct whitespace
2403 * errors, so let's try matching after whitespace correction.
2404 *
2405 * While checking the preimage against the target, whitespace
2406 * errors in both fixed, we count how large the corresponding
2407 * postimage needs to be. The postimage prepared by
2408 * apply_one_fragment() has whitespace errors fixed on added
2409 * lines already, but the common lines were propagated as-is,
2410 * which may become longer when their whitespace errors are
2411 * fixed.
2412 */
2413
2414 /* First count added lines in postimage */
2415 postlen = 0;
2416 for (i = 0; i < postimage->nr; i++) {
2417 if (!(postimage->line[i].flag & LINE_COMMON))
2418 postlen += postimage->line[i].len;
2419 }
2420
2421 /*
2422 * The preimage may extend beyond the end of the file,
2423 * but in this loop we will only handle the part of the
2424 * preimage that falls within the file.
2425 */
2426 strbuf_init(&fixed, preimage->len + 1);
2427 orig = preimage->buf;
2428 target = img->buf + try;
2429 for (i = 0; i < preimage_limit; i++) {
2430 size_t oldlen = preimage->line[i].len;
2431 size_t tgtlen = img->line[try_lno + i].len;
2432 size_t fixstart = fixed.len;
2433 struct strbuf tgtfix;
2434 int match;
2435
2436 /* Try fixing the line in the preimage */
2437 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);
2438
2439 /* Try fixing the line in the target */
2440 strbuf_init(&tgtfix, tgtlen);
2441 ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);
2442
2443 /*
2444 * If they match, either the preimage was based on
2445 * a version before our tree fixed whitespace breakage,
2446 * or we are lacking a whitespace-fix patch the tree
2447 * the preimage was based on already had (i.e. target
2448 * has whitespace breakage, the preimage doesn't).
2449 * In either case, we are fixing the whitespace breakages
2450 * so we might as well take the fix together with their
2451 * real change.
2452 */
2453 match = (tgtfix.len == fixed.len - fixstart &&
2454 !memcmp(tgtfix.buf, fixed.buf + fixstart,
2455 fixed.len - fixstart));
2456
2457 /* Add the length if this is common with the postimage */
2458 if (preimage->line[i].flag & LINE_COMMON)
2459 postlen += tgtfix.len;
2460
2461 strbuf_release(&tgtfix);
2462 if (!match)
2463 goto unmatch_exit;
2464
2465 orig += oldlen;
2466 target += tgtlen;
2467 }
2468
2469
2470 /*
2471 * Now handle the lines in the preimage that falls beyond the
2472 * end of the file (if any). They will only match if they are
2473 * empty or only contain whitespace (if WS_BLANK_AT_EOL is
2474 * false).
2475 */
2476 for ( ; i < preimage->nr; i++) {
2477 size_t fixstart = fixed.len; /* start of the fixed preimage */
2478 size_t oldlen = preimage->line[i].len;
2479 int j;
2480
2481 /* Try fixing the line in the preimage */
2482 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);
2483
2484 for (j = fixstart; j < fixed.len; j++)
2485 if (!isspace(fixed.buf[j]))
2486 goto unmatch_exit;
2487
2488 orig += oldlen;
2489 }
2490
2491 /*
2492 * Yes, the preimage is based on an older version that still
2493 * has whitespace breakages unfixed, and fixing them makes the
2494 * hunk match. Update the context lines in the postimage.
2495 */
2496 fixed_buf = strbuf_detach(&fixed, &fixed_len);
2497 if (postlen < postimage->len)
2498 postlen = 0;
2499 update_pre_post_images(preimage, postimage,
2500 fixed_buf, fixed_len, postlen);
2501 return 1;
2502
2503 unmatch_exit:
2504 strbuf_release(&fixed);
2505 return 0;
2506 }
2507
2508 static int find_pos(struct image *img,
2509 struct image *preimage,
2510 struct image *postimage,
2511 int line,
2512 unsigned ws_rule,
2513 int match_beginning, int match_end)
2514 {
2515 int i;
2516 unsigned long backwards, forwards, try;
2517 int backwards_lno, forwards_lno, try_lno;
2518
2519 /*
2520 * If match_beginning or match_end is specified, there is no
2521 * point starting from a wrong line that will never match and
2522 * wander around and wait for a match at the specified end.
2523 */
2524 if (match_beginning)
2525 line = 0;
2526 else if (match_end)
2527 line = img->nr - preimage->nr;
2528
2529 /*
2530 * Because the comparison is unsigned, the following test
2531 * will also take care of a negative line number that can
2532 * result when match_end and preimage is larger than the target.
2533 */
2534 if ((size_t) line > img->nr)
2535 line = img->nr;
2536
2537 try = 0;
2538 for (i = 0; i < line; i++)
2539 try += img->line[i].len;
2540
2541 /*
2542 * There's probably some smart way to do this, but I'll leave
2543 * that to the smart and beautiful people. I'm simple and stupid.
2544 */
2545 backwards = try;
2546 backwards_lno = line;
2547 forwards = try;
2548 forwards_lno = line;
2549 try_lno = line;
2550
2551 for (i = 0; ; i++) {
2552 if (match_fragment(img, preimage, postimage,
2553 try, try_lno, ws_rule,
2554 match_beginning, match_end))
2555 return try_lno;
2556
2557 again:
2558 if (backwards_lno == 0 && forwards_lno == img->nr)
2559 break;
2560
2561 if (i & 1) {
2562 if (backwards_lno == 0) {
2563 i++;
2564 goto again;
2565 }
2566 backwards_lno--;
2567 backwards -= img->line[backwards_lno].len;
2568 try = backwards;
2569 try_lno = backwards_lno;
2570 } else {
2571 if (forwards_lno == img->nr) {
2572 i++;
2573 goto again;
2574 }
2575 forwards += img->line[forwards_lno].len;
2576 forwards_lno++;
2577 try = forwards;
2578 try_lno = forwards_lno;
2579 }
2580
2581 }
2582 return -1;
2583 }
2584
2585 static void remove_first_line(struct image *img)
2586 {
2587 img->buf += img->line[0].len;
2588 img->len -= img->line[0].len;
2589 img->line++;
2590 img->nr--;
2591 }
2592
2593 static void remove_last_line(struct image *img)
2594 {
2595 img->len -= img->line[--img->nr].len;
2596 }
2597
2598 /*
2599 * The change from "preimage" and "postimage" has been found to
2600 * apply at applied_pos (counts in line numbers) in "img".
2601 * Update "img" to remove "preimage" and replace it with "postimage".
2602 */
2603 static void update_image(struct image *img,
2604 int applied_pos,
2605 struct image *preimage,
2606 struct image *postimage)
2607 {
2608 /*
2609 * remove the copy of preimage at offset in img
2610 * and replace it with postimage
2611 */
2612 int i, nr;
2613 size_t remove_count, insert_count, applied_at = 0;
2614 char *result;
2615 int preimage_limit;
2616
2617 /*
2618 * If we are removing blank lines at the end of img,
2619 * the preimage may extend beyond the end.
2620 * If that is the case, we must be careful only to
2621 * remove the part of the preimage that falls within
2622 * the boundaries of img. Initialize preimage_limit
2623 * to the number of lines in the preimage that falls
2624 * within the boundaries.
2625 */
2626 preimage_limit = preimage->nr;
2627 if (preimage_limit > img->nr - applied_pos)
2628 preimage_limit = img->nr - applied_pos;
2629
2630 for (i = 0; i < applied_pos; i++)
2631 applied_at += img->line[i].len;
2632
2633 remove_count = 0;
2634 for (i = 0; i < preimage_limit; i++)
2635 remove_count += img->line[applied_pos + i].len;
2636 insert_count = postimage->len;
2637
2638 /* Adjust the contents */
2639 result = xmalloc(img->len + insert_count - remove_count + 1);
2640 memcpy(result, img->buf, applied_at);
2641 memcpy(result + applied_at, postimage->buf, postimage->len);
2642 memcpy(result + applied_at + postimage->len,
2643 img->buf + (applied_at + remove_count),
2644 img->len - (applied_at + remove_count));
2645 free(img->buf);
2646 img->buf = result;
2647 img->len += insert_count - remove_count;
2648 result[img->len] = '\0';
2649
2650 /* Adjust the line table */
2651 nr = img->nr + postimage->nr - preimage_limit;
2652 if (preimage_limit < postimage->nr) {
2653 /*
2654 * NOTE: this knows that we never call remove_first_line()
2655 * on anything other than pre/post image.
2656 */
2657 REALLOC_ARRAY(img->line, nr);
2658 img->line_allocated = img->line;
2659 }
2660 if (preimage_limit != postimage->nr)
2661 memmove(img->line + applied_pos + postimage->nr,
2662 img->line + applied_pos + preimage_limit,
2663 (img->nr - (applied_pos + preimage_limit)) *
2664 sizeof(*img->line));
2665 memcpy(img->line + applied_pos,
2666 postimage->line,
2667 postimage->nr * sizeof(*img->line));
2668 if (!allow_overlap)
2669 for (i = 0; i < postimage->nr; i++)
2670 img->line[applied_pos + i].flag |= LINE_PATCHED;
2671 img->nr = nr;
2672 }
2673
2674 /*
2675 * Use the patch-hunk text in "frag" to prepare two images (preimage and
2676 * postimage) for the hunk. Find lines that match "preimage" in "img" and
2677 * replace the part of "img" with "postimage" text.
2678 */
2679 static int apply_one_fragment(struct image *img, struct fragment *frag,
2680 int inaccurate_eof, unsigned ws_rule,
2681 int nth_fragment)
2682 {
2683 int match_beginning, match_end;
2684 const char *patch = frag->patch;
2685 int size = frag->size;
2686 char *old, *oldlines;
2687 struct strbuf newlines;
2688 int new_blank_lines_at_end = 0;
2689 int found_new_blank_lines_at_end = 0;
2690 int hunk_linenr = frag->linenr;
2691 unsigned long leading, trailing;
2692 int pos, applied_pos;
2693 struct image preimage;
2694 struct image postimage;
2695
2696 memset(&preimage, 0, sizeof(preimage));
2697 memset(&postimage, 0, sizeof(postimage));
2698 oldlines = xmalloc(size);
2699 strbuf_init(&newlines, size);
2700
2701 old = oldlines;
2702 while (size > 0) {
2703 char first;
2704 int len = linelen(patch, size);
2705 int plen;
2706 int added_blank_line = 0;
2707 int is_blank_context = 0;
2708 size_t start;
2709
2710 if (!len)
2711 break;
2712
2713 /*
2714 * "plen" is how much of the line we should use for
2715 * the actual patch data. Normally we just remove the
2716 * first character on the line, but if the line is
2717 * followed by "\ No newline", then we also remove the
2718 * last one (which is the newline, of course).
2719 */
2720 plen = len - 1;
2721 if (len < size && patch[len] == '\\')
2722 plen--;
2723 first = *patch;
2724 if (apply_in_reverse) {
2725 if (first == '-')
2726 first = '+';
2727 else if (first == '+')
2728 first = '-';
2729 }
2730
2731 switch (first) {
2732 case '\n':
2733 /* Newer GNU diff, empty context line */
2734 if (plen < 0)
2735 /* ... followed by '\No newline'; nothing */
2736 break;
2737 *old++ = '\n';
2738 strbuf_addch(&newlines, '\n');
2739 add_line_info(&preimage, "\n", 1, LINE_COMMON);
2740 add_line_info(&postimage, "\n", 1, LINE_COMMON);
2741 is_blank_context = 1;
2742 break;
2743 case ' ':
2744 if (plen && (ws_rule & WS_BLANK_AT_EOF) &&
2745 ws_blank_line(patch + 1, plen, ws_rule))
2746 is_blank_context = 1;
2747 case '-':
2748 memcpy(old, patch + 1, plen);
2749 add_line_info(&preimage, old, plen,
2750 (first == ' ' ? LINE_COMMON : 0));
2751 old += plen;
2752 if (first == '-')
2753 break;
2754 /* Fall-through for ' ' */
2755 case '+':
2756 /* --no-add does not add new lines */
2757 if (first == '+' && no_add)
2758 break;
2759
2760 start = newlines.len;
2761 if (first != '+' ||
2762 !whitespace_error ||
2763 ws_error_action != correct_ws_error) {
2764 strbuf_add(&newlines, patch + 1, plen);
2765 }
2766 else {
2767 ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &applied_after_fixing_ws);
2768 }
2769 add_line_info(&postimage, newlines.buf + start, newlines.len - start,
2770 (first == '+' ? 0 : LINE_COMMON));
2771 if (first == '+' &&
2772 (ws_rule & WS_BLANK_AT_EOF) &&
2773 ws_blank_line(patch + 1, plen, ws_rule))
2774 added_blank_line = 1;
2775 break;
2776 case '@': case '\\':
2777 /* Ignore it, we already handled it */
2778 break;
2779 default:
2780 if (apply_verbosely)
2781 error(_("invalid start of line: '%c'"), first);
2782 applied_pos = -1;
2783 goto out;
2784 }
2785 if (added_blank_line) {
2786 if (!new_blank_lines_at_end)
2787 found_new_blank_lines_at_end = hunk_linenr;
2788 new_blank_lines_at_end++;
2789 }
2790 else if (is_blank_context)
2791 ;
2792 else
2793 new_blank_lines_at_end = 0;
2794 patch += len;
2795 size -= len;
2796 hunk_linenr++;
2797 }
2798 if (inaccurate_eof &&
2799 old > oldlines && old[-1] == '\n' &&
2800 newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {
2801 old--;
2802 strbuf_setlen(&newlines, newlines.len - 1);
2803 }
2804
2805 leading = frag->leading;
2806 trailing = frag->trailing;
2807
2808 /*
2809 * A hunk to change lines at the beginning would begin with
2810 * @@ -1,L +N,M @@
2811 * but we need to be careful. -U0 that inserts before the second
2812 * line also has this pattern.
2813 *
2814 * And a hunk to add to an empty file would begin with
2815 * @@ -0,0 +N,M @@
2816 *
2817 * In other words, a hunk that is (frag->oldpos <= 1) with or
2818 * without leading context must match at the beginning.
2819 */
2820 match_beginning = (!frag->oldpos ||
2821 (frag->oldpos == 1 && !unidiff_zero));
2822
2823 /*
2824 * A hunk without trailing lines must match at the end.
2825 * However, we simply cannot tell if a hunk must match end
2826 * from the lack of trailing lines if the patch was generated
2827 * with unidiff without any context.
2828 */
2829 match_end = !unidiff_zero && !trailing;
2830
2831 pos = frag->newpos ? (frag->newpos - 1) : 0;
2832 preimage.buf = oldlines;
2833 preimage.len = old - oldlines;
2834 postimage.buf = newlines.buf;
2835 postimage.len = newlines.len;
2836 preimage.line = preimage.line_allocated;
2837 postimage.line = postimage.line_allocated;
2838
2839 for (;;) {
2840
2841 applied_pos = find_pos(img, &preimage, &postimage, pos,
2842 ws_rule, match_beginning, match_end);
2843
2844 if (applied_pos >= 0)
2845 break;
2846
2847 /* Am I at my context limits? */
2848 if ((leading <= p_context) && (trailing <= p_context))
2849 break;
2850 if (match_beginning || match_end) {
2851 match_beginning = match_end = 0;
2852 continue;
2853 }
2854
2855 /*
2856 * Reduce the number of context lines; reduce both
2857 * leading and trailing if they are equal otherwise
2858 * just reduce the larger context.
2859 */
2860 if (leading >= trailing) {
2861 remove_first_line(&preimage);
2862 remove_first_line(&postimage);
2863 pos--;
2864 leading--;
2865 }
2866 if (trailing > leading) {
2867 remove_last_line(&preimage);
2868 remove_last_line(&postimage);
2869 trailing--;
2870 }
2871 }
2872
2873 if (applied_pos >= 0) {
2874 if (new_blank_lines_at_end &&
2875 preimage.nr + applied_pos >= img->nr &&
2876 (ws_rule & WS_BLANK_AT_EOF) &&
2877 ws_error_action != nowarn_ws_error) {
2878 record_ws_error(WS_BLANK_AT_EOF, "+", 1,
2879 found_new_blank_lines_at_end);
2880 if (ws_error_action == correct_ws_error) {
2881 while (new_blank_lines_at_end--)
2882 remove_last_line(&postimage);
2883 }
2884 /*
2885 * We would want to prevent write_out_results()
2886 * from taking place in apply_patch() that follows
2887 * the callchain led us here, which is:
2888 * apply_patch->check_patch_list->check_patch->
2889 * apply_data->apply_fragments->apply_one_fragment
2890 */
2891 if (ws_error_action == die_on_ws_error)
2892 apply = 0;
2893 }
2894
2895 if (apply_verbosely && applied_pos != pos) {
2896 int offset = applied_pos - pos;
2897 if (apply_in_reverse)
2898 offset = 0 - offset;
2899 fprintf_ln(stderr,
2900 Q_("Hunk #%d succeeded at %d (offset %d line).",
2901 "Hunk #%d succeeded at %d (offset %d lines).",
2902 offset),
2903 nth_fragment, applied_pos + 1, offset);
2904 }
2905
2906 /*
2907 * Warn if it was necessary to reduce the number
2908 * of context lines.
2909 */
2910 if ((leading != frag->leading) ||
2911 (trailing != frag->trailing))
2912 fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"
2913 " to apply fragment at %d"),
2914 leading, trailing, applied_pos+1);
2915 update_image(img, applied_pos, &preimage, &postimage);
2916 } else {
2917 if (apply_verbosely)
2918 error(_("while searching for:\n%.*s"),
2919 (int)(old - oldlines), oldlines);
2920 }
2921
2922 out:
2923 free(oldlines);
2924 strbuf_release(&newlines);
2925 free(preimage.line_allocated);
2926 free(postimage.line_allocated);
2927
2928 return (applied_pos < 0);
2929 }
2930
2931 static int apply_binary_fragment(struct image *img, struct patch *patch)
2932 {
2933 struct fragment *fragment = patch->fragments;
2934 unsigned long len;
2935 void *dst;
2936
2937 if (!fragment)
2938 return error(_("missing binary patch data for '%s'"),
2939 patch->new_name ?
2940 patch->new_name :
2941 patch->old_name);
2942
2943 /* Binary patch is irreversible without the optional second hunk */
2944 if (apply_in_reverse) {
2945 if (!fragment->next)
2946 return error("cannot reverse-apply a binary patch "
2947 "without the reverse hunk to '%s'",
2948 patch->new_name
2949 ? patch->new_name : patch->old_name);
2950 fragment = fragment->next;
2951 }
2952 switch (fragment->binary_patch_method) {
2953 case BINARY_DELTA_DEFLATED:
2954 dst = patch_delta(img->buf, img->len, fragment->patch,
2955 fragment->size, &len);
2956 if (!dst)
2957 return -1;
2958 clear_image(img);
2959 img->buf = dst;
2960 img->len = len;
2961 return 0;
2962 case BINARY_LITERAL_DEFLATED:
2963 clear_image(img);
2964 img->len = fragment->size;
2965 img->buf = xmemdupz(fragment->patch, img->len);
2966 return 0;
2967 }
2968 return -1;
2969 }
2970
2971 /*
2972 * Replace "img" with the result of applying the binary patch.
2973 * The binary patch data itself in patch->fragment is still kept
2974 * but the preimage prepared by the caller in "img" is freed here
2975 * or in the helper function apply_binary_fragment() this calls.
2976 */
2977 static int apply_binary(struct image *img, struct patch *patch)
2978 {
2979 const char *name = patch->old_name ? patch->old_name : patch->new_name;
2980 unsigned char sha1[20];
2981
2982 /*
2983 * For safety, we require patch index line to contain
2984 * full 40-byte textual SHA1 for old and new, at least for now.
2985 */
2986 if (strlen(patch->old_sha1_prefix) != 40 ||
2987 strlen(patch->new_sha1_prefix) != 40 ||
2988 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
2989 get_sha1_hex(patch->new_sha1_prefix, sha1))
2990 return error("cannot apply binary patch to '%s' "
2991 "without full index line", name);
2992
2993 if (patch->old_name) {
2994 /*
2995 * See if the old one matches what the patch
2996 * applies to.
2997 */
2998 hash_sha1_file(img->buf, img->len, blob_type, sha1);
2999 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
3000 return error("the patch applies to '%s' (%s), "
3001 "which does not match the "
3002 "current contents.",
3003 name, sha1_to_hex(sha1));
3004 }
3005 else {
3006 /* Otherwise, the old one must be empty. */
3007 if (img->len)
3008 return error("the patch applies to an empty "
3009 "'%s' but it is not empty", name);
3010 }
3011
3012 get_sha1_hex(patch->new_sha1_prefix, sha1);
3013 if (is_null_sha1(sha1)) {
3014 clear_image(img);
3015 return 0; /* deletion patch */
3016 }
3017
3018 if (has_sha1_file(sha1)) {
3019 /* We already have the postimage */
3020 enum object_type type;
3021 unsigned long size;
3022 char *result;
3023
3024 result = read_sha1_file(sha1, &type, &size);
3025 if (!result)
3026 return error("the necessary postimage %s for "
3027 "'%s' cannot be read",
3028 patch->new_sha1_prefix, name);
3029 clear_image(img);
3030 img->buf = result;
3031 img->len = size;
3032 } else {
3033 /*
3034 * We have verified buf matches the preimage;
3035 * apply the patch data to it, which is stored
3036 * in the patch->fragments->{patch,size}.
3037 */
3038 if (apply_binary_fragment(img, patch))
3039 return error(_("binary patch does not apply to '%s'"),
3040 name);
3041
3042 /* verify that the result matches */
3043 hash_sha1_file(img->buf, img->len, blob_type, sha1);
3044 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
3045 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
3046 name, patch->new_sha1_prefix, sha1_to_hex(sha1));
3047 }
3048
3049 return 0;
3050 }
3051
3052 static int apply_fragments(struct image *img, struct patch *patch)
3053 {
3054 struct fragment *frag = patch->fragments;
3055 const char *name = patch->old_name ? patch->old_name : patch->new_name;
3056 unsigned ws_rule = patch->ws_rule;
3057 unsigned inaccurate_eof = patch->inaccurate_eof;
3058 int nth = 0;
3059
3060 if (patch->is_binary)
3061 return apply_binary(img, patch);
3062
3063 while (frag) {
3064 nth++;
3065 if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {
3066 error(_("patch failed: %s:%ld"), name, frag->oldpos);
3067 if (!apply_with_reject)
3068 return -1;
3069 frag->rejected = 1;
3070 }
3071 frag = frag->next;
3072 }
3073 return 0;
3074 }
3075
3076 static int read_blob_object(struct strbuf *buf, const unsigned char *sha1, unsigned mode)
3077 {
3078 if (S_ISGITLINK(mode)) {
3079 strbuf_grow(buf, 100);
3080 strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(sha1));
3081 } else {
3082 enum object_type type;
3083 unsigned long sz;
3084 char *result;
3085
3086 result = read_sha1_file(sha1, &type, &sz);
3087 if (!result)
3088 return -1;
3089 /* XXX read_sha1_file NUL-terminates */
3090 strbuf_attach(buf, result, sz, sz + 1);
3091 }
3092 return 0;
3093 }
3094
3095 static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf)
3096 {
3097 if (!ce)
3098 return 0;
3099 return read_blob_object(buf, ce->sha1, ce->ce_mode);
3100 }
3101
3102 static struct patch *in_fn_table(const char *name)
3103 {
3104 struct string_list_item *item;
3105
3106 if (name == NULL)
3107 return NULL;
3108
3109 item = string_list_lookup(&fn_table, name);
3110 if (item != NULL)
3111 return (struct patch *)item->util;
3112
3113 return NULL;
3114 }
3115
3116 /*
3117 * item->util in the filename table records the status of the path.
3118 * Usually it points at a patch (whose result records the contents
3119 * of it after applying it), but it could be PATH_WAS_DELETED for a
3120 * path that a previously applied patch has already removed, or
3121 * PATH_TO_BE_DELETED for a path that a later patch would remove.
3122 *
3123 * The latter is needed to deal with a case where two paths A and B
3124 * are swapped by first renaming A to B and then renaming B to A;
3125 * moving A to B should not be prevented due to presence of B as we
3126 * will remove it in a later patch.
3127 */
3128 #define PATH_TO_BE_DELETED ((struct patch *) -2)
3129 #define PATH_WAS_DELETED ((struct patch *) -1)
3130
3131 static int to_be_deleted(struct patch *patch)
3132 {
3133 return patch == PATH_TO_BE_DELETED;
3134 }
3135
3136 static int was_deleted(struct patch *patch)
3137 {
3138 return patch == PATH_WAS_DELETED;
3139 }
3140
3141 static void add_to_fn_table(struct patch *patch)
3142 {
3143 struct string_list_item *item;
3144
3145 /*
3146 * Always add new_name unless patch is a deletion
3147 * This should cover the cases for normal diffs,
3148 * file creations and copies
3149 */
3150 if (patch->new_name != NULL) {
3151 item = string_list_insert(&fn_table, patch->new_name);
3152 item->util = patch;
3153 }
3154
3155 /*
3156 * store a failure on rename/deletion cases because
3157 * later chunks shouldn't patch old names
3158 */
3159 if ((patch->new_name == NULL) || (patch->is_rename)) {
3160 item = string_list_insert(&fn_table, patch->old_name);
3161 item->util = PATH_WAS_DELETED;
3162 }
3163 }
3164
3165 static void prepare_fn_table(struct patch *patch)
3166 {
3167 /*
3168 * store information about incoming file deletion
3169 */
3170 while (patch) {
3171 if ((patch->new_name == NULL) || (patch->is_rename)) {
3172 struct string_list_item *item;
3173 item = string_list_insert(&fn_table, patch->old_name);
3174 item->util = PATH_TO_BE_DELETED;
3175 }
3176 patch = patch->next;
3177 }
3178 }
3179
3180 static int checkout_target(struct index_state *istate,
3181 struct cache_entry *ce, struct stat *st)
3182 {
3183 struct checkout costate;
3184
3185 memset(&costate, 0, sizeof(costate));
3186 costate.base_dir = "";
3187 costate.refresh_cache = 1;
3188 costate.istate = istate;
3189 if (checkout_entry(ce, &costate, NULL) || lstat(ce->name, st))
3190 return error(_("cannot checkout %s"), ce->name);
3191 return 0;
3192 }
3193
3194 static struct patch *previous_patch(struct patch *patch, int *gone)
3195 {
3196 struct patch *previous;
3197
3198 *gone = 0;
3199 if (patch->is_copy || patch->is_rename)
3200 return NULL; /* "git" patches do not depend on the order */
3201
3202 previous = in_fn_table(patch->old_name);
3203 if (!previous)
3204 return NULL;
3205
3206 if (to_be_deleted(previous))
3207 return NULL; /* the deletion hasn't happened yet */
3208
3209 if (was_deleted(previous))
3210 *gone = 1;
3211
3212 return previous;
3213 }
3214
3215 static int verify_index_match(const struct cache_entry *ce, struct stat *st)
3216 {
3217 if (S_ISGITLINK(ce->ce_mode)) {
3218 if (!S_ISDIR(st->st_mode))
3219 return -1;
3220 return 0;
3221 }
3222 return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
3223 }
3224
3225 #define SUBMODULE_PATCH_WITHOUT_INDEX 1
3226
3227 static int load_patch_target(struct strbuf *buf,
3228 const struct cache_entry *ce,
3229 struct stat *st,
3230 const char *name,
3231 unsigned expected_mode)
3232 {
3233 if (cached || check_index) {
3234 if (read_file_or_gitlink(ce, buf))
3235 return error(_("read of %s failed"), name);
3236 } else if (name) {
3237 if (S_ISGITLINK(expected_mode)) {
3238 if (ce)
3239 return read_file_or_gitlink(ce, buf);
3240 else
3241 return SUBMODULE_PATCH_WITHOUT_INDEX;
3242 } else if (has_symlink_leading_path(name, strlen(name))) {
3243 return error(_("reading from '%s' beyond a symbolic link"), name);
3244 } else {
3245 if (read_old_data(st, name, buf))
3246 return error(_("read of %s failed"), name);
3247 }
3248 }
3249 return 0;
3250 }
3251
3252 /*
3253 * We are about to apply "patch"; populate the "image" with the
3254 * current version we have, from the working tree or from the index,
3255 * depending on the situation e.g. --cached/--index. If we are
3256 * applying a non-git patch that incrementally updates the tree,
3257 * we read from the result of a previous diff.
3258 */
3259 static int load_preimage(struct image *image,
3260 struct patch *patch, struct stat *st,
3261 const struct cache_entry *ce)
3262 {
3263 struct strbuf buf = STRBUF_INIT;
3264 size_t len;
3265 char *img;
3266 struct patch *previous;
3267 int status;
3268
3269 previous = previous_patch(patch, &status);
3270 if (status)
3271 return error(_("path %s has been renamed/deleted"),
3272 patch->old_name);
3273 if (previous) {
3274 /* We have a patched copy in memory; use that. */
3275 strbuf_add(&buf, previous->result, previous->resultsize);
3276 } else {
3277 status = load_patch_target(&buf, ce, st,
3278 patch->old_name, patch->old_mode);
3279 if (status < 0)
3280 return status;
3281 else if (status == SUBMODULE_PATCH_WITHOUT_INDEX) {
3282 /*
3283 * There is no way to apply subproject
3284 * patch without looking at the index.
3285 * NEEDSWORK: shouldn't this be flagged
3286 * as an error???
3287 */
3288 free_fragment_list(patch->fragments);
3289 patch->fragments = NULL;
3290 } else if (status) {
3291 return error(_("read of %s failed"), patch->old_name);
3292 }
3293 }
3294
3295 img = strbuf_detach(&buf, &len);
3296 prepare_image(image, img, len, !patch->is_binary);
3297 return 0;
3298 }
3299
3300 static int three_way_merge(struct image *image,
3301 char *path,
3302 const unsigned char *base,
3303 const unsigned char *ours,
3304 const unsigned char *theirs)
3305 {
3306 mmfile_t base_file, our_file, their_file;
3307 mmbuffer_t result = { NULL };
3308 int status;
3309
3310 read_mmblob(&base_file, base);
3311 read_mmblob(&our_file, ours);
3312 read_mmblob(&their_file, theirs);
3313 status = ll_merge(&result, path,
3314 &base_file, "base",
3315 &our_file, "ours",
3316 &their_file, "theirs", NULL);
3317 free(base_file.ptr);
3318 free(our_file.ptr);
3319 free(their_file.ptr);
3320 if (status < 0 || !result.ptr) {
3321 free(result.ptr);
3322 return -1;
3323 }
3324 clear_image(image);
3325 image->buf = result.ptr;
3326 image->len = result.size;
3327
3328 return status;
3329 }
3330
3331 /*
3332 * When directly falling back to add/add three-way merge, we read from
3333 * the current contents of the new_name. In no cases other than that
3334 * this function will be called.
3335 */
3336 static int load_current(struct image *image, struct patch *patch)
3337 {
3338 struct strbuf buf = STRBUF_INIT;
3339 int status, pos;
3340 size_t len;
3341 char *img;
3342 struct stat st;
3343 struct cache_entry *ce;
3344 char *name = patch->new_name;
3345 unsigned mode = patch->new_mode;
3346
3347 if (!patch->is_new)
3348 die("BUG: patch to %s is not a creation", patch->old_name);
3349
3350 pos = cache_name_pos(name, strlen(name));
3351 if (pos < 0)
3352 return error(_("%s: does not exist in index"), name);
3353 ce = active_cache[pos];
3354 if (lstat(name, &st)) {
3355 if (errno != ENOENT)
3356 return error(_("%s: %s"), name, strerror(errno));
3357 if (checkout_target(&the_index, ce, &st))
3358 return -1;
3359 }
3360 if (verify_index_match(ce, &st))
3361 return error(_("%s: does not match index"), name);
3362
3363 status = load_patch_target(&buf, ce, &st, name, mode);
3364 if (status < 0)
3365 return status;
3366 else if (status)
3367 return -1;
3368 img = strbuf_detach(&buf, &len);
3369 prepare_image(image, img, len, !patch->is_binary);
3370 return 0;
3371 }
3372
3373 static int try_threeway(struct image *image, struct patch *patch,
3374 struct stat *st, const struct cache_entry *ce)
3375 {
3376 unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];
3377 struct strbuf buf = STRBUF_INIT;
3378 size_t len;
3379 int status;
3380 char *img;
3381 struct image tmp_image;
3382
3383 /* No point falling back to 3-way merge in these cases */
3384 if (patch->is_delete ||
3385 S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))
3386 return -1;
3387
3388 /* Preimage the patch was prepared for */
3389 if (patch->is_new)
3390 write_sha1_file("", 0, blob_type, pre_sha1);
3391 else if (get_sha1(patch->old_sha1_prefix, pre_sha1) ||
3392 read_blob_object(&buf, pre_sha1, patch->old_mode))
3393 return error("repository lacks the necessary blob to fall back on 3-way merge.");
3394
3395 fprintf(stderr, "Falling back to three-way merge...\n");
3396
3397 img = strbuf_detach(&buf, &len);
3398 prepare_image(&tmp_image, img, len, 1);
3399 /* Apply the patch to get the post image */
3400 if (apply_fragments(&tmp_image, patch) < 0) {
3401 clear_image(&tmp_image);
3402 return -1;
3403 }
3404 /* post_sha1[] is theirs */
3405 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_sha1);
3406 clear_image(&tmp_image);
3407
3408 /* our_sha1[] is ours */
3409 if (patch->is_new) {
3410 if (load_current(&tmp_image, patch))
3411 return error("cannot read the current contents of '%s'",
3412 patch->new_name);
3413 } else {
3414 if (load_preimage(&tmp_image, patch, st, ce))
3415 return error("cannot read the current contents of '%s'",
3416 patch->old_name);
3417 }
3418 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);
3419 clear_image(&tmp_image);
3420
3421 /* in-core three-way merge between post and our using pre as base */
3422 status = three_way_merge(image, patch->new_name,
3423 pre_sha1, our_sha1, post_sha1);
3424 if (status < 0) {
3425 fprintf(stderr, "Failed to fall back on three-way merge...\n");
3426 return status;
3427 }
3428
3429 if (status) {
3430 patch->conflicted_threeway = 1;
3431 if (patch->is_new)
3432 oidclr(&patch->threeway_stage[0]);
3433 else
3434 hashcpy(patch->threeway_stage[0].hash, pre_sha1);
3435 hashcpy(patch->threeway_stage[1].hash, our_sha1);
3436 hashcpy(patch->threeway_stage[2].hash, post_sha1);
3437 fprintf(stderr, "Applied patch to '%s' with conflicts.\n", patch->new_name);
3438 } else {
3439 fprintf(stderr, "Applied patch to '%s' cleanly.\n", patch->new_name);
3440 }
3441 return 0;
3442 }
3443
3444 static int apply_data(struct patch *patch, struct stat *st, const struct cache_entry *ce)
3445 {
3446 struct image image;
3447
3448 if (load_preimage(&image, patch, st, ce) < 0)
3449 return -1;
3450
3451 if (patch->direct_to_threeway ||
3452 apply_fragments(&image, patch) < 0) {
3453 /* Note: with --reject, apply_fragments() returns 0 */
3454 if (!threeway || try_threeway(&image, patch, st, ce) < 0)
3455 return -1;
3456 }
3457 patch->result = image.buf;
3458 patch->resultsize = image.len;
3459 add_to_fn_table(patch);
3460 free(image.line_allocated);
3461
3462 if (0 < patch->is_delete && patch->resultsize)
3463 return error(_("removal patch leaves file contents"));
3464
3465 return 0;
3466 }
3467
3468 /*
3469 * If "patch" that we are looking at modifies or deletes what we have,
3470 * we would want it not to lose any local modification we have, either
3471 * in the working tree or in the index.
3472 *
3473 * This also decides if a non-git patch is a creation patch or a
3474 * modification to an existing empty file. We do not check the state
3475 * of the current tree for a creation patch in this function; the caller
3476 * check_patch() separately makes sure (and errors out otherwise) that
3477 * the path the patch creates does not exist in the current tree.
3478 */
3479 static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)
3480 {
3481 const char *old_name = patch->old_name;
3482 struct patch *previous = NULL;
3483 int stat_ret = 0, status;
3484 unsigned st_mode = 0;
3485
3486 if (!old_name)
3487 return 0;
3488
3489 assert(patch->is_new <= 0);
3490 previous = previous_patch(patch, &status);
3491
3492 if (status)
3493 return error(_("path %s has been renamed/deleted"), old_name);
3494 if (previous) {
3495 st_mode = previous->new_mode;
3496 } else if (!cached) {
3497 stat_ret = lstat(old_name, st);
3498 if (stat_ret && errno != ENOENT)
3499 return error(_("%s: %s"), old_name, strerror(errno));
3500 }
3501
3502 if (check_index && !previous) {
3503 int pos = cache_name_pos(old_name, strlen(old_name));
3504 if (pos < 0) {
3505 if (patch->is_new < 0)
3506 goto is_new;
3507 return error(_("%s: does not exist in index"), old_name);
3508 }
3509 *ce = active_cache[pos];
3510 if (stat_ret < 0) {
3511 if (checkout_target(&the_index, *ce, st))
3512 return -1;
3513 }
3514 if (!cached && verify_index_match(*ce, st))
3515 return error(_("%s: does not match index"), old_name);
3516 if (cached)
3517 st_mode = (*ce)->ce_mode;
3518 } else if (stat_ret < 0) {
3519 if (patch->is_new < 0)
3520 goto is_new;
3521 return error(_("%s: %s"), old_name, strerror(errno));
3522 }
3523
3524 if (!cached && !previous)
3525 st_mode = ce_mode_from_stat(*ce, st->st_mode);
3526
3527 if (patch->is_new < 0)
3528 patch->is_new = 0;
3529 if (!patch->old_mode)
3530 patch->old_mode = st_mode;
3531 if ((st_mode ^ patch->old_mode) & S_IFMT)
3532 return error(_("%s: wrong type"), old_name);
3533 if (st_mode != patch->old_mode)
3534 warning(_("%s has type %o, expected %o"),
3535 old_name, st_mode, patch->old_mode);
3536 if (!patch->new_mode && !patch->is_delete)
3537 patch->new_mode = st_mode;
3538 return 0;
3539
3540 is_new:
3541 patch->is_new = 1;
3542 patch->is_delete = 0;
3543 free(patch->old_name);
3544 patch->old_name = NULL;
3545 return 0;
3546 }
3547
3548
3549 #define EXISTS_IN_INDEX 1
3550 #define EXISTS_IN_WORKTREE 2
3551
3552 static int check_to_create(const char *new_name, int ok_if_exists)
3553 {
3554 struct stat nst;
3555
3556 if (check_index &&
3557 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
3558 !ok_if_exists)
3559 return EXISTS_IN_INDEX;
3560 if (cached)
3561 return 0;
3562
3563 if (!lstat(new_name, &nst)) {
3564 if (S_ISDIR(nst.st_mode) || ok_if_exists)
3565 return 0;
3566 /*
3567 * A leading component of new_name might be a symlink
3568 * that is going to be removed with this patch, but
3569 * still pointing at somewhere that has the path.
3570 * In such a case, path "new_name" does not exist as
3571 * far as git is concerned.
3572 */
3573 if (has_symlink_leading_path(new_name, strlen(new_name)))
3574 return 0;
3575
3576 return EXISTS_IN_WORKTREE;
3577 } else if ((errno != ENOENT) && (errno != ENOTDIR)) {
3578 return error("%s: %s", new_name, strerror(errno));
3579 }
3580 return 0;
3581 }
3582
3583 /*
3584 * We need to keep track of how symlinks in the preimage are
3585 * manipulated by the patches. A patch to add a/b/c where a/b
3586 * is a symlink should not be allowed to affect the directory
3587 * the symlink points at, but if the same patch removes a/b,
3588 * it is perfectly fine, as the patch removes a/b to make room
3589 * to create a directory a/b so that a/b/c can be created.
3590 */
3591 static struct string_list symlink_changes;
3592 #define SYMLINK_GOES_AWAY 01
3593 #define SYMLINK_IN_RESULT 02
3594
3595 static uintptr_t register_symlink_changes(const char *path, uintptr_t what)
3596 {
3597 struct string_list_item *ent;
3598
3599 ent = string_list_lookup(&symlink_changes, path);
3600 if (!ent) {
3601 ent = string_list_insert(&symlink_changes, path);
3602 ent->util = (void *)0;
3603 }
3604 ent->util = (void *)(what | ((uintptr_t)ent->util));
3605 return (uintptr_t)ent->util;
3606 }
3607
3608 static uintptr_t check_symlink_changes(const char *path)
3609 {
3610 struct string_list_item *ent;
3611
3612 ent = string_list_lookup(&symlink_changes, path);
3613 if (!ent)
3614 return 0;
3615 return (uintptr_t)ent->util;
3616 }
3617
3618 static void prepare_symlink_changes(struct patch *patch)
3619 {
3620 for ( ; patch; patch = patch->next) {
3621 if ((patch->old_name && S_ISLNK(patch->old_mode)) &&
3622 (patch->is_rename || patch->is_delete))
3623 /* the symlink at patch->old_name is removed */
3624 register_symlink_changes(patch->old_name, SYMLINK_GOES_AWAY);
3625
3626 if (patch->new_name && S_ISLNK(patch->new_mode))
3627 /* the symlink at patch->new_name is created or remains */
3628 register_symlink_changes(patch->new_name, SYMLINK_IN_RESULT);
3629 }
3630 }
3631
3632 static int path_is_beyond_symlink_1(struct strbuf *name)
3633 {
3634 do {
3635 unsigned int change;
3636
3637 while (--name->len && name->buf[name->len] != '/')
3638 ; /* scan backwards */
3639 if (!name->len)
3640 break;
3641 name->buf[name->len] = '\0';
3642 change = check_symlink_changes(name->buf);
3643 if (change & SYMLINK_IN_RESULT)
3644 return 1;
3645 if (change & SYMLINK_GOES_AWAY)
3646 /*
3647 * This cannot be "return 0", because we may
3648 * see a new one created at a higher level.
3649 */
3650 continue;
3651
3652 /* otherwise, check the preimage */
3653 if (check_index) {
3654 struct cache_entry *ce;
3655
3656 ce = cache_file_exists(name->buf, name->len, ignore_case);
3657 if (ce && S_ISLNK(ce->ce_mode))
3658 return 1;
3659 } else {
3660 struct stat st;
3661 if (!lstat(name->buf, &st) && S_ISLNK(st.st_mode))
3662 return 1;
3663 }
3664 } while (1);
3665 return 0;
3666 }
3667
3668 static int path_is_beyond_symlink(const char *name_)
3669 {
3670 int ret;
3671 struct strbuf name = STRBUF_INIT;
3672
3673 assert(*name_ != '\0');
3674 strbuf_addstr(&name, name_);
3675 ret = path_is_beyond_symlink_1(&name);
3676 strbuf_release(&name);
3677
3678 return ret;
3679 }
3680
3681 static void die_on_unsafe_path(struct patch *patch)
3682 {
3683 const char *old_name = NULL;
3684 const char *new_name = NULL;
3685 if (patch->is_delete)
3686 old_name = patch->old_name;
3687 else if (!patch->is_new && !patch->is_copy)
3688 old_name = patch->old_name;
3689 if (!patch->is_delete)
3690 new_name = patch->new_name;
3691
3692 if (old_name && !verify_path(old_name))
3693 die(_("invalid path '%s'"), old_name);
3694 if (new_name && !verify_path(new_name))
3695 die(_("invalid path '%s'"), new_name);
3696 }
3697
3698 /*
3699 * Check and apply the patch in-core; leave the result in patch->result
3700 * for the caller to write it out to the final destination.
3701 */
3702 static int check_patch(struct patch *patch)
3703 {
3704 struct stat st;
3705 const char *old_name = patch->old_name;
3706 const char *new_name = patch->new_name;
3707 const char *name = old_name ? old_name : new_name;
3708 struct cache_entry *ce = NULL;
3709 struct patch *tpatch;
3710 int ok_if_exists;
3711 int status;
3712
3713 patch->rejected = 1; /* we will drop this after we succeed */
3714
3715 status = check_preimage(patch, &ce, &st);
3716 if (status)
3717 return status;
3718 old_name = patch->old_name;
3719
3720 /*
3721 * A type-change diff is always split into a patch to delete
3722 * old, immediately followed by a patch to create new (see
3723 * diff.c::run_diff()); in such a case it is Ok that the entry
3724 * to be deleted by the previous patch is still in the working
3725 * tree and in the index.
3726 *
3727 * A patch to swap-rename between A and B would first rename A
3728 * to B and then rename B to A. While applying the first one,
3729 * the presence of B should not stop A from getting renamed to
3730 * B; ask to_be_deleted() about the later rename. Removal of
3731 * B and rename from A to B is handled the same way by asking
3732 * was_deleted().
3733 */
3734 if ((tpatch = in_fn_table(new_name)) &&
3735 (was_deleted(tpatch) || to_be_deleted(tpatch)))
3736 ok_if_exists = 1;
3737 else
3738 ok_if_exists = 0;
3739
3740 if (new_name &&
3741 ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {
3742 int err = check_to_create(new_name, ok_if_exists);
3743
3744 if (err && threeway) {
3745 patch->direct_to_threeway = 1;
3746 } else switch (err) {
3747 case 0:
3748 break; /* happy */
3749 case EXISTS_IN_INDEX:
3750 return error(_("%s: already exists in index"), new_name);
3751 break;
3752 case EXISTS_IN_WORKTREE:
3753 return error(_("%s: already exists in working directory"),
3754 new_name);
3755 default:
3756 return err;
3757 }
3758
3759 if (!patch->new_mode) {
3760 if (0 < patch->is_new)
3761 patch->new_mode = S_IFREG | 0644;
3762 else
3763 patch->new_mode = patch->old_mode;
3764 }
3765 }
3766
3767 if (new_name && old_name) {
3768 int same = !strcmp(old_name, new_name);
3769 if (!patch->new_mode)
3770 patch->new_mode = patch->old_mode;
3771 if ((patch->old_mode ^ patch->new_mode) & S_IFMT) {
3772 if (same)
3773 return error(_("new mode (%o) of %s does not "
3774 "match old mode (%o)"),