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