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