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