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