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