contrib/git-svn: handle array values correctly
[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
c1504628 696 *p2 = 1;
fab2c257
LT
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
3103cf9e 837 if (patch->is_new && oldlines)
30996652 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 }
c1504628
LT
904 if (oldlines || newlines)
905 return -1;
8b64647d
JH
906 /* If a fragment ends with an incomplete line, we failed to include
907 * it in the above loop because we hit oldlines == newlines == 0
908 * before seeing it.
909 */
433ef8a2 910 if (12 < size && !memcmp(line, "\\ ", 2))
8b64647d
JH
911 offset += linelen(line, size);
912
3f40315a
LT
913 patch->lines_added += added;
914 patch->lines_deleted += deleted;
c1bb9350
LT
915 return offset;
916}
917
19c58fb8 918static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
c1bb9350
LT
919{
920 unsigned long offset = 0;
19c58fb8 921 struct fragment **fragp = &patch->fragments;
c1bb9350
LT
922
923 while (size > 4 && !memcmp(line, "@@ -", 4)) {
19c58fb8
LT
924 struct fragment *fragment;
925 int len;
926
927 fragment = xmalloc(sizeof(*fragment));
928 memset(fragment, 0, sizeof(*fragment));
929 len = parse_fragment(line, size, patch, fragment);
c1bb9350 930 if (len <= 0)
46979f56 931 die("corrupt patch at line %d", linenr);
c1bb9350 932
19c58fb8
LT
933 fragment->patch = line;
934 fragment->size = len;
935
936 *fragp = fragment;
937 fragp = &fragment->next;
c1bb9350
LT
938
939 offset += len;
940 line += len;
941 size -= len;
942 }
943 return offset;
944}
945
1fea629f
LT
946static inline int metadata_changes(struct patch *patch)
947{
948 return patch->is_rename > 0 ||
949 patch->is_copy > 0 ||
950 patch->is_new > 0 ||
951 patch->is_delete ||
952 (patch->old_mode && patch->new_mode &&
953 patch->old_mode != patch->new_mode);
954}
955
19c58fb8 956static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
c1bb9350
LT
957{
958 int hdrsize, patchsize;
19c58fb8 959 int offset = find_header(buffer, size, &hdrsize, patch);
c1bb9350
LT
960
961 if (offset < 0)
962 return offset;
c1bb9350 963
19c58fb8 964 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
c1bb9350 965
92927ed0 966 if (!patchsize) {
3200d1ae
JH
967 static const char *binhdr[] = {
968 "Binary files ",
969 "Files ",
970 NULL,
971 };
972 int i;
973 int hd = hdrsize + offset;
974 unsigned long llen = linelen(buffer + hd, size - hd);
975
976 if (!memcmp(" differ\n", buffer + hd + llen - 8, 8))
977 for (i = 0; binhdr[i]; i++) {
978 int len = strlen(binhdr[i]);
979 if (len < size - hd &&
980 !memcmp(binhdr[i], buffer + hd, len)) {
981 patch->is_binary = 1;
982 break;
983 }
984 }
ff36de08 985
92927ed0 986 /* Empty patch cannot be applied if:
011f4274
JH
987 * - it is a binary patch and we do not do binary_replace, or
988 * - text patch without metadata change
92927ed0
JH
989 */
990 if ((apply || check) &&
011f4274
JH
991 (patch->is_binary
992 ? !allow_binary_replacement
993 : !metadata_changes(patch)))
ff36de08
JH
994 die("patch with only garbage at line %d", linenr);
995 }
1fea629f 996
c1bb9350
LT
997 return offset + hdrsize + patchsize;
998}
999
6da4016a
LT
1000static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1001static const char minuses[]= "----------------------------------------------------------------------";
3f40315a
LT
1002
1003static void show_stats(struct patch *patch)
1004{
62917097 1005 const char *prefix = "";
03b4538b 1006 char *name = patch->new_name;
22943f1a 1007 char *qname = NULL;
95bedc9e 1008 int len, max, add, del, total;
3f40315a 1009
5041aa70 1010 if (!name)
03b4538b 1011 name = patch->old_name;
3f40315a 1012
22943f1a
JH
1013 if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
1014 qname = xmalloc(len + 1);
1015 quote_c_style(name, qname, NULL, 0);
1016 name = qname;
1017 }
1018
3f40315a
LT
1019 /*
1020 * "scale" the filename
1021 */
1022 len = strlen(name);
1023 max = max_len;
1024 if (max > 50)
1025 max = 50;
62917097
LT
1026 if (len > max) {
1027 char *slash;
1028 prefix = "...";
1029 max -= 3;
3f40315a 1030 name += len - max;
62917097
LT
1031 slash = strchr(name, '/');
1032 if (slash)
1033 name = slash;
1034 }
3f40315a
LT
1035 len = max;
1036
1037 /*
1038 * scale the add/delete
1039 */
1040 max = max_change;
1041 if (max + len > 70)
1042 max = 70 - len;
95bedc9e
LT
1043
1044 add = patch->lines_added;
1045 del = patch->lines_deleted;
1046 total = add + del;
1047
69f956e1
SV
1048 if (max_change > 0) {
1049 total = (total * max + max_change / 2) / max_change;
1050 add = (add * max + max_change / 2) / max_change;
1051 del = total - add;
1052 }
ff36de08
JH
1053 if (patch->is_binary)
1054 printf(" %s%-*s | Bin\n", prefix, len, name);
1055 else
1056 printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
1057 len, name, patch->lines_added + patch->lines_deleted,
1058 add, pluses, del, minuses);
22943f1a
JH
1059 if (qname)
1060 free(qname);
3f40315a
LT
1061}
1062
3cca928d
LT
1063static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
1064{
1065 int fd;
1066 unsigned long got;
1067
1068 switch (st->st_mode & S_IFMT) {
1069 case S_IFLNK:
1070 return readlink(path, buf, size);
1071 case S_IFREG:
1072 fd = open(path, O_RDONLY);
1073 if (fd < 0)
1074 return error("unable to open %s", path);
1075 got = 0;
1076 for (;;) {
1c15afb9
JH
1077 int ret = xread(fd, buf + got, size - got);
1078 if (ret <= 0)
3cca928d
LT
1079 break;
1080 got += ret;
1081 }
1082 close(fd);
1083 return got;
1084
1085 default:
1086 return -1;
1087 }
1088}
1089
1090static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line)
1091{
6e7c92a9
LT
1092 int i;
1093 unsigned long start, backwards, forwards;
3cca928d
LT
1094
1095 if (fragsize > size)
1096 return -1;
1097
1098 start = 0;
1099 if (line > 1) {
3cca928d 1100 unsigned long offset = 0;
6e7c92a9
LT
1101 i = line-1;
1102 while (offset + fragsize <= size) {
3cca928d
LT
1103 if (buf[offset++] == '\n') {
1104 start = offset;
6e7c92a9 1105 if (!--i)
3cca928d
LT
1106 break;
1107 }
1108 }
1109 }
1110
1111 /* Exact line number? */
1112 if (!memcmp(buf + start, fragment, fragsize))
1113 return start;
1114
6e7c92a9
LT
1115 /*
1116 * There's probably some smart way to do this, but I'll leave
1117 * that to the smart and beautiful people. I'm simple and stupid.
1118 */
1119 backwards = start;
1120 forwards = start;
1121 for (i = 0; ; i++) {
1122 unsigned long try;
1123 int n;
1124
1125 /* "backward" */
1126 if (i & 1) {
1127 if (!backwards) {
1128 if (forwards + fragsize > size)
1129 break;
1130 continue;
1131 }
1132 do {
1133 --backwards;
1134 } while (backwards && buf[backwards-1] != '\n');
1135 try = backwards;
1136 } else {
1137 while (forwards + fragsize <= size) {
1138 if (buf[forwards++] == '\n')
1139 break;
1140 }
1141 try = forwards;
1142 }
1143
1144 if (try + fragsize > size)
1145 continue;
1146 if (memcmp(buf + try, fragment, fragsize))
1147 continue;
1148 n = (i >> 1)+1;
1149 if (i & 1)
1150 n = -n;
6e7c92a9
LT
1151 return try;
1152 }
1153
3cca928d
LT
1154 /*
1155 * We should start searching forward and backward.
1156 */
1157 return -1;
1158}
1159
6e7c92a9
LT
1160struct buffer_desc {
1161 char *buffer;
1162 unsigned long size;
1163 unsigned long alloc;
1164};
1165
b5767dd6
JH
1166static int apply_line(char *output, const char *patch, int plen)
1167{
1168 /* plen is number of bytes to be copied from patch,
1169 * starting at patch+1 (patch[0] is '+'). Typically
1170 * patch[plen] is '\n'.
1171 */
1172 int add_nl_to_tail = 0;
2ae1c53b 1173 if ((new_whitespace == strip_whitespace) &&
b5767dd6
JH
1174 1 < plen && isspace(patch[plen-1])) {
1175 if (patch[plen] == '\n')
1176 add_nl_to_tail = 1;
1177 plen--;
1178 while (0 < plen && isspace(patch[plen]))
1179 plen--;
fc96b7c9 1180 applied_after_stripping++;
b5767dd6
JH
1181 }
1182 memcpy(output, patch + 1, plen);
1183 if (add_nl_to_tail)
1184 output[plen++] = '\n';
1185 return plen;
1186}
1187
6e7c92a9 1188static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
3cca928d 1189{
6e7c92a9 1190 char *buf = desc->buffer;
3cca928d
LT
1191 const char *patch = frag->patch;
1192 int offset, size = frag->size;
1193 char *old = xmalloc(size);
1194 char *new = xmalloc(size);
1195 int oldsize = 0, newsize = 0;
1196
1197 while (size > 0) {
1198 int len = linelen(patch, size);
1199 int plen;
1200
1201 if (!len)
1202 break;
1203
1204 /*
1205 * "plen" is how much of the line we should use for
1206 * the actual patch data. Normally we just remove the
1207 * first character on the line, but if the line is
1208 * followed by "\ No newline", then we also remove the
1209 * last one (which is the newline, of course).
1210 */
1211 plen = len-1;
8b64647d 1212 if (len < size && patch[len] == '\\')
3cca928d
LT
1213 plen--;
1214 switch (*patch) {
1215 case ' ':
1216 case '-':
1217 memcpy(old + oldsize, patch + 1, plen);
1218 oldsize += plen;
1219 if (*patch == '-')
1220 break;
1221 /* Fall-through for ' ' */
1222 case '+':
b5767dd6
JH
1223 if (*patch != '+' || !no_add)
1224 newsize += apply_line(new + newsize, patch,
1225 plen);
3cca928d
LT
1226 break;
1227 case '@': case '\\':
1228 /* Ignore it, we already handled it */
1229 break;
1230 default:
1231 return -1;
1232 }
1233 patch += len;
1234 size -= len;
1235 }
1236
5b5d4d9e
JS
1237#ifdef NO_ACCURATE_DIFF
1238 if (oldsize > 0 && old[oldsize - 1] == '\n' &&
1239 newsize > 0 && new[newsize - 1] == '\n') {
1240 oldsize--;
1241 newsize--;
1242 }
1243#endif
1244
6e7c92a9 1245 offset = find_offset(buf, desc->size, old, oldsize, frag->newpos);
3cca928d 1246 if (offset >= 0) {
6e7c92a9
LT
1247 int diff = newsize - oldsize;
1248 unsigned long size = desc->size + diff;
1249 unsigned long alloc = desc->alloc;
1250
1251 if (size > alloc) {
1252 alloc = size + 8192;
1253 desc->alloc = alloc;
1254 buf = xrealloc(buf, alloc);
1255 desc->buffer = buf;
1256 }
1257 desc->size = size;
1258 memmove(buf + offset + newsize, buf + offset + oldsize, size - offset - newsize);
1259 memcpy(buf + offset, new, newsize);
3cca928d
LT
1260 offset = 0;
1261 }
1262
1263 free(old);
1264 free(new);
1265 return offset;
1266}
1267
6e7c92a9 1268static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
3cca928d
LT
1269{
1270 struct fragment *frag = patch->fragments;
011f4274
JH
1271 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1272
1273 if (patch->is_binary) {
1274 unsigned char sha1[20];
1275
1276 if (!allow_binary_replacement)
1277 return error("cannot apply binary patch to '%s' "
1278 "without --allow-binary-replacement",
1279 name);
1280
1281 /* For safety, we require patch index line to contain
1282 * full 40-byte textual SHA1 for old and new, at least for now.
1283 */
1284 if (strlen(patch->old_sha1_prefix) != 40 ||
1285 strlen(patch->new_sha1_prefix) != 40 ||
1286 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1287 get_sha1_hex(patch->new_sha1_prefix, sha1))
1288 return error("cannot apply binary patch to '%s' "
1289 "without full index line", name);
1290
1291 if (patch->old_name) {
1292 unsigned char hdr[50];
1293 int hdrlen;
1294
1295 /* See if the old one matches what the patch
1296 * applies to.
1297 */
1298 write_sha1_file_prepare(desc->buffer, desc->size,
1299 "blob", sha1, hdr, &hdrlen);
1300 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1301 return error("the patch applies to '%s' (%s), "
1302 "which does not match the "
1303 "current contents.",
1304 name, sha1_to_hex(sha1));
1305 }
1306 else {
1307 /* Otherwise, the old one must be empty. */
1308 if (desc->size)
1309 return error("the patch applies to an empty "
1310 "'%s' but it is not empty", name);
1311 }
1312
1313 /* For now, we do not record post-image data in the patch,
1314 * and require the object already present in the recipient's
1315 * object database.
1316 */
1317 if (desc->buffer) {
1318 free(desc->buffer);
1319 desc->alloc = desc->size = 0;
1320 }
1321 get_sha1_hex(patch->new_sha1_prefix, sha1);
1322
1323 if (memcmp(sha1, null_sha1, 20)) {
1324 char type[10];
1325 unsigned long size;
1326
1327 desc->buffer = read_sha1_file(sha1, type, &size);
1328 if (!desc->buffer)
1329 return error("the necessary postimage %s for "
1330 "'%s' does not exist",
1331 patch->new_sha1_prefix, name);
1332 desc->alloc = desc->size = size;
1333 }
1334
1335 return 0;
1336 }
3cca928d
LT
1337
1338 while (frag) {
6e7c92a9 1339 if (apply_one_fragment(desc, frag) < 0)
011f4274
JH
1340 return error("patch failed: %s:%ld",
1341 name, frag->oldpos);
3cca928d
LT
1342 frag = frag->next;
1343 }
30996652 1344 return 0;
3cca928d
LT
1345}
1346
1347static int apply_data(struct patch *patch, struct stat *st)
1348{
6e7c92a9
LT
1349 char *buf;
1350 unsigned long size, alloc;
1351 struct buffer_desc desc;
3cca928d 1352
30996652
LT
1353 size = 0;
1354 alloc = 0;
1355 buf = NULL;
1356 if (patch->old_name) {
1357 size = st->st_size;
1358 alloc = size + 8192;
1359 buf = xmalloc(alloc);
1360 if (read_old_data(st, patch->old_name, buf, alloc) != size)
1361 return error("read of %s failed", patch->old_name);
1362 }
6e7c92a9
LT
1363
1364 desc.size = size;
1365 desc.alloc = alloc;
1366 desc.buffer = buf;
1367 if (apply_fragments(&desc, patch) < 0)
3cca928d 1368 return -1;
6e7c92a9
LT
1369 patch->result = desc.buffer;
1370 patch->resultsize = desc.size;
5aa7d94c
LT
1371
1372 if (patch->is_delete && patch->resultsize)
1373 return error("removal patch leaves file contents");
1374
3cca928d
LT
1375 return 0;
1376}
1377
a577284a 1378static int check_patch(struct patch *patch)
fab2c257 1379{
a577284a 1380 struct stat st;
fab2c257
LT
1381 const char *old_name = patch->old_name;
1382 const char *new_name = patch->new_name;
011f4274 1383 const char *name = old_name ? old_name : new_name;
fab2c257
LT
1384
1385 if (old_name) {
a577284a 1386 int changed;
56d33b11 1387 int stat_ret = lstat(old_name, &st);
a577284a 1388
3cca928d
LT
1389 if (check_index) {
1390 int pos = cache_name_pos(old_name, strlen(old_name));
1391 if (pos < 0)
56d33b11
JH
1392 return error("%s: does not exist in index",
1393 old_name);
1394 if (stat_ret < 0) {
1395 struct checkout costate;
1396 if (errno != ENOENT)
1397 return error("%s: %s", old_name,
1398 strerror(errno));
1399 /* checkout */
1400 costate.base_dir = "";
1401 costate.base_dir_len = 0;
1402 costate.force = 0;
1403 costate.quiet = 0;
1404 costate.not_new = 0;
1405 costate.refresh_cache = 1;
1406 if (checkout_entry(active_cache[pos],
de84f99c
SP
1407 &costate,
1408 NULL) ||
56d33b11
JH
1409 lstat(old_name, &st))
1410 return -1;
1411 }
1412
5f73076c 1413 changed = ce_match_stat(active_cache[pos], &st, 1);
3cca928d 1414 if (changed)
56d33b11
JH
1415 return error("%s: does not match index",
1416 old_name);
3cca928d 1417 }
56d33b11
JH
1418 else if (stat_ret < 0)
1419 return error("%s: %s", old_name, strerror(errno));
1420
3cca928d
LT
1421 if (patch->is_new < 0)
1422 patch->is_new = 0;
de4971b5 1423 st.st_mode = ntohl(create_ce_mode(st.st_mode));
a577284a
LT
1424 if (!patch->old_mode)
1425 patch->old_mode = st.st_mode;
3cca928d
LT
1426 if ((st.st_mode ^ patch->old_mode) & S_IFMT)
1427 return error("%s: wrong type", old_name);
1428 if (st.st_mode != patch->old_mode)
1429 fprintf(stderr, "warning: %s has type %o, expected %o\n",
1430 old_name, st.st_mode, patch->old_mode);
fab2c257 1431 }
a577284a 1432
fab2c257 1433 if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
3cca928d 1434 if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0)
a577284a
LT
1435 return error("%s: already exists in index", new_name);
1436 if (!lstat(new_name, &st))
1437 return error("%s: already exists in working directory", new_name);
1438 if (errno != ENOENT)
1439 return error("%s: %s", new_name, strerror(errno));
35cc4bcd
JS
1440 if (!patch->new_mode) {
1441 if (patch->is_new)
1442 patch->new_mode = S_IFREG | 0644;
1443 else
1444 patch->new_mode = patch->old_mode;
1445 }
fab2c257 1446 }
3cca928d
LT
1447
1448 if (new_name && old_name) {
1449 int same = !strcmp(old_name, new_name);
1450 if (!patch->new_mode)
1451 patch->new_mode = patch->old_mode;
1452 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
1453 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1454 patch->new_mode, new_name, patch->old_mode,
1455 same ? "" : " of ", same ? "" : old_name);
1456 }
1457
1458 if (apply_data(patch, &st) < 0)
011f4274 1459 return error("%s: patch does not apply", name);
a577284a 1460 return 0;
fab2c257
LT
1461}
1462
a577284a 1463static int check_patch_list(struct patch *patch)
19c58fb8 1464{
a577284a
LT
1465 int error = 0;
1466
1467 for (;patch ; patch = patch->next)
1468 error |= check_patch(patch);
1469 return error;
1470}
1471
2cf67f1e
JH
1472static inline int is_null_sha1(const unsigned char *sha1)
1473{
1474 return !memcmp(sha1, null_sha1, 20);
1475}
1476
1477static void show_index_list(struct patch *list)
1478{
1479 struct patch *patch;
1480
1481 /* Once we start supporting the reverse patch, it may be
1482 * worth showing the new sha1 prefix, but until then...
1483 */
1484 for (patch = list; patch; patch = patch->next) {
1485 const unsigned char *sha1_ptr;
1486 unsigned char sha1[20];
1487 const char *name;
1488
1489 name = patch->old_name ? patch->old_name : patch->new_name;
1490 if (patch->is_new)
1491 sha1_ptr = null_sha1;
1492 else if (get_sha1(patch->old_sha1_prefix, sha1))
1493 die("sha1 information is lacking or useless (%s).",
1494 name);
1495 else
1496 sha1_ptr = sha1;
22943f1a
JH
1497
1498 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
1499 if (line_termination && quote_c_style(name, NULL, NULL, 0))
1500 quote_c_style(name, NULL, stdout, 0);
1501 else
1502 fputs(name, stdout);
1503 putchar(line_termination);
2cf67f1e
JH
1504 }
1505}
1506
a577284a
LT
1507static void stat_patch_list(struct patch *patch)
1508{
1509 int files, adds, dels;
1510
1511 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
1512 files++;
1513 adds += patch->lines_added;
1514 dels += patch->lines_deleted;
1515 show_stats(patch);
1516 }
1517
1518 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
3f40315a
LT
1519}
1520
7d8b7c21
JH
1521static void numstat_patch_list(struct patch *patch)
1522{
1523 for ( ; patch; patch = patch->next) {
1524 const char *name;
1525 name = patch->old_name ? patch->old_name : patch->new_name;
1526 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
1527 if (line_termination && quote_c_style(name, NULL, NULL, 0))
1528 quote_c_style(name, NULL, stdout, 0);
1529 else
1530 fputs(name, stdout);
1531 putchar('\n');
1532 }
1533}
1534
96c912a4
JH
1535static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
1536{
1537 if (mode)
1538 printf(" %s mode %06o %s\n", newdelete, mode, name);
1539 else
1540 printf(" %s %s\n", newdelete, name);
1541}
1542
1543static void show_mode_change(struct patch *p, int show_name)
1544{
1545 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
1546 if (show_name)
1547 printf(" mode change %06o => %06o %s\n",
1548 p->old_mode, p->new_mode, p->new_name);
1549 else
1550 printf(" mode change %06o => %06o\n",
1551 p->old_mode, p->new_mode);
1552 }
1553}
1554
1555static void show_rename_copy(struct patch *p)
1556{
1557 const char *renamecopy = p->is_rename ? "rename" : "copy";
1558 const char *old, *new;
1559
1560 /* Find common prefix */
1561 old = p->old_name;
1562 new = p->new_name;
1563 while (1) {
1564 const char *slash_old, *slash_new;
1565 slash_old = strchr(old, '/');
1566 slash_new = strchr(new, '/');
1567 if (!slash_old ||
1568 !slash_new ||
1569 slash_old - old != slash_new - new ||
1570 memcmp(old, new, slash_new - new))
1571 break;
1572 old = slash_old + 1;
1573 new = slash_new + 1;
1574 }
1575 /* p->old_name thru old is the common prefix, and old and new
1576 * through the end of names are renames
1577 */
1578 if (old != p->old_name)
1579 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
e30e814d 1580 (int)(old - p->old_name), p->old_name,
96c912a4
JH
1581 old, new, p->score);
1582 else
1583 printf(" %s %s => %s (%d%%)\n", renamecopy,
1584 p->old_name, p->new_name, p->score);
1585 show_mode_change(p, 0);
1586}
1587
1588static void summary_patch_list(struct patch *patch)
1589{
1590 struct patch *p;
1591
1592 for (p = patch; p; p = p->next) {
1593 if (p->is_new)
1594 show_file_mode_name("create", p->new_mode, p->new_name);
1595 else if (p->is_delete)
1596 show_file_mode_name("delete", p->old_mode, p->old_name);
1597 else {
1598 if (p->is_rename || p->is_copy)
1599 show_rename_copy(p);
1600 else {
1601 if (p->score) {
1602 printf(" rewrite %s (%d%%)\n",
1603 p->new_name, p->score);
1604 show_mode_change(p, 0);
1605 }
1606 else
1607 show_mode_change(p, 1);
1608 }
1609 }
1610 }
1611}
1612
3f40315a
LT
1613static void patch_stats(struct patch *patch)
1614{
1615 int lines = patch->lines_added + patch->lines_deleted;
1616
1617 if (lines > max_change)
1618 max_change = lines;
1619 if (patch->old_name) {
22943f1a
JH
1620 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
1621 if (!len)
1622 len = strlen(patch->old_name);
3f40315a
LT
1623 if (len > max_len)
1624 max_len = len;
1625 }
1626 if (patch->new_name) {
22943f1a
JH
1627 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
1628 if (!len)
1629 len = strlen(patch->new_name);
3f40315a
LT
1630 if (len > max_len)
1631 max_len = len;
1632 }
19c58fb8
LT
1633}
1634
5aa7d94c
LT
1635static void remove_file(struct patch *patch)
1636{
1637 if (write_index) {
1638 if (remove_file_from_cache(patch->old_name) < 0)
1639 die("unable to remove %s from index", patch->old_name);
1640 }
1641 unlink(patch->old_name);
1642}
1643
1644static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
1645{
1646 struct stat st;
1647 struct cache_entry *ce;
1648 int namelen = strlen(path);
1649 unsigned ce_size = cache_entry_size(namelen);
1650
1651 if (!write_index)
1652 return;
1653
1654 ce = xmalloc(ce_size);
1655 memset(ce, 0, ce_size);
1656 memcpy(ce->name, path, namelen);
1657 ce->ce_mode = create_ce_mode(mode);
1658 ce->ce_flags = htons(namelen);
1659 if (lstat(path, &st) < 0)
1660 die("unable to stat newly created file %s", path);
1661 fill_stat_cache_info(ce, &st);
1662 if (write_sha1_file(buf, size, "blob", ce->sha1) < 0)
1663 die("unable to create backing store for newly created file %s", path);
1664 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
1665 die("unable to add cache entry for %s", path);
1666}
1667
1b668341
LT
1668static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
1669{
1670 int fd;
1671
1672 if (S_ISLNK(mode))
1673 return symlink(buf, path);
781411ed 1674 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
1b668341
LT
1675 if (fd < 0)
1676 return -1;
1677 while (size) {
1c15afb9
JH
1678 int written = xwrite(fd, buf, size);
1679 if (written < 0)
1b668341 1680 die("writing file %s: %s", path, strerror(errno));
1b668341
LT
1681 if (!written)
1682 die("out of space writing file %s", path);
1683 buf += written;
1684 size -= written;
1685 }
1686 if (close(fd) < 0)
1687 die("closing file %s: %s", path, strerror(errno));
1688 return 0;
1689}
1690
5c8af185
LT
1691/*
1692 * We optimistically assume that the directories exist,
1693 * which is true 99% of the time anyway. If they don't,
1694 * we create them and try again.
1695 */
8361e1d4 1696static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
5c8af185 1697{
1b668341
LT
1698 if (!try_create_file(path, mode, buf, size))
1699 return;
5c8af185 1700
1b668341 1701 if (errno == ENOENT) {
8361e1d4
JR
1702 if (safe_create_leading_directories(path))
1703 return;
1b668341
LT
1704 if (!try_create_file(path, mode, buf, size))
1705 return;
5c8af185 1706 }
5c8af185 1707
1b668341
LT
1708 if (errno == EEXIST) {
1709 unsigned int nr = getpid();
5c8af185 1710
1b668341
LT
1711 for (;;) {
1712 const char *newpath;
1713 newpath = mkpath("%s~%u", path, nr);
1714 if (!try_create_file(newpath, mode, buf, size)) {
1715 if (!rename(newpath, path))
1716 return;
1717 unlink(newpath);
1718 break;
1719 }
1720 if (errno != EEXIST)
1721 break;
d9e08be9
AR
1722 ++nr;
1723 }
5c8af185 1724 }
1b668341 1725 die("unable to write file %s mode %o", path, mode);
5c8af185
LT
1726}
1727
5aa7d94c
LT
1728static void create_file(struct patch *patch)
1729{
8361e1d4 1730 char *path = patch->new_name;
5aa7d94c
LT
1731 unsigned mode = patch->new_mode;
1732 unsigned long size = patch->resultsize;
1733 char *buf = patch->result;
1734
1735 if (!mode)
1736 mode = S_IFREG | 0644;
1b668341
LT
1737 create_one_file(path, mode, buf, size);
1738 add_index_file(path, mode, buf, size);
5aa7d94c
LT
1739}
1740
1741static void write_out_one_result(struct patch *patch)
1742{
1743 if (patch->is_delete > 0) {
1744 remove_file(patch);
1745 return;
1746 }
1747 if (patch->is_new > 0 || patch->is_copy) {
1748 create_file(patch);
1749 return;
1750 }
1751 /*
1752 * Rename or modification boils down to the same
1753 * thing: remove the old, write the new
1754 */
1755 remove_file(patch);
1756 create_file(patch);
1757}
1758
d854f783 1759static void write_out_results(struct patch *list, int skipped_patch)
5aa7d94c 1760{
d854f783 1761 if (!list && !skipped_patch)
f7b79707
LT
1762 die("No changes");
1763
5aa7d94c
LT
1764 while (list) {
1765 write_out_one_result(list);
1766 list = list->next;
1767 }
1768}
1769
1770static struct cache_file cache_file;
1771
d854f783
JH
1772static struct excludes {
1773 struct excludes *next;
1774 const char *path;
1775} *excludes;
1776
1777static int use_patch(struct patch *p)
1778{
c7c81b3a 1779 const char *pathname = p->new_name ? p->new_name : p->old_name;
d854f783
JH
1780 struct excludes *x = excludes;
1781 while (x) {
1782 if (fnmatch(x->path, pathname, 0) == 0)
1783 return 0;
1784 x = x->next;
1785 }
edf2e370
JH
1786 if (0 < prefix_length) {
1787 int pathlen = strlen(pathname);
1788 if (pathlen <= prefix_length ||
1789 memcmp(prefix, pathname, prefix_length))
1790 return 0;
1791 }
d854f783
JH
1792 return 1;
1793}
1794
b5767dd6 1795static int apply_patch(int fd, const char *filename)
c1bb9350 1796{
5aa7d94c 1797 int newfd;
c1bb9350
LT
1798 unsigned long offset, size;
1799 char *buffer = read_patch_file(fd, &size);
19c58fb8 1800 struct patch *list = NULL, **listp = &list;
d854f783 1801 int skipped_patch = 0;
c1bb9350 1802
b5767dd6 1803 patch_input_file = filename;
c1bb9350
LT
1804 if (!buffer)
1805 return -1;
1806 offset = 0;
1807 while (size > 0) {
19c58fb8
LT
1808 struct patch *patch;
1809 int nr;
1810
1811 patch = xmalloc(sizeof(*patch));
1812 memset(patch, 0, sizeof(*patch));
1813 nr = parse_chunk(buffer + offset, size, patch);
c1bb9350
LT
1814 if (nr < 0)
1815 break;
d854f783
JH
1816 if (use_patch(patch)) {
1817 patch_stats(patch);
1818 *listp = patch;
1819 listp = &patch->next;
1820 } else {
1821 /* perhaps free it a bit better? */
1822 free(patch);
1823 skipped_patch++;
1824 }
c1bb9350
LT
1825 offset += nr;
1826 size -= nr;
1827 }
19c58fb8 1828
5aa7d94c 1829 newfd = -1;
b5767dd6
JH
1830 if (whitespace_error && (new_whitespace == error_on_whitespace))
1831 apply = 0;
1832
5aa7d94c
LT
1833 write_index = check_index && apply;
1834 if (write_index)
1835 newfd = hold_index_file_for_update(&cache_file, get_index_file());
1836 if (check_index) {
1837 if (read_cache() < 0)
1838 die("unable to read index file");
1839 }
1840
a577284a
LT
1841 if ((check || apply) && check_patch_list(list) < 0)
1842 exit(1);
1843
5aa7d94c 1844 if (apply)
d854f783 1845 write_out_results(list, skipped_patch);
5aa7d94c
LT
1846
1847 if (write_index) {
1848 if (write_cache(newfd, active_cache, active_nr) ||
1849 commit_index_file(&cache_file))
1850 die("Unable to write new cachefile");
1851 }
1852
2cf67f1e
JH
1853 if (show_index_info)
1854 show_index_list(list);
1855
a577284a
LT
1856 if (diffstat)
1857 stat_patch_list(list);
19c58fb8 1858
7d8b7c21
JH
1859 if (numstat)
1860 numstat_patch_list(list);
1861
96c912a4
JH
1862 if (summary)
1863 summary_patch_list(list);
1864
c1bb9350
LT
1865 free(buffer);
1866 return 0;
1867}
1868
2ae1c53b
JH
1869static int git_apply_config(const char *var, const char *value)
1870{
1871 if (!strcmp(var, "apply.whitespace")) {
1872 apply_default_whitespace = strdup(value);
1873 return 0;
1874 }
1875 return git_default_config(var, value);
1876}
1877
1878
c1bb9350
LT
1879int main(int argc, char **argv)
1880{
1881 int i;
4dfdbe10 1882 int read_stdin = 1;
2ae1c53b 1883 const char *whitespace_option = NULL;
c1bb9350 1884
c1bb9350
LT
1885 for (i = 1; i < argc; i++) {
1886 const char *arg = argv[i];
1887 int fd;
1888
1889 if (!strcmp(arg, "-")) {
b5767dd6 1890 apply_patch(0, "<stdin>");
4dfdbe10 1891 read_stdin = 0;
c1bb9350
LT
1892 continue;
1893 }
d854f783
JH
1894 if (!strncmp(arg, "--exclude=", 10)) {
1895 struct excludes *x = xmalloc(sizeof(*x));
1896 x->path = arg + 10;
1897 x->next = excludes;
1898 excludes = x;
1899 continue;
1900 }
e36f8b60
DB
1901 if (!strncmp(arg, "-p", 2)) {
1902 p_value = atoi(arg + 2);
1903 continue;
1904 }
cb93c193
JH
1905 if (!strcmp(arg, "--no-add")) {
1906 no_add = 1;
1907 continue;
1908 }
fab2c257 1909 if (!strcmp(arg, "--stat")) {
a577284a 1910 apply = 0;
fab2c257
LT
1911 diffstat = 1;
1912 continue;
1913 }
011f4274
JH
1914 if (!strcmp(arg, "--allow-binary-replacement")) {
1915 allow_binary_replacement = 1;
1916 continue;
1917 }
7d8b7c21
JH
1918 if (!strcmp(arg, "--numstat")) {
1919 apply = 0;
1920 numstat = 1;
1921 continue;
1922 }
96c912a4
JH
1923 if (!strcmp(arg, "--summary")) {
1924 apply = 0;
1925 summary = 1;
1926 continue;
1927 }
a577284a
LT
1928 if (!strcmp(arg, "--check")) {
1929 apply = 0;
1930 check = 1;
1931 continue;
1932 }
3cca928d
LT
1933 if (!strcmp(arg, "--index")) {
1934 check_index = 1;
1935 continue;
1936 }
aefa4a5b
LT
1937 if (!strcmp(arg, "--apply")) {
1938 apply = 1;
1939 continue;
1940 }
22943f1a 1941 if (!strcmp(arg, "--index-info")) {
2cf67f1e
JH
1942 apply = 0;
1943 show_index_info = 1;
1944 continue;
1945 }
22943f1a
JH
1946 if (!strcmp(arg, "-z")) {
1947 line_termination = 0;
1948 continue;
1949 }
19bfcd5a 1950 if (!strncmp(arg, "--whitespace=", 13)) {
2ae1c53b
JH
1951 whitespace_option = arg + 13;
1952 parse_whitespace_option(arg + 13);
1953 continue;
19bfcd5a 1954 }
edf2e370
JH
1955
1956 if (check_index && prefix_length < 0) {
1957 prefix = setup_git_directory();
1958 prefix_length = prefix ? strlen(prefix) : 0;
2ae1c53b
JH
1959 git_config(git_apply_config);
1960 if (!whitespace_option && apply_default_whitespace)
1961 parse_whitespace_option(apply_default_whitespace);
edf2e370
JH
1962 }
1963 if (0 < prefix_length)
1964 arg = prefix_filename(prefix, prefix_length, arg);
1965
c1bb9350
LT
1966 fd = open(arg, O_RDONLY);
1967 if (fd < 0)
1968 usage(apply_usage);
4dfdbe10 1969 read_stdin = 0;
f21d6726 1970 set_default_whitespace_mode(whitespace_option);
b5767dd6 1971 apply_patch(fd, arg);
c1bb9350
LT
1972 close(fd);
1973 }
f21d6726 1974 set_default_whitespace_mode(whitespace_option);
4dfdbe10 1975 if (read_stdin)
b5767dd6 1976 apply_patch(0, "<stdin>");
fc96b7c9
JH
1977 if (whitespace_error) {
1978 if (squelch_whitespace_errors &&
1979 squelch_whitespace_errors < whitespace_error) {
1980 int squelched =
1981 whitespace_error - squelch_whitespace_errors;
1982 fprintf(stderr, "warning: squelched %d whitespace error%s\n",
1983 squelched,
1984 squelched == 1 ? "" : "s");
1985 }
1986 if (new_whitespace == error_on_whitespace)
1987 die("%d line%s add%s trailing whitespaces.",
1988 whitespace_error,
1989 whitespace_error == 1 ? "" : "s",
1990 whitespace_error == 1 ? "s" : "");
1991 if (applied_after_stripping)
1992 fprintf(stderr, "warning: %d line%s applied after"
1993 " stripping trailing whitespaces.\n",
1994 applied_after_stripping,
1995 applied_after_stripping == 1 ? "" : "s");
1996 else if (whitespace_error)
1997 fprintf(stderr, "warning: %d line%s add%s trailing"
1998 " whitespaces.\n",
1999 whitespace_error,
2000 whitespace_error == 1 ? "" : "s",
2001 whitespace_error == 1 ? "s" : "");
2002 }
c1bb9350
LT
2003 return 0;
2004}