Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
[git/git.git] / builtin-apply.c
CommitLineData
c1bb9350
LT
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 *
c1bb9350 8 */
c1bb9350 9#include "cache.h"
03ac6e64 10#include "cache-tree.h"
22943f1a 11#include "quote.h"
8e440259 12#include "blob.h"
051308f6 13#include "delta.h"
ac6245e3 14#include "builtin.h"
c1bb9350 15
a9486b02
PR
16/*
17 * --check turns on checking that the working tree matches the
18 * files that are being modified, but doesn't apply the patch
19 * --stat does just a diffstat, and doesn't actually apply
20 * --numstat does numeric diffstat, and doesn't actually apply
21 * --index-info shows the old and new index info for paths if available.
22 * --index updates the cache as well.
23 * --cached updates only the cache without ever touching the working tree.
24 */
edf2e370
JH
25static const char *prefix;
26static int prefix_length = -1;
dbd0f7d3 27static int newfd = -1;
edf2e370 28
4be60962 29static int unidiff_zero;
e36f8b60 30static int p_value = 1;
3e8a5db9 31static int p_value_known;
96f1e58f 32static int check_index;
7da3bf37 33static int update_index;
96f1e58f
DR
34static int cached;
35static int diffstat;
36static int numstat;
37static int summary;
38static int check;
a577284a 39static int apply = 1;
96f1e58f 40static int apply_in_reverse;
57dc397c 41static int apply_with_reject;
a2bf404e 42static int apply_verbosely;
96f1e58f
DR
43static int no_add;
44static int show_index_info;
22943f1a 45static int line_termination = '\n';
bf8675d3 46static unsigned long p_context = ULONG_MAX;
12dd6e8c 47static const char apply_usage[] =
a2bf404e 48"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
c1bb9350 49
19bfcd5a 50static enum whitespace_eol {
2ae1c53b 51 nowarn_whitespace,
19bfcd5a 52 warn_on_whitespace,
b5767dd6 53 error_on_whitespace,
2ae1c53b 54 strip_whitespace,
621603b7 55} new_whitespace = warn_on_whitespace;
96f1e58f 56static int whitespace_error;
fc96b7c9 57static int squelch_whitespace_errors = 5;
c94bf41c 58static int applied_after_fixing_ws;
96f1e58f 59static const char *patch_input_file;
19bfcd5a 60
2ae1c53b
JH
61static void parse_whitespace_option(const char *option)
62{
63 if (!option) {
621603b7 64 new_whitespace = warn_on_whitespace;
2ae1c53b
JH
65 return;
66 }
67 if (!strcmp(option, "warn")) {
68 new_whitespace = warn_on_whitespace;
69 return;
70 }
621603b7
JH
71 if (!strcmp(option, "nowarn")) {
72 new_whitespace = nowarn_whitespace;
73 return;
74 }
2ae1c53b
JH
75 if (!strcmp(option, "error")) {
76 new_whitespace = error_on_whitespace;
77 return;
78 }
79 if (!strcmp(option, "error-all")) {
80 new_whitespace = error_on_whitespace;
81 squelch_whitespace_errors = 0;
82 return;
83 }
84 if (!strcmp(option, "strip")) {
85 new_whitespace = strip_whitespace;
86 return;
87 }
88 die("unrecognized whitespace option '%s'", option);
89}
90
f21d6726
JH
91static void set_default_whitespace_mode(const char *whitespace_option)
92{
93 if (!whitespace_option && !apply_default_whitespace) {
94 new_whitespace = (apply
95 ? warn_on_whitespace
96 : nowarn_whitespace);
97 }
98}
99
3f40315a
LT
100/*
101 * For "diff-stat" like behaviour, we keep track of the biggest change
102 * we've seen, and the longest filename. That allows us to do simple
103 * scaling.
104 */
105static int max_change, max_len;
106
a4acb0eb
LT
107/*
108 * Various "current state", notably line numbers and what
109 * file (and how) we're patching right now.. The "is_xxxx"
110 * things are flags, where -1 means "don't know yet".
111 */
46979f56 112static int linenr = 1;
19c58fb8 113
3cd4f5e8
JH
114/*
115 * This represents one "hunk" from a patch, starting with
116 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
117 * patch text is pointed at by patch, and its byte length
118 * is stored in size. leading and trailing are the number
119 * of context lines.
120 */
19c58fb8 121struct fragment {
47495887 122 unsigned long leading, trailing;
19c58fb8
LT
123 unsigned long oldpos, oldlines;
124 unsigned long newpos, newlines;
125 const char *patch;
126 int size;
57dc397c 127 int rejected;
19c58fb8
LT
128 struct fragment *next;
129};
130
3cd4f5e8
JH
131/*
132 * When dealing with a binary patch, we reuse "leading" field
133 * to store the type of the binary hunk, either deflated "delta"
134 * or deflated "literal".
135 */
136#define binary_patch_method leading
137#define BINARY_DELTA_DEFLATED 1
138#define BINARY_LITERAL_DEFLATED 2
139
19c58fb8 140struct patch {
5041aa70 141 char *new_name, *old_name, *def_name;
19c58fb8 142 unsigned int old_mode, new_mode;
3dad11bf 143 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
57dc397c 144 int rejected;
0660626c 145 unsigned long deflate_origlen;
3f40315a 146 int lines_added, lines_deleted;
96c912a4 147 int score;
9987d7c5 148 unsigned int is_toplevel_relative:1;
3dad11bf
RS
149 unsigned int inaccurate_eof:1;
150 unsigned int is_binary:1;
151 unsigned int is_copy:1;
152 unsigned int is_rename:1;
19c58fb8 153 struct fragment *fragments;
5aa7d94c 154 char *result;
3cca928d 155 unsigned long resultsize;
2cf67f1e
JH
156 char old_sha1_prefix[41];
157 char new_sha1_prefix[41];
19c58fb8
LT
158 struct patch *next;
159};
46979f56 160
a2bf404e
JH
161static void say_patch_name(FILE *output, const char *pre, struct patch *patch, const char *post)
162{
163 fputs(pre, output);
164 if (patch->old_name && patch->new_name &&
165 strcmp(patch->old_name, patch->new_name)) {
166 write_name_quoted(NULL, 0, patch->old_name, 1, output);
167 fputs(" => ", output);
168 write_name_quoted(NULL, 0, patch->new_name, 1, output);
169 }
170 else {
171 const char *n = patch->new_name;
172 if (!n)
173 n = patch->old_name;
174 write_name_quoted(NULL, 0, n, 1, output);
175 }
176 fputs(post, output);
177}
178
c1bb9350 179#define CHUNKSIZE (8192)
a4acb0eb 180#define SLOP (16)
c1bb9350
LT
181
182static void *read_patch_file(int fd, unsigned long *sizep)
183{
184 unsigned long size = 0, alloc = CHUNKSIZE;
185 void *buffer = xmalloc(alloc);
186
187 for (;;) {
8a912bcb 188 ssize_t nr = alloc - size;
c1bb9350
LT
189 if (nr < 1024) {
190 alloc += CHUNKSIZE;
191 buffer = xrealloc(buffer, alloc);
192 nr = alloc - size;
193 }
1d7f171c 194 nr = xread(fd, (char *) buffer + size, nr);
c1bb9350
LT
195 if (!nr)
196 break;
1c15afb9 197 if (nr < 0)
c1bb9350 198 die("git-apply: read returned %s", strerror(errno));
c1bb9350
LT
199 size += nr;
200 }
201 *sizep = size;
a4acb0eb
LT
202
203 /*
204 * Make sure that we have some slop in the buffer
205 * so that we can do speculative "memcmp" etc, and
206 * see to it that it is NUL-filled.
207 */
208 if (alloc < size + SLOP)
209 buffer = xrealloc(buffer, size + SLOP);
1d7f171c 210 memset((char *) buffer + size, 0, SLOP);
c1bb9350
LT
211 return buffer;
212}
213
3cca928d 214static unsigned long linelen(const char *buffer, unsigned long size)
c1bb9350
LT
215{
216 unsigned long len = 0;
217 while (size--) {
218 len++;
219 if (*buffer++ == '\n')
220 break;
221 }
222 return len;
223}
224
a4acb0eb
LT
225static int is_dev_null(const char *str)
226{
227 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
228}
229
381ca9a3
LT
230#define TERM_SPACE 1
231#define TERM_TAB 2
9a4a100e
LT
232
233static int name_terminate(const char *name, int namelen, int c, int terminate)
234{
235 if (c == ' ' && !(terminate & TERM_SPACE))
236 return 0;
237 if (c == '\t' && !(terminate & TERM_TAB))
238 return 0;
239
9a4a100e
LT
240 return 1;
241}
242
56185f49 243static char *find_name(const char *line, char *def, int p_value, int terminate)
c1bb9350 244{
a4acb0eb
LT
245 int len;
246 const char *start = line;
247 char *name;
248
22943f1a
JH
249 if (*line == '"') {
250 /* Proposed "new-style" GNU patch/diff format; see
251 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
252 */
253 name = unquote_c_style(line, NULL);
254 if (name) {
255 char *cp = name;
256 while (p_value) {
257 cp = strchr(name, '/');
258 if (!cp)
259 break;
260 cp++;
261 p_value--;
262 }
263 if (cp) {
264 /* name can later be freed, so we need
265 * to memmove, not just return cp
266 */
267 memmove(name, cp, strlen(cp) + 1);
268 free(def);
269 return name;
270 }
271 else {
272 free(name);
273 name = NULL;
274 }
275 }
276 }
277
c1bb9350 278 for (;;) {
a4acb0eb 279 char c = *line;
9a4a100e
LT
280
281 if (isspace(c)) {
282 if (c == '\n')
283 break;
284 if (name_terminate(start, line-start, c, terminate))
285 break;
286 }
a4acb0eb
LT
287 line++;
288 if (c == '/' && !--p_value)
289 start = line;
290 }
291 if (!start)
292 return def;
293 len = line - start;
294 if (!len)
295 return def;
296
297 /*
298 * Generally we prefer the shorter name, especially
299 * if the other one is just a variation of that with
300 * something else tacked on to the end (ie "file.orig"
301 * or "file~").
302 */
303 if (def) {
304 int deflen = strlen(def);
305 if (deflen < len && !strncmp(start, def, deflen))
306 return def;
c1bb9350 307 }
a4acb0eb
LT
308
309 name = xmalloc(len + 1);
310 memcpy(name, start, len);
311 name[len] = 0;
312 free(def);
313 return name;
314}
315
3e8a5db9
JH
316static int count_slashes(const char *cp)
317{
318 int cnt = 0;
319 char ch;
320
321 while ((ch = *cp++))
322 if (ch == '/')
323 cnt++;
324 return cnt;
325}
326
327/*
328 * Given the string after "--- " or "+++ ", guess the appropriate
329 * p_value for the given patch.
330 */
331static int guess_p_value(const char *nameline)
332{
333 char *name, *cp;
334 int val = -1;
335
336 if (is_dev_null(nameline))
337 return -1;
338 name = find_name(nameline, NULL, 0, TERM_SPACE | TERM_TAB);
339 if (!name)
340 return -1;
341 cp = strchr(name, '/');
342 if (!cp)
343 val = 0;
344 else if (prefix) {
345 /*
346 * Does it begin with "a/$our-prefix" and such? Then this is
347 * very likely to apply to our directory.
348 */
349 if (!strncmp(name, prefix, prefix_length))
350 val = count_slashes(prefix);
351 else {
352 cp++;
353 if (!strncmp(cp, prefix, prefix_length))
354 val = count_slashes(prefix) + 1;
355 }
356 }
357 free(name);
358 return val;
359}
360
a4acb0eb
LT
361/*
362 * Get the name etc info from the --/+++ lines of a traditional patch header
363 *
9a4a100e
LT
364 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
365 * files, we can happily check the index for a match, but for creating a
366 * new file we should try to match whatever "patch" does. I have no idea.
a4acb0eb 367 */
19c58fb8 368static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
a4acb0eb 369{
a4acb0eb
LT
370 char *name;
371
a9486b02
PR
372 first += 4; /* skip "--- " */
373 second += 4; /* skip "+++ " */
3e8a5db9
JH
374 if (!p_value_known) {
375 int p, q;
376 p = guess_p_value(first);
377 q = guess_p_value(second);
378 if (p < 0) p = q;
379 if (0 <= p && p == q) {
380 p_value = p;
381 p_value_known = 1;
382 }
383 }
a4acb0eb 384 if (is_dev_null(first)) {
19c58fb8
LT
385 patch->is_new = 1;
386 patch->is_delete = 0;
5041aa70 387 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
19c58fb8 388 patch->new_name = name;
a4acb0eb 389 } else if (is_dev_null(second)) {
19c58fb8
LT
390 patch->is_new = 0;
391 patch->is_delete = 1;
381ca9a3 392 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
19c58fb8 393 patch->old_name = name;
a4acb0eb 394 } else {
381ca9a3
LT
395 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
396 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
19c58fb8 397 patch->old_name = patch->new_name = name;
a4acb0eb
LT
398 }
399 if (!name)
400 die("unable to find filename in patch at line %d", linenr);
a4acb0eb
LT
401}
402
19c58fb8 403static int gitdiff_hdrend(const char *line, struct patch *patch)
a4acb0eb
LT
404{
405 return -1;
406}
407
1e3f6b6e
LT
408/*
409 * We're anal about diff header consistency, to make
410 * sure that we don't end up having strange ambiguous
411 * patches floating around.
412 *
413 * As a result, gitdiff_{old|new}name() will check
414 * their names against any previous information, just
415 * to make sure..
416 */
417static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
418{
1e3f6b6e 419 if (!orig_name && !isnull)
79ee194e 420 return find_name(line, NULL, p_value, TERM_TAB);
1e3f6b6e 421
1e3f6b6e 422 if (orig_name) {
22943f1a
JH
423 int len;
424 const char *name;
425 char *another;
1e3f6b6e
LT
426 name = orig_name;
427 len = strlen(name);
428 if (isnull)
429 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
79ee194e 430 another = find_name(line, NULL, p_value, TERM_TAB);
22943f1a
JH
431 if (!another || memcmp(another, name, len))
432 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
433 free(another);
1e3f6b6e
LT
434 return orig_name;
435 }
22943f1a
JH
436 else {
437 /* expect "/dev/null" */
438 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
439 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
440 return NULL;
441 }
1e3f6b6e
LT
442}
443
19c58fb8 444static int gitdiff_oldname(const char *line, struct patch *patch)
a4acb0eb 445{
19c58fb8 446 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
a4acb0eb
LT
447 return 0;
448}
449
19c58fb8 450static int gitdiff_newname(const char *line, struct patch *patch)
a4acb0eb 451{
19c58fb8 452 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
a4acb0eb
LT
453 return 0;
454}
455
19c58fb8 456static int gitdiff_oldmode(const char *line, struct patch *patch)
a4acb0eb 457{
19c58fb8 458 patch->old_mode = strtoul(line, NULL, 8);
a4acb0eb
LT
459 return 0;
460}
461
19c58fb8 462static int gitdiff_newmode(const char *line, struct patch *patch)
a4acb0eb 463{
19c58fb8 464 patch->new_mode = strtoul(line, NULL, 8);
a4acb0eb
LT
465 return 0;
466}
467
19c58fb8 468static int gitdiff_delete(const char *line, struct patch *patch)
a4acb0eb 469{
19c58fb8 470 patch->is_delete = 1;
5041aa70 471 patch->old_name = patch->def_name;
19c58fb8 472 return gitdiff_oldmode(line, patch);
a4acb0eb
LT
473}
474
19c58fb8 475static int gitdiff_newfile(const char *line, struct patch *patch)
a4acb0eb 476{
19c58fb8 477 patch->is_new = 1;
5041aa70 478 patch->new_name = patch->def_name;
19c58fb8 479 return gitdiff_newmode(line, patch);
a4acb0eb
LT
480}
481
19c58fb8 482static int gitdiff_copysrc(const char *line, struct patch *patch)
a4acb0eb 483{
19c58fb8
LT
484 patch->is_copy = 1;
485 patch->old_name = find_name(line, NULL, 0, 0);
a4acb0eb
LT
486 return 0;
487}
488
19c58fb8 489static int gitdiff_copydst(const char *line, struct patch *patch)
a4acb0eb 490{
19c58fb8
LT
491 patch->is_copy = 1;
492 patch->new_name = find_name(line, NULL, 0, 0);
a4acb0eb
LT
493 return 0;
494}
495
19c58fb8 496static int gitdiff_renamesrc(const char *line, struct patch *patch)
a4acb0eb 497{
19c58fb8
LT
498 patch->is_rename = 1;
499 patch->old_name = find_name(line, NULL, 0, 0);
a4acb0eb
LT
500 return 0;
501}
502
19c58fb8 503static int gitdiff_renamedst(const char *line, struct patch *patch)
a4acb0eb 504{
19c58fb8
LT
505 patch->is_rename = 1;
506 patch->new_name = find_name(line, NULL, 0, 0);
a4acb0eb
LT
507 return 0;
508}
509
19c58fb8 510static int gitdiff_similarity(const char *line, struct patch *patch)
a4acb0eb 511{
96c912a4
JH
512 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
513 patch->score = 0;
a4acb0eb 514 return 0;
c1bb9350
LT
515}
516
70aadac0
JH
517static int gitdiff_dissimilarity(const char *line, struct patch *patch)
518{
96c912a4
JH
519 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
520 patch->score = 0;
70aadac0
JH
521 return 0;
522}
523
2cf67f1e
JH
524static int gitdiff_index(const char *line, struct patch *patch)
525{
526 /* index line is N hexadecimal, "..", N hexadecimal,
527 * and optional space with octal mode.
528 */
529 const char *ptr, *eol;
530 int len;
531
532 ptr = strchr(line, '.');
9add69b1 533 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
2cf67f1e
JH
534 return 0;
535 len = ptr - line;
536 memcpy(patch->old_sha1_prefix, line, len);
537 patch->old_sha1_prefix[len] = 0;
538
539 line = ptr + 2;
540 ptr = strchr(line, ' ');
541 eol = strchr(line, '\n');
542
543 if (!ptr || eol < ptr)
544 ptr = eol;
545 len = ptr - line;
546
9add69b1 547 if (40 < len)
2cf67f1e
JH
548 return 0;
549 memcpy(patch->new_sha1_prefix, line, len);
550 patch->new_sha1_prefix[len] = 0;
551 if (*ptr == ' ')
552 patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
553 return 0;
554}
555
9a4a100e
LT
556/*
557 * This is normal for a diff that doesn't change anything: we'll fall through
558 * into the next diff. Tell the parser to break out.
559 */
19c58fb8 560static int gitdiff_unrecognized(const char *line, struct patch *patch)
9a4a100e
LT
561{
562 return -1;
563}
564
22943f1a
JH
565static const char *stop_at_slash(const char *line, int llen)
566{
567 int i;
568
569 for (i = 0; i < llen; i++) {
570 int ch = line[i];
571 if (ch == '/')
572 return line + i;
573 }
574 return NULL;
575}
576
577/* This is to extract the same name that appears on "diff --git"
578 * line. We do not find and return anything if it is a rename
579 * patch, and it is OK because we will find the name elsewhere.
580 * We need to reliably find name only when it is mode-change only,
581 * creation or deletion of an empty file. In any of these cases,
582 * both sides are the same name under a/ and b/ respectively.
583 */
584static char *git_header_name(char *line, int llen)
5041aa70
LT
585{
586 int len;
22943f1a
JH
587 const char *name;
588 const char *second = NULL;
5041aa70 589
22943f1a
JH
590 line += strlen("diff --git ");
591 llen -= strlen("diff --git ");
592
593 if (*line == '"') {
594 const char *cp;
595 char *first = unquote_c_style(line, &second);
596 if (!first)
5041aa70 597 return NULL;
22943f1a
JH
598
599 /* advance to the first slash */
600 cp = stop_at_slash(first, strlen(first));
601 if (!cp || cp == first) {
602 /* we do not accept absolute paths */
603 free_first_and_fail:
604 free(first);
605 return NULL;
606 }
607 len = strlen(cp+1);
608 memmove(first, cp+1, len+1); /* including NUL */
609
610 /* second points at one past closing dq of name.
611 * find the second name.
612 */
613 while ((second < line + llen) && isspace(*second))
614 second++;
615
616 if (line + llen <= second)
617 goto free_first_and_fail;
618 if (*second == '"') {
619 char *sp = unquote_c_style(second, NULL);
620 if (!sp)
621 goto free_first_and_fail;
622 cp = stop_at_slash(sp, strlen(sp));
623 if (!cp || cp == sp) {
624 free_both_and_fail:
625 free(sp);
626 goto free_first_and_fail;
627 }
628 /* They must match, otherwise ignore */
629 if (strcmp(cp+1, first))
630 goto free_both_and_fail;
631 free(sp);
632 return first;
633 }
634
635 /* unquoted second */
636 cp = stop_at_slash(second, line + llen - second);
637 if (!cp || cp == second)
638 goto free_first_and_fail;
639 cp++;
640 if (line + llen - cp != len + 1 ||
641 memcmp(first, cp, len))
642 goto free_first_and_fail;
643 return first;
5041aa70
LT
644 }
645
22943f1a
JH
646 /* unquoted first name */
647 name = stop_at_slash(line, llen);
648 if (!name || name == line)
5041aa70
LT
649 return NULL;
650
22943f1a
JH
651 name++;
652
653 /* since the first name is unquoted, a dq if exists must be
654 * the beginning of the second name.
655 */
656 for (second = name; second < line + llen; second++) {
657 if (*second == '"') {
658 const char *cp = second;
659 const char *np;
660 char *sp = unquote_c_style(second, NULL);
661
662 if (!sp)
663 return NULL;
664 np = stop_at_slash(sp, strlen(sp));
665 if (!np || np == sp) {
666 free_second_and_fail:
667 free(sp);
668 return NULL;
669 }
670 np++;
671 len = strlen(np);
672 if (len < cp - name &&
673 !strncmp(np, name, len) &&
674 isspace(name[len])) {
675 /* Good */
676 memmove(sp, np, len + 1);
677 return sp;
678 }
679 goto free_second_and_fail;
680 }
681 }
682
5041aa70
LT
683 /*
684 * Accept a name only if it shows up twice, exactly the same
685 * form.
686 */
687 for (len = 0 ; ; len++) {
dd305c84 688 switch (name[len]) {
5041aa70
LT
689 default:
690 continue;
691 case '\n':
e70a165d 692 return NULL;
5041aa70
LT
693 case '\t': case ' ':
694 second = name+len;
695 for (;;) {
696 char c = *second++;
697 if (c == '\n')
698 return NULL;
699 if (c == '/')
700 break;
701 }
0e87e048 702 if (second[len] == '\n' && !memcmp(name, second, len)) {
5041aa70
LT
703 char *ret = xmalloc(len + 1);
704 memcpy(ret, name, len);
705 ret[len] = 0;
706 return ret;
707 }
708 }
709 }
710 return NULL;
711}
712
c1bb9350 713/* Verify that we recognize the lines following a git header */
19c58fb8 714static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
c1bb9350 715{
a4acb0eb
LT
716 unsigned long offset;
717
718 /* A git diff has explicit new/delete information, so we don't guess */
19c58fb8
LT
719 patch->is_new = 0;
720 patch->is_delete = 0;
a4acb0eb 721
5041aa70
LT
722 /*
723 * Some things may not have the old name in the
724 * rest of the headers anywhere (pure mode changes,
725 * or removing or adding empty files), so we get
726 * the default name from the header.
727 */
22943f1a 728 patch->def_name = git_header_name(line, len);
5041aa70 729
a4acb0eb
LT
730 line += len;
731 size -= len;
732 linenr++;
733 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
734 static const struct opentry {
735 const char *str;
19c58fb8 736 int (*fn)(const char *, struct patch *);
a4acb0eb
LT
737 } optable[] = {
738 { "@@ -", gitdiff_hdrend },
739 { "--- ", gitdiff_oldname },
740 { "+++ ", gitdiff_newname },
741 { "old mode ", gitdiff_oldmode },
742 { "new mode ", gitdiff_newmode },
743 { "deleted file mode ", gitdiff_delete },
744 { "new file mode ", gitdiff_newfile },
745 { "copy from ", gitdiff_copysrc },
746 { "copy to ", gitdiff_copydst },
33f4d087
LT
747 { "rename old ", gitdiff_renamesrc },
748 { "rename new ", gitdiff_renamedst },
dc938417
LT
749 { "rename from ", gitdiff_renamesrc },
750 { "rename to ", gitdiff_renamedst },
a4acb0eb 751 { "similarity index ", gitdiff_similarity },
70aadac0 752 { "dissimilarity index ", gitdiff_dissimilarity },
2cf67f1e 753 { "index ", gitdiff_index },
9a4a100e 754 { "", gitdiff_unrecognized },
a4acb0eb
LT
755 };
756 int i;
c1bb9350 757
c1bb9350 758 len = linelen(line, size);
a4acb0eb 759 if (!len || line[len-1] != '\n')
c1bb9350 760 break;
b4f2a6ac 761 for (i = 0; i < ARRAY_SIZE(optable); i++) {
a4acb0eb
LT
762 const struct opentry *p = optable + i;
763 int oplen = strlen(p->str);
764 if (len < oplen || memcmp(p->str, line, oplen))
765 continue;
19c58fb8 766 if (p->fn(line + oplen, patch) < 0)
a4acb0eb 767 return offset;
9a4a100e 768 break;
a4acb0eb 769 }
c1bb9350
LT
770 }
771
a4acb0eb 772 return offset;
c1bb9350
LT
773}
774
fab2c257 775static int parse_num(const char *line, unsigned long *p)
46979f56
LT
776{
777 char *ptr;
fab2c257
LT
778
779 if (!isdigit(*line))
780 return 0;
781 *p = strtoul(line, &ptr, 10);
782 return ptr - line;
783}
784
785static int parse_range(const char *line, int len, int offset, const char *expect,
786 unsigned long *p1, unsigned long *p2)
787{
46979f56
LT
788 int digits, ex;
789
790 if (offset < 0 || offset >= len)
791 return -1;
792 line += offset;
793 len -= offset;
794
fab2c257
LT
795 digits = parse_num(line, p1);
796 if (!digits)
46979f56 797 return -1;
46979f56
LT
798
799 offset += digits;
800 line += digits;
801 len -= digits;
802
c1504628 803 *p2 = 1;
fab2c257
LT
804 if (*line == ',') {
805 digits = parse_num(line+1, p2);
806 if (!digits)
807 return -1;
808
809 offset += digits+1;
810 line += digits+1;
811 len -= digits+1;
812 }
813
46979f56
LT
814 ex = strlen(expect);
815 if (ex > len)
816 return -1;
817 if (memcmp(line, expect, ex))
818 return -1;
819
820 return offset + ex;
821}
822
823/*
824 * Parse a unified diff fragment header of the
825 * form "@@ -a,b +c,d @@"
826 */
19c58fb8 827static int parse_fragment_header(char *line, int len, struct fragment *fragment)
46979f56
LT
828{
829 int offset;
830
831 if (!len || line[len-1] != '\n')
832 return -1;
833
834 /* Figure out the number of lines in a fragment */
fab2c257
LT
835 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
836 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
46979f56
LT
837
838 return offset;
839}
840
19c58fb8 841static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
c1bb9350
LT
842{
843 unsigned long offset, len;
844
9987d7c5 845 patch->is_toplevel_relative = 0;
19c58fb8
LT
846 patch->is_rename = patch->is_copy = 0;
847 patch->is_new = patch->is_delete = -1;
848 patch->old_mode = patch->new_mode = 0;
849 patch->old_name = patch->new_name = NULL;
46979f56 850 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
c1bb9350
LT
851 unsigned long nextlen;
852
853 len = linelen(line, size);
854 if (!len)
855 break;
856
857 /* Testing this early allows us to take a few shortcuts.. */
858 if (len < 6)
859 continue;
46979f56
LT
860
861 /*
82e5a82f 862 * Make sure we don't find any unconnected patch fragments.
46979f56
LT
863 * That's a sign that we didn't find a header, and that a
864 * patch has become corrupted/broken up.
865 */
866 if (!memcmp("@@ -", line, 4)) {
19c58fb8
LT
867 struct fragment dummy;
868 if (parse_fragment_header(line, len, &dummy) < 0)
46979f56 869 continue;
65341411
JH
870 die("patch fragment without header at line %d: %.*s",
871 linenr, (int)len-1, line);
46979f56
LT
872 }
873
c1bb9350
LT
874 if (size < len + 6)
875 break;
876
877 /*
878 * Git patch? It might not have a real patch, just a rename
879 * or mode change, so we handle that specially
880 */
881 if (!memcmp("diff --git ", line, 11)) {
19c58fb8 882 int git_hdr_len = parse_git_header(line, len, size, patch);
206de27e 883 if (git_hdr_len <= len)
c1bb9350 884 continue;
b7e8039a
LT
885 if (!patch->old_name && !patch->new_name) {
886 if (!patch->def_name)
887 die("git diff header lacks filename information (line %d)", linenr);
888 patch->old_name = patch->new_name = patch->def_name;
889 }
9987d7c5 890 patch->is_toplevel_relative = 1;
a4acb0eb 891 *hdrsize = git_hdr_len;
c1bb9350
LT
892 return offset;
893 }
894
895 /** --- followed by +++ ? */
896 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
897 continue;
898
899 /*
900 * We only accept unified patches, so we want it to
901 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
902 * minimum
903 */
904 nextlen = linelen(line + len, size - len);
905 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
906 continue;
907
908 /* Ok, we'll consider it a patch */
19c58fb8 909 parse_traditional_patch(line, line+len, patch);
c1bb9350 910 *hdrsize = len + nextlen;
46979f56 911 linenr += 2;
c1bb9350
LT
912 return offset;
913 }
914 return -1;
915}
916
d0c25035
JH
917static void check_whitespace(const char *line, int len)
918{
919 const char *err = "Adds trailing whitespace";
920 int seen_space = 0;
921 int i;
922
923 /*
924 * We know len is at least two, since we have a '+' and we
925 * checked that the last character was a '\n' before calling
926 * this function. That is, an addition of an empty line would
927 * check the '+' here. Sneaky...
928 */
929 if (isspace(line[len-2]))
930 goto error;
931
932 /*
933 * Make sure that there is no space followed by a tab in
934 * indentation.
935 */
936 err = "Space in indent is followed by a tab";
937 for (i = 1; i < len; i++) {
938 if (line[i] == '\t') {
939 if (seen_space)
940 goto error;
941 }
942 else if (line[i] == ' ')
943 seen_space = 1;
944 else
945 break;
946 }
947 return;
948
949 error:
950 whitespace_error++;
951 if (squelch_whitespace_errors &&
952 squelch_whitespace_errors < whitespace_error)
953 ;
954 else
955 fprintf(stderr, "%s.\n%s:%d:%.*s\n",
956 err, patch_input_file, linenr, len-2, line+1);
957}
958
959
c1bb9350 960/*
4be60962
JH
961 * Parse a unified diff. Note that this really needs to parse each
962 * fragment separately, since the only way to know the difference
963 * between a "---" that is part of a patch, and a "---" that starts
964 * the next patch is to look at the line counts..
c1bb9350 965 */
19c58fb8 966static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
c1bb9350 967{
3f40315a 968 int added, deleted;
c1bb9350 969 int len = linelen(line, size), offset;
30996652 970 unsigned long oldlines, newlines;
47495887 971 unsigned long leading, trailing;
c1bb9350 972
19c58fb8 973 offset = parse_fragment_header(line, len, fragment);
c1bb9350
LT
974 if (offset < 0)
975 return -1;
19c58fb8
LT
976 oldlines = fragment->oldlines;
977 newlines = fragment->newlines;
47495887
EB
978 leading = 0;
979 trailing = 0;
c1bb9350
LT
980
981 /* Parse the thing.. */
982 line += len;
983 size -= len;
46979f56 984 linenr++;
3f40315a 985 added = deleted = 0;
4be60962
JH
986 for (offset = len;
987 0 < size;
988 offset += len, size -= len, line += len, linenr++) {
c1bb9350
LT
989 if (!oldlines && !newlines)
990 break;
991 len = linelen(line, size);
992 if (!len || line[len-1] != '\n')
993 return -1;
994 switch (*line) {
995 default:
996 return -1;
b507b465 997 case '\n': /* newer GNU diff, an empty context line */
c1bb9350
LT
998 case ' ':
999 oldlines--;
1000 newlines--;
47495887
EB
1001 if (!deleted && !added)
1002 leading++;
1003 trailing++;
c1bb9350
LT
1004 break;
1005 case '-':
5fda48d6
JS
1006 if (apply_in_reverse &&
1007 new_whitespace != nowarn_whitespace)
1008 check_whitespace(line, len);
3f40315a 1009 deleted++;
c1bb9350 1010 oldlines--;
47495887 1011 trailing = 0;
c1bb9350
LT
1012 break;
1013 case '+':
5fda48d6
JS
1014 if (!apply_in_reverse &&
1015 new_whitespace != nowarn_whitespace)
d0c25035 1016 check_whitespace(line, len);
3f40315a 1017 added++;
c1bb9350 1018 newlines--;
47495887 1019 trailing = 0;
c1bb9350 1020 break;
433ef8a2
FK
1021
1022 /* We allow "\ No newline at end of file". Depending
1023 * on locale settings when the patch was produced we
1024 * don't know what this line looks like. The only
56d33b11
JH
1025 * thing we do know is that it begins with "\ ".
1026 * Checking for 12 is just for sanity check -- any
1027 * l10n of "\ No newline..." is at least that long.
1028 */
fab2c257 1029 case '\\':
433ef8a2 1030 if (len < 12 || memcmp(line, "\\ ", 2))
3cca928d 1031 return -1;
fab2c257 1032 break;
c1bb9350
LT
1033 }
1034 }
c1504628
LT
1035 if (oldlines || newlines)
1036 return -1;
47495887
EB
1037 fragment->leading = leading;
1038 fragment->trailing = trailing;
1039
8b64647d
JH
1040 /* If a fragment ends with an incomplete line, we failed to include
1041 * it in the above loop because we hit oldlines == newlines == 0
1042 * before seeing it.
1043 */
433ef8a2 1044 if (12 < size && !memcmp(line, "\\ ", 2))
8b64647d
JH
1045 offset += linelen(line, size);
1046
3f40315a
LT
1047 patch->lines_added += added;
1048 patch->lines_deleted += deleted;
4be60962
JH
1049
1050 if (0 < patch->is_new && oldlines)
1051 return error("new file depends on old contents");
1052 if (0 < patch->is_delete && newlines)
1053 return error("deleted file still has contents");
c1bb9350
LT
1054 return offset;
1055}
1056
19c58fb8 1057static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
c1bb9350
LT
1058{
1059 unsigned long offset = 0;
4be60962 1060 unsigned long oldlines = 0, newlines = 0, context = 0;
19c58fb8 1061 struct fragment **fragp = &patch->fragments;
c1bb9350
LT
1062
1063 while (size > 4 && !memcmp(line, "@@ -", 4)) {
19c58fb8
LT
1064 struct fragment *fragment;
1065 int len;
1066
90321c10 1067 fragment = xcalloc(1, sizeof(*fragment));
19c58fb8 1068 len = parse_fragment(line, size, patch, fragment);
c1bb9350 1069 if (len <= 0)
46979f56 1070 die("corrupt patch at line %d", linenr);
19c58fb8
LT
1071 fragment->patch = line;
1072 fragment->size = len;
4be60962
JH
1073 oldlines += fragment->oldlines;
1074 newlines += fragment->newlines;
1075 context += fragment->leading + fragment->trailing;
19c58fb8
LT
1076
1077 *fragp = fragment;
1078 fragp = &fragment->next;
c1bb9350
LT
1079
1080 offset += len;
1081 line += len;
1082 size -= len;
1083 }
4be60962
JH
1084
1085 /*
1086 * If something was removed (i.e. we have old-lines) it cannot
1087 * be creation, and if something was added it cannot be
1088 * deletion. However, the reverse is not true; --unified=0
1089 * patches that only add are not necessarily creation even
1090 * though they do not have any old lines, and ones that only
1091 * delete are not necessarily deletion.
1092 *
1093 * Unfortunately, a real creation/deletion patch do _not_ have
1094 * any context line by definition, so we cannot safely tell it
1095 * apart with --unified=0 insanity. At least if the patch has
1096 * more than one hunk it is not creation or deletion.
1097 */
1098 if (patch->is_new < 0 &&
1099 (oldlines || (patch->fragments && patch->fragments->next)))
1100 patch->is_new = 0;
1101 if (patch->is_delete < 0 &&
1102 (newlines || (patch->fragments && patch->fragments->next)))
1103 patch->is_delete = 0;
1104 if (!unidiff_zero || context) {
1105 /* If the user says the patch is not generated with
1106 * --unified=0, or if we have seen context lines,
1107 * then not having oldlines means the patch is creation,
1108 * and not having newlines means the patch is deletion.
1109 */
6f9f3b26 1110 if (patch->is_new < 0 && !oldlines) {
4be60962 1111 patch->is_new = 1;
6f9f3b26
JH
1112 patch->old_name = NULL;
1113 }
1114 if (patch->is_delete < 0 && !newlines) {
4be60962 1115 patch->is_delete = 1;
6f9f3b26
JH
1116 patch->new_name = NULL;
1117 }
4be60962
JH
1118 }
1119
1120 if (0 < patch->is_new && oldlines)
1121 die("new file %s depends on old contents", patch->new_name);
1122 if (0 < patch->is_delete && newlines)
1123 die("deleted file %s still has contents", patch->old_name);
1124 if (!patch->is_delete && !newlines && context)
1125 fprintf(stderr, "** warning: file %s becomes empty but "
1126 "is not deleted\n", patch->new_name);
1127
c1bb9350
LT
1128 return offset;
1129}
1130
1fea629f
LT
1131static inline int metadata_changes(struct patch *patch)
1132{
1133 return patch->is_rename > 0 ||
1134 patch->is_copy > 0 ||
1135 patch->is_new > 0 ||
1136 patch->is_delete ||
1137 (patch->old_mode && patch->new_mode &&
1138 patch->old_mode != patch->new_mode);
1139}
1140
3cd4f5e8
JH
1141static char *inflate_it(const void *data, unsigned long size,
1142 unsigned long inflated_size)
051308f6 1143{
3cd4f5e8
JH
1144 z_stream stream;
1145 void *out;
1146 int st;
1147
1148 memset(&stream, 0, sizeof(stream));
1149
1150 stream.next_in = (unsigned char *)data;
1151 stream.avail_in = size;
1152 stream.next_out = out = xmalloc(inflated_size);
1153 stream.avail_out = inflated_size;
1154 inflateInit(&stream);
1155 st = inflate(&stream, Z_FINISH);
1156 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1157 free(out);
1158 return NULL;
1159 }
1160 return out;
1161}
1162
1163static struct fragment *parse_binary_hunk(char **buf_p,
1164 unsigned long *sz_p,
1165 int *status_p,
1166 int *used_p)
1167{
1168 /* Expect a line that begins with binary patch method ("literal"
1169 * or "delta"), followed by the length of data before deflating.
1170 * a sequence of 'length-byte' followed by base-85 encoded data
1171 * should follow, terminated by a newline.
051308f6
JH
1172 *
1173 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1174 * and we would limit the patch line to 66 characters,
1175 * so one line can fit up to 13 groups that would decode
1176 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1177 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
051308f6
JH
1178 */
1179 int llen, used;
3cd4f5e8
JH
1180 unsigned long size = *sz_p;
1181 char *buffer = *buf_p;
1182 int patch_method;
1183 unsigned long origlen;
0660626c 1184 char *data = NULL;
3cd4f5e8
JH
1185 int hunk_size = 0;
1186 struct fragment *frag;
051308f6 1187
0660626c
JH
1188 llen = linelen(buffer, size);
1189 used = llen;
3cd4f5e8
JH
1190
1191 *status_p = 0;
0660626c 1192
cc44c765 1193 if (!prefixcmp(buffer, "delta ")) {
3cd4f5e8
JH
1194 patch_method = BINARY_DELTA_DEFLATED;
1195 origlen = strtoul(buffer + 6, NULL, 10);
0660626c 1196 }
cc44c765 1197 else if (!prefixcmp(buffer, "literal ")) {
3cd4f5e8
JH
1198 patch_method = BINARY_LITERAL_DEFLATED;
1199 origlen = strtoul(buffer + 8, NULL, 10);
0660626c
JH
1200 }
1201 else
3cd4f5e8
JH
1202 return NULL;
1203
1204 linenr++;
0660626c 1205 buffer += llen;
051308f6
JH
1206 while (1) {
1207 int byte_length, max_byte_length, newsize;
1208 llen = linelen(buffer, size);
1209 used += llen;
1210 linenr++;
03eb8f8a
JH
1211 if (llen == 1) {
1212 /* consume the blank line */
1213 buffer++;
1214 size--;
051308f6 1215 break;
03eb8f8a 1216 }
051308f6
JH
1217 /* Minimum line is "A00000\n" which is 7-byte long,
1218 * and the line length must be multiple of 5 plus 2.
1219 */
1220 if ((llen < 7) || (llen-2) % 5)
1221 goto corrupt;
1222 max_byte_length = (llen - 2) / 5 * 4;
1223 byte_length = *buffer;
1224 if ('A' <= byte_length && byte_length <= 'Z')
1225 byte_length = byte_length - 'A' + 1;
1226 else if ('a' <= byte_length && byte_length <= 'z')
1227 byte_length = byte_length - 'a' + 27;
1228 else
1229 goto corrupt;
1230 /* if the input length was not multiple of 4, we would
1231 * have filler at the end but the filler should never
1232 * exceed 3 bytes
1233 */
1234 if (max_byte_length < byte_length ||
1235 byte_length <= max_byte_length - 4)
1236 goto corrupt;
3cd4f5e8 1237 newsize = hunk_size + byte_length;
0660626c 1238 data = xrealloc(data, newsize);
3cd4f5e8 1239 if (decode_85(data + hunk_size, buffer + 1, byte_length))
051308f6 1240 goto corrupt;
3cd4f5e8 1241 hunk_size = newsize;
051308f6
JH
1242 buffer += llen;
1243 size -= llen;
1244 }
3cd4f5e8
JH
1245
1246 frag = xcalloc(1, sizeof(*frag));
1247 frag->patch = inflate_it(data, hunk_size, origlen);
1248 if (!frag->patch)
1249 goto corrupt;
1250 free(data);
1251 frag->size = origlen;
1252 *buf_p = buffer;
1253 *sz_p = size;
1254 *used_p = used;
1255 frag->binary_patch_method = patch_method;
1256 return frag;
1257
051308f6 1258 corrupt:
4cac42b1 1259 free(data);
3cd4f5e8
JH
1260 *status_p = -1;
1261 error("corrupt binary patch at line %d: %.*s",
1262 linenr-1, llen-1, buffer);
1263 return NULL;
1264}
1265
1266static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1267{
1268 /* We have read "GIT binary patch\n"; what follows is a line
1269 * that says the patch method (currently, either "literal" or
1270 * "delta") and the length of data before deflating; a
1271 * sequence of 'length-byte' followed by base-85 encoded data
1272 * follows.
1273 *
1274 * When a binary patch is reversible, there is another binary
1275 * hunk in the same format, starting with patch method (either
1276 * "literal" or "delta") with the length of data, and a sequence
1277 * of length-byte + base-85 encoded data, terminated with another
1278 * empty line. This data, when applied to the postimage, produces
1279 * the preimage.
1280 */
1281 struct fragment *forward;
1282 struct fragment *reverse;
1283 int status;
1284 int used, used_1;
1285
1286 forward = parse_binary_hunk(&buffer, &size, &status, &used);
1287 if (!forward && !status)
1288 /* there has to be one hunk (forward hunk) */
1289 return error("unrecognized binary patch at line %d", linenr-1);
1290 if (status)
1291 /* otherwise we already gave an error message */
1292 return status;
1293
1294 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1295 if (reverse)
1296 used += used_1;
1297 else if (status) {
1298 /* not having reverse hunk is not an error, but having
1299 * a corrupt reverse hunk is.
1300 */
1301 free((void*) forward->patch);
1302 free(forward);
1303 return status;
1304 }
1305 forward->next = reverse;
1306 patch->fragments = forward;
1307 patch->is_binary = 1;
1308 return used;
051308f6
JH
1309}
1310
19c58fb8 1311static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
c1bb9350
LT
1312{
1313 int hdrsize, patchsize;
19c58fb8 1314 int offset = find_header(buffer, size, &hdrsize, patch);
c1bb9350
LT
1315
1316 if (offset < 0)
1317 return offset;
c1bb9350 1318
19c58fb8 1319 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
c1bb9350 1320
92927ed0 1321 if (!patchsize) {
3200d1ae
JH
1322 static const char *binhdr[] = {
1323 "Binary files ",
1324 "Files ",
1325 NULL,
1326 };
051308f6 1327 static const char git_binary[] = "GIT binary patch\n";
3200d1ae
JH
1328 int i;
1329 int hd = hdrsize + offset;
1330 unsigned long llen = linelen(buffer + hd, size - hd);
1331
051308f6
JH
1332 if (llen == sizeof(git_binary) - 1 &&
1333 !memcmp(git_binary, buffer + hd, llen)) {
1334 int used;
1335 linenr++;
1336 used = parse_binary(buffer + hd + llen,
1337 size - hd - llen, patch);
1338 if (used)
1339 patchsize = used + llen;
1340 else
1341 patchsize = 0;
1342 }
1343 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
3200d1ae
JH
1344 for (i = 0; binhdr[i]; i++) {
1345 int len = strlen(binhdr[i]);
1346 if (len < size - hd &&
1347 !memcmp(binhdr[i], buffer + hd, len)) {
051308f6 1348 linenr++;
3200d1ae 1349 patch->is_binary = 1;
051308f6 1350 patchsize = llen;
3200d1ae
JH
1351 break;
1352 }
1353 }
051308f6 1354 }
ff36de08 1355
2b6eef94
JH
1356 /* Empty patch cannot be applied if it is a text patch
1357 * without metadata change. A binary patch appears
1358 * empty to us here.
92927ed0
JH
1359 */
1360 if ((apply || check) &&
2b6eef94 1361 (!patch->is_binary && !metadata_changes(patch)))
ff36de08
JH
1362 die("patch with only garbage at line %d", linenr);
1363 }
1fea629f 1364
c1bb9350
LT
1365 return offset + hdrsize + patchsize;
1366}
1367
e5a94313
JS
1368#define swap(a,b) myswap((a),(b),sizeof(a))
1369
1370#define myswap(a, b, size) do { \
1371 unsigned char mytmp[size]; \
1372 memcpy(mytmp, &a, size); \
1373 memcpy(&a, &b, size); \
1374 memcpy(&b, mytmp, size); \
1375} while (0)
1376
1377static void reverse_patches(struct patch *p)
1378{
1379 for (; p; p = p->next) {
1380 struct fragment *frag = p->fragments;
1381
1382 swap(p->new_name, p->old_name);
1383 swap(p->new_mode, p->old_mode);
1384 swap(p->is_new, p->is_delete);
1385 swap(p->lines_added, p->lines_deleted);
1386 swap(p->old_sha1_prefix, p->new_sha1_prefix);
1387
1388 for (; frag; frag = frag->next) {
1389 swap(frag->newpos, frag->oldpos);
1390 swap(frag->newlines, frag->oldlines);
1391 }
e5a94313
JS
1392 }
1393}
1394
6da4016a
LT
1395static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1396static const char minuses[]= "----------------------------------------------------------------------";
3f40315a
LT
1397
1398static void show_stats(struct patch *patch)
1399{
62917097 1400 const char *prefix = "";
03b4538b 1401 char *name = patch->new_name;
22943f1a 1402 char *qname = NULL;
95bedc9e 1403 int len, max, add, del, total;
3f40315a 1404
5041aa70 1405 if (!name)
03b4538b 1406 name = patch->old_name;
3f40315a 1407
22943f1a
JH
1408 if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
1409 qname = xmalloc(len + 1);
1410 quote_c_style(name, qname, NULL, 0);
1411 name = qname;
1412 }
1413
3f40315a
LT
1414 /*
1415 * "scale" the filename
1416 */
1417 len = strlen(name);
1418 max = max_len;
1419 if (max > 50)
1420 max = 50;
62917097
LT
1421 if (len > max) {
1422 char *slash;
1423 prefix = "...";
1424 max -= 3;
3f40315a 1425 name += len - max;
62917097
LT
1426 slash = strchr(name, '/');
1427 if (slash)
1428 name = slash;
1429 }
3f40315a
LT
1430 len = max;
1431
1432 /*
1433 * scale the add/delete
1434 */
1435 max = max_change;
1436 if (max + len > 70)
1437 max = 70 - len;
95bedc9e
LT
1438
1439 add = patch->lines_added;
1440 del = patch->lines_deleted;
1441 total = add + del;
1442
69f956e1
SV
1443 if (max_change > 0) {
1444 total = (total * max + max_change / 2) / max_change;
1445 add = (add * max + max_change / 2) / max_change;
1446 del = total - add;
1447 }
ff36de08
JH
1448 if (patch->is_binary)
1449 printf(" %s%-*s | Bin\n", prefix, len, name);
1450 else
1451 printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
1452 len, name, patch->lines_added + patch->lines_deleted,
1453 add, pluses, del, minuses);
4cac42b1 1454 free(qname);
3f40315a
LT
1455}
1456
67160271 1457static int read_old_data(struct stat *st, const char *path, char **buf_p, unsigned long *alloc_p, unsigned long *size_p)
3cca928d
LT
1458{
1459 int fd;
1460 unsigned long got;
67160271
JH
1461 unsigned long nsize;
1462 char *nbuf;
1463 unsigned long size = *size_p;
1464 char *buf = *buf_p;
3cca928d
LT
1465
1466 switch (st->st_mode & S_IFMT) {
1467 case S_IFLNK:
67160271 1468 return readlink(path, buf, size) != size;
3cca928d
LT
1469 case S_IFREG:
1470 fd = open(path, O_RDONLY);
1471 if (fd < 0)
1472 return error("unable to open %s", path);
1473 got = 0;
1474 for (;;) {
8a912bcb 1475 ssize_t ret = xread(fd, buf + got, size - got);
1c15afb9 1476 if (ret <= 0)
3cca928d
LT
1477 break;
1478 got += ret;
1479 }
1480 close(fd);
67160271 1481 nsize = got;
ac78e548
AR
1482 nbuf = convert_to_git(path, buf, &nsize);
1483 if (nbuf) {
67160271
JH
1484 free(buf);
1485 *buf_p = nbuf;
1486 *alloc_p = nsize;
1487 *size_p = nsize;
1488 }
1489 return got != size;
3cca928d
LT
1490 default:
1491 return -1;
1492 }
1493}
1494
47495887 1495static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line, int *lines)
3cca928d 1496{
6e7c92a9
LT
1497 int i;
1498 unsigned long start, backwards, forwards;
3cca928d
LT
1499
1500 if (fragsize > size)
1501 return -1;
1502
1503 start = 0;
1504 if (line > 1) {
3cca928d 1505 unsigned long offset = 0;
6e7c92a9
LT
1506 i = line-1;
1507 while (offset + fragsize <= size) {
3cca928d
LT
1508 if (buf[offset++] == '\n') {
1509 start = offset;
6e7c92a9 1510 if (!--i)
3cca928d
LT
1511 break;
1512 }
1513 }
1514 }
1515
1516 /* Exact line number? */
6b763c42
JH
1517 if ((start + fragsize <= size) &&
1518 !memcmp(buf + start, fragment, fragsize))
3cca928d
LT
1519 return start;
1520
6e7c92a9
LT
1521 /*
1522 * There's probably some smart way to do this, but I'll leave
1523 * that to the smart and beautiful people. I'm simple and stupid.
1524 */
1525 backwards = start;
1526 forwards = start;
1527 for (i = 0; ; i++) {
1528 unsigned long try;
1529 int n;
1530
1531 /* "backward" */
1532 if (i & 1) {
1533 if (!backwards) {
1534 if (forwards + fragsize > size)
1535 break;
1536 continue;
1537 }
1538 do {
1539 --backwards;
1540 } while (backwards && buf[backwards-1] != '\n');
1541 try = backwards;
1542 } else {
1543 while (forwards + fragsize <= size) {
1544 if (buf[forwards++] == '\n')
1545 break;
1546 }
1547 try = forwards;
1548 }
1549
1550 if (try + fragsize > size)
1551 continue;
1552 if (memcmp(buf + try, fragment, fragsize))
1553 continue;
1554 n = (i >> 1)+1;
1555 if (i & 1)
1556 n = -n;
47495887 1557 *lines = n;
6e7c92a9
LT
1558 return try;
1559 }
1560
3cca928d
LT
1561 /*
1562 * We should start searching forward and backward.
1563 */
1564 return -1;
1565}
1566
47495887
EB
1567static void remove_first_line(const char **rbuf, int *rsize)
1568{
1569 const char *buf = *rbuf;
1570 int size = *rsize;
1571 unsigned long offset;
1572 offset = 0;
1573 while (offset <= size) {
1574 if (buf[offset++] == '\n')
1575 break;
1576 }
1577 *rsize = size - offset;
1578 *rbuf = buf + offset;
1579}
1580
1581static void remove_last_line(const char **rbuf, int *rsize)
1582{
1583 const char *buf = *rbuf;
1584 int size = *rsize;
1585 unsigned long offset;
1586 offset = size - 1;
1587 while (offset > 0) {
1588 if (buf[--offset] == '\n')
1589 break;
1590 }
1591 *rsize = offset + 1;
1592}
1593
6e7c92a9
LT
1594struct buffer_desc {
1595 char *buffer;
1596 unsigned long size;
1597 unsigned long alloc;
1598};
1599
b5767dd6
JH
1600static int apply_line(char *output, const char *patch, int plen)
1601{
1602 /* plen is number of bytes to be copied from patch,
1603 * starting at patch+1 (patch[0] is '+'). Typically
d0c25035
JH
1604 * patch[plen] is '\n', unless this is the incomplete
1605 * last line.
b5767dd6 1606 */
d0c25035 1607 int i;
b5767dd6 1608 int add_nl_to_tail = 0;
d0c25035
JH
1609 int fixed = 0;
1610 int last_tab_in_indent = -1;
1611 int last_space_in_indent = -1;
1612 int need_fix_leading_space = 0;
1613 char *buf;
1614
63e50d49
JH
1615 if ((new_whitespace != strip_whitespace) || !whitespace_error ||
1616 *patch != '+') {
d0c25035
JH
1617 memcpy(output, patch + 1, plen);
1618 return plen;
1619 }
1620
1621 if (1 < plen && isspace(patch[plen-1])) {
b5767dd6
JH
1622 if (patch[plen] == '\n')
1623 add_nl_to_tail = 1;
1624 plen--;
1625 while (0 < plen && isspace(patch[plen]))
1626 plen--;
d0c25035 1627 fixed = 1;
b5767dd6 1628 }
d0c25035
JH
1629
1630 for (i = 1; i < plen; i++) {
1631 char ch = patch[i];
1632 if (ch == '\t') {
1633 last_tab_in_indent = i;
1634 if (0 <= last_space_in_indent)
1635 need_fix_leading_space = 1;
1636 }
1637 else if (ch == ' ')
1638 last_space_in_indent = i;
1639 else
1640 break;
1641 }
1642
1643 buf = output;
1644 if (need_fix_leading_space) {
1645 /* between patch[1..last_tab_in_indent] strip the
1646 * funny spaces, updating them to tab as needed.
1647 */
1648 for (i = 1; i < last_tab_in_indent; i++, plen--) {
1649 char ch = patch[i];
1650 if (ch != ' ')
1651 *output++ = ch;
1652 else if ((i % 8) == 0)
1653 *output++ = '\t';
1654 }
1655 fixed = 1;
1656 i = last_tab_in_indent;
1657 }
1658 else
1659 i = 1;
1660
1661 memcpy(output, patch + i, plen);
b5767dd6
JH
1662 if (add_nl_to_tail)
1663 output[plen++] = '\n';
d0c25035 1664 if (fixed)
c94bf41c 1665 applied_after_fixing_ws++;
d0c25035 1666 return output + plen - buf;
b5767dd6
JH
1667}
1668
f686d030 1669static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag, int inaccurate_eof)
3cca928d 1670{
65aadb92 1671 int match_beginning, match_end;
6e7c92a9 1672 char *buf = desc->buffer;
3cca928d
LT
1673 const char *patch = frag->patch;
1674 int offset, size = frag->size;
1675 char *old = xmalloc(size);
1676 char *new = xmalloc(size);
47495887 1677 const char *oldlines, *newlines;
3cca928d 1678 int oldsize = 0, newsize = 0;
077e1af5 1679 int new_blank_lines_at_end = 0;
47495887
EB
1680 unsigned long leading, trailing;
1681 int pos, lines;
3cca928d
LT
1682
1683 while (size > 0) {
e5a94313 1684 char first;
3cca928d
LT
1685 int len = linelen(patch, size);
1686 int plen;
077e1af5 1687 int added_blank_line = 0;
3cca928d
LT
1688
1689 if (!len)
1690 break;
1691
1692 /*
1693 * "plen" is how much of the line we should use for
1694 * the actual patch data. Normally we just remove the
1695 * first character on the line, but if the line is
1696 * followed by "\ No newline", then we also remove the
1697 * last one (which is the newline, of course).
1698 */
1699 plen = len-1;
8b64647d 1700 if (len < size && patch[len] == '\\')
3cca928d 1701 plen--;
e5a94313 1702 first = *patch;
f686d030 1703 if (apply_in_reverse) {
e5a94313
JS
1704 if (first == '-')
1705 first = '+';
1706 else if (first == '+')
1707 first = '-';
1708 }
efe7f358 1709
e5a94313 1710 switch (first) {
b507b465
LT
1711 case '\n':
1712 /* Newer GNU diff, empty context line */
1713 if (plen < 0)
1714 /* ... followed by '\No newline'; nothing */
1715 break;
1716 old[oldsize++] = '\n';
1717 new[newsize++] = '\n';
1718 break;
3cca928d
LT
1719 case ' ':
1720 case '-':
1721 memcpy(old + oldsize, patch + 1, plen);
1722 oldsize += plen;
e5a94313 1723 if (first == '-')
3cca928d
LT
1724 break;
1725 /* Fall-through for ' ' */
1726 case '+':
077e1af5
JH
1727 if (first != '+' || !no_add) {
1728 int added = apply_line(new + newsize, patch,
1729 plen);
1730 newsize += added;
1731 if (first == '+' &&
1732 added == 1 && new[newsize-1] == '\n')
1733 added_blank_line = 1;
1734 }
3cca928d
LT
1735 break;
1736 case '@': case '\\':
1737 /* Ignore it, we already handled it */
1738 break;
1739 default:
aeabfa07
JS
1740 if (apply_verbosely)
1741 error("invalid start of line: '%c'", first);
3cca928d
LT
1742 return -1;
1743 }
077e1af5
JH
1744 if (added_blank_line)
1745 new_blank_lines_at_end++;
1746 else
1747 new_blank_lines_at_end = 0;
3cca928d
LT
1748 patch += len;
1749 size -= len;
1750 }
1751
3eaa38da 1752 if (inaccurate_eof && oldsize > 0 && old[oldsize - 1] == '\n' &&
5b5d4d9e
JS
1753 newsize > 0 && new[newsize - 1] == '\n') {
1754 oldsize--;
1755 newsize--;
1756 }
47495887
EB
1757
1758 oldlines = old;
1759 newlines = new;
1760 leading = frag->leading;
1761 trailing = frag->trailing;
1bf1a859
LT
1762
1763 /*
65aadb92
JH
1764 * If we don't have any leading/trailing data in the patch,
1765 * we want it to match at the beginning/end of the file.
4be60962
JH
1766 *
1767 * But that would break if the patch is generated with
1768 * --unified=0; sane people wouldn't do that to cause us
1769 * trouble, but we try to please not so sane ones as well.
1bf1a859 1770 */
4be60962
JH
1771 if (unidiff_zero) {
1772 match_beginning = (!leading && !frag->oldpos);
1773 match_end = 0;
1774 }
1775 else {
1776 match_beginning = !leading && (frag->oldpos == 1);
1777 match_end = !trailing;
1778 }
1bf1a859 1779
47495887
EB
1780 lines = 0;
1781 pos = frag->newpos;
1782 for (;;) {
57dc397c
JH
1783 offset = find_offset(buf, desc->size,
1784 oldlines, oldsize, pos, &lines);
1bf1a859
LT
1785 if (match_end && offset + oldsize != desc->size)
1786 offset = -1;
65aadb92
JH
1787 if (match_beginning && offset)
1788 offset = -1;
47495887 1789 if (offset >= 0) {
efe7f358
MC
1790 int diff;
1791 unsigned long size, alloc;
1792
1793 if (new_whitespace == strip_whitespace &&
1794 (desc->size - oldsize - offset == 0)) /* end of file? */
077e1af5 1795 newsize -= new_blank_lines_at_end;
efe7f358
MC
1796
1797 diff = newsize - oldsize;
1798 size = desc->size + diff;
1799 alloc = desc->alloc;
47495887
EB
1800
1801 /* Warn if it was necessary to reduce the number
1802 * of context lines.
1803 */
57dc397c
JH
1804 if ((leading != frag->leading) ||
1805 (trailing != frag->trailing))
1806 fprintf(stderr, "Context reduced to (%ld/%ld)"
1807 " to apply fragment at %d\n",
47495887
EB
1808 leading, trailing, pos + lines);
1809
1810 if (size > alloc) {
1811 alloc = size + 8192;
1812 desc->alloc = alloc;
1813 buf = xrealloc(buf, alloc);
1814 desc->buffer = buf;
1815 }
1816 desc->size = size;
57dc397c
JH
1817 memmove(buf + offset + newsize,
1818 buf + offset + oldsize,
1819 size - offset - newsize);
47495887
EB
1820 memcpy(buf + offset, newlines, newsize);
1821 offset = 0;
1822
1823 break;
1824 }
1825
1826 /* Am I at my context limits? */
1827 if ((leading <= p_context) && (trailing <= p_context))
1828 break;
65aadb92
JH
1829 if (match_beginning || match_end) {
1830 match_beginning = match_end = 0;
1bf1a859
LT
1831 continue;
1832 }
47495887
EB
1833 /* Reduce the number of context lines
1834 * Reduce both leading and trailing if they are equal
1835 * otherwise just reduce the larger context.
1836 */
1837 if (leading >= trailing) {
1838 remove_first_line(&oldlines, &oldsize);
1839 remove_first_line(&newlines, &newsize);
1840 pos--;
1841 leading--;
1842 }
1843 if (trailing > leading) {
1844 remove_last_line(&oldlines, &oldsize);
1845 remove_last_line(&newlines, &newsize);
1846 trailing--;
6e7c92a9 1847 }
3cca928d
LT
1848 }
1849
aeabfa07
JS
1850 if (offset && apply_verbosely)
1851 error("while searching for:\n%.*s", oldsize, oldlines);
1852
3cca928d
LT
1853 free(old);
1854 free(new);
1855 return offset;
1856}
1857
0660626c
JH
1858static int apply_binary_fragment(struct buffer_desc *desc, struct patch *patch)
1859{
1860 unsigned long dst_size;
1861 struct fragment *fragment = patch->fragments;
1862 void *data;
1863 void *result;
1864
3cd4f5e8
JH
1865 /* Binary patch is irreversible without the optional second hunk */
1866 if (apply_in_reverse) {
1867 if (!fragment->next)
1868 return error("cannot reverse-apply a binary patch "
1869 "without the reverse hunk to '%s'",
1870 patch->new_name
1871 ? patch->new_name : patch->old_name);
03eb8f8a 1872 fragment = fragment->next;
3cd4f5e8
JH
1873 }
1874 data = (void*) fragment->patch;
1875 switch (fragment->binary_patch_method) {
0660626c
JH
1876 case BINARY_DELTA_DEFLATED:
1877 result = patch_delta(desc->buffer, desc->size,
1878 data,
3cd4f5e8 1879 fragment->size,
0660626c
JH
1880 &dst_size);
1881 free(desc->buffer);
1882 desc->buffer = result;
0660626c
JH
1883 break;
1884 case BINARY_LITERAL_DEFLATED:
1885 free(desc->buffer);
1886 desc->buffer = data;
3cd4f5e8 1887 dst_size = fragment->size;
0660626c
JH
1888 break;
1889 }
1890 if (!desc->buffer)
1891 return -1;
1892 desc->size = desc->alloc = dst_size;
1893 return 0;
1894}
1895
051308f6 1896static int apply_binary(struct buffer_desc *desc, struct patch *patch)
3cca928d 1897{
011f4274 1898 const char *name = patch->old_name ? patch->old_name : patch->new_name;
051308f6 1899 unsigned char sha1[20];
011f4274 1900
051308f6
JH
1901 /* For safety, we require patch index line to contain
1902 * full 40-byte textual SHA1 for old and new, at least for now.
1903 */
1904 if (strlen(patch->old_sha1_prefix) != 40 ||
1905 strlen(patch->new_sha1_prefix) != 40 ||
1906 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1907 get_sha1_hex(patch->new_sha1_prefix, sha1))
1908 return error("cannot apply binary patch to '%s' "
1909 "without full index line", name);
011f4274 1910
051308f6
JH
1911 if (patch->old_name) {
1912 /* See if the old one matches what the patch
1913 * applies to.
011f4274 1914 */
abdc3fc8 1915 hash_sha1_file(desc->buffer, desc->size, blob_type, sha1);
051308f6
JH
1916 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1917 return error("the patch applies to '%s' (%s), "
1918 "which does not match the "
1919 "current contents.",
1920 name, sha1_to_hex(sha1));
1921 }
1922 else {
1923 /* Otherwise, the old one must be empty. */
1924 if (desc->size)
1925 return error("the patch applies to an empty "
1926 "'%s' but it is not empty", name);
1927 }
011f4274 1928
0660626c 1929 get_sha1_hex(patch->new_sha1_prefix, sha1);
0bef57ee 1930 if (is_null_sha1(sha1)) {
051308f6
JH
1931 free(desc->buffer);
1932 desc->alloc = desc->size = 0;
0660626c 1933 desc->buffer = NULL;
051308f6 1934 return 0; /* deletion patch */
0660626c 1935 }
011f4274 1936
051308f6 1937 if (has_sha1_file(sha1)) {
0660626c 1938 /* We already have the postimage */
21666f1a 1939 enum object_type type;
051308f6
JH
1940 unsigned long size;
1941
0660626c 1942 free(desc->buffer);
21666f1a 1943 desc->buffer = read_sha1_file(sha1, &type, &size);
051308f6
JH
1944 if (!desc->buffer)
1945 return error("the necessary postimage %s for "
1946 "'%s' cannot be read",
1947 patch->new_sha1_prefix, name);
1948 desc->alloc = desc->size = size;
1949 }
1950 else {
0660626c
JH
1951 /* We have verified desc matches the preimage;
1952 * apply the patch data to it, which is stored
1953 * in the patch->fragments->{patch,size}.
011f4274 1954 */
0660626c 1955 if (apply_binary_fragment(desc, patch))
051308f6
JH
1956 return error("binary patch does not apply to '%s'",
1957 name);
011f4274 1958
051308f6 1959 /* verify that the result matches */
abdc3fc8 1960 hash_sha1_file(desc->buffer, desc->size, blob_type, sha1);
051308f6 1961 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
03eb8f8a 1962 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)", name, patch->new_sha1_prefix, sha1_to_hex(sha1));
011f4274 1963 }
3cca928d 1964
051308f6
JH
1965 return 0;
1966}
1967
1968static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
1969{
1970 struct fragment *frag = patch->fragments;
1971 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1972
1973 if (patch->is_binary)
1974 return apply_binary(desc, patch);
1975
3cca928d 1976 while (frag) {
57dc397c
JH
1977 if (apply_one_fragment(desc, frag, patch->inaccurate_eof)) {
1978 error("patch failed: %s:%ld", name, frag->oldpos);
1979 if (!apply_with_reject)
1980 return -1;
1981 frag->rejected = 1;
1982 }
3cca928d
LT
1983 frag = frag->next;
1984 }
30996652 1985 return 0;
3cca928d
LT
1986}
1987
e06c5a6c
SV
1988static int read_file_or_gitlink(struct cache_entry *ce, char **buf_p,
1989 unsigned long *size_p)
1990{
1991 if (!ce)
1992 return 0;
1993
1994 if (S_ISGITLINK(ntohl(ce->ce_mode))) {
1995 *buf_p = xmalloc(100);
1996 *size_p = snprintf(*buf_p, 100,
1997 "Subproject commit %s\n", sha1_to_hex(ce->sha1));
1998 } else {
1999 enum object_type type;
2000 *buf_p = read_sha1_file(ce->sha1, &type, size_p);
2001 if (!*buf_p)
2002 return -1;
2003 }
2004 return 0;
2005}
2006
04e4888e 2007static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
3cca928d 2008{
6e7c92a9
LT
2009 char *buf;
2010 unsigned long size, alloc;
2011 struct buffer_desc desc;
3cca928d 2012
30996652
LT
2013 size = 0;
2014 alloc = 0;
2015 buf = NULL;
04e4888e 2016 if (cached) {
e06c5a6c
SV
2017 if (read_file_or_gitlink(ce, &buf, &size))
2018 return error("read of %s failed", patch->old_name);
2019 alloc = size;
2020 } else if (patch->old_name) {
2021 if (S_ISGITLINK(patch->old_mode)) {
2022 if (ce)
2023 read_file_or_gitlink(ce, &buf, &size);
2024 else {
2025 /*
2026 * There is no way to apply subproject
2027 * patch without looking at the index.
2028 */
2029 patch->fragments = NULL;
2030 size = 0;
2031 }
2032 }
2033 else {
2034 size = xsize_t(st->st_size);
2035 alloc = size + 8192;
2036 buf = xmalloc(alloc);
2037 if (read_old_data(st, patch->old_name,
2038 &buf, &alloc, &size))
04e4888e
JH
2039 return error("read of %s failed",
2040 patch->old_name);
04e4888e
JH
2041 }
2042 }
6e7c92a9
LT
2043
2044 desc.size = size;
2045 desc.alloc = alloc;
2046 desc.buffer = buf;
57dc397c 2047
6e7c92a9 2048 if (apply_fragments(&desc, patch) < 0)
57dc397c 2049 return -1; /* note with --reject this succeeds. */
2c71810b
JH
2050
2051 /* NUL terminate the result */
242abf10 2052 if (desc.alloc <= desc.size)
2c71810b 2053 desc.buffer = xrealloc(desc.buffer, desc.size + 1);
2c71810b
JH
2054 desc.buffer[desc.size] = 0;
2055
6e7c92a9
LT
2056 patch->result = desc.buffer;
2057 patch->resultsize = desc.size;
5aa7d94c 2058
4be60962 2059 if (0 < patch->is_delete && patch->resultsize)
5aa7d94c
LT
2060 return error("removal patch leaves file contents");
2061
3cca928d
LT
2062 return 0;
2063}
2064
64cab591
JH
2065static int check_to_create_blob(const char *new_name, int ok_if_exists)
2066{
2067 struct stat nst;
2068 if (!lstat(new_name, &nst)) {
2069 if (S_ISDIR(nst.st_mode) || ok_if_exists)
2070 return 0;
2071 /*
2072 * A leading component of new_name might be a symlink
2073 * that is going to be removed with this patch, but
2074 * still pointing at somewhere that has the path.
2075 * In such a case, path "new_name" does not exist as
2076 * far as git is concerned.
2077 */
2078 if (has_symlink_leading_path(new_name, NULL))
2079 return 0;
2080
2081 return error("%s: already exists in working directory", new_name);
2082 }
2083 else if ((errno != ENOENT) && (errno != ENOTDIR))
2084 return error("%s: %s", new_name, strerror(errno));
2085 return 0;
2086}
2087
e06c5a6c
SV
2088static int verify_index_match(struct cache_entry *ce, struct stat *st)
2089{
2090 if (S_ISGITLINK(ntohl(ce->ce_mode))) {
2091 if (!S_ISDIR(st->st_mode))
2092 return -1;
2093 return 0;
2094 }
2095 return ce_match_stat(ce, st, 1);
2096}
2097
7f95aef2 2098static int check_patch(struct patch *patch, struct patch *prev_patch)
fab2c257 2099{
a577284a 2100 struct stat st;
fab2c257
LT
2101 const char *old_name = patch->old_name;
2102 const char *new_name = patch->new_name;
011f4274 2103 const char *name = old_name ? old_name : new_name;
04e4888e 2104 struct cache_entry *ce = NULL;
7f95aef2 2105 int ok_if_exists;
fab2c257 2106
57dc397c 2107 patch->rejected = 1; /* we will drop this after we succeed */
e06c5a6c
SV
2108
2109 /*
2110 * Make sure that we do not have local modifications from the
2111 * index when we are looking at the index. Also make sure
2112 * we have the preimage file to be patched in the work tree,
2113 * unless --cached, which tells git to apply only in the index.
2114 */
fab2c257 2115 if (old_name) {
04e4888e
JH
2116 int stat_ret = 0;
2117 unsigned st_mode = 0;
a577284a 2118
04e4888e
JH
2119 if (!cached)
2120 stat_ret = lstat(old_name, &st);
3cca928d
LT
2121 if (check_index) {
2122 int pos = cache_name_pos(old_name, strlen(old_name));
2123 if (pos < 0)
56d33b11
JH
2124 return error("%s: does not exist in index",
2125 old_name);
04e4888e 2126 ce = active_cache[pos];
56d33b11
JH
2127 if (stat_ret < 0) {
2128 struct checkout costate;
2129 if (errno != ENOENT)
2130 return error("%s: %s", old_name,
2131 strerror(errno));
2132 /* checkout */
2133 costate.base_dir = "";
2134 costate.base_dir_len = 0;
2135 costate.force = 0;
2136 costate.quiet = 0;
2137 costate.not_new = 0;
2138 costate.refresh_cache = 1;
04e4888e 2139 if (checkout_entry(ce,
de84f99c
SP
2140 &costate,
2141 NULL) ||
56d33b11
JH
2142 lstat(old_name, &st))
2143 return -1;
2144 }
e06c5a6c 2145 if (!cached && verify_index_match(ce, &st))
56d33b11
JH
2146 return error("%s: does not match index",
2147 old_name);
04e4888e
JH
2148 if (cached)
2149 st_mode = ntohl(ce->ce_mode);
e06c5a6c 2150 } else if (stat_ret < 0)
56d33b11
JH
2151 return error("%s: %s", old_name, strerror(errno));
2152
04e4888e 2153 if (!cached)
185c975f 2154 st_mode = ntohl(ce_mode_from_stat(ce, st.st_mode));
04e4888e 2155
3cca928d
LT
2156 if (patch->is_new < 0)
2157 patch->is_new = 0;
a577284a 2158 if (!patch->old_mode)
04e4888e
JH
2159 patch->old_mode = st_mode;
2160 if ((st_mode ^ patch->old_mode) & S_IFMT)
3cca928d 2161 return error("%s: wrong type", old_name);
04e4888e 2162 if (st_mode != patch->old_mode)
3cca928d 2163 fprintf(stderr, "warning: %s has type %o, expected %o\n",
04e4888e 2164 old_name, st_mode, patch->old_mode);
fab2c257 2165 }
a577284a 2166
4be60962 2167 if (new_name && prev_patch && 0 < prev_patch->is_delete &&
7f95aef2
JH
2168 !strcmp(prev_patch->old_name, new_name))
2169 /* A type-change diff is always split into a patch to
2170 * delete old, immediately followed by a patch to
2171 * create new (see diff.c::run_diff()); in such a case
2172 * it is Ok that the entry to be deleted by the
2173 * previous patch is still in the working tree and in
2174 * the index.
2175 */
2176 ok_if_exists = 1;
2177 else
2178 ok_if_exists = 0;
2179
4be60962
JH
2180 if (new_name &&
2181 ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {
7f95aef2
JH
2182 if (check_index &&
2183 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
2184 !ok_if_exists)
a577284a 2185 return error("%s: already exists in index", new_name);
d91d4c2c 2186 if (!cached) {
64cab591
JH
2187 int err = check_to_create_blob(new_name, ok_if_exists);
2188 if (err)
2189 return err;
d91d4c2c 2190 }
35cc4bcd 2191 if (!patch->new_mode) {
4be60962 2192 if (0 < patch->is_new)
35cc4bcd
JS
2193 patch->new_mode = S_IFREG | 0644;
2194 else
2195 patch->new_mode = patch->old_mode;
2196 }
fab2c257 2197 }
3cca928d
LT
2198
2199 if (new_name && old_name) {
2200 int same = !strcmp(old_name, new_name);
2201 if (!patch->new_mode)
2202 patch->new_mode = patch->old_mode;
2203 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
2204 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2205 patch->new_mode, new_name, patch->old_mode,
2206 same ? "" : " of ", same ? "" : old_name);
04e4888e 2207 }
3cca928d 2208
04e4888e 2209 if (apply_data(patch, &st, ce) < 0)
011f4274 2210 return error("%s: patch does not apply", name);
57dc397c 2211 patch->rejected = 0;
a577284a 2212 return 0;
fab2c257
LT
2213}
2214
a577284a 2215static int check_patch_list(struct patch *patch)
19c58fb8 2216{
7f95aef2 2217 struct patch *prev_patch = NULL;
60b7f38e 2218 int err = 0;
a577284a 2219
7f95aef2 2220 for (prev_patch = NULL; patch ; patch = patch->next) {
a2bf404e
JH
2221 if (apply_verbosely)
2222 say_patch_name(stderr,
2223 "Checking patch ", patch, "...\n");
60b7f38e 2224 err |= check_patch(patch, prev_patch);
7f95aef2
JH
2225 prev_patch = patch;
2226 }
60b7f38e 2227 return err;
a577284a
LT
2228}
2229
2cf67f1e
JH
2230static void show_index_list(struct patch *list)
2231{
2232 struct patch *patch;
2233
2234 /* Once we start supporting the reverse patch, it may be
2235 * worth showing the new sha1 prefix, but until then...
2236 */
2237 for (patch = list; patch; patch = patch->next) {
2238 const unsigned char *sha1_ptr;
2239 unsigned char sha1[20];
2240 const char *name;
2241
2242 name = patch->old_name ? patch->old_name : patch->new_name;
4be60962 2243 if (0 < patch->is_new)
2cf67f1e
JH
2244 sha1_ptr = null_sha1;
2245 else if (get_sha1(patch->old_sha1_prefix, sha1))
2246 die("sha1 information is lacking or useless (%s).",
2247 name);
2248 else
2249 sha1_ptr = sha1;
22943f1a
JH
2250
2251 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
2252 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2253 quote_c_style(name, NULL, stdout, 0);
2254 else
2255 fputs(name, stdout);
2256 putchar(line_termination);
2cf67f1e
JH
2257 }
2258}
2259
a577284a
LT
2260static void stat_patch_list(struct patch *patch)
2261{
2262 int files, adds, dels;
2263
2264 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
2265 files++;
2266 adds += patch->lines_added;
2267 dels += patch->lines_deleted;
2268 show_stats(patch);
2269 }
2270
2271 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
3f40315a
LT
2272}
2273
7d8b7c21
JH
2274static void numstat_patch_list(struct patch *patch)
2275{
2276 for ( ; patch; patch = patch->next) {
2277 const char *name;
49e3343c 2278 name = patch->new_name ? patch->new_name : patch->old_name;
ef58d958
JH
2279 if (patch->is_binary)
2280 printf("-\t-\t");
2281 else
2282 printf("%d\t%d\t",
2283 patch->lines_added, patch->lines_deleted);
7d8b7c21
JH
2284 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2285 quote_c_style(name, NULL, stdout, 0);
2286 else
2287 fputs(name, stdout);
854de5a5 2288 putchar(line_termination);
7d8b7c21
JH
2289 }
2290}
2291
96c912a4
JH
2292static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
2293{
2294 if (mode)
2295 printf(" %s mode %06o %s\n", newdelete, mode, name);
2296 else
2297 printf(" %s %s\n", newdelete, name);
2298}
2299
2300static void show_mode_change(struct patch *p, int show_name)
2301{
2302 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
2303 if (show_name)
2304 printf(" mode change %06o => %06o %s\n",
2305 p->old_mode, p->new_mode, p->new_name);
2306 else
2307 printf(" mode change %06o => %06o\n",
2308 p->old_mode, p->new_mode);
2309 }
2310}
2311
2312static void show_rename_copy(struct patch *p)
2313{
2314 const char *renamecopy = p->is_rename ? "rename" : "copy";
2315 const char *old, *new;
2316
2317 /* Find common prefix */
2318 old = p->old_name;
2319 new = p->new_name;
2320 while (1) {
2321 const char *slash_old, *slash_new;
2322 slash_old = strchr(old, '/');
2323 slash_new = strchr(new, '/');
2324 if (!slash_old ||
2325 !slash_new ||
2326 slash_old - old != slash_new - new ||
2327 memcmp(old, new, slash_new - new))
2328 break;
2329 old = slash_old + 1;
2330 new = slash_new + 1;
2331 }
2332 /* p->old_name thru old is the common prefix, and old and new
2333 * through the end of names are renames
2334 */
2335 if (old != p->old_name)
2336 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
e30e814d 2337 (int)(old - p->old_name), p->old_name,
96c912a4
JH
2338 old, new, p->score);
2339 else
2340 printf(" %s %s => %s (%d%%)\n", renamecopy,
2341 p->old_name, p->new_name, p->score);
2342 show_mode_change(p, 0);
2343}
2344
2345static void summary_patch_list(struct patch *patch)
2346{
2347 struct patch *p;
2348
2349 for (p = patch; p; p = p->next) {
2350 if (p->is_new)
2351 show_file_mode_name("create", p->new_mode, p->new_name);
2352 else if (p->is_delete)
2353 show_file_mode_name("delete", p->old_mode, p->old_name);
2354 else {
2355 if (p->is_rename || p->is_copy)
2356 show_rename_copy(p);
2357 else {
2358 if (p->score) {
2359 printf(" rewrite %s (%d%%)\n",
2360 p->new_name, p->score);
2361 show_mode_change(p, 0);
2362 }
2363 else
2364 show_mode_change(p, 1);
2365 }
2366 }
2367 }
2368}
2369
3f40315a
LT
2370static void patch_stats(struct patch *patch)
2371{
2372 int lines = patch->lines_added + patch->lines_deleted;
2373
2374 if (lines > max_change)
2375 max_change = lines;
2376 if (patch->old_name) {
22943f1a
JH
2377 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
2378 if (!len)
2379 len = strlen(patch->old_name);
3f40315a
LT
2380 if (len > max_len)
2381 max_len = len;
2382 }
2383 if (patch->new_name) {
22943f1a
JH
2384 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
2385 if (!len)
2386 len = strlen(patch->new_name);
3f40315a
LT
2387 if (len > max_len)
2388 max_len = len;
2389 }
19c58fb8
LT
2390}
2391
aea19457 2392static void remove_file(struct patch *patch, int rmdir_empty)
5aa7d94c 2393{
7da3bf37 2394 if (update_index) {
5aa7d94c
LT
2395 if (remove_file_from_cache(patch->old_name) < 0)
2396 die("unable to remove %s from index", patch->old_name);
03ac6e64 2397 cache_tree_invalidate_path(active_cache_tree, patch->old_name);
5aa7d94c 2398 }
d234b21c 2399 if (!cached) {
e06c5a6c
SV
2400 if (S_ISGITLINK(patch->old_mode)) {
2401 if (rmdir(patch->old_name))
2402 warning("unable to remove submodule %s",
2403 patch->old_name);
2404 } else if (!unlink(patch->old_name) && rmdir_empty) {
d234b21c
AJ
2405 char *name = xstrdup(patch->old_name);
2406 char *end = strrchr(name, '/');
2407 while (end) {
2408 *end = 0;
2409 if (rmdir(name))
2410 break;
2411 end = strrchr(name, '/');
2412 }
2413 free(name);
2414 }
2415 }
5aa7d94c
LT
2416}
2417
2418static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
2419{
2420 struct stat st;
2421 struct cache_entry *ce;
2422 int namelen = strlen(path);
2423 unsigned ce_size = cache_entry_size(namelen);
2424
7da3bf37 2425 if (!update_index)
5aa7d94c
LT
2426 return;
2427
90321c10 2428 ce = xcalloc(1, ce_size);
5aa7d94c
LT
2429 memcpy(ce->name, path, namelen);
2430 ce->ce_mode = create_ce_mode(mode);
2431 ce->ce_flags = htons(namelen);
e06c5a6c
SV
2432 if (S_ISGITLINK(mode)) {
2433 const char *s = buf;
2434
2435 if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))
2436 die("corrupt patch for subproject %s", path);
2437 } else {
2438 if (!cached) {
2439 if (lstat(path, &st) < 0)
2440 die("unable to stat newly created file %s",
2441 path);
2442 fill_stat_cache_info(ce, &st);
2443 }
2444 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
2445 die("unable to create backing store for newly created file %s", path);
04e4888e 2446 }
5aa7d94c
LT
2447 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
2448 die("unable to add cache entry for %s", path);
2449}
2450
1b668341
LT
2451static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
2452{
ac78e548 2453 int fd;
67160271 2454 char *nbuf;
1b668341 2455
e06c5a6c
SV
2456 if (S_ISGITLINK(mode)) {
2457 struct stat st;
2458 if (!lstat(path, &st) && S_ISDIR(st.st_mode))
2459 return 0;
2460 return mkdir(path, 0777);
2461 }
2462
78a8d641 2463 if (has_symlinks && S_ISLNK(mode))
2c71810b
JH
2464 /* Although buf:size is counted string, it also is NUL
2465 * terminated.
2466 */
1b668341 2467 return symlink(buf, path);
cc96fd09
JH
2468
2469 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
2470 if (fd < 0)
2471 return -1;
2472
ac78e548
AR
2473 nbuf = convert_to_working_tree(path, buf, &size);
2474 if (nbuf)
67160271 2475 buf = nbuf;
ac78e548 2476
1b668341 2477 while (size) {
1c15afb9
JH
2478 int written = xwrite(fd, buf, size);
2479 if (written < 0)
1b668341 2480 die("writing file %s: %s", path, strerror(errno));
1b668341
LT
2481 if (!written)
2482 die("out of space writing file %s", path);
2483 buf += written;
2484 size -= written;
2485 }
2486 if (close(fd) < 0)
2487 die("closing file %s: %s", path, strerror(errno));
ac78e548 2488 if (nbuf)
cc96fd09 2489 free(nbuf);
1b668341
LT
2490 return 0;
2491}
2492
5c8af185
LT
2493/*
2494 * We optimistically assume that the directories exist,
2495 * which is true 99% of the time anyway. If they don't,
2496 * we create them and try again.
2497 */
8361e1d4 2498static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
5c8af185 2499{
04e4888e
JH
2500 if (cached)
2501 return;
1b668341
LT
2502 if (!try_create_file(path, mode, buf, size))
2503 return;
5c8af185 2504
1b668341 2505 if (errno == ENOENT) {
8361e1d4
JR
2506 if (safe_create_leading_directories(path))
2507 return;
1b668341
LT
2508 if (!try_create_file(path, mode, buf, size))
2509 return;
5c8af185 2510 }
5c8af185 2511
56ac168f 2512 if (errno == EEXIST || errno == EACCES) {
c28c571c
JH
2513 /* We may be trying to create a file where a directory
2514 * used to be.
2515 */
2516 struct stat st;
0afa7644 2517 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))
c28c571c
JH
2518 errno = EEXIST;
2519 }
2520
1b668341
LT
2521 if (errno == EEXIST) {
2522 unsigned int nr = getpid();
5c8af185 2523
1b668341
LT
2524 for (;;) {
2525 const char *newpath;
2526 newpath = mkpath("%s~%u", path, nr);
2527 if (!try_create_file(newpath, mode, buf, size)) {
2528 if (!rename(newpath, path))
2529 return;
2530 unlink(newpath);
2531 break;
2532 }
2533 if (errno != EEXIST)
2534 break;
d9e08be9
AR
2535 ++nr;
2536 }
5c8af185 2537 }
1b668341 2538 die("unable to write file %s mode %o", path, mode);
5c8af185
LT
2539}
2540
5aa7d94c
LT
2541static void create_file(struct patch *patch)
2542{
8361e1d4 2543 char *path = patch->new_name;
5aa7d94c
LT
2544 unsigned mode = patch->new_mode;
2545 unsigned long size = patch->resultsize;
2546 char *buf = patch->result;
2547
2548 if (!mode)
2549 mode = S_IFREG | 0644;
03ac6e64 2550 create_one_file(path, mode, buf, size);
1b668341 2551 add_index_file(path, mode, buf, size);
03ac6e64 2552 cache_tree_invalidate_path(active_cache_tree, path);
5aa7d94c
LT
2553}
2554
eed46644
JH
2555/* phase zero is to remove, phase one is to create */
2556static void write_out_one_result(struct patch *patch, int phase)
5aa7d94c
LT
2557{
2558 if (patch->is_delete > 0) {
eed46644 2559 if (phase == 0)
aea19457 2560 remove_file(patch, 1);
5aa7d94c
LT
2561 return;
2562 }
2563 if (patch->is_new > 0 || patch->is_copy) {
eed46644
JH
2564 if (phase == 1)
2565 create_file(patch);
5aa7d94c
LT
2566 return;
2567 }
2568 /*
2569 * Rename or modification boils down to the same
2570 * thing: remove the old, write the new
2571 */
eed46644 2572 if (phase == 0)
93969438 2573 remove_file(patch, patch->is_rename);
eed46644 2574 if (phase == 1)
57dc397c 2575 create_file(patch);
5aa7d94c
LT
2576}
2577
57dc397c
JH
2578static int write_out_one_reject(struct patch *patch)
2579{
82e2765f
JH
2580 FILE *rej;
2581 char namebuf[PATH_MAX];
57dc397c 2582 struct fragment *frag;
82e2765f 2583 int cnt = 0;
57dc397c 2584
82e2765f 2585 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
57dc397c
JH
2586 if (!frag->rejected)
2587 continue;
82e2765f
JH
2588 cnt++;
2589 }
2590
a2bf404e
JH
2591 if (!cnt) {
2592 if (apply_verbosely)
2593 say_patch_name(stderr,
2594 "Applied patch ", patch, " cleanly.\n");
82e2765f 2595 return 0;
a2bf404e 2596 }
82e2765f
JH
2597
2598 /* This should not happen, because a removal patch that leaves
2599 * contents are marked "rejected" at the patch level.
2600 */
2601 if (!patch->new_name)
2602 die("internal error");
2603
a2bf404e
JH
2604 /* Say this even without --verbose */
2605 say_patch_name(stderr, "Applying patch ", patch, " with");
2606 fprintf(stderr, " %d rejects...\n", cnt);
2607
82e2765f
JH
2608 cnt = strlen(patch->new_name);
2609 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
2610 cnt = ARRAY_SIZE(namebuf) - 5;
2611 fprintf(stderr,
2612 "warning: truncating .rej filename to %.*s.rej",
2613 cnt - 1, patch->new_name);
2614 }
2615 memcpy(namebuf, patch->new_name, cnt);
2616 memcpy(namebuf + cnt, ".rej", 5);
2617
2618 rej = fopen(namebuf, "w");
2619 if (!rej)
2620 return error("cannot open %s: %s", namebuf, strerror(errno));
2621
2622 /* Normal git tools never deal with .rej, so do not pretend
2623 * this is a git patch by saying --git nor give extended
2624 * headers. While at it, maybe please "kompare" that wants
2625 * the trailing TAB and some garbage at the end of line ;-).
2626 */
2627 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
2628 patch->new_name, patch->new_name);
0e9ee323 2629 for (cnt = 1, frag = patch->fragments;
82e2765f
JH
2630 frag;
2631 cnt++, frag = frag->next) {
2632 if (!frag->rejected) {
2633 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);
2634 continue;
57dc397c 2635 }
82e2765f
JH
2636 fprintf(stderr, "Rejected hunk #%d.\n", cnt);
2637 fprintf(rej, "%.*s", frag->size, frag->patch);
57dc397c 2638 if (frag->patch[frag->size-1] != '\n')
82e2765f 2639 fputc('\n', rej);
57dc397c 2640 }
82e2765f
JH
2641 fclose(rej);
2642 return -1;
5aa7d94c
LT
2643}
2644
57dc397c 2645static int write_out_results(struct patch *list, int skipped_patch)
5aa7d94c 2646{
eed46644 2647 int phase;
57dc397c
JH
2648 int errs = 0;
2649 struct patch *l;
eed46644 2650
d854f783 2651 if (!list && !skipped_patch)
57dc397c 2652 return error("No changes");
f7b79707 2653
eed46644 2654 for (phase = 0; phase < 2; phase++) {
57dc397c 2655 l = list;
eed46644 2656 while (l) {
57dc397c
JH
2657 if (l->rejected)
2658 errs = 1;
82e2765f 2659 else {
57dc397c 2660 write_out_one_result(l, phase);
82e2765f 2661 if (phase == 1 && write_out_one_reject(l))
57dc397c
JH
2662 errs = 1;
2663 }
eed46644
JH
2664 l = l->next;
2665 }
5aa7d94c 2666 }
57dc397c 2667 return errs;
5aa7d94c
LT
2668}
2669
021b6e45 2670static struct lock_file lock_file;
5aa7d94c 2671
d854f783
JH
2672static struct excludes {
2673 struct excludes *next;
2674 const char *path;
2675} *excludes;
2676
2677static int use_patch(struct patch *p)
2678{
c7c81b3a 2679 const char *pathname = p->new_name ? p->new_name : p->old_name;
d854f783
JH
2680 struct excludes *x = excludes;
2681 while (x) {
2682 if (fnmatch(x->path, pathname, 0) == 0)
2683 return 0;
2684 x = x->next;
2685 }
edf2e370
JH
2686 if (0 < prefix_length) {
2687 int pathlen = strlen(pathname);
2688 if (pathlen <= prefix_length ||
2689 memcmp(prefix, pathname, prefix_length))
2690 return 0;
2691 }
d854f783
JH
2692 return 1;
2693}
2694
eac70c4f 2695static void prefix_one(char **name)
56185f49 2696{
eac70c4f
JS
2697 char *old_name = *name;
2698 if (!old_name)
2699 return;
2700 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));
2701 free(old_name);
56185f49
JH
2702}
2703
2704static void prefix_patches(struct patch *p)
2705{
9987d7c5 2706 if (!prefix || p->is_toplevel_relative)
56185f49
JH
2707 return;
2708 for ( ; p; p = p->next) {
6c912f5b
JH
2709 if (p->new_name == p->old_name) {
2710 char *prefixed = p->new_name;
2711 prefix_one(&prefixed);
2712 p->new_name = p->old_name = prefixed;
2713 }
2714 else {
eac70c4f 2715 prefix_one(&p->new_name);
6c912f5b
JH
2716 prefix_one(&p->old_name);
2717 }
56185f49
JH
2718 }
2719}
2720
f686d030 2721static int apply_patch(int fd, const char *filename, int inaccurate_eof)
c1bb9350
LT
2722{
2723 unsigned long offset, size;
2724 char *buffer = read_patch_file(fd, &size);
19c58fb8 2725 struct patch *list = NULL, **listp = &list;
d854f783 2726 int skipped_patch = 0;
c1bb9350 2727
b5767dd6 2728 patch_input_file = filename;
c1bb9350
LT
2729 if (!buffer)
2730 return -1;
2731 offset = 0;
2732 while (size > 0) {
19c58fb8
LT
2733 struct patch *patch;
2734 int nr;
2735
90321c10 2736 patch = xcalloc(1, sizeof(*patch));
3eaa38da 2737 patch->inaccurate_eof = inaccurate_eof;
19c58fb8 2738 nr = parse_chunk(buffer + offset, size, patch);
c1bb9350
LT
2739 if (nr < 0)
2740 break;
f686d030 2741 if (apply_in_reverse)
e5a94313 2742 reverse_patches(patch);
56185f49
JH
2743 if (prefix)
2744 prefix_patches(patch);
d854f783
JH
2745 if (use_patch(patch)) {
2746 patch_stats(patch);
2747 *listp = patch;
2748 listp = &patch->next;
56185f49
JH
2749 }
2750 else {
d854f783
JH
2751 /* perhaps free it a bit better? */
2752 free(patch);
2753 skipped_patch++;
2754 }
c1bb9350
LT
2755 offset += nr;
2756 size -= nr;
2757 }
19c58fb8 2758
b5767dd6
JH
2759 if (whitespace_error && (new_whitespace == error_on_whitespace))
2760 apply = 0;
2761
7da3bf37
JH
2762 update_index = check_index && apply;
2763 if (update_index && newfd < 0)
30ca07a2
JH
2764 newfd = hold_locked_index(&lock_file, 1);
2765
5aa7d94c
LT
2766 if (check_index) {
2767 if (read_cache() < 0)
2768 die("unable to read index file");
2769 }
2770
57dc397c
JH
2771 if ((check || apply) &&
2772 check_patch_list(list) < 0 &&
2773 !apply_with_reject)
a577284a
LT
2774 exit(1);
2775
57dc397c
JH
2776 if (apply && write_out_results(list, skipped_patch))
2777 exit(1);
5aa7d94c 2778
2cf67f1e
JH
2779 if (show_index_info)
2780 show_index_list(list);
2781
a577284a
LT
2782 if (diffstat)
2783 stat_patch_list(list);
19c58fb8 2784
7d8b7c21
JH
2785 if (numstat)
2786 numstat_patch_list(list);
2787
96c912a4
JH
2788 if (summary)
2789 summary_patch_list(list);
2790
c1bb9350
LT
2791 free(buffer);
2792 return 0;
2793}
2794
2ae1c53b
JH
2795static int git_apply_config(const char *var, const char *value)
2796{
2797 if (!strcmp(var, "apply.whitespace")) {
9befac47 2798 apply_default_whitespace = xstrdup(value);
2ae1c53b
JH
2799 return 0;
2800 }
2801 return git_default_config(var, value);
2802}
2803
2804
cd554bb1 2805int cmd_apply(int argc, const char **argv, const char *unused_prefix)
c1bb9350
LT
2806{
2807 int i;
4dfdbe10 2808 int read_stdin = 1;
3eaa38da 2809 int inaccurate_eof = 0;
57dc397c 2810 int errs = 0;
dc7b2436 2811 int is_not_gitdir = 0;
3eaa38da 2812
2ae1c53b 2813 const char *whitespace_option = NULL;
c1bb9350 2814
dc7b2436
JH
2815 prefix = setup_git_directory_gently(&is_not_gitdir);
2816 prefix_length = prefix ? strlen(prefix) : 0;
700ea479
JH
2817 git_config(git_apply_config);
2818 if (apply_default_whitespace)
2819 parse_whitespace_option(apply_default_whitespace);
67160271 2820
c1bb9350
LT
2821 for (i = 1; i < argc; i++) {
2822 const char *arg = argv[i];
47495887 2823 char *end;
c1bb9350
LT
2824 int fd;
2825
2826 if (!strcmp(arg, "-")) {
57dc397c 2827 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
4dfdbe10 2828 read_stdin = 0;
c1bb9350
LT
2829 continue;
2830 }
cc44c765 2831 if (!prefixcmp(arg, "--exclude=")) {
d854f783
JH
2832 struct excludes *x = xmalloc(sizeof(*x));
2833 x->path = arg + 10;
2834 x->next = excludes;
2835 excludes = x;
2836 continue;
2837 }
cc44c765 2838 if (!prefixcmp(arg, "-p")) {
e36f8b60 2839 p_value = atoi(arg + 2);
3e8a5db9 2840 p_value_known = 1;
e36f8b60
DB
2841 continue;
2842 }
cb93c193
JH
2843 if (!strcmp(arg, "--no-add")) {
2844 no_add = 1;
2845 continue;
2846 }
fab2c257 2847 if (!strcmp(arg, "--stat")) {
a577284a 2848 apply = 0;
fab2c257
LT
2849 diffstat = 1;
2850 continue;
2851 }
0660626c
JH
2852 if (!strcmp(arg, "--allow-binary-replacement") ||
2853 !strcmp(arg, "--binary")) {
2b6eef94 2854 continue; /* now no-op */
011f4274 2855 }
7d8b7c21
JH
2856 if (!strcmp(arg, "--numstat")) {
2857 apply = 0;
2858 numstat = 1;
2859 continue;
2860 }
96c912a4
JH
2861 if (!strcmp(arg, "--summary")) {
2862 apply = 0;
2863 summary = 1;
2864 continue;
2865 }
a577284a
LT
2866 if (!strcmp(arg, "--check")) {
2867 apply = 0;
2868 check = 1;
2869 continue;
2870 }
3cca928d 2871 if (!strcmp(arg, "--index")) {
dc7b2436
JH
2872 if (is_not_gitdir)
2873 die("--index outside a repository");
3cca928d
LT
2874 check_index = 1;
2875 continue;
2876 }
04e4888e 2877 if (!strcmp(arg, "--cached")) {
dc7b2436
JH
2878 if (is_not_gitdir)
2879 die("--cached outside a repository");
04e4888e
JH
2880 check_index = 1;
2881 cached = 1;
2882 continue;
2883 }
aefa4a5b
LT
2884 if (!strcmp(arg, "--apply")) {
2885 apply = 1;
2886 continue;
2887 }
22943f1a 2888 if (!strcmp(arg, "--index-info")) {
2cf67f1e
JH
2889 apply = 0;
2890 show_index_info = 1;
2891 continue;
2892 }
22943f1a
JH
2893 if (!strcmp(arg, "-z")) {
2894 line_termination = 0;
2895 continue;
2896 }
cc44c765 2897 if (!prefixcmp(arg, "-C")) {
47495887
EB
2898 p_context = strtoul(arg + 2, &end, 0);
2899 if (*end != '\0')
2900 die("unrecognized context count '%s'", arg + 2);
2901 continue;
2902 }
cc44c765 2903 if (!prefixcmp(arg, "--whitespace=")) {
2ae1c53b
JH
2904 whitespace_option = arg + 13;
2905 parse_whitespace_option(arg + 13);
2906 continue;
19bfcd5a 2907 }
e5a94313 2908 if (!strcmp(arg, "-R") || !strcmp(arg, "--reverse")) {
f686d030 2909 apply_in_reverse = 1;
e5a94313 2910 continue;
4be60962
JH
2911 }
2912 if (!strcmp(arg, "--unidiff-zero")) {
2913 unidiff_zero = 1;
2914 continue;
e5a94313 2915 }
57dc397c 2916 if (!strcmp(arg, "--reject")) {
8938045a 2917 apply = apply_with_reject = apply_verbosely = 1;
57dc397c
JH
2918 continue;
2919 }
aeabfa07 2920 if (!strcmp(arg, "-v") || !strcmp(arg, "--verbose")) {
a2bf404e
JH
2921 apply_verbosely = 1;
2922 continue;
2923 }
3eaa38da
JS
2924 if (!strcmp(arg, "--inaccurate-eof")) {
2925 inaccurate_eof = 1;
2926 continue;
2927 }
edf2e370
JH
2928 if (0 < prefix_length)
2929 arg = prefix_filename(prefix, prefix_length, arg);
2930
c1bb9350
LT
2931 fd = open(arg, O_RDONLY);
2932 if (fd < 0)
2933 usage(apply_usage);
4dfdbe10 2934 read_stdin = 0;
f21d6726 2935 set_default_whitespace_mode(whitespace_option);
57dc397c 2936 errs |= apply_patch(fd, arg, inaccurate_eof);
c1bb9350
LT
2937 close(fd);
2938 }
f21d6726 2939 set_default_whitespace_mode(whitespace_option);
4dfdbe10 2940 if (read_stdin)
57dc397c 2941 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
fc96b7c9
JH
2942 if (whitespace_error) {
2943 if (squelch_whitespace_errors &&
2944 squelch_whitespace_errors < whitespace_error) {
2945 int squelched =
2946 whitespace_error - squelch_whitespace_errors;
57dc397c
JH
2947 fprintf(stderr, "warning: squelched %d "
2948 "whitespace error%s\n",
fc96b7c9
JH
2949 squelched,
2950 squelched == 1 ? "" : "s");
2951 }
2952 if (new_whitespace == error_on_whitespace)
c94bf41c 2953 die("%d line%s add%s whitespace errors.",
fc96b7c9
JH
2954 whitespace_error,
2955 whitespace_error == 1 ? "" : "s",
2956 whitespace_error == 1 ? "s" : "");
c94bf41c 2957 if (applied_after_fixing_ws)
fc96b7c9 2958 fprintf(stderr, "warning: %d line%s applied after"
c94bf41c
JH
2959 " fixing whitespace errors.\n",
2960 applied_after_fixing_ws,
2961 applied_after_fixing_ws == 1 ? "" : "s");
fc96b7c9 2962 else if (whitespace_error)
c94bf41c 2963 fprintf(stderr, "warning: %d line%s add%s whitespace errors.\n",
fc96b7c9
JH
2964 whitespace_error,
2965 whitespace_error == 1 ? "" : "s",
2966 whitespace_error == 1 ? "s" : "");
2967 }
dbd0f7d3 2968
7da3bf37 2969 if (update_index) {
dbd0f7d3 2970 if (write_cache(newfd, active_cache, active_nr) ||
30ca07a2 2971 close(newfd) || commit_locked_index(&lock_file))
021b6e45 2972 die("Unable to write new index file");
dbd0f7d3
EW
2973 }
2974
57dc397c 2975 return !!errs;
c1bb9350 2976}