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