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