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