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