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