diff.c: use diff_options directly
[git] / diff.c
1 /*
2  * Copyright (C) 2005 Junio C Hamano
3  */
4 #include "cache.h"
5 #include "tempfile.h"
6 #include "quote.h"
7 #include "diff.h"
8 #include "diffcore.h"
9 #include "delta.h"
10 #include "xdiff-interface.h"
11 #include "color.h"
12 #include "attr.h"
13 #include "run-command.h"
14 #include "utf8.h"
15 #include "userdiff.h"
16 #include "submodule-config.h"
17 #include "submodule.h"
18 #include "ll-merge.h"
19 #include "string-list.h"
20 #include "argv-array.h"
21
22 #ifdef NO_FAST_WORKING_DIRECTORY
23 #define FAST_WORKING_DIRECTORY 0
24 #else
25 #define FAST_WORKING_DIRECTORY 1
26 #endif
27
28 static int diff_detect_rename_default;
29 static int diff_compaction_heuristic; /* experimental */
30 static int diff_rename_limit_default = 400;
31 static int diff_suppress_blank_empty;
32 static int diff_use_color_default = -1;
33 static int diff_context_default = 3;
34 static const char *diff_word_regex_cfg;
35 static const char *external_diff_cmd_cfg;
36 static const char *diff_order_file_cfg;
37 int diff_auto_refresh_index = 1;
38 static int diff_mnemonic_prefix;
39 static int diff_no_prefix;
40 static int diff_stat_graph_width;
41 static int diff_dirstat_permille_default = 30;
42 static struct diff_options default_diff_options;
43 static long diff_algorithm;
44
45 static char diff_colors[][COLOR_MAXLEN] = {
46         GIT_COLOR_RESET,
47         GIT_COLOR_NORMAL,       /* CONTEXT */
48         GIT_COLOR_BOLD,         /* METAINFO */
49         GIT_COLOR_CYAN,         /* FRAGINFO */
50         GIT_COLOR_RED,          /* OLD */
51         GIT_COLOR_GREEN,        /* NEW */
52         GIT_COLOR_YELLOW,       /* COMMIT */
53         GIT_COLOR_BG_RED,       /* WHITESPACE */
54         GIT_COLOR_NORMAL,       /* FUNCINFO */
55 };
56
57 static int parse_diff_color_slot(const char *var)
58 {
59         if (!strcasecmp(var, "context") || !strcasecmp(var, "plain"))
60                 return DIFF_CONTEXT;
61         if (!strcasecmp(var, "meta"))
62                 return DIFF_METAINFO;
63         if (!strcasecmp(var, "frag"))
64                 return DIFF_FRAGINFO;
65         if (!strcasecmp(var, "old"))
66                 return DIFF_FILE_OLD;
67         if (!strcasecmp(var, "new"))
68                 return DIFF_FILE_NEW;
69         if (!strcasecmp(var, "commit"))
70                 return DIFF_COMMIT;
71         if (!strcasecmp(var, "whitespace"))
72                 return DIFF_WHITESPACE;
73         if (!strcasecmp(var, "func"))
74                 return DIFF_FUNCINFO;
75         return -1;
76 }
77
78 static int parse_dirstat_params(struct diff_options *options, const char *params_string,
79                                 struct strbuf *errmsg)
80 {
81         char *params_copy = xstrdup(params_string);
82         struct string_list params = STRING_LIST_INIT_NODUP;
83         int ret = 0;
84         int i;
85
86         if (*params_copy)
87                 string_list_split_in_place(&params, params_copy, ',', -1);
88         for (i = 0; i < params.nr; i++) {
89                 const char *p = params.items[i].string;
90                 if (!strcmp(p, "changes")) {
91                         DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
92                         DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
93                 } else if (!strcmp(p, "lines")) {
94                         DIFF_OPT_SET(options, DIRSTAT_BY_LINE);
95                         DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
96                 } else if (!strcmp(p, "files")) {
97                         DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
98                         DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
99                 } else if (!strcmp(p, "noncumulative")) {
100                         DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE);
101                 } else if (!strcmp(p, "cumulative")) {
102                         DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
103                 } else if (isdigit(*p)) {
104                         char *end;
105                         int permille = strtoul(p, &end, 10) * 10;
106                         if (*end == '.' && isdigit(*++end)) {
107                                 /* only use first digit */
108                                 permille += *end - '0';
109                                 /* .. and ignore any further digits */
110                                 while (isdigit(*++end))
111                                         ; /* nothing */
112                         }
113                         if (!*end)
114                                 options->dirstat_permille = permille;
115                         else {
116                                 strbuf_addf(errmsg, _("  Failed to parse dirstat cut-off percentage '%s'\n"),
117                                             p);
118                                 ret++;
119                         }
120                 } else {
121                         strbuf_addf(errmsg, _("  Unknown dirstat parameter '%s'\n"), p);
122                         ret++;
123                 }
124
125         }
126         string_list_clear(&params, 0);
127         free(params_copy);
128         return ret;
129 }
130
131 static int parse_submodule_params(struct diff_options *options, const char *value)
132 {
133         if (!strcmp(value, "log"))
134                 DIFF_OPT_SET(options, SUBMODULE_LOG);
135         else if (!strcmp(value, "short"))
136                 DIFF_OPT_CLR(options, SUBMODULE_LOG);
137         else
138                 return -1;
139         return 0;
140 }
141
142 static int git_config_rename(const char *var, const char *value)
143 {
144         if (!value)
145                 return DIFF_DETECT_RENAME;
146         if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
147                 return  DIFF_DETECT_COPY;
148         return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
149 }
150
151 long parse_algorithm_value(const char *value)
152 {
153         if (!value)
154                 return -1;
155         else if (!strcasecmp(value, "myers") || !strcasecmp(value, "default"))
156                 return 0;
157         else if (!strcasecmp(value, "minimal"))
158                 return XDF_NEED_MINIMAL;
159         else if (!strcasecmp(value, "patience"))
160                 return XDF_PATIENCE_DIFF;
161         else if (!strcasecmp(value, "histogram"))
162                 return XDF_HISTOGRAM_DIFF;
163         return -1;
164 }
165
166 /*
167  * These are to give UI layer defaults.
168  * The core-level commands such as git-diff-files should
169  * never be affected by the setting of diff.renames
170  * the user happens to have in the configuration file.
171  */
172 void init_diff_ui_defaults(void)
173 {
174         diff_detect_rename_default = 1;
175 }
176
177 int git_diff_ui_config(const char *var, const char *value, void *cb)
178 {
179         if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
180                 diff_use_color_default = git_config_colorbool(var, value);
181                 return 0;
182         }
183         if (!strcmp(var, "diff.context")) {
184                 diff_context_default = git_config_int(var, value);
185                 if (diff_context_default < 0)
186                         return -1;
187                 return 0;
188         }
189         if (!strcmp(var, "diff.renames")) {
190                 diff_detect_rename_default = git_config_rename(var, value);
191                 return 0;
192         }
193         if (!strcmp(var, "diff.compactionheuristic")) {
194                 diff_compaction_heuristic = git_config_bool(var, value);
195                 return 0;
196         }
197         if (!strcmp(var, "diff.autorefreshindex")) {
198                 diff_auto_refresh_index = git_config_bool(var, value);
199                 return 0;
200         }
201         if (!strcmp(var, "diff.mnemonicprefix")) {
202                 diff_mnemonic_prefix = git_config_bool(var, value);
203                 return 0;
204         }
205         if (!strcmp(var, "diff.noprefix")) {
206                 diff_no_prefix = git_config_bool(var, value);
207                 return 0;
208         }
209         if (!strcmp(var, "diff.statgraphwidth")) {
210                 diff_stat_graph_width = git_config_int(var, value);
211                 return 0;
212         }
213         if (!strcmp(var, "diff.external"))
214                 return git_config_string(&external_diff_cmd_cfg, var, value);
215         if (!strcmp(var, "diff.wordregex"))
216                 return git_config_string(&diff_word_regex_cfg, var, value);
217         if (!strcmp(var, "diff.orderfile"))
218                 return git_config_pathname(&diff_order_file_cfg, var, value);
219
220         if (!strcmp(var, "diff.ignoresubmodules"))
221                 handle_ignore_submodules_arg(&default_diff_options, value);
222
223         if (!strcmp(var, "diff.submodule")) {
224                 if (parse_submodule_params(&default_diff_options, value))
225                         warning(_("Unknown value for 'diff.submodule' config variable: '%s'"),
226                                 value);
227                 return 0;
228         }
229
230         if (!strcmp(var, "diff.algorithm")) {
231                 diff_algorithm = parse_algorithm_value(value);
232                 if (diff_algorithm < 0)
233                         return -1;
234                 return 0;
235         }
236
237         if (git_color_config(var, value, cb) < 0)
238                 return -1;
239
240         return git_diff_basic_config(var, value, cb);
241 }
242
243 int git_diff_basic_config(const char *var, const char *value, void *cb)
244 {
245         const char *name;
246
247         if (!strcmp(var, "diff.renamelimit")) {
248                 diff_rename_limit_default = git_config_int(var, value);
249                 return 0;
250         }
251
252         if (userdiff_config(var, value) < 0)
253                 return -1;
254
255         if (skip_prefix(var, "diff.color.", &name) ||
256             skip_prefix(var, "color.diff.", &name)) {
257                 int slot = parse_diff_color_slot(name);
258                 if (slot < 0)
259                         return 0;
260                 if (!value)
261                         return config_error_nonbool(var);
262                 return color_parse(value, diff_colors[slot]);
263         }
264
265         /* like GNU diff's --suppress-blank-empty option  */
266         if (!strcmp(var, "diff.suppressblankempty") ||
267                         /* for backwards compatibility */
268                         !strcmp(var, "diff.suppress-blank-empty")) {
269                 diff_suppress_blank_empty = git_config_bool(var, value);
270                 return 0;
271         }
272
273         if (!strcmp(var, "diff.dirstat")) {
274                 struct strbuf errmsg = STRBUF_INIT;
275                 default_diff_options.dirstat_permille = diff_dirstat_permille_default;
276                 if (parse_dirstat_params(&default_diff_options, value, &errmsg))
277                         warning(_("Found errors in 'diff.dirstat' config variable:\n%s"),
278                                 errmsg.buf);
279                 strbuf_release(&errmsg);
280                 diff_dirstat_permille_default = default_diff_options.dirstat_permille;
281                 return 0;
282         }
283
284         if (starts_with(var, "submodule."))
285                 return parse_submodule_config_option(var, value);
286
287         return git_default_config(var, value, cb);
288 }
289
290 static char *quote_two(const char *one, const char *two)
291 {
292         int need_one = quote_c_style(one, NULL, NULL, 1);
293         int need_two = quote_c_style(two, NULL, NULL, 1);
294         struct strbuf res = STRBUF_INIT;
295
296         if (need_one + need_two) {
297                 strbuf_addch(&res, '"');
298                 quote_c_style(one, &res, NULL, 1);
299                 quote_c_style(two, &res, NULL, 1);
300                 strbuf_addch(&res, '"');
301         } else {
302                 strbuf_addstr(&res, one);
303                 strbuf_addstr(&res, two);
304         }
305         return strbuf_detach(&res, NULL);
306 }
307
308 static const char *external_diff(void)
309 {
310         static const char *external_diff_cmd = NULL;
311         static int done_preparing = 0;
312
313         if (done_preparing)
314                 return external_diff_cmd;
315         external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
316         if (!external_diff_cmd)
317                 external_diff_cmd = external_diff_cmd_cfg;
318         done_preparing = 1;
319         return external_diff_cmd;
320 }
321
322 /*
323  * Keep track of files used for diffing. Sometimes such an entry
324  * refers to a temporary file, sometimes to an existing file, and
325  * sometimes to "/dev/null".
326  */
327 static struct diff_tempfile {
328         /*
329          * filename external diff should read from, or NULL if this
330          * entry is currently not in use:
331          */
332         const char *name;
333
334         char hex[GIT_SHA1_HEXSZ + 1];
335         char mode[10];
336
337         /*
338          * If this diff_tempfile instance refers to a temporary file,
339          * this tempfile object is used to manage its lifetime.
340          */
341         struct tempfile tempfile;
342 } diff_temp[2];
343
344 typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
345
346 struct emit_callback {
347         int color_diff;
348         unsigned ws_rule;
349         int blank_at_eof_in_preimage;
350         int blank_at_eof_in_postimage;
351         int lno_in_preimage;
352         int lno_in_postimage;
353         sane_truncate_fn truncate;
354         const char **label_path;
355         struct diff_words_data *diff_words;
356         struct diff_options *opt;
357         int *found_changesp;
358         struct strbuf *header;
359 };
360
361 static int count_lines(const char *data, int size)
362 {
363         int count, ch, completely_empty = 1, nl_just_seen = 0;
364         count = 0;
365         while (0 < size--) {
366                 ch = *data++;
367                 if (ch == '\n') {
368                         count++;
369                         nl_just_seen = 1;
370                         completely_empty = 0;
371                 }
372                 else {
373                         nl_just_seen = 0;
374                         completely_empty = 0;
375                 }
376         }
377         if (completely_empty)
378                 return 0;
379         if (!nl_just_seen)
380                 count++; /* no trailing newline */
381         return count;
382 }
383
384 static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
385 {
386         if (!DIFF_FILE_VALID(one)) {
387                 mf->ptr = (char *)""; /* does not matter */
388                 mf->size = 0;
389                 return 0;
390         }
391         else if (diff_populate_filespec(one, 0))
392                 return -1;
393
394         mf->ptr = one->data;
395         mf->size = one->size;
396         return 0;
397 }
398
399 /* like fill_mmfile, but only for size, so we can avoid retrieving blob */
400 static unsigned long diff_filespec_size(struct diff_filespec *one)
401 {
402         if (!DIFF_FILE_VALID(one))
403                 return 0;
404         diff_populate_filespec(one, CHECK_SIZE_ONLY);
405         return one->size;
406 }
407
408 static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
409 {
410         char *ptr = mf->ptr;
411         long size = mf->size;
412         int cnt = 0;
413
414         if (!size)
415                 return cnt;
416         ptr += size - 1; /* pointing at the very end */
417         if (*ptr != '\n')
418                 ; /* incomplete line */
419         else
420                 ptr--; /* skip the last LF */
421         while (mf->ptr < ptr) {
422                 char *prev_eol;
423                 for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
424                         if (*prev_eol == '\n')
425                                 break;
426                 if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
427                         break;
428                 cnt++;
429                 ptr = prev_eol - 1;
430         }
431         return cnt;
432 }
433
434 static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
435                                struct emit_callback *ecbdata)
436 {
437         int l1, l2, at;
438         unsigned ws_rule = ecbdata->ws_rule;
439         l1 = count_trailing_blank(mf1, ws_rule);
440         l2 = count_trailing_blank(mf2, ws_rule);
441         if (l2 <= l1) {
442                 ecbdata->blank_at_eof_in_preimage = 0;
443                 ecbdata->blank_at_eof_in_postimage = 0;
444                 return;
445         }
446         at = count_lines(mf1->ptr, mf1->size);
447         ecbdata->blank_at_eof_in_preimage = (at - l1) + 1;
448
449         at = count_lines(mf2->ptr, mf2->size);
450         ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
451 }
452
453 static void emit_line_0(struct diff_options *o, const char *set, const char *reset,
454                         int first, const char *line, int len)
455 {
456         int has_trailing_newline, has_trailing_carriage_return;
457         int nofirst;
458         FILE *file = o->file;
459
460         fputs(diff_line_prefix(o), file);
461
462         if (len == 0) {
463                 has_trailing_newline = (first == '\n');
464                 has_trailing_carriage_return = (!has_trailing_newline &&
465                                                 (first == '\r'));
466                 nofirst = has_trailing_newline || has_trailing_carriage_return;
467         } else {
468                 has_trailing_newline = (len > 0 && line[len-1] == '\n');
469                 if (has_trailing_newline)
470                         len--;
471                 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
472                 if (has_trailing_carriage_return)
473                         len--;
474                 nofirst = 0;
475         }
476
477         if (len || !nofirst) {
478                 fputs(set, file);
479                 if (!nofirst)
480                         fputc(first, file);
481                 fwrite(line, len, 1, file);
482                 fputs(reset, file);
483         }
484         if (has_trailing_carriage_return)
485                 fputc('\r', file);
486         if (has_trailing_newline)
487                 fputc('\n', file);
488 }
489
490 static void emit_line(struct diff_options *o, const char *set, const char *reset,
491                       const char *line, int len)
492 {
493         emit_line_0(o, set, reset, line[0], line+1, len-1);
494 }
495
496 static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
497 {
498         if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
499               ecbdata->blank_at_eof_in_preimage &&
500               ecbdata->blank_at_eof_in_postimage &&
501               ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
502               ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
503                 return 0;
504         return ws_blank_line(line, len, ecbdata->ws_rule);
505 }
506
507 static void emit_line_checked(const char *reset,
508                               struct emit_callback *ecbdata,
509                               const char *line, int len,
510                               enum color_diff color,
511                               unsigned ws_error_highlight,
512                               char sign)
513 {
514         const char *set = diff_get_color(ecbdata->color_diff, color);
515         const char *ws = NULL;
516
517         if (ecbdata->opt->ws_error_highlight & ws_error_highlight) {
518                 ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
519                 if (!*ws)
520                         ws = NULL;
521         }
522
523         if (!ws)
524                 emit_line_0(ecbdata->opt, set, reset, sign, line, len);
525         else if (sign == '+' && new_blank_line_at_eof(ecbdata, line, len))
526                 /* Blank line at EOF - paint '+' as well */
527                 emit_line_0(ecbdata->opt, ws, reset, sign, line, len);
528         else {
529                 /* Emit just the prefix, then the rest. */
530                 emit_line_0(ecbdata->opt, set, reset, sign, "", 0);
531                 ws_check_emit(line, len, ecbdata->ws_rule,
532                               ecbdata->opt->file, set, reset, ws);
533         }
534 }
535
536 static void emit_add_line(const char *reset,
537                           struct emit_callback *ecbdata,
538                           const char *line, int len)
539 {
540         emit_line_checked(reset, ecbdata, line, len,
541                           DIFF_FILE_NEW, WSEH_NEW, '+');
542 }
543
544 static void emit_del_line(const char *reset,
545                           struct emit_callback *ecbdata,
546                           const char *line, int len)
547 {
548         emit_line_checked(reset, ecbdata, line, len,
549                           DIFF_FILE_OLD, WSEH_OLD, '-');
550 }
551
552 static void emit_context_line(const char *reset,
553                               struct emit_callback *ecbdata,
554                               const char *line, int len)
555 {
556         emit_line_checked(reset, ecbdata, line, len,
557                           DIFF_CONTEXT, WSEH_CONTEXT, ' ');
558 }
559
560 static void emit_hunk_header(struct emit_callback *ecbdata,
561                              const char *line, int len)
562 {
563         const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
564         const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
565         const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
566         const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
567         static const char atat[2] = { '@', '@' };
568         const char *cp, *ep;
569         struct strbuf msgbuf = STRBUF_INIT;
570         int org_len = len;
571         int i = 1;
572
573         /*
574          * As a hunk header must begin with "@@ -<old>, +<new> @@",
575          * it always is at least 10 bytes long.
576          */
577         if (len < 10 ||
578             memcmp(line, atat, 2) ||
579             !(ep = memmem(line + 2, len - 2, atat, 2))) {
580                 emit_line(ecbdata->opt, context, reset, line, len);
581                 return;
582         }
583         ep += 2; /* skip over @@ */
584
585         /* The hunk header in fraginfo color */
586         strbuf_addstr(&msgbuf, frag);
587         strbuf_add(&msgbuf, line, ep - line);
588         strbuf_addstr(&msgbuf, reset);
589
590         /*
591          * trailing "\r\n"
592          */
593         for ( ; i < 3; i++)
594                 if (line[len - i] == '\r' || line[len - i] == '\n')
595                         len--;
596
597         /* blank before the func header */
598         for (cp = ep; ep - line < len; ep++)
599                 if (*ep != ' ' && *ep != '\t')
600                         break;
601         if (ep != cp) {
602                 strbuf_addstr(&msgbuf, context);
603                 strbuf_add(&msgbuf, cp, ep - cp);
604                 strbuf_addstr(&msgbuf, reset);
605         }
606
607         if (ep < line + len) {
608                 strbuf_addstr(&msgbuf, func);
609                 strbuf_add(&msgbuf, ep, line + len - ep);
610                 strbuf_addstr(&msgbuf, reset);
611         }
612
613         strbuf_add(&msgbuf, line + len, org_len - len);
614         emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
615         strbuf_release(&msgbuf);
616 }
617
618 static struct diff_tempfile *claim_diff_tempfile(void) {
619         int i;
620         for (i = 0; i < ARRAY_SIZE(diff_temp); i++)
621                 if (!diff_temp[i].name)
622                         return diff_temp + i;
623         die("BUG: diff is failing to clean up its tempfiles");
624 }
625
626 static void remove_tempfile(void)
627 {
628         int i;
629         for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
630                 if (is_tempfile_active(&diff_temp[i].tempfile))
631                         delete_tempfile(&diff_temp[i].tempfile);
632                 diff_temp[i].name = NULL;
633         }
634 }
635
636 static void print_line_count(FILE *file, int count)
637 {
638         switch (count) {
639         case 0:
640                 fprintf(file, "0,0");
641                 break;
642         case 1:
643                 fprintf(file, "1");
644                 break;
645         default:
646                 fprintf(file, "1,%d", count);
647                 break;
648         }
649 }
650
651 static void emit_rewrite_lines(struct emit_callback *ecb,
652                                int prefix, const char *data, int size)
653 {
654         const char *endp = NULL;
655         static const char *nneof = " No newline at end of file\n";
656         const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
657
658         while (0 < size) {
659                 int len;
660
661                 endp = memchr(data, '\n', size);
662                 len = endp ? (endp - data + 1) : size;
663                 if (prefix != '+') {
664                         ecb->lno_in_preimage++;
665                         emit_del_line(reset, ecb, data, len);
666                 } else {
667                         ecb->lno_in_postimage++;
668                         emit_add_line(reset, ecb, data, len);
669                 }
670                 size -= len;
671                 data += len;
672         }
673         if (!endp) {
674                 const char *context = diff_get_color(ecb->color_diff,
675                                                      DIFF_CONTEXT);
676                 putc('\n', ecb->opt->file);
677                 emit_line_0(ecb->opt, context, reset, '\\',
678                             nneof, strlen(nneof));
679         }
680 }
681
682 static void emit_rewrite_diff(const char *name_a,
683                               const char *name_b,
684                               struct diff_filespec *one,
685                               struct diff_filespec *two,
686                               struct userdiff_driver *textconv_one,
687                               struct userdiff_driver *textconv_two,
688                               struct diff_options *o)
689 {
690         int lc_a, lc_b;
691         const char *name_a_tab, *name_b_tab;
692         const char *metainfo = diff_get_color(o->use_color, DIFF_METAINFO);
693         const char *fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
694         const char *reset = diff_get_color(o->use_color, DIFF_RESET);
695         static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
696         const char *a_prefix, *b_prefix;
697         char *data_one, *data_two;
698         size_t size_one, size_two;
699         struct emit_callback ecbdata;
700         const char *line_prefix = diff_line_prefix(o);
701
702         if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
703                 a_prefix = o->b_prefix;
704                 b_prefix = o->a_prefix;
705         } else {
706                 a_prefix = o->a_prefix;
707                 b_prefix = o->b_prefix;
708         }
709
710         name_a += (*name_a == '/');
711         name_b += (*name_b == '/');
712         name_a_tab = strchr(name_a, ' ') ? "\t" : "";
713         name_b_tab = strchr(name_b, ' ') ? "\t" : "";
714
715         strbuf_reset(&a_name);
716         strbuf_reset(&b_name);
717         quote_two_c_style(&a_name, a_prefix, name_a, 0);
718         quote_two_c_style(&b_name, b_prefix, name_b, 0);
719
720         size_one = fill_textconv(textconv_one, one, &data_one);
721         size_two = fill_textconv(textconv_two, two, &data_two);
722
723         memset(&ecbdata, 0, sizeof(ecbdata));
724         ecbdata.color_diff = want_color(o->use_color);
725         ecbdata.found_changesp = &o->found_changes;
726         ecbdata.ws_rule = whitespace_rule(name_b);
727         ecbdata.opt = o;
728         if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
729                 mmfile_t mf1, mf2;
730                 mf1.ptr = (char *)data_one;
731                 mf2.ptr = (char *)data_two;
732                 mf1.size = size_one;
733                 mf2.size = size_two;
734                 check_blank_at_eof(&mf1, &mf2, &ecbdata);
735         }
736         ecbdata.lno_in_preimage = 1;
737         ecbdata.lno_in_postimage = 1;
738
739         lc_a = count_lines(data_one, size_one);
740         lc_b = count_lines(data_two, size_two);
741         fprintf(o->file,
742                 "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
743                 line_prefix, metainfo, a_name.buf, name_a_tab, reset,
744                 line_prefix, metainfo, b_name.buf, name_b_tab, reset,
745                 line_prefix, fraginfo);
746         if (!o->irreversible_delete)
747                 print_line_count(o->file, lc_a);
748         else
749                 fprintf(o->file, "?,?");
750         fprintf(o->file, " +");
751         print_line_count(o->file, lc_b);
752         fprintf(o->file, " @@%s\n", reset);
753         if (lc_a && !o->irreversible_delete)
754                 emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
755         if (lc_b)
756                 emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
757         if (textconv_one)
758                 free((char *)data_one);
759         if (textconv_two)
760                 free((char *)data_two);
761 }
762
763 struct diff_words_buffer {
764         mmfile_t text;
765         long alloc;
766         struct diff_words_orig {
767                 const char *begin, *end;
768         } *orig;
769         int orig_nr, orig_alloc;
770 };
771
772 static void diff_words_append(char *line, unsigned long len,
773                 struct diff_words_buffer *buffer)
774 {
775         ALLOC_GROW(buffer->text.ptr, buffer->text.size + len, buffer->alloc);
776         line++;
777         len--;
778         memcpy(buffer->text.ptr + buffer->text.size, line, len);
779         buffer->text.size += len;
780         buffer->text.ptr[buffer->text.size] = '\0';
781 }
782
783 struct diff_words_style_elem {
784         const char *prefix;
785         const char *suffix;
786         const char *color; /* NULL; filled in by the setup code if
787                             * color is enabled */
788 };
789
790 struct diff_words_style {
791         enum diff_words_type type;
792         struct diff_words_style_elem new, old, ctx;
793         const char *newline;
794 };
795
796 static struct diff_words_style diff_words_styles[] = {
797         { DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
798         { DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
799         { DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" }
800 };
801
802 struct diff_words_data {
803         struct diff_words_buffer minus, plus;
804         const char *current_plus;
805         int last_minus;
806         struct diff_options *opt;
807         regex_t *word_regex;
808         enum diff_words_type type;
809         struct diff_words_style *style;
810 };
811
812 static int fn_out_diff_words_write_helper(FILE *fp,
813                                           struct diff_words_style_elem *st_el,
814                                           const char *newline,
815                                           size_t count, const char *buf,
816                                           const char *line_prefix)
817 {
818         int print = 0;
819
820         while (count) {
821                 char *p = memchr(buf, '\n', count);
822                 if (print)
823                         fputs(line_prefix, fp);
824                 if (p != buf) {
825                         if (st_el->color && fputs(st_el->color, fp) < 0)
826                                 return -1;
827                         if (fputs(st_el->prefix, fp) < 0 ||
828                             fwrite(buf, p ? p - buf : count, 1, fp) != 1 ||
829                             fputs(st_el->suffix, fp) < 0)
830                                 return -1;
831                         if (st_el->color && *st_el->color
832                             && fputs(GIT_COLOR_RESET, fp) < 0)
833                                 return -1;
834                 }
835                 if (!p)
836                         return 0;
837                 if (fputs(newline, fp) < 0)
838                         return -1;
839                 count -= p + 1 - buf;
840                 buf = p + 1;
841                 print = 1;
842         }
843         return 0;
844 }
845
846 /*
847  * '--color-words' algorithm can be described as:
848  *
849  *   1. collect a the minus/plus lines of a diff hunk, divided into
850  *      minus-lines and plus-lines;
851  *
852  *   2. break both minus-lines and plus-lines into words and
853  *      place them into two mmfile_t with one word for each line;
854  *
855  *   3. use xdiff to run diff on the two mmfile_t to get the words level diff;
856  *
857  * And for the common parts of the both file, we output the plus side text.
858  * diff_words->current_plus is used to trace the current position of the plus file
859  * which printed. diff_words->last_minus is used to trace the last minus word
860  * printed.
861  *
862  * For '--graph' to work with '--color-words', we need to output the graph prefix
863  * on each line of color words output. Generally, there are two conditions on
864  * which we should output the prefix.
865  *
866  *   1. diff_words->last_minus == 0 &&
867  *      diff_words->current_plus == diff_words->plus.text.ptr
868  *
869  *      that is: the plus text must start as a new line, and if there is no minus
870  *      word printed, a graph prefix must be printed.
871  *
872  *   2. diff_words->current_plus > diff_words->plus.text.ptr &&
873  *      *(diff_words->current_plus - 1) == '\n'
874  *
875  *      that is: a graph prefix must be printed following a '\n'
876  */
877 static int color_words_output_graph_prefix(struct diff_words_data *diff_words)
878 {
879         if ((diff_words->last_minus == 0 &&
880                 diff_words->current_plus == diff_words->plus.text.ptr) ||
881                 (diff_words->current_plus > diff_words->plus.text.ptr &&
882                 *(diff_words->current_plus - 1) == '\n')) {
883                 return 1;
884         } else {
885                 return 0;
886         }
887 }
888
889 static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
890 {
891         struct diff_words_data *diff_words = priv;
892         struct diff_words_style *style = diff_words->style;
893         int minus_first, minus_len, plus_first, plus_len;
894         const char *minus_begin, *minus_end, *plus_begin, *plus_end;
895         struct diff_options *opt = diff_words->opt;
896         const char *line_prefix;
897
898         if (line[0] != '@' || parse_hunk_header(line, len,
899                         &minus_first, &minus_len, &plus_first, &plus_len))
900                 return;
901
902         assert(opt);
903         line_prefix = diff_line_prefix(opt);
904
905         /* POSIX requires that first be decremented by one if len == 0... */
906         if (minus_len) {
907                 minus_begin = diff_words->minus.orig[minus_first].begin;
908                 minus_end =
909                         diff_words->minus.orig[minus_first + minus_len - 1].end;
910         } else
911                 minus_begin = minus_end =
912                         diff_words->minus.orig[minus_first].end;
913
914         if (plus_len) {
915                 plus_begin = diff_words->plus.orig[plus_first].begin;
916                 plus_end = diff_words->plus.orig[plus_first + plus_len - 1].end;
917         } else
918                 plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
919
920         if (color_words_output_graph_prefix(diff_words)) {
921                 fputs(line_prefix, diff_words->opt->file);
922         }
923         if (diff_words->current_plus != plus_begin) {
924                 fn_out_diff_words_write_helper(diff_words->opt->file,
925                                 &style->ctx, style->newline,
926                                 plus_begin - diff_words->current_plus,
927                                 diff_words->current_plus, line_prefix);
928                 if (*(plus_begin - 1) == '\n')
929                         fputs(line_prefix, diff_words->opt->file);
930         }
931         if (minus_begin != minus_end) {
932                 fn_out_diff_words_write_helper(diff_words->opt->file,
933                                 &style->old, style->newline,
934                                 minus_end - minus_begin, minus_begin,
935                                 line_prefix);
936         }
937         if (plus_begin != plus_end) {
938                 fn_out_diff_words_write_helper(diff_words->opt->file,
939                                 &style->new, style->newline,
940                                 plus_end - plus_begin, plus_begin,
941                                 line_prefix);
942         }
943
944         diff_words->current_plus = plus_end;
945         diff_words->last_minus = minus_first;
946 }
947
948 /* This function starts looking at *begin, and returns 0 iff a word was found. */
949 static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
950                 int *begin, int *end)
951 {
952         if (word_regex && *begin < buffer->size) {
953                 regmatch_t match[1];
954                 if (!regexec(word_regex, buffer->ptr + *begin, 1, match, 0)) {
955                         char *p = memchr(buffer->ptr + *begin + match[0].rm_so,
956                                         '\n', match[0].rm_eo - match[0].rm_so);
957                         *end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
958                         *begin += match[0].rm_so;
959                         return *begin >= *end;
960                 }
961                 return -1;
962         }
963
964         /* find the next word */
965         while (*begin < buffer->size && isspace(buffer->ptr[*begin]))
966                 (*begin)++;
967         if (*begin >= buffer->size)
968                 return -1;
969
970         /* find the end of the word */
971         *end = *begin + 1;
972         while (*end < buffer->size && !isspace(buffer->ptr[*end]))
973                 (*end)++;
974
975         return 0;
976 }
977
978 /*
979  * This function splits the words in buffer->text, stores the list with
980  * newline separator into out, and saves the offsets of the original words
981  * in buffer->orig.
982  */
983 static void diff_words_fill(struct diff_words_buffer *buffer, mmfile_t *out,
984                 regex_t *word_regex)
985 {
986         int i, j;
987         long alloc = 0;
988
989         out->size = 0;
990         out->ptr = NULL;
991
992         /* fake an empty "0th" word */
993         ALLOC_GROW(buffer->orig, 1, buffer->orig_alloc);
994         buffer->orig[0].begin = buffer->orig[0].end = buffer->text.ptr;
995         buffer->orig_nr = 1;
996
997         for (i = 0; i < buffer->text.size; i++) {
998                 if (find_word_boundaries(&buffer->text, word_regex, &i, &j))
999                         return;
1000
1001                 /* store original boundaries */
1002                 ALLOC_GROW(buffer->orig, buffer->orig_nr + 1,
1003                                 buffer->orig_alloc);
1004                 buffer->orig[buffer->orig_nr].begin = buffer->text.ptr + i;
1005                 buffer->orig[buffer->orig_nr].end = buffer->text.ptr + j;
1006                 buffer->orig_nr++;
1007
1008                 /* store one word */
1009                 ALLOC_GROW(out->ptr, out->size + j - i + 1, alloc);
1010                 memcpy(out->ptr + out->size, buffer->text.ptr + i, j - i);
1011                 out->ptr[out->size + j - i] = '\n';
1012                 out->size += j - i + 1;
1013
1014                 i = j - 1;
1015         }
1016 }
1017
1018 /* this executes the word diff on the accumulated buffers */
1019 static void diff_words_show(struct diff_words_data *diff_words)
1020 {
1021         xpparam_t xpp;
1022         xdemitconf_t xecfg;
1023         mmfile_t minus, plus;
1024         struct diff_words_style *style = diff_words->style;
1025
1026         struct diff_options *opt = diff_words->opt;
1027         const char *line_prefix;
1028
1029         assert(opt);
1030         line_prefix = diff_line_prefix(opt);
1031
1032         /* special case: only removal */
1033         if (!diff_words->plus.text.size) {
1034                 fputs(line_prefix, diff_words->opt->file);
1035                 fn_out_diff_words_write_helper(diff_words->opt->file,
1036                         &style->old, style->newline,
1037                         diff_words->minus.text.size,
1038                         diff_words->minus.text.ptr, line_prefix);
1039                 diff_words->minus.text.size = 0;
1040                 return;
1041         }
1042
1043         diff_words->current_plus = diff_words->plus.text.ptr;
1044         diff_words->last_minus = 0;
1045
1046         memset(&xpp, 0, sizeof(xpp));
1047         memset(&xecfg, 0, sizeof(xecfg));
1048         diff_words_fill(&diff_words->minus, &minus, diff_words->word_regex);
1049         diff_words_fill(&diff_words->plus, &plus, diff_words->word_regex);
1050         xpp.flags = 0;
1051         /* as only the hunk header will be parsed, we need a 0-context */
1052         xecfg.ctxlen = 0;
1053         if (xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
1054                           &xpp, &xecfg))
1055                 die("unable to generate word diff");
1056         free(minus.ptr);
1057         free(plus.ptr);
1058         if (diff_words->current_plus != diff_words->plus.text.ptr +
1059                         diff_words->plus.text.size) {
1060                 if (color_words_output_graph_prefix(diff_words))
1061                         fputs(line_prefix, diff_words->opt->file);
1062                 fn_out_diff_words_write_helper(diff_words->opt->file,
1063                         &style->ctx, style->newline,
1064                         diff_words->plus.text.ptr + diff_words->plus.text.size
1065                         - diff_words->current_plus, diff_words->current_plus,
1066                         line_prefix);
1067         }
1068         diff_words->minus.text.size = diff_words->plus.text.size = 0;
1069 }
1070
1071 /* In "color-words" mode, show word-diff of words accumulated in the buffer */
1072 static void diff_words_flush(struct emit_callback *ecbdata)
1073 {
1074         if (ecbdata->diff_words->minus.text.size ||
1075             ecbdata->diff_words->plus.text.size)
1076                 diff_words_show(ecbdata->diff_words);
1077 }
1078
1079 static void diff_filespec_load_driver(struct diff_filespec *one)
1080 {
1081         /* Use already-loaded driver */
1082         if (one->driver)
1083                 return;
1084
1085         if (S_ISREG(one->mode))
1086                 one->driver = userdiff_find_by_path(one->path);
1087
1088         /* Fallback to default settings */
1089         if (!one->driver)
1090                 one->driver = userdiff_find_by_name("default");
1091 }
1092
1093 static const char *userdiff_word_regex(struct diff_filespec *one)
1094 {
1095         diff_filespec_load_driver(one);
1096         return one->driver->word_regex;
1097 }
1098
1099 static void init_diff_words_data(struct emit_callback *ecbdata,
1100                                  struct diff_options *orig_opts,
1101                                  struct diff_filespec *one,
1102                                  struct diff_filespec *two)
1103 {
1104         int i;
1105         struct diff_options *o = xmalloc(sizeof(struct diff_options));
1106         memcpy(o, orig_opts, sizeof(struct diff_options));
1107
1108         ecbdata->diff_words =
1109                 xcalloc(1, sizeof(struct diff_words_data));
1110         ecbdata->diff_words->type = o->word_diff;
1111         ecbdata->diff_words->opt = o;
1112         if (!o->word_regex)
1113                 o->word_regex = userdiff_word_regex(one);
1114         if (!o->word_regex)
1115                 o->word_regex = userdiff_word_regex(two);
1116         if (!o->word_regex)
1117                 o->word_regex = diff_word_regex_cfg;
1118         if (o->word_regex) {
1119                 ecbdata->diff_words->word_regex = (regex_t *)
1120                         xmalloc(sizeof(regex_t));
1121                 if (regcomp(ecbdata->diff_words->word_regex,
1122                             o->word_regex,
1123                             REG_EXTENDED | REG_NEWLINE))
1124                         die ("Invalid regular expression: %s",
1125                              o->word_regex);
1126         }
1127         for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) {
1128                 if (o->word_diff == diff_words_styles[i].type) {
1129                         ecbdata->diff_words->style =
1130                                 &diff_words_styles[i];
1131                         break;
1132                 }
1133         }
1134         if (want_color(o->use_color)) {
1135                 struct diff_words_style *st = ecbdata->diff_words->style;
1136                 st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
1137                 st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);
1138                 st->ctx.color = diff_get_color_opt(o, DIFF_CONTEXT);
1139         }
1140 }
1141
1142 static void free_diff_words_data(struct emit_callback *ecbdata)
1143 {
1144         if (ecbdata->diff_words) {
1145                 diff_words_flush(ecbdata);
1146                 free (ecbdata->diff_words->opt);
1147                 free (ecbdata->diff_words->minus.text.ptr);
1148                 free (ecbdata->diff_words->minus.orig);
1149                 free (ecbdata->diff_words->plus.text.ptr);
1150                 free (ecbdata->diff_words->plus.orig);
1151                 if (ecbdata->diff_words->word_regex) {
1152                         regfree(ecbdata->diff_words->word_regex);
1153                         free(ecbdata->diff_words->word_regex);
1154                 }
1155                 free(ecbdata->diff_words);
1156                 ecbdata->diff_words = NULL;
1157         }
1158 }
1159
1160 const char *diff_get_color(int diff_use_color, enum color_diff ix)
1161 {
1162         if (want_color(diff_use_color))
1163                 return diff_colors[ix];
1164         return "";
1165 }
1166
1167 const char *diff_line_prefix(struct diff_options *opt)
1168 {
1169         struct strbuf *msgbuf;
1170         if (!opt->output_prefix)
1171                 return "";
1172
1173         msgbuf = opt->output_prefix(opt, opt->output_prefix_data);
1174         return msgbuf->buf;
1175 }
1176
1177 static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
1178 {
1179         const char *cp;
1180         unsigned long allot;
1181         size_t l = len;
1182
1183         if (ecb->truncate)
1184                 return ecb->truncate(line, len);
1185         cp = line;
1186         allot = l;
1187         while (0 < l) {
1188                 (void) utf8_width(&cp, &l);
1189                 if (!cp)
1190                         break; /* truncated in the middle? */
1191         }
1192         return allot - l;
1193 }
1194
1195 static void find_lno(const char *line, struct emit_callback *ecbdata)
1196 {
1197         const char *p;
1198         ecbdata->lno_in_preimage = 0;
1199         ecbdata->lno_in_postimage = 0;
1200         p = strchr(line, '-');
1201         if (!p)
1202                 return; /* cannot happen */
1203         ecbdata->lno_in_preimage = strtol(p + 1, NULL, 10);
1204         p = strchr(p, '+');
1205         if (!p)
1206                 return; /* cannot happen */
1207         ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
1208 }
1209
1210 static void fn_out_consume(void *priv, char *line, unsigned long len)
1211 {
1212         struct emit_callback *ecbdata = priv;
1213         const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
1214         const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
1215         const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
1216         struct diff_options *o = ecbdata->opt;
1217         const char *line_prefix = diff_line_prefix(o);
1218
1219         if (ecbdata->header) {
1220                 fprintf(o->file, "%s", ecbdata->header->buf);
1221                 strbuf_reset(ecbdata->header);
1222                 ecbdata->header = NULL;
1223         }
1224         *(ecbdata->found_changesp) = 1;
1225
1226         if (ecbdata->label_path[0]) {
1227                 const char *name_a_tab, *name_b_tab;
1228
1229                 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
1230                 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
1231
1232                 fprintf(o->file, "%s%s--- %s%s%s\n",
1233                         line_prefix, meta, ecbdata->label_path[0], reset, name_a_tab);
1234                 fprintf(o->file, "%s%s+++ %s%s%s\n",
1235                         line_prefix, meta, ecbdata->label_path[1], reset, name_b_tab);
1236                 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
1237         }
1238
1239         if (diff_suppress_blank_empty
1240             && len == 2 && line[0] == ' ' && line[1] == '\n') {
1241                 line[0] = '\n';
1242                 len = 1;
1243         }
1244
1245         if (line[0] == '@') {
1246                 if (ecbdata->diff_words)
1247                         diff_words_flush(ecbdata);
1248                 len = sane_truncate_line(ecbdata, line, len);
1249                 find_lno(line, ecbdata);
1250                 emit_hunk_header(ecbdata, line, len);
1251                 if (line[len-1] != '\n')
1252                         putc('\n', o->file);
1253                 return;
1254         }
1255
1256         if (len < 1) {
1257                 emit_line(o, reset, reset, line, len);
1258                 if (ecbdata->diff_words
1259                     && ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN)
1260                         fputs("~\n", o->file);
1261                 return;
1262         }
1263
1264         if (ecbdata->diff_words) {
1265                 if (line[0] == '-') {
1266                         diff_words_append(line, len,
1267                                           &ecbdata->diff_words->minus);
1268                         return;
1269                 } else if (line[0] == '+') {
1270                         diff_words_append(line, len,
1271                                           &ecbdata->diff_words->plus);
1272                         return;
1273                 } else if (starts_with(line, "\\ ")) {
1274                         /*
1275                          * Eat the "no newline at eof" marker as if we
1276                          * saw a "+" or "-" line with nothing on it,
1277                          * and return without diff_words_flush() to
1278                          * defer processing. If this is the end of
1279                          * preimage, more "+" lines may come after it.
1280                          */
1281                         return;
1282                 }
1283                 diff_words_flush(ecbdata);
1284                 if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
1285                         emit_line(o, context, reset, line, len);
1286                         fputs("~\n", o->file);
1287                 } else {
1288                         /*
1289                          * Skip the prefix character, if any.  With
1290                          * diff_suppress_blank_empty, there may be
1291                          * none.
1292                          */
1293                         if (line[0] != '\n') {
1294                               line++;
1295                               len--;
1296                         }
1297                         emit_line(o, context, reset, line, len);
1298                 }
1299                 return;
1300         }
1301
1302         switch (line[0]) {
1303         case '+':
1304                 ecbdata->lno_in_postimage++;
1305                 emit_add_line(reset, ecbdata, line + 1, len - 1);
1306                 break;
1307         case '-':
1308                 ecbdata->lno_in_preimage++;
1309                 emit_del_line(reset, ecbdata, line + 1, len - 1);
1310                 break;
1311         case ' ':
1312                 ecbdata->lno_in_postimage++;
1313                 ecbdata->lno_in_preimage++;
1314                 emit_context_line(reset, ecbdata, line + 1, len - 1);
1315                 break;
1316         default:
1317                 /* incomplete line at the end */
1318                 ecbdata->lno_in_preimage++;
1319                 emit_line(o, diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
1320                           reset, line, len);
1321                 break;
1322         }
1323 }
1324
1325 static char *pprint_rename(const char *a, const char *b)
1326 {
1327         const char *old = a;
1328         const char *new = b;
1329         struct strbuf name = STRBUF_INIT;
1330         int pfx_length, sfx_length;
1331         int pfx_adjust_for_slash;
1332         int len_a = strlen(a);
1333         int len_b = strlen(b);
1334         int a_midlen, b_midlen;
1335         int qlen_a = quote_c_style(a, NULL, NULL, 0);
1336         int qlen_b = quote_c_style(b, NULL, NULL, 0);
1337
1338         if (qlen_a || qlen_b) {
1339                 quote_c_style(a, &name, NULL, 0);
1340                 strbuf_addstr(&name, " => ");
1341                 quote_c_style(b, &name, NULL, 0);
1342                 return strbuf_detach(&name, NULL);
1343         }
1344
1345         /* Find common prefix */
1346         pfx_length = 0;
1347         while (*old && *new && *old == *new) {
1348                 if (*old == '/')
1349                         pfx_length = old - a + 1;
1350                 old++;
1351                 new++;
1352         }
1353
1354         /* Find common suffix */
1355         old = a + len_a;
1356         new = b + len_b;
1357         sfx_length = 0;
1358         /*
1359          * If there is a common prefix, it must end in a slash.  In
1360          * that case we let this loop run 1 into the prefix to see the
1361          * same slash.
1362          *
1363          * If there is no common prefix, we cannot do this as it would
1364          * underrun the input strings.
1365          */
1366         pfx_adjust_for_slash = (pfx_length ? 1 : 0);
1367         while (a + pfx_length - pfx_adjust_for_slash <= old &&
1368                b + pfx_length - pfx_adjust_for_slash <= new &&
1369                *old == *new) {
1370                 if (*old == '/')
1371                         sfx_length = len_a - (old - a);
1372                 old--;
1373                 new--;
1374         }
1375
1376         /*
1377          * pfx{mid-a => mid-b}sfx
1378          * {pfx-a => pfx-b}sfx
1379          * pfx{sfx-a => sfx-b}
1380          * name-a => name-b
1381          */
1382         a_midlen = len_a - pfx_length - sfx_length;
1383         b_midlen = len_b - pfx_length - sfx_length;
1384         if (a_midlen < 0)
1385                 a_midlen = 0;
1386         if (b_midlen < 0)
1387                 b_midlen = 0;
1388
1389         strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
1390         if (pfx_length + sfx_length) {
1391                 strbuf_add(&name, a, pfx_length);
1392                 strbuf_addch(&name, '{');
1393         }
1394         strbuf_add(&name, a + pfx_length, a_midlen);
1395         strbuf_addstr(&name, " => ");
1396         strbuf_add(&name, b + pfx_length, b_midlen);
1397         if (pfx_length + sfx_length) {
1398                 strbuf_addch(&name, '}');
1399                 strbuf_add(&name, a + len_a - sfx_length, sfx_length);
1400         }
1401         return strbuf_detach(&name, NULL);
1402 }
1403
1404 struct diffstat_t {
1405         int nr;
1406         int alloc;
1407         struct diffstat_file {
1408                 char *from_name;
1409                 char *name;
1410                 char *print_name;
1411                 unsigned is_unmerged:1;
1412                 unsigned is_binary:1;
1413                 unsigned is_renamed:1;
1414                 unsigned is_interesting:1;
1415                 uintmax_t added, deleted;
1416         } **files;
1417 };
1418
1419 static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
1420                                           const char *name_a,
1421                                           const char *name_b)
1422 {
1423         struct diffstat_file *x;
1424         x = xcalloc(1, sizeof(*x));
1425         ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc);
1426         diffstat->files[diffstat->nr++] = x;
1427         if (name_b) {
1428                 x->from_name = xstrdup(name_a);
1429                 x->name = xstrdup(name_b);
1430                 x->is_renamed = 1;
1431         }
1432         else {
1433                 x->from_name = NULL;
1434                 x->name = xstrdup(name_a);
1435         }
1436         return x;
1437 }
1438
1439 static void diffstat_consume(void *priv, char *line, unsigned long len)
1440 {
1441         struct diffstat_t *diffstat = priv;
1442         struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
1443
1444         if (line[0] == '+')
1445                 x->added++;
1446         else if (line[0] == '-')
1447                 x->deleted++;
1448 }
1449
1450 const char mime_boundary_leader[] = "------------";
1451
1452 static int scale_linear(int it, int width, int max_change)
1453 {
1454         if (!it)
1455                 return 0;
1456         /*
1457          * make sure that at least one '-' or '+' is printed if
1458          * there is any change to this path. The easiest way is to
1459          * scale linearly as if the alloted width is one column shorter
1460          * than it is, and then add 1 to the result.
1461          */
1462         return 1 + (it * (width - 1) / max_change);
1463 }
1464
1465 static void show_name(FILE *file,
1466                       const char *prefix, const char *name, int len)
1467 {
1468         fprintf(file, " %s%-*s |", prefix, len, name);
1469 }
1470
1471 static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
1472 {
1473         if (cnt <= 0)
1474                 return;
1475         fprintf(file, "%s", set);
1476         while (cnt--)
1477                 putc(ch, file);
1478         fprintf(file, "%s", reset);
1479 }
1480
1481 static void fill_print_name(struct diffstat_file *file)
1482 {
1483         char *pname;
1484
1485         if (file->print_name)
1486                 return;
1487
1488         if (!file->is_renamed) {
1489                 struct strbuf buf = STRBUF_INIT;
1490                 if (quote_c_style(file->name, &buf, NULL, 0)) {
1491                         pname = strbuf_detach(&buf, NULL);
1492                 } else {
1493                         pname = file->name;
1494                         strbuf_release(&buf);
1495                 }
1496         } else {
1497                 pname = pprint_rename(file->from_name, file->name);
1498         }
1499         file->print_name = pname;
1500 }
1501
1502 int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
1503 {
1504         struct strbuf sb = STRBUF_INIT;
1505         int ret;
1506
1507         if (!files) {
1508                 assert(insertions == 0 && deletions == 0);
1509                 return fprintf(fp, "%s\n", " 0 files changed");
1510         }
1511
1512         strbuf_addf(&sb,
1513                     (files == 1) ? " %d file changed" : " %d files changed",
1514                     files);
1515
1516         /*
1517          * For binary diff, the caller may want to print "x files
1518          * changed" with insertions == 0 && deletions == 0.
1519          *
1520          * Not omitting "0 insertions(+), 0 deletions(-)" in this case
1521          * is probably less confusing (i.e skip over "2 files changed
1522          * but nothing about added/removed lines? Is this a bug in Git?").
1523          */
1524         if (insertions || deletions == 0) {
1525                 strbuf_addf(&sb,
1526                             (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)",
1527                             insertions);
1528         }
1529
1530         if (deletions || insertions == 0) {
1531                 strbuf_addf(&sb,
1532                             (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)",
1533                             deletions);
1534         }
1535         strbuf_addch(&sb, '\n');
1536         ret = fputs(sb.buf, fp);
1537         strbuf_release(&sb);
1538         return ret;
1539 }
1540
1541 static void show_stats(struct diffstat_t *data, struct diff_options *options)
1542 {
1543         int i, len, add, del, adds = 0, dels = 0;
1544         uintmax_t max_change = 0, max_len = 0;
1545         int total_files = data->nr, count;
1546         int width, name_width, graph_width, number_width = 0, bin_width = 0;
1547         const char *reset, *add_c, *del_c;
1548         const char *line_prefix = "";
1549         int extra_shown = 0;
1550
1551         if (data->nr == 0)
1552                 return;
1553
1554         line_prefix = diff_line_prefix(options);
1555         count = options->stat_count ? options->stat_count : data->nr;
1556
1557         reset = diff_get_color_opt(options, DIFF_RESET);
1558         add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
1559         del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
1560
1561         /*
1562          * Find the longest filename and max number of changes
1563          */
1564         for (i = 0; (i < count) && (i < data->nr); i++) {
1565                 struct diffstat_file *file = data->files[i];
1566                 uintmax_t change = file->added + file->deleted;
1567
1568                 if (!file->is_interesting && (change == 0)) {
1569                         count++; /* not shown == room for one more */
1570                         continue;
1571                 }
1572                 fill_print_name(file);
1573                 len = strlen(file->print_name);
1574                 if (max_len < len)
1575                         max_len = len;
1576
1577                 if (file->is_unmerged) {
1578                         /* "Unmerged" is 8 characters */
1579                         bin_width = bin_width < 8 ? 8 : bin_width;
1580                         continue;
1581                 }
1582                 if (file->is_binary) {
1583                         /* "Bin XXX -> YYY bytes" */
1584                         int w = 14 + decimal_width(file->added)
1585                                 + decimal_width(file->deleted);
1586                         bin_width = bin_width < w ? w : bin_width;
1587                         /* Display change counts aligned with "Bin" */
1588                         number_width = 3;
1589                         continue;
1590                 }
1591
1592                 if (max_change < change)
1593                         max_change = change;
1594         }
1595         count = i; /* where we can stop scanning in data->files[] */
1596
1597         /*
1598          * We have width = stat_width or term_columns() columns total.
1599          * We want a maximum of min(max_len, stat_name_width) for the name part.
1600          * We want a maximum of min(max_change, stat_graph_width) for the +- part.
1601          * We also need 1 for " " and 4 + decimal_width(max_change)
1602          * for " | NNNN " and one the empty column at the end, altogether
1603          * 6 + decimal_width(max_change).
1604          *
1605          * If there's not enough space, we will use the smaller of
1606          * stat_name_width (if set) and 5/8*width for the filename,
1607          * and the rest for constant elements + graph part, but no more
1608          * than stat_graph_width for the graph part.
1609          * (5/8 gives 50 for filename and 30 for the constant parts + graph
1610          * for the standard terminal size).
1611          *
1612          * In other words: stat_width limits the maximum width, and
1613          * stat_name_width fixes the maximum width of the filename,
1614          * and is also used to divide available columns if there
1615          * aren't enough.
1616          *
1617          * Binary files are displayed with "Bin XXX -> YYY bytes"
1618          * instead of the change count and graph. This part is treated
1619          * similarly to the graph part, except that it is not
1620          * "scaled". If total width is too small to accommodate the
1621          * guaranteed minimum width of the filename part and the
1622          * separators and this message, this message will "overflow"
1623          * making the line longer than the maximum width.
1624          */
1625
1626         if (options->stat_width == -1)
1627                 width = term_columns() - options->output_prefix_length;
1628         else
1629                 width = options->stat_width ? options->stat_width : 80;
1630         number_width = decimal_width(max_change) > number_width ?
1631                 decimal_width(max_change) : number_width;
1632
1633         if (options->stat_graph_width == -1)
1634                 options->stat_graph_width = diff_stat_graph_width;
1635
1636         /*
1637          * Guarantee 3/8*16==6 for the graph part
1638          * and 5/8*16==10 for the filename part
1639          */
1640         if (width < 16 + 6 + number_width)
1641                 width = 16 + 6 + number_width;
1642
1643         /*
1644          * First assign sizes that are wanted, ignoring available width.
1645          * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
1646          * starting from "XXX" should fit in graph_width.
1647          */
1648         graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
1649         if (options->stat_graph_width &&
1650             options->stat_graph_width < graph_width)
1651                 graph_width = options->stat_graph_width;
1652
1653         name_width = (options->stat_name_width > 0 &&
1654                       options->stat_name_width < max_len) ?
1655                 options->stat_name_width : max_len;
1656
1657         /*
1658          * Adjust adjustable widths not to exceed maximum width
1659          */
1660         if (name_width + number_width + 6 + graph_width > width) {
1661                 if (graph_width > width * 3/8 - number_width - 6) {
1662                         graph_width = width * 3/8 - number_width - 6;
1663                         if (graph_width < 6)
1664                                 graph_width = 6;
1665                 }
1666
1667                 if (options->stat_graph_width &&
1668                     graph_width > options->stat_graph_width)
1669                         graph_width = options->stat_graph_width;
1670                 if (name_width > width - number_width - 6 - graph_width)
1671                         name_width = width - number_width - 6 - graph_width;
1672                 else
1673                         graph_width = width - number_width - 6 - name_width;
1674         }
1675
1676         /*
1677          * From here name_width is the width of the name area,
1678          * and graph_width is the width of the graph area.
1679          * max_change is used to scale graph properly.
1680          */
1681         for (i = 0; i < count; i++) {
1682                 const char *prefix = "";
1683                 struct diffstat_file *file = data->files[i];
1684                 char *name = file->print_name;
1685                 uintmax_t added = file->added;
1686                 uintmax_t deleted = file->deleted;
1687                 int name_len;
1688
1689                 if (!file->is_interesting && (added + deleted == 0))
1690                         continue;
1691
1692                 /*
1693                  * "scale" the filename
1694                  */
1695                 len = name_width;
1696                 name_len = strlen(name);
1697                 if (name_width < name_len) {
1698                         char *slash;
1699                         prefix = "...";
1700                         len -= 3;
1701                         name += name_len - len;
1702                         slash = strchr(name, '/');
1703                         if (slash)
1704                                 name = slash;
1705                 }
1706
1707                 if (file->is_binary) {
1708                         fprintf(options->file, "%s", line_prefix);
1709                         show_name(options->file, prefix, name, len);
1710                         fprintf(options->file, " %*s", number_width, "Bin");
1711                         if (!added && !deleted) {
1712                                 putc('\n', options->file);
1713                                 continue;
1714                         }
1715                         fprintf(options->file, " %s%"PRIuMAX"%s",
1716                                 del_c, deleted, reset);
1717                         fprintf(options->file, " -> ");
1718                         fprintf(options->file, "%s%"PRIuMAX"%s",
1719                                 add_c, added, reset);
1720                         fprintf(options->file, " bytes");
1721                         fprintf(options->file, "\n");
1722                         continue;
1723                 }
1724                 else if (file->is_unmerged) {
1725                         fprintf(options->file, "%s", line_prefix);
1726                         show_name(options->file, prefix, name, len);
1727                         fprintf(options->file, " Unmerged\n");
1728                         continue;
1729                 }
1730
1731                 /*
1732                  * scale the add/delete
1733                  */
1734                 add = added;
1735                 del = deleted;
1736
1737                 if (graph_width <= max_change) {
1738                         int total = scale_linear(add + del, graph_width, max_change);
1739                         if (total < 2 && add && del)
1740                                 /* width >= 2 due to the sanity check */
1741                                 total = 2;
1742                         if (add < del) {
1743                                 add = scale_linear(add, graph_width, max_change);
1744                                 del = total - add;
1745                         } else {
1746                                 del = scale_linear(del, graph_width, max_change);
1747                                 add = total - del;
1748                         }
1749                 }
1750                 fprintf(options->file, "%s", line_prefix);
1751                 show_name(options->file, prefix, name, len);
1752                 fprintf(options->file, " %*"PRIuMAX"%s",
1753                         number_width, added + deleted,
1754                         added + deleted ? " " : "");
1755                 show_graph(options->file, '+', add, add_c, reset);
1756                 show_graph(options->file, '-', del, del_c, reset);
1757                 fprintf(options->file, "\n");
1758         }
1759
1760         for (i = 0; i < data->nr; i++) {
1761                 struct diffstat_file *file = data->files[i];
1762                 uintmax_t added = file->added;
1763                 uintmax_t deleted = file->deleted;
1764
1765                 if (file->is_unmerged ||
1766                     (!file->is_interesting && (added + deleted == 0))) {
1767                         total_files--;
1768                         continue;
1769                 }
1770
1771                 if (!file->is_binary) {
1772                         adds += added;
1773                         dels += deleted;
1774                 }
1775                 if (i < count)
1776                         continue;
1777                 if (!extra_shown)
1778                         fprintf(options->file, "%s ...\n", line_prefix);
1779                 extra_shown = 1;
1780         }
1781         fprintf(options->file, "%s", line_prefix);
1782         print_stat_summary(options->file, total_files, adds, dels);
1783 }
1784
1785 static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
1786 {
1787         int i, adds = 0, dels = 0, total_files = data->nr;
1788
1789         if (data->nr == 0)
1790                 return;
1791
1792         for (i = 0; i < data->nr; i++) {
1793                 int added = data->files[i]->added;
1794                 int deleted= data->files[i]->deleted;
1795
1796                 if (data->files[i]->is_unmerged ||
1797                     (!data->files[i]->is_interesting && (added + deleted == 0))) {
1798                         total_files--;
1799                 } else if (!data->files[i]->is_binary) { /* don't count bytes */
1800                         adds += added;
1801                         dels += deleted;
1802                 }
1803         }
1804         fprintf(options->file, "%s", diff_line_prefix(options));
1805         print_stat_summary(options->file, total_files, adds, dels);
1806 }
1807
1808 static void show_numstat(struct diffstat_t *data, struct diff_options *options)
1809 {
1810         int i;
1811
1812         if (data->nr == 0)
1813                 return;
1814
1815         for (i = 0; i < data->nr; i++) {
1816                 struct diffstat_file *file = data->files[i];
1817
1818                 fprintf(options->file, "%s", diff_line_prefix(options));
1819
1820                 if (file->is_binary)
1821                         fprintf(options->file, "-\t-\t");
1822                 else
1823                         fprintf(options->file,
1824                                 "%"PRIuMAX"\t%"PRIuMAX"\t",
1825                                 file->added, file->deleted);
1826                 if (options->line_termination) {
1827                         fill_print_name(file);
1828                         if (!file->is_renamed)
1829                                 write_name_quoted(file->name, options->file,
1830                                                   options->line_termination);
1831                         else {
1832                                 fputs(file->print_name, options->file);
1833                                 putc(options->line_termination, options->file);
1834                         }
1835                 } else {
1836                         if (file->is_renamed) {
1837                                 putc('\0', options->file);
1838                                 write_name_quoted(file->from_name, options->file, '\0');
1839                         }
1840                         write_name_quoted(file->name, options->file, '\0');
1841                 }
1842         }
1843 }
1844
1845 struct dirstat_file {
1846         const char *name;
1847         unsigned long changed;
1848 };
1849
1850 struct dirstat_dir {
1851         struct dirstat_file *files;
1852         int alloc, nr, permille, cumulative;
1853 };
1854
1855 static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
1856                 unsigned long changed, const char *base, int baselen)
1857 {
1858         unsigned long this_dir = 0;
1859         unsigned int sources = 0;
1860         const char *line_prefix = diff_line_prefix(opt);
1861
1862         while (dir->nr) {
1863                 struct dirstat_file *f = dir->files;
1864                 int namelen = strlen(f->name);
1865                 unsigned long this;
1866                 char *slash;
1867
1868                 if (namelen < baselen)
1869                         break;
1870                 if (memcmp(f->name, base, baselen))
1871                         break;
1872                 slash = strchr(f->name + baselen, '/');
1873                 if (slash) {
1874                         int newbaselen = slash + 1 - f->name;
1875                         this = gather_dirstat(opt, dir, changed, f->name, newbaselen);
1876                         sources++;
1877                 } else {
1878                         this = f->changed;
1879                         dir->files++;
1880                         dir->nr--;
1881                         sources += 2;
1882                 }
1883                 this_dir += this;
1884         }
1885
1886         /*
1887          * We don't report dirstat's for
1888          *  - the top level
1889          *  - or cases where everything came from a single directory
1890          *    under this directory (sources == 1).
1891          */
1892         if (baselen && sources != 1) {
1893                 if (this_dir) {
1894                         int permille = this_dir * 1000 / changed;
1895                         if (permille >= dir->permille) {
1896                                 fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
1897                                         permille / 10, permille % 10, baselen, base);
1898                                 if (!dir->cumulative)
1899                                         return 0;
1900                         }
1901                 }
1902         }
1903         return this_dir;
1904 }
1905
1906 static int dirstat_compare(const void *_a, const void *_b)
1907 {
1908         const struct dirstat_file *a = _a;
1909         const struct dirstat_file *b = _b;
1910         return strcmp(a->name, b->name);
1911 }
1912
1913 static void show_dirstat(struct diff_options *options)
1914 {
1915         int i;
1916         unsigned long changed;
1917         struct dirstat_dir dir;
1918         struct diff_queue_struct *q = &diff_queued_diff;
1919
1920         dir.files = NULL;
1921         dir.alloc = 0;
1922         dir.nr = 0;
1923         dir.permille = options->dirstat_permille;
1924         dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1925
1926         changed = 0;
1927         for (i = 0; i < q->nr; i++) {
1928                 struct diff_filepair *p = q->queue[i];
1929                 const char *name;
1930                 unsigned long copied, added, damage;
1931                 int content_changed;
1932
1933                 name = p->two->path ? p->two->path : p->one->path;
1934
1935                 if (p->one->oid_valid && p->two->oid_valid)
1936                         content_changed = oidcmp(&p->one->oid, &p->two->oid);
1937                 else
1938                         content_changed = 1;
1939
1940                 if (!content_changed) {
1941                         /*
1942                          * The SHA1 has not changed, so pre-/post-content is
1943                          * identical. We can therefore skip looking at the
1944                          * file contents altogether.
1945                          */
1946                         damage = 0;
1947                         goto found_damage;
1948                 }
1949
1950                 if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE)) {
1951                         /*
1952                          * In --dirstat-by-file mode, we don't really need to
1953                          * look at the actual file contents at all.
1954                          * The fact that the SHA1 changed is enough for us to
1955                          * add this file to the list of results
1956                          * (with each file contributing equal damage).
1957                          */
1958                         damage = 1;
1959                         goto found_damage;
1960                 }
1961
1962                 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1963                         diff_populate_filespec(p->one, 0);
1964                         diff_populate_filespec(p->two, 0);
1965                         diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
1966                                                &copied, &added);
1967                         diff_free_filespec_data(p->one);
1968                         diff_free_filespec_data(p->two);
1969                 } else if (DIFF_FILE_VALID(p->one)) {
1970                         diff_populate_filespec(p->one, CHECK_SIZE_ONLY);
1971                         copied = added = 0;
1972                         diff_free_filespec_data(p->one);
1973                 } else if (DIFF_FILE_VALID(p->two)) {
1974                         diff_populate_filespec(p->two, CHECK_SIZE_ONLY);
1975                         copied = 0;
1976                         added = p->two->size;
1977                         diff_free_filespec_data(p->two);
1978                 } else
1979                         continue;
1980
1981                 /*
1982                  * Original minus copied is the removed material,
1983                  * added is the new material.  They are both damages
1984                  * made to the preimage.
1985                  * If the resulting damage is zero, we know that
1986                  * diffcore_count_changes() considers the two entries to
1987                  * be identical, but since content_changed is true, we
1988                  * know that there must have been _some_ kind of change,
1989                  * so we force all entries to have damage > 0.
1990                  */
1991                 damage = (p->one->size - copied) + added;
1992                 if (!damage)
1993                         damage = 1;
1994
1995 found_damage:
1996                 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1997                 dir.files[dir.nr].name = name;
1998                 dir.files[dir.nr].changed = damage;
1999                 changed += damage;
2000                 dir.nr++;
2001         }
2002
2003         /* This can happen even with many files, if everything was renames */
2004         if (!changed)
2005                 return;
2006
2007         /* Show all directories with more than x% of the changes */
2008         qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
2009         gather_dirstat(options, &dir, changed, "", 0);
2010 }
2011
2012 static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options)
2013 {
2014         int i;
2015         unsigned long changed;
2016         struct dirstat_dir dir;
2017
2018         if (data->nr == 0)
2019                 return;
2020
2021         dir.files = NULL;
2022         dir.alloc = 0;
2023         dir.nr = 0;
2024         dir.permille = options->dirstat_permille;
2025         dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
2026
2027         changed = 0;
2028         for (i = 0; i < data->nr; i++) {
2029                 struct diffstat_file *file = data->files[i];
2030                 unsigned long damage = file->added + file->deleted;
2031                 if (file->is_binary)
2032                         /*
2033                          * binary files counts bytes, not lines. Must find some
2034                          * way to normalize binary bytes vs. textual lines.
2035                          * The following heuristic assumes that there are 64
2036                          * bytes per "line".
2037                          * This is stupid and ugly, but very cheap...
2038                          */
2039                         damage = (damage + 63) / 64;
2040                 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
2041                 dir.files[dir.nr].name = file->name;
2042                 dir.files[dir.nr].changed = damage;
2043                 changed += damage;
2044                 dir.nr++;
2045         }
2046
2047         /* This can happen even with many files, if everything was renames */
2048         if (!changed)
2049                 return;
2050
2051         /* Show all directories with more than x% of the changes */
2052         qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
2053         gather_dirstat(options, &dir, changed, "", 0);
2054 }
2055
2056 static void free_diffstat_info(struct diffstat_t *diffstat)
2057 {
2058         int i;
2059         for (i = 0; i < diffstat->nr; i++) {
2060                 struct diffstat_file *f = diffstat->files[i];
2061                 if (f->name != f->print_name)
2062                         free(f->print_name);
2063                 free(f->name);
2064                 free(f->from_name);
2065                 free(f);
2066         }
2067         free(diffstat->files);
2068 }
2069
2070 struct checkdiff_t {
2071         const char *filename;
2072         int lineno;
2073         int conflict_marker_size;
2074         struct diff_options *o;
2075         unsigned ws_rule;
2076         unsigned status;
2077 };
2078
2079 static int is_conflict_marker(const char *line, int marker_size, unsigned long len)
2080 {
2081         char firstchar;
2082         int cnt;
2083
2084         if (len < marker_size + 1)
2085                 return 0;
2086         firstchar = line[0];
2087         switch (firstchar) {
2088         case '=': case '>': case '<': case '|':
2089                 break;
2090         default:
2091                 return 0;
2092         }
2093         for (cnt = 1; cnt < marker_size; cnt++)
2094                 if (line[cnt] != firstchar)
2095                         return 0;
2096         /* line[1] thru line[marker_size-1] are same as firstchar */
2097         if (len < marker_size + 1 || !isspace(line[marker_size]))
2098                 return 0;
2099         return 1;
2100 }
2101
2102 static void checkdiff_consume(void *priv, char *line, unsigned long len)
2103 {
2104         struct checkdiff_t *data = priv;
2105         int marker_size = data->conflict_marker_size;
2106         const char *ws = diff_get_color(data->o->use_color, DIFF_WHITESPACE);
2107         const char *reset = diff_get_color(data->o->use_color, DIFF_RESET);
2108         const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW);
2109         char *err;
2110         const char *line_prefix;
2111
2112         assert(data->o);
2113         line_prefix = diff_line_prefix(data->o);
2114
2115         if (line[0] == '+') {
2116                 unsigned bad;
2117                 data->lineno++;
2118                 if (is_conflict_marker(line + 1, marker_size, len - 1)) {
2119                         data->status |= 1;
2120                         fprintf(data->o->file,
2121                                 "%s%s:%d: leftover conflict marker\n",
2122                                 line_prefix, data->filename, data->lineno);
2123                 }
2124                 bad = ws_check(line + 1, len - 1, data->ws_rule);
2125                 if (!bad)
2126                         return;
2127                 data->status |= bad;
2128                 err = whitespace_error_string(bad);
2129                 fprintf(data->o->file, "%s%s:%d: %s.\n",
2130                         line_prefix, data->filename, data->lineno, err);
2131                 free(err);
2132                 emit_line(data->o, set, reset, line, 1);
2133                 ws_check_emit(line + 1, len - 1, data->ws_rule,
2134                               data->o->file, set, reset, ws);
2135         } else if (line[0] == ' ') {
2136                 data->lineno++;
2137         } else if (line[0] == '@') {
2138                 char *plus = strchr(line, '+');
2139                 if (plus)
2140                         data->lineno = strtol(plus, NULL, 10) - 1;
2141                 else
2142                         die("invalid diff");
2143         }
2144 }
2145
2146 static unsigned char *deflate_it(char *data,
2147                                  unsigned long size,
2148                                  unsigned long *result_size)
2149 {
2150         int bound;
2151         unsigned char *deflated;
2152         git_zstream stream;
2153
2154         git_deflate_init(&stream, zlib_compression_level);
2155         bound = git_deflate_bound(&stream, size);
2156         deflated = xmalloc(bound);
2157         stream.next_out = deflated;
2158         stream.avail_out = bound;
2159
2160         stream.next_in = (unsigned char *)data;
2161         stream.avail_in = size;
2162         while (git_deflate(&stream, Z_FINISH) == Z_OK)
2163                 ; /* nothing */
2164         git_deflate_end(&stream);
2165         *result_size = stream.total_out;
2166         return deflated;
2167 }
2168
2169 static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two,
2170                                   const char *prefix)
2171 {
2172         void *cp;
2173         void *delta;
2174         void *deflated;
2175         void *data;
2176         unsigned long orig_size;
2177         unsigned long delta_size;
2178         unsigned long deflate_size;
2179         unsigned long data_size;
2180
2181         /* We could do deflated delta, or we could do just deflated two,
2182          * whichever is smaller.
2183          */
2184         delta = NULL;
2185         deflated = deflate_it(two->ptr, two->size, &deflate_size);
2186         if (one->size && two->size) {
2187                 delta = diff_delta(one->ptr, one->size,
2188                                    two->ptr, two->size,
2189                                    &delta_size, deflate_size);
2190                 if (delta) {
2191                         void *to_free = delta;
2192                         orig_size = delta_size;
2193                         delta = deflate_it(delta, delta_size, &delta_size);
2194                         free(to_free);
2195                 }
2196         }
2197
2198         if (delta && delta_size < deflate_size) {
2199                 fprintf(file, "%sdelta %lu\n", prefix, orig_size);
2200                 free(deflated);
2201                 data = delta;
2202                 data_size = delta_size;
2203         }
2204         else {
2205                 fprintf(file, "%sliteral %lu\n", prefix, two->size);
2206                 free(delta);
2207                 data = deflated;
2208                 data_size = deflate_size;
2209         }
2210
2211         /* emit data encoded in base85 */
2212         cp = data;
2213         while (data_size) {
2214                 int bytes = (52 < data_size) ? 52 : data_size;
2215                 char line[70];
2216                 data_size -= bytes;
2217                 if (bytes <= 26)
2218                         line[0] = bytes + 'A' - 1;
2219                 else
2220                         line[0] = bytes - 26 + 'a' - 1;
2221                 encode_85(line + 1, cp, bytes);
2222                 cp = (char *) cp + bytes;
2223                 fprintf(file, "%s", prefix);
2224                 fputs(line, file);
2225                 fputc('\n', file);
2226         }
2227         fprintf(file, "%s\n", prefix);
2228         free(data);
2229 }
2230
2231 static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two,
2232                              const char *prefix)
2233 {
2234         fprintf(file, "%sGIT binary patch\n", prefix);
2235         emit_binary_diff_body(file, one, two, prefix);
2236         emit_binary_diff_body(file, two, one, prefix);
2237 }
2238
2239 int diff_filespec_is_binary(struct diff_filespec *one)
2240 {
2241         if (one->is_binary == -1) {
2242                 diff_filespec_load_driver(one);
2243                 if (one->driver->binary != -1)
2244                         one->is_binary = one->driver->binary;
2245                 else {
2246                         if (!one->data && DIFF_FILE_VALID(one))
2247                                 diff_populate_filespec(one, CHECK_BINARY);
2248                         if (one->is_binary == -1 && one->data)
2249                                 one->is_binary = buffer_is_binary(one->data,
2250                                                 one->size);
2251                         if (one->is_binary == -1)
2252                                 one->is_binary = 0;
2253                 }
2254         }
2255         return one->is_binary;
2256 }
2257
2258 static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
2259 {
2260         diff_filespec_load_driver(one);
2261         return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
2262 }
2263
2264 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
2265 {
2266         if (!options->a_prefix)
2267                 options->a_prefix = a;
2268         if (!options->b_prefix)
2269                 options->b_prefix = b;
2270 }
2271
2272 struct userdiff_driver *get_textconv(struct diff_filespec *one)
2273 {
2274         if (!DIFF_FILE_VALID(one))
2275                 return NULL;
2276
2277         diff_filespec_load_driver(one);
2278         return userdiff_get_textconv(one->driver);
2279 }
2280
2281 static void builtin_diff(const char *name_a,
2282                          const char *name_b,
2283                          struct diff_filespec *one,
2284                          struct diff_filespec *two,
2285                          const char *xfrm_msg,
2286                          int must_show_header,
2287                          struct diff_options *o,
2288                          int complete_rewrite)
2289 {
2290         mmfile_t mf1, mf2;
2291         const char *lbl[2];
2292         char *a_one, *b_two;
2293         const char *meta = diff_get_color_opt(o, DIFF_METAINFO);
2294         const char *reset = diff_get_color_opt(o, DIFF_RESET);
2295         const char *a_prefix, *b_prefix;
2296         struct userdiff_driver *textconv_one = NULL;
2297         struct userdiff_driver *textconv_two = NULL;
2298         struct strbuf header = STRBUF_INIT;
2299         const char *line_prefix = diff_line_prefix(o);
2300
2301         if (DIFF_OPT_TST(o, SUBMODULE_LOG) &&
2302                         (!one->mode || S_ISGITLINK(one->mode)) &&
2303                         (!two->mode || S_ISGITLINK(two->mode))) {
2304                 const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
2305                 const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
2306                 show_submodule_summary(o->file, one->path ? one->path : two->path,
2307                                 line_prefix,
2308                                 one->oid.hash, two->oid.hash,
2309                                 two->dirty_submodule,
2310                                 meta, del, add, reset);
2311                 return;
2312         }
2313
2314         if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
2315                 textconv_one = get_textconv(one);
2316                 textconv_two = get_textconv(two);
2317         }
2318
2319         diff_set_mnemonic_prefix(o, "a/", "b/");
2320         if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
2321                 a_prefix = o->b_prefix;
2322                 b_prefix = o->a_prefix;
2323         } else {
2324                 a_prefix = o->a_prefix;
2325                 b_prefix = o->b_prefix;
2326         }
2327
2328         /* Never use a non-valid filename anywhere if at all possible */
2329         name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
2330         name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
2331
2332         a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
2333         b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
2334         lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
2335         lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
2336         strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset);
2337         if (lbl[0][0] == '/') {
2338                 /* /dev/null */
2339                 strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset);
2340                 if (xfrm_msg)
2341                         strbuf_addstr(&header, xfrm_msg);
2342                 must_show_header = 1;
2343         }
2344         else if (lbl[1][0] == '/') {
2345                 strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset);
2346                 if (xfrm_msg)
2347                         strbuf_addstr(&header, xfrm_msg);
2348                 must_show_header = 1;
2349         }
2350         else {
2351                 if (one->mode != two->mode) {
2352                         strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, meta, one->mode, reset);
2353                         strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, meta, two->mode, reset);
2354                         must_show_header = 1;
2355                 }
2356                 if (xfrm_msg)
2357                         strbuf_addstr(&header, xfrm_msg);
2358
2359                 /*
2360                  * we do not run diff between different kind
2361                  * of objects.
2362                  */
2363                 if ((one->mode ^ two->mode) & S_IFMT)
2364                         goto free_ab_and_return;
2365                 if (complete_rewrite &&
2366                     (textconv_one || !diff_filespec_is_binary(one)) &&
2367                     (textconv_two || !diff_filespec_is_binary(two))) {
2368                         fprintf(o->file, "%s", header.buf);
2369                         strbuf_reset(&header);
2370                         emit_rewrite_diff(name_a, name_b, one, two,
2371                                                 textconv_one, textconv_two, o);
2372                         o->found_changes = 1;
2373                         goto free_ab_and_return;
2374                 }
2375         }
2376
2377         if (o->irreversible_delete && lbl[1][0] == '/') {
2378                 fprintf(o->file, "%s", header.buf);
2379                 strbuf_reset(&header);
2380                 goto free_ab_and_return;
2381         } else if (!DIFF_OPT_TST(o, TEXT) &&
2382             ( (!textconv_one && diff_filespec_is_binary(one)) ||
2383               (!textconv_two && diff_filespec_is_binary(two)) )) {
2384                 if (!one->data && !two->data &&
2385                     S_ISREG(one->mode) && S_ISREG(two->mode) &&
2386                     !DIFF_OPT_TST(o, BINARY)) {
2387                         if (!oidcmp(&one->oid, &two->oid)) {
2388                                 if (must_show_header)
2389                                         fprintf(o->file, "%s", header.buf);
2390                                 goto free_ab_and_return;
2391                         }
2392                         fprintf(o->file, "%s", header.buf);
2393                         fprintf(o->file, "%sBinary files %s and %s differ\n",
2394                                 line_prefix, lbl[0], lbl[1]);
2395                         goto free_ab_and_return;
2396                 }
2397                 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2398                         die("unable to read files to diff");
2399                 /* Quite common confusing case */
2400                 if (mf1.size == mf2.size &&
2401                     !memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
2402                         if (must_show_header)
2403                                 fprintf(o->file, "%s", header.buf);
2404                         goto free_ab_and_return;
2405                 }
2406                 fprintf(o->file, "%s", header.buf);
2407                 strbuf_reset(&header);
2408                 if (DIFF_OPT_TST(o, BINARY))
2409                         emit_binary_diff(o->file, &mf1, &mf2, line_prefix);
2410                 else
2411                         fprintf(o->file, "%sBinary files %s and %s differ\n",
2412                                 line_prefix, lbl[0], lbl[1]);
2413                 o->found_changes = 1;
2414         } else {
2415                 /* Crazy xdl interfaces.. */
2416                 const char *diffopts = getenv("GIT_DIFF_OPTS");
2417                 const char *v;
2418                 xpparam_t xpp;
2419                 xdemitconf_t xecfg;
2420                 struct emit_callback ecbdata;
2421                 const struct userdiff_funcname *pe;
2422
2423                 if (must_show_header) {
2424                         fprintf(o->file, "%s", header.buf);
2425                         strbuf_reset(&header);
2426                 }
2427
2428                 mf1.size = fill_textconv(textconv_one, one, &mf1.ptr);
2429                 mf2.size = fill_textconv(textconv_two, two, &mf2.ptr);
2430
2431                 pe = diff_funcname_pattern(one);
2432                 if (!pe)
2433                         pe = diff_funcname_pattern(two);
2434
2435                 memset(&xpp, 0, sizeof(xpp));
2436                 memset(&xecfg, 0, sizeof(xecfg));
2437                 memset(&ecbdata, 0, sizeof(ecbdata));
2438                 ecbdata.label_path = lbl;
2439                 ecbdata.color_diff = want_color(o->use_color);
2440                 ecbdata.found_changesp = &o->found_changes;
2441                 ecbdata.ws_rule = whitespace_rule(name_b);
2442                 if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
2443                         check_blank_at_eof(&mf1, &mf2, &ecbdata);
2444                 ecbdata.opt = o;
2445                 ecbdata.header = header.len ? &header : NULL;
2446                 xpp.flags = o->xdl_opts;
2447                 xecfg.ctxlen = o->context;
2448                 xecfg.interhunkctxlen = o->interhunkcontext;
2449                 xecfg.flags = XDL_EMIT_FUNCNAMES;
2450                 if (DIFF_OPT_TST(o, FUNCCONTEXT))
2451                         xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
2452                 if (pe)
2453                         xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
2454                 if (!diffopts)
2455                         ;
2456                 else if (skip_prefix(diffopts, "--unified=", &v))
2457                         xecfg.ctxlen = strtoul(v, NULL, 10);
2458                 else if (skip_prefix(diffopts, "-u", &v))
2459                         xecfg.ctxlen = strtoul(v, NULL, 10);
2460                 if (o->word_diff)
2461                         init_diff_words_data(&ecbdata, o, one, two);
2462                 if (xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
2463                                   &xpp, &xecfg))
2464                         die("unable to generate diff for %s", one->path);
2465                 if (o->word_diff)
2466                         free_diff_words_data(&ecbdata);
2467                 if (textconv_one)
2468                         free(mf1.ptr);
2469                 if (textconv_two)
2470                         free(mf2.ptr);
2471                 xdiff_clear_find_func(&xecfg);
2472         }
2473
2474  free_ab_and_return:
2475         strbuf_release(&header);
2476         diff_free_filespec_data(one);
2477         diff_free_filespec_data(two);
2478         free(a_one);
2479         free(b_two);
2480         return;
2481 }
2482
2483 static void builtin_diffstat(const char *name_a, const char *name_b,
2484                              struct diff_filespec *one,
2485                              struct diff_filespec *two,
2486                              struct diffstat_t *diffstat,
2487                              struct diff_options *o,
2488                              struct diff_filepair *p)
2489 {
2490         mmfile_t mf1, mf2;
2491         struct diffstat_file *data;
2492         int same_contents;
2493         int complete_rewrite = 0;
2494
2495         if (!DIFF_PAIR_UNMERGED(p)) {
2496                 if (p->status == DIFF_STATUS_MODIFIED && p->score)
2497                         complete_rewrite = 1;
2498         }
2499
2500         data = diffstat_add(diffstat, name_a, name_b);
2501         data->is_interesting = p->status != DIFF_STATUS_UNKNOWN;
2502
2503         if (!one || !two) {
2504                 data->is_unmerged = 1;
2505                 return;
2506         }
2507
2508         same_contents = !oidcmp(&one->oid, &two->oid);
2509
2510         if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
2511                 data->is_binary = 1;
2512                 if (same_contents) {
2513                         data->added = 0;
2514                         data->deleted = 0;
2515                 } else {
2516                         data->added = diff_filespec_size(two);
2517                         data->deleted = diff_filespec_size(one);
2518                 }
2519         }
2520
2521         else if (complete_rewrite) {
2522                 diff_populate_filespec(one, 0);
2523                 diff_populate_filespec(two, 0);
2524                 data->deleted = count_lines(one->data, one->size);
2525                 data->added = count_lines(two->data, two->size);
2526         }
2527
2528         else if (!same_contents) {
2529                 /* Crazy xdl interfaces.. */
2530                 xpparam_t xpp;
2531                 xdemitconf_t xecfg;
2532
2533                 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2534                         die("unable to read files to diff");
2535
2536                 memset(&xpp, 0, sizeof(xpp));
2537                 memset(&xecfg, 0, sizeof(xecfg));
2538                 xpp.flags = o->xdl_opts;
2539                 xecfg.ctxlen = o->context;
2540                 xecfg.interhunkctxlen = o->interhunkcontext;
2541                 if (xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
2542                                   &xpp, &xecfg))
2543                         die("unable to generate diffstat for %s", one->path);
2544         }
2545
2546         diff_free_filespec_data(one);
2547         diff_free_filespec_data(two);
2548 }
2549
2550 static void builtin_checkdiff(const char *name_a, const char *name_b,
2551                               const char *attr_path,
2552                               struct diff_filespec *one,
2553                               struct diff_filespec *two,
2554                               struct diff_options *o)
2555 {
2556         mmfile_t mf1, mf2;
2557         struct checkdiff_t data;
2558
2559         if (!two)
2560                 return;
2561
2562         memset(&data, 0, sizeof(data));
2563         data.filename = name_b ? name_b : name_a;
2564         data.lineno = 0;
2565         data.o = o;
2566         data.ws_rule = whitespace_rule(attr_path);
2567         data.conflict_marker_size = ll_merge_marker_size(attr_path);
2568
2569         if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
2570                 die("unable to read files to diff");
2571
2572         /*
2573          * All the other codepaths check both sides, but not checking
2574          * the "old" side here is deliberate.  We are checking the newly
2575          * introduced changes, and as long as the "new" side is text, we
2576          * can and should check what it introduces.
2577          */
2578         if (diff_filespec_is_binary(two))
2579                 goto free_and_return;
2580         else {
2581                 /* Crazy xdl interfaces.. */
2582                 xpparam_t xpp;
2583                 xdemitconf_t xecfg;
2584
2585                 memset(&xpp, 0, sizeof(xpp));
2586                 memset(&xecfg, 0, sizeof(xecfg));
2587                 xecfg.ctxlen = 1; /* at least one context line */
2588                 xpp.flags = 0;
2589                 if (xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
2590                                   &xpp, &xecfg))
2591                         die("unable to generate checkdiff for %s", one->path);
2592
2593                 if (data.ws_rule & WS_BLANK_AT_EOF) {
2594                         struct emit_callback ecbdata;
2595                         int blank_at_eof;
2596
2597                         ecbdata.ws_rule = data.ws_rule;
2598                         check_blank_at_eof(&mf1, &mf2, &ecbdata);
2599                         blank_at_eof = ecbdata.blank_at_eof_in_postimage;
2600
2601                         if (blank_at_eof) {
2602                                 static char *err;
2603                                 if (!err)
2604                                         err = whitespace_error_string(WS_BLANK_AT_EOF);
2605                                 fprintf(o->file, "%s:%d: %s.\n",
2606                                         data.filename, blank_at_eof, err);
2607                                 data.status = 1; /* report errors */
2608                         }
2609                 }
2610         }
2611  free_and_return:
2612         diff_free_filespec_data(one);
2613         diff_free_filespec_data(two);
2614         if (data.status)
2615                 DIFF_OPT_SET(o, CHECK_FAILED);
2616 }
2617
2618 struct diff_filespec *alloc_filespec(const char *path)
2619 {
2620         struct diff_filespec *spec;
2621
2622         FLEXPTR_ALLOC_STR(spec, path, path);
2623         spec->count = 1;
2624         spec->is_binary = -1;
2625         return spec;
2626 }
2627
2628 void free_filespec(struct diff_filespec *spec)
2629 {
2630         if (!--spec->count) {
2631                 diff_free_filespec_data(spec);
2632                 free(spec);
2633         }
2634 }
2635
2636 void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
2637                    int sha1_valid, unsigned short mode)
2638 {
2639         if (mode) {
2640                 spec->mode = canon_mode(mode);
2641                 hashcpy(spec->oid.hash, sha1);
2642                 spec->oid_valid = sha1_valid;
2643         }
2644 }
2645
2646 /*
2647  * Given a name and sha1 pair, if the index tells us the file in
2648  * the work tree has that object contents, return true, so that
2649  * prepare_temp_file() does not have to inflate and extract.
2650  */
2651 static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
2652 {
2653         const struct cache_entry *ce;
2654         struct stat st;
2655         int pos, len;
2656
2657         /*
2658          * We do not read the cache ourselves here, because the
2659          * benchmark with my previous version that always reads cache
2660          * shows that it makes things worse for diff-tree comparing
2661          * two linux-2.6 kernel trees in an already checked out work
2662          * tree.  This is because most diff-tree comparisons deal with
2663          * only a small number of files, while reading the cache is
2664          * expensive for a large project, and its cost outweighs the
2665          * savings we get by not inflating the object to a temporary
2666          * file.  Practically, this code only helps when we are used
2667          * by diff-cache --cached, which does read the cache before
2668          * calling us.
2669          */
2670         if (!active_cache)
2671                 return 0;
2672
2673         /* We want to avoid the working directory if our caller
2674          * doesn't need the data in a normal file, this system
2675          * is rather slow with its stat/open/mmap/close syscalls,
2676          * and the object is contained in a pack file.  The pack
2677          * is probably already open and will be faster to obtain
2678          * the data through than the working directory.  Loose
2679          * objects however would tend to be slower as they need
2680          * to be individually opened and inflated.
2681          */
2682         if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1))
2683                 return 0;
2684
2685         /*
2686          * Similarly, if we'd have to convert the file contents anyway, that
2687          * makes the optimization not worthwhile.
2688          */
2689         if (!want_file && would_convert_to_git(name))
2690                 return 0;
2691
2692         len = strlen(name);
2693         pos = cache_name_pos(name, len);
2694         if (pos < 0)
2695                 return 0;
2696         ce = active_cache[pos];
2697
2698         /*
2699          * This is not the sha1 we are looking for, or
2700          * unreusable because it is not a regular file.
2701          */
2702         if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
2703                 return 0;
2704
2705         /*
2706          * If ce is marked as "assume unchanged", there is no
2707          * guarantee that work tree matches what we are looking for.
2708          */
2709         if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
2710                 return 0;
2711
2712         /*
2713          * If ce matches the file in the work tree, we can reuse it.
2714          */
2715         if (ce_uptodate(ce) ||
2716             (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
2717                 return 1;
2718
2719         return 0;
2720 }
2721
2722 static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
2723 {
2724         struct strbuf buf = STRBUF_INIT;
2725         char *dirty = "";
2726
2727         /* Are we looking at the work tree? */
2728         if (s->dirty_submodule)
2729                 dirty = "-dirty";
2730
2731         strbuf_addf(&buf, "Subproject commit %s%s\n",
2732                     oid_to_hex(&s->oid), dirty);
2733         s->size = buf.len;
2734         if (size_only) {
2735                 s->data = NULL;
2736                 strbuf_release(&buf);
2737         } else {
2738                 s->data = strbuf_detach(&buf, NULL);
2739                 s->should_free = 1;
2740         }
2741         return 0;
2742 }
2743
2744 /*
2745  * While doing rename detection and pickaxe operation, we may need to
2746  * grab the data for the blob (or file) for our own in-core comparison.
2747  * diff_filespec has data and size fields for this purpose.
2748  */
2749 int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
2750 {
2751         int size_only = flags & CHECK_SIZE_ONLY;
2752         int err = 0;
2753         /*
2754          * demote FAIL to WARN to allow inspecting the situation
2755          * instead of refusing.
2756          */
2757         enum safe_crlf crlf_warn = (safe_crlf == SAFE_CRLF_FAIL
2758                                     ? SAFE_CRLF_WARN
2759                                     : safe_crlf);
2760
2761         if (!DIFF_FILE_VALID(s))
2762                 die("internal error: asking to populate invalid file.");
2763         if (S_ISDIR(s->mode))
2764                 return -1;
2765
2766         if (s->data)
2767                 return 0;
2768
2769         if (size_only && 0 < s->size)
2770                 return 0;
2771
2772         if (S_ISGITLINK(s->mode))
2773                 return diff_populate_gitlink(s, size_only);
2774
2775         if (!s->oid_valid ||
2776             reuse_worktree_file(s->path, s->oid.hash, 0)) {
2777                 struct strbuf buf = STRBUF_INIT;
2778                 struct stat st;
2779                 int fd;
2780
2781                 if (lstat(s->path, &st) < 0) {
2782                         if (errno == ENOENT) {
2783                         err_empty:
2784                                 err = -1;
2785                         empty:
2786                                 s->data = (char *)"";
2787                                 s->size = 0;
2788                                 return err;
2789                         }
2790                 }
2791                 s->size = xsize_t(st.st_size);
2792                 if (!s->size)
2793                         goto empty;
2794                 if (S_ISLNK(st.st_mode)) {
2795                         struct strbuf sb = STRBUF_INIT;
2796
2797                         if (strbuf_readlink(&sb, s->path, s->size))
2798                                 goto err_empty;
2799                         s->size = sb.len;
2800                         s->data = strbuf_detach(&sb, NULL);
2801                         s->should_free = 1;
2802                         return 0;
2803                 }
2804                 if (size_only)
2805                         return 0;
2806                 if ((flags & CHECK_BINARY) &&
2807                     s->size > big_file_threshold && s->is_binary == -1) {
2808                         s->is_binary = 1;
2809                         return 0;
2810                 }
2811                 fd = open(s->path, O_RDONLY);
2812                 if (fd < 0)
2813                         goto err_empty;
2814                 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
2815                 close(fd);
2816                 s->should_munmap = 1;
2817
2818                 /*
2819                  * Convert from working tree format to canonical git format
2820                  */
2821                 if (convert_to_git(s->path, s->data, s->size, &buf, crlf_warn)) {
2822                         size_t size = 0;
2823                         munmap(s->data, s->size);
2824                         s->should_munmap = 0;
2825                         s->data = strbuf_detach(&buf, &size);
2826                         s->size = size;
2827                         s->should_free = 1;
2828                 }
2829         }
2830         else {
2831                 enum object_type type;
2832                 if (size_only || (flags & CHECK_BINARY)) {
2833                         type = sha1_object_info(s->oid.hash, &s->size);
2834                         if (type < 0)
2835                                 die("unable to read %s",
2836                                     oid_to_hex(&s->oid));
2837                         if (size_only)
2838                                 return 0;
2839                         if (s->size > big_file_threshold && s->is_binary == -1) {
2840                                 s->is_binary = 1;
2841                                 return 0;
2842                         }
2843                 }
2844                 s->data = read_sha1_file(s->oid.hash, &type, &s->size);
2845                 if (!s->data)
2846                         die("unable to read %s", oid_to_hex(&s->oid));
2847                 s->should_free = 1;
2848         }
2849         return 0;
2850 }
2851
2852 void diff_free_filespec_blob(struct diff_filespec *s)
2853 {
2854         if (s->should_free)
2855                 free(s->data);
2856         else if (s->should_munmap)
2857                 munmap(s->data, s->size);
2858
2859         if (s->should_free || s->should_munmap) {
2860                 s->should_free = s->should_munmap = 0;
2861                 s->data = NULL;
2862         }
2863 }
2864
2865 void diff_free_filespec_data(struct diff_filespec *s)
2866 {
2867         diff_free_filespec_blob(s);
2868         free(s->cnt_data);
2869         s->cnt_data = NULL;
2870 }
2871
2872 static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
2873                            void *blob,
2874                            unsigned long size,
2875                            const struct object_id *oid,
2876                            int mode)
2877 {
2878         int fd;
2879         struct strbuf buf = STRBUF_INIT;
2880         struct strbuf template = STRBUF_INIT;
2881         char *path_dup = xstrdup(path);
2882         const char *base = basename(path_dup);
2883
2884         /* Generate "XXXXXX_basename.ext" */
2885         strbuf_addstr(&template, "XXXXXX_");
2886         strbuf_addstr(&template, base);
2887
2888         fd = mks_tempfile_ts(&temp->tempfile, template.buf, strlen(base) + 1);
2889         if (fd < 0)
2890                 die_errno("unable to create temp-file");
2891         if (convert_to_working_tree(path,
2892                         (const char *)blob, (size_t)size, &buf)) {
2893                 blob = buf.buf;
2894                 size = buf.len;
2895         }
2896         if (write_in_full(fd, blob, size) != size)
2897                 die_errno("unable to write temp-file");
2898         close_tempfile(&temp->tempfile);
2899         temp->name = get_tempfile_path(&temp->tempfile);
2900         oid_to_hex_r(temp->hex, oid);
2901         xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
2902         strbuf_release(&buf);
2903         strbuf_release(&template);
2904         free(path_dup);
2905 }
2906
2907 static struct diff_tempfile *prepare_temp_file(const char *name,
2908                 struct diff_filespec *one)
2909 {
2910         struct diff_tempfile *temp = claim_diff_tempfile();
2911
2912         if (!DIFF_FILE_VALID(one)) {
2913         not_a_valid_file:
2914                 /* A '-' entry produces this for file-2, and
2915                  * a '+' entry produces this for file-1.
2916                  */
2917                 temp->name = "/dev/null";
2918                 xsnprintf(temp->hex, sizeof(temp->hex), ".");
2919                 xsnprintf(temp->mode, sizeof(temp->mode), ".");
2920                 return temp;
2921         }
2922
2923         if (!S_ISGITLINK(one->mode) &&
2924             (!one->oid_valid ||
2925              reuse_worktree_file(name, one->oid.hash, 1))) {
2926                 struct stat st;
2927                 if (lstat(name, &st) < 0) {
2928                         if (errno == ENOENT)
2929                                 goto not_a_valid_file;
2930                         die_errno("stat(%s)", name);
2931                 }
2932                 if (S_ISLNK(st.st_mode)) {
2933                         struct strbuf sb = STRBUF_INIT;
2934                         if (strbuf_readlink(&sb, name, st.st_size) < 0)
2935                                 die_errno("readlink(%s)", name);
2936                         prep_temp_blob(name, temp, sb.buf, sb.len,
2937                                        (one->oid_valid ?
2938                                         &one->oid : &null_oid),
2939                                        (one->oid_valid ?
2940                                         one->mode : S_IFLNK));
2941                         strbuf_release(&sb);
2942                 }
2943                 else {
2944                         /* we can borrow from the file in the work tree */
2945                         temp->name = name;
2946                         if (!one->oid_valid)
2947                                 sha1_to_hex_r(temp->hex, null_sha1);
2948                         else
2949                                 sha1_to_hex_r(temp->hex, one->oid.hash);
2950                         /* Even though we may sometimes borrow the
2951                          * contents from the work tree, we always want
2952                          * one->mode.  mode is trustworthy even when
2953                          * !(one->sha1_valid), as long as
2954                          * DIFF_FILE_VALID(one).
2955                          */
2956                         xsnprintf(temp->mode, sizeof(temp->mode), "%06o", one->mode);
2957                 }
2958                 return temp;
2959         }
2960         else {
2961                 if (diff_populate_filespec(one, 0))
2962                         die("cannot read data blob for %s", one->path);
2963                 prep_temp_blob(name, temp, one->data, one->size,
2964                                &one->oid, one->mode);
2965         }
2966         return temp;
2967 }
2968
2969 static void add_external_diff_name(struct argv_array *argv,
2970                                    const char *name,
2971                                    struct diff_filespec *df)
2972 {
2973         struct diff_tempfile *temp = prepare_temp_file(name, df);
2974         argv_array_push(argv, temp->name);
2975         argv_array_push(argv, temp->hex);
2976         argv_array_push(argv, temp->mode);
2977 }
2978
2979 /* An external diff command takes:
2980  *
2981  * diff-cmd name infile1 infile1-sha1 infile1-mode \
2982  *               infile2 infile2-sha1 infile2-mode [ rename-to ]
2983  *
2984  */
2985 static void run_external_diff(const char *pgm,
2986                               const char *name,
2987                               const char *other,
2988                               struct diff_filespec *one,
2989                               struct diff_filespec *two,
2990                               const char *xfrm_msg,
2991                               int complete_rewrite,
2992                               struct diff_options *o)
2993 {
2994         struct argv_array argv = ARGV_ARRAY_INIT;
2995         struct argv_array env = ARGV_ARRAY_INIT;
2996         struct diff_queue_struct *q = &diff_queued_diff;
2997
2998         argv_array_push(&argv, pgm);
2999         argv_array_push(&argv, name);
3000
3001         if (one && two) {
3002                 add_external_diff_name(&argv, name, one);
3003                 if (!other)
3004                         add_external_diff_name(&argv, name, two);
3005                 else {
3006                         add_external_diff_name(&argv, other, two);
3007                         argv_array_push(&argv, other);
3008                         argv_array_push(&argv, xfrm_msg);
3009                 }
3010         }
3011
3012         argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
3013         argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
3014
3015         if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
3016                 die(_("external diff died, stopping at %s"), name);
3017
3018         remove_tempfile();
3019         argv_array_clear(&argv);
3020         argv_array_clear(&env);
3021 }
3022
3023 static int similarity_index(struct diff_filepair *p)
3024 {
3025         return p->score * 100 / MAX_SCORE;
3026 }
3027
3028 static void fill_metainfo(struct strbuf *msg,
3029                           const char *name,
3030                           const char *other,
3031                           struct diff_filespec *one,
3032                           struct diff_filespec *two,
3033                           struct diff_options *o,
3034                           struct diff_filepair *p,
3035                           int *must_show_header,
3036                           int use_color)
3037 {
3038         const char *set = diff_get_color(use_color, DIFF_METAINFO);
3039         const char *reset = diff_get_color(use_color, DIFF_RESET);
3040         const char *line_prefix = diff_line_prefix(o);
3041
3042         *must_show_header = 1;
3043         strbuf_init(msg, PATH_MAX * 2 + 300);
3044         switch (p->status) {
3045         case DIFF_STATUS_COPIED:
3046                 strbuf_addf(msg, "%s%ssimilarity index %d%%",
3047                             line_prefix, set, similarity_index(p));
3048                 strbuf_addf(msg, "%s\n%s%scopy from ",
3049                             reset,  line_prefix, set);
3050                 quote_c_style(name, msg, NULL, 0);
3051                 strbuf_addf(msg, "%s\n%s%scopy to ", reset, line_prefix, set);
3052                 quote_c_style(other, msg, NULL, 0);
3053                 strbuf_addf(msg, "%s\n", reset);
3054                 break;
3055         case DIFF_STATUS_RENAMED:
3056                 strbuf_addf(msg, "%s%ssimilarity index %d%%",
3057                             line_prefix, set, similarity_index(p));
3058                 strbuf_addf(msg, "%s\n%s%srename from ",
3059                             reset, line_prefix, set);
3060                 quote_c_style(name, msg, NULL, 0);
3061                 strbuf_addf(msg, "%s\n%s%srename to ",
3062                             reset, line_prefix, set);
3063                 quote_c_style(other, msg, NULL, 0);
3064                 strbuf_addf(msg, "%s\n", reset);
3065                 break;
3066         case DIFF_STATUS_MODIFIED:
3067                 if (p->score) {
3068                         strbuf_addf(msg, "%s%sdissimilarity index %d%%%s\n",
3069                                     line_prefix,
3070                                     set, similarity_index(p), reset);
3071                         break;
3072                 }
3073                 /* fallthru */
3074         default:
3075                 *must_show_header = 0;
3076         }
3077         if (one && two && oidcmp(&one->oid, &two->oid)) {
3078                 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
3079
3080                 if (DIFF_OPT_TST(o, BINARY)) {
3081                         mmfile_t mf;
3082                         if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
3083                             (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
3084                                 abbrev = 40;
3085                 }
3086                 strbuf_addf(msg, "%s%sindex %s..", line_prefix, set,
3087                             find_unique_abbrev(one->oid.hash, abbrev));
3088                 strbuf_addstr(msg, find_unique_abbrev(two->oid.hash, abbrev));
3089                 if (one->mode == two->mode)
3090                         strbuf_addf(msg, " %06o", one->mode);
3091                 strbuf_addf(msg, "%s\n", reset);
3092         }
3093 }
3094
3095 static void run_diff_cmd(const char *pgm,
3096                          const char *name,
3097                          const char *other,
3098                          const char *attr_path,
3099                          struct diff_filespec *one,
3100                          struct diff_filespec *two,
3101                          struct strbuf *msg,
3102                          struct diff_options *o,
3103                          struct diff_filepair *p)
3104 {
3105         const char *xfrm_msg = NULL;
3106         int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
3107         int must_show_header = 0;
3108
3109
3110         if (DIFF_OPT_TST(o, ALLOW_EXTERNAL)) {
3111                 struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
3112                 if (drv && drv->external)
3113                         pgm = drv->external;
3114         }
3115
3116         if (msg) {
3117                 /*
3118                  * don't use colors when the header is intended for an
3119                  * external diff driver
3120                  */
3121                 fill_metainfo(msg, name, other, one, two, o, p,
3122                               &must_show_header,
3123                               want_color(o->use_color) && !pgm);
3124                 xfrm_msg = msg->len ? msg->buf : NULL;
3125         }
3126
3127         if (pgm) {
3128                 run_external_diff(pgm, name, other, one, two, xfrm_msg,
3129                                   complete_rewrite, o);
3130                 return;
3131         }
3132         if (one && two)
3133                 builtin_diff(name, other ? other : name,
3134                              one, two, xfrm_msg, must_show_header,
3135                              o, complete_rewrite);
3136         else
3137                 fprintf(o->file, "* Unmerged path %s\n", name);
3138 }
3139
3140 static void diff_fill_sha1_info(struct diff_filespec *one)
3141 {
3142         if (DIFF_FILE_VALID(one)) {
3143                 if (!one->oid_valid) {
3144                         struct stat st;
3145                         if (one->is_stdin) {
3146                                 oidclr(&one->oid);
3147                                 return;
3148                         }
3149                         if (lstat(one->path, &st) < 0)
3150                                 die_errno("stat '%s'", one->path);
3151                         if (index_path(one->oid.hash, one->path, &st, 0))
3152                                 die("cannot hash %s", one->path);
3153                 }
3154         }
3155         else
3156                 oidclr(&one->oid);
3157 }
3158
3159 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
3160 {
3161         /* Strip the prefix but do not molest /dev/null and absolute paths */
3162         if (*namep && **namep != '/') {
3163                 *namep += prefix_length;
3164                 if (**namep == '/')
3165                         ++*namep;
3166         }
3167         if (*otherp && **otherp != '/') {
3168                 *otherp += prefix_length;
3169                 if (**otherp == '/')
3170                         ++*otherp;
3171         }
3172 }
3173
3174 static void run_diff(struct diff_filepair *p, struct diff_options *o)
3175 {
3176         const char *pgm = external_diff();
3177         struct strbuf msg;
3178         struct diff_filespec *one = p->one;
3179         struct diff_filespec *two = p->two;
3180         const char *name;
3181         const char *other;
3182         const char *attr_path;
3183
3184         name  = p->one->path;
3185         other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3186         attr_path = name;
3187         if (o->prefix_length)
3188                 strip_prefix(o->prefix_length, &name, &other);
3189
3190         if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
3191                 pgm = NULL;
3192
3193         if (DIFF_PAIR_UNMERGED(p)) {
3194                 run_diff_cmd(pgm, name, NULL, attr_path,
3195                              NULL, NULL, NULL, o, p);
3196                 return;
3197         }
3198
3199         diff_fill_sha1_info(one);
3200         diff_fill_sha1_info(two);
3201
3202         if (!pgm &&
3203             DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
3204             (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
3205                 /*
3206                  * a filepair that changes between file and symlink
3207                  * needs to be split into deletion and creation.
3208                  */
3209                 struct diff_filespec *null = alloc_filespec(two->path);
3210                 run_diff_cmd(NULL, name, other, attr_path,
3211                              one, null, &msg, o, p);
3212                 free(null);
3213                 strbuf_release(&msg);
3214
3215                 null = alloc_filespec(one->path);
3216                 run_diff_cmd(NULL, name, other, attr_path,
3217                              null, two, &msg, o, p);
3218                 free(null);
3219         }
3220         else
3221                 run_diff_cmd(pgm, name, other, attr_path,
3222                              one, two, &msg, o, p);
3223
3224         strbuf_release(&msg);
3225 }
3226
3227 static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
3228                          struct diffstat_t *diffstat)
3229 {
3230         const char *name;
3231         const char *other;
3232
3233         if (DIFF_PAIR_UNMERGED(p)) {
3234                 /* unmerged */
3235                 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, p);
3236                 return;
3237         }
3238
3239         name = p->one->path;
3240         other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3241
3242         if (o->prefix_length)
3243                 strip_prefix(o->prefix_length, &name, &other);
3244
3245         diff_fill_sha1_info(p->one);
3246         diff_fill_sha1_info(p->two);
3247
3248         builtin_diffstat(name, other, p->one, p->two, diffstat, o, p);
3249 }
3250
3251 static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
3252 {
3253         const char *name;
3254         const char *other;
3255         const char *attr_path;
3256
3257         if (DIFF_PAIR_UNMERGED(p)) {
3258                 /* unmerged */
3259                 return;
3260         }
3261
3262         name = p->one->path;
3263         other = (strcmp(name, p->two->path) ? p->two->path : NULL);
3264         attr_path = other ? other : name;
3265
3266         if (o->prefix_length)
3267                 strip_prefix(o->prefix_length, &name, &other);
3268
3269         diff_fill_sha1_info(p->one);
3270         diff_fill_sha1_info(p->two);
3271
3272         builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
3273 }
3274
3275 void diff_setup(struct diff_options *options)
3276 {
3277         memcpy(options, &default_diff_options, sizeof(*options));
3278
3279         options->file = stdout;
3280
3281         options->line_termination = '\n';
3282         options->break_opt = -1;
3283         options->rename_limit = -1;
3284         options->dirstat_permille = diff_dirstat_permille_default;
3285         options->context = diff_context_default;
3286         options->ws_error_highlight = WSEH_NEW;
3287         DIFF_OPT_SET(options, RENAME_EMPTY);
3288
3289         /* pathchange left =NULL by default */
3290         options->change = diff_change;
3291         options->add_remove = diff_addremove;
3292         options->use_color = diff_use_color_default;
3293         options->detect_rename = diff_detect_rename_default;
3294         options->xdl_opts |= diff_algorithm;
3295         if (diff_compaction_heuristic)
3296                 DIFF_XDL_SET(options, COMPACTION_HEURISTIC);
3297
3298         options->orderfile = diff_order_file_cfg;
3299
3300         if (diff_no_prefix) {
3301                 options->a_prefix = options->b_prefix = "";
3302         } else if (!diff_mnemonic_prefix) {
3303                 options->a_prefix = "a/";
3304                 options->b_prefix = "b/";
3305         }
3306 }
3307
3308 void diff_setup_done(struct diff_options *options)
3309 {
3310         int count = 0;
3311
3312         if (options->set_default)
3313                 options->set_default(options);
3314
3315         if (options->output_format & DIFF_FORMAT_NAME)
3316                 count++;
3317         if (options->output_format & DIFF_FORMAT_NAME_STATUS)
3318                 count++;
3319         if (options->output_format & DIFF_FORMAT_CHECKDIFF)
3320                 count++;
3321         if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
3322                 count++;
3323         if (count > 1)
3324                 die("--name-only, --name-status, --check and -s are mutually exclusive");
3325
3326         /*
3327          * Most of the time we can say "there are changes"
3328          * only by checking if there are changed paths, but
3329          * --ignore-whitespace* options force us to look
3330          * inside contents.
3331          */
3332
3333         if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
3334             DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
3335             DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
3336                 DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
3337         else
3338                 DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
3339
3340         if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
3341                 options->detect_rename = DIFF_DETECT_COPY;
3342
3343         if (!DIFF_OPT_TST(options, RELATIVE_NAME))
3344                 options->prefix = NULL;
3345         if (options->prefix)
3346                 options->prefix_length = strlen(options->prefix);
3347         else
3348                 options->prefix_length = 0;
3349
3350         if (options->output_format & (DIFF_FORMAT_NAME |
3351                                       DIFF_FORMAT_NAME_STATUS |
3352                                       DIFF_FORMAT_CHECKDIFF |
3353                                       DIFF_FORMAT_NO_OUTPUT))
3354                 options->output_format &= ~(DIFF_FORMAT_RAW |
3355                                             DIFF_FORMAT_NUMSTAT |
3356                                             DIFF_FORMAT_DIFFSTAT |
3357                                             DIFF_FORMAT_SHORTSTAT |
3358                                             DIFF_FORMAT_DIRSTAT |
3359                                             DIFF_FORMAT_SUMMARY |
3360                                             DIFF_FORMAT_PATCH);
3361
3362         /*
3363          * These cases always need recursive; we do not drop caller-supplied
3364          * recursive bits for other formats here.
3365          */
3366         if (options->output_format & (DIFF_FORMAT_PATCH |
3367                                       DIFF_FORMAT_NUMSTAT |
3368                                       DIFF_FORMAT_DIFFSTAT |
3369                                       DIFF_FORMAT_SHORTSTAT |
3370                                       DIFF_FORMAT_DIRSTAT |
3371                                       DIFF_FORMAT_SUMMARY |
3372                                       DIFF_FORMAT_CHECKDIFF))
3373                 DIFF_OPT_SET(options, RECURSIVE);
3374         /*
3375          * Also pickaxe would not work very well if you do not say recursive
3376          */
3377         if (options->pickaxe)
3378                 DIFF_OPT_SET(options, RECURSIVE);
3379         /*
3380          * When patches are generated, submodules diffed against the work tree
3381          * must be checked for dirtiness too so it can be shown in the output
3382          */
3383         if (options->output_format & DIFF_FORMAT_PATCH)
3384                 DIFF_OPT_SET(options, DIRTY_SUBMODULES);
3385
3386         if (options->detect_rename && options->rename_limit < 0)
3387                 options->rename_limit = diff_rename_limit_default;
3388         if (options->setup & DIFF_SETUP_USE_CACHE) {
3389                 if (!active_cache)
3390                         /* read-cache does not die even when it fails
3391                          * so it is safe for us to do this here.  Also
3392                          * it does not smudge active_cache or active_nr
3393                          * when it fails, so we do not have to worry about
3394                          * cleaning it up ourselves either.
3395                          */
3396                         read_cache();
3397         }
3398         if (options->abbrev <= 0 || 40 < options->abbrev)
3399                 options->abbrev = 40; /* full */
3400
3401         /*
3402          * It does not make sense to show the first hit we happened
3403          * to have found.  It does not make sense not to return with
3404          * exit code in such a case either.
3405          */
3406         if (DIFF_OPT_TST(options, QUICK)) {
3407                 options->output_format = DIFF_FORMAT_NO_OUTPUT;
3408                 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3409         }
3410
3411         options->diff_path_counter = 0;
3412
3413         if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1)
3414                 die(_("--follow requires exactly one pathspec"));
3415 }
3416
3417 static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
3418 {
3419         char c, *eq;
3420         int len;
3421
3422         if (*arg != '-')
3423                 return 0;
3424         c = *++arg;
3425         if (!c)
3426                 return 0;
3427         if (c == arg_short) {
3428                 c = *++arg;
3429                 if (!c)
3430                         return 1;
3431                 if (val && isdigit(c)) {
3432                         char *end;
3433                         int n = strtoul(arg, &end, 10);
3434                         if (*end)
3435                                 return 0;
3436                         *val = n;
3437                         return 1;
3438                 }
3439                 return 0;
3440         }
3441         if (c != '-')
3442                 return 0;
3443         arg++;
3444         eq = strchrnul(arg, '=');
3445         len = eq - arg;
3446         if (!len || strncmp(arg, arg_long, len))
3447                 return 0;
3448         if (*eq) {
3449                 int n;
3450                 char *end;
3451                 if (!isdigit(*++eq))
3452                         return 0;
3453                 n = strtoul(eq, &end, 10);
3454                 if (*end)
3455                         return 0;
3456                 *val = n;
3457         }
3458         return 1;
3459 }
3460
3461 static int diff_scoreopt_parse(const char *opt);
3462
3463 static inline int short_opt(char opt, const char **argv,
3464                             const char **optarg)
3465 {
3466         const char *arg = argv[0];
3467         if (arg[0] != '-' || arg[1] != opt)
3468                 return 0;
3469         if (arg[2] != '\0') {
3470                 *optarg = arg + 2;
3471                 return 1;
3472         }
3473         if (!argv[1])
3474                 die("Option '%c' requires a value", opt);
3475         *optarg = argv[1];
3476         return 2;
3477 }
3478
3479 int parse_long_opt(const char *opt, const char **argv,
3480                    const char **optarg)
3481 {
3482         const char *arg = argv[0];
3483         if (!skip_prefix(arg, "--", &arg))
3484                 return 0;
3485         if (!skip_prefix(arg, opt, &arg))
3486                 return 0;
3487         if (*arg == '=') { /* stuck form: --option=value */
3488                 *optarg = arg + 1;
3489                 return 1;
3490         }
3491         if (*arg != '\0')
3492                 return 0;
3493         /* separate form: --option value */
3494         if (!argv[1])
3495                 die("Option '--%s' requires a value", opt);
3496         *optarg = argv[1];
3497         return 2;
3498 }
3499
3500 static int stat_opt(struct diff_options *options, const char **av)
3501 {
3502         const char *arg = av[0];
3503         char *end;
3504         int width = options->stat_width;
3505         int name_width = options->stat_name_width;
3506         int graph_width = options->stat_graph_width;
3507         int count = options->stat_count;
3508         int argcount = 1;
3509
3510         if (!skip_prefix(arg, "--stat", &arg))
3511                 die("BUG: stat option does not begin with --stat: %s", arg);
3512         end = (char *)arg;
3513
3514         switch (*arg) {
3515         case '-':
3516                 if (skip_prefix(arg, "-width", &arg)) {
3517                         if (*arg == '=')
3518                                 width = strtoul(arg + 1, &end, 10);
3519                         else if (!*arg && !av[1])
3520                                 die("Option '--stat-width' requires a value");
3521                         else if (!*arg) {
3522                                 width = strtoul(av[1], &end, 10);
3523                                 argcount = 2;
3524                         }
3525                 } else if (skip_prefix(arg, "-name-width", &arg)) {
3526                         if (*arg == '=')
3527                                 name_width = strtoul(arg + 1, &end, 10);
3528                         else if (!*arg && !av[1])
3529                                 die("Option '--stat-name-width' requires a value");
3530                         else if (!*arg) {
3531                                 name_width = strtoul(av[1], &end, 10);
3532                                 argcount = 2;
3533                         }
3534                 } else if (skip_prefix(arg, "-graph-width", &arg)) {
3535                         if (*arg == '=')
3536                                 graph_width = strtoul(arg + 1, &end, 10);
3537                         else if (!*arg && !av[1])
3538                                 die("Option '--stat-graph-width' requires a value");
3539                         else if (!*arg) {
3540                                 graph_width = strtoul(av[1], &end, 10);
3541                                 argcount = 2;
3542                         }
3543                 } else if (skip_prefix(arg, "-count", &arg)) {
3544                         if (*arg == '=')
3545                                 count = strtoul(arg + 1, &end, 10);
3546                         else if (!*arg && !av[1])
3547                                 die("Option '--stat-count' requires a value");
3548                         else if (!*arg) {
3549                                 count = strtoul(av[1], &end, 10);
3550                                 argcount = 2;
3551                         }
3552                 }
3553                 break;
3554         case '=':
3555                 width = strtoul(arg+1, &end, 10);
3556                 if (*end == ',')
3557                         name_width = strtoul(end+1, &end, 10);
3558                 if (*end == ',')
3559                         count = strtoul(end+1, &end, 10);
3560         }
3561
3562         /* Important! This checks all the error cases! */
3563         if (*end)
3564                 return 0;
3565         options->output_format |= DIFF_FORMAT_DIFFSTAT;
3566         options->stat_name_width = name_width;
3567         options->stat_graph_width = graph_width;
3568         options->stat_width = width;
3569         options->stat_count = count;
3570         return argcount;
3571 }
3572
3573 static int parse_dirstat_opt(struct diff_options *options, const char *params)
3574 {
3575         struct strbuf errmsg = STRBUF_INIT;
3576         if (parse_dirstat_params(options, params, &errmsg))
3577                 die(_("Failed to parse --dirstat/-X option parameter:\n%s"),
3578                     errmsg.buf);
3579         strbuf_release(&errmsg);
3580         /*
3581          * The caller knows a dirstat-related option is given from the command
3582          * line; allow it to say "return this_function();"
3583          */
3584         options->output_format |= DIFF_FORMAT_DIRSTAT;
3585         return 1;
3586 }
3587
3588 static int parse_submodule_opt(struct diff_options *options, const char *value)
3589 {
3590         if (parse_submodule_params(options, value))
3591                 die(_("Failed to parse --submodule option parameter: '%s'"),
3592                         value);
3593         return 1;
3594 }
3595
3596 static const char diff_status_letters[] = {
3597         DIFF_STATUS_ADDED,
3598         DIFF_STATUS_COPIED,
3599         DIFF_STATUS_DELETED,
3600         DIFF_STATUS_MODIFIED,
3601         DIFF_STATUS_RENAMED,
3602         DIFF_STATUS_TYPE_CHANGED,
3603         DIFF_STATUS_UNKNOWN,
3604         DIFF_STATUS_UNMERGED,
3605         DIFF_STATUS_FILTER_AON,
3606         DIFF_STATUS_FILTER_BROKEN,
3607         '\0',
3608 };
3609
3610 static unsigned int filter_bit['Z' + 1];
3611
3612 static void prepare_filter_bits(void)
3613 {
3614         int i;
3615
3616         if (!filter_bit[DIFF_STATUS_ADDED]) {
3617                 for (i = 0; diff_status_letters[i]; i++)
3618                         filter_bit[(int) diff_status_letters[i]] = (1 << i);
3619         }
3620 }
3621
3622 static unsigned filter_bit_tst(char status, const struct diff_options *opt)
3623 {
3624         return opt->filter & filter_bit[(int) status];
3625 }
3626
3627 static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)
3628 {
3629         int i, optch;
3630
3631         prepare_filter_bits();
3632
3633         /*
3634          * If there is a negation e.g. 'd' in the input, and we haven't
3635          * initialized the filter field with another --diff-filter, start
3636          * from full set of bits, except for AON.
3637          */
3638         if (!opt->filter) {
3639                 for (i = 0; (optch = optarg[i]) != '\0'; i++) {
3640                         if (optch < 'a' || 'z' < optch)
3641                                 continue;
3642                         opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1;
3643                         opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON];
3644                         break;
3645                 }
3646         }
3647
3648         for (i = 0; (optch = optarg[i]) != '\0'; i++) {
3649                 unsigned int bit;
3650                 int negate;
3651
3652                 if ('a' <= optch && optch <= 'z') {
3653                         negate = 1;
3654                         optch = toupper(optch);
3655                 } else {
3656                         negate = 0;
3657                 }
3658
3659                 bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0;
3660                 if (!bit)
3661                         return optarg[i];
3662                 if (negate)
3663                         opt->filter &= ~bit;
3664                 else
3665                         opt->filter |= bit;
3666         }
3667         return 0;
3668 }
3669
3670 static void enable_patch_output(int *fmt) {
3671         *fmt &= ~DIFF_FORMAT_NO_OUTPUT;
3672         *fmt |= DIFF_FORMAT_PATCH;
3673 }
3674
3675 static int parse_one_token(const char **arg, const char *token)
3676 {
3677         const char *rest;
3678         if (skip_prefix(*arg, token, &rest) && (!*rest || *rest == ',')) {
3679                 *arg = rest;
3680                 return 1;
3681         }
3682         return 0;
3683 }
3684
3685 static int parse_ws_error_highlight(struct diff_options *opt, const char *arg)
3686 {
3687         const char *orig_arg = arg;
3688         unsigned val = 0;
3689         while (*arg) {
3690                 if (parse_one_token(&arg, "none"))
3691                         val = 0;
3692                 else if (parse_one_token(&arg, "default"))
3693                         val = WSEH_NEW;
3694                 else if (parse_one_token(&arg, "all"))
3695                         val = WSEH_NEW | WSEH_OLD | WSEH_CONTEXT;
3696                 else if (parse_one_token(&arg, "new"))
3697                         val |= WSEH_NEW;
3698                 else if (parse_one_token(&arg, "old"))
3699                         val |= WSEH_OLD;
3700                 else if (parse_one_token(&arg, "context"))
3701                         val |= WSEH_CONTEXT;
3702                 else {
3703                         error("unknown value after ws-error-highlight=%.*s",
3704                               (int)(arg - orig_arg), orig_arg);
3705                         return 0;
3706                 }
3707                 if (*arg)
3708                         arg++;
3709         }
3710         opt->ws_error_highlight = val;
3711         return 1;
3712 }
3713
3714 int diff_opt_parse(struct diff_options *options,
3715                    const char **av, int ac, const char *prefix)
3716 {
3717         const char *arg = av[0];
3718         const char *optarg;
3719         int argcount;
3720
3721         if (!prefix)
3722                 prefix = "";
3723
3724         /* Output format options */
3725         if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch")
3726             || opt_arg(arg, 'U', "unified", &options->context))
3727                 enable_patch_output(&options->output_format);
3728         else if (!strcmp(arg, "--raw"))
3729                 options->output_format |= DIFF_FORMAT_RAW;
3730         else if (!strcmp(arg, "--patch-with-raw")) {
3731                 enable_patch_output(&options->output_format);
3732                 options->output_format |= DIFF_FORMAT_RAW;
3733         } else if (!strcmp(arg, "--numstat"))
3734                 options->output_format |= DIFF_FORMAT_NUMSTAT;
3735         else if (!strcmp(arg, "--shortstat"))
3736                 options->output_format |= DIFF_FORMAT_SHORTSTAT;
3737         else if (!strcmp(arg, "-X") || !strcmp(arg, "--dirstat"))
3738                 return parse_dirstat_opt(options, "");
3739         else if (skip_prefix(arg, "-X", &arg))
3740                 return parse_dirstat_opt(options, arg);
3741         else if (skip_prefix(arg, "--dirstat=", &arg))
3742                 return parse_dirstat_opt(options, arg);
3743         else if (!strcmp(arg, "--cumulative"))
3744                 return parse_dirstat_opt(options, "cumulative");
3745         else if (!strcmp(arg, "--dirstat-by-file"))
3746                 return parse_dirstat_opt(options, "files");
3747         else if (skip_prefix(arg, "--dirstat-by-file=", &arg)) {
3748                 parse_dirstat_opt(options, "files");
3749                 return parse_dirstat_opt(options, arg);
3750         }
3751         else if (!strcmp(arg, "--check"))
3752                 options->output_format |= DIFF_FORMAT_CHECKDIFF;
3753         else if (!strcmp(arg, "--summary"))
3754                 options->output_format |= DIFF_FORMAT_SUMMARY;
3755         else if (!strcmp(arg, "--patch-with-stat")) {
3756                 enable_patch_output(&options->output_format);
3757                 options->output_format |= DIFF_FORMAT_DIFFSTAT;
3758         } else if (!strcmp(arg, "--name-only"))
3759                 options->output_format |= DIFF_FORMAT_NAME;
3760         else if (!strcmp(arg, "--name-status"))
3761                 options->output_format |= DIFF_FORMAT_NAME_STATUS;
3762         else if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch"))
3763                 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
3764         else if (starts_with(arg, "--stat"))
3765                 /* --stat, --stat-width, --stat-name-width, or --stat-count */
3766                 return stat_opt(options, av);
3767
3768         /* renames options */
3769         else if (starts_with(arg, "-B") || starts_with(arg, "--break-rewrites=") ||
3770                  !strcmp(arg, "--break-rewrites")) {
3771                 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
3772                         return error("invalid argument to -B: %s", arg+2);
3773         }
3774         else if (starts_with(arg, "-M") || starts_with(arg, "--find-renames=") ||
3775                  !strcmp(arg, "--find-renames")) {
3776                 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3777                         return error("invalid argument to -M: %s", arg+2);
3778                 options->detect_rename = DIFF_DETECT_RENAME;
3779         }
3780         else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) {
3781                 options->irreversible_delete = 1;
3782         }
3783         else if (starts_with(arg, "-C") || starts_with(arg, "--find-copies=") ||
3784                  !strcmp(arg, "--find-copies")) {
3785                 if (options->detect_rename == DIFF_DETECT_COPY)
3786                         DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3787                 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
3788                         return error("invalid argument to -C: %s", arg+2);
3789                 options->detect_rename = DIFF_DETECT_COPY;
3790         }
3791         else if (!strcmp(arg, "--no-renames"))
3792                 options->detect_rename = 0;
3793         else if (!strcmp(arg, "--rename-empty"))
3794                 DIFF_OPT_SET(options, RENAME_EMPTY);
3795         else if (!strcmp(arg, "--no-rename-empty"))
3796                 DIFF_OPT_CLR(options, RENAME_EMPTY);
3797         else if (!strcmp(arg, "--relative"))
3798                 DIFF_OPT_SET(options, RELATIVE_NAME);
3799         else if (skip_prefix(arg, "--relative=", &arg)) {
3800                 DIFF_OPT_SET(options, RELATIVE_NAME);
3801                 options->prefix = arg;
3802         }
3803
3804         /* xdiff options */
3805         else if (!strcmp(arg, "--minimal"))
3806                 DIFF_XDL_SET(options, NEED_MINIMAL);
3807         else if (!strcmp(arg, "--no-minimal"))
3808                 DIFF_XDL_CLR(options, NEED_MINIMAL);
3809         else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
3810                 DIFF_XDL_SET(options, IGNORE_WHITESPACE);
3811         else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
3812                 DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
3813         else if (!strcmp(arg, "--ignore-space-at-eol"))
3814                 DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
3815         else if (!strcmp(arg, "--ignore-blank-lines"))
3816                 DIFF_XDL_SET(options, IGNORE_BLANK_LINES);
3817         else if (!strcmp(arg, "--compaction-heuristic"))
3818                 DIFF_XDL_SET(options, COMPACTION_HEURISTIC);
3819         else if (!strcmp(arg, "--no-compaction-heuristic"))
3820                 DIFF_XDL_CLR(options, COMPACTION_HEURISTIC);
3821         else if (!strcmp(arg, "--patience"))
3822                 options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
3823         else if (!strcmp(arg, "--histogram"))
3824                 options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
3825         else if ((argcount = parse_long_opt("diff-algorithm", av, &optarg))) {
3826                 long value = parse_algorithm_value(optarg);
3827                 if (value < 0)
3828                         return error("option diff-algorithm accepts \"myers\", "
3829                                      "\"minimal\", \"patience\" and \"histogram\"");
3830                 /* clear out previous settings */
3831                 DIFF_XDL_CLR(options, NEED_MINIMAL);
3832                 options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
3833                 options->xdl_opts |= value;
3834                 return argcount;
3835         }
3836
3837         /* flags options */
3838         else if (!strcmp(arg, "--binary")) {
3839                 enable_patch_output(&options->output_format);
3840                 DIFF_OPT_SET(options, BINARY);
3841         }
3842         else if (!strcmp(arg, "--full-index"))
3843                 DIFF_OPT_SET(options, FULL_INDEX);
3844         else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
3845                 DIFF_OPT_SET(options, TEXT);
3846         else if (!strcmp(arg, "-R"))
3847                 DIFF_OPT_SET(options, REVERSE_DIFF);
3848         else if (!strcmp(arg, "--find-copies-harder"))
3849                 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3850         else if (!strcmp(arg, "--follow"))
3851                 DIFF_OPT_SET(options, FOLLOW_RENAMES);
3852         else if (!strcmp(arg, "--no-follow")) {
3853                 DIFF_OPT_CLR(options, FOLLOW_RENAMES);
3854                 DIFF_OPT_CLR(options, DEFAULT_FOLLOW_RENAMES);
3855         } else if (!strcmp(arg, "--color"))
3856                 options->use_color = 1;
3857         else if (skip_prefix(arg, "--color=", &arg)) {
3858                 int value = git_config_colorbool(NULL, arg);
3859                 if (value < 0)
3860                         return error("option `color' expects \"always\", \"auto\", or \"never\"");
3861                 options->use_color = value;
3862         }
3863         else if (!strcmp(arg, "--no-color"))
3864                 options->use_color = 0;
3865         else if (!strcmp(arg, "--color-words")) {
3866                 options->use_color = 1;
3867                 options->word_diff = DIFF_WORDS_COLOR;
3868         }
3869         else if (skip_prefix(arg, "--color-words=", &arg)) {
3870                 options->use_color = 1;
3871                 options->word_diff = DIFF_WORDS_COLOR;
3872                 options->word_regex = arg;
3873         }
3874         else if (!strcmp(arg, "--word-diff")) {
3875                 if (options->word_diff == DIFF_WORDS_NONE)
3876                         options->word_diff = DIFF_WORDS_PLAIN;
3877         }
3878         else if (skip_prefix(arg, "--word-diff=", &arg)) {
3879                 if (!strcmp(arg, "plain"))
3880                         options->word_diff = DIFF_WORDS_PLAIN;
3881                 else if (!strcmp(arg, "color")) {
3882                         options->use_color = 1;
3883                         options->word_diff = DIFF_WORDS_COLOR;
3884                 }
3885                 else if (!strcmp(arg, "porcelain"))
3886                         options->word_diff = DIFF_WORDS_PORCELAIN;
3887                 else if (!strcmp(arg, "none"))
3888                         options->word_diff = DIFF_WORDS_NONE;
3889                 else
3890                         die("bad --word-diff argument: %s", arg);
3891         }
3892         else if ((argcount = parse_long_opt("word-diff-regex", av, &optarg))) {
3893                 if (options->word_diff == DIFF_WORDS_NONE)
3894                         options->word_diff = DIFF_WORDS_PLAIN;
3895                 options->word_regex = optarg;
3896                 return argcount;
3897         }
3898         else if (!strcmp(arg, "--exit-code"))
3899                 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3900         else if (!strcmp(arg, "--quiet"))
3901                 DIFF_OPT_SET(options, QUICK);
3902         else if (!strcmp(arg, "--ext-diff"))
3903                 DIFF_OPT_SET(options, ALLOW_EXTERNAL);
3904         else if (!strcmp(arg, "--no-ext-diff"))
3905                 DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
3906         else if (!strcmp(arg, "--textconv"))
3907                 DIFF_OPT_SET(options, ALLOW_TEXTCONV);
3908         else if (!strcmp(arg, "--no-textconv"))
3909                 DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
3910         else if (!strcmp(arg, "--ignore-submodules")) {
3911                 DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
3912                 handle_ignore_submodules_arg(options, "all");
3913         } else if (skip_prefix(arg, "--ignore-submodules=", &arg)) {
3914                 DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
3915                 handle_ignore_submodules_arg(options, arg);
3916         } else if (!strcmp(arg, "--submodule"))
3917                 DIFF_OPT_SET(options, SUBMODULE_LOG);
3918         else if (skip_prefix(arg, "--submodule=", &arg))
3919                 return parse_submodule_opt(options, arg);
3920         else if (skip_prefix(arg, "--ws-error-highlight=", &arg))
3921                 return parse_ws_error_highlight(options, arg);
3922
3923         /* misc options */
3924         else if (!strcmp(arg, "-z"))
3925                 options->line_termination = 0;
3926         else if ((argcount = short_opt('l', av, &optarg))) {
3927                 options->rename_limit = strtoul(optarg, NULL, 10);
3928                 return argcount;
3929         }
3930         else if ((argcount = short_opt('S', av, &optarg))) {
3931                 options->pickaxe = optarg;
3932                 options->pickaxe_opts |= DIFF_PICKAXE_KIND_S;
3933                 return argcount;
3934         } else if ((argcount = short_opt('G', av, &optarg))) {
3935                 options->pickaxe = optarg;
3936                 options->pickaxe_opts |= DIFF_PICKAXE_KIND_G;
3937                 return argcount;
3938         }
3939         else if (!strcmp(arg, "--pickaxe-all"))
3940                 options->pickaxe_opts |= DIFF_PICKAXE_ALL;
3941         else if (!strcmp(arg, "--pickaxe-regex"))
3942                 options->pickaxe_opts |= DIFF_PICKAXE_REGEX;
3943         else if ((argcount = short_opt('O', av, &optarg))) {
3944                 const char *path = prefix_filename(prefix, strlen(prefix), optarg);
3945                 options->orderfile = xstrdup(path);
3946                 return argcount;
3947         }
3948         else if ((argcount = parse_long_opt("diff-filter", av, &optarg))) {
3949                 int offending = parse_diff_filter_opt(optarg, options);
3950                 if (offending)
3951                         die("unknown change class '%c' in --diff-filter=%s",
3952                             offending, optarg);
3953                 return argcount;
3954         }
3955         else if (!strcmp(arg, "--abbrev"))
3956                 options->abbrev = DEFAULT_ABBREV;
3957         else if (skip_prefix(arg, "--abbrev=", &arg)) {
3958                 options->abbrev = strtoul(arg, NULL, 10);
3959                 if (options->abbrev < MINIMUM_ABBREV)
3960                         options->abbrev = MINIMUM_ABBREV;
3961                 else if (40 < options->abbrev)
3962                         options->abbrev = 40;
3963         }
3964         else if ((argcount = parse_long_opt("src-prefix", av, &optarg))) {
3965                 options->a_prefix = optarg;
3966                 return argcount;
3967         }
3968         else if ((argcount = parse_long_opt("dst-prefix", av, &optarg))) {
3969                 options->b_prefix = optarg;
3970                 return argcount;
3971         }
3972         else if (!strcmp(arg, "--no-prefix"))
3973                 options->a_prefix = options->b_prefix = "";
3974         else if (opt_arg(arg, '\0', "inter-hunk-context",
3975                          &options->interhunkcontext))
3976                 ;
3977         else if (!strcmp(arg, "-W"))
3978                 DIFF_OPT_SET(options, FUNCCONTEXT);
3979         else if (!strcmp(arg, "--function-context"))
3980                 DIFF_OPT_SET(options, FUNCCONTEXT);
3981         else if (!strcmp(arg, "--no-function-context"))
3982                 DIFF_OPT_CLR(options, FUNCCONTEXT);
3983         else if ((argcount = parse_long_opt("output", av, &optarg))) {
3984                 const char *path = prefix_filename(prefix, strlen(prefix), optarg);
3985                 options->file = fopen(path, "w");
3986                 if (!options->file)
3987                         die_errno("Could not open '%s'", path);
3988                 options->close_file = 1;
3989                 if (options->use_color != GIT_COLOR_ALWAYS)
3990                         options->use_color = GIT_COLOR_NEVER;
3991                 return argcount;
3992         } else
3993                 return 0;
3994         return 1;
3995 }
3996
3997 int parse_rename_score(const char **cp_p)
3998 {
3999         unsigned long num, scale;
4000         int ch, dot;
4001         const char *cp = *cp_p;
4002
4003         num = 0;
4004         scale = 1;
4005         dot = 0;
4006         for (;;) {
4007                 ch = *cp;
4008                 if ( !dot && ch == '.' ) {
4009                         scale = 1;
4010                         dot = 1;
4011                 } else if ( ch == '%' ) {
4012                         scale = dot ? scale*100 : 100;
4013                         cp++;   /* % is always at the end */
4014                         break;
4015                 } else if ( ch >= '0' && ch <= '9' ) {
4016                         if ( scale < 100000 ) {
4017                                 scale *= 10;
4018                                 num = (num*10) + (ch-'0');
4019                         }
4020                 } else {
4021                         break;
4022                 }
4023                 cp++;
4024         }
4025         *cp_p = cp;
4026
4027         /* user says num divided by scale and we say internally that
4028          * is MAX_SCORE * num / scale.
4029          */
4030         return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
4031 }
4032
4033 static int diff_scoreopt_parse(const char *opt)
4034 {
4035         int opt1, opt2, cmd;
4036
4037         if (*opt++ != '-')
4038                 return -1;
4039         cmd = *opt++;
4040         if (cmd == '-') {
4041                 /* convert the long-form arguments into short-form versions */
4042                 if (skip_prefix(opt, "break-rewrites", &opt)) {
4043                         if (*opt == 0 || *opt++ == '=')
4044                                 cmd = 'B';
4045                 } else if (skip_prefix(opt, "find-copies", &opt)) {
4046                         if (*opt == 0 || *opt++ == '=')
4047                                 cmd = 'C';
4048                 } else if (skip_prefix(opt, "find-renames", &opt)) {
4049                         if (*opt == 0 || *opt++ == '=')
4050                                 cmd = 'M';
4051                 }
4052         }
4053         if (cmd != 'M' && cmd != 'C' && cmd != 'B')
4054                 return -1; /* that is not a -M, -C, or -B option */
4055
4056         opt1 = parse_rename_score(&opt);
4057         if (cmd != 'B')
4058                 opt2 = 0;
4059         else {
4060                 if (*opt == 0)
4061                         opt2 = 0;
4062                 else if (*opt != '/')
4063                         return -1; /* we expect -B80/99 or -B80 */
4064                 else {
4065                         opt++;
4066                         opt2 = parse_rename_score(&opt);
4067                 }
4068         }
4069         if (*opt != 0)
4070                 return -1;
4071         return opt1 | (opt2 << 16);
4072 }
4073
4074 struct diff_queue_struct diff_queued_diff;
4075
4076 void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
4077 {
4078         ALLOC_GROW(queue->queue, queue->nr + 1, queue->alloc);
4079         queue->queue[queue->nr++] = dp;
4080 }
4081
4082 struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
4083                                  struct diff_filespec *one,
4084                                  struct diff_filespec *two)
4085 {
4086         struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
4087         dp->one = one;
4088         dp->two = two;
4089         if (queue)
4090                 diff_q(queue, dp);
4091         return dp;
4092 }
4093
4094 void diff_free_filepair(struct diff_filepair *p)
4095 {
4096         free_filespec(p->one);
4097         free_filespec(p->two);
4098         free(p);
4099 }
4100
4101 /* This is different from find_unique_abbrev() in that
4102  * it stuffs the result with dots for alignment.
4103  */
4104 const char *diff_unique_abbrev(const unsigned char *sha1, int len)
4105 {
4106         int abblen;
4107         const char *abbrev;
4108         if (len == 40)
4109                 return sha1_to_hex(sha1);
4110
4111         abbrev = find_unique_abbrev(sha1, len);
4112         abblen = strlen(abbrev);
4113         if (abblen < 37) {
4114                 static char hex[41];
4115                 if (len < abblen && abblen <= len + 2)
4116                         xsnprintf(hex, sizeof(hex), "%s%.*s", abbrev, len+3-abblen, "..");
4117                 else
4118                         xsnprintf(hex, sizeof(hex), "%s...", abbrev);
4119                 return hex;
4120         }
4121         return sha1_to_hex(sha1);
4122 }
4123
4124 static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
4125 {
4126         int line_termination = opt->line_termination;
4127         int inter_name_termination = line_termination ? '\t' : '\0';
4128
4129         fprintf(opt->file, "%s", diff_line_prefix(opt));
4130         if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
4131                 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
4132                         diff_unique_abbrev(p->one->oid.hash, opt->abbrev));
4133                 fprintf(opt->file, "%s ",
4134                         diff_unique_abbrev(p->two->oid.hash, opt->abbrev));
4135         }
4136         if (p->score) {
4137                 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
4138                         inter_name_termination);
4139         } else {
4140                 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
4141         }
4142
4143         if (p->status == DIFF_STATUS_COPIED ||
4144             p->status == DIFF_STATUS_RENAMED) {
4145                 const char *name_a, *name_b;
4146                 name_a = p->one->path;
4147                 name_b = p->two->path;
4148                 strip_prefix(opt->prefix_length, &name_a, &name_b);
4149                 write_name_quoted(name_a, opt->file, inter_name_termination);
4150                 write_name_quoted(name_b, opt->file, line_termination);
4151         } else {
4152                 const char *name_a, *name_b;
4153                 name_a = p->one->mode ? p->one->path : p->two->path;
4154                 name_b = NULL;
4155                 strip_prefix(opt->prefix_length, &name_a, &name_b);
4156                 write_name_quoted(name_a, opt->file, line_termination);
4157         }
4158 }
4159
4160 int diff_unmodified_pair(struct diff_filepair *p)
4161 {
4162         /* This function is written stricter than necessary to support
4163          * the currently implemented transformers, but the idea is to
4164          * let transformers to produce diff_filepairs any way they want,
4165          * and filter and clean them up here before producing the output.
4166          */
4167         struct diff_filespec *one = p->one, *two = p->two;
4168
4169         if (DIFF_PAIR_UNMERGED(p))
4170                 return 0; /* unmerged is interesting */
4171
4172         /* deletion, addition, mode or type change
4173          * and rename are all interesting.
4174          */
4175         if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
4176             DIFF_PAIR_MODE_CHANGED(p) ||
4177             strcmp(one->path, two->path))
4178                 return 0;
4179
4180         /* both are valid and point at the same path.  that is, we are
4181          * dealing with a change.
4182          */
4183         if (one->oid_valid && two->oid_valid &&
4184             !oidcmp(&one->oid, &two->oid) &&
4185             !one->dirty_submodule && !two->dirty_submodule)
4186                 return 1; /* no change */
4187         if (!one->oid_valid && !two->oid_valid)
4188                 return 1; /* both look at the same file on the filesystem. */
4189         return 0;
4190 }
4191
4192 static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
4193 {
4194         if (diff_unmodified_pair(p))
4195                 return;
4196
4197         if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4198             (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4199                 return; /* no tree diffs in patch format */
4200
4201         run_diff(p, o);
4202 }
4203
4204 static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
4205                             struct diffstat_t *diffstat)
4206 {
4207         if (diff_unmodified_pair(p))
4208                 return;
4209
4210         if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4211             (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4212                 return; /* no useful stat for tree diffs */
4213
4214         run_diffstat(p, o, diffstat);
4215 }
4216
4217 static void diff_flush_checkdiff(struct diff_filepair *p,
4218                 struct diff_options *o)
4219 {
4220         if (diff_unmodified_pair(p))
4221                 return;
4222
4223         if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4224             (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4225                 return; /* nothing to check in tree diffs */
4226
4227         run_checkdiff(p, o);
4228 }
4229
4230 int diff_queue_is_empty(void)
4231 {
4232         struct diff_queue_struct *q = &diff_queued_diff;
4233         int i;
4234         for (i = 0; i < q->nr; i++)
4235                 if (!diff_unmodified_pair(q->queue[i]))
4236                         return 0;
4237         return 1;
4238 }
4239
4240 #if DIFF_DEBUG
4241 void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
4242 {
4243         fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
4244                 x, one ? one : "",
4245                 s->path,
4246                 DIFF_FILE_VALID(s) ? "valid" : "invalid",
4247                 s->mode,
4248                 s->oid_valid ? oid_to_hex(&s->oid) : "");
4249         fprintf(stderr, "queue[%d] %s size %lu\n",
4250                 x, one ? one : "",
4251                 s->size);
4252 }
4253
4254 void diff_debug_filepair(const struct diff_filepair *p, int i)
4255 {
4256         diff_debug_filespec(p->one, i, "one");
4257         diff_debug_filespec(p->two, i, "two");
4258         fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
4259                 p->score, p->status ? p->status : '?',
4260                 p->one->rename_used, p->broken_pair);
4261 }
4262
4263 void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
4264 {
4265         int i;
4266         if (msg)
4267                 fprintf(stderr, "%s\n", msg);
4268         fprintf(stderr, "q->nr = %d\n", q->nr);
4269         for (i = 0; i < q->nr; i++) {
4270                 struct diff_filepair *p = q->queue[i];
4271                 diff_debug_filepair(p, i);
4272         }
4273 }
4274 #endif
4275
4276 static void diff_resolve_rename_copy(void)
4277 {
4278         int i;
4279         struct diff_filepair *p;
4280         struct diff_queue_struct *q = &diff_queued_diff;
4281
4282         diff_debug_queue("resolve-rename-copy", q);
4283
4284         for (i = 0; i < q->nr; i++) {
4285                 p = q->queue[i];
4286                 p->status = 0; /* undecided */
4287                 if (DIFF_PAIR_UNMERGED(p))
4288                         p->status = DIFF_STATUS_UNMERGED;
4289                 else if (!DIFF_FILE_VALID(p->one))
4290                         p->status = DIFF_STATUS_ADDED;
4291                 else if (!DIFF_FILE_VALID(p->two))
4292                         p->status = DIFF_STATUS_DELETED;
4293                 else if (DIFF_PAIR_TYPE_CHANGED(p))
4294                         p->status = DIFF_STATUS_TYPE_CHANGED;
4295
4296                 /* from this point on, we are dealing with a pair
4297                  * whose both sides are valid and of the same type, i.e.
4298                  * either in-place edit or rename/copy edit.
4299                  */
4300                 else if (DIFF_PAIR_RENAME(p)) {
4301                         /*
4302                          * A rename might have re-connected a broken
4303                          * pair up, causing the pathnames to be the
4304                          * same again. If so, that's not a rename at
4305                          * all, just a modification..
4306                          *
4307                          * Otherwise, see if this source was used for
4308                          * multiple renames, in which case we decrement
4309                          * the count, and call it a copy.
4310                          */
4311                         if (!strcmp(p->one->path, p->two->path))
4312                                 p->status = DIFF_STATUS_MODIFIED;
4313                         else if (--p->one->rename_used > 0)
4314                                 p->status = DIFF_STATUS_COPIED;
4315                         else
4316                                 p->status = DIFF_STATUS_RENAMED;
4317                 }
4318                 else if (oidcmp(&p->one->oid, &p->two->oid) ||
4319                          p->one->mode != p->two->mode ||
4320                          p->one->dirty_submodule ||
4321                          p->two->dirty_submodule ||
4322                          is_null_oid(&p->one->oid))
4323                         p->status = DIFF_STATUS_MODIFIED;
4324                 else {
4325                         /* This is a "no-change" entry and should not
4326                          * happen anymore, but prepare for broken callers.
4327                          */
4328                         error("feeding unmodified %s to diffcore",
4329                               p->one->path);
4330                         p->status = DIFF_STATUS_UNKNOWN;
4331                 }
4332         }
4333         diff_debug_queue("resolve-rename-copy done", q);
4334 }
4335
4336 static int check_pair_status(struct diff_filepair *p)
4337 {
4338         switch (p->status) {
4339         case DIFF_STATUS_UNKNOWN:
4340                 return 0;
4341         case 0:
4342                 die("internal error in diff-resolve-rename-copy");
4343         default:
4344                 return 1;
4345         }
4346 }
4347
4348 static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
4349 {
4350         int fmt = opt->output_format;
4351
4352         if (fmt & DIFF_FORMAT_CHECKDIFF)
4353                 diff_flush_checkdiff(p, opt);
4354         else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
4355                 diff_flush_raw(p, opt);
4356         else if (fmt & DIFF_FORMAT_NAME) {
4357                 const char *name_a, *name_b;
4358                 name_a = p->two->path;
4359                 name_b = NULL;
4360                 strip_prefix(opt->prefix_length, &name_a, &name_b);
4361                 write_name_quoted(name_a, opt->file, opt->line_termination);
4362         }
4363 }
4364
4365 static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
4366 {
4367         if (fs->mode)
4368                 fprintf(file, " %s mode %06o ", newdelete, fs->mode);
4369         else
4370                 fprintf(file, " %s ", newdelete);
4371         write_name_quoted(fs->path, file, '\n');
4372 }
4373
4374
4375 static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name,
4376                 const char *line_prefix)
4377 {
4378         if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
4379                 fprintf(file, "%s mode change %06o => %06o%c", line_prefix, p->one->mode,
4380                         p->two->mode, show_name ? ' ' : '\n');
4381                 if (show_name) {
4382                         write_name_quoted(p->two->path, file, '\n');
4383                 }
4384         }
4385 }
4386
4387 static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p,
4388                         const char *line_prefix)
4389 {
4390         char *names = pprint_rename(p->one->path, p->two->path);
4391
4392         fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
4393         free(names);
4394         show_mode_change(file, p, 0, line_prefix);
4395 }
4396
4397 static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
4398 {
4399         FILE *file = opt->file;
4400         const char *line_prefix = diff_line_prefix(opt);
4401
4402         switch(p->status) {
4403         case DIFF_STATUS_DELETED:
4404                 fputs(line_prefix, file);
4405                 show_file_mode_name(file, "delete", p->one);
4406                 break;
4407         case DIFF_STATUS_ADDED:
4408                 fputs(line_prefix, file);
4409                 show_file_mode_name(file, "create", p->two);
4410                 break;
4411         case DIFF_STATUS_COPIED:
4412                 fputs(line_prefix, file);
4413                 show_rename_copy(file, "copy", p, line_prefix);
4414                 break;
4415         case DIFF_STATUS_RENAMED:
4416                 fputs(line_prefix, file);
4417                 show_rename_copy(file, "rename", p, line_prefix);
4418                 break;
4419         default:
4420                 if (p->score) {
4421                         fprintf(file, "%s rewrite ", line_prefix);
4422                         write_name_quoted(p->two->path, file, ' ');
4423                         fprintf(file, "(%d%%)\n", similarity_index(p));
4424                 }
4425                 show_mode_change(file, p, !p->score, line_prefix);
4426                 break;
4427         }
4428 }
4429
4430 struct patch_id_t {
4431         git_SHA_CTX *ctx;
4432         int patchlen;
4433 };
4434
4435 static int remove_space(char *line, int len)
4436 {
4437         int i;
4438         char *dst = line;
4439         unsigned char c;
4440
4441         for (i = 0; i < len; i++)
4442                 if (!isspace((c = line[i])))
4443                         *dst++ = c;
4444
4445         return dst - line;
4446 }
4447
4448 static void patch_id_consume(void *priv, char *line, unsigned long len)
4449 {
4450         struct patch_id_t *data = priv;
4451         int new_len;
4452
4453         /* Ignore line numbers when computing the SHA1 of the patch */
4454         if (starts_with(line, "@@ -"))
4455                 return;
4456
4457         new_len = remove_space(line, len);
4458
4459         git_SHA1_Update(data->ctx, line, new_len);
4460         data->patchlen += new_len;
4461 }
4462
4463 /* returns 0 upon success, and writes result into sha1 */
4464 static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1, int diff_header_only)
4465 {
4466         struct diff_queue_struct *q = &diff_queued_diff;
4467         int i;
4468         git_SHA_CTX ctx;
4469         struct patch_id_t data;
4470         char buffer[PATH_MAX * 4 + 20];
4471
4472         git_SHA1_Init(&ctx);
4473         memset(&data, 0, sizeof(struct patch_id_t));
4474         data.ctx = &ctx;
4475
4476         for (i = 0; i < q->nr; i++) {
4477                 xpparam_t xpp;
4478                 xdemitconf_t xecfg;
4479                 mmfile_t mf1, mf2;
4480                 struct diff_filepair *p = q->queue[i];
4481                 int len1, len2;
4482
4483                 memset(&xpp, 0, sizeof(xpp));
4484                 memset(&xecfg, 0, sizeof(xecfg));
4485                 if (p->status == 0)
4486                         return error("internal diff status error");
4487                 if (p->status == DIFF_STATUS_UNKNOWN)
4488                         continue;
4489                 if (diff_unmodified_pair(p))
4490                         continue;
4491                 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
4492                     (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
4493                         continue;
4494                 if (DIFF_PAIR_UNMERGED(p))
4495                         continue;
4496
4497                 diff_fill_sha1_info(p->one);
4498                 diff_fill_sha1_info(p->two);
4499
4500                 len1 = remove_space(p->one->path, strlen(p->one->path));
4501                 len2 = remove_space(p->two->path, strlen(p->two->path));
4502                 if (p->one->mode == 0)
4503                         len1 = snprintf(buffer, sizeof(buffer),
4504                                         "diff--gita/%.*sb/%.*s"
4505                                         "newfilemode%06o"
4506                                         "---/dev/null"
4507                                         "+++b/%.*s",
4508                                         len1, p->one->path,
4509                                         len2, p->two->path,
4510                                         p->two->mode,
4511                                         len2, p->two->path);
4512                 else if (p->two->mode == 0)
4513                         len1 = snprintf(buffer, sizeof(buffer),
4514                                         "diff--gita/%.*sb/%.*s"
4515                                         "deletedfilemode%06o"
4516                                         "---a/%.*s"
4517                                         "+++/dev/null",
4518                                         len1, p->one->path,
4519                                         len2, p->two->path,
4520                                         p->one->mode,
4521                                         len1, p->one->path);
4522                 else
4523                         len1 = snprintf(buffer, sizeof(buffer),
4524                                         "diff--gita/%.*sb/%.*s"
4525                                         "---a/%.*s"
4526                                         "+++b/%.*s",
4527                                         len1, p->one->path,
4528                                         len2, p->two->path,
4529                                         len1, p->one->path,
4530                                         len2, p->two->path);
4531                 git_SHA1_Update(&ctx, buffer, len1);
4532
4533                 if (diff_header_only)
4534                         continue;
4535
4536                 if (fill_mmfile(&mf1, p->one) < 0 ||
4537                     fill_mmfile(&mf2, p->two) < 0)
4538                         return error("unable to read files to diff");
4539
4540                 if (diff_filespec_is_binary(p->one) ||
4541                     diff_filespec_is_binary(p->two)) {
4542                         git_SHA1_Update(&ctx, oid_to_hex(&p->one->oid),
4543                                         40);
4544                         git_SHA1_Update(&ctx, oid_to_hex(&p->two->oid),
4545                                         40);
4546                         continue;
4547                 }
4548
4549                 xpp.flags = 0;
4550                 xecfg.ctxlen = 3;
4551                 xecfg.flags = 0;
4552                 if (xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
4553                                   &xpp, &xecfg))
4554                         return error("unable to generate patch-id diff for %s",
4555                                      p->one->path);
4556         }
4557
4558         git_SHA1_Final(sha1, &ctx);
4559         return 0;
4560 }
4561
4562 int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1, int diff_header_only)
4563 {
4564         struct diff_queue_struct *q = &diff_queued_diff;
4565         int i;
4566         int result = diff_get_patch_id(options, sha1, diff_header_only);
4567
4568         for (i = 0; i < q->nr; i++)
4569                 diff_free_filepair(q->queue[i]);
4570
4571         free(q->queue);
4572         DIFF_QUEUE_CLEAR(q);
4573
4574         return result;
4575 }
4576
4577 static int is_summary_empty(const struct diff_queue_struct *q)
4578 {
4579         int i;
4580
4581         for (i = 0; i < q->nr; i++) {
4582                 const struct diff_filepair *p = q->queue[i];
4583
4584                 switch (p->status) {
4585                 case DIFF_STATUS_DELETED:
4586                 case DIFF_STATUS_ADDED:
4587                 case DIFF_STATUS_COPIED:
4588                 case DIFF_STATUS_RENAMED:
4589                         return 0;
4590                 default:
4591                         if (p->score)
4592                                 return 0;
4593                         if (p->one->mode && p->two->mode &&
4594                             p->one->mode != p->two->mode)
4595                                 return 0;
4596                         break;
4597                 }
4598         }
4599         return 1;
4600 }
4601
4602 static const char rename_limit_warning[] =
4603 "inexact rename detection was skipped due to too many files.";
4604
4605 static const char degrade_cc_to_c_warning[] =
4606 "only found copies from modified paths due to too many files.";
4607
4608 static const char rename_limit_advice[] =
4609 "you may want to set your %s variable to at least "
4610 "%d and retry the command.";
4611
4612 void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
4613 {
4614         if (degraded_cc)
4615                 warning(degrade_cc_to_c_warning);
4616         else if (needed)
4617                 warning(rename_limit_warning);
4618         else
4619                 return;
4620         if (0 < needed && needed < 32767)
4621                 warning(rename_limit_advice, varname, needed);
4622 }
4623
4624 void diff_flush(struct diff_options *options)
4625 {
4626         struct diff_queue_struct *q = &diff_queued_diff;
4627         int i, output_format = options->output_format;
4628         int separator = 0;
4629         int dirstat_by_line = 0;
4630
4631         /*
4632          * Order: raw, stat, summary, patch
4633          * or:    name/name-status/checkdiff (other bits clear)
4634          */
4635         if (!q->nr)
4636                 goto free_queue;
4637
4638         if (output_format & (DIFF_FORMAT_RAW |
4639                              DIFF_FORMAT_NAME |
4640                              DIFF_FORMAT_NAME_STATUS |
4641                              DIFF_FORMAT_CHECKDIFF)) {
4642                 for (i = 0; i < q->nr; i++) {
4643                         struct diff_filepair *p = q->queue[i];
4644                         if (check_pair_status(p))
4645                                 flush_one_pair(p, options);
4646                 }
4647                 separator++;
4648         }
4649
4650         if (output_format & DIFF_FORMAT_DIRSTAT && DIFF_OPT_TST(options, DIRSTAT_BY_LINE))
4651                 dirstat_by_line = 1;
4652
4653         if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT) ||
4654             dirstat_by_line) {
4655                 struct diffstat_t diffstat;
4656
4657                 memset(&diffstat, 0, sizeof(struct diffstat_t));
4658                 for (i = 0; i < q->nr; i++) {
4659                         struct diff_filepair *p = q->queue[i];
4660                         if (check_pair_status(p))
4661                                 diff_flush_stat(p, options, &diffstat);
4662                 }
4663                 if (output_format & DIFF_FORMAT_NUMSTAT)
4664                         show_numstat(&diffstat, options);
4665                 if (output_format & DIFF_FORMAT_DIFFSTAT)
4666                         show_stats(&diffstat, options);
4667                 if (output_format & DIFF_FORMAT_SHORTSTAT)
4668                         show_shortstats(&diffstat, options);
4669                 if (output_format & DIFF_FORMAT_DIRSTAT && dirstat_by_line)
4670                         show_dirstat_by_line(&diffstat, options);
4671                 free_diffstat_info(&diffstat);
4672                 separator++;
4673         }
4674         if ((output_format & DIFF_FORMAT_DIRSTAT) && !dirstat_by_line)
4675                 show_dirstat(options);
4676
4677         if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
4678                 for (i = 0; i < q->nr; i++) {
4679                         diff_summary(options, q->queue[i]);
4680                 }
4681                 separator++;
4682         }
4683
4684         if (output_format & DIFF_FORMAT_NO_OUTPUT &&
4685             DIFF_OPT_TST(options, EXIT_WITH_STATUS) &&
4686             DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
4687                 /*
4688                  * run diff_flush_patch for the exit status. setting
4689                  * options->file to /dev/null should be safe, because we
4690                  * aren't supposed to produce any output anyway.
4691                  */
4692                 if (options->close_file)
4693                         fclose(options->file);
4694                 options->file = fopen("/dev/null", "w");
4695                 if (!options->file)
4696                         die_errno("Could not open /dev/null");
4697                 options->close_file = 1;
4698                 for (i = 0; i < q->nr; i++) {
4699                         struct diff_filepair *p = q->queue[i];
4700                         if (check_pair_status(p))
4701                                 diff_flush_patch(p, options);
4702                         if (options->found_changes)
4703                                 break;
4704                 }
4705         }
4706
4707         if (output_format & DIFF_FORMAT_PATCH) {
4708                 if (separator) {
4709                         fprintf(options->file, "%s%c",
4710                                 diff_line_prefix(options),
4711                                 options->line_termination);
4712                         if (options->stat_sep) {
4713                                 /* attach patch instead of inline */
4714                                 fputs(options->stat_sep, options->file);
4715                         }
4716                 }
4717
4718                 for (i = 0; i < q->nr; i++) {
4719                         struct diff_filepair *p = q->queue[i];
4720                         if (check_pair_status(p))
4721                                 diff_flush_patch(p, options);
4722                 }
4723         }
4724
4725         if (output_format & DIFF_FORMAT_CALLBACK)
4726                 options->format_callback(q, options, options->format_callback_data);
4727
4728         for (i = 0; i < q->nr; i++)
4729                 diff_free_filepair(q->queue[i]);
4730 free_queue:
4731         free(q->queue);
4732         DIFF_QUEUE_CLEAR(q);
4733         if (options->close_file)
4734                 fclose(options->file);
4735
4736         /*
4737          * Report the content-level differences with HAS_CHANGES;
4738          * diff_addremove/diff_change does not set the bit when
4739          * DIFF_FROM_CONTENTS is in effect (e.g. with -w).
4740          */
4741         if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
4742                 if (options->found_changes)
4743                         DIFF_OPT_SET(options, HAS_CHANGES);
4744                 else
4745                         DIFF_OPT_CLR(options, HAS_CHANGES);
4746         }
4747 }
4748
4749 static int match_filter(const struct diff_options *options, const struct diff_filepair *p)
4750 {
4751         return (((p->status == DIFF_STATUS_MODIFIED) &&
4752                  ((p->score &&
4753                    filter_bit_tst(DIFF_STATUS_FILTER_BROKEN, options)) ||
4754                   (!p->score &&
4755                    filter_bit_tst(DIFF_STATUS_MODIFIED, options)))) ||
4756                 ((p->status != DIFF_STATUS_MODIFIED) &&
4757                  filter_bit_tst(p->status, options)));
4758 }
4759
4760 static void diffcore_apply_filter(struct diff_options *options)
4761 {
4762         int i;
4763         struct diff_queue_struct *q = &diff_queued_diff;
4764         struct diff_queue_struct outq;
4765
4766         DIFF_QUEUE_CLEAR(&outq);
4767
4768         if (!options->filter)
4769                 return;
4770
4771         if (filter_bit_tst(DIFF_STATUS_FILTER_AON, options)) {
4772                 int found;
4773                 for (i = found = 0; !found && i < q->nr; i++) {
4774                         if (match_filter(options, q->queue[i]))
4775                                 found++;
4776                 }
4777                 if (found)
4778                         return;
4779
4780                 /* otherwise we will clear the whole queue
4781                  * by copying the empty outq at the end of this
4782                  * function, but first clear the current entries
4783                  * in the queue.
4784                  */
4785                 for (i = 0; i < q->nr; i++)
4786                         diff_free_filepair(q->queue[i]);
4787         }
4788         else {
4789                 /* Only the matching ones */
4790                 for (i = 0; i < q->nr; i++) {
4791                         struct diff_filepair *p = q->queue[i];
4792                         if (match_filter(options, p))
4793                                 diff_q(&outq, p);
4794                         else
4795                                 diff_free_filepair(p);
4796                 }
4797         }
4798         free(q->queue);
4799         *q = outq;
4800 }
4801
4802 /* Check whether two filespecs with the same mode and size are identical */
4803 static int diff_filespec_is_identical(struct diff_filespec *one,
4804                                       struct diff_filespec *two)
4805 {
4806         if (S_ISGITLINK(one->mode))
4807                 return 0;
4808         if (diff_populate_filespec(one, 0))
4809                 return 0;
4810         if (diff_populate_filespec(two, 0))
4811                 return 0;
4812         return !memcmp(one->data, two->data, one->size);
4813 }
4814
4815 static int diff_filespec_check_stat_unmatch(struct diff_filepair *p)
4816 {
4817         if (p->done_skip_stat_unmatch)
4818                 return p->skip_stat_unmatch_result;
4819
4820         p->done_skip_stat_unmatch = 1;
4821         p->skip_stat_unmatch_result = 0;
4822         /*
4823          * 1. Entries that come from stat info dirtiness
4824          *    always have both sides (iow, not create/delete),
4825          *    one side of the object name is unknown, with
4826          *    the same mode and size.  Keep the ones that
4827          *    do not match these criteria.  They have real
4828          *    differences.
4829          *
4830          * 2. At this point, the file is known to be modified,
4831          *    with the same mode and size, and the object
4832          *    name of one side is unknown.  Need to inspect
4833          *    the identical contents.
4834          */
4835         if (!DIFF_FILE_VALID(p->one) || /* (1) */
4836             !DIFF_FILE_VALID(p->two) ||
4837             (p->one->oid_valid && p->two->oid_valid) ||
4838             (p->one->mode != p->two->mode) ||
4839             diff_populate_filespec(p->one, CHECK_SIZE_ONLY) ||
4840             diff_populate_filespec(p->two, CHECK_SIZE_ONLY) ||
4841             (p->one->size != p->two->size) ||
4842             !diff_filespec_is_identical(p->one, p->two)) /* (2) */
4843                 p->skip_stat_unmatch_result = 1;
4844         return p->skip_stat_unmatch_result;
4845 }
4846
4847 static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
4848 {
4849         int i;
4850         struct diff_queue_struct *q = &diff_queued_diff;
4851         struct diff_queue_struct outq;
4852         DIFF_QUEUE_CLEAR(&outq);
4853
4854         for (i = 0; i < q->nr; i++) {
4855                 struct diff_filepair *p = q->queue[i];
4856
4857                 if (diff_filespec_check_stat_unmatch(p))
4858                         diff_q(&outq, p);
4859                 else {
4860                         /*
4861                          * The caller can subtract 1 from skip_stat_unmatch
4862                          * to determine how many paths were dirty only
4863                          * due to stat info mismatch.
4864                          */
4865                         if (!DIFF_OPT_TST(diffopt, NO_INDEX))
4866                                 diffopt->skip_stat_unmatch++;
4867                         diff_free_filepair(p);
4868                 }
4869         }
4870         free(q->queue);
4871         *q = outq;
4872 }
4873
4874 static int diffnamecmp(const void *a_, const void *b_)
4875 {
4876         const struct diff_filepair *a = *((const struct diff_filepair **)a_);
4877         const struct diff_filepair *b = *((const struct diff_filepair **)b_);
4878         const char *name_a, *name_b;
4879
4880         name_a = a->one ? a->one->path : a->two->path;
4881         name_b = b->one ? b->one->path : b->two->path;
4882         return strcmp(name_a, name_b);
4883 }
4884
4885 void diffcore_fix_diff_index(struct diff_options *options)
4886 {
4887         struct diff_queue_struct *q = &diff_queued_diff;
4888         qsort(q->queue, q->nr, sizeof(q->queue[0]), diffnamecmp);
4889 }
4890
4891 void diffcore_std(struct diff_options *options)
4892 {
4893         /* NOTE please keep the following in sync with diff_tree_combined() */
4894         if (options->skip_stat_unmatch)
4895                 diffcore_skip_stat_unmatch(options);
4896         if (!options->found_follow) {
4897                 /* See try_to_follow_renames() in tree-diff.c */
4898                 if (options->break_opt != -1)
4899                         diffcore_break(options->break_opt);
4900                 if (options->detect_rename)
4901                         diffcore_rename(options);
4902                 if (options->break_opt != -1)
4903                         diffcore_merge_broken();
4904         }
4905         if (options->pickaxe)
4906                 diffcore_pickaxe(options);
4907         if (options->orderfile)
4908                 diffcore_order(options->orderfile);
4909         if (!options->found_follow)
4910                 /* See try_to_follow_renames() in tree-diff.c */
4911                 diff_resolve_rename_copy();
4912         diffcore_apply_filter(options);
4913
4914         if (diff_queued_diff.nr && !DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
4915                 DIFF_OPT_SET(options, HAS_CHANGES);
4916         else
4917                 DIFF_OPT_CLR(options, HAS_CHANGES);
4918
4919         options->found_follow = 0;
4920 }
4921
4922 int diff_result_code(struct diff_options *opt, int status)
4923 {
4924         int result = 0;
4925
4926         diff_warn_rename_limit("diff.renameLimit",
4927                                opt->needed_rename_limit,
4928                                opt->degraded_cc_to_c);
4929         if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
4930             !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
4931                 return status;
4932         if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
4933             DIFF_OPT_TST(opt, HAS_CHANGES))
4934                 result |= 01;
4935         if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
4936             DIFF_OPT_TST(opt, CHECK_FAILED))
4937                 result |= 02;
4938         return result;
4939 }
4940
4941 int diff_can_quit_early(struct diff_options *opt)
4942 {
4943         return (DIFF_OPT_TST(opt, QUICK) &&
4944                 !opt->filter &&
4945                 DIFF_OPT_TST(opt, HAS_CHANGES));
4946 }
4947
4948 /*
4949  * Shall changes to this submodule be ignored?
4950  *
4951  * Submodule changes can be configured to be ignored separately for each path,
4952  * but that configuration can be overridden from the command line.
4953  */
4954 static int is_submodule_ignored(const char *path, struct diff_options *options)
4955 {
4956         int ignored = 0;
4957         unsigned orig_flags = options->flags;
4958         if (!DIFF_OPT_TST(options, OVERRIDE_SUBMODULE_CONFIG))
4959                 set_diffopt_flags_from_submodule_config(options, path);
4960         if (DIFF_OPT_TST(options, IGNORE_SUBMODULES))
4961                 ignored = 1;
4962         options->flags = orig_flags;
4963         return ignored;
4964 }
4965
4966 void diff_addremove(struct diff_options *options,
4967                     int addremove, unsigned mode,
4968                     const unsigned char *sha1,
4969                     int sha1_valid,
4970                     const char *concatpath, unsigned dirty_submodule)
4971 {
4972         struct diff_filespec *one, *two;
4973
4974         if (S_ISGITLINK(mode) && is_submodule_ignored(concatpath, options))
4975                 return;
4976
4977         /* This may look odd, but it is a preparation for
4978          * feeding "there are unchanged files which should
4979          * not produce diffs, but when you are doing copy
4980          * detection you would need them, so here they are"
4981          * entries to the diff-core.  They will be prefixed
4982          * with something like '=' or '*' (I haven't decided
4983          * which but should not make any difference).
4984          * Feeding the same new and old to diff_change()
4985          * also has the same effect.
4986          * Before the final output happens, they are pruned after
4987          * merged into rename/copy pairs as appropriate.
4988          */
4989         if (DIFF_OPT_TST(options, REVERSE_DIFF))
4990                 addremove = (addremove == '+' ? '-' :
4991                              addremove == '-' ? '+' : addremove);
4992
4993         if (options->prefix &&
4994             strncmp(concatpath, options->prefix, options->prefix_length))
4995                 return;
4996
4997         one = alloc_filespec(concatpath);
4998         two = alloc_filespec(concatpath);
4999
5000         if (addremove != '+')
5001                 fill_filespec(one, sha1, sha1_valid, mode);
5002         if (addremove != '-') {
5003                 fill_filespec(two, sha1, sha1_valid, mode);
5004                 two->dirty_submodule = dirty_submodule;
5005         }
5006
5007         diff_queue(&diff_queued_diff, one, two);
5008         if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
5009                 DIFF_OPT_SET(options, HAS_CHANGES);
5010 }
5011
5012 void diff_change(struct diff_options *options,
5013                  unsigned old_mode, unsigned new_mode,
5014                  const unsigned char *old_sha1,
5015                  const unsigned char *new_sha1,
5016                  int old_sha1_valid, int new_sha1_valid,
5017                  const char *concatpath,
5018                  unsigned old_dirty_submodule, unsigned new_dirty_submodule)
5019 {
5020         struct diff_filespec *one, *two;
5021         struct diff_filepair *p;
5022
5023         if (S_ISGITLINK(old_mode) && S_ISGITLINK(new_mode) &&
5024             is_submodule_ignored(concatpath, options))
5025                 return;
5026
5027         if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
5028                 unsigned tmp;
5029                 const unsigned char *tmp_c;
5030                 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
5031                 tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
5032                 tmp = old_sha1_valid; old_sha1_valid = new_sha1_valid;
5033                         new_sha1_valid = tmp;
5034                 tmp = old_dirty_submodule; old_dirty_submodule = new_dirty_submodule;
5035                         new_dirty_submodule = tmp;
5036         }
5037
5038         if (options->prefix &&
5039             strncmp(concatpath, options->prefix, options->prefix_length))
5040                 return;
5041
5042         one = alloc_filespec(concatpath);
5043         two = alloc_filespec(concatpath);
5044         fill_filespec(one, old_sha1, old_sha1_valid, old_mode);
5045         fill_filespec(two, new_sha1, new_sha1_valid, new_mode);
5046         one->dirty_submodule = old_dirty_submodule;
5047         two->dirty_submodule = new_dirty_submodule;
5048         p = diff_queue(&diff_queued_diff, one, two);
5049
5050         if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
5051                 return;
5052
5053         if (DIFF_OPT_TST(options, QUICK) && options->skip_stat_unmatch &&
5054             !diff_filespec_check_stat_unmatch(p))
5055                 return;
5056
5057         DIFF_OPT_SET(options, HAS_CHANGES);
5058 }
5059
5060 struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path)
5061 {
5062         struct diff_filepair *pair;
5063         struct diff_filespec *one, *two;
5064
5065         if (options->prefix &&
5066             strncmp(path, options->prefix, options->prefix_length))
5067                 return NULL;
5068
5069         one = alloc_filespec(path);
5070         two = alloc_filespec(path);
5071         pair = diff_queue(&diff_queued_diff, one, two);
5072         pair->is_unmerged = 1;
5073         return pair;
5074 }
5075
5076 static char *run_textconv(const char *pgm, struct diff_filespec *spec,
5077                 size_t *outsize)
5078 {
5079         struct diff_tempfile *temp;
5080         const char *argv[3];
5081         const char **arg = argv;
5082         struct child_process child = CHILD_PROCESS_INIT;
5083         struct strbuf buf = STRBUF_INIT;
5084         int err = 0;
5085
5086         temp = prepare_temp_file(spec->path, spec);
5087         *arg++ = pgm;
5088         *arg++ = temp->name;
5089         *arg = NULL;
5090
5091         child.use_shell = 1;
5092         child.argv = argv;
5093         child.out = -1;
5094         if (start_command(&child)) {
5095                 remove_tempfile();
5096                 return NULL;
5097         }
5098
5099         if (strbuf_read(&buf, child.out, 0) < 0)
5100                 err = error("error reading from textconv command '%s'", pgm);
5101         close(child.out);
5102
5103         if (finish_command(&child) || err) {
5104                 strbuf_release(&buf);
5105                 remove_tempfile();
5106                 return NULL;
5107         }
5108         remove_tempfile();
5109
5110         return strbuf_detach(&buf, outsize);
5111 }
5112
5113 size_t fill_textconv(struct userdiff_driver *driver,
5114                      struct diff_filespec *df,
5115                      char **outbuf)
5116 {
5117         size_t size;
5118
5119         if (!driver) {
5120                 if (!DIFF_FILE_VALID(df)) {
5121                         *outbuf = "";
5122                         return 0;
5123                 }
5124                 if (diff_populate_filespec(df, 0))
5125                         die("unable to read files to diff");
5126                 *outbuf = df->data;
5127                 return df->size;
5128         }
5129
5130         if (!driver->textconv)
5131                 die("BUG: fill_textconv called with non-textconv driver");
5132
5133         if (driver->textconv_cache && df->oid_valid) {
5134                 *outbuf = notes_cache_get(driver->textconv_cache,
5135                                           df->oid.hash,
5136                                           &size);
5137                 if (*outbuf)
5138                         return size;
5139         }
5140
5141         *outbuf = run_textconv(driver->textconv, df, &size);
5142         if (!*outbuf)
5143                 die("unable to read files to diff");
5144
5145         if (driver->textconv_cache && df->oid_valid) {
5146                 /* ignore errors, as we might be in a readonly repository */
5147                 notes_cache_put(driver->textconv_cache, df->oid.hash, *outbuf,
5148                                 size);
5149                 /*
5150                  * we could save up changes and flush them all at the end,
5151                  * but we would need an extra call after all diffing is done.
5152                  * Since generating a cache entry is the slow path anyway,
5153                  * this extra overhead probably isn't a big deal.
5154                  */
5155                 notes_cache_write(driver->textconv_cache);
5156         }
5157
5158         return size;
5159 }
5160
5161 void setup_diff_pager(struct diff_options *opt)
5162 {
5163         /*
5164          * If the user asked for our exit code, then either they want --quiet
5165          * or --exit-code. We should definitely not bother with a pager in the
5166          * former case, as we will generate no output. Since we still properly
5167          * report our exit code even when a pager is run, we _could_ run a
5168          * pager with --exit-code. But since we have not done so historically,
5169          * and because it is easy to find people oneline advising "git diff
5170          * --exit-code" in hooks and other scripts, we do not do so.
5171          */
5172         if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
5173             check_pager_config("diff") != 0)
5174                 setup_pager();
5175 }