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