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