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