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