apply: squelch excessive errors and --whitespace=error-all
[git/git.git] / 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 */
d854f783 9#include <fnmatch.h>
c1bb9350 10#include "cache.h"
22943f1a 11#include "quote.h"
c1bb9350 12
a577284a
LT
13// --check turns on checking that the working tree matches the
14// files that are being modified, but doesn't apply the patch
15// --stat does just a diffstat, and doesn't actually apply
7d8b7c21 16// --numstat does numeric diffstat, and doesn't actually apply
22943f1a 17// --index-info shows the old and new index info for paths if available.
a577284a 18//
edf2e370
JH
19static const char *prefix;
20static int prefix_length = -1;
21
e36f8b60 22static int p_value = 1;
011f4274 23static int allow_binary_replacement = 0;
3cca928d 24static int check_index = 0;
5aa7d94c 25static int write_index = 0;
fab2c257 26static int diffstat = 0;
7d8b7c21 27static int numstat = 0;
96c912a4 28static int summary = 0;
a577284a
LT
29static int check = 0;
30static int apply = 1;
cb93c193 31static int no_add = 0;
2cf67f1e 32static int show_index_info = 0;
22943f1a 33static int line_termination = '\n';
12dd6e8c 34static const char apply_usage[] =
e36f8b60 35"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] <patch>...";
c1bb9350 36
19bfcd5a
LT
37static enum whitespace_eol {
38 nowarn,
39 warn_on_whitespace,
b5767dd6
JH
40 error_on_whitespace,
41 strip_and_apply,
19bfcd5a 42} new_whitespace = nowarn;
b5767dd6 43static int whitespace_error = 0;
fc96b7c9
JH
44static int squelch_whitespace_errors = 5;
45static int applied_after_stripping = 0;
b5767dd6 46static const char *patch_input_file = NULL;
19bfcd5a 47
3f40315a
LT
48/*
49 * For "diff-stat" like behaviour, we keep track of the biggest change
50 * we've seen, and the longest filename. That allows us to do simple
51 * scaling.
52 */
53static int max_change, max_len;
54
a4acb0eb
LT
55/*
56 * Various "current state", notably line numbers and what
57 * file (and how) we're patching right now.. The "is_xxxx"
58 * things are flags, where -1 means "don't know yet".
59 */
46979f56 60static int linenr = 1;
19c58fb8
LT
61
62struct fragment {
63 unsigned long oldpos, oldlines;
64 unsigned long newpos, newlines;
65 const char *patch;
66 int size;
67 struct fragment *next;
68};
69
70struct patch {
5041aa70 71 char *new_name, *old_name, *def_name;
19c58fb8 72 unsigned int old_mode, new_mode;
ff36de08 73 int is_rename, is_copy, is_new, is_delete, is_binary;
3f40315a 74 int lines_added, lines_deleted;
96c912a4 75 int score;
19c58fb8 76 struct fragment *fragments;
5aa7d94c 77 char *result;
3cca928d 78 unsigned long resultsize;
2cf67f1e
JH
79 char old_sha1_prefix[41];
80 char new_sha1_prefix[41];
19c58fb8
LT
81 struct patch *next;
82};
46979f56 83
c1bb9350 84#define CHUNKSIZE (8192)
a4acb0eb 85#define SLOP (16)
c1bb9350
LT
86
87static void *read_patch_file(int fd, unsigned long *sizep)
88{
89 unsigned long size = 0, alloc = CHUNKSIZE;
90 void *buffer = xmalloc(alloc);
91
92 for (;;) {
93 int nr = alloc - size;
94 if (nr < 1024) {
95 alloc += CHUNKSIZE;
96 buffer = xrealloc(buffer, alloc);
97 nr = alloc - size;
98 }
1c15afb9 99 nr = xread(fd, buffer + size, nr);
c1bb9350
LT
100 if (!nr)
101 break;
1c15afb9 102 if (nr < 0)
c1bb9350 103 die("git-apply: read returned %s", strerror(errno));
c1bb9350
LT
104 size += nr;
105 }
106 *sizep = size;
a4acb0eb
LT
107
108 /*
109 * Make sure that we have some slop in the buffer
110 * so that we can do speculative "memcmp" etc, and
111 * see to it that it is NUL-filled.
112 */
113 if (alloc < size + SLOP)
114 buffer = xrealloc(buffer, size + SLOP);
115 memset(buffer + size, 0, SLOP);
c1bb9350
LT
116 return buffer;
117}
118
3cca928d 119static unsigned long linelen(const char *buffer, unsigned long size)
c1bb9350
LT
120{
121 unsigned long len = 0;
122 while (size--) {
123 len++;
124 if (*buffer++ == '\n')
125 break;
126 }
127 return len;
128}
129
a4acb0eb
LT
130static int is_dev_null(const char *str)
131{
132 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
133}
134
381ca9a3
LT
135#define TERM_SPACE 1
136#define TERM_TAB 2
9a4a100e
LT
137
138static int name_terminate(const char *name, int namelen, int c, int terminate)
139{
140 if (c == ' ' && !(terminate & TERM_SPACE))
141 return 0;
142 if (c == '\t' && !(terminate & TERM_TAB))
143 return 0;
144
9a4a100e
LT
145 return 1;
146}
147
148static char * find_name(const char *line, char *def, int p_value, int terminate)
c1bb9350 149{
a4acb0eb
LT
150 int len;
151 const char *start = line;
152 char *name;
153
22943f1a
JH
154 if (*line == '"') {
155 /* Proposed "new-style" GNU patch/diff format; see
156 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
157 */
158 name = unquote_c_style(line, NULL);
159 if (name) {
160 char *cp = name;
161 while (p_value) {
162 cp = strchr(name, '/');
163 if (!cp)
164 break;
165 cp++;
166 p_value--;
167 }
168 if (cp) {
169 /* name can later be freed, so we need
170 * to memmove, not just return cp
171 */
172 memmove(name, cp, strlen(cp) + 1);
173 free(def);
174 return name;
175 }
176 else {
177 free(name);
178 name = NULL;
179 }
180 }
181 }
182
c1bb9350 183 for (;;) {
a4acb0eb 184 char c = *line;
9a4a100e
LT
185
186 if (isspace(c)) {
187 if (c == '\n')
188 break;
189 if (name_terminate(start, line-start, c, terminate))
190 break;
191 }
a4acb0eb
LT
192 line++;
193 if (c == '/' && !--p_value)
194 start = line;
195 }
196 if (!start)
197 return def;
198 len = line - start;
199 if (!len)
200 return def;
201
202 /*
203 * Generally we prefer the shorter name, especially
204 * if the other one is just a variation of that with
205 * something else tacked on to the end (ie "file.orig"
206 * or "file~").
207 */
208 if (def) {
209 int deflen = strlen(def);
210 if (deflen < len && !strncmp(start, def, deflen))
211 return def;
c1bb9350 212 }
a4acb0eb
LT
213
214 name = xmalloc(len + 1);
215 memcpy(name, start, len);
216 name[len] = 0;
217 free(def);
218 return name;
219}
220
221/*
222 * Get the name etc info from the --/+++ lines of a traditional patch header
223 *
224 * NOTE! This hardcodes "-p1" behaviour in filename detection.
9a4a100e
LT
225 *
226 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
227 * files, we can happily check the index for a match, but for creating a
228 * new file we should try to match whatever "patch" does. I have no idea.
a4acb0eb 229 */
19c58fb8 230static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
a4acb0eb 231{
a4acb0eb
LT
232 char *name;
233
234 first += 4; // skip "--- "
235 second += 4; // skip "+++ "
236 if (is_dev_null(first)) {
19c58fb8
LT
237 patch->is_new = 1;
238 patch->is_delete = 0;
5041aa70 239 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
19c58fb8 240 patch->new_name = name;
a4acb0eb 241 } else if (is_dev_null(second)) {
19c58fb8
LT
242 patch->is_new = 0;
243 patch->is_delete = 1;
381ca9a3 244 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
19c58fb8 245 patch->old_name = name;
a4acb0eb 246 } else {
381ca9a3
LT
247 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
248 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
19c58fb8 249 patch->old_name = patch->new_name = name;
a4acb0eb
LT
250 }
251 if (!name)
252 die("unable to find filename in patch at line %d", linenr);
a4acb0eb
LT
253}
254
19c58fb8 255static int gitdiff_hdrend(const char *line, struct patch *patch)
a4acb0eb
LT
256{
257 return -1;
258}
259
1e3f6b6e
LT
260/*
261 * We're anal about diff header consistency, to make
262 * sure that we don't end up having strange ambiguous
263 * patches floating around.
264 *
265 * As a result, gitdiff_{old|new}name() will check
266 * their names against any previous information, just
267 * to make sure..
268 */
269static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
270{
1e3f6b6e
LT
271 if (!orig_name && !isnull)
272 return find_name(line, NULL, 1, 0);
273
1e3f6b6e 274 if (orig_name) {
22943f1a
JH
275 int len;
276 const char *name;
277 char *another;
1e3f6b6e
LT
278 name = orig_name;
279 len = strlen(name);
280 if (isnull)
281 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
22943f1a
JH
282 another = find_name(line, NULL, 1, 0);
283 if (!another || memcmp(another, name, len))
284 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
285 free(another);
1e3f6b6e
LT
286 return orig_name;
287 }
22943f1a
JH
288 else {
289 /* expect "/dev/null" */
290 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
291 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
292 return NULL;
293 }
1e3f6b6e
LT
294}
295
19c58fb8 296static int gitdiff_oldname(const char *line, struct patch *patch)
a4acb0eb 297{
19c58fb8 298 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
a4acb0eb
LT
299 return 0;
300}
301
19c58fb8 302static int gitdiff_newname(const char *line, struct patch *patch)
a4acb0eb 303{
19c58fb8 304 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
a4acb0eb
LT
305 return 0;
306}
307
19c58fb8 308static int gitdiff_oldmode(const char *line, struct patch *patch)
a4acb0eb 309{
19c58fb8 310 patch->old_mode = strtoul(line, NULL, 8);
a4acb0eb
LT
311 return 0;
312}
313
19c58fb8 314static int gitdiff_newmode(const char *line, struct patch *patch)
a4acb0eb 315{
19c58fb8 316 patch->new_mode = strtoul(line, NULL, 8);
a4acb0eb
LT
317 return 0;
318}
319
19c58fb8 320static int gitdiff_delete(const char *line, struct patch *patch)
a4acb0eb 321{
19c58fb8 322 patch->is_delete = 1;
5041aa70 323 patch->old_name = patch->def_name;
19c58fb8 324 return gitdiff_oldmode(line, patch);
a4acb0eb
LT
325}
326
19c58fb8 327static int gitdiff_newfile(const char *line, struct patch *patch)
a4acb0eb 328{
19c58fb8 329 patch->is_new = 1;
5041aa70 330 patch->new_name = patch->def_name;
19c58fb8 331 return gitdiff_newmode(line, patch);
a4acb0eb
LT
332}
333
19c58fb8 334static int gitdiff_copysrc(const char *line, struct patch *patch)
a4acb0eb 335{
19c58fb8
LT
336 patch->is_copy = 1;
337 patch->old_name = find_name(line, NULL, 0, 0);
a4acb0eb
LT
338 return 0;
339}
340
19c58fb8 341static int gitdiff_copydst(const char *line, struct patch *patch)
a4acb0eb 342{
19c58fb8
LT
343 patch->is_copy = 1;
344 patch->new_name = find_name(line, NULL, 0, 0);
a4acb0eb
LT
345 return 0;
346}
347
19c58fb8 348static int gitdiff_renamesrc(const char *line, struct patch *patch)
a4acb0eb 349{
19c58fb8
LT
350 patch->is_rename = 1;
351 patch->old_name = find_name(line, NULL, 0, 0);
a4acb0eb
LT
352 return 0;
353}
354
19c58fb8 355static int gitdiff_renamedst(const char *line, struct patch *patch)
a4acb0eb 356{
19c58fb8
LT
357 patch->is_rename = 1;
358 patch->new_name = find_name(line, NULL, 0, 0);
a4acb0eb
LT
359 return 0;
360}
361
19c58fb8 362static int gitdiff_similarity(const char *line, struct patch *patch)
a4acb0eb 363{
96c912a4
JH
364 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
365 patch->score = 0;
a4acb0eb 366 return 0;
c1bb9350
LT
367}
368
70aadac0
JH
369static int gitdiff_dissimilarity(const char *line, struct patch *patch)
370{
96c912a4
JH
371 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
372 patch->score = 0;
70aadac0
JH
373 return 0;
374}
375
2cf67f1e
JH
376static int gitdiff_index(const char *line, struct patch *patch)
377{
378 /* index line is N hexadecimal, "..", N hexadecimal,
379 * and optional space with octal mode.
380 */
381 const char *ptr, *eol;
382 int len;
383
384 ptr = strchr(line, '.');
9add69b1 385 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
2cf67f1e
JH
386 return 0;
387 len = ptr - line;
388 memcpy(patch->old_sha1_prefix, line, len);
389 patch->old_sha1_prefix[len] = 0;
390
391 line = ptr + 2;
392 ptr = strchr(line, ' ');
393 eol = strchr(line, '\n');
394
395 if (!ptr || eol < ptr)
396 ptr = eol;
397 len = ptr - line;
398
9add69b1 399 if (40 < len)
2cf67f1e
JH
400 return 0;
401 memcpy(patch->new_sha1_prefix, line, len);
402 patch->new_sha1_prefix[len] = 0;
403 if (*ptr == ' ')
404 patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
405 return 0;
406}
407
9a4a100e
LT
408/*
409 * This is normal for a diff that doesn't change anything: we'll fall through
410 * into the next diff. Tell the parser to break out.
411 */
19c58fb8 412static int gitdiff_unrecognized(const char *line, struct patch *patch)
9a4a100e
LT
413{
414 return -1;
415}
416
22943f1a
JH
417static const char *stop_at_slash(const char *line, int llen)
418{
419 int i;
420
421 for (i = 0; i < llen; i++) {
422 int ch = line[i];
423 if (ch == '/')
424 return line + i;
425 }
426 return NULL;
427}
428
429/* This is to extract the same name that appears on "diff --git"
430 * line. We do not find and return anything if it is a rename
431 * patch, and it is OK because we will find the name elsewhere.
432 * We need to reliably find name only when it is mode-change only,
433 * creation or deletion of an empty file. In any of these cases,
434 * both sides are the same name under a/ and b/ respectively.
435 */
436static char *git_header_name(char *line, int llen)
5041aa70
LT
437{
438 int len;
22943f1a
JH
439 const char *name;
440 const char *second = NULL;
5041aa70 441
22943f1a
JH
442 line += strlen("diff --git ");
443 llen -= strlen("diff --git ");
444
445 if (*line == '"') {
446 const char *cp;
447 char *first = unquote_c_style(line, &second);
448 if (!first)
5041aa70 449 return NULL;
22943f1a
JH
450
451 /* advance to the first slash */
452 cp = stop_at_slash(first, strlen(first));
453 if (!cp || cp == first) {
454 /* we do not accept absolute paths */
455 free_first_and_fail:
456 free(first);
457 return NULL;
458 }
459 len = strlen(cp+1);
460 memmove(first, cp+1, len+1); /* including NUL */
461
462 /* second points at one past closing dq of name.
463 * find the second name.
464 */
465 while ((second < line + llen) && isspace(*second))
466 second++;
467
468 if (line + llen <= second)
469 goto free_first_and_fail;
470 if (*second == '"') {
471 char *sp = unquote_c_style(second, NULL);
472 if (!sp)
473 goto free_first_and_fail;
474 cp = stop_at_slash(sp, strlen(sp));
475 if (!cp || cp == sp) {
476 free_both_and_fail:
477 free(sp);
478 goto free_first_and_fail;
479 }
480 /* They must match, otherwise ignore */
481 if (strcmp(cp+1, first))
482 goto free_both_and_fail;
483 free(sp);
484 return first;
485 }
486
487 /* unquoted second */
488 cp = stop_at_slash(second, line + llen - second);
489 if (!cp || cp == second)
490 goto free_first_and_fail;
491 cp++;
492 if (line + llen - cp != len + 1 ||
493 memcmp(first, cp, len))
494 goto free_first_and_fail;
495 return first;
5041aa70
LT
496 }
497
22943f1a
JH
498 /* unquoted first name */
499 name = stop_at_slash(line, llen);
500 if (!name || name == line)
5041aa70
LT
501 return NULL;
502
22943f1a
JH
503 name++;
504
505 /* since the first name is unquoted, a dq if exists must be
506 * the beginning of the second name.
507 */
508 for (second = name; second < line + llen; second++) {
509 if (*second == '"') {
510 const char *cp = second;
511 const char *np;
512 char *sp = unquote_c_style(second, NULL);
513
514 if (!sp)
515 return NULL;
516 np = stop_at_slash(sp, strlen(sp));
517 if (!np || np == sp) {
518 free_second_and_fail:
519 free(sp);
520 return NULL;
521 }
522 np++;
523 len = strlen(np);
524 if (len < cp - name &&
525 !strncmp(np, name, len) &&
526 isspace(name[len])) {
527 /* Good */
528 memmove(sp, np, len + 1);
529 return sp;
530 }
531 goto free_second_and_fail;
532 }
533 }
534
5041aa70
LT
535 /*
536 * Accept a name only if it shows up twice, exactly the same
537 * form.
538 */
539 for (len = 0 ; ; len++) {
540 char c = name[len];
541
542 switch (c) {
543 default:
544 continue;
545 case '\n':
e70a165d 546 return NULL;
5041aa70
LT
547 case '\t': case ' ':
548 second = name+len;
549 for (;;) {
550 char c = *second++;
551 if (c == '\n')
552 return NULL;
553 if (c == '/')
554 break;
555 }
0e87e048 556 if (second[len] == '\n' && !memcmp(name, second, len)) {
5041aa70
LT
557 char *ret = xmalloc(len + 1);
558 memcpy(ret, name, len);
559 ret[len] = 0;
560 return ret;
561 }
562 }
563 }
564 return NULL;
565}
566
c1bb9350 567/* Verify that we recognize the lines following a git header */
19c58fb8 568static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
c1bb9350 569{
a4acb0eb
LT
570 unsigned long offset;
571
572 /* A git diff has explicit new/delete information, so we don't guess */
19c58fb8
LT
573 patch->is_new = 0;
574 patch->is_delete = 0;
a4acb0eb 575
5041aa70
LT
576 /*
577 * Some things may not have the old name in the
578 * rest of the headers anywhere (pure mode changes,
579 * or removing or adding empty files), so we get
580 * the default name from the header.
581 */
22943f1a 582 patch->def_name = git_header_name(line, len);
5041aa70 583
a4acb0eb
LT
584 line += len;
585 size -= len;
586 linenr++;
587 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
588 static const struct opentry {
589 const char *str;
19c58fb8 590 int (*fn)(const char *, struct patch *);
a4acb0eb
LT
591 } optable[] = {
592 { "@@ -", gitdiff_hdrend },
593 { "--- ", gitdiff_oldname },
594 { "+++ ", gitdiff_newname },
595 { "old mode ", gitdiff_oldmode },
596 { "new mode ", gitdiff_newmode },
597 { "deleted file mode ", gitdiff_delete },
598 { "new file mode ", gitdiff_newfile },
599 { "copy from ", gitdiff_copysrc },
600 { "copy to ", gitdiff_copydst },
33f4d087
LT
601 { "rename old ", gitdiff_renamesrc },
602 { "rename new ", gitdiff_renamedst },
dc938417
LT
603 { "rename from ", gitdiff_renamesrc },
604 { "rename to ", gitdiff_renamedst },
a4acb0eb 605 { "similarity index ", gitdiff_similarity },
70aadac0 606 { "dissimilarity index ", gitdiff_dissimilarity },
2cf67f1e 607 { "index ", gitdiff_index },
9a4a100e 608 { "", gitdiff_unrecognized },
a4acb0eb
LT
609 };
610 int i;
c1bb9350 611
c1bb9350 612 len = linelen(line, size);
a4acb0eb 613 if (!len || line[len-1] != '\n')
c1bb9350 614 break;
a4acb0eb
LT
615 for (i = 0; i < sizeof(optable) / sizeof(optable[0]); i++) {
616 const struct opentry *p = optable + i;
617 int oplen = strlen(p->str);
618 if (len < oplen || memcmp(p->str, line, oplen))
619 continue;
19c58fb8 620 if (p->fn(line + oplen, patch) < 0)
a4acb0eb 621 return offset;
9a4a100e 622 break;
a4acb0eb 623 }
c1bb9350
LT
624 }
625
a4acb0eb 626 return offset;
c1bb9350
LT
627}
628
fab2c257 629static int parse_num(const char *line, unsigned long *p)
46979f56
LT
630{
631 char *ptr;
fab2c257
LT
632
633 if (!isdigit(*line))
634 return 0;
635 *p = strtoul(line, &ptr, 10);
636 return ptr - line;
637}
638
639static int parse_range(const char *line, int len, int offset, const char *expect,
640 unsigned long *p1, unsigned long *p2)
641{
46979f56
LT
642 int digits, ex;
643
644 if (offset < 0 || offset >= len)
645 return -1;
646 line += offset;
647 len -= offset;
648
fab2c257
LT
649 digits = parse_num(line, p1);
650 if (!digits)
46979f56 651 return -1;
46979f56
LT
652
653 offset += digits;
654 line += digits;
655 len -= digits;
656
fab2c257
LT
657 *p2 = *p1;
658 if (*line == ',') {
659 digits = parse_num(line+1, p2);
660 if (!digits)
661 return -1;
662
663 offset += digits+1;
664 line += digits+1;
665 len -= digits+1;
666 }
667
46979f56
LT
668 ex = strlen(expect);
669 if (ex > len)
670 return -1;
671 if (memcmp(line, expect, ex))
672 return -1;
673
674 return offset + ex;
675}
676
677/*
678 * Parse a unified diff fragment header of the
679 * form "@@ -a,b +c,d @@"
680 */
19c58fb8 681static int parse_fragment_header(char *line, int len, struct fragment *fragment)
46979f56
LT
682{
683 int offset;
684
685 if (!len || line[len-1] != '\n')
686 return -1;
687
688 /* Figure out the number of lines in a fragment */
fab2c257
LT
689 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
690 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
46979f56
LT
691
692 return offset;
693}
694
19c58fb8 695static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
c1bb9350
LT
696{
697 unsigned long offset, len;
698
19c58fb8
LT
699 patch->is_rename = patch->is_copy = 0;
700 patch->is_new = patch->is_delete = -1;
701 patch->old_mode = patch->new_mode = 0;
702 patch->old_name = patch->new_name = NULL;
46979f56 703 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
c1bb9350
LT
704 unsigned long nextlen;
705
706 len = linelen(line, size);
707 if (!len)
708 break;
709
710 /* Testing this early allows us to take a few shortcuts.. */
711 if (len < 6)
712 continue;
46979f56
LT
713
714 /*
715 * Make sure we don't find any unconnected patch fragmants.
716 * That's a sign that we didn't find a header, and that a
717 * patch has become corrupted/broken up.
718 */
719 if (!memcmp("@@ -", line, 4)) {
19c58fb8
LT
720 struct fragment dummy;
721 if (parse_fragment_header(line, len, &dummy) < 0)
46979f56 722 continue;
4ec99bf0 723 error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
46979f56
LT
724 }
725
c1bb9350
LT
726 if (size < len + 6)
727 break;
728
729 /*
730 * Git patch? It might not have a real patch, just a rename
731 * or mode change, so we handle that specially
732 */
733 if (!memcmp("diff --git ", line, 11)) {
19c58fb8 734 int git_hdr_len = parse_git_header(line, len, size, patch);
206de27e 735 if (git_hdr_len <= len)
c1bb9350 736 continue;
b7e8039a
LT
737 if (!patch->old_name && !patch->new_name) {
738 if (!patch->def_name)
739 die("git diff header lacks filename information (line %d)", linenr);
740 patch->old_name = patch->new_name = patch->def_name;
741 }
a4acb0eb 742 *hdrsize = git_hdr_len;
c1bb9350
LT
743 return offset;
744 }
745
746 /** --- followed by +++ ? */
747 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
748 continue;
749
750 /*
751 * We only accept unified patches, so we want it to
752 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
753 * minimum
754 */
755 nextlen = linelen(line + len, size - len);
756 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
757 continue;
758
759 /* Ok, we'll consider it a patch */
19c58fb8 760 parse_traditional_patch(line, line+len, patch);
c1bb9350 761 *hdrsize = len + nextlen;
46979f56 762 linenr += 2;
c1bb9350
LT
763 return offset;
764 }
765 return -1;
766}
767
c1bb9350
LT
768/*
769 * Parse a unified diff. Note that this really needs
770 * to parse each fragment separately, since the only
771 * way to know the difference between a "---" that is
772 * part of a patch, and a "---" that starts the next
773 * patch is to look at the line counts..
774 */
19c58fb8 775static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
c1bb9350 776{
3f40315a 777 int added, deleted;
c1bb9350 778 int len = linelen(line, size), offset;
30996652 779 unsigned long oldlines, newlines;
c1bb9350 780
19c58fb8 781 offset = parse_fragment_header(line, len, fragment);
c1bb9350
LT
782 if (offset < 0)
783 return -1;
19c58fb8
LT
784 oldlines = fragment->oldlines;
785 newlines = fragment->newlines;
c1bb9350 786
30996652
LT
787 if (patch->is_new < 0) {
788 patch->is_new = !oldlines;
789 if (!oldlines)
790 patch->old_name = NULL;
791 }
792 if (patch->is_delete < 0) {
793 patch->is_delete = !newlines;
794 if (!newlines)
795 patch->new_name = NULL;
796 }
797
798 if (patch->is_new != !oldlines)
799 return error("new file depends on old contents");
af3f929f
LT
800 if (patch->is_delete != !newlines) {
801 if (newlines)
802 return error("deleted file still has contents");
803 fprintf(stderr, "** warning: file %s becomes empty but is not deleted\n", patch->new_name);
804 }
a4acb0eb 805
c1bb9350
LT
806 /* Parse the thing.. */
807 line += len;
808 size -= len;
46979f56 809 linenr++;
3f40315a 810 added = deleted = 0;
46979f56 811 for (offset = len; size > 0; offset += len, size -= len, line += len, linenr++) {
c1bb9350
LT
812 if (!oldlines && !newlines)
813 break;
814 len = linelen(line, size);
815 if (!len || line[len-1] != '\n')
816 return -1;
817 switch (*line) {
818 default:
819 return -1;
820 case ' ':
821 oldlines--;
822 newlines--;
823 break;
824 case '-':
3f40315a 825 deleted++;
c1bb9350
LT
826 oldlines--;
827 break;
828 case '+':
19bfcd5a
LT
829 /*
830 * We know len is at least two, since we have a '+' and
b5767dd6
JH
831 * we checked that the last character was a '\n' above.
832 * That is, an addition of an empty line would check
833 * the '+' here. Sneaky...
19bfcd5a 834 */
b5767dd6
JH
835 if ((new_whitespace != nowarn) &&
836 isspace(line[len-2])) {
fc96b7c9
JH
837 whitespace_error++;
838 if (squelch_whitespace_errors &&
839 squelch_whitespace_errors <
840 whitespace_error)
841 ;
842 else {
843 fprintf(stderr, "Adds trailing whitespace.\n%s:%d:%.*s\n",
844 patch_input_file,
845 linenr, len-2, line+1);
846 }
19bfcd5a 847 }
3f40315a 848 added++;
c1bb9350
LT
849 newlines--;
850 break;
433ef8a2
FK
851
852 /* We allow "\ No newline at end of file". Depending
853 * on locale settings when the patch was produced we
854 * don't know what this line looks like. The only
56d33b11
JH
855 * thing we do know is that it begins with "\ ".
856 * Checking for 12 is just for sanity check -- any
857 * l10n of "\ No newline..." is at least that long.
858 */
fab2c257 859 case '\\':
433ef8a2 860 if (len < 12 || memcmp(line, "\\ ", 2))
3cca928d 861 return -1;
fab2c257 862 break;
c1bb9350
LT
863 }
864 }
8b64647d
JH
865 /* If a fragment ends with an incomplete line, we failed to include
866 * it in the above loop because we hit oldlines == newlines == 0
867 * before seeing it.
868 */
433ef8a2 869 if (12 < size && !memcmp(line, "\\ ", 2))
8b64647d
JH
870 offset += linelen(line, size);
871
3f40315a
LT
872 patch->lines_added += added;
873 patch->lines_deleted += deleted;
c1bb9350
LT
874 return offset;
875}
876
19c58fb8 877static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
c1bb9350
LT
878{
879 unsigned long offset = 0;
19c58fb8 880 struct fragment **fragp = &patch->fragments;
c1bb9350
LT
881
882 while (size > 4 && !memcmp(line, "@@ -", 4)) {
19c58fb8
LT
883 struct fragment *fragment;
884 int len;
885
886 fragment = xmalloc(sizeof(*fragment));
887 memset(fragment, 0, sizeof(*fragment));
888 len = parse_fragment(line, size, patch, fragment);
c1bb9350 889 if (len <= 0)
46979f56 890 die("corrupt patch at line %d", linenr);
c1bb9350 891
19c58fb8
LT
892 fragment->patch = line;
893 fragment->size = len;
894
895 *fragp = fragment;
896 fragp = &fragment->next;
c1bb9350
LT
897
898 offset += len;
899 line += len;
900 size -= len;
901 }
902 return offset;
903}
904
1fea629f
LT
905static inline int metadata_changes(struct patch *patch)
906{
907 return patch->is_rename > 0 ||
908 patch->is_copy > 0 ||
909 patch->is_new > 0 ||
910 patch->is_delete ||
911 (patch->old_mode && patch->new_mode &&
912 patch->old_mode != patch->new_mode);
913}
914
19c58fb8 915static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
c1bb9350
LT
916{
917 int hdrsize, patchsize;
19c58fb8 918 int offset = find_header(buffer, size, &hdrsize, patch);
c1bb9350
LT
919
920 if (offset < 0)
921 return offset;
c1bb9350 922
19c58fb8 923 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
c1bb9350 924
92927ed0 925 if (!patchsize) {
3200d1ae
JH
926 static const char *binhdr[] = {
927 "Binary files ",
928 "Files ",
929 NULL,
930 };
931 int i;
932 int hd = hdrsize + offset;
933 unsigned long llen = linelen(buffer + hd, size - hd);
934
935 if (!memcmp(" differ\n", buffer + hd + llen - 8, 8))
936 for (i = 0; binhdr[i]; i++) {
937 int len = strlen(binhdr[i]);
938 if (len < size - hd &&
939 !memcmp(binhdr[i], buffer + hd, len)) {
940 patch->is_binary = 1;
941 break;
942 }
943 }
ff36de08 944
92927ed0 945 /* Empty patch cannot be applied if:
011f4274
JH
946 * - it is a binary patch and we do not do binary_replace, or
947 * - text patch without metadata change
92927ed0
JH
948 */
949 if ((apply || check) &&
011f4274
JH
950 (patch->is_binary
951 ? !allow_binary_replacement
952 : !metadata_changes(patch)))
ff36de08
JH
953 die("patch with only garbage at line %d", linenr);
954 }
1fea629f 955
c1bb9350
LT
956 return offset + hdrsize + patchsize;
957}
958
6da4016a
LT
959static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
960static const char minuses[]= "----------------------------------------------------------------------";
3f40315a
LT
961
962static void show_stats(struct patch *patch)
963{
62917097 964 const char *prefix = "";
03b4538b 965 char *name = patch->new_name;
22943f1a 966 char *qname = NULL;
95bedc9e 967 int len, max, add, del, total;
3f40315a 968
5041aa70 969 if (!name)
03b4538b 970 name = patch->old_name;
3f40315a 971
22943f1a
JH
972 if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
973 qname = xmalloc(len + 1);
974 quote_c_style(name, qname, NULL, 0);
975 name = qname;
976 }
977
3f40315a
LT
978 /*
979 * "scale" the filename
980 */
981 len = strlen(name);
982 max = max_len;
983 if (max > 50)
984 max = 50;
62917097
LT
985 if (len > max) {
986 char *slash;
987 prefix = "...";
988 max -= 3;
3f40315a 989 name += len - max;
62917097
LT
990 slash = strchr(name, '/');
991 if (slash)
992 name = slash;
993 }
3f40315a
LT
994 len = max;
995
996 /*
997 * scale the add/delete
998 */
999 max = max_change;
1000 if (max + len > 70)
1001 max = 70 - len;
95bedc9e
LT
1002
1003 add = patch->lines_added;
1004 del = patch->lines_deleted;
1005 total = add + del;
1006
69f956e1
SV
1007 if (max_change > 0) {
1008 total = (total * max + max_change / 2) / max_change;
1009 add = (add * max + max_change / 2) / max_change;
1010 del = total - add;
1011 }
ff36de08
JH
1012 if (patch->is_binary)
1013 printf(" %s%-*s | Bin\n", prefix, len, name);
1014 else
1015 printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
1016 len, name, patch->lines_added + patch->lines_deleted,
1017 add, pluses, del, minuses);
22943f1a
JH
1018 if (qname)
1019 free(qname);
3f40315a
LT
1020}
1021
3cca928d
LT
1022static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
1023{
1024 int fd;
1025 unsigned long got;
1026
1027 switch (st->st_mode & S_IFMT) {
1028 case S_IFLNK:
1029 return readlink(path, buf, size);
1030 case S_IFREG:
1031 fd = open(path, O_RDONLY);
1032 if (fd < 0)
1033 return error("unable to open %s", path);
1034 got = 0;
1035 for (;;) {
1c15afb9
JH
1036 int ret = xread(fd, buf + got, size - got);
1037 if (ret <= 0)
3cca928d
LT
1038 break;
1039 got += ret;
1040 }
1041 close(fd);
1042 return got;
1043
1044 default:
1045 return -1;
1046 }
1047}
1048
1049static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line)
1050{
6e7c92a9
LT
1051 int i;
1052 unsigned long start, backwards, forwards;
3cca928d
LT
1053
1054 if (fragsize > size)
1055 return -1;
1056
1057 start = 0;
1058 if (line > 1) {
3cca928d 1059 unsigned long offset = 0;
6e7c92a9
LT
1060 i = line-1;
1061 while (offset + fragsize <= size) {
3cca928d
LT
1062 if (buf[offset++] == '\n') {
1063 start = offset;
6e7c92a9 1064 if (!--i)
3cca928d
LT
1065 break;
1066 }
1067 }
1068 }
1069
1070 /* Exact line number? */
1071 if (!memcmp(buf + start, fragment, fragsize))
1072 return start;
1073
6e7c92a9
LT
1074 /*
1075 * There's probably some smart way to do this, but I'll leave
1076 * that to the smart and beautiful people. I'm simple and stupid.
1077 */
1078 backwards = start;
1079 forwards = start;
1080 for (i = 0; ; i++) {
1081 unsigned long try;
1082 int n;
1083
1084 /* "backward" */
1085 if (i & 1) {
1086 if (!backwards) {
1087 if (forwards + fragsize > size)
1088 break;
1089 continue;
1090 }
1091 do {
1092 --backwards;
1093 } while (backwards && buf[backwards-1] != '\n');
1094 try = backwards;
1095 } else {
1096 while (forwards + fragsize <= size) {
1097 if (buf[forwards++] == '\n')
1098 break;
1099 }
1100 try = forwards;
1101 }
1102
1103 if (try + fragsize > size)
1104 continue;
1105 if (memcmp(buf + try, fragment, fragsize))
1106 continue;
1107 n = (i >> 1)+1;
1108 if (i & 1)
1109 n = -n;
6e7c92a9
LT
1110 return try;
1111 }
1112
3cca928d
LT
1113 /*
1114 * We should start searching forward and backward.
1115 */
1116 return -1;
1117}
1118
6e7c92a9
LT
1119struct buffer_desc {
1120 char *buffer;
1121 unsigned long size;
1122 unsigned long alloc;
1123};
1124
b5767dd6
JH
1125static int apply_line(char *output, const char *patch, int plen)
1126{
1127 /* plen is number of bytes to be copied from patch,
1128 * starting at patch+1 (patch[0] is '+'). Typically
1129 * patch[plen] is '\n'.
1130 */
1131 int add_nl_to_tail = 0;
1132 if ((new_whitespace == strip_and_apply) &&
1133 1 < plen && isspace(patch[plen-1])) {
1134 if (patch[plen] == '\n')
1135 add_nl_to_tail = 1;
1136 plen--;
1137 while (0 < plen && isspace(patch[plen]))
1138 plen--;
fc96b7c9 1139 applied_after_stripping++;
b5767dd6
JH
1140 }
1141 memcpy(output, patch + 1, plen);
1142 if (add_nl_to_tail)
1143 output[plen++] = '\n';
1144 return plen;
1145}
1146
6e7c92a9 1147static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
3cca928d 1148{
6e7c92a9 1149 char *buf = desc->buffer;
3cca928d
LT
1150 const char *patch = frag->patch;
1151 int offset, size = frag->size;
1152 char *old = xmalloc(size);
1153 char *new = xmalloc(size);
1154 int oldsize = 0, newsize = 0;
1155
1156 while (size > 0) {
1157 int len = linelen(patch, size);
1158 int plen;
1159
1160 if (!len)
1161 break;
1162
1163 /*
1164 * "plen" is how much of the line we should use for
1165 * the actual patch data. Normally we just remove the
1166 * first character on the line, but if the line is
1167 * followed by "\ No newline", then we also remove the
1168 * last one (which is the newline, of course).
1169 */
1170 plen = len-1;
8b64647d 1171 if (len < size && patch[len] == '\\')
3cca928d
LT
1172 plen--;
1173 switch (*patch) {
1174 case ' ':
1175 case '-':
1176 memcpy(old + oldsize, patch + 1, plen);
1177 oldsize += plen;
1178 if (*patch == '-')
1179 break;
1180 /* Fall-through for ' ' */
1181 case '+':
b5767dd6
JH
1182 if (*patch != '+' || !no_add)
1183 newsize += apply_line(new + newsize, patch,
1184 plen);
3cca928d
LT
1185 break;
1186 case '@': case '\\':
1187 /* Ignore it, we already handled it */
1188 break;
1189 default:
1190 return -1;
1191 }
1192 patch += len;
1193 size -= len;
1194 }
1195
5b5d4d9e
JS
1196#ifdef NO_ACCURATE_DIFF
1197 if (oldsize > 0 && old[oldsize - 1] == '\n' &&
1198 newsize > 0 && new[newsize - 1] == '\n') {
1199 oldsize--;
1200 newsize--;
1201 }
1202#endif
1203
6e7c92a9 1204 offset = find_offset(buf, desc->size, old, oldsize, frag->newpos);
3cca928d 1205 if (offset >= 0) {
6e7c92a9
LT
1206 int diff = newsize - oldsize;
1207 unsigned long size = desc->size + diff;
1208 unsigned long alloc = desc->alloc;
1209
1210 if (size > alloc) {
1211 alloc = size + 8192;
1212 desc->alloc = alloc;
1213 buf = xrealloc(buf, alloc);
1214 desc->buffer = buf;
1215 }
1216 desc->size = size;
1217 memmove(buf + offset + newsize, buf + offset + oldsize, size - offset - newsize);
1218 memcpy(buf + offset, new, newsize);
3cca928d
LT
1219 offset = 0;
1220 }
1221
1222 free(old);
1223 free(new);
1224 return offset;
1225}
1226
6e7c92a9 1227static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
3cca928d
LT
1228{
1229 struct fragment *frag = patch->fragments;
011f4274
JH
1230 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1231
1232 if (patch->is_binary) {
1233 unsigned char sha1[20];
1234
1235 if (!allow_binary_replacement)
1236 return error("cannot apply binary patch to '%s' "
1237 "without --allow-binary-replacement",
1238 name);
1239
1240 /* For safety, we require patch index line to contain
1241 * full 40-byte textual SHA1 for old and new, at least for now.
1242 */
1243 if (strlen(patch->old_sha1_prefix) != 40 ||
1244 strlen(patch->new_sha1_prefix) != 40 ||
1245 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1246 get_sha1_hex(patch->new_sha1_prefix, sha1))
1247 return error("cannot apply binary patch to '%s' "
1248 "without full index line", name);
1249
1250 if (patch->old_name) {
1251 unsigned char hdr[50];
1252 int hdrlen;
1253
1254 /* See if the old one matches what the patch
1255 * applies to.
1256 */
1257 write_sha1_file_prepare(desc->buffer, desc->size,
1258 "blob", sha1, hdr, &hdrlen);
1259 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1260 return error("the patch applies to '%s' (%s), "
1261 "which does not match the "
1262 "current contents.",
1263 name, sha1_to_hex(sha1));
1264 }
1265 else {
1266 /* Otherwise, the old one must be empty. */
1267 if (desc->size)
1268 return error("the patch applies to an empty "
1269 "'%s' but it is not empty", name);
1270 }
1271
1272 /* For now, we do not record post-image data in the patch,
1273 * and require the object already present in the recipient's
1274 * object database.
1275 */
1276 if (desc->buffer) {
1277 free(desc->buffer);
1278 desc->alloc = desc->size = 0;
1279 }
1280 get_sha1_hex(patch->new_sha1_prefix, sha1);
1281
1282 if (memcmp(sha1, null_sha1, 20)) {
1283 char type[10];
1284 unsigned long size;
1285
1286 desc->buffer = read_sha1_file(sha1, type, &size);
1287 if (!desc->buffer)
1288 return error("the necessary postimage %s for "
1289 "'%s' does not exist",
1290 patch->new_sha1_prefix, name);
1291 desc->alloc = desc->size = size;
1292 }
1293
1294 return 0;
1295 }
3cca928d
LT
1296
1297 while (frag) {
6e7c92a9 1298 if (apply_one_fragment(desc, frag) < 0)
011f4274
JH
1299 return error("patch failed: %s:%ld",
1300 name, frag->oldpos);
3cca928d
LT
1301 frag = frag->next;
1302 }
30996652 1303 return 0;
3cca928d
LT
1304}
1305
1306static int apply_data(struct patch *patch, struct stat *st)
1307{
6e7c92a9
LT
1308 char *buf;
1309 unsigned long size, alloc;
1310 struct buffer_desc desc;
3cca928d 1311
30996652
LT
1312 size = 0;
1313 alloc = 0;
1314 buf = NULL;
1315 if (patch->old_name) {
1316 size = st->st_size;
1317 alloc = size + 8192;
1318 buf = xmalloc(alloc);
1319 if (read_old_data(st, patch->old_name, buf, alloc) != size)
1320 return error("read of %s failed", patch->old_name);
1321 }
6e7c92a9
LT
1322
1323 desc.size = size;
1324 desc.alloc = alloc;
1325 desc.buffer = buf;
1326 if (apply_fragments(&desc, patch) < 0)
3cca928d 1327 return -1;
6e7c92a9
LT
1328 patch->result = desc.buffer;
1329 patch->resultsize = desc.size;
5aa7d94c
LT
1330
1331 if (patch->is_delete && patch->resultsize)
1332 return error("removal patch leaves file contents");
1333
3cca928d
LT
1334 return 0;
1335}
1336
a577284a 1337static int check_patch(struct patch *patch)
fab2c257 1338{
a577284a 1339 struct stat st;
fab2c257
LT
1340 const char *old_name = patch->old_name;
1341 const char *new_name = patch->new_name;
011f4274 1342 const char *name = old_name ? old_name : new_name;
fab2c257
LT
1343
1344 if (old_name) {
a577284a 1345 int changed;
56d33b11 1346 int stat_ret = lstat(old_name, &st);
a577284a 1347
3cca928d
LT
1348 if (check_index) {
1349 int pos = cache_name_pos(old_name, strlen(old_name));
1350 if (pos < 0)
56d33b11
JH
1351 return error("%s: does not exist in index",
1352 old_name);
1353 if (stat_ret < 0) {
1354 struct checkout costate;
1355 if (errno != ENOENT)
1356 return error("%s: %s", old_name,
1357 strerror(errno));
1358 /* checkout */
1359 costate.base_dir = "";
1360 costate.base_dir_len = 0;
1361 costate.force = 0;
1362 costate.quiet = 0;
1363 costate.not_new = 0;
1364 costate.refresh_cache = 1;
1365 if (checkout_entry(active_cache[pos],
1366 &costate) ||
1367 lstat(old_name, &st))
1368 return -1;
1369 }
1370
5f73076c 1371 changed = ce_match_stat(active_cache[pos], &st, 1);
3cca928d 1372 if (changed)
56d33b11
JH
1373 return error("%s: does not match index",
1374 old_name);
3cca928d 1375 }
56d33b11
JH
1376 else if (stat_ret < 0)
1377 return error("%s: %s", old_name, strerror(errno));
1378
3cca928d
LT
1379 if (patch->is_new < 0)
1380 patch->is_new = 0;
de4971b5 1381 st.st_mode = ntohl(create_ce_mode(st.st_mode));
a577284a
LT
1382 if (!patch->old_mode)
1383 patch->old_mode = st.st_mode;
3cca928d
LT
1384 if ((st.st_mode ^ patch->old_mode) & S_IFMT)
1385 return error("%s: wrong type", old_name);
1386 if (st.st_mode != patch->old_mode)
1387 fprintf(stderr, "warning: %s has type %o, expected %o\n",
1388 old_name, st.st_mode, patch->old_mode);
fab2c257 1389 }
a577284a 1390
fab2c257 1391 if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
3cca928d 1392 if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0)
a577284a
LT
1393 return error("%s: already exists in index", new_name);
1394 if (!lstat(new_name, &st))
1395 return error("%s: already exists in working directory", new_name);
1396 if (errno != ENOENT)
1397 return error("%s: %s", new_name, strerror(errno));
35cc4bcd
JS
1398 if (!patch->new_mode) {
1399 if (patch->is_new)
1400 patch->new_mode = S_IFREG | 0644;
1401 else
1402 patch->new_mode = patch->old_mode;
1403 }
fab2c257 1404 }
3cca928d
LT
1405
1406 if (new_name && old_name) {
1407 int same = !strcmp(old_name, new_name);
1408 if (!patch->new_mode)
1409 patch->new_mode = patch->old_mode;
1410 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
1411 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1412 patch->new_mode, new_name, patch->old_mode,
1413 same ? "" : " of ", same ? "" : old_name);
1414 }
1415
1416 if (apply_data(patch, &st) < 0)
011f4274 1417 return error("%s: patch does not apply", name);
a577284a 1418 return 0;
fab2c257
LT
1419}
1420
a577284a 1421static int check_patch_list(struct patch *patch)
19c58fb8 1422{
a577284a
LT
1423 int error = 0;
1424
1425 for (;patch ; patch = patch->next)
1426 error |= check_patch(patch);
1427 return error;
1428}
1429
2cf67f1e
JH
1430static inline int is_null_sha1(const unsigned char *sha1)
1431{
1432 return !memcmp(sha1, null_sha1, 20);
1433}
1434
1435static void show_index_list(struct patch *list)
1436{
1437 struct patch *patch;
1438
1439 /* Once we start supporting the reverse patch, it may be
1440 * worth showing the new sha1 prefix, but until then...
1441 */
1442 for (patch = list; patch; patch = patch->next) {
1443 const unsigned char *sha1_ptr;
1444 unsigned char sha1[20];
1445 const char *name;
1446
1447 name = patch->old_name ? patch->old_name : patch->new_name;
1448 if (patch->is_new)
1449 sha1_ptr = null_sha1;
1450 else if (get_sha1(patch->old_sha1_prefix, sha1))
1451 die("sha1 information is lacking or useless (%s).",
1452 name);
1453 else
1454 sha1_ptr = sha1;
22943f1a
JH
1455
1456 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
1457 if (line_termination && quote_c_style(name, NULL, NULL, 0))
1458 quote_c_style(name, NULL, stdout, 0);
1459 else
1460 fputs(name, stdout);
1461 putchar(line_termination);
2cf67f1e
JH
1462 }
1463}
1464
a577284a
LT
1465static void stat_patch_list(struct patch *patch)
1466{
1467 int files, adds, dels;
1468
1469 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
1470 files++;
1471 adds += patch->lines_added;
1472 dels += patch->lines_deleted;
1473 show_stats(patch);
1474 }
1475
1476 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
3f40315a
LT
1477}
1478
7d8b7c21
JH
1479static void numstat_patch_list(struct patch *patch)
1480{
1481 for ( ; patch; patch = patch->next) {
1482 const char *name;
1483 name = patch->old_name ? patch->old_name : patch->new_name;
1484 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
1485 if (line_termination && quote_c_style(name, NULL, NULL, 0))
1486 quote_c_style(name, NULL, stdout, 0);
1487 else
1488 fputs(name, stdout);
1489 putchar('\n');
1490 }
1491}
1492
96c912a4
JH
1493static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
1494{
1495 if (mode)
1496 printf(" %s mode %06o %s\n", newdelete, mode, name);
1497 else
1498 printf(" %s %s\n", newdelete, name);
1499}
1500
1501static void show_mode_change(struct patch *p, int show_name)
1502{
1503 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
1504 if (show_name)
1505 printf(" mode change %06o => %06o %s\n",
1506 p->old_mode, p->new_mode, p->new_name);
1507 else
1508 printf(" mode change %06o => %06o\n",
1509 p->old_mode, p->new_mode);
1510 }
1511}
1512
1513static void show_rename_copy(struct patch *p)
1514{
1515 const char *renamecopy = p->is_rename ? "rename" : "copy";
1516 const char *old, *new;
1517
1518 /* Find common prefix */
1519 old = p->old_name;
1520 new = p->new_name;
1521 while (1) {
1522 const char *slash_old, *slash_new;
1523 slash_old = strchr(old, '/');
1524 slash_new = strchr(new, '/');
1525 if (!slash_old ||
1526 !slash_new ||
1527 slash_old - old != slash_new - new ||
1528 memcmp(old, new, slash_new - new))
1529 break;
1530 old = slash_old + 1;
1531 new = slash_new + 1;
1532 }
1533 /* p->old_name thru old is the common prefix, and old and new
1534 * through the end of names are renames
1535 */
1536 if (old != p->old_name)
1537 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
e30e814d 1538 (int)(old - p->old_name), p->old_name,
96c912a4
JH
1539 old, new, p->score);
1540 else
1541 printf(" %s %s => %s (%d%%)\n", renamecopy,
1542 p->old_name, p->new_name, p->score);
1543 show_mode_change(p, 0);
1544}
1545
1546static void summary_patch_list(struct patch *patch)
1547{
1548 struct patch *p;
1549
1550 for (p = patch; p; p = p->next) {
1551 if (p->is_new)
1552 show_file_mode_name("create", p->new_mode, p->new_name);
1553 else if (p->is_delete)
1554 show_file_mode_name("delete", p->old_mode, p->old_name);
1555 else {
1556 if (p->is_rename || p->is_copy)
1557 show_rename_copy(p);
1558 else {
1559 if (p->score) {
1560 printf(" rewrite %s (%d%%)\n",
1561 p->new_name, p->score);
1562 show_mode_change(p, 0);
1563 }
1564 else
1565 show_mode_change(p, 1);
1566 }
1567 }
1568 }
1569}
1570
3f40315a
LT
1571static void patch_stats(struct patch *patch)
1572{
1573 int lines = patch->lines_added + patch->lines_deleted;
1574
1575 if (lines > max_change)
1576 max_change = lines;
1577 if (patch->old_name) {
22943f1a
JH
1578 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
1579 if (!len)
1580 len = strlen(patch->old_name);
3f40315a
LT
1581 if (len > max_len)
1582 max_len = len;
1583 }
1584 if (patch->new_name) {
22943f1a
JH
1585 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
1586 if (!len)
1587 len = strlen(patch->new_name);
3f40315a
LT
1588 if (len > max_len)
1589 max_len = len;
1590 }
19c58fb8
LT
1591}
1592
5aa7d94c
LT
1593static void remove_file(struct patch *patch)
1594{
1595 if (write_index) {
1596 if (remove_file_from_cache(patch->old_name) < 0)
1597 die("unable to remove %s from index", patch->old_name);
1598 }
1599 unlink(patch->old_name);
1600}
1601
1602static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
1603{
1604 struct stat st;
1605 struct cache_entry *ce;
1606 int namelen = strlen(path);
1607 unsigned ce_size = cache_entry_size(namelen);
1608
1609 if (!write_index)
1610 return;
1611
1612 ce = xmalloc(ce_size);
1613 memset(ce, 0, ce_size);
1614 memcpy(ce->name, path, namelen);
1615 ce->ce_mode = create_ce_mode(mode);
1616 ce->ce_flags = htons(namelen);
1617 if (lstat(path, &st) < 0)
1618 die("unable to stat newly created file %s", path);
1619 fill_stat_cache_info(ce, &st);
1620 if (write_sha1_file(buf, size, "blob", ce->sha1) < 0)
1621 die("unable to create backing store for newly created file %s", path);
1622 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
1623 die("unable to add cache entry for %s", path);
1624}
1625
1b668341
LT
1626static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
1627{
1628 int fd;
1629
1630 if (S_ISLNK(mode))
1631 return symlink(buf, path);
781411ed 1632 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
1b668341
LT
1633 if (fd < 0)
1634 return -1;
1635 while (size) {
1c15afb9
JH
1636 int written = xwrite(fd, buf, size);
1637 if (written < 0)
1b668341 1638 die("writing file %s: %s", path, strerror(errno));
1b668341
LT
1639 if (!written)
1640 die("out of space writing file %s", path);
1641 buf += written;
1642 size -= written;
1643 }
1644 if (close(fd) < 0)
1645 die("closing file %s: %s", path, strerror(errno));
1646 return 0;
1647}
1648
5c8af185
LT
1649/*
1650 * We optimistically assume that the directories exist,
1651 * which is true 99% of the time anyway. If they don't,
1652 * we create them and try again.
1653 */
8361e1d4 1654static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
5c8af185 1655{
1b668341
LT
1656 if (!try_create_file(path, mode, buf, size))
1657 return;
5c8af185 1658
1b668341 1659 if (errno == ENOENT) {
8361e1d4
JR
1660 if (safe_create_leading_directories(path))
1661 return;
1b668341
LT
1662 if (!try_create_file(path, mode, buf, size))
1663 return;
5c8af185 1664 }
5c8af185 1665
1b668341
LT
1666 if (errno == EEXIST) {
1667 unsigned int nr = getpid();
5c8af185 1668
1b668341
LT
1669 for (;;) {
1670 const char *newpath;
1671 newpath = mkpath("%s~%u", path, nr);
1672 if (!try_create_file(newpath, mode, buf, size)) {
1673 if (!rename(newpath, path))
1674 return;
1675 unlink(newpath);
1676 break;
1677 }
1678 if (errno != EEXIST)
1679 break;
d9e08be9
AR
1680 ++nr;
1681 }
5c8af185 1682 }
1b668341 1683 die("unable to write file %s mode %o", path, mode);
5c8af185
LT
1684}
1685
5aa7d94c
LT
1686static void create_file(struct patch *patch)
1687{
8361e1d4 1688 char *path = patch->new_name;
5aa7d94c
LT
1689 unsigned mode = patch->new_mode;
1690 unsigned long size = patch->resultsize;
1691 char *buf = patch->result;
1692
1693 if (!mode)
1694 mode = S_IFREG | 0644;
1b668341
LT
1695 create_one_file(path, mode, buf, size);
1696 add_index_file(path, mode, buf, size);
5aa7d94c
LT
1697}
1698
1699static void write_out_one_result(struct patch *patch)
1700{
1701 if (patch->is_delete > 0) {
1702 remove_file(patch);
1703 return;
1704 }
1705 if (patch->is_new > 0 || patch->is_copy) {
1706 create_file(patch);
1707 return;
1708 }
1709 /*
1710 * Rename or modification boils down to the same
1711 * thing: remove the old, write the new
1712 */
1713 remove_file(patch);
1714 create_file(patch);
1715}
1716
d854f783 1717static void write_out_results(struct patch *list, int skipped_patch)
5aa7d94c 1718{
d854f783 1719 if (!list && !skipped_patch)
f7b79707
LT
1720 die("No changes");
1721
5aa7d94c
LT
1722 while (list) {
1723 write_out_one_result(list);
1724 list = list->next;
1725 }
1726}
1727
1728static struct cache_file cache_file;
1729
d854f783
JH
1730static struct excludes {
1731 struct excludes *next;
1732 const char *path;
1733} *excludes;
1734
1735static int use_patch(struct patch *p)
1736{
c7c81b3a 1737 const char *pathname = p->new_name ? p->new_name : p->old_name;
d854f783
JH
1738 struct excludes *x = excludes;
1739 while (x) {
1740 if (fnmatch(x->path, pathname, 0) == 0)
1741 return 0;
1742 x = x->next;
1743 }
edf2e370
JH
1744 if (0 < prefix_length) {
1745 int pathlen = strlen(pathname);
1746 if (pathlen <= prefix_length ||
1747 memcmp(prefix, pathname, prefix_length))
1748 return 0;
1749 }
d854f783
JH
1750 return 1;
1751}
1752
b5767dd6 1753static int apply_patch(int fd, const char *filename)
c1bb9350 1754{
5aa7d94c 1755 int newfd;
c1bb9350
LT
1756 unsigned long offset, size;
1757 char *buffer = read_patch_file(fd, &size);
19c58fb8 1758 struct patch *list = NULL, **listp = &list;
d854f783 1759 int skipped_patch = 0;
c1bb9350 1760
b5767dd6 1761 patch_input_file = filename;
c1bb9350
LT
1762 if (!buffer)
1763 return -1;
1764 offset = 0;
1765 while (size > 0) {
19c58fb8
LT
1766 struct patch *patch;
1767 int nr;
1768
1769 patch = xmalloc(sizeof(*patch));
1770 memset(patch, 0, sizeof(*patch));
1771 nr = parse_chunk(buffer + offset, size, patch);
c1bb9350
LT
1772 if (nr < 0)
1773 break;
d854f783
JH
1774 if (use_patch(patch)) {
1775 patch_stats(patch);
1776 *listp = patch;
1777 listp = &patch->next;
1778 } else {
1779 /* perhaps free it a bit better? */
1780 free(patch);
1781 skipped_patch++;
1782 }
c1bb9350
LT
1783 offset += nr;
1784 size -= nr;
1785 }
19c58fb8 1786
5aa7d94c 1787 newfd = -1;
b5767dd6
JH
1788 if (whitespace_error && (new_whitespace == error_on_whitespace))
1789 apply = 0;
1790
5aa7d94c
LT
1791 write_index = check_index && apply;
1792 if (write_index)
1793 newfd = hold_index_file_for_update(&cache_file, get_index_file());
1794 if (check_index) {
1795 if (read_cache() < 0)
1796 die("unable to read index file");
1797 }
1798
a577284a
LT
1799 if ((check || apply) && check_patch_list(list) < 0)
1800 exit(1);
1801
5aa7d94c 1802 if (apply)
d854f783 1803 write_out_results(list, skipped_patch);
5aa7d94c
LT
1804
1805 if (write_index) {
1806 if (write_cache(newfd, active_cache, active_nr) ||
1807 commit_index_file(&cache_file))
1808 die("Unable to write new cachefile");
1809 }
1810
2cf67f1e
JH
1811 if (show_index_info)
1812 show_index_list(list);
1813
a577284a
LT
1814 if (diffstat)
1815 stat_patch_list(list);
19c58fb8 1816
7d8b7c21
JH
1817 if (numstat)
1818 numstat_patch_list(list);
1819
96c912a4
JH
1820 if (summary)
1821 summary_patch_list(list);
1822
c1bb9350
LT
1823 free(buffer);
1824 return 0;
1825}
1826
1827int main(int argc, char **argv)
1828{
1829 int i;
4dfdbe10 1830 int read_stdin = 1;
c1bb9350 1831
c1bb9350
LT
1832 for (i = 1; i < argc; i++) {
1833 const char *arg = argv[i];
1834 int fd;
1835
1836 if (!strcmp(arg, "-")) {
b5767dd6 1837 apply_patch(0, "<stdin>");
4dfdbe10 1838 read_stdin = 0;
c1bb9350
LT
1839 continue;
1840 }
d854f783
JH
1841 if (!strncmp(arg, "--exclude=", 10)) {
1842 struct excludes *x = xmalloc(sizeof(*x));
1843 x->path = arg + 10;
1844 x->next = excludes;
1845 excludes = x;
1846 continue;
1847 }
e36f8b60
DB
1848 if (!strncmp(arg, "-p", 2)) {
1849 p_value = atoi(arg + 2);
1850 continue;
1851 }
cb93c193
JH
1852 if (!strcmp(arg, "--no-add")) {
1853 no_add = 1;
1854 continue;
1855 }
fab2c257 1856 if (!strcmp(arg, "--stat")) {
a577284a 1857 apply = 0;
fab2c257
LT
1858 diffstat = 1;
1859 continue;
1860 }
011f4274
JH
1861 if (!strcmp(arg, "--allow-binary-replacement")) {
1862 allow_binary_replacement = 1;
1863 continue;
1864 }
7d8b7c21
JH
1865 if (!strcmp(arg, "--numstat")) {
1866 apply = 0;
1867 numstat = 1;
1868 continue;
1869 }
96c912a4
JH
1870 if (!strcmp(arg, "--summary")) {
1871 apply = 0;
1872 summary = 1;
1873 continue;
1874 }
a577284a
LT
1875 if (!strcmp(arg, "--check")) {
1876 apply = 0;
1877 check = 1;
1878 continue;
1879 }
3cca928d
LT
1880 if (!strcmp(arg, "--index")) {
1881 check_index = 1;
1882 continue;
1883 }
aefa4a5b
LT
1884 if (!strcmp(arg, "--apply")) {
1885 apply = 1;
1886 continue;
1887 }
22943f1a 1888 if (!strcmp(arg, "--index-info")) {
2cf67f1e
JH
1889 apply = 0;
1890 show_index_info = 1;
1891 continue;
1892 }
22943f1a
JH
1893 if (!strcmp(arg, "-z")) {
1894 line_termination = 0;
1895 continue;
1896 }
19bfcd5a 1897 if (!strncmp(arg, "--whitespace=", 13)) {
b5767dd6 1898 if (!strcmp(arg+13, "warn")) {
19bfcd5a
LT
1899 new_whitespace = warn_on_whitespace;
1900 continue;
1901 }
b5767dd6 1902 if (!strcmp(arg+13, "error")) {
19bfcd5a
LT
1903 new_whitespace = error_on_whitespace;
1904 continue;
1905 }
fc96b7c9
JH
1906 if (!strcmp(arg+13, "error-all")) {
1907 new_whitespace = error_on_whitespace;
1908 squelch_whitespace_errors = 0;
1909 continue;
1910 }
b5767dd6
JH
1911 if (!strcmp(arg+13, "strip")) {
1912 new_whitespace = strip_and_apply;
1913 continue;
1914 }
fc96b7c9 1915 die("unrecognized whitespace option '%s'", arg+13);
19bfcd5a 1916 }
edf2e370
JH
1917
1918 if (check_index && prefix_length < 0) {
1919 prefix = setup_git_directory();
1920 prefix_length = prefix ? strlen(prefix) : 0;
1921 git_config(git_default_config);
1922 }
1923 if (0 < prefix_length)
1924 arg = prefix_filename(prefix, prefix_length, arg);
1925
c1bb9350
LT
1926 fd = open(arg, O_RDONLY);
1927 if (fd < 0)
1928 usage(apply_usage);
4dfdbe10 1929 read_stdin = 0;
b5767dd6 1930 apply_patch(fd, arg);
c1bb9350
LT
1931 close(fd);
1932 }
4dfdbe10 1933 if (read_stdin)
b5767dd6 1934 apply_patch(0, "<stdin>");
fc96b7c9
JH
1935 if (whitespace_error) {
1936 if (squelch_whitespace_errors &&
1937 squelch_whitespace_errors < whitespace_error) {
1938 int squelched =
1939 whitespace_error - squelch_whitespace_errors;
1940 fprintf(stderr, "warning: squelched %d whitespace error%s\n",
1941 squelched,
1942 squelched == 1 ? "" : "s");
1943 }
1944 if (new_whitespace == error_on_whitespace)
1945 die("%d line%s add%s trailing whitespaces.",
1946 whitespace_error,
1947 whitespace_error == 1 ? "" : "s",
1948 whitespace_error == 1 ? "s" : "");
1949 if (applied_after_stripping)
1950 fprintf(stderr, "warning: %d line%s applied after"
1951 " stripping trailing whitespaces.\n",
1952 applied_after_stripping,
1953 applied_after_stripping == 1 ? "" : "s");
1954 else if (whitespace_error)
1955 fprintf(stderr, "warning: %d line%s add%s trailing"
1956 " whitespaces.\n",
1957 whitespace_error,
1958 whitespace_error == 1 ? "" : "s",
1959 whitespace_error == 1 ? "s" : "");
1960 }
c1bb9350
LT
1961 return 0;
1962}