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