color-words: expand docs with precise semantics
[git/git.git] / diff.c
CommitLineData
6973dcae
JH
1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
6973dcae
JH
4#include "cache.h"
5#include "quote.h"
6#include "diff.h"
7#include "diffcore.h"
051308f6 8#include "delta.h"
6973dcae 9#include "xdiff-interface.h"
7c92fe0e 10#include "color.h"
8c701249 11#include "attr.h"
d5535ec7 12#include "run-command.h"
23707811 13#include "utf8.h"
be58e70d 14#include "userdiff.h"
6973dcae 15
1510fea7
SP
16#ifdef NO_FAST_WORKING_DIRECTORY
17#define FAST_WORKING_DIRECTORY 0
18#else
19#define FAST_WORKING_DIRECTORY 1
20#endif
21
96f1e58f 22static int diff_detect_rename_default;
50705915 23static int diff_rename_limit_default = 200;
a624eaa7 24static int diff_suppress_blank_empty;
6b2f2d98 25int diff_use_color_default = -1;
cbe02100 26static const char *external_diff_cmd_cfg;
aecbf914 27int diff_auto_refresh_index = 1;
a5a818ee 28static int diff_mnemonic_prefix;
6973dcae 29
7c92fe0e 30static char diff_colors[][COLOR_MAXLEN] = {
f37399e6 31 "\033[m", /* reset */
448c3ef1
JH
32 "", /* PLAIN (normal) */
33 "\033[1m", /* METAINFO (bold) */
34 "\033[36m", /* FRAGINFO (cyan) */
35 "\033[31m", /* OLD (red) */
36 "\033[32m", /* NEW (green) */
37 "\033[33m", /* COMMIT (yellow) */
38 "\033[41m", /* WHITESPACE (red background) */
cd112cef
JS
39};
40
9cb92c39
JK
41static void diff_filespec_load_driver(struct diff_filespec *one);
42static char *run_textconv(const char *, struct diff_filespec *, size_t *);
43
801235c5
JH
44static int parse_diff_color_slot(const char *var, int ofs)
45{
46 if (!strcasecmp(var+ofs, "plain"))
47 return DIFF_PLAIN;
48 if (!strcasecmp(var+ofs, "meta"))
49 return DIFF_METAINFO;
50 if (!strcasecmp(var+ofs, "frag"))
51 return DIFF_FRAGINFO;
52 if (!strcasecmp(var+ofs, "old"))
53 return DIFF_FILE_OLD;
54 if (!strcasecmp(var+ofs, "new"))
55 return DIFF_FILE_NEW;
ce436973
JK
56 if (!strcasecmp(var+ofs, "commit"))
57 return DIFF_COMMIT;
448c3ef1
JH
58 if (!strcasecmp(var+ofs, "whitespace"))
59 return DIFF_WHITESPACE;
801235c5
JH
60 die("bad config variable '%s'", var);
61}
62
83ad63cf
JH
63/*
64 * These are to give UI layer defaults.
65 * The core-level commands such as git-diff-files should
66 * never be affected by the setting of diff.renames
67 * the user happens to have in the configuration file.
68 */
ef90d6d4 69int git_diff_ui_config(const char *var, const char *value, void *cb)
801235c5 70{
a159ca0c 71 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
0f6f5a40 72 diff_use_color_default = git_config_colorbool(var, value, -1);
801235c5
JH
73 return 0;
74 }
b68ea12e
EW
75 if (!strcmp(var, "diff.renames")) {
76 if (!value)
77 diff_detect_rename_default = DIFF_DETECT_RENAME;
78 else if (!strcasecmp(value, "copies") ||
79 !strcasecmp(value, "copy"))
80 diff_detect_rename_default = DIFF_DETECT_COPY;
81 else if (git_config_bool(var,value))
82 diff_detect_rename_default = DIFF_DETECT_RENAME;
83 return 0;
84 }
aecbf914
JH
85 if (!strcmp(var, "diff.autorefreshindex")) {
86 diff_auto_refresh_index = git_config_bool(var, value);
87 return 0;
88 }
a5a818ee
JH
89 if (!strcmp(var, "diff.mnemonicprefix")) {
90 diff_mnemonic_prefix = git_config_bool(var, value);
91 return 0;
92 }
daec808c
BH
93 if (!strcmp(var, "diff.external"))
94 return git_config_string(&external_diff_cmd_cfg, var, value);
f1af60bd 95
ef90d6d4 96 return git_diff_basic_config(var, value, cb);
9a1805a8
JK
97}
98
ef90d6d4 99int git_diff_basic_config(const char *var, const char *value, void *cb)
9a1805a8 100{
2b6ca6df
LT
101 if (!strcmp(var, "diff.renamelimit")) {
102 diff_rename_limit_default = git_config_int(var, value);
103 return 0;
104 }
105
c7534ef4
JK
106 switch (userdiff_config(var, value)) {
107 case 0: break;
108 case -1: return -1;
109 default: return 0;
110 }
111
1968d77d 112 if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
801235c5 113 int slot = parse_diff_color_slot(var, 11);
64f30e94
JH
114 if (!value)
115 return config_error_nonbool(var);
7c92fe0e 116 color_parse(value, var, diff_colors[slot]);
801235c5
JH
117 return 0;
118 }
f1af60bd 119
a624eaa7
JM
120 /* like GNU diff's --suppress-blank-empty option */
121 if (!strcmp(var, "diff.suppress-blank-empty")) {
122 diff_suppress_blank_empty = git_config_bool(var, value);
123 return 0;
124 }
125
ef90d6d4 126 return git_color_default_config(var, value, cb);
801235c5
JH
127}
128
6973dcae
JH
129static char *quote_two(const char *one, const char *two)
130{
131 int need_one = quote_c_style(one, NULL, NULL, 1);
132 int need_two = quote_c_style(two, NULL, NULL, 1);
f285a2d7 133 struct strbuf res = STRBUF_INIT;
6973dcae
JH
134
135 if (need_one + need_two) {
663af342
PH
136 strbuf_addch(&res, '"');
137 quote_c_style(one, &res, NULL, 1);
138 quote_c_style(two, &res, NULL, 1);
139 strbuf_addch(&res, '"');
140 } else {
141 strbuf_addstr(&res, one);
142 strbuf_addstr(&res, two);
6973dcae 143 }
b315c5c0 144 return strbuf_detach(&res, NULL);
6973dcae
JH
145}
146
147static const char *external_diff(void)
148{
149 static const char *external_diff_cmd = NULL;
150 static int done_preparing = 0;
151
152 if (done_preparing)
153 return external_diff_cmd;
154 external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
cbe02100
JS
155 if (!external_diff_cmd)
156 external_diff_cmd = external_diff_cmd_cfg;
6973dcae
JH
157 done_preparing = 1;
158 return external_diff_cmd;
159}
160
6973dcae
JH
161static struct diff_tempfile {
162 const char *name; /* filename external diff should read from */
163 char hex[41];
164 char mode[10];
1472966c 165 char tmp_path[PATH_MAX];
6973dcae
JH
166} diff_temp[2];
167
168static int count_lines(const char *data, int size)
169{
170 int count, ch, completely_empty = 1, nl_just_seen = 0;
171 count = 0;
172 while (0 < size--) {
173 ch = *data++;
174 if (ch == '\n') {
175 count++;
176 nl_just_seen = 1;
177 completely_empty = 0;
178 }
179 else {
180 nl_just_seen = 0;
181 completely_empty = 0;
182 }
183 }
184 if (completely_empty)
185 return 0;
186 if (!nl_just_seen)
187 count++; /* no trailing newline */
188 return count;
189}
190
c0c77734 191static void print_line_count(FILE *file, int count)
6973dcae
JH
192{
193 switch (count) {
194 case 0:
c0c77734 195 fprintf(file, "0,0");
6973dcae
JH
196 break;
197 case 1:
c0c77734 198 fprintf(file, "1");
6973dcae
JH
199 break;
200 default:
c0c77734 201 fprintf(file, "1,%d", count);
6973dcae
JH
202 break;
203 }
204}
205
c0c77734
DB
206static void copy_file_with_prefix(FILE *file,
207 int prefix, const char *data, int size,
1468bd47 208 const char *set, const char *reset)
6973dcae
JH
209{
210 int ch, nl_just_seen = 1;
211 while (0 < size--) {
212 ch = *data++;
13e36ec5 213 if (nl_just_seen) {
c0c77734
DB
214 fputs(set, file);
215 putc(prefix, file);
13e36ec5
JS
216 }
217 if (ch == '\n') {
6973dcae 218 nl_just_seen = 1;
c0c77734 219 fputs(reset, file);
13e36ec5 220 } else
6973dcae 221 nl_just_seen = 0;
c0c77734 222 putc(ch, file);
6973dcae
JH
223 }
224 if (!nl_just_seen)
c0c77734 225 fprintf(file, "%s\n\\ No newline at end of file\n", reset);
6973dcae
JH
226}
227
228static void emit_rewrite_diff(const char *name_a,
229 const char *name_b,
230 struct diff_filespec *one,
13e36ec5 231 struct diff_filespec *two,
3aa1f7ca
JK
232 const char *textconv_one,
233 const char *textconv_two,
eab9a40b 234 struct diff_options *o)
6973dcae
JH
235{
236 int lc_a, lc_b;
eab9a40b 237 int color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
1a9eb3b9 238 const char *name_a_tab, *name_b_tab;
13e36ec5
JS
239 const char *metainfo = diff_get_color(color_diff, DIFF_METAINFO);
240 const char *fraginfo = diff_get_color(color_diff, DIFF_FRAGINFO);
241 const char *old = diff_get_color(color_diff, DIFF_FILE_OLD);
242 const char *new = diff_get_color(color_diff, DIFF_FILE_NEW);
243 const char *reset = diff_get_color(color_diff, DIFF_RESET);
d5625091 244 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
a5a818ee 245 const char *a_prefix, *b_prefix;
3aa1f7ca
JK
246 const char *data_one, *data_two;
247 size_t size_one, size_two;
a5a818ee
JH
248
249 if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
250 a_prefix = o->b_prefix;
251 b_prefix = o->a_prefix;
252 } else {
253 a_prefix = o->a_prefix;
254 b_prefix = o->b_prefix;
255 }
1a9eb3b9 256
8a13becc
JH
257 name_a += (*name_a == '/');
258 name_b += (*name_b == '/');
1a9eb3b9
JH
259 name_a_tab = strchr(name_a, ' ') ? "\t" : "";
260 name_b_tab = strchr(name_b, ' ') ? "\t" : "";
261
d5625091
JH
262 strbuf_reset(&a_name);
263 strbuf_reset(&b_name);
a5a818ee
JH
264 quote_two_c_style(&a_name, a_prefix, name_a, 0);
265 quote_two_c_style(&b_name, b_prefix, name_b, 0);
d5625091 266
6973dcae
JH
267 diff_populate_filespec(one, 0);
268 diff_populate_filespec(two, 0);
3aa1f7ca
JK
269 if (textconv_one) {
270 data_one = run_textconv(textconv_one, one, &size_one);
271 if (!data_one)
272 die("unable to read files to diff");
273 }
274 else {
275 data_one = one->data;
276 size_one = one->size;
277 }
278 if (textconv_two) {
279 data_two = run_textconv(textconv_two, two, &size_two);
280 if (!data_two)
281 die("unable to read files to diff");
282 }
283 else {
284 data_two = two->data;
285 size_two = two->size;
286 }
287
288 lc_a = count_lines(data_one, size_one);
289 lc_b = count_lines(data_two, size_two);
c0c77734
DB
290 fprintf(o->file,
291 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
292 metainfo, a_name.buf, name_a_tab, reset,
293 metainfo, b_name.buf, name_b_tab, reset, fraginfo);
294 print_line_count(o->file, lc_a);
295 fprintf(o->file, " +");
296 print_line_count(o->file, lc_b);
297 fprintf(o->file, " @@%s\n", reset);
6973dcae 298 if (lc_a)
3aa1f7ca 299 copy_file_with_prefix(o->file, '-', data_one, size_one, old, reset);
6973dcae 300 if (lc_b)
3aa1f7ca 301 copy_file_with_prefix(o->file, '+', data_two, size_two, new, reset);
6973dcae
JH
302}
303
304static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
305{
306 if (!DIFF_FILE_VALID(one)) {
d2543b8e 307 mf->ptr = (char *)""; /* does not matter */
6973dcae
JH
308 mf->size = 0;
309 return 0;
310 }
311 else if (diff_populate_filespec(one, 0))
312 return -1;
9cb92c39 313
04427ac8
JK
314 mf->ptr = one->data;
315 mf->size = one->size;
6973dcae
JH
316 return 0;
317}
318
f59a59e2
JS
319struct diff_words_buffer {
320 mmfile_t text;
321 long alloc;
2e5d2003
JS
322 struct diff_words_orig {
323 const char *begin, *end;
324 } *orig;
325 int orig_nr, orig_alloc;
f59a59e2
JS
326};
327
328static void diff_words_append(char *line, unsigned long len,
329 struct diff_words_buffer *buffer)
330{
23c1575f 331 ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
f59a59e2
JS
332 line++;
333 len--;
334 memcpy(buffer->text.ptr + buffer->text.size, line, len);
335 buffer->text.size += len;
2b6a5417 336 buffer->text.ptr[buffer->text.size] = '\0';
f59a59e2
JS
337}
338
339struct diff_words_data {
f59a59e2 340 struct diff_words_buffer minus, plus;
2e5d2003 341 const char *current_plus;
c0c77734 342 FILE *file;
2b6a5417 343 regex_t *word_regex;
f59a59e2
JS
344};
345
f59a59e2
JS
346static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
347{
348 struct diff_words_data *diff_words = priv;
2e5d2003
JS
349 int minus_first, minus_len, plus_first, plus_len;
350 const char *minus_begin, *minus_end, *plus_begin, *plus_end;
f59a59e2 351
2e5d2003
JS
352 if (line[0] != '@' || parse_hunk_header(line, len,
353 &minus_first, &minus_len, &plus_first, &plus_len))
354 return;
f59a59e2 355
2e5d2003
JS
356 /* POSIX requires that first be decremented by one if len == 0... */
357 if (minus_len) {
358 minus_begin = diff_words->minus.orig[minus_first].begin;
359 minus_end =
360 diff_words->minus.orig[minus_first + minus_len - 1].end;
361 } else
362 minus_begin = minus_end =
363 diff_words->minus.orig[minus_first].end;
364
365 if (plus_len) {
366 plus_begin = diff_words->plus.orig[plus_first].begin;
367 plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
368 } else
369 plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
370
371 if (diff_words->current_plus != plus_begin)
372 fwrite(diff_words->current_plus,
373 plus_begin - diff_words->current_plus, 1,
374 diff_words->file);
375 if (minus_begin != minus_end)
376 color_fwrite_lines(diff_words->file,
377 diff_get_color(1, DIFF_FILE_OLD),
378 minus_end - minus_begin, minus_begin);
379 if (plus_begin != plus_end)
380 color_fwrite_lines(diff_words->file,
381 diff_get_color(1, DIFF_FILE_NEW),
382 plus_end - plus_begin, plus_begin);
383
384 diff_words->current_plus = plus_end;
f59a59e2
JS
385}
386
2b6a5417
JS
387/* This function starts looking at *begin, and returns 0 iff a word was found. */
388static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
389 int *begin, int *end)
390{
391 if (word_regex && *begin < buffer->size) {
392 regmatch_t match[1];
393 if (!regexec(word_regex, buffer->ptr + *begin, 1, match, 0)) {
394 char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
395 '\n', match[0].rm_eo - match[0].rm_so);
396 *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
397 *begin += match[0].rm_so;
398 return *begin >= *end;
399 }
400 return -1;
401 }
402
403 /* find the next word */
404 while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
405 (*begin)++;
406 if (*begin >= buffer->size)
407 return -1;
408
409 /* find the end of the word */
410 *end = *begin + 1;
411 while (*end < buffer->size && !isspace(buffer->ptr[*end]))
412 (*end)++;
413
414 return 0;
415}
416
23c1575f 417/*
2e5d2003
JS
418 * This function splits the words in buffer->text, stores the list with
419 * newline separator into out, and saves the offsets of the original words
420 * in buffer->orig.
23c1575f 421 */
2b6a5417
JS
422static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
423 regex_t *word_regex)
23c1575f 424{
2e5d2003 425 int i, j;
2b6a5417 426 long alloc = 0;
2e5d2003
JS
427
428 out->size = 0;
2b6a5417 429 out->ptr = NULL;
2e5d2003
JS
430
431 /* fake an empty "0th" word */
432 ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
433 buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
434 buffer->orig_nr = 1;
435
436 for (i = 0; i < buffer->text.size; i++) {
2b6a5417
JS
437 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
438 return;
2e5d2003
JS
439
440 /* store original boundaries */
441 ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
442 buffer->orig_alloc);
443 buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
444 buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
445 buffer->orig_nr++;
446
447 /* store one word */
2b6a5417 448 ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
2e5d2003
JS
449 memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
450 out->ptr[out->size + j - i] = '\n';
451 out->size += j - i + 1;
452
453 i = j - 1;
454 }
23c1575f
JS
455}
456
f59a59e2
JS
457/* this executes the word diff on the accumulated buffers */
458static void diff_words_show(struct diff_words_data *diff_words)
459{
460 xpparam_t xpp;
461 xdemitconf_t xecfg;
462 xdemitcb_t ecb;
463 mmfile_t minus, plus;
f59a59e2 464
2e5d2003
JS
465 /* special case: only removal */
466 if (!diff_words->plus.text.size) {
467 color_fwrite_lines(diff_words->file,
468 diff_get_color(1, DIFF_FILE_OLD),
469 diff_words->minus.text.size, diff_words->minus.text.ptr);
470 diff_words->minus.text.size = 0;
471 return;
472 }
473
474 diff_words->current_plus = diff_words->plus.text.ptr;
475
9ccd0a88 476 memset(&xpp, 0, sizeof(xpp));
30b25010 477 memset(&xecfg, 0, sizeof(xecfg));
2b6a5417
JS
478 diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
479 diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
f59a59e2 480 xpp.flags = XDF_NEED_MINIMAL;
2b6a5417 481 /* as only the hunk header will be parsed, we need a 0-context */
2e5d2003 482 xecfg.ctxlen = 0;
8a3f524b
JH
483 xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
484 &xpp, &xecfg, &ecb);
f59a59e2
JS
485 free(minus.ptr);
486 free(plus.ptr);
2e5d2003
JS
487 if (diff_words->current_plus != diff_words->plus.text.ptr +
488 diff_words->plus.text.size)
489 fwrite(diff_words->current_plus,
490 diff_words->plus.text.ptr + diff_words->plus.text.size
491 - diff_words->current_plus, 1,
492 diff_words->file);
f59a59e2 493 diff_words->minus.text.size = diff_words->plus.text.size = 0;
f59a59e2
JS
494}
495
23707811
JH
496typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
497
6973dcae 498struct emit_callback {
cd112cef 499 int nparents, color_diff;
cf1b7869 500 unsigned ws_rule;
23707811 501 sane_truncate_fn truncate;
6973dcae 502 const char **label_path;
f59a59e2 503 struct diff_words_data *diff_words;
34a5e1a2 504 int *found_changesp;
c0c77734 505 FILE *file;
6973dcae
JH
506};
507
f59a59e2
JS
508static void free_diff_words_data(struct emit_callback *ecbdata)
509{
510 if (ecbdata->diff_words) {
511 /* flush buffers */
512 if (ecbdata->diff_words->minus.text.size ||
513 ecbdata->diff_words->plus.text.size)
514 diff_words_show(ecbdata->diff_words);
515
8e0f7003 516 free (ecbdata->diff_words->minus.text.ptr);
2e5d2003 517 free (ecbdata->diff_words->minus.orig);
8e0f7003 518 free (ecbdata->diff_words->plus.text.ptr);
2e5d2003 519 free (ecbdata->diff_words->plus.orig);
2b6a5417 520 free(ecbdata->diff_words->word_regex);
f59a59e2
JS
521 free(ecbdata->diff_words);
522 ecbdata->diff_words = NULL;
523 }
524}
525
ce436973 526const char *diff_get_color(int diff_use_color, enum color_diff ix)
cd112cef
JS
527{
528 if (diff_use_color)
50f575fc
LT
529 return diff_colors[ix];
530 return "";
cd112cef
JS
531}
532
c0c77734 533static void emit_line(FILE *file, const char *set, const char *reset, const char *line, int len)
448c3ef1 534{
39280970
JH
535 int has_trailing_newline, has_trailing_carriage_return;
536
537 has_trailing_newline = (len > 0 && line[len-1] == '\n');
4afbcab9 538 if (has_trailing_newline)
06ff64ae 539 len--;
39280970
JH
540 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
541 if (has_trailing_carriage_return)
542 len--;
06ff64ae 543
c0c77734
DB
544 fputs(set, file);
545 fwrite(line, len, 1, file);
546 fputs(reset, file);
39280970
JH
547 if (has_trailing_carriage_return)
548 fputc('\r', file);
4afbcab9
JH
549 if (has_trailing_newline)
550 fputc('\n', file);
448c3ef1
JH
551}
552
c5a8c3ec
JS
553static void emit_add_line(const char *reset, struct emit_callback *ecbdata, const char *line, int len)
554{
555 const char *ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
556 const char *set = diff_get_color(ecbdata->color_diff, DIFF_FILE_NEW);
557
558 if (!*ws)
c0c77734 559 emit_line(ecbdata->file, set, reset, line, len);
c1795bb0
WC
560 else {
561 /* Emit just the prefix, then the rest. */
c0c77734 562 emit_line(ecbdata->file, set, reset, line, ecbdata->nparents);
8f8841e9
JH
563 ws_check_emit(line + ecbdata->nparents,
564 len - ecbdata->nparents, ecbdata->ws_rule,
565 ecbdata->file, set, reset, ws);
c1795bb0 566 }
c5a8c3ec
JS
567}
568
23707811
JH
569static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
570{
571 const char *cp;
572 unsigned long allot;
573 size_t l = len;
574
575 if (ecb->truncate)
576 return ecb->truncate(line, len);
577 cp = line;
578 allot = l;
579 while (0 < l) {
580 (void) utf8_width(&cp, &l);
581 if (!cp)
582 break; /* truncated in the middle? */
583 }
584 return allot - l;
585}
586
cd112cef 587static void fn_out_consume(void *priv, char *line, unsigned long len)
6973dcae
JH
588{
589 int i;
448c3ef1 590 int color;
6973dcae 591 struct emit_callback *ecbdata = priv;
472ca780
JK
592 const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
593 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
ce436973 594 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
6973dcae 595
34a5e1a2
JS
596 *(ecbdata->found_changesp) = 1;
597
6973dcae 598 if (ecbdata->label_path[0]) {
1a9eb3b9
JH
599 const char *name_a_tab, *name_b_tab;
600
601 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
602 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
603
c0c77734
DB
604 fprintf(ecbdata->file, "%s--- %s%s%s\n",
605 meta, ecbdata->label_path[0], reset, name_a_tab);
606 fprintf(ecbdata->file, "%s+++ %s%s%s\n",
607 meta, ecbdata->label_path[1], reset, name_b_tab);
6973dcae
JH
608 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
609 }
cd112cef 610
a624eaa7
JM
611 if (diff_suppress_blank_empty
612 && len == 2 && line[0] == ' ' && line[1] == '\n') {
613 line[0] = '\n';
614 len = 1;
615 }
616
cd112cef
JS
617 /* This is not really necessary for now because
618 * this codepath only deals with two-way diffs.
619 */
620 for (i = 0; i < len && line[i] == '@'; i++)
621 ;
622 if (2 <= i && i < len && line[i] == ' ') {
623 ecbdata->nparents = i - 1;
23707811 624 len = sane_truncate_line(ecbdata, line, len);
c0c77734
DB
625 emit_line(ecbdata->file,
626 diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO),
448c3ef1 627 reset, line, len);
23707811 628 if (line[len-1] != '\n')
c0c77734 629 putc('\n', ecbdata->file);
448c3ef1 630 return;
cd112cef 631 }
448c3ef1
JH
632
633 if (len < ecbdata->nparents) {
c0c77734 634 emit_line(ecbdata->file, reset, reset, line, len);
448c3ef1 635 return;
cd112cef 636 }
448c3ef1
JH
637
638 color = DIFF_PLAIN;
639 if (ecbdata->diff_words && ecbdata->nparents != 1)
640 /* fall back to normal diff */
641 free_diff_words_data(ecbdata);
642 if (ecbdata->diff_words) {
643 if (line[0] == '-') {
644 diff_words_append(line, len,
645 &ecbdata->diff_words->minus);
646 return;
647 } else if (line[0] == '+') {
648 diff_words_append(line, len,
649 &ecbdata->diff_words->plus);
650 return;
651 }
652 if (ecbdata->diff_words->minus.text.size ||
653 ecbdata->diff_words->plus.text.size)
654 diff_words_show(ecbdata->diff_words);
655 line++;
50f575fc 656 len--;
c0c77734 657 emit_line(ecbdata->file, plain, reset, line, len);
448c3ef1
JH
658 return;
659 }
660 for (i = 0; i < ecbdata->nparents && len; i++) {
661 if (line[i] == '-')
662 color = DIFF_FILE_OLD;
663 else if (line[i] == '+')
664 color = DIFF_FILE_NEW;
665 }
666
667 if (color != DIFF_FILE_NEW) {
c0c77734
DB
668 emit_line(ecbdata->file,
669 diff_get_color(ecbdata->color_diff, color),
448c3ef1
JH
670 reset, line, len);
671 return;
672 }
673 emit_add_line(reset, ecbdata, line, len);
6973dcae
JH
674}
675
676static char *pprint_rename(const char *a, const char *b)
677{
678 const char *old = a;
679 const char *new = b;
f285a2d7 680 struct strbuf name = STRBUF_INIT;
6973dcae
JH
681 int pfx_length, sfx_length;
682 int len_a = strlen(a);
683 int len_b = strlen(b);
663af342 684 int a_midlen, b_midlen;
e5bfbf9b
AJ
685 int qlen_a = quote_c_style(a, NULL, NULL, 0);
686 int qlen_b = quote_c_style(b, NULL, NULL, 0);
687
688 if (qlen_a || qlen_b) {
663af342
PH
689 quote_c_style(a, &name, NULL, 0);
690 strbuf_addstr(&name, " => ");
691 quote_c_style(b, &name, NULL, 0);
b315c5c0 692 return strbuf_detach(&name, NULL);
e5bfbf9b 693 }
6973dcae
JH
694
695 /* Find common prefix */
696 pfx_length = 0;
697 while (*old && *new && *old == *new) {
698 if (*old == '/')
699 pfx_length = old - a + 1;
700 old++;
701 new++;
702 }
703
704 /* Find common suffix */
705 old = a + len_a;
706 new = b + len_b;
707 sfx_length = 0;
708 while (a <= old && b <= new && *old == *new) {
709 if (*old == '/')
710 sfx_length = len_a - (old - a);
711 old--;
712 new--;
713 }
714
715 /*
716 * pfx{mid-a => mid-b}sfx
717 * {pfx-a => pfx-b}sfx
718 * pfx{sfx-a => sfx-b}
719 * name-a => name-b
720 */
663af342
PH
721 a_midlen = len_a - pfx_length - sfx_length;
722 b_midlen = len_b - pfx_length - sfx_length;
723 if (a_midlen < 0)
724 a_midlen = 0;
725 if (b_midlen < 0)
726 b_midlen = 0;
727
728 strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
6973dcae 729 if (pfx_length + sfx_length) {
663af342
PH
730 strbuf_add(&name, a, pfx_length);
731 strbuf_addch(&name, '{');
6973dcae 732 }
663af342
PH
733 strbuf_add(&name, a + pfx_length, a_midlen);
734 strbuf_addstr(&name, " => ");
735 strbuf_add(&name, b + pfx_length, b_midlen);
736 if (pfx_length + sfx_length) {
737 strbuf_addch(&name, '}');
738 strbuf_add(&name, a + len_a - sfx_length, sfx_length);
6973dcae 739 }
b315c5c0 740 return strbuf_detach(&name, NULL);
6973dcae
JH
741}
742
743struct diffstat_t {
6973dcae
JH
744 int nr;
745 int alloc;
746 struct diffstat_file {
f604652e 747 char *from_name;
6973dcae 748 char *name;
f604652e 749 char *print_name;
6973dcae
JH
750 unsigned is_unmerged:1;
751 unsigned is_binary:1;
752 unsigned is_renamed:1;
753 unsigned int added, deleted;
754 } **files;
755};
756
757static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
758 const char *name_a,
759 const char *name_b)
760{
761 struct diffstat_file *x;
762 x = xcalloc(sizeof (*x), 1);
763 if (diffstat->nr == diffstat->alloc) {
764 diffstat->alloc = alloc_nr(diffstat->alloc);
765 diffstat->files = xrealloc(diffstat->files,
766 diffstat->alloc * sizeof(x));
767 }
768 diffstat->files[diffstat->nr++] = x;
769 if (name_b) {
f604652e
JH
770 x->from_name = xstrdup(name_a);
771 x->name = xstrdup(name_b);
6973dcae
JH
772 x->is_renamed = 1;
773 }
f604652e
JH
774 else {
775 x->from_name = NULL;
9befac47 776 x->name = xstrdup(name_a);
f604652e 777 }
6973dcae
JH
778 return x;
779}
780
781static void diffstat_consume(void *priv, char *line, unsigned long len)
782{
783 struct diffstat_t *diffstat = priv;
784 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
785
786 if (line[0] == '+')
787 x->added++;
788 else if (line[0] == '-')
789 x->deleted++;
790}
791
698ce6f8 792const char mime_boundary_leader[] = "------------";
6973dcae 793
a2540023
JH
794static int scale_linear(int it, int width, int max_change)
795{
796 /*
3ed74e60
JS
797 * make sure that at least one '-' is printed if there were deletions,
798 * and likewise for '+'.
a2540023 799 */
3ed74e60
JS
800 if (max_change < 2)
801 return it;
802 return ((it - 1) * (width - 1) + max_change - 1) / (max_change - 1);
a2540023
JH
803}
804
c0c77734
DB
805static void show_name(FILE *file,
806 const char *prefix, const char *name, int len,
785f7432 807 const char *reset, const char *set)
a2540023 808{
c0c77734 809 fprintf(file, " %s%s%-*s%s |", set, prefix, len, name, reset);
a2540023
JH
810}
811
c0c77734 812static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
a2540023
JH
813{
814 if (cnt <= 0)
815 return;
c0c77734 816 fprintf(file, "%s", set);
a2540023 817 while (cnt--)
c0c77734
DB
818 putc(ch, file);
819 fprintf(file, "%s", reset);
a2540023
JH
820}
821
f604652e
JH
822static void fill_print_name(struct diffstat_file *file)
823{
824 char *pname;
825
826 if (file->print_name)
827 return;
828
829 if (!file->is_renamed) {
f285a2d7 830 struct strbuf buf = STRBUF_INIT;
f604652e
JH
831 if (quote_c_style(file->name, &buf, NULL, 0)) {
832 pname = strbuf_detach(&buf, NULL);
833 } else {
834 pname = file->name;
835 strbuf_release(&buf);
836 }
837 } else {
838 pname = pprint_rename(file->from_name, file->name);
839 }
840 file->print_name = pname;
841}
842
a2540023 843static void show_stats(struct diffstat_t* data, struct diff_options *options)
6973dcae 844{
6973dcae 845 int i, len, add, del, total, adds = 0, dels = 0;
a2540023 846 int max_change = 0, max_len = 0;
6973dcae 847 int total_files = data->nr;
a2540023 848 int width, name_width;
785f7432 849 const char *reset, *set, *add_c, *del_c;
6973dcae
JH
850
851 if (data->nr == 0)
852 return;
853
a2540023
JH
854 width = options->stat_width ? options->stat_width : 80;
855 name_width = options->stat_name_width ? options->stat_name_width : 50;
856
857 /* Sanity: give at least 5 columns to the graph,
858 * but leave at least 10 columns for the name.
859 */
861d1af3
OM
860 if (width < 25)
861 width = 25;
862 if (name_width < 10)
863 name_width = 10;
864 else if (width < name_width + 15)
865 name_width = width - 15;
a2540023
JH
866
867 /* Find the longest filename and max number of changes */
8f67f8ae
PH
868 reset = diff_get_color_opt(options, DIFF_RESET);
869 set = diff_get_color_opt(options, DIFF_PLAIN);
870 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
871 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
785f7432 872
6973dcae
JH
873 for (i = 0; i < data->nr; i++) {
874 struct diffstat_file *file = data->files[i];
a2540023 875 int change = file->added + file->deleted;
f604652e
JH
876 fill_print_name(file);
877 len = strlen(file->print_name);
6973dcae
JH
878 if (max_len < len)
879 max_len = len;
880
881 if (file->is_binary || file->is_unmerged)
882 continue;
a2540023
JH
883 if (max_change < change)
884 max_change = change;
6973dcae
JH
885 }
886
a2540023
JH
887 /* Compute the width of the graph part;
888 * 10 is for one blank at the beginning of the line plus
889 * " | count " between the name and the graph.
890 *
891 * From here on, name_width is the width of the name area,
892 * and width is the width of the graph area.
893 */
894 name_width = (name_width < max_len) ? name_width : max_len;
895 if (width < (name_width + 10) + max_change)
896 width = width - (name_width + 10);
897 else
898 width = max_change;
899
6973dcae 900 for (i = 0; i < data->nr; i++) {
d2543b8e 901 const char *prefix = "";
f604652e 902 char *name = data->files[i]->print_name;
6973dcae
JH
903 int added = data->files[i]->added;
904 int deleted = data->files[i]->deleted;
a2540023 905 int name_len;
6973dcae
JH
906
907 /*
908 * "scale" the filename
909 */
a2540023
JH
910 len = name_width;
911 name_len = strlen(name);
912 if (name_width < name_len) {
6973dcae
JH
913 char *slash;
914 prefix = "...";
a2540023
JH
915 len -= 3;
916 name += name_len - len;
6973dcae
JH
917 slash = strchr(name, '/');
918 if (slash)
919 name = slash;
920 }
6973dcae
JH
921
922 if (data->files[i]->is_binary) {
c0c77734
DB
923 show_name(options->file, prefix, name, len, reset, set);
924 fprintf(options->file, " Bin ");
925 fprintf(options->file, "%s%d%s", del_c, deleted, reset);
926 fprintf(options->file, " -> ");
927 fprintf(options->file, "%s%d%s", add_c, added, reset);
928 fprintf(options->file, " bytes");
929 fprintf(options->file, "\n");
f604652e 930 continue;
6973dcae
JH
931 }
932 else if (data->files[i]->is_unmerged) {
c0c77734
DB
933 show_name(options->file, prefix, name, len, reset, set);
934 fprintf(options->file, " Unmerged\n");
f604652e 935 continue;
6973dcae
JH
936 }
937 else if (!data->files[i]->is_renamed &&
938 (added + deleted == 0)) {
939 total_files--;
f604652e 940 continue;
6973dcae
JH
941 }
942
a2540023
JH
943 /*
944 * scale the add/delete
945 */
6973dcae
JH
946 add = added;
947 del = deleted;
948 total = add + del;
949 adds += add;
950 dels += del;
951
a2540023 952 if (width <= max_change) {
a2540023 953 add = scale_linear(add, width, max_change);
3ed74e60
JS
954 del = scale_linear(del, width, max_change);
955 total = add + del;
6973dcae 956 }
c0c77734 957 show_name(options->file, prefix, name, len, reset, set);
4d9b5359
JK
958 fprintf(options->file, "%5d%s", added + deleted,
959 added + deleted ? " " : "");
c0c77734
DB
960 show_graph(options->file, '+', add, add_c, reset);
961 show_graph(options->file, '-', del, del_c, reset);
962 fprintf(options->file, "\n");
963 }
964 fprintf(options->file,
965 "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
785f7432 966 set, total_files, adds, dels, reset);
6973dcae
JH
967}
968
c0c77734 969static void show_shortstats(struct diffstat_t* data, struct diff_options *options)
ebd124c6
NP
970{
971 int i, adds = 0, dels = 0, total_files = data->nr;
972
973 if (data->nr == 0)
974 return;
975
976 for (i = 0; i < data->nr; i++) {
977 if (!data->files[i]->is_binary &&
978 !data->files[i]->is_unmerged) {
979 int added = data->files[i]->added;
980 int deleted= data->files[i]->deleted;
981 if (!data->files[i]->is_renamed &&
982 (added + deleted == 0)) {
983 total_files--;
984 } else {
985 adds += added;
986 dels += deleted;
987 }
988 }
ebd124c6 989 }
c0c77734 990 fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n",
ebd124c6
NP
991 total_files, adds, dels);
992}
993
74e2abe5
JH
994static void show_numstat(struct diffstat_t* data, struct diff_options *options)
995{
996 int i;
997
f604652e
JH
998 if (data->nr == 0)
999 return;
1000
74e2abe5
JH
1001 for (i = 0; i < data->nr; i++) {
1002 struct diffstat_file *file = data->files[i];
1003
bfddbc5e 1004 if (file->is_binary)
c0c77734 1005 fprintf(options->file, "-\t-\t");
bfddbc5e 1006 else
c0c77734
DB
1007 fprintf(options->file,
1008 "%d\t%d\t", file->added, file->deleted);
f604652e
JH
1009 if (options->line_termination) {
1010 fill_print_name(file);
1011 if (!file->is_renamed)
c0c77734 1012 write_name_quoted(file->name, options->file,
f604652e
JH
1013 options->line_termination);
1014 else {
c0c77734
DB
1015 fputs(file->print_name, options->file);
1016 putc(options->line_termination, options->file);
f604652e 1017 }
663af342 1018 } else {
f604652e 1019 if (file->is_renamed) {
c0c77734
DB
1020 putc('\0', options->file);
1021 write_name_quoted(file->from_name, options->file, '\0');
f604652e 1022 }
c0c77734 1023 write_name_quoted(file->name, options->file, '\0');
663af342 1024 }
74e2abe5
JH
1025 }
1026}
1027
c04a7155
JH
1028struct dirstat_file {
1029 const char *name;
1030 unsigned long changed;
7df7c019
LT
1031};
1032
c04a7155
JH
1033struct dirstat_dir {
1034 struct dirstat_file *files;
1035 int alloc, nr, percent, cumulative;
1036};
1037
1038static long gather_dirstat(FILE *file, struct dirstat_dir *dir, unsigned long changed, const char *base, int baselen)
7df7c019
LT
1039{
1040 unsigned long this_dir = 0;
1041 unsigned int sources = 0;
1042
1043 while (dir->nr) {
c04a7155 1044 struct dirstat_file *f = dir->files;
7df7c019
LT
1045 int namelen = strlen(f->name);
1046 unsigned long this;
1047 char *slash;
1048
1049 if (namelen < baselen)
1050 break;
1051 if (memcmp(f->name, base, baselen))
1052 break;
1053 slash = strchr(f->name + baselen, '/');
1054 if (slash) {
1055 int newbaselen = slash + 1 - f->name;
c0c77734 1056 this = gather_dirstat(file, dir, changed, f->name, newbaselen);
7df7c019
LT
1057 sources++;
1058 } else {
c04a7155 1059 this = f->changed;
7df7c019
LT
1060 dir->files++;
1061 dir->nr--;
1062 sources += 2;
1063 }
1064 this_dir += this;
1065 }
1066
1067 /*
1068 * We don't report dirstat's for
1069 * - the top level
1070 * - or cases where everything came from a single directory
1071 * under this directory (sources == 1).
1072 */
1073 if (baselen && sources != 1) {
1074 int permille = this_dir * 1000 / changed;
1075 if (permille) {
1076 int percent = permille / 10;
1077 if (percent >= dir->percent) {
c0c77734 1078 fprintf(file, "%4d.%01d%% %.*s\n", percent, permille % 10, baselen, base);
7df7c019
LT
1079 if (!dir->cumulative)
1080 return 0;
1081 }
1082 }
1083 }
1084 return this_dir;
1085}
1086
441bca0b
LT
1087static int dirstat_compare(const void *_a, const void *_b)
1088{
1089 const struct dirstat_file *a = _a;
1090 const struct dirstat_file *b = _b;
1091 return strcmp(a->name, b->name);
1092}
1093
c04a7155 1094static void show_dirstat(struct diff_options *options)
7df7c019
LT
1095{
1096 int i;
1097 unsigned long changed;
c04a7155
JH
1098 struct dirstat_dir dir;
1099 struct diff_queue_struct *q = &diff_queued_diff;
1100
1101 dir.files = NULL;
1102 dir.alloc = 0;
1103 dir.nr = 0;
1104 dir.percent = options->dirstat_percent;
f88d225f 1105 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
7df7c019 1106
7df7c019 1107 changed = 0;
c04a7155
JH
1108 for (i = 0; i < q->nr; i++) {
1109 struct diff_filepair *p = q->queue[i];
1110 const char *name;
1111 unsigned long copied, added, damage;
1112
1113 name = p->one->path ? p->one->path : p->two->path;
1114
1115 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1116 diff_populate_filespec(p->one, 0);
1117 diff_populate_filespec(p->two, 0);
1118 diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
1119 &copied, &added);
1120 diff_free_filespec_data(p->one);
1121 diff_free_filespec_data(p->two);
1122 } else if (DIFF_FILE_VALID(p->one)) {
1123 diff_populate_filespec(p->one, 1);
1124 copied = added = 0;
1125 diff_free_filespec_data(p->one);
1126 } else if (DIFF_FILE_VALID(p->two)) {
1127 diff_populate_filespec(p->two, 1);
1128 copied = 0;
1129 added = p->two->size;
1130 diff_free_filespec_data(p->two);
1131 } else
2b0b551d 1132 continue;
c04a7155
JH
1133
1134 /*
1135 * Original minus copied is the removed material,
1136 * added is the new material. They are both damages
fd33777b
HO
1137 * made to the preimage. In --dirstat-by-file mode, count
1138 * damaged files, not damaged lines. This is done by
1139 * counting only a single damaged line per file.
c04a7155
JH
1140 */
1141 damage = (p->one->size - copied) + added;
fd33777b
HO
1142 if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE) && damage > 0)
1143 damage = 1;
c04a7155
JH
1144
1145 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1146 dir.files[dir.nr].name = name;
1147 dir.files[dir.nr].changed = damage;
1148 changed += damage;
1149 dir.nr++;
7df7c019
LT
1150 }
1151
1152 /* This can happen even with many files, if everything was renames */
1153 if (!changed)
1154 return;
1155
1156 /* Show all directories with more than x% of the changes */
441bca0b 1157 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
c0c77734 1158 gather_dirstat(options->file, &dir, changed, "", 0);
7df7c019
LT
1159}
1160
f604652e
JH
1161static void free_diffstat_info(struct diffstat_t *diffstat)
1162{
1163 int i;
1164 for (i = 0; i < diffstat->nr; i++) {
1165 struct diffstat_file *f = diffstat->files[i];
1166 if (f->name != f->print_name)
1167 free(f->print_name);
1168 free(f->name);
1169 free(f->from_name);
1170 free(f);
1171 }
1172 free(diffstat->files);
1173}
1174
88246898 1175struct checkdiff_t {
88246898 1176 const char *filename;
1ba111d1
JH
1177 int lineno;
1178 struct diff_options *o;
cf1b7869 1179 unsigned ws_rule;
62c64895 1180 unsigned status;
877f23cc 1181 int trailing_blanks_start;
88246898
JS
1182};
1183
04954043
JH
1184static int is_conflict_marker(const char *line, unsigned long len)
1185{
1186 char firstchar;
1187 int cnt;
1188
1189 if (len < 8)
1190 return 0;
1191 firstchar = line[0];
1192 switch (firstchar) {
1193 case '=': case '>': case '<':
1194 break;
1195 default:
1196 return 0;
1197 }
1198 for (cnt = 1; cnt < 7; cnt++)
1199 if (line[cnt] != firstchar)
1200 return 0;
1201 /* line[0] thru line[6] are same as firstchar */
1202 if (firstchar == '=') {
1203 /* divider between ours and theirs? */
1204 if (len != 8 || line[7] != '\n')
1205 return 0;
1206 } else if (len < 8 || !isspace(line[7])) {
1207 /* not divider before ours nor after theirs */
1208 return 0;
1209 }
1210 return 1;
1211}
1212
88246898
JS
1213static void checkdiff_consume(void *priv, char *line, unsigned long len)
1214{
1215 struct checkdiff_t *data = priv;
1ba111d1
JH
1216 int color_diff = DIFF_OPT_TST(data->o, COLOR_DIFF);
1217 const char *ws = diff_get_color(color_diff, DIFF_WHITESPACE);
1218 const char *reset = diff_get_color(color_diff, DIFF_RESET);
1219 const char *set = diff_get_color(color_diff, DIFF_FILE_NEW);
c1795bb0 1220 char *err;
88246898
JS
1221
1222 if (line[0] == '+') {
18374e58 1223 unsigned bad;
0ef617f4 1224 data->lineno++;
877f23cc
JH
1225 if (!ws_blank_line(line + 1, len - 1, data->ws_rule))
1226 data->trailing_blanks_start = 0;
1227 else if (!data->trailing_blanks_start)
1228 data->trailing_blanks_start = data->lineno;
04954043
JH
1229 if (is_conflict_marker(line + 1, len - 1)) {
1230 data->status |= 1;
1231 fprintf(data->o->file,
1232 "%s:%d: leftover conflict marker\n",
1233 data->filename, data->lineno);
1234 }
8f8841e9 1235 bad = ws_check(line + 1, len - 1, data->ws_rule);
18374e58 1236 if (!bad)
c1795bb0 1237 return;
18374e58
JH
1238 data->status |= bad;
1239 err = whitespace_error_string(bad);
1ba111d1
JH
1240 fprintf(data->o->file, "%s:%d: %s.\n",
1241 data->filename, data->lineno, err);
c1795bb0 1242 free(err);
1ba111d1 1243 emit_line(data->o->file, set, reset, line, 1);
8f8841e9 1244 ws_check_emit(line + 1, len - 1, data->ws_rule,
1ba111d1 1245 data->o->file, set, reset, ws);
877f23cc 1246 } else if (line[0] == ' ') {
88246898 1247 data->lineno++;
877f23cc
JH
1248 data->trailing_blanks_start = 0;
1249 } else if (line[0] == '@') {
88246898
JS
1250 char *plus = strchr(line, '+');
1251 if (plus)
0ef617f4 1252 data->lineno = strtol(plus, NULL, 10) - 1;
88246898
JS
1253 else
1254 die("invalid diff");
877f23cc 1255 data->trailing_blanks_start = 0;
88246898
JS
1256 }
1257}
1258
0660626c
JH
1259static unsigned char *deflate_it(char *data,
1260 unsigned long size,
1261 unsigned long *result_size)
051308f6 1262{
0660626c
JH
1263 int bound;
1264 unsigned char *deflated;
1265 z_stream stream;
1266
1267 memset(&stream, 0, sizeof(stream));
12f6c308 1268 deflateInit(&stream, zlib_compression_level);
0660626c
JH
1269 bound = deflateBound(&stream, size);
1270 deflated = xmalloc(bound);
1271 stream.next_out = deflated;
1272 stream.avail_out = bound;
1273
1274 stream.next_in = (unsigned char *)data;
1275 stream.avail_in = size;
1276 while (deflate(&stream, Z_FINISH) == Z_OK)
1277 ; /* nothing */
1278 deflateEnd(&stream);
1279 *result_size = stream.total_out;
1280 return deflated;
051308f6
JH
1281}
1282
c0c77734 1283static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two)
051308f6 1284{
0660626c
JH
1285 void *cp;
1286 void *delta;
1287 void *deflated;
1288 void *data;
1289 unsigned long orig_size;
1290 unsigned long delta_size;
1291 unsigned long deflate_size;
1292 unsigned long data_size;
051308f6 1293
0660626c
JH
1294 /* We could do deflated delta, or we could do just deflated two,
1295 * whichever is smaller.
051308f6 1296 */
0660626c
JH
1297 delta = NULL;
1298 deflated = deflate_it(two->ptr, two->size, &deflate_size);
1299 if (one->size && two->size) {
1300 delta = diff_delta(one->ptr, one->size,
1301 two->ptr, two->size,
1302 &delta_size, deflate_size);
1303 if (delta) {
1304 void *to_free = delta;
1305 orig_size = delta_size;
1306 delta = deflate_it(delta, delta_size, &delta_size);
1307 free(to_free);
051308f6
JH
1308 }
1309 }
051308f6 1310
0660626c 1311 if (delta && delta_size < deflate_size) {
c0c77734 1312 fprintf(file, "delta %lu\n", orig_size);
0660626c
JH
1313 free(deflated);
1314 data = delta;
1315 data_size = delta_size;
1316 }
1317 else {
c0c77734 1318 fprintf(file, "literal %lu\n", two->size);
0660626c
JH
1319 free(delta);
1320 data = deflated;
1321 data_size = deflate_size;
1322 }
051308f6 1323
0660626c
JH
1324 /* emit data encoded in base85 */
1325 cp = data;
1326 while (data_size) {
1327 int bytes = (52 < data_size) ? 52 : data_size;
051308f6 1328 char line[70];
0660626c 1329 data_size -= bytes;
051308f6
JH
1330 if (bytes <= 26)
1331 line[0] = bytes + 'A' - 1;
1332 else
1333 line[0] = bytes - 26 + 'a' - 1;
1334 encode_85(line + 1, cp, bytes);
1d7f171c 1335 cp = (char *) cp + bytes;
c0c77734
DB
1336 fputs(line, file);
1337 fputc('\n', file);
051308f6 1338 }
c0c77734 1339 fprintf(file, "\n");
0660626c 1340 free(data);
051308f6
JH
1341}
1342
c0c77734 1343static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two)
d4c452f0 1344{
c0c77734
DB
1345 fprintf(file, "GIT binary patch\n");
1346 emit_binary_diff_body(file, one, two);
1347 emit_binary_diff_body(file, two, one);
d4c452f0
JH
1348}
1349
72cf4841 1350static void diff_filespec_load_driver(struct diff_filespec *one)
6973dcae 1351{
122aa6f9
JK
1352 if (!one->driver)
1353 one->driver = userdiff_find_by_path(one->path);
1354 if (!one->driver)
1355 one->driver = userdiff_find_by_name("default");
29a3eefd
JH
1356}
1357
1358int diff_filespec_is_binary(struct diff_filespec *one)
1359{
122aa6f9
JK
1360 if (one->is_binary == -1) {
1361 diff_filespec_load_driver(one);
1362 if (one->driver->binary != -1)
1363 one->is_binary = one->driver->binary;
1364 else {
1365 if (!one->data && DIFF_FILE_VALID(one))
1366 diff_populate_filespec(one, 0);
1367 if (one->data)
1368 one->is_binary = buffer_is_binary(one->data,
1369 one->size);
1370 if (one->is_binary == -1)
1371 one->is_binary = 0;
1372 }
1373 }
29a3eefd 1374 return one->is_binary;
6973dcae
JH
1375}
1376
be58e70d 1377static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
f258475a 1378{
122aa6f9
JK
1379 diff_filespec_load_driver(one);
1380 return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
f258475a
JH
1381}
1382
a5a818ee
JH
1383void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
1384{
1385 if (!options->a_prefix)
1386 options->a_prefix = a;
1387 if (!options->b_prefix)
1388 options->b_prefix = b;
1389}
1390
04427ac8
JK
1391static const char *get_textconv(struct diff_filespec *one)
1392{
1393 if (!DIFF_FILE_VALID(one))
1394 return NULL;
2675773a
JK
1395 if (!S_ISREG(one->mode))
1396 return NULL;
04427ac8
JK
1397 diff_filespec_load_driver(one);
1398 return one->driver->textconv;
1399}
1400
6973dcae
JH
1401static void builtin_diff(const char *name_a,
1402 const char *name_b,
1403 struct diff_filespec *one,
1404 struct diff_filespec *two,
1405 const char *xfrm_msg,
051308f6 1406 struct diff_options *o,
6973dcae
JH
1407 int complete_rewrite)
1408{
1409 mmfile_t mf1, mf2;
1410 const char *lbl[2];
1411 char *a_one, *b_two;
8f67f8ae
PH
1412 const char *set = diff_get_color_opt(o, DIFF_METAINFO);
1413 const char *reset = diff_get_color_opt(o, DIFF_RESET);
a5a818ee 1414 const char *a_prefix, *b_prefix;
c7534ef4 1415 const char *textconv_one = NULL, *textconv_two = NULL;
a5a818ee 1416
3aa1f7ca
JK
1417 if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
1418 textconv_one = get_textconv(one);
1419 textconv_two = get_textconv(two);
1420 }
1421
a5a818ee
JH
1422 diff_set_mnemonic_prefix(o, "a/", "b/");
1423 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
1424 a_prefix = o->b_prefix;
1425 b_prefix = o->a_prefix;
1426 } else {
1427 a_prefix = o->a_prefix;
1428 b_prefix = o->b_prefix;
1429 }
6973dcae 1430
71b989e7
LT
1431 /* Never use a non-valid filename anywhere if at all possible */
1432 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
1433 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
1434
a5a818ee
JH
1435 a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
1436 b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
6973dcae
JH
1437 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
1438 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
c0c77734 1439 fprintf(o->file, "%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
6973dcae
JH
1440 if (lbl[0][0] == '/') {
1441 /* /dev/null */
c0c77734 1442 fprintf(o->file, "%snew file mode %06o%s\n", set, two->mode, reset);
50f575fc 1443 if (xfrm_msg && xfrm_msg[0])
c0c77734 1444 fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
6973dcae
JH
1445 }
1446 else if (lbl[1][0] == '/') {
c0c77734 1447 fprintf(o->file, "%sdeleted file mode %06o%s\n", set, one->mode, reset);
50f575fc 1448 if (xfrm_msg && xfrm_msg[0])
c0c77734 1449 fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
6973dcae
JH
1450 }
1451 else {
1452 if (one->mode != two->mode) {
c0c77734
DB
1453 fprintf(o->file, "%sold mode %06o%s\n", set, one->mode, reset);
1454 fprintf(o->file, "%snew mode %06o%s\n", set, two->mode, reset);
cd112cef 1455 }
50f575fc 1456 if (xfrm_msg && xfrm_msg[0])
c0c77734 1457 fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
6973dcae
JH
1458 /*
1459 * we do not run diff between different kind
1460 * of objects.
1461 */
1462 if ((one->mode ^ two->mode) & S_IFMT)
1463 goto free_ab_and_return;
0c01857d 1464 if (complete_rewrite &&
3aa1f7ca
JK
1465 (textconv_one || !diff_filespec_is_binary(one)) &&
1466 (textconv_two || !diff_filespec_is_binary(two))) {
1467 emit_rewrite_diff(name_a, name_b, one, two,
1468 textconv_one, textconv_two, o);
34a5e1a2 1469 o->found_changes = 1;
6973dcae
JH
1470 goto free_ab_and_return;
1471 }
1472 }
1473
1474 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1475 die("unable to read files to diff");
1476
8f67f8ae 1477 if (!DIFF_OPT_TST(o, TEXT) &&
04427ac8
JK
1478 ( (diff_filespec_is_binary(one) && !textconv_one) ||
1479 (diff_filespec_is_binary(two) && !textconv_two) )) {
0660626c
JH
1480 /* Quite common confusing case */
1481 if (mf1.size == mf2.size &&
1482 !memcmp(mf1.ptr, mf2.ptr, mf1.size))
1483 goto free_ab_and_return;
8f67f8ae 1484 if (DIFF_OPT_TST(o, BINARY))
c0c77734 1485 emit_binary_diff(o->file, &mf1, &mf2);
051308f6 1486 else
c0c77734
DB
1487 fprintf(o->file, "Binary files %s and %s differ\n",
1488 lbl[0], lbl[1]);
34a5e1a2 1489 o->found_changes = 1;
051308f6 1490 }
6973dcae
JH
1491 else {
1492 /* Crazy xdl interfaces.. */
1493 const char *diffopts = getenv("GIT_DIFF_OPTS");
1494 xpparam_t xpp;
1495 xdemitconf_t xecfg;
1496 xdemitcb_t ecb;
1497 struct emit_callback ecbdata;
be58e70d 1498 const struct userdiff_funcname *pe;
f258475a 1499
04427ac8
JK
1500 if (textconv_one) {
1501 size_t size;
1502 mf1.ptr = run_textconv(textconv_one, one, &size);
1503 if (!mf1.ptr)
1504 die("unable to read files to diff");
1505 mf1.size = size;
1506 }
1507 if (textconv_two) {
1508 size_t size;
1509 mf2.ptr = run_textconv(textconv_two, two, &size);
1510 if (!mf2.ptr)
1511 die("unable to read files to diff");
1512 mf2.size = size;
1513 }
1514
45e7ca0f
BC
1515 pe = diff_funcname_pattern(one);
1516 if (!pe)
1517 pe = diff_funcname_pattern(two);
6973dcae 1518
9ccd0a88 1519 memset(&xpp, 0, sizeof(xpp));
30b25010 1520 memset(&xecfg, 0, sizeof(xecfg));
cd112cef 1521 memset(&ecbdata, 0, sizeof(ecbdata));
6973dcae 1522 ecbdata.label_path = lbl;
8f67f8ae 1523 ecbdata.color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
34a5e1a2 1524 ecbdata.found_changesp = &o->found_changes;
cf1b7869 1525 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
c0c77734 1526 ecbdata.file = o->file;
0d21efa5 1527 xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
ee1e5412 1528 xecfg.ctxlen = o->context;
6d0e674a 1529 xecfg.interhunkctxlen = o->interhunkcontext;
6973dcae 1530 xecfg.flags = XDL_EMIT_FUNCNAMES;
45e7ca0f 1531 if (pe)
a013585b 1532 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
6973dcae
JH
1533 if (!diffopts)
1534 ;
cc44c765 1535 else if (!prefixcmp(diffopts, "--unified="))
6973dcae 1536 xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
cc44c765 1537 else if (!prefixcmp(diffopts, "-u"))
6973dcae 1538 xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
c0c77734 1539 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS)) {
f59a59e2
JS
1540 ecbdata.diff_words =
1541 xcalloc(1, sizeof(struct diff_words_data));
c0c77734 1542 ecbdata.diff_words->file = o->file;
2b6a5417
JS
1543 if (o->word_regex) {
1544 ecbdata.diff_words->word_regex = (regex_t *)
1545 xmalloc(sizeof(regex_t));
1546 if (regcomp(ecbdata.diff_words->word_regex,
bf82940d
TR
1547 o->word_regex,
1548 REG_EXTENDED | REG_NEWLINE))
2b6a5417
JS
1549 die ("Invalid regular expression: %s",
1550 o->word_regex);
1551 }
c0c77734 1552 }
8a3f524b
JH
1553 xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
1554 &xpp, &xecfg, &ecb);
8f67f8ae 1555 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS))
f59a59e2 1556 free_diff_words_data(&ecbdata);
04427ac8
JK
1557 if (textconv_one)
1558 free(mf1.ptr);
1559 if (textconv_two)
1560 free(mf2.ptr);
6973dcae
JH
1561 }
1562
1563 free_ab_and_return:
fc3abdf5
JH
1564 diff_free_filespec_data(one);
1565 diff_free_filespec_data(two);
6973dcae
JH
1566 free(a_one);
1567 free(b_two);
1568 return;
1569}
1570
1571static void builtin_diffstat(const char *name_a, const char *name_b,
1572 struct diff_filespec *one,
1573 struct diff_filespec *two,
710158e3 1574 struct diffstat_t *diffstat,
0d21efa5 1575 struct diff_options *o,
710158e3 1576 int complete_rewrite)
6973dcae
JH
1577{
1578 mmfile_t mf1, mf2;
1579 struct diffstat_file *data;
1580
1581 data = diffstat_add(diffstat, name_a, name_b);
1582
1583 if (!one || !two) {
1584 data->is_unmerged = 1;
1585 return;
1586 }
710158e3
JH
1587 if (complete_rewrite) {
1588 diff_populate_filespec(one, 0);
1589 diff_populate_filespec(two, 0);
1590 data->deleted = count_lines(one->data, one->size);
1591 data->added = count_lines(two->data, two->size);
fc3abdf5 1592 goto free_and_return;
710158e3 1593 }
6973dcae
JH
1594 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1595 die("unable to read files to diff");
1596
29a3eefd 1597 if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
6973dcae 1598 data->is_binary = 1;
b1882587
AP
1599 data->added = mf2.size;
1600 data->deleted = mf1.size;
1601 } else {
6973dcae
JH
1602 /* Crazy xdl interfaces.. */
1603 xpparam_t xpp;
1604 xdemitconf_t xecfg;
1605 xdemitcb_t ecb;
1606
9ccd0a88 1607 memset(&xpp, 0, sizeof(xpp));
30b25010 1608 memset(&xecfg, 0, sizeof(xecfg));
0d21efa5 1609 xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
8a3f524b
JH
1610 xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
1611 &xpp, &xecfg, &ecb);
6973dcae 1612 }
fc3abdf5
JH
1613
1614 free_and_return:
1615 diff_free_filespec_data(one);
1616 diff_free_filespec_data(two);
6973dcae
JH
1617}
1618
88246898 1619static void builtin_checkdiff(const char *name_a, const char *name_b,
cd676a51 1620 const char *attr_path,
5ff10dd6
JH
1621 struct diff_filespec *one,
1622 struct diff_filespec *two,
1623 struct diff_options *o)
88246898
JS
1624{
1625 mmfile_t mf1, mf2;
1626 struct checkdiff_t data;
1627
1628 if (!two)
1629 return;
1630
1631 memset(&data, 0, sizeof(data));
88246898
JS
1632 data.filename = name_b ? name_b : name_a;
1633 data.lineno = 0;
1ba111d1 1634 data.o = o;
cd676a51 1635 data.ws_rule = whitespace_rule(attr_path);
88246898
JS
1636
1637 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1638 die("unable to read files to diff");
1639
5ff10dd6
JH
1640 /*
1641 * All the other codepaths check both sides, but not checking
1642 * the "old" side here is deliberate. We are checking the newly
1643 * introduced changes, and as long as the "new" side is text, we
1644 * can and should check what it introduces.
1645 */
29a3eefd 1646 if (diff_filespec_is_binary(two))
fc3abdf5 1647 goto free_and_return;
88246898
JS
1648 else {
1649 /* Crazy xdl interfaces.. */
1650 xpparam_t xpp;
1651 xdemitconf_t xecfg;
1652 xdemitcb_t ecb;
1653
9ccd0a88 1654 memset(&xpp, 0, sizeof(xpp));
30b25010 1655 memset(&xecfg, 0, sizeof(xecfg));
c35539eb 1656 xecfg.ctxlen = 1; /* at least one context line */
88246898 1657 xpp.flags = XDF_NEED_MINIMAL;
8a3f524b
JH
1658 xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
1659 &xpp, &xecfg, &ecb);
877f23cc 1660
04c6e9e9
JH
1661 if ((data.ws_rule & WS_TRAILING_SPACE) &&
1662 data.trailing_blanks_start) {
877f23cc
JH
1663 fprintf(o->file, "%s:%d: ends with blank lines.\n",
1664 data.filename, data.trailing_blanks_start);
1665 data.status = 1; /* report errors */
1666 }
88246898 1667 }
fc3abdf5
JH
1668 free_and_return:
1669 diff_free_filespec_data(one);
1670 diff_free_filespec_data(two);
62c64895
WC
1671 if (data.status)
1672 DIFF_OPT_SET(o, CHECK_FAILED);
88246898
JS
1673}
1674
6973dcae
JH
1675struct diff_filespec *alloc_filespec(const char *path)
1676{
1677 int namelen = strlen(path);
1678 struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
1679
1680 memset(spec, 0, sizeof(*spec));
1681 spec->path = (char *)(spec + 1);
1682 memcpy(spec->path, path, namelen+1);
9fb88419 1683 spec->count = 1;
122aa6f9 1684 spec->is_binary = -1;
6973dcae
JH
1685 return spec;
1686}
1687
9fb88419
LT
1688void free_filespec(struct diff_filespec *spec)
1689{
1690 if (!--spec->count) {
1691 diff_free_filespec_data(spec);
1692 free(spec);
1693 }
1694}
1695
6973dcae
JH
1696void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
1697 unsigned short mode)
1698{
1699 if (mode) {
1700 spec->mode = canon_mode(mode);
e702496e 1701 hashcpy(spec->sha1, sha1);
0bef57ee 1702 spec->sha1_valid = !is_null_sha1(sha1);
6973dcae
JH
1703 }
1704}
1705
1706/*
5adf317b 1707 * Given a name and sha1 pair, if the index tells us the file in
6973dcae
JH
1708 * the work tree has that object contents, return true, so that
1709 * prepare_temp_file() does not have to inflate and extract.
1710 */
1510fea7 1711static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
6973dcae
JH
1712{
1713 struct cache_entry *ce;
1714 struct stat st;
1715 int pos, len;
1716
1717 /* We do not read the cache ourselves here, because the
1718 * benchmark with my previous version that always reads cache
1719 * shows that it makes things worse for diff-tree comparing
1720 * two linux-2.6 kernel trees in an already checked out work
1721 * tree. This is because most diff-tree comparisons deal with
1722 * only a small number of files, while reading the cache is
1723 * expensive for a large project, and its cost outweighs the
1724 * savings we get by not inflating the object to a temporary
1725 * file. Practically, this code only helps when we are used
1726 * by diff-cache --cached, which does read the cache before
1727 * calling us.
1728 */
1729 if (!active_cache)
1730 return 0;
1731
1510fea7
SP
1732 /* We want to avoid the working directory if our caller
1733 * doesn't need the data in a normal file, this system
1734 * is rather slow with its stat/open/mmap/close syscalls,
1735 * and the object is contained in a pack file. The pack
1736 * is probably already open and will be faster to obtain
1737 * the data through than the working directory. Loose
1738 * objects however would tend to be slower as they need
1739 * to be individually opened and inflated.
1740 */
5caf9232 1741 if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL))
1510fea7
SP
1742 return 0;
1743
6973dcae
JH
1744 len = strlen(name);
1745 pos = cache_name_pos(name, len);
1746 if (pos < 0)
1747 return 0;
1748 ce = active_cache[pos];
eadb5831
JH
1749
1750 /*
1751 * This is not the sha1 we are looking for, or
1752 * unreusable because it is not a regular file.
1753 */
1754 if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
6973dcae 1755 return 0;
eadb5831
JH
1756
1757 /*
1758 * If ce matches the file in the work tree, we can reuse it.
6973dcae 1759 */
eadb5831
JH
1760 if (ce_uptodate(ce) ||
1761 (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
1762 return 1;
1763
1764 return 0;
6973dcae
JH
1765}
1766
3afaa72d
JH
1767static int populate_from_stdin(struct diff_filespec *s)
1768{
f285a2d7 1769 struct strbuf buf = STRBUF_INIT;
c32f749f 1770 size_t size = 0;
af6eb822 1771
f1696ee3 1772 if (strbuf_read(&buf, 0, 0) < 0)
af6eb822 1773 return error("error while reading from stdin %s",
3afaa72d 1774 strerror(errno));
af6eb822 1775
3afaa72d 1776 s->should_munmap = 0;
c32f749f
RS
1777 s->data = strbuf_detach(&buf, &size);
1778 s->size = size;
3afaa72d
JH
1779 s->should_free = 1;
1780 return 0;
1781}
1782
04786756
LT
1783static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
1784{
1785 int len;
1786 char *data = xmalloc(100);
1787 len = snprintf(data, 100,
1788 "Subproject commit %s\n", sha1_to_hex(s->sha1));
1789 s->data = data;
1790 s->size = len;
1791 s->should_free = 1;
1792 if (size_only) {
1793 s->data = NULL;
1794 free(data);
1795 }
1796 return 0;
1797}
1798
6973dcae
JH
1799/*
1800 * While doing rename detection and pickaxe operation, we may need to
1801 * grab the data for the blob (or file) for our own in-core comparison.
1802 * diff_filespec has data and size fields for this purpose.
1803 */
1804int diff_populate_filespec(struct diff_filespec *s, int size_only)
1805{
1806 int err = 0;
1807 if (!DIFF_FILE_VALID(s))
1808 die("internal error: asking to populate invalid file.");
1809 if (S_ISDIR(s->mode))
1810 return -1;
1811
6973dcae 1812 if (s->data)
fc3abdf5 1813 return 0;
04786756 1814
6e0b8ed6
JH
1815 if (size_only && 0 < s->size)
1816 return 0;
1817
302b9282 1818 if (S_ISGITLINK(s->mode))
04786756
LT
1819 return diff_populate_gitlink(s, size_only);
1820
6973dcae 1821 if (!s->sha1_valid ||
1510fea7 1822 reuse_worktree_file(s->path, s->sha1, 0)) {
f285a2d7 1823 struct strbuf buf = STRBUF_INIT;
6973dcae
JH
1824 struct stat st;
1825 int fd;
6c510bee 1826
3afaa72d
JH
1827 if (!strcmp(s->path, "-"))
1828 return populate_from_stdin(s);
1829
6973dcae
JH
1830 if (lstat(s->path, &st) < 0) {
1831 if (errno == ENOENT) {
1832 err_empty:
1833 err = -1;
1834 empty:
d2543b8e 1835 s->data = (char *)"";
6973dcae
JH
1836 s->size = 0;
1837 return err;
1838 }
1839 }
dc49cd76 1840 s->size = xsize_t(st.st_size);
6973dcae
JH
1841 if (!s->size)
1842 goto empty;
6973dcae 1843 if (S_ISLNK(st.st_mode)) {
cf219d8c
LT
1844 struct strbuf sb = STRBUF_INIT;
1845
1846 if (strbuf_readlink(&sb, s->path, s->size))
6973dcae 1847 goto err_empty;
0956a6db
RS
1848 s->size = sb.len;
1849 s->data = strbuf_detach(&sb, NULL);
cf219d8c 1850 s->should_free = 1;
6973dcae
JH
1851 return 0;
1852 }
cf219d8c
LT
1853 if (size_only)
1854 return 0;
6973dcae
JH
1855 fd = open(s->path, O_RDONLY);
1856 if (fd < 0)
1857 goto err_empty;
c4712e45 1858 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
6973dcae 1859 close(fd);
6973dcae 1860 s->should_munmap = 1;
6c510bee
LT
1861
1862 /*
1863 * Convert from working tree format to canonical git format
1864 */
21e5ad50 1865 if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) {
c32f749f 1866 size_t size = 0;
6c510bee
LT
1867 munmap(s->data, s->size);
1868 s->should_munmap = 0;
c32f749f
RS
1869 s->data = strbuf_detach(&buf, &size);
1870 s->size = size;
6c510bee
LT
1871 s->should_free = 1;
1872 }
6973dcae
JH
1873 }
1874 else {
21666f1a 1875 enum object_type type;
6e0b8ed6 1876 if (size_only)
21666f1a 1877 type = sha1_object_info(s->sha1, &s->size);
6973dcae 1878 else {
21666f1a 1879 s->data = read_sha1_file(s->sha1, &type, &s->size);
6973dcae
JH
1880 s->should_free = 1;
1881 }
1882 }
1883 return 0;
1884}
1885
8ae92e63 1886void diff_free_filespec_blob(struct diff_filespec *s)
6973dcae
JH
1887{
1888 if (s->should_free)
1889 free(s->data);
1890 else if (s->should_munmap)
1891 munmap(s->data, s->size);
fc3abdf5
JH
1892
1893 if (s->should_free || s->should_munmap) {
1894 s->should_free = s->should_munmap = 0;
1895 s->data = NULL;
1896 }
eede7b7d
JK
1897}
1898
1899void diff_free_filespec_data(struct diff_filespec *s)
1900{
8ae92e63 1901 diff_free_filespec_blob(s);
6973dcae
JH
1902 free(s->cnt_data);
1903 s->cnt_data = NULL;
1904}
1905
1906static void prep_temp_blob(struct diff_tempfile *temp,
1907 void *blob,
1908 unsigned long size,
1909 const unsigned char *sha1,
1910 int mode)
1911{
1912 int fd;
1913
1472966c 1914 fd = git_mkstemp(temp->tmp_path, PATH_MAX, ".diff_XXXXXX");
6973dcae 1915 if (fd < 0)
e7a7be88 1916 die("unable to create temp-file: %s", strerror(errno));
93822c22 1917 if (write_in_full(fd, blob, size) != size)
6973dcae
JH
1918 die("unable to write temp-file");
1919 close(fd);
1920 temp->name = temp->tmp_path;
1921 strcpy(temp->hex, sha1_to_hex(sha1));
1922 temp->hex[40] = 0;
1923 sprintf(temp->mode, "%06o", mode);
1924}
1925
1926static void prepare_temp_file(const char *name,
1927 struct diff_tempfile *temp,
1928 struct diff_filespec *one)
1929{
1930 if (!DIFF_FILE_VALID(one)) {
1931 not_a_valid_file:
1932 /* A '-' entry produces this for file-2, and
1933 * a '+' entry produces this for file-1.
1934 */
1935 temp->name = "/dev/null";
1936 strcpy(temp->hex, ".");
1937 strcpy(temp->mode, ".");
1938 return;
1939 }
1940
1941 if (!one->sha1_valid ||
1510fea7 1942 reuse_worktree_file(name, one->sha1, 1)) {
6973dcae
JH
1943 struct stat st;
1944 if (lstat(name, &st) < 0) {
1945 if (errno == ENOENT)
1946 goto not_a_valid_file;
1947 die("stat(%s): %s", name, strerror(errno));
1948 }
1949 if (S_ISLNK(st.st_mode)) {
1950 int ret;
1951 char buf[PATH_MAX + 1]; /* ought to be SYMLINK_MAX */
dfab6aae 1952 ret = readlink(name, buf, sizeof(buf));
6973dcae
JH
1953 if (ret < 0)
1954 die("readlink(%s)", name);
dfab6aae
LT
1955 if (ret == sizeof(buf))
1956 die("symlink too long: %s", name);
1957 prep_temp_blob(temp, buf, ret,
6973dcae
JH
1958 (one->sha1_valid ?
1959 one->sha1 : null_sha1),
1960 (one->sha1_valid ?
1961 one->mode : S_IFLNK));
1962 }
1963 else {
1964 /* we can borrow from the file in the work tree */
1965 temp->name = name;
1966 if (!one->sha1_valid)
1967 strcpy(temp->hex, sha1_to_hex(null_sha1));
1968 else
1969 strcpy(temp->hex, sha1_to_hex(one->sha1));
1970 /* Even though we may sometimes borrow the
1971 * contents from the work tree, we always want
1972 * one->mode. mode is trustworthy even when
1973 * !(one->sha1_valid), as long as
1974 * DIFF_FILE_VALID(one).
1975 */
1976 sprintf(temp->mode, "%06o", one->mode);
1977 }
1978 return;
1979 }
1980 else {
1981 if (diff_populate_filespec(one, 0))
1982 die("cannot read data blob for %s", one->path);
1983 prep_temp_blob(temp, one->data, one->size,
1984 one->sha1, one->mode);
1985 }
1986}
1987
1988static void remove_tempfile(void)
1989{
1990 int i;
1991
1992 for (i = 0; i < 2; i++)
1993 if (diff_temp[i].name == diff_temp[i].tmp_path) {
1994 unlink(diff_temp[i].name);
1995 diff_temp[i].name = NULL;
1996 }
1997}
1998
1999static void remove_tempfile_on_signal(int signo)
2000{
2001 remove_tempfile();
2002 signal(SIGINT, SIG_DFL);
2003 raise(signo);
2004}
2005
6973dcae
JH
2006/* An external diff command takes:
2007 *
2008 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2009 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2010 *
2011 */
2012static void run_external_diff(const char *pgm,
2013 const char *name,
2014 const char *other,
2015 struct diff_filespec *one,
2016 struct diff_filespec *two,
2017 const char *xfrm_msg,
2018 int complete_rewrite)
2019{
2020 const char *spawn_arg[10];
2021 struct diff_tempfile *temp = diff_temp;
2022 int retval;
2023 static int atexit_asked = 0;
2024 const char *othername;
2025 const char **arg = &spawn_arg[0];
2026
2027 othername = (other? other : name);
2028 if (one && two) {
2029 prepare_temp_file(name, &temp[0], one);
2030 prepare_temp_file(othername, &temp[1], two);
2031 if (! atexit_asked &&
2032 (temp[0].name == temp[0].tmp_path ||
2033 temp[1].name == temp[1].tmp_path)) {
2034 atexit_asked = 1;
2035 atexit(remove_tempfile);
2036 }
2037 signal(SIGINT, remove_tempfile_on_signal);
2038 }
2039
2040 if (one && two) {
2041 *arg++ = pgm;
2042 *arg++ = name;
2043 *arg++ = temp[0].name;
2044 *arg++ = temp[0].hex;
2045 *arg++ = temp[0].mode;
2046 *arg++ = temp[1].name;
2047 *arg++ = temp[1].hex;
2048 *arg++ = temp[1].mode;
2049 if (other) {
2050 *arg++ = other;
2051 *arg++ = xfrm_msg;
2052 }
2053 } else {
2054 *arg++ = pgm;
2055 *arg++ = name;
2056 }
2057 *arg = NULL;
d5535ec7
JS
2058 fflush(NULL);
2059 retval = run_command_v_opt(spawn_arg, 0);
6973dcae
JH
2060 remove_tempfile();
2061 if (retval) {
2062 fprintf(stderr, "external diff died, stopping at %s.\n", name);
2063 exit(1);
2064 }
2065}
2066
2067static void run_diff_cmd(const char *pgm,
2068 const char *name,
2069 const char *other,
cd676a51 2070 const char *attr_path,
6973dcae
JH
2071 struct diff_filespec *one,
2072 struct diff_filespec *two,
2073 const char *xfrm_msg,
051308f6 2074 struct diff_options *o,
6973dcae
JH
2075 int complete_rewrite)
2076{
8f67f8ae 2077 if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
f1af60bd
JH
2078 pgm = NULL;
2079 else {
be58e70d
JK
2080 struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
2081 if (drv && drv->external)
2082 pgm = drv->external;
f1af60bd
JH
2083 }
2084
6973dcae
JH
2085 if (pgm) {
2086 run_external_diff(pgm, name, other, one, two, xfrm_msg,
2087 complete_rewrite);
2088 return;
2089 }
2090 if (one && two)
2091 builtin_diff(name, other ? other : name,
051308f6 2092 one, two, xfrm_msg, o, complete_rewrite);
6973dcae 2093 else
c0c77734 2094 fprintf(o->file, "* Unmerged path %s\n", name);
6973dcae
JH
2095}
2096
2097static void diff_fill_sha1_info(struct diff_filespec *one)
2098{
2099 if (DIFF_FILE_VALID(one)) {
2100 if (!one->sha1_valid) {
2101 struct stat st;
5332b2af
JS
2102 if (!strcmp(one->path, "-")) {
2103 hashcpy(one->sha1, null_sha1);
2104 return;
2105 }
6973dcae
JH
2106 if (lstat(one->path, &st) < 0)
2107 die("stat %s", one->path);
2108 if (index_path(one->sha1, one->path, &st, 0))
d7530708 2109 die("cannot hash %s", one->path);
6973dcae
JH
2110 }
2111 }
2112 else
e702496e 2113 hashclr(one->sha1);
6973dcae
JH
2114}
2115
125b7630
RS
2116static int similarity_index(struct diff_filepair *p)
2117{
2118 return p->score * 100 / MAX_SCORE;
2119}
2120
cd676a51
JH
2121static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
2122{
2123 /* Strip the prefix but do not molest /dev/null and absolute paths */
2124 if (*namep && **namep != '/')
2125 *namep += prefix_length;
2126 if (*otherp && **otherp != '/')
2127 *otherp += prefix_length;
2128}
2129
6973dcae
JH
2130static void run_diff(struct diff_filepair *p, struct diff_options *o)
2131{
2132 const char *pgm = external_diff();
663af342
PH
2133 struct strbuf msg;
2134 char *xfrm_msg;
2135 struct diff_filespec *one = p->one;
2136 struct diff_filespec *two = p->two;
6973dcae
JH
2137 const char *name;
2138 const char *other;
cd676a51 2139 const char *attr_path;
6973dcae 2140 int complete_rewrite = 0;
663af342 2141
cd676a51
JH
2142 name = p->one->path;
2143 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2144 attr_path = name;
2145 if (o->prefix_length)
2146 strip_prefix(o->prefix_length, &name, &other);
6973dcae
JH
2147
2148 if (DIFF_PAIR_UNMERGED(p)) {
cd676a51
JH
2149 run_diff_cmd(pgm, name, NULL, attr_path,
2150 NULL, NULL, NULL, o, 0);
6973dcae
JH
2151 return;
2152 }
2153
6973dcae
JH
2154 diff_fill_sha1_info(one);
2155 diff_fill_sha1_info(two);
2156
663af342 2157 strbuf_init(&msg, PATH_MAX * 2 + 300);
6973dcae
JH
2158 switch (p->status) {
2159 case DIFF_STATUS_COPIED:
663af342
PH
2160 strbuf_addf(&msg, "similarity index %d%%", similarity_index(p));
2161 strbuf_addstr(&msg, "\ncopy from ");
2162 quote_c_style(name, &msg, NULL, 0);
2163 strbuf_addstr(&msg, "\ncopy to ");
2164 quote_c_style(other, &msg, NULL, 0);
2165 strbuf_addch(&msg, '\n');
6973dcae
JH
2166 break;
2167 case DIFF_STATUS_RENAMED:
663af342
PH
2168 strbuf_addf(&msg, "similarity index %d%%", similarity_index(p));
2169 strbuf_addstr(&msg, "\nrename from ");
2170 quote_c_style(name, &msg, NULL, 0);
2171 strbuf_addstr(&msg, "\nrename to ");
2172 quote_c_style(other, &msg, NULL, 0);
2173 strbuf_addch(&msg, '\n');
6973dcae
JH
2174 break;
2175 case DIFF_STATUS_MODIFIED:
2176 if (p->score) {
663af342 2177 strbuf_addf(&msg, "dissimilarity index %d%%\n",
125b7630 2178 similarity_index(p));
6973dcae
JH
2179 complete_rewrite = 1;
2180 break;
2181 }
2182 /* fallthru */
2183 default:
2184 /* nothing */
2185 ;
2186 }
2187
a89fccd2 2188 if (hashcmp(one->sha1, two->sha1)) {
8f67f8ae 2189 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
6973dcae 2190
8f67f8ae 2191 if (DIFF_OPT_TST(o, BINARY)) {
82793c55 2192 mmfile_t mf;
29a3eefd
JH
2193 if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
2194 (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
82793c55
JH
2195 abbrev = 40;
2196 }
663af342 2197 strbuf_addf(&msg, "index %.*s..%.*s",
dcb3450f
LT
2198 abbrev, sha1_to_hex(one->sha1),
2199 abbrev, sha1_to_hex(two->sha1));
6973dcae 2200 if (one->mode == two->mode)
663af342
PH
2201 strbuf_addf(&msg, " %06o", one->mode);
2202 strbuf_addch(&msg, '\n');
6973dcae
JH
2203 }
2204
663af342
PH
2205 if (msg.len)
2206 strbuf_setlen(&msg, msg.len - 1);
2207 xfrm_msg = msg.len ? msg.buf : NULL;
6973dcae
JH
2208
2209 if (!pgm &&
2210 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
2211 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
2212 /* a filepair that changes between file and symlink
2213 * needs to be split into deletion and creation.
2214 */
2215 struct diff_filespec *null = alloc_filespec(two->path);
cd676a51
JH
2216 run_diff_cmd(NULL, name, other, attr_path,
2217 one, null, xfrm_msg, o, 0);
6973dcae
JH
2218 free(null);
2219 null = alloc_filespec(one->path);
cd676a51
JH
2220 run_diff_cmd(NULL, name, other, attr_path,
2221 null, two, xfrm_msg, o, 0);
6973dcae
JH
2222 free(null);
2223 }
2224 else
cd676a51
JH
2225 run_diff_cmd(pgm, name, other, attr_path,
2226 one, two, xfrm_msg, o, complete_rewrite);
6973dcae 2227
663af342 2228 strbuf_release(&msg);
6973dcae
JH
2229}
2230
2231static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
2232 struct diffstat_t *diffstat)
2233{
2234 const char *name;
2235 const char *other;
710158e3 2236 int complete_rewrite = 0;
6973dcae
JH
2237
2238 if (DIFF_PAIR_UNMERGED(p)) {
2239 /* unmerged */
0d21efa5 2240 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0);
6973dcae
JH
2241 return;
2242 }
2243
2244 name = p->one->path;
2245 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2246
cd676a51
JH
2247 if (o->prefix_length)
2248 strip_prefix(o->prefix_length, &name, &other);
2249
6973dcae
JH
2250 diff_fill_sha1_info(p->one);
2251 diff_fill_sha1_info(p->two);
2252
710158e3
JH
2253 if (p->status == DIFF_STATUS_MODIFIED && p->score)
2254 complete_rewrite = 1;
0d21efa5 2255 builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite);
6973dcae
JH
2256}
2257
88246898
JS
2258static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
2259{
2260 const char *name;
2261 const char *other;
cd676a51 2262 const char *attr_path;
88246898
JS
2263
2264 if (DIFF_PAIR_UNMERGED(p)) {
2265 /* unmerged */
2266 return;
2267 }
2268
2269 name = p->one->path;
2270 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
cd676a51
JH
2271 attr_path = other ? other : name;
2272
2273 if (o->prefix_length)
2274 strip_prefix(o->prefix_length, &name, &other);
88246898
JS
2275
2276 diff_fill_sha1_info(p->one);
2277 diff_fill_sha1_info(p->two);
2278
cd676a51 2279 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
88246898
JS
2280}
2281
6973dcae
JH
2282void diff_setup(struct diff_options *options)
2283{
2284 memset(options, 0, sizeof(*options));
c0c77734
DB
2285
2286 options->file = stdout;
2287
6973dcae
JH
2288 options->line_termination = '\n';
2289 options->break_opt = -1;
2290 options->rename_limit = -1;
7df7c019 2291 options->dirstat_percent = 3;
f88d225f 2292 DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE);
ee1e5412 2293 options->context = 3;
6973dcae
JH
2294
2295 options->change = diff_change;
2296 options->add_remove = diff_addremove;
6b2f2d98 2297 if (diff_use_color_default > 0)
8f67f8ae
PH
2298 DIFF_OPT_SET(options, COLOR_DIFF);
2299 else
2300 DIFF_OPT_CLR(options, COLOR_DIFF);
b68ea12e 2301 options->detect_rename = diff_detect_rename_default;
eab9a40b 2302
a5a818ee
JH
2303 if (!diff_mnemonic_prefix) {
2304 options->a_prefix = "a/";
2305 options->b_prefix = "b/";
2306 }
6973dcae
JH
2307}
2308
2309int diff_setup_done(struct diff_options *options)
2310{
d7de00f7
TH
2311 int count = 0;
2312
2313 if (options->output_format & DIFF_FORMAT_NAME)
2314 count++;
2315 if (options->output_format & DIFF_FORMAT_NAME_STATUS)
2316 count++;
2317 if (options->output_format & DIFF_FORMAT_CHECKDIFF)
2318 count++;
2319 if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
2320 count++;
2321 if (count > 1)
2322 die("--name-only, --name-status, --check and -s are mutually exclusive");
2323
8f67f8ae 2324 if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
03b9d560
JH
2325 options->detect_rename = DIFF_DETECT_COPY;
2326
cd676a51
JH
2327 if (!DIFF_OPT_TST(options, RELATIVE_NAME))
2328 options->prefix = NULL;
2329 if (options->prefix)
2330 options->prefix_length = strlen(options->prefix);
2331 else
2332 options->prefix_length = 0;
2333
c6744349
TH
2334 if (options->output_format & (DIFF_FORMAT_NAME |
2335 DIFF_FORMAT_NAME_STATUS |
2336 DIFF_FORMAT_CHECKDIFF |
2337 DIFF_FORMAT_NO_OUTPUT))
2338 options->output_format &= ~(DIFF_FORMAT_RAW |
74e2abe5 2339 DIFF_FORMAT_NUMSTAT |
c6744349 2340 DIFF_FORMAT_DIFFSTAT |
ebd124c6 2341 DIFF_FORMAT_SHORTSTAT |
7df7c019 2342 DIFF_FORMAT_DIRSTAT |
c6744349
TH
2343 DIFF_FORMAT_SUMMARY |
2344 DIFF_FORMAT_PATCH);
2345
6973dcae
JH
2346 /*
2347 * These cases always need recursive; we do not drop caller-supplied
2348 * recursive bits for other formats here.
2349 */
c6744349 2350 if (options->output_format & (DIFF_FORMAT_PATCH |
74e2abe5 2351 DIFF_FORMAT_NUMSTAT |
c6744349 2352 DIFF_FORMAT_DIFFSTAT |
ebd124c6 2353 DIFF_FORMAT_SHORTSTAT |
7df7c019 2354 DIFF_FORMAT_DIRSTAT |
d7014dc0 2355 DIFF_FORMAT_SUMMARY |
c6744349 2356 DIFF_FORMAT_CHECKDIFF))
8f67f8ae 2357 DIFF_OPT_SET(options, RECURSIVE);
5e363541 2358 /*
3969cf7d 2359 * Also pickaxe would not work very well if you do not say recursive
5e363541 2360 */
3969cf7d 2361 if (options->pickaxe)
8f67f8ae 2362 DIFF_OPT_SET(options, RECURSIVE);
5e363541 2363
6973dcae
JH
2364 if (options->detect_rename && options->rename_limit < 0)
2365 options->rename_limit = diff_rename_limit_default;
2366 if (options->setup & DIFF_SETUP_USE_CACHE) {
2367 if (!active_cache)
2368 /* read-cache does not die even when it fails
2369 * so it is safe for us to do this here. Also
2370 * it does not smudge active_cache or active_nr
2371 * when it fails, so we do not have to worry about
2372 * cleaning it up ourselves either.
2373 */
2374 read_cache();
2375 }
6973dcae
JH
2376 if (options->abbrev <= 0 || 40 < options->abbrev)
2377 options->abbrev = 40; /* full */
2378
68aacb2f
JH
2379 /*
2380 * It does not make sense to show the first hit we happened
2381 * to have found. It does not make sense not to return with
2382 * exit code in such a case either.
2383 */
8f67f8ae 2384 if (DIFF_OPT_TST(options, QUIET)) {
68aacb2f 2385 options->output_format = DIFF_FORMAT_NO_OUTPUT;
8f67f8ae 2386 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
68aacb2f
JH
2387 }
2388
6973dcae
JH
2389 return 0;
2390}
2391
d2543b8e 2392static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
ee1e5412
LT
2393{
2394 char c, *eq;
2395 int len;
2396
2397 if (*arg != '-')
2398 return 0;
2399 c = *++arg;
2400 if (!c)
2401 return 0;
2402 if (c == arg_short) {
2403 c = *++arg;
2404 if (!c)
2405 return 1;
2406 if (val && isdigit(c)) {
2407 char *end;
2408 int n = strtoul(arg, &end, 10);
2409 if (*end)
2410 return 0;
2411 *val = n;
2412 return 1;
2413 }
2414 return 0;
2415 }
2416 if (c != '-')
2417 return 0;
2418 arg++;
2419 eq = strchr(arg, '=');
2420 if (eq)
2421 len = eq - arg;
2422 else
2423 len = strlen(arg);
2424 if (!len || strncmp(arg, arg_long, len))
2425 return 0;
2426 if (eq) {
2427 int n;
2428 char *end;
2429 if (!isdigit(*++eq))
2430 return 0;
2431 n = strtoul(eq, &end, 10);
2432 if (*end)
2433 return 0;
2434 *val = n;
2435 }
2436 return 1;
2437}
2438
16befb8b
JH
2439static int diff_scoreopt_parse(const char *opt);
2440
6973dcae
JH
2441int diff_opt_parse(struct diff_options *options, const char **av, int ac)
2442{
2443 const char *arg = av[0];
d054680c
PH
2444
2445 /* Output format options */
6973dcae 2446 if (!strcmp(arg, "-p") || !strcmp(arg, "-u"))
c6744349 2447 options->output_format |= DIFF_FORMAT_PATCH;
ee1e5412 2448 else if (opt_arg(arg, 'U', "unified", &options->context))
c6744349 2449 options->output_format |= DIFF_FORMAT_PATCH;
a610786f
TH
2450 else if (!strcmp(arg, "--raw"))
2451 options->output_format |= DIFF_FORMAT_RAW;
8f67f8ae 2452 else if (!strcmp(arg, "--patch-with-raw"))
c6744349 2453 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW;
8f67f8ae 2454 else if (!strcmp(arg, "--numstat"))
74e2abe5 2455 options->output_format |= DIFF_FORMAT_NUMSTAT;
8f67f8ae 2456 else if (!strcmp(arg, "--shortstat"))
ebd124c6 2457 options->output_format |= DIFF_FORMAT_SHORTSTAT;
7df7c019
LT
2458 else if (opt_arg(arg, 'X', "dirstat", &options->dirstat_percent))
2459 options->output_format |= DIFF_FORMAT_DIRSTAT;
f88d225f
JH
2460 else if (!strcmp(arg, "--cumulative")) {
2461 options->output_format |= DIFF_FORMAT_DIRSTAT;
2462 DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
fd33777b
HO
2463 } else if (opt_arg(arg, 0, "dirstat-by-file",
2464 &options->dirstat_percent)) {
2465 options->output_format |= DIFF_FORMAT_DIRSTAT;
2466 DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
f88d225f 2467 }
d054680c
PH
2468 else if (!strcmp(arg, "--check"))
2469 options->output_format |= DIFF_FORMAT_CHECKDIFF;
2470 else if (!strcmp(arg, "--summary"))
2471 options->output_format |= DIFF_FORMAT_SUMMARY;
2472 else if (!strcmp(arg, "--patch-with-stat"))
2473 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT;
2474 else if (!strcmp(arg, "--name-only"))
2475 options->output_format |= DIFF_FORMAT_NAME;
2476 else if (!strcmp(arg, "--name-status"))
2477 options->output_format |= DIFF_FORMAT_NAME_STATUS;
2478 else if (!strcmp(arg, "-s"))
2479 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
cc44c765 2480 else if (!prefixcmp(arg, "--stat")) {
5c5b2ea9
LT
2481 char *end;
2482 int width = options->stat_width;
2483 int name_width = options->stat_name_width;
2484 arg += 6;
2485 end = (char *)arg;
2486
2487 switch (*arg) {
2488 case '-':
cc44c765 2489 if (!prefixcmp(arg, "-width="))
5c5b2ea9 2490 width = strtoul(arg + 7, &end, 10);
cc44c765 2491 else if (!prefixcmp(arg, "-name-width="))
5c5b2ea9
LT
2492 name_width = strtoul(arg + 12, &end, 10);
2493 break;
2494 case '=':
2495 width = strtoul(arg+1, &end, 10);
2496 if (*end == ',')
2497 name_width = strtoul(end+1, &end, 10);
2498 }
2499
2500 /* Important! This checks all the error cases! */
2501 if (*end)
2502 return 0;
c6744349 2503 options->output_format |= DIFF_FORMAT_DIFFSTAT;
5c5b2ea9
LT
2504 options->stat_name_width = name_width;
2505 options->stat_width = width;
a2540023 2506 }
d054680c
PH
2507
2508 /* renames options */
cc44c765 2509 else if (!prefixcmp(arg, "-B")) {
8f67f8ae 2510 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
6973dcae
JH
2511 return -1;
2512 }
cc44c765 2513 else if (!prefixcmp(arg, "-M")) {
8f67f8ae 2514 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
6973dcae
JH
2515 return -1;
2516 options->detect_rename = DIFF_DETECT_RENAME;
2517 }
cc44c765 2518 else if (!prefixcmp(arg, "-C")) {
ca6c0970 2519 if (options->detect_rename == DIFF_DETECT_COPY)
8f67f8ae
PH
2520 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2521 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
6973dcae
JH
2522 return -1;
2523 options->detect_rename = DIFF_DETECT_COPY;
2524 }
d054680c
PH
2525 else if (!strcmp(arg, "--no-renames"))
2526 options->detect_rename = 0;
cd676a51
JH
2527 else if (!strcmp(arg, "--relative"))
2528 DIFF_OPT_SET(options, RELATIVE_NAME);
c0cb4a06
JH
2529 else if (!prefixcmp(arg, "--relative=")) {
2530 DIFF_OPT_SET(options, RELATIVE_NAME);
2531 options->prefix = arg + 11;
2532 }
d054680c
PH
2533
2534 /* xdiff options */
2535 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
2536 options->xdl_opts |= XDF_IGNORE_WHITESPACE;
2537 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
2538 options->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2539 else if (!strcmp(arg, "--ignore-space-at-eol"))
2540 options->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
2541
2542 /* flags options */
2543 else if (!strcmp(arg, "--binary")) {
2544 options->output_format |= DIFF_FORMAT_PATCH;
2545 DIFF_OPT_SET(options, BINARY);
2546 }
2547 else if (!strcmp(arg, "--full-index"))
2548 DIFF_OPT_SET(options, FULL_INDEX);
2549 else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
2550 DIFF_OPT_SET(options, TEXT);
2551 else if (!strcmp(arg, "-R"))
2552 DIFF_OPT_SET(options, REVERSE_DIFF);
6973dcae 2553 else if (!strcmp(arg, "--find-copies-harder"))
8f67f8ae 2554 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
750f7b66 2555 else if (!strcmp(arg, "--follow"))
8f67f8ae 2556 DIFF_OPT_SET(options, FOLLOW_RENAMES);
cd112cef 2557 else if (!strcmp(arg, "--color"))
8f67f8ae 2558 DIFF_OPT_SET(options, COLOR_DIFF);
fef88bb0 2559 else if (!strcmp(arg, "--no-color"))
8f67f8ae 2560 DIFF_OPT_CLR(options, COLOR_DIFF);
f59a59e2 2561 else if (!strcmp(arg, "--color-words"))
8f67f8ae 2562 options->flags |= DIFF_OPT_COLOR_DIFF | DIFF_OPT_COLOR_DIFF_WORDS;
2b6a5417
JS
2563 else if (!prefixcmp(arg, "--color-words=")) {
2564 options->flags |= DIFF_OPT_COLOR_DIFF | DIFF_OPT_COLOR_DIFF_WORDS;
2565 options->word_regex = arg + 14;
2566 }
41bbf9d5 2567 else if (!strcmp(arg, "--exit-code"))
8f67f8ae 2568 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
68aacb2f 2569 else if (!strcmp(arg, "--quiet"))
8f67f8ae 2570 DIFF_OPT_SET(options, QUIET);
72909bef 2571 else if (!strcmp(arg, "--ext-diff"))
8f67f8ae 2572 DIFF_OPT_SET(options, ALLOW_EXTERNAL);
72909bef 2573 else if (!strcmp(arg, "--no-ext-diff"))
8f67f8ae 2574 DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
e10ea812
JK
2575 else if (!strcmp(arg, "--textconv"))
2576 DIFF_OPT_SET(options, ALLOW_TEXTCONV);
2577 else if (!strcmp(arg, "--no-textconv"))
2578 DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
50fd9bd8
JS
2579 else if (!strcmp(arg, "--ignore-submodules"))
2580 DIFF_OPT_SET(options, IGNORE_SUBMODULES);
d054680c
PH
2581
2582 /* misc options */
2583 else if (!strcmp(arg, "-z"))
2584 options->line_termination = 0;
2585 else if (!prefixcmp(arg, "-l"))
2586 options->rename_limit = strtoul(arg+2, NULL, 10);
2587 else if (!prefixcmp(arg, "-S"))
2588 options->pickaxe = arg + 2;
2589 else if (!strcmp(arg, "--pickaxe-all"))
2590 options->pickaxe_opts = DIFF_PICKAXE_ALL;
2591 else if (!strcmp(arg, "--pickaxe-regex"))
2592 options->pickaxe_opts = DIFF_PICKAXE_REGEX;
2593 else if (!prefixcmp(arg, "-O"))
2594 options->orderfile = arg + 2;
2595 else if (!prefixcmp(arg, "--diff-filter="))
2596 options->filter = arg + 14;
2597 else if (!strcmp(arg, "--abbrev"))
2598 options->abbrev = DEFAULT_ABBREV;
2599 else if (!prefixcmp(arg, "--abbrev=")) {
2600 options->abbrev = strtoul(arg + 9, NULL, 10);
2601 if (options->abbrev < MINIMUM_ABBREV)
2602 options->abbrev = MINIMUM_ABBREV;
2603 else if (40 < options->abbrev)
2604 options->abbrev = 40;
2605 }
eab9a40b
JS
2606 else if (!prefixcmp(arg, "--src-prefix="))
2607 options->a_prefix = arg + 13;
2608 else if (!prefixcmp(arg, "--dst-prefix="))
2609 options->b_prefix = arg + 13;
2610 else if (!strcmp(arg, "--no-prefix"))
2611 options->a_prefix = options->b_prefix = "";
6d0e674a
RS
2612 else if (opt_arg(arg, '\0', "inter-hunk-context",
2613 &options->interhunkcontext))
2614 ;
c0c77734
DB
2615 else if (!prefixcmp(arg, "--output=")) {
2616 options->file = fopen(arg + strlen("--output="), "w");
2617 options->close_file = 1;
2618 } else
6973dcae
JH
2619 return 0;
2620 return 1;
2621}
2622
2623static int parse_num(const char **cp_p)
2624{
2625 unsigned long num, scale;
2626 int ch, dot;
2627 const char *cp = *cp_p;
2628
2629 num = 0;
2630 scale = 1;
2631 dot = 0;
2632 for(;;) {
2633 ch = *cp;
2634 if ( !dot && ch == '.' ) {
2635 scale = 1;
2636 dot = 1;
2637 } else if ( ch == '%' ) {
2638 scale = dot ? scale*100 : 100;
2639 cp++; /* % is always at the end */
2640 break;
2641 } else if ( ch >= '0' && ch <= '9' ) {
2642 if ( scale < 100000 ) {
2643 scale *= 10;
2644 num = (num*10) + (ch-'0');
2645 }
2646 } else {
2647 break;
2648 }
2649 cp++;
2650 }
2651 *cp_p = cp;
2652
2653 /* user says num divided by scale and we say internally that
2654 * is MAX_SCORE * num / scale.
2655 */
dc49cd76 2656 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
6973dcae
JH
2657}
2658
16befb8b 2659static int diff_scoreopt_parse(const char *opt)
6973dcae
JH
2660{
2661 int opt1, opt2, cmd;
2662
2663 if (*opt++ != '-')
2664 return -1;
2665 cmd = *opt++;
2666 if (cmd != 'M' && cmd != 'C' && cmd != 'B')
2667 return -1; /* that is not a -M, -C nor -B option */
2668
2669 opt1 = parse_num(&opt);
2670 if (cmd != 'B')
2671 opt2 = 0;
2672 else {
2673 if (*opt == 0)
2674 opt2 = 0;
2675 else if (*opt != '/')
2676 return -1; /* we expect -B80/99 or -B80 */
2677 else {
2678 opt++;
2679 opt2 = parse_num(&opt);
2680 }
2681 }
2682 if (*opt != 0)
2683 return -1;
2684 return opt1 | (opt2 << 16);
2685}
2686
2687struct diff_queue_struct diff_queued_diff;
2688
2689void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
2690{
2691 if (queue->alloc <= queue->nr) {
2692 queue->alloc = alloc_nr(queue->alloc);
2693 queue->queue = xrealloc(queue->queue,
2694 sizeof(dp) * queue->alloc);
2695 }
2696 queue->queue[queue->nr++] = dp;
2697}
2698
2699struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
2700 struct diff_filespec *one,
2701 struct diff_filespec *two)
2702{
ef677686 2703 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
6973dcae
JH
2704 dp->one = one;
2705 dp->two = two;
6973dcae
JH
2706 if (queue)
2707 diff_q(queue, dp);
2708 return dp;
2709}
2710
2711void diff_free_filepair(struct diff_filepair *p)
2712{
9fb88419
LT
2713 free_filespec(p->one);
2714 free_filespec(p->two);
6973dcae
JH
2715 free(p);
2716}
2717
2718/* This is different from find_unique_abbrev() in that
2719 * it stuffs the result with dots for alignment.
2720 */
2721const char *diff_unique_abbrev(const unsigned char *sha1, int len)
2722{
2723 int abblen;
2724 const char *abbrev;
2725 if (len == 40)
2726 return sha1_to_hex(sha1);
2727
2728 abbrev = find_unique_abbrev(sha1, len);
6973dcae
JH
2729 abblen = strlen(abbrev);
2730 if (abblen < 37) {
2731 static char hex[41];
2732 if (len < abblen && abblen <= len + 2)
2733 sprintf(hex, "%s%.*s", abbrev, len+3-abblen, "..");
2734 else
2735 sprintf(hex, "%s...", abbrev);
2736 return hex;
2737 }
2738 return sha1_to_hex(sha1);
2739}
2740
663af342 2741static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
6973dcae 2742{
663af342
PH
2743 int line_termination = opt->line_termination;
2744 int inter_name_termination = line_termination ? '\t' : '\0';
6973dcae 2745
663af342 2746 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
c0c77734
DB
2747 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
2748 diff_unique_abbrev(p->one->sha1, opt->abbrev));
2749 fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
6973dcae 2750 }
663af342 2751 if (p->score) {
c0c77734
DB
2752 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
2753 inter_name_termination);
663af342 2754 } else {
c0c77734 2755 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
6973dcae 2756 }
6973dcae 2757
cd676a51
JH
2758 if (p->status == DIFF_STATUS_COPIED ||
2759 p->status == DIFF_STATUS_RENAMED) {
2760 const char *name_a, *name_b;
2761 name_a = p->one->path;
2762 name_b = p->two->path;
2763 strip_prefix(opt->prefix_length, &name_a, &name_b);
c0c77734
DB
2764 write_name_quoted(name_a, opt->file, inter_name_termination);
2765 write_name_quoted(name_b, opt->file, line_termination);
663af342 2766 } else {
cd676a51
JH
2767 const char *name_a, *name_b;
2768 name_a = p->one->mode ? p->one->path : p->two->path;
2769 name_b = NULL;
2770 strip_prefix(opt->prefix_length, &name_a, &name_b);
c0c77734 2771 write_name_quoted(name_a, opt->file, line_termination);
663af342 2772 }
6973dcae
JH
2773}
2774
2775int diff_unmodified_pair(struct diff_filepair *p)
2776{
2777 /* This function is written stricter than necessary to support
2778 * the currently implemented transformers, but the idea is to
2779 * let transformers to produce diff_filepairs any way they want,
2780 * and filter and clean them up here before producing the output.
2781 */
663af342 2782 struct diff_filespec *one = p->one, *two = p->two;
6973dcae
JH
2783
2784 if (DIFF_PAIR_UNMERGED(p))
2785 return 0; /* unmerged is interesting */
2786
6973dcae
JH
2787 /* deletion, addition, mode or type change
2788 * and rename are all interesting.
2789 */
2790 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
2791 DIFF_PAIR_MODE_CHANGED(p) ||
2792 strcmp(one->path, two->path))
2793 return 0;
2794
2795 /* both are valid and point at the same path. that is, we are
2796 * dealing with a change.
2797 */
2798 if (one->sha1_valid && two->sha1_valid &&
a89fccd2 2799 !hashcmp(one->sha1, two->sha1))
6973dcae
JH
2800 return 1; /* no change */
2801 if (!one->sha1_valid && !two->sha1_valid)
2802 return 1; /* both look at the same file on the filesystem. */
2803 return 0;
2804}
2805
2806static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
2807{
2808 if (diff_unmodified_pair(p))
2809 return;
2810
2811 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2812 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2813 return; /* no tree diffs in patch format */
2814
2815 run_diff(p, o);
2816}
2817
2818static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
2819 struct diffstat_t *diffstat)
2820{
2821 if (diff_unmodified_pair(p))
2822 return;
2823
2824 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2825 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2826 return; /* no tree diffs in patch format */
2827
2828 run_diffstat(p, o, diffstat);
2829}
2830
88246898
JS
2831static void diff_flush_checkdiff(struct diff_filepair *p,
2832 struct diff_options *o)
2833{
2834 if (diff_unmodified_pair(p))
2835 return;
2836
2837 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2838 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2839 return; /* no tree diffs in patch format */
2840
2841 run_checkdiff(p, o);
2842}
2843
6973dcae
JH
2844int diff_queue_is_empty(void)
2845{
2846 struct diff_queue_struct *q = &diff_queued_diff;
2847 int i;
2848 for (i = 0; i < q->nr; i++)
2849 if (!diff_unmodified_pair(q->queue[i]))
2850 return 0;
2851 return 1;
2852}
2853
2854#if DIFF_DEBUG
2855void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
2856{
2857 fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
2858 x, one ? one : "",
2859 s->path,
2860 DIFF_FILE_VALID(s) ? "valid" : "invalid",
2861 s->mode,
2862 s->sha1_valid ? sha1_to_hex(s->sha1) : "");
2863 fprintf(stderr, "queue[%d] %s size %lu flags %d\n",
2864 x, one ? one : "",
2865 s->size, s->xfrm_flags);
2866}
2867
2868void diff_debug_filepair(const struct diff_filepair *p, int i)
2869{
2870 diff_debug_filespec(p->one, i, "one");
2871 diff_debug_filespec(p->two, i, "two");
64479711 2872 fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
6973dcae 2873 p->score, p->status ? p->status : '?',
64479711 2874 p->one->rename_used, p->broken_pair);
6973dcae
JH
2875}
2876
2877void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
2878{
2879 int i;
2880 if (msg)
2881 fprintf(stderr, "%s\n", msg);
2882 fprintf(stderr, "q->nr = %d\n", q->nr);
2883 for (i = 0; i < q->nr; i++) {
2884 struct diff_filepair *p = q->queue[i];
2885 diff_debug_filepair(p, i);
2886 }
2887}
2888#endif
2889
2890static void diff_resolve_rename_copy(void)
2891{
64479711
LT
2892 int i;
2893 struct diff_filepair *p;
6973dcae
JH
2894 struct diff_queue_struct *q = &diff_queued_diff;
2895
2896 diff_debug_queue("resolve-rename-copy", q);
2897
2898 for (i = 0; i < q->nr; i++) {
2899 p = q->queue[i];
2900 p->status = 0; /* undecided */
2901 if (DIFF_PAIR_UNMERGED(p))
2902 p->status = DIFF_STATUS_UNMERGED;
2903 else if (!DIFF_FILE_VALID(p->one))
2904 p->status = DIFF_STATUS_ADDED;
2905 else if (!DIFF_FILE_VALID(p->two))
2906 p->status = DIFF_STATUS_DELETED;
2907 else if (DIFF_PAIR_TYPE_CHANGED(p))
2908 p->status = DIFF_STATUS_TYPE_CHANGED;
2909
2910 /* from this point on, we are dealing with a pair
2911 * whose both sides are valid and of the same type, i.e.
2912 * either in-place edit or rename/copy edit.
2913 */
2914 else if (DIFF_PAIR_RENAME(p)) {
64479711
LT
2915 /*
2916 * A rename might have re-connected a broken
2917 * pair up, causing the pathnames to be the
2918 * same again. If so, that's not a rename at
2919 * all, just a modification..
2920 *
2921 * Otherwise, see if this source was used for
2922 * multiple renames, in which case we decrement
2923 * the count, and call it a copy.
6973dcae 2924 */
64479711
LT
2925 if (!strcmp(p->one->path, p->two->path))
2926 p->status = DIFF_STATUS_MODIFIED;
2927 else if (--p->one->rename_used > 0)
6973dcae 2928 p->status = DIFF_STATUS_COPIED;
64479711 2929 else
6973dcae
JH
2930 p->status = DIFF_STATUS_RENAMED;
2931 }
a89fccd2 2932 else if (hashcmp(p->one->sha1, p->two->sha1) ||
d516c2d1
JS
2933 p->one->mode != p->two->mode ||
2934 is_null_sha1(p->one->sha1))
6973dcae
JH
2935 p->status = DIFF_STATUS_MODIFIED;
2936 else {
2937 /* This is a "no-change" entry and should not
2938 * happen anymore, but prepare for broken callers.
2939 */
2940 error("feeding unmodified %s to diffcore",
2941 p->one->path);
2942 p->status = DIFF_STATUS_UNKNOWN;
2943 }
2944 }
2945 diff_debug_queue("resolve-rename-copy done", q);
2946}
2947
c6744349 2948static int check_pair_status(struct diff_filepair *p)
6973dcae 2949{
6973dcae
JH
2950 switch (p->status) {
2951 case DIFF_STATUS_UNKNOWN:
c6744349 2952 return 0;
6973dcae
JH
2953 case 0:
2954 die("internal error in diff-resolve-rename-copy");
6973dcae 2955 default:
c6744349 2956 return 1;
6973dcae
JH
2957 }
2958}
2959
c6744349
TH
2960static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
2961{
2962 int fmt = opt->output_format;
2963
2964 if (fmt & DIFF_FORMAT_CHECKDIFF)
2965 diff_flush_checkdiff(p, opt);
2966 else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
2967 diff_flush_raw(p, opt);
cd676a51
JH
2968 else if (fmt & DIFF_FORMAT_NAME) {
2969 const char *name_a, *name_b;
2970 name_a = p->two->path;
2971 name_b = NULL;
2972 strip_prefix(opt->prefix_length, &name_a, &name_b);
c0c77734 2973 write_name_quoted(name_a, opt->file, opt->line_termination);
cd676a51 2974 }
c6744349
TH
2975}
2976
c0c77734 2977static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
4bbd261b
SE
2978{
2979 if (fs->mode)
c0c77734 2980 fprintf(file, " %s mode %06o ", newdelete, fs->mode);
4bbd261b 2981 else
c0c77734
DB
2982 fprintf(file, " %s ", newdelete);
2983 write_name_quoted(fs->path, file, '\n');
4bbd261b
SE
2984}
2985
2986
c0c77734 2987static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name)
4bbd261b
SE
2988{
2989 if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
c0c77734 2990 fprintf(file, " mode change %06o => %06o%c", p->one->mode, p->two->mode,
663af342 2991 show_name ? ' ' : '\n');
0d26a64e 2992 if (show_name) {
c0c77734 2993 write_name_quoted(p->two->path, file, '\n');
0d26a64e 2994 }
4bbd261b
SE
2995 }
2996}
2997
c0c77734 2998static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p)
4bbd261b 2999{
b9f44164 3000 char *names = pprint_rename(p->one->path, p->two->path);
4bbd261b 3001
c0c77734 3002 fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
b9f44164 3003 free(names);
c0c77734 3004 show_mode_change(file, p, 0);
4bbd261b
SE
3005}
3006
c0c77734 3007static void diff_summary(FILE *file, struct diff_filepair *p)
4bbd261b
SE
3008{
3009 switch(p->status) {
3010 case DIFF_STATUS_DELETED:
c0c77734 3011 show_file_mode_name(file, "delete", p->one);
4bbd261b
SE
3012 break;
3013 case DIFF_STATUS_ADDED:
c0c77734 3014 show_file_mode_name(file, "create", p->two);
4bbd261b
SE
3015 break;
3016 case DIFF_STATUS_COPIED:
c0c77734 3017 show_rename_copy(file, "copy", p);
4bbd261b
SE
3018 break;
3019 case DIFF_STATUS_RENAMED:
c0c77734 3020 show_rename_copy(file, "rename", p);
4bbd261b
SE
3021 break;
3022 default:
3023 if (p->score) {
c0c77734
DB
3024 fputs(" rewrite ", file);
3025 write_name_quoted(p->two->path, file, ' ');
3026 fprintf(file, "(%d%%)\n", similarity_index(p));
663af342 3027 }
c0c77734 3028 show_mode_change(file, p, !p->score);
4bbd261b
SE
3029 break;
3030 }
3031}
3032
fcb3d0ad 3033struct patch_id_t {
9126f009 3034 git_SHA_CTX *ctx;
fcb3d0ad
JS
3035 int patchlen;
3036};
3037
3038static int remove_space(char *line, int len)
3039{
3040 int i;
663af342
PH
3041 char *dst = line;
3042 unsigned char c;
fcb3d0ad 3043
663af342
PH
3044 for (i = 0; i < len; i++)
3045 if (!isspace((c = line[i])))
3046 *dst++ = c;
fcb3d0ad 3047
663af342 3048 return dst - line;
fcb3d0ad
JS
3049}
3050
3051static void patch_id_consume(void *priv, char *line, unsigned long len)
3052{
3053 struct patch_id_t *data = priv;
3054 int new_len;
3055
3056 /* Ignore line numbers when computing the SHA1 of the patch */
cc44c765 3057 if (!prefixcmp(line, "@@ -"))
fcb3d0ad
JS
3058 return;
3059
3060 new_len = remove_space(line, len);
3061
9126f009 3062 git_SHA1_Update(data->ctx, line, new_len);
fcb3d0ad
JS
3063 data->patchlen += new_len;
3064}
3065
3066/* returns 0 upon success, and writes result into sha1 */
3067static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
3068{
3069 struct diff_queue_struct *q = &diff_queued_diff;
3070 int i;
9126f009 3071 git_SHA_CTX ctx;
fcb3d0ad
JS
3072 struct patch_id_t data;
3073 char buffer[PATH_MAX * 4 + 20];
3074
9126f009 3075 git_SHA1_Init(&ctx);
fcb3d0ad
JS
3076 memset(&data, 0, sizeof(struct patch_id_t));
3077 data.ctx = &ctx;
fcb3d0ad
JS
3078
3079 for (i = 0; i < q->nr; i++) {
3080 xpparam_t xpp;
3081 xdemitconf_t xecfg;
3082 xdemitcb_t ecb;
3083 mmfile_t mf1, mf2;
3084 struct diff_filepair *p = q->queue[i];
3085 int len1, len2;
3086
9ccd0a88 3087 memset(&xpp, 0, sizeof(xpp));
30b25010 3088 memset(&xecfg, 0, sizeof(xecfg));
fcb3d0ad
JS
3089 if (p->status == 0)
3090 return error("internal diff status error");
3091 if (p->status == DIFF_STATUS_UNKNOWN)
3092 continue;
3093 if (diff_unmodified_pair(p))
3094 continue;
3095 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3096 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3097 continue;
3098 if (DIFF_PAIR_UNMERGED(p))
3099 continue;
3100
3101 diff_fill_sha1_info(p->one);
3102 diff_fill_sha1_info(p->two);
3103 if (fill_mmfile(&mf1, p->one) < 0 ||
3104 fill_mmfile(&mf2, p->two) < 0)
3105 return error("unable to read files to diff");
3106
fcb3d0ad
JS
3107 len1 = remove_space(p->one->path, strlen(p->one->path));
3108 len2 = remove_space(p->two->path, strlen(p->two->path));
3109 if (p->one->mode == 0)
3110 len1 = snprintf(buffer, sizeof(buffer),
3111 "diff--gita/%.*sb/%.*s"
3112 "newfilemode%06o"
3113 "---/dev/null"
3114 "+++b/%.*s",
3115 len1, p->one->path,
3116 len2, p->two->path,
3117 p->two->mode,
3118 len2, p->two->path);
3119 else if (p->two->mode == 0)
3120 len1 = snprintf(buffer, sizeof(buffer),
3121 "diff--gita/%.*sb/%.*s"
3122 "deletedfilemode%06o"
3123 "---a/%.*s"
3124 "+++/dev/null",
3125 len1, p->one->path,
3126 len2, p->two->path,
3127 p->one->mode,
3128 len1, p->one->path);
3129 else
3130 len1 = snprintf(buffer, sizeof(buffer),
3131 "diff--gita/%.*sb/%.*s"
3132 "---a/%.*s"
3133 "+++b/%.*s",
3134 len1, p->one->path,
3135 len2, p->two->path,
3136 len1, p->one->path,
3137 len2, p->two->path);
9126f009 3138 git_SHA1_Update(&ctx, buffer, len1);
fcb3d0ad
JS
3139
3140 xpp.flags = XDF_NEED_MINIMAL;
3141 xecfg.ctxlen = 3;
9fdc3bb5 3142 xecfg.flags = XDL_EMIT_FUNCNAMES;
8a3f524b
JH
3143 xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
3144 &xpp, &xecfg, &ecb);
fcb3d0ad
JS
3145 }
3146
9126f009 3147 git_SHA1_Final(sha1, &ctx);
fcb3d0ad
JS
3148 return 0;
3149}
3150
3151int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
3152{
3153 struct diff_queue_struct *q = &diff_queued_diff;
3154 int i;
3155 int result = diff_get_patch_id(options, sha1);
3156
3157 for (i = 0; i < q->nr; i++)
3158 diff_free_filepair(q->queue[i]);
3159
3160 free(q->queue);
3161 q->queue = NULL;
3162 q->nr = q->alloc = 0;
3163
3164 return result;
3165}
3166
946c3784 3167static int is_summary_empty(const struct diff_queue_struct *q)
6973dcae 3168{
6973dcae 3169 int i;
6973dcae 3170
946c3784
TH
3171 for (i = 0; i < q->nr; i++) {
3172 const struct diff_filepair *p = q->queue[i];
3173
3174 switch (p->status) {
3175 case DIFF_STATUS_DELETED:
3176 case DIFF_STATUS_ADDED:
3177 case DIFF_STATUS_COPIED:
3178 case DIFF_STATUS_RENAMED:
3179 return 0;
3180 default:
3181 if (p->score)
3182 return 0;
3183 if (p->one->mode && p->two->mode &&
3184 p->one->mode != p->two->mode)
3185 return 0;
3186 break;
3187 }
6973dcae 3188 }
946c3784
TH
3189 return 1;
3190}
3191
6973dcae
JH
3192void diff_flush(struct diff_options *options)
3193{
3194 struct diff_queue_struct *q = &diff_queued_diff;
c6744349 3195 int i, output_format = options->output_format;
946c3784 3196 int separator = 0;
6973dcae 3197
c6744349
TH
3198 /*
3199 * Order: raw, stat, summary, patch
3200 * or: name/name-status/checkdiff (other bits clear)
3201 */
946c3784
TH
3202 if (!q->nr)
3203 goto free_queue;
6973dcae 3204
c6744349
TH
3205 if (output_format & (DIFF_FORMAT_RAW |
3206 DIFF_FORMAT_NAME |
3207 DIFF_FORMAT_NAME_STATUS |
3208 DIFF_FORMAT_CHECKDIFF)) {
6973dcae
JH
3209 for (i = 0; i < q->nr; i++) {
3210 struct diff_filepair *p = q->queue[i];
c6744349
TH
3211 if (check_pair_status(p))
3212 flush_one_pair(p, options);
6973dcae 3213 }
946c3784 3214 separator++;
6973dcae 3215 }
c6744349 3216
c04a7155 3217 if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT)) {
5e2b0636 3218 struct diffstat_t diffstat;
c6744349 3219
5e2b0636 3220 memset(&diffstat, 0, sizeof(struct diffstat_t));
6973dcae
JH
3221 for (i = 0; i < q->nr; i++) {
3222 struct diff_filepair *p = q->queue[i];
c6744349 3223 if (check_pair_status(p))
5e2b0636 3224 diff_flush_stat(p, options, &diffstat);
6973dcae 3225 }
74e2abe5
JH
3226 if (output_format & DIFF_FORMAT_NUMSTAT)
3227 show_numstat(&diffstat, options);
3228 if (output_format & DIFF_FORMAT_DIFFSTAT)
3229 show_stats(&diffstat, options);
f604652e 3230 if (output_format & DIFF_FORMAT_SHORTSTAT)
c0c77734 3231 show_shortstats(&diffstat, options);
f604652e 3232 free_diffstat_info(&diffstat);
3969cf7d 3233 separator++;
6973dcae 3234 }
c04a7155
JH
3235 if (output_format & DIFF_FORMAT_DIRSTAT)
3236 show_dirstat(options);
6973dcae 3237
946c3784 3238 if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
c6744349 3239 for (i = 0; i < q->nr; i++)
c0c77734 3240 diff_summary(options->file, q->queue[i]);
3969cf7d 3241 separator++;
6973dcae
JH
3242 }
3243
c6744349 3244 if (output_format & DIFF_FORMAT_PATCH) {
946c3784 3245 if (separator) {
6b2fbaaf 3246 putc(options->line_termination, options->file);
946c3784
TH
3247 if (options->stat_sep) {
3248 /* attach patch instead of inline */
c0c77734 3249 fputs(options->stat_sep, options->file);
946c3784 3250 }
c6744349
TH
3251 }
3252
3253 for (i = 0; i < q->nr; i++) {
3254 struct diff_filepair *p = q->queue[i];
3255 if (check_pair_status(p))
3256 diff_flush_patch(p, options);
3257 }
4bbd261b
SE
3258 }
3259
04245581
JK
3260 if (output_format & DIFF_FORMAT_CALLBACK)
3261 options->format_callback(q, options, options->format_callback_data);
3262
c6744349
TH
3263 for (i = 0; i < q->nr; i++)
3264 diff_free_filepair(q->queue[i]);
946c3784 3265free_queue:
6973dcae
JH
3266 free(q->queue);
3267 q->queue = NULL;
3268 q->nr = q->alloc = 0;
c0c77734
DB
3269 if (options->close_file)
3270 fclose(options->file);
6973dcae
JH
3271}
3272
3273static void diffcore_apply_filter(const char *filter)
3274{
3275 int i;
3276 struct diff_queue_struct *q = &diff_queued_diff;
3277 struct diff_queue_struct outq;
3278 outq.queue = NULL;
3279 outq.nr = outq.alloc = 0;
3280
3281 if (!filter)
3282 return;
3283
3284 if (strchr(filter, DIFF_STATUS_FILTER_AON)) {
3285 int found;
3286 for (i = found = 0; !found && i < q->nr; i++) {
3287 struct diff_filepair *p = q->queue[i];
3288 if (((p->status == DIFF_STATUS_MODIFIED) &&
3289 ((p->score &&
3290 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3291 (!p->score &&
3292 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3293 ((p->status != DIFF_STATUS_MODIFIED) &&
3294 strchr(filter, p->status)))
3295 found++;
3296 }
3297 if (found)
3298 return;
3299
3300 /* otherwise we will clear the whole queue
3301 * by copying the empty outq at the end of this
3302 * function, but first clear the current entries
3303 * in the queue.
3304 */
3305 for (i = 0; i < q->nr; i++)
3306 diff_free_filepair(q->queue[i]);
3307 }
3308 else {
3309 /* Only the matching ones */
3310 for (i = 0; i < q->nr; i++) {
3311 struct diff_filepair *p = q->queue[i];
3312
3313 if (((p->status == DIFF_STATUS_MODIFIED) &&
3314 ((p->score &&
3315 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3316 (!p->score &&
3317 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3318 ((p->status != DIFF_STATUS_MODIFIED) &&
3319 strchr(filter, p->status)))
3320 diff_q(&outq, p);
3321 else
3322 diff_free_filepair(p);
3323 }
3324 }
3325 free(q->queue);
3326 *q = outq;
3327}
3328
5701115a
SV
3329/* Check whether two filespecs with the same mode and size are identical */
3330static int diff_filespec_is_identical(struct diff_filespec *one,
3331 struct diff_filespec *two)
3332{
2b459b48
JH
3333 if (S_ISGITLINK(one->mode))
3334 return 0;
5701115a
SV
3335 if (diff_populate_filespec(one, 0))
3336 return 0;
3337 if (diff_populate_filespec(two, 0))
3338 return 0;
3339 return !memcmp(one->data, two->data, one->size);
3340}
3341
fb13227e
JH
3342static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3343{
3344 int i;
3345 struct diff_queue_struct *q = &diff_queued_diff;
3346 struct diff_queue_struct outq;
3347 outq.queue = NULL;
3348 outq.nr = outq.alloc = 0;
3349
3350 for (i = 0; i < q->nr; i++) {
3351 struct diff_filepair *p = q->queue[i];
3352
3353 /*
3354 * 1. Entries that come from stat info dirtyness
3355 * always have both sides (iow, not create/delete),
3356 * one side of the object name is unknown, with
3357 * the same mode and size. Keep the ones that
3358 * do not match these criteria. They have real
3359 * differences.
3360 *
3361 * 2. At this point, the file is known to be modified,
3362 * with the same mode and size, and the object
3363 * name of one side is unknown. Need to inspect
3364 * the identical contents.
3365 */
3366 if (!DIFF_FILE_VALID(p->one) || /* (1) */
3367 !DIFF_FILE_VALID(p->two) ||
3368 (p->one->sha1_valid && p->two->sha1_valid) ||
3369 (p->one->mode != p->two->mode) ||
3370 diff_populate_filespec(p->one, 1) ||
3371 diff_populate_filespec(p->two, 1) ||
3372 (p->one->size != p->two->size) ||
5701115a 3373 !diff_filespec_is_identical(p->one, p->two)) /* (2) */
fb13227e
JH
3374 diff_q(&outq, p);
3375 else {
3376 /*
3377 * The caller can subtract 1 from skip_stat_unmatch
3378 * to determine how many paths were dirty only
3379 * due to stat info mismatch.
3380 */
8f67f8ae 3381 if (!DIFF_OPT_TST(diffopt, NO_INDEX))
6d2d9e86 3382 diffopt->skip_stat_unmatch++;
fb13227e
JH
3383 diff_free_filepair(p);
3384 }
3385 }
3386 free(q->queue);
3387 *q = outq;
3388}
3389
6973dcae
JH
3390void diffcore_std(struct diff_options *options)
3391{
9d865356 3392 if (options->skip_stat_unmatch)
fb13227e 3393 diffcore_skip_stat_unmatch(options);
6973dcae
JH
3394 if (options->break_opt != -1)
3395 diffcore_break(options->break_opt);
3396 if (options->detect_rename)
3397 diffcore_rename(options);
3398 if (options->break_opt != -1)
3399 diffcore_merge_broken();
3400 if (options->pickaxe)
3401 diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
3402 if (options->orderfile)
3403 diffcore_order(options->orderfile);
3404 diff_resolve_rename_copy();
3405 diffcore_apply_filter(options->filter);
68aacb2f 3406
8f67f8ae
PH
3407 if (diff_queued_diff.nr)
3408 DIFF_OPT_SET(options, HAS_CHANGES);
3409 else
3410 DIFF_OPT_CLR(options, HAS_CHANGES);
6973dcae
JH
3411}
3412
da31b358
JH
3413int diff_result_code(struct diff_options *opt, int status)
3414{
3415 int result = 0;
3416 if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3417 !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
3418 return status;
3419 if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3420 DIFF_OPT_TST(opt, HAS_CHANGES))
3421 result |= 01;
3422 if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
3423 DIFF_OPT_TST(opt, CHECK_FAILED))
3424 result |= 02;
3425 return result;
3426}
6973dcae 3427
6973dcae
JH
3428void diff_addremove(struct diff_options *options,
3429 int addremove, unsigned mode,
3430 const unsigned char *sha1,
fd55a19e 3431 const char *concatpath)
6973dcae 3432{
6973dcae
JH
3433 struct diff_filespec *one, *two;
3434
50fd9bd8
JS
3435 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(mode))
3436 return;
3437
6973dcae
JH
3438 /* This may look odd, but it is a preparation for
3439 * feeding "there are unchanged files which should
3440 * not produce diffs, but when you are doing copy
3441 * detection you would need them, so here they are"
3442 * entries to the diff-core. They will be prefixed
3443 * with something like '=' or '*' (I haven't decided
3444 * which but should not make any difference).
a6080a0a 3445 * Feeding the same new and old to diff_change()
6973dcae
JH
3446 * also has the same effect.
3447 * Before the final output happens, they are pruned after
3448 * merged into rename/copy pairs as appropriate.
3449 */
8f67f8ae 3450 if (DIFF_OPT_TST(options, REVERSE_DIFF))
6973dcae
JH
3451 addremove = (addremove == '+' ? '-' :
3452 addremove == '-' ? '+' : addremove);
3453
cd676a51
JH
3454 if (options->prefix &&
3455 strncmp(concatpath, options->prefix, options->prefix_length))
3456 return;
3457
6973dcae
JH
3458 one = alloc_filespec(concatpath);
3459 two = alloc_filespec(concatpath);
3460
3461 if (addremove != '+')
3462 fill_filespec(one, sha1, mode);
3463 if (addremove != '-')
3464 fill_filespec(two, sha1, mode);
3465
3466 diff_queue(&diff_queued_diff, one, two);
8f67f8ae 3467 DIFF_OPT_SET(options, HAS_CHANGES);
6973dcae
JH
3468}
3469
3470void diff_change(struct diff_options *options,
3471 unsigned old_mode, unsigned new_mode,
3472 const unsigned char *old_sha1,
3473 const unsigned char *new_sha1,
fd55a19e 3474 const char *concatpath)
6973dcae 3475{
6973dcae
JH
3476 struct diff_filespec *one, *two;
3477
50fd9bd8
JS
3478 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(old_mode)
3479 && S_ISGITLINK(new_mode))
3480 return;
3481
8f67f8ae 3482 if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
6973dcae
JH
3483 unsigned tmp;
3484 const unsigned char *tmp_c;
3485 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
3486 tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
3487 }
cd676a51
JH
3488
3489 if (options->prefix &&
3490 strncmp(concatpath, options->prefix, options->prefix_length))
3491 return;
3492
6973dcae
JH
3493 one = alloc_filespec(concatpath);
3494 two = alloc_filespec(concatpath);
3495 fill_filespec(one, old_sha1, old_mode);
3496 fill_filespec(two, new_sha1, new_mode);
3497
3498 diff_queue(&diff_queued_diff, one, two);
8f67f8ae 3499 DIFF_OPT_SET(options, HAS_CHANGES);
6973dcae
JH
3500}
3501
3502void diff_unmerge(struct diff_options *options,
e9c84099
JH
3503 const char *path,
3504 unsigned mode, const unsigned char *sha1)
6973dcae
JH
3505{
3506 struct diff_filespec *one, *two;
cd676a51
JH
3507
3508 if (options->prefix &&
3509 strncmp(path, options->prefix, options->prefix_length))
3510 return;
3511
6973dcae
JH
3512 one = alloc_filespec(path);
3513 two = alloc_filespec(path);
e9c84099
JH
3514 fill_filespec(one, sha1, mode);
3515 diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1;
6973dcae 3516}
9cb92c39
JK
3517
3518static char *run_textconv(const char *pgm, struct diff_filespec *spec,
3519 size_t *outsize)
3520{
3521 struct diff_tempfile temp;
3522 const char *argv[3];
3523 const char **arg = argv;
3524 struct child_process child;
3525 struct strbuf buf = STRBUF_INIT;
3526
3527 prepare_temp_file(spec->path, &temp, spec);
3528 *arg++ = pgm;
3529 *arg++ = temp.name;
3530 *arg = NULL;
3531
3532 memset(&child, 0, sizeof(child));
3533 child.argv = argv;
3534 child.out = -1;
3535 if (start_command(&child) != 0 ||
3536 strbuf_read(&buf, child.out, 0) < 0 ||
3537 finish_command(&child) != 0) {
3538 if (temp.name == temp.tmp_path)
3539 unlink(temp.name);
3540 error("error running textconv command '%s'", pgm);
3541 return NULL;
3542 }
3543 if (temp.name == temp.tmp_path)
3544 unlink(temp.name);
3545
3546 return strbuf_detach(&buf, outsize);
3547}