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