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