read-cache.con commit Merge branch 'jk/janitorial-fixes' (7aab05d)
   1/*
   2 * GIT - The information manager from hell
   3 *
   4 * Copyright (C) Linus Torvalds, 2005
   5 */
   6#define NO_THE_INDEX_COMPATIBILITY_MACROS
   7#include "cache.h"
   8#include "cache-tree.h"
   9#include "refs.h"
  10#include "dir.h"
  11#include "tree.h"
  12#include "commit.h"
  13#include "blob.h"
  14#include "resolve-undo.h"
  15#include "strbuf.h"
  16#include "varint.h"
  17
  18static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
  19                                               unsigned int options);
  20
  21/* Mask for the name length in ce_flags in the on-disk index */
  22
  23#define CE_NAMEMASK  (0x0fff)
  24
  25/* Index extensions.
  26 *
  27 * The first letter should be 'A'..'Z' for extensions that are not
  28 * necessary for a correct operation (i.e. optimization data).
  29 * When new extensions are added that _needs_ to be understood in
  30 * order to correctly interpret the index file, pick character that
  31 * is outside the range, to cause the reader to abort.
  32 */
  33
  34#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
  35#define CACHE_EXT_TREE 0x54524545       /* "TREE" */
  36#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
  37
  38struct index_state the_index;
  39
  40static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
  41{
  42        istate->cache[nr] = ce;
  43        add_name_hash(istate, ce);
  44}
  45
  46static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
  47{
  48        struct cache_entry *old = istate->cache[nr];
  49
  50        remove_name_hash(istate, old);
  51        free(old);
  52        set_index_entry(istate, nr, ce);
  53        istate->cache_changed = 1;
  54}
  55
  56void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
  57{
  58        struct cache_entry *old = istate->cache[nr], *new;
  59        int namelen = strlen(new_name);
  60
  61        new = xmalloc(cache_entry_size(namelen));
  62        copy_cache_entry(new, old);
  63        new->ce_flags &= ~CE_HASHED;
  64        new->ce_namelen = namelen;
  65        memcpy(new->name, new_name, namelen + 1);
  66
  67        cache_tree_invalidate_path(istate->cache_tree, old->name);
  68        remove_index_entry_at(istate, nr);
  69        add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
  70}
  71
  72void fill_stat_data(struct stat_data *sd, struct stat *st)
  73{
  74        sd->sd_ctime.sec = (unsigned int)st->st_ctime;
  75        sd->sd_mtime.sec = (unsigned int)st->st_mtime;
  76        sd->sd_ctime.nsec = ST_CTIME_NSEC(*st);
  77        sd->sd_mtime.nsec = ST_MTIME_NSEC(*st);
  78        sd->sd_dev = st->st_dev;
  79        sd->sd_ino = st->st_ino;
  80        sd->sd_uid = st->st_uid;
  81        sd->sd_gid = st->st_gid;
  82        sd->sd_size = st->st_size;
  83}
  84
  85int match_stat_data(const struct stat_data *sd, struct stat *st)
  86{
  87        int changed = 0;
  88
  89        if (sd->sd_mtime.sec != (unsigned int)st->st_mtime)
  90                changed |= MTIME_CHANGED;
  91        if (trust_ctime && check_stat &&
  92            sd->sd_ctime.sec != (unsigned int)st->st_ctime)
  93                changed |= CTIME_CHANGED;
  94
  95#ifdef USE_NSEC
  96        if (check_stat && sd->sd_mtime.nsec != ST_MTIME_NSEC(*st))
  97                changed |= MTIME_CHANGED;
  98        if (trust_ctime && check_stat &&
  99            sd->sd_ctime.nsec != ST_CTIME_NSEC(*st))
 100                changed |= CTIME_CHANGED;
 101#endif
 102
 103        if (check_stat) {
 104                if (sd->sd_uid != (unsigned int) st->st_uid ||
 105                        sd->sd_gid != (unsigned int) st->st_gid)
 106                        changed |= OWNER_CHANGED;
 107                if (sd->sd_ino != (unsigned int) st->st_ino)
 108                        changed |= INODE_CHANGED;
 109        }
 110
 111#ifdef USE_STDEV
 112        /*
 113         * st_dev breaks on network filesystems where different
 114         * clients will have different views of what "device"
 115         * the filesystem is on
 116         */
 117        if (check_stat && sd->sd_dev != (unsigned int) st->st_dev)
 118                        changed |= INODE_CHANGED;
 119#endif
 120
 121        if (sd->sd_size != (unsigned int) st->st_size)
 122                changed |= DATA_CHANGED;
 123
 124        return changed;
 125}
 126
 127/*
 128 * This only updates the "non-critical" parts of the directory
 129 * cache, ie the parts that aren't tracked by GIT, and only used
 130 * to validate the cache.
 131 */
 132void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
 133{
 134        fill_stat_data(&ce->ce_stat_data, st);
 135
 136        if (assume_unchanged)
 137                ce->ce_flags |= CE_VALID;
 138
 139        if (S_ISREG(st->st_mode))
 140                ce_mark_uptodate(ce);
 141}
 142
 143static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
 144{
 145        int match = -1;
 146        int fd = open(ce->name, O_RDONLY);
 147
 148        if (fd >= 0) {
 149                unsigned char sha1[20];
 150                if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
 151                        match = hashcmp(sha1, ce->sha1);
 152                /* index_fd() closed the file descriptor already */
 153        }
 154        return match;
 155}
 156
 157static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
 158{
 159        int match = -1;
 160        void *buffer;
 161        unsigned long size;
 162        enum object_type type;
 163        struct strbuf sb = STRBUF_INIT;
 164
 165        if (strbuf_readlink(&sb, ce->name, expected_size))
 166                return -1;
 167
 168        buffer = read_sha1_file(ce->sha1, &type, &size);
 169        if (buffer) {
 170                if (size == sb.len)
 171                        match = memcmp(buffer, sb.buf, size);
 172                free(buffer);
 173        }
 174        strbuf_release(&sb);
 175        return match;
 176}
 177
 178static int ce_compare_gitlink(const struct cache_entry *ce)
 179{
 180        unsigned char sha1[20];
 181
 182        /*
 183         * We don't actually require that the .git directory
 184         * under GITLINK directory be a valid git directory. It
 185         * might even be missing (in case nobody populated that
 186         * sub-project).
 187         *
 188         * If so, we consider it always to match.
 189         */
 190        if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
 191                return 0;
 192        return hashcmp(sha1, ce->sha1);
 193}
 194
 195static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
 196{
 197        switch (st->st_mode & S_IFMT) {
 198        case S_IFREG:
 199                if (ce_compare_data(ce, st))
 200                        return DATA_CHANGED;
 201                break;
 202        case S_IFLNK:
 203                if (ce_compare_link(ce, xsize_t(st->st_size)))
 204                        return DATA_CHANGED;
 205                break;
 206        case S_IFDIR:
 207                if (S_ISGITLINK(ce->ce_mode))
 208                        return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
 209        default:
 210                return TYPE_CHANGED;
 211        }
 212        return 0;
 213}
 214
 215static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
 216{
 217        unsigned int changed = 0;
 218
 219        if (ce->ce_flags & CE_REMOVE)
 220                return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
 221
 222        switch (ce->ce_mode & S_IFMT) {
 223        case S_IFREG:
 224                changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
 225                /* We consider only the owner x bit to be relevant for
 226                 * "mode changes"
 227                 */
 228                if (trust_executable_bit &&
 229                    (0100 & (ce->ce_mode ^ st->st_mode)))
 230                        changed |= MODE_CHANGED;
 231                break;
 232        case S_IFLNK:
 233                if (!S_ISLNK(st->st_mode) &&
 234                    (has_symlinks || !S_ISREG(st->st_mode)))
 235                        changed |= TYPE_CHANGED;
 236                break;
 237        case S_IFGITLINK:
 238                /* We ignore most of the st_xxx fields for gitlinks */
 239                if (!S_ISDIR(st->st_mode))
 240                        changed |= TYPE_CHANGED;
 241                else if (ce_compare_gitlink(ce))
 242                        changed |= DATA_CHANGED;
 243                return changed;
 244        default:
 245                die("internal error: ce_mode is %o", ce->ce_mode);
 246        }
 247
 248        changed |= match_stat_data(&ce->ce_stat_data, st);
 249
 250        /* Racily smudged entry? */
 251        if (!ce->ce_stat_data.sd_size) {
 252                if (!is_empty_blob_sha1(ce->sha1))
 253                        changed |= DATA_CHANGED;
 254        }
 255
 256        return changed;
 257}
 258
 259static int is_racy_timestamp(const struct index_state *istate,
 260                             const struct cache_entry *ce)
 261{
 262        return (!S_ISGITLINK(ce->ce_mode) &&
 263                istate->timestamp.sec &&
 264#ifdef USE_NSEC
 265                 /* nanosecond timestamped files can also be racy! */
 266                (istate->timestamp.sec < ce->ce_stat_data.sd_mtime.sec ||
 267                 (istate->timestamp.sec == ce->ce_stat_data.sd_mtime.sec &&
 268                  istate->timestamp.nsec <= ce->ce_stat_data.sd_mtime.nsec))
 269#else
 270                istate->timestamp.sec <= ce->ce_stat_data.sd_mtime.sec
 271#endif
 272                 );
 273}
 274
 275int ie_match_stat(const struct index_state *istate,
 276                  const struct cache_entry *ce, struct stat *st,
 277                  unsigned int options)
 278{
 279        unsigned int changed;
 280        int ignore_valid = options & CE_MATCH_IGNORE_VALID;
 281        int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
 282        int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
 283
 284        /*
 285         * If it's marked as always valid in the index, it's
 286         * valid whatever the checked-out copy says.
 287         *
 288         * skip-worktree has the same effect with higher precedence
 289         */
 290        if (!ignore_skip_worktree && ce_skip_worktree(ce))
 291                return 0;
 292        if (!ignore_valid && (ce->ce_flags & CE_VALID))
 293                return 0;
 294
 295        /*
 296         * Intent-to-add entries have not been added, so the index entry
 297         * by definition never matches what is in the work tree until it
 298         * actually gets added.
 299         */
 300        if (ce->ce_flags & CE_INTENT_TO_ADD)
 301                return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
 302
 303        changed = ce_match_stat_basic(ce, st);
 304
 305        /*
 306         * Within 1 second of this sequence:
 307         *      echo xyzzy >file && git-update-index --add file
 308         * running this command:
 309         *      echo frotz >file
 310         * would give a falsely clean cache entry.  The mtime and
 311         * length match the cache, and other stat fields do not change.
 312         *
 313         * We could detect this at update-index time (the cache entry
 314         * being registered/updated records the same time as "now")
 315         * and delay the return from git-update-index, but that would
 316         * effectively mean we can make at most one commit per second,
 317         * which is not acceptable.  Instead, we check cache entries
 318         * whose mtime are the same as the index file timestamp more
 319         * carefully than others.
 320         */
 321        if (!changed && is_racy_timestamp(istate, ce)) {
 322                if (assume_racy_is_modified)
 323                        changed |= DATA_CHANGED;
 324                else
 325                        changed |= ce_modified_check_fs(ce, st);
 326        }
 327
 328        return changed;
 329}
 330
 331int ie_modified(const struct index_state *istate,
 332                const struct cache_entry *ce,
 333                struct stat *st, unsigned int options)
 334{
 335        int changed, changed_fs;
 336
 337        changed = ie_match_stat(istate, ce, st, options);
 338        if (!changed)
 339                return 0;
 340        /*
 341         * If the mode or type has changed, there's no point in trying
 342         * to refresh the entry - it's not going to match
 343         */
 344        if (changed & (MODE_CHANGED | TYPE_CHANGED))
 345                return changed;
 346
 347        /*
 348         * Immediately after read-tree or update-index --cacheinfo,
 349         * the length field is zero, as we have never even read the
 350         * lstat(2) information once, and we cannot trust DATA_CHANGED
 351         * returned by ie_match_stat() which in turn was returned by
 352         * ce_match_stat_basic() to signal that the filesize of the
 353         * blob changed.  We have to actually go to the filesystem to
 354         * see if the contents match, and if so, should answer "unchanged".
 355         *
 356         * The logic does not apply to gitlinks, as ce_match_stat_basic()
 357         * already has checked the actual HEAD from the filesystem in the
 358         * subproject.  If ie_match_stat() already said it is different,
 359         * then we know it is.
 360         */
 361        if ((changed & DATA_CHANGED) &&
 362            (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
 363                return changed;
 364
 365        changed_fs = ce_modified_check_fs(ce, st);
 366        if (changed_fs)
 367                return changed | changed_fs;
 368        return 0;
 369}
 370
 371int base_name_compare(const char *name1, int len1, int mode1,
 372                      const char *name2, int len2, int mode2)
 373{
 374        unsigned char c1, c2;
 375        int len = len1 < len2 ? len1 : len2;
 376        int cmp;
 377
 378        cmp = memcmp(name1, name2, len);
 379        if (cmp)
 380                return cmp;
 381        c1 = name1[len];
 382        c2 = name2[len];
 383        if (!c1 && S_ISDIR(mode1))
 384                c1 = '/';
 385        if (!c2 && S_ISDIR(mode2))
 386                c2 = '/';
 387        return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
 388}
 389
 390/*
 391 * df_name_compare() is identical to base_name_compare(), except it
 392 * compares conflicting directory/file entries as equal. Note that
 393 * while a directory name compares as equal to a regular file, they
 394 * then individually compare _differently_ to a filename that has
 395 * a dot after the basename (because '\0' < '.' < '/').
 396 *
 397 * This is used by routines that want to traverse the git namespace
 398 * but then handle conflicting entries together when possible.
 399 */
 400int df_name_compare(const char *name1, int len1, int mode1,
 401                    const char *name2, int len2, int mode2)
 402{
 403        int len = len1 < len2 ? len1 : len2, cmp;
 404        unsigned char c1, c2;
 405
 406        cmp = memcmp(name1, name2, len);
 407        if (cmp)
 408                return cmp;
 409        /* Directories and files compare equal (same length, same name) */
 410        if (len1 == len2)
 411                return 0;
 412        c1 = name1[len];
 413        if (!c1 && S_ISDIR(mode1))
 414                c1 = '/';
 415        c2 = name2[len];
 416        if (!c2 && S_ISDIR(mode2))
 417                c2 = '/';
 418        if (c1 == '/' && !c2)
 419                return 0;
 420        if (c2 == '/' && !c1)
 421                return 0;
 422        return c1 - c2;
 423}
 424
 425int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2)
 426{
 427        int len = len1 < len2 ? len1 : len2;
 428        int cmp;
 429
 430        cmp = memcmp(name1, name2, len);
 431        if (cmp)
 432                return cmp;
 433        if (len1 < len2)
 434                return -1;
 435        if (len1 > len2)
 436                return 1;
 437
 438        if (stage1 < stage2)
 439                return -1;
 440        if (stage1 > stage2)
 441                return 1;
 442        return 0;
 443}
 444
 445int cache_name_compare(const char *name1, int len1, const char *name2, int len2)
 446{
 447        return cache_name_stage_compare(name1, len1, 0, name2, len2, 0);
 448}
 449
 450static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
 451{
 452        int first, last;
 453
 454        first = 0;
 455        last = istate->cache_nr;
 456        while (last > first) {
 457                int next = (last + first) >> 1;
 458                struct cache_entry *ce = istate->cache[next];
 459                int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
 460                if (!cmp)
 461                        return next;
 462                if (cmp < 0) {
 463                        last = next;
 464                        continue;
 465                }
 466                first = next+1;
 467        }
 468        return -first-1;
 469}
 470
 471int index_name_pos(const struct index_state *istate, const char *name, int namelen)
 472{
 473        return index_name_stage_pos(istate, name, namelen, 0);
 474}
 475
 476/* Remove entry, return true if there are more entries to go.. */
 477int remove_index_entry_at(struct index_state *istate, int pos)
 478{
 479        struct cache_entry *ce = istate->cache[pos];
 480
 481        record_resolve_undo(istate, ce);
 482        remove_name_hash(istate, ce);
 483        free(ce);
 484        istate->cache_changed = 1;
 485        istate->cache_nr--;
 486        if (pos >= istate->cache_nr)
 487                return 0;
 488        memmove(istate->cache + pos,
 489                istate->cache + pos + 1,
 490                (istate->cache_nr - pos) * sizeof(struct cache_entry *));
 491        return 1;
 492}
 493
 494/*
 495 * Remove all cache entries marked for removal, that is where
 496 * CE_REMOVE is set in ce_flags.  This is much more effective than
 497 * calling remove_index_entry_at() for each entry to be removed.
 498 */
 499void remove_marked_cache_entries(struct index_state *istate)
 500{
 501        struct cache_entry **ce_array = istate->cache;
 502        unsigned int i, j;
 503
 504        for (i = j = 0; i < istate->cache_nr; i++) {
 505                if (ce_array[i]->ce_flags & CE_REMOVE) {
 506                        remove_name_hash(istate, ce_array[i]);
 507                        free(ce_array[i]);
 508                }
 509                else
 510                        ce_array[j++] = ce_array[i];
 511        }
 512        istate->cache_changed = 1;
 513        istate->cache_nr = j;
 514}
 515
 516int remove_file_from_index(struct index_state *istate, const char *path)
 517{
 518        int pos = index_name_pos(istate, path, strlen(path));
 519        if (pos < 0)
 520                pos = -pos-1;
 521        cache_tree_invalidate_path(istate->cache_tree, path);
 522        while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
 523                remove_index_entry_at(istate, pos);
 524        return 0;
 525}
 526
 527static int compare_name(struct cache_entry *ce, const char *path, int namelen)
 528{
 529        return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
 530}
 531
 532static int index_name_pos_also_unmerged(struct index_state *istate,
 533        const char *path, int namelen)
 534{
 535        int pos = index_name_pos(istate, path, namelen);
 536        struct cache_entry *ce;
 537
 538        if (pos >= 0)
 539                return pos;
 540
 541        /* maybe unmerged? */
 542        pos = -1 - pos;
 543        if (pos >= istate->cache_nr ||
 544                        compare_name((ce = istate->cache[pos]), path, namelen))
 545                return -1;
 546
 547        /* order of preference: stage 2, 1, 3 */
 548        if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
 549                        ce_stage((ce = istate->cache[pos + 1])) == 2 &&
 550                        !compare_name(ce, path, namelen))
 551                pos++;
 552        return pos;
 553}
 554
 555static int different_name(struct cache_entry *ce, struct cache_entry *alias)
 556{
 557        int len = ce_namelen(ce);
 558        return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
 559}
 560
 561/*
 562 * If we add a filename that aliases in the cache, we will use the
 563 * name that we already have - but we don't want to update the same
 564 * alias twice, because that implies that there were actually two
 565 * different files with aliasing names!
 566 *
 567 * So we use the CE_ADDED flag to verify that the alias was an old
 568 * one before we accept it as
 569 */
 570static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_entry *alias)
 571{
 572        int len;
 573        struct cache_entry *new;
 574
 575        if (alias->ce_flags & CE_ADDED)
 576                die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
 577
 578        /* Ok, create the new entry using the name of the existing alias */
 579        len = ce_namelen(alias);
 580        new = xcalloc(1, cache_entry_size(len));
 581        memcpy(new->name, alias->name, len);
 582        copy_cache_entry(new, ce);
 583        free(ce);
 584        return new;
 585}
 586
 587void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
 588{
 589        unsigned char sha1[20];
 590        if (write_sha1_file("", 0, blob_type, sha1))
 591                die("cannot create an empty blob in the object database");
 592        hashcpy(ce->sha1, sha1);
 593}
 594
 595int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
 596{
 597        int size, namelen, was_same;
 598        mode_t st_mode = st->st_mode;
 599        struct cache_entry *ce, *alias;
 600        unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
 601        int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
 602        int pretend = flags & ADD_CACHE_PRETEND;
 603        int intent_only = flags & ADD_CACHE_INTENT;
 604        int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
 605                          (intent_only ? ADD_CACHE_NEW_ONLY : 0));
 606
 607        if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
 608                return error("%s: can only add regular files, symbolic links or git-directories", path);
 609
 610        namelen = strlen(path);
 611        if (S_ISDIR(st_mode)) {
 612                while (namelen && path[namelen-1] == '/')
 613                        namelen--;
 614        }
 615        size = cache_entry_size(namelen);
 616        ce = xcalloc(1, size);
 617        memcpy(ce->name, path, namelen);
 618        ce->ce_namelen = namelen;
 619        if (!intent_only)
 620                fill_stat_cache_info(ce, st);
 621        else
 622                ce->ce_flags |= CE_INTENT_TO_ADD;
 623
 624        if (trust_executable_bit && has_symlinks)
 625                ce->ce_mode = create_ce_mode(st_mode);
 626        else {
 627                /* If there is an existing entry, pick the mode bits and type
 628                 * from it, otherwise assume unexecutable regular file.
 629                 */
 630                struct cache_entry *ent;
 631                int pos = index_name_pos_also_unmerged(istate, path, namelen);
 632
 633                ent = (0 <= pos) ? istate->cache[pos] : NULL;
 634                ce->ce_mode = ce_mode_from_stat(ent, st_mode);
 635        }
 636
 637        /* When core.ignorecase=true, determine if a directory of the same name but differing
 638         * case already exists within the Git repository.  If it does, ensure the directory
 639         * case of the file being added to the repository matches (is folded into) the existing
 640         * entry's directory case.
 641         */
 642        if (ignore_case) {
 643                const char *startPtr = ce->name;
 644                const char *ptr = startPtr;
 645                while (*ptr) {
 646                        while (*ptr && *ptr != '/')
 647                                ++ptr;
 648                        if (*ptr == '/') {
 649                                struct cache_entry *foundce;
 650                                ++ptr;
 651                                foundce = index_dir_exists(istate, ce->name, ptr - ce->name - 1);
 652                                if (foundce) {
 653                                        memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
 654                                        startPtr = ptr;
 655                                }
 656                        }
 657                }
 658        }
 659
 660        alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
 661        if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
 662                /* Nothing changed, really */
 663                free(ce);
 664                if (!S_ISGITLINK(alias->ce_mode))
 665                        ce_mark_uptodate(alias);
 666                alias->ce_flags |= CE_ADDED;
 667                return 0;
 668        }
 669        if (!intent_only) {
 670                if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT))
 671                        return error("unable to index file %s", path);
 672        } else
 673                set_object_name_for_intent_to_add_entry(ce);
 674
 675        if (ignore_case && alias && different_name(ce, alias))
 676                ce = create_alias_ce(ce, alias);
 677        ce->ce_flags |= CE_ADDED;
 678
 679        /* It was suspected to be racily clean, but it turns out to be Ok */
 680        was_same = (alias &&
 681                    !ce_stage(alias) &&
 682                    !hashcmp(alias->sha1, ce->sha1) &&
 683                    ce->ce_mode == alias->ce_mode);
 684
 685        if (pretend)
 686                ;
 687        else if (add_index_entry(istate, ce, add_option))
 688                return error("unable to add %s to index",path);
 689        if (verbose && !was_same)
 690                printf("add '%s'\n", path);
 691        return 0;
 692}
 693
 694int add_file_to_index(struct index_state *istate, const char *path, int flags)
 695{
 696        struct stat st;
 697        if (lstat(path, &st))
 698                die_errno("unable to stat '%s'", path);
 699        return add_to_index(istate, path, &st, flags);
 700}
 701
 702struct cache_entry *make_cache_entry(unsigned int mode,
 703                const unsigned char *sha1, const char *path, int stage,
 704                unsigned int refresh_options)
 705{
 706        int size, len;
 707        struct cache_entry *ce;
 708
 709        if (!verify_path(path)) {
 710                error("Invalid path '%s'", path);
 711                return NULL;
 712        }
 713
 714        len = strlen(path);
 715        size = cache_entry_size(len);
 716        ce = xcalloc(1, size);
 717
 718        hashcpy(ce->sha1, sha1);
 719        memcpy(ce->name, path, len);
 720        ce->ce_flags = create_ce_flags(stage);
 721        ce->ce_namelen = len;
 722        ce->ce_mode = create_ce_mode(mode);
 723
 724        return refresh_cache_entry(ce, refresh_options);
 725}
 726
 727int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
 728{
 729        int len = ce_namelen(a);
 730        return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
 731}
 732
 733/*
 734 * We fundamentally don't like some paths: we don't want
 735 * dot or dot-dot anywhere, and for obvious reasons don't
 736 * want to recurse into ".git" either.
 737 *
 738 * Also, we don't want double slashes or slashes at the
 739 * end that can make pathnames ambiguous.
 740 */
 741static int verify_dotfile(const char *rest)
 742{
 743        /*
 744         * The first character was '.', but that
 745         * has already been discarded, we now test
 746         * the rest.
 747         */
 748
 749        /* "." is not allowed */
 750        if (*rest == '\0' || is_dir_sep(*rest))
 751                return 0;
 752
 753        switch (*rest) {
 754        /*
 755         * ".git" followed by  NUL or slash is bad. This
 756         * shares the path end test with the ".." case.
 757         */
 758        case 'g':
 759                if (rest[1] != 'i')
 760                        break;
 761                if (rest[2] != 't')
 762                        break;
 763                rest += 2;
 764        /* fallthrough */
 765        case '.':
 766                if (rest[1] == '\0' || is_dir_sep(rest[1]))
 767                        return 0;
 768        }
 769        return 1;
 770}
 771
 772int verify_path(const char *path)
 773{
 774        char c;
 775
 776        if (has_dos_drive_prefix(path))
 777                return 0;
 778
 779        goto inside;
 780        for (;;) {
 781                if (!c)
 782                        return 1;
 783                if (is_dir_sep(c)) {
 784inside:
 785                        c = *path++;
 786                        if ((c == '.' && !verify_dotfile(path)) ||
 787                            is_dir_sep(c) || c == '\0')
 788                                return 0;
 789                }
 790                c = *path++;
 791        }
 792}
 793
 794/*
 795 * Do we have another file that has the beginning components being a
 796 * proper superset of the name we're trying to add?
 797 */
 798static int has_file_name(struct index_state *istate,
 799                         const struct cache_entry *ce, int pos, int ok_to_replace)
 800{
 801        int retval = 0;
 802        int len = ce_namelen(ce);
 803        int stage = ce_stage(ce);
 804        const char *name = ce->name;
 805
 806        while (pos < istate->cache_nr) {
 807                struct cache_entry *p = istate->cache[pos++];
 808
 809                if (len >= ce_namelen(p))
 810                        break;
 811                if (memcmp(name, p->name, len))
 812                        break;
 813                if (ce_stage(p) != stage)
 814                        continue;
 815                if (p->name[len] != '/')
 816                        continue;
 817                if (p->ce_flags & CE_REMOVE)
 818                        continue;
 819                retval = -1;
 820                if (!ok_to_replace)
 821                        break;
 822                remove_index_entry_at(istate, --pos);
 823        }
 824        return retval;
 825}
 826
 827/*
 828 * Do we have another file with a pathname that is a proper
 829 * subset of the name we're trying to add?
 830 */
 831static int has_dir_name(struct index_state *istate,
 832                        const struct cache_entry *ce, int pos, int ok_to_replace)
 833{
 834        int retval = 0;
 835        int stage = ce_stage(ce);
 836        const char *name = ce->name;
 837        const char *slash = name + ce_namelen(ce);
 838
 839        for (;;) {
 840                int len;
 841
 842                for (;;) {
 843                        if (*--slash == '/')
 844                                break;
 845                        if (slash <= ce->name)
 846                                return retval;
 847                }
 848                len = slash - name;
 849
 850                pos = index_name_stage_pos(istate, name, len, stage);
 851                if (pos >= 0) {
 852                        /*
 853                         * Found one, but not so fast.  This could
 854                         * be a marker that says "I was here, but
 855                         * I am being removed".  Such an entry is
 856                         * not a part of the resulting tree, and
 857                         * it is Ok to have a directory at the same
 858                         * path.
 859                         */
 860                        if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
 861                                retval = -1;
 862                                if (!ok_to_replace)
 863                                        break;
 864                                remove_index_entry_at(istate, pos);
 865                                continue;
 866                        }
 867                }
 868                else
 869                        pos = -pos-1;
 870
 871                /*
 872                 * Trivial optimization: if we find an entry that
 873                 * already matches the sub-directory, then we know
 874                 * we're ok, and we can exit.
 875                 */
 876                while (pos < istate->cache_nr) {
 877                        struct cache_entry *p = istate->cache[pos];
 878                        if ((ce_namelen(p) <= len) ||
 879                            (p->name[len] != '/') ||
 880                            memcmp(p->name, name, len))
 881                                break; /* not our subdirectory */
 882                        if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
 883                                /*
 884                                 * p is at the same stage as our entry, and
 885                                 * is a subdirectory of what we are looking
 886                                 * at, so we cannot have conflicts at our
 887                                 * level or anything shorter.
 888                                 */
 889                                return retval;
 890                        pos++;
 891                }
 892        }
 893        return retval;
 894}
 895
 896/* We may be in a situation where we already have path/file and path
 897 * is being added, or we already have path and path/file is being
 898 * added.  Either one would result in a nonsense tree that has path
 899 * twice when git-write-tree tries to write it out.  Prevent it.
 900 *
 901 * If ok-to-replace is specified, we remove the conflicting entries
 902 * from the cache so the caller should recompute the insert position.
 903 * When this happens, we return non-zero.
 904 */
 905static int check_file_directory_conflict(struct index_state *istate,
 906                                         const struct cache_entry *ce,
 907                                         int pos, int ok_to_replace)
 908{
 909        int retval;
 910
 911        /*
 912         * When ce is an "I am going away" entry, we allow it to be added
 913         */
 914        if (ce->ce_flags & CE_REMOVE)
 915                return 0;
 916
 917        /*
 918         * We check if the path is a sub-path of a subsequent pathname
 919         * first, since removing those will not change the position
 920         * in the array.
 921         */
 922        retval = has_file_name(istate, ce, pos, ok_to_replace);
 923
 924        /*
 925         * Then check if the path might have a clashing sub-directory
 926         * before it.
 927         */
 928        return retval + has_dir_name(istate, ce, pos, ok_to_replace);
 929}
 930
 931static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
 932{
 933        int pos;
 934        int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
 935        int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
 936        int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
 937        int new_only = option & ADD_CACHE_NEW_ONLY;
 938
 939        cache_tree_invalidate_path(istate->cache_tree, ce->name);
 940        pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
 941
 942        /* existing match? Just replace it. */
 943        if (pos >= 0) {
 944                if (!new_only)
 945                        replace_index_entry(istate, pos, ce);
 946                return 0;
 947        }
 948        pos = -pos-1;
 949
 950        /*
 951         * Inserting a merged entry ("stage 0") into the index
 952         * will always replace all non-merged entries..
 953         */
 954        if (pos < istate->cache_nr && ce_stage(ce) == 0) {
 955                while (ce_same_name(istate->cache[pos], ce)) {
 956                        ok_to_add = 1;
 957                        if (!remove_index_entry_at(istate, pos))
 958                                break;
 959                }
 960        }
 961
 962        if (!ok_to_add)
 963                return -1;
 964        if (!verify_path(ce->name))
 965                return error("Invalid path '%s'", ce->name);
 966
 967        if (!skip_df_check &&
 968            check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
 969                if (!ok_to_replace)
 970                        return error("'%s' appears as both a file and as a directory",
 971                                     ce->name);
 972                pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
 973                pos = -pos-1;
 974        }
 975        return pos + 1;
 976}
 977
 978int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
 979{
 980        int pos;
 981
 982        if (option & ADD_CACHE_JUST_APPEND)
 983                pos = istate->cache_nr;
 984        else {
 985                int ret;
 986                ret = add_index_entry_with_check(istate, ce, option);
 987                if (ret <= 0)
 988                        return ret;
 989                pos = ret - 1;
 990        }
 991
 992        /* Make sure the array is big enough .. */
 993        if (istate->cache_nr == istate->cache_alloc) {
 994                istate->cache_alloc = alloc_nr(istate->cache_alloc);
 995                istate->cache = xrealloc(istate->cache,
 996                                        istate->cache_alloc * sizeof(*istate->cache));
 997        }
 998
 999        /* Add it in.. */
1000        istate->cache_nr++;
1001        if (istate->cache_nr > pos + 1)
1002                memmove(istate->cache + pos + 1,
1003                        istate->cache + pos,
1004                        (istate->cache_nr - pos - 1) * sizeof(ce));
1005        set_index_entry(istate, pos, ce);
1006        istate->cache_changed = 1;
1007        return 0;
1008}
1009
1010/*
1011 * "refresh" does not calculate a new sha1 file or bring the
1012 * cache up-to-date for mode/content changes. But what it
1013 * _does_ do is to "re-match" the stat information of a file
1014 * with the cache, so that you can refresh the cache for a
1015 * file that hasn't been changed but where the stat entry is
1016 * out of date.
1017 *
1018 * For example, you'd want to do this after doing a "git-read-tree",
1019 * to link up the stat cache details with the proper files.
1020 */
1021static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1022                                             struct cache_entry *ce,
1023                                             unsigned int options, int *err,
1024                                             int *changed_ret)
1025{
1026        struct stat st;
1027        struct cache_entry *updated;
1028        int changed, size;
1029        int refresh = options & CE_MATCH_REFRESH;
1030        int ignore_valid = options & CE_MATCH_IGNORE_VALID;
1031        int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
1032        int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
1033
1034        if (!refresh || ce_uptodate(ce))
1035                return ce;
1036
1037        /*
1038         * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1039         * that the change to the work tree does not matter and told
1040         * us not to worry.
1041         */
1042        if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1043                ce_mark_uptodate(ce);
1044                return ce;
1045        }
1046        if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1047                ce_mark_uptodate(ce);
1048                return ce;
1049        }
1050
1051        if (lstat(ce->name, &st) < 0) {
1052                if (ignore_missing && errno == ENOENT)
1053                        return ce;
1054                if (err)
1055                        *err = errno;
1056                return NULL;
1057        }
1058
1059        changed = ie_match_stat(istate, ce, &st, options);
1060        if (changed_ret)
1061                *changed_ret = changed;
1062        if (!changed) {
1063                /*
1064                 * The path is unchanged.  If we were told to ignore
1065                 * valid bit, then we did the actual stat check and
1066                 * found that the entry is unmodified.  If the entry
1067                 * is not marked VALID, this is the place to mark it
1068                 * valid again, under "assume unchanged" mode.
1069                 */
1070                if (ignore_valid && assume_unchanged &&
1071                    !(ce->ce_flags & CE_VALID))
1072                        ; /* mark this one VALID again */
1073                else {
1074                        /*
1075                         * We do not mark the index itself "modified"
1076                         * because CE_UPTODATE flag is in-core only;
1077                         * we are not going to write this change out.
1078                         */
1079                        if (!S_ISGITLINK(ce->ce_mode))
1080                                ce_mark_uptodate(ce);
1081                        return ce;
1082                }
1083        }
1084
1085        if (ie_modified(istate, ce, &st, options)) {
1086                if (err)
1087                        *err = EINVAL;
1088                return NULL;
1089        }
1090
1091        size = ce_size(ce);
1092        updated = xmalloc(size);
1093        memcpy(updated, ce, size);
1094        fill_stat_cache_info(updated, &st);
1095        /*
1096         * If ignore_valid is not set, we should leave CE_VALID bit
1097         * alone.  Otherwise, paths marked with --no-assume-unchanged
1098         * (i.e. things to be edited) will reacquire CE_VALID bit
1099         * automatically, which is not really what we want.
1100         */
1101        if (!ignore_valid && assume_unchanged &&
1102            !(ce->ce_flags & CE_VALID))
1103                updated->ce_flags &= ~CE_VALID;
1104
1105        return updated;
1106}
1107
1108static void show_file(const char * fmt, const char * name, int in_porcelain,
1109                      int * first, const char *header_msg)
1110{
1111        if (in_porcelain && *first && header_msg) {
1112                printf("%s\n", header_msg);
1113                *first = 0;
1114        }
1115        printf(fmt, name);
1116}
1117
1118int refresh_index(struct index_state *istate, unsigned int flags,
1119                  const struct pathspec *pathspec,
1120                  char *seen, const char *header_msg)
1121{
1122        int i;
1123        int has_errors = 0;
1124        int really = (flags & REFRESH_REALLY) != 0;
1125        int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1126        int quiet = (flags & REFRESH_QUIET) != 0;
1127        int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
1128        int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
1129        int first = 1;
1130        int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1131        unsigned int options = (CE_MATCH_REFRESH |
1132                                (really ? CE_MATCH_IGNORE_VALID : 0) |
1133                                (not_new ? CE_MATCH_IGNORE_MISSING : 0));
1134        const char *modified_fmt;
1135        const char *deleted_fmt;
1136        const char *typechange_fmt;
1137        const char *added_fmt;
1138        const char *unmerged_fmt;
1139
1140        modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1141        deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
1142        typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
1143        added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
1144        unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1145        for (i = 0; i < istate->cache_nr; i++) {
1146                struct cache_entry *ce, *new;
1147                int cache_errno = 0;
1148                int changed = 0;
1149                int filtered = 0;
1150
1151                ce = istate->cache[i];
1152                if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1153                        continue;
1154
1155                if (pathspec && !ce_path_match(ce, pathspec, seen))
1156                        filtered = 1;
1157
1158                if (ce_stage(ce)) {
1159                        while ((i < istate->cache_nr) &&
1160                               ! strcmp(istate->cache[i]->name, ce->name))
1161                                i++;
1162                        i--;
1163                        if (allow_unmerged)
1164                                continue;
1165                        if (!filtered)
1166                                show_file(unmerged_fmt, ce->name, in_porcelain,
1167                                          &first, header_msg);
1168                        has_errors = 1;
1169                        continue;
1170                }
1171
1172                if (filtered)
1173                        continue;
1174
1175                new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
1176                if (new == ce)
1177                        continue;
1178                if (!new) {
1179                        const char *fmt;
1180
1181                        if (really && cache_errno == EINVAL) {
1182                                /* If we are doing --really-refresh that
1183                                 * means the index is not valid anymore.
1184                                 */
1185                                ce->ce_flags &= ~CE_VALID;
1186                                istate->cache_changed = 1;
1187                        }
1188                        if (quiet)
1189                                continue;
1190
1191                        if (cache_errno == ENOENT)
1192                                fmt = deleted_fmt;
1193                        else if (ce->ce_flags & CE_INTENT_TO_ADD)
1194                                fmt = added_fmt; /* must be before other checks */
1195                        else if (changed & TYPE_CHANGED)
1196                                fmt = typechange_fmt;
1197                        else
1198                                fmt = modified_fmt;
1199                        show_file(fmt,
1200                                  ce->name, in_porcelain, &first, header_msg);
1201                        has_errors = 1;
1202                        continue;
1203                }
1204
1205                replace_index_entry(istate, i, new);
1206        }
1207        return has_errors;
1208}
1209
1210static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
1211                                               unsigned int options)
1212{
1213        return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
1214}
1215
1216
1217/*****************************************************************
1218 * Index File I/O
1219 *****************************************************************/
1220
1221#define INDEX_FORMAT_DEFAULT 3
1222
1223/*
1224 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1225 * Again - this is just a (very strong in practice) heuristic that
1226 * the inode hasn't changed.
1227 *
1228 * We save the fields in big-endian order to allow using the
1229 * index file over NFS transparently.
1230 */
1231struct ondisk_cache_entry {
1232        struct cache_time ctime;
1233        struct cache_time mtime;
1234        uint32_t dev;
1235        uint32_t ino;
1236        uint32_t mode;
1237        uint32_t uid;
1238        uint32_t gid;
1239        uint32_t size;
1240        unsigned char sha1[20];
1241        uint16_t flags;
1242        char name[FLEX_ARRAY]; /* more */
1243};
1244
1245/*
1246 * This struct is used when CE_EXTENDED bit is 1
1247 * The struct must match ondisk_cache_entry exactly from
1248 * ctime till flags
1249 */
1250struct ondisk_cache_entry_extended {
1251        struct cache_time ctime;
1252        struct cache_time mtime;
1253        uint32_t dev;
1254        uint32_t ino;
1255        uint32_t mode;
1256        uint32_t uid;
1257        uint32_t gid;
1258        uint32_t size;
1259        unsigned char sha1[20];
1260        uint16_t flags;
1261        uint16_t flags2;
1262        char name[FLEX_ARRAY]; /* more */
1263};
1264
1265/* These are only used for v3 or lower */
1266#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1267#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1268#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1269#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1270                            ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1271                            ondisk_cache_entry_size(ce_namelen(ce)))
1272
1273static int verify_hdr(struct cache_header *hdr, unsigned long size)
1274{
1275        git_SHA_CTX c;
1276        unsigned char sha1[20];
1277        int hdr_version;
1278
1279        if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
1280                return error("bad signature");
1281        hdr_version = ntohl(hdr->hdr_version);
1282        if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
1283                return error("bad index version %d", hdr_version);
1284        git_SHA1_Init(&c);
1285        git_SHA1_Update(&c, hdr, size - 20);
1286        git_SHA1_Final(sha1, &c);
1287        if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
1288                return error("bad index file sha1 signature");
1289        return 0;
1290}
1291
1292static int read_index_extension(struct index_state *istate,
1293                                const char *ext, void *data, unsigned long sz)
1294{
1295        switch (CACHE_EXT(ext)) {
1296        case CACHE_EXT_TREE:
1297                istate->cache_tree = cache_tree_read(data, sz);
1298                break;
1299        case CACHE_EXT_RESOLVE_UNDO:
1300                istate->resolve_undo = resolve_undo_read(data, sz);
1301                break;
1302        default:
1303                if (*ext < 'A' || 'Z' < *ext)
1304                        return error("index uses %.4s extension, which we do not understand",
1305                                     ext);
1306                fprintf(stderr, "ignoring %.4s extension\n", ext);
1307                break;
1308        }
1309        return 0;
1310}
1311
1312int read_index(struct index_state *istate)
1313{
1314        return read_index_from(istate, get_index_file());
1315}
1316
1317static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
1318                                                   unsigned int flags,
1319                                                   const char *name,
1320                                                   size_t len)
1321{
1322        struct cache_entry *ce = xmalloc(cache_entry_size(len));
1323
1324        ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
1325        ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
1326        ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
1327        ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec);
1328        ce->ce_stat_data.sd_dev   = get_be32(&ondisk->dev);
1329        ce->ce_stat_data.sd_ino   = get_be32(&ondisk->ino);
1330        ce->ce_mode  = get_be32(&ondisk->mode);
1331        ce->ce_stat_data.sd_uid   = get_be32(&ondisk->uid);
1332        ce->ce_stat_data.sd_gid   = get_be32(&ondisk->gid);
1333        ce->ce_stat_data.sd_size  = get_be32(&ondisk->size);
1334        ce->ce_flags = flags & ~CE_NAMEMASK;
1335        ce->ce_namelen = len;
1336        hashcpy(ce->sha1, ondisk->sha1);
1337        memcpy(ce->name, name, len);
1338        ce->name[len] = '\0';
1339        return ce;
1340}
1341
1342/*
1343 * Adjacent cache entries tend to share the leading paths, so it makes
1344 * sense to only store the differences in later entries.  In the v4
1345 * on-disk format of the index, each on-disk cache entry stores the
1346 * number of bytes to be stripped from the end of the previous name,
1347 * and the bytes to append to the result, to come up with its name.
1348 */
1349static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
1350{
1351        const unsigned char *ep, *cp = (const unsigned char *)cp_;
1352        size_t len = decode_varint(&cp);
1353
1354        if (name->len < len)
1355                die("malformed name field in the index");
1356        strbuf_remove(name, name->len - len, len);
1357        for (ep = cp; *ep; ep++)
1358                ; /* find the end */
1359        strbuf_add(name, cp, ep - cp);
1360        return (const char *)ep + 1 - cp_;
1361}
1362
1363static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
1364                                            unsigned long *ent_size,
1365                                            struct strbuf *previous_name)
1366{
1367        struct cache_entry *ce;
1368        size_t len;
1369        const char *name;
1370        unsigned int flags;
1371
1372        /* On-disk flags are just 16 bits */
1373        flags = get_be16(&ondisk->flags);
1374        len = flags & CE_NAMEMASK;
1375
1376        if (flags & CE_EXTENDED) {
1377                struct ondisk_cache_entry_extended *ondisk2;
1378                int extended_flags;
1379                ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1380                extended_flags = get_be16(&ondisk2->flags2) << 16;
1381                /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1382                if (extended_flags & ~CE_EXTENDED_FLAGS)
1383                        die("Unknown index entry format %08x", extended_flags);
1384                flags |= extended_flags;
1385                name = ondisk2->name;
1386        }
1387        else
1388                name = ondisk->name;
1389
1390        if (!previous_name) {
1391                /* v3 and earlier */
1392                if (len == CE_NAMEMASK)
1393                        len = strlen(name);
1394                ce = cache_entry_from_ondisk(ondisk, flags, name, len);
1395
1396                *ent_size = ondisk_ce_size(ce);
1397        } else {
1398                unsigned long consumed;
1399                consumed = expand_name_field(previous_name, name);
1400                ce = cache_entry_from_ondisk(ondisk, flags,
1401                                             previous_name->buf,
1402                                             previous_name->len);
1403
1404                *ent_size = (name - ((char *)ondisk)) + consumed;
1405        }
1406        return ce;
1407}
1408
1409/* remember to discard_cache() before reading a different cache! */
1410int read_index_from(struct index_state *istate, const char *path)
1411{
1412        int fd, i;
1413        struct stat st;
1414        unsigned long src_offset;
1415        struct cache_header *hdr;
1416        void *mmap;
1417        size_t mmap_size;
1418        struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1419
1420        if (istate->initialized)
1421                return istate->cache_nr;
1422
1423        istate->timestamp.sec = 0;
1424        istate->timestamp.nsec = 0;
1425        fd = open(path, O_RDONLY);
1426        if (fd < 0) {
1427                if (errno == ENOENT)
1428                        return 0;
1429                die_errno("index file open failed");
1430        }
1431
1432        if (fstat(fd, &st))
1433                die_errno("cannot stat the open index");
1434
1435        mmap_size = xsize_t(st.st_size);
1436        if (mmap_size < sizeof(struct cache_header) + 20)
1437                die("index file smaller than expected");
1438
1439        mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
1440        if (mmap == MAP_FAILED)
1441                die_errno("unable to map index file");
1442        close(fd);
1443
1444        hdr = mmap;
1445        if (verify_hdr(hdr, mmap_size) < 0)
1446                goto unmap;
1447
1448        istate->version = ntohl(hdr->hdr_version);
1449        istate->cache_nr = ntohl(hdr->hdr_entries);
1450        istate->cache_alloc = alloc_nr(istate->cache_nr);
1451        istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
1452        istate->initialized = 1;
1453
1454        if (istate->version == 4)
1455                previous_name = &previous_name_buf;
1456        else
1457                previous_name = NULL;
1458
1459        src_offset = sizeof(*hdr);
1460        for (i = 0; i < istate->cache_nr; i++) {
1461                struct ondisk_cache_entry *disk_ce;
1462                struct cache_entry *ce;
1463                unsigned long consumed;
1464
1465                disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
1466                ce = create_from_disk(disk_ce, &consumed, previous_name);
1467                set_index_entry(istate, i, ce);
1468
1469                src_offset += consumed;
1470        }
1471        strbuf_release(&previous_name_buf);
1472        istate->timestamp.sec = st.st_mtime;
1473        istate->timestamp.nsec = ST_MTIME_NSEC(st);
1474
1475        while (src_offset <= mmap_size - 20 - 8) {
1476                /* After an array of active_nr index entries,
1477                 * there can be arbitrary number of extended
1478                 * sections, each of which is prefixed with
1479                 * extension name (4-byte) and section length
1480                 * in 4-byte network byte order.
1481                 */
1482                uint32_t extsize;
1483                memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
1484                extsize = ntohl(extsize);
1485                if (read_index_extension(istate,
1486                                         (const char *) mmap + src_offset,
1487                                         (char *) mmap + src_offset + 8,
1488                                         extsize) < 0)
1489                        goto unmap;
1490                src_offset += 8;
1491                src_offset += extsize;
1492        }
1493        munmap(mmap, mmap_size);
1494        return istate->cache_nr;
1495
1496unmap:
1497        munmap(mmap, mmap_size);
1498        die("index file corrupt");
1499}
1500
1501int is_index_unborn(struct index_state *istate)
1502{
1503        return (!istate->cache_nr && !istate->timestamp.sec);
1504}
1505
1506int discard_index(struct index_state *istate)
1507{
1508        int i;
1509
1510        for (i = 0; i < istate->cache_nr; i++)
1511                free(istate->cache[i]);
1512        resolve_undo_clear_index(istate);
1513        istate->cache_nr = 0;
1514        istate->cache_changed = 0;
1515        istate->timestamp.sec = 0;
1516        istate->timestamp.nsec = 0;
1517        free_name_hash(istate);
1518        cache_tree_free(&(istate->cache_tree));
1519        istate->initialized = 0;
1520        free(istate->cache);
1521        istate->cache = NULL;
1522        istate->cache_alloc = 0;
1523        return 0;
1524}
1525
1526int unmerged_index(const struct index_state *istate)
1527{
1528        int i;
1529        for (i = 0; i < istate->cache_nr; i++) {
1530                if (ce_stage(istate->cache[i]))
1531                        return 1;
1532        }
1533        return 0;
1534}
1535
1536#define WRITE_BUFFER_SIZE 8192
1537static unsigned char write_buffer[WRITE_BUFFER_SIZE];
1538static unsigned long write_buffer_len;
1539
1540static int ce_write_flush(git_SHA_CTX *context, int fd)
1541{
1542        unsigned int buffered = write_buffer_len;
1543        if (buffered) {
1544                git_SHA1_Update(context, write_buffer, buffered);
1545                if (write_in_full(fd, write_buffer, buffered) != buffered)
1546                        return -1;
1547                write_buffer_len = 0;
1548        }
1549        return 0;
1550}
1551
1552static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
1553{
1554        while (len) {
1555                unsigned int buffered = write_buffer_len;
1556                unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1557                if (partial > len)
1558                        partial = len;
1559                memcpy(write_buffer + buffered, data, partial);
1560                buffered += partial;
1561                if (buffered == WRITE_BUFFER_SIZE) {
1562                        write_buffer_len = buffered;
1563                        if (ce_write_flush(context, fd))
1564                                return -1;
1565                        buffered = 0;
1566                }
1567                write_buffer_len = buffered;
1568                len -= partial;
1569                data = (char *) data + partial;
1570        }
1571        return 0;
1572}
1573
1574static int write_index_ext_header(git_SHA_CTX *context, int fd,
1575                                  unsigned int ext, unsigned int sz)
1576{
1577        ext = htonl(ext);
1578        sz = htonl(sz);
1579        return ((ce_write(context, fd, &ext, 4) < 0) ||
1580                (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
1581}
1582
1583static int ce_flush(git_SHA_CTX *context, int fd)
1584{
1585        unsigned int left = write_buffer_len;
1586
1587        if (left) {
1588                write_buffer_len = 0;
1589                git_SHA1_Update(context, write_buffer, left);
1590        }
1591
1592        /* Flush first if not enough space for SHA1 signature */
1593        if (left + 20 > WRITE_BUFFER_SIZE) {
1594                if (write_in_full(fd, write_buffer, left) != left)
1595                        return -1;
1596                left = 0;
1597        }
1598
1599        /* Append the SHA1 signature at the end */
1600        git_SHA1_Final(write_buffer + left, context);
1601        left += 20;
1602        return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
1603}
1604
1605static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1606{
1607        /*
1608         * The only thing we care about in this function is to smudge the
1609         * falsely clean entry due to touch-update-touch race, so we leave
1610         * everything else as they are.  We are called for entries whose
1611         * ce_stat_data.sd_mtime match the index file mtime.
1612         *
1613         * Note that this actually does not do much for gitlinks, for
1614         * which ce_match_stat_basic() always goes to the actual
1615         * contents.  The caller checks with is_racy_timestamp() which
1616         * always says "no" for gitlinks, so we are not called for them ;-)
1617         */
1618        struct stat st;
1619
1620        if (lstat(ce->name, &st) < 0)
1621                return;
1622        if (ce_match_stat_basic(ce, &st))
1623                return;
1624        if (ce_modified_check_fs(ce, &st)) {
1625                /* This is "racily clean"; smudge it.  Note that this
1626                 * is a tricky code.  At first glance, it may appear
1627                 * that it can break with this sequence:
1628                 *
1629                 * $ echo xyzzy >frotz
1630                 * $ git-update-index --add frotz
1631                 * $ : >frotz
1632                 * $ sleep 3
1633                 * $ echo filfre >nitfol
1634                 * $ git-update-index --add nitfol
1635                 *
1636                 * but it does not.  When the second update-index runs,
1637                 * it notices that the entry "frotz" has the same timestamp
1638                 * as index, and if we were to smudge it by resetting its
1639                 * size to zero here, then the object name recorded
1640                 * in index is the 6-byte file but the cached stat information
1641                 * becomes zero --- which would then match what we would
1642                 * obtain from the filesystem next time we stat("frotz").
1643                 *
1644                 * However, the second update-index, before calling
1645                 * this function, notices that the cached size is 6
1646                 * bytes and what is on the filesystem is an empty
1647                 * file, and never calls us, so the cached size information
1648                 * for "frotz" stays 6 which does not match the filesystem.
1649                 */
1650                ce->ce_stat_data.sd_size = 0;
1651        }
1652}
1653
1654/* Copy miscellaneous fields but not the name */
1655static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
1656                                       struct cache_entry *ce)
1657{
1658        short flags;
1659
1660        ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
1661        ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
1662        ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
1663        ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
1664        ondisk->dev  = htonl(ce->ce_stat_data.sd_dev);
1665        ondisk->ino  = htonl(ce->ce_stat_data.sd_ino);
1666        ondisk->mode = htonl(ce->ce_mode);
1667        ondisk->uid  = htonl(ce->ce_stat_data.sd_uid);
1668        ondisk->gid  = htonl(ce->ce_stat_data.sd_gid);
1669        ondisk->size = htonl(ce->ce_stat_data.sd_size);
1670        hashcpy(ondisk->sha1, ce->sha1);
1671
1672        flags = ce->ce_flags;
1673        flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
1674        ondisk->flags = htons(flags);
1675        if (ce->ce_flags & CE_EXTENDED) {
1676                struct ondisk_cache_entry_extended *ondisk2;
1677                ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1678                ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
1679                return ondisk2->name;
1680        }
1681        else {
1682                return ondisk->name;
1683        }
1684}
1685
1686static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
1687                          struct strbuf *previous_name)
1688{
1689        int size;
1690        struct ondisk_cache_entry *ondisk;
1691        char *name;
1692        int result;
1693
1694        if (!previous_name) {
1695                size = ondisk_ce_size(ce);
1696                ondisk = xcalloc(1, size);
1697                name = copy_cache_entry_to_ondisk(ondisk, ce);
1698                memcpy(name, ce->name, ce_namelen(ce));
1699        } else {
1700                int common, to_remove, prefix_size;
1701                unsigned char to_remove_vi[16];
1702                for (common = 0;
1703                     (ce->name[common] &&
1704                      common < previous_name->len &&
1705                      ce->name[common] == previous_name->buf[common]);
1706                     common++)
1707                        ; /* still matching */
1708                to_remove = previous_name->len - common;
1709                prefix_size = encode_varint(to_remove, to_remove_vi);
1710
1711                if (ce->ce_flags & CE_EXTENDED)
1712                        size = offsetof(struct ondisk_cache_entry_extended, name);
1713                else
1714                        size = offsetof(struct ondisk_cache_entry, name);
1715                size += prefix_size + (ce_namelen(ce) - common + 1);
1716
1717                ondisk = xcalloc(1, size);
1718                name = copy_cache_entry_to_ondisk(ondisk, ce);
1719                memcpy(name, to_remove_vi, prefix_size);
1720                memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);
1721
1722                strbuf_splice(previous_name, common, to_remove,
1723                              ce->name + common, ce_namelen(ce) - common);
1724        }
1725
1726        result = ce_write(c, fd, ondisk, size);
1727        free(ondisk);
1728        return result;
1729}
1730
1731static int has_racy_timestamp(struct index_state *istate)
1732{
1733        int entries = istate->cache_nr;
1734        int i;
1735
1736        for (i = 0; i < entries; i++) {
1737                struct cache_entry *ce = istate->cache[i];
1738                if (is_racy_timestamp(istate, ce))
1739                        return 1;
1740        }
1741        return 0;
1742}
1743
1744/*
1745 * Opportunistically update the index but do not complain if we can't
1746 */
1747void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
1748{
1749        if ((istate->cache_changed || has_racy_timestamp(istate)) &&
1750            !write_index(istate, lockfile->fd))
1751                commit_locked_index(lockfile);
1752        else
1753                rollback_lock_file(lockfile);
1754}
1755
1756int write_index(struct index_state *istate, int newfd)
1757{
1758        git_SHA_CTX c;
1759        struct cache_header hdr;
1760        int i, err, removed, extended, hdr_version;
1761        struct cache_entry **cache = istate->cache;
1762        int entries = istate->cache_nr;
1763        struct stat st;
1764        struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
1765
1766        for (i = removed = extended = 0; i < entries; i++) {
1767                if (cache[i]->ce_flags & CE_REMOVE)
1768                        removed++;
1769
1770                /* reduce extended entries if possible */
1771                cache[i]->ce_flags &= ~CE_EXTENDED;
1772                if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
1773                        extended++;
1774                        cache[i]->ce_flags |= CE_EXTENDED;
1775                }
1776        }
1777
1778        if (!istate->version)
1779                istate->version = INDEX_FORMAT_DEFAULT;
1780
1781        /* demote version 3 to version 2 when the latter suffices */
1782        if (istate->version == 3 || istate->version == 2)
1783                istate->version = extended ? 3 : 2;
1784
1785        hdr_version = istate->version;
1786
1787        hdr.hdr_signature = htonl(CACHE_SIGNATURE);
1788        hdr.hdr_version = htonl(hdr_version);
1789        hdr.hdr_entries = htonl(entries - removed);
1790
1791        git_SHA1_Init(&c);
1792        if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
1793                return -1;
1794
1795        previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
1796        for (i = 0; i < entries; i++) {
1797                struct cache_entry *ce = cache[i];
1798                if (ce->ce_flags & CE_REMOVE)
1799                        continue;
1800                if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
1801                        ce_smudge_racily_clean_entry(ce);
1802                if (is_null_sha1(ce->sha1)) {
1803                        static const char msg[] = "cache entry has null sha1: %s";
1804                        static int allow = -1;
1805
1806                        if (allow < 0)
1807                                allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
1808                        if (allow)
1809                                warning(msg, ce->name);
1810                        else
1811                                return error(msg, ce->name);
1812                }
1813                if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
1814                        return -1;
1815        }
1816        strbuf_release(&previous_name_buf);
1817
1818        /* Write extension data here */
1819        if (istate->cache_tree) {
1820                struct strbuf sb = STRBUF_INIT;
1821
1822                cache_tree_write(&sb, istate->cache_tree);
1823                err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
1824                        || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1825                strbuf_release(&sb);
1826                if (err)
1827                        return -1;
1828        }
1829        if (istate->resolve_undo) {
1830                struct strbuf sb = STRBUF_INIT;
1831
1832                resolve_undo_write(&sb, istate->resolve_undo);
1833                err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
1834                                             sb.len) < 0
1835                        || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1836                strbuf_release(&sb);
1837                if (err)
1838                        return -1;
1839        }
1840
1841        if (ce_flush(&c, newfd) || fstat(newfd, &st))
1842                return -1;
1843        istate->timestamp.sec = (unsigned int)st.st_mtime;
1844        istate->timestamp.nsec = ST_MTIME_NSEC(st);
1845        return 0;
1846}
1847
1848/*
1849 * Read the index file that is potentially unmerged into given
1850 * index_state, dropping any unmerged entries.  Returns true if
1851 * the index is unmerged.  Callers who want to refuse to work
1852 * from an unmerged state can call this and check its return value,
1853 * instead of calling read_cache().
1854 */
1855int read_index_unmerged(struct index_state *istate)
1856{
1857        int i;
1858        int unmerged = 0;
1859
1860        read_index(istate);
1861        for (i = 0; i < istate->cache_nr; i++) {
1862                struct cache_entry *ce = istate->cache[i];
1863                struct cache_entry *new_ce;
1864                int size, len;
1865
1866                if (!ce_stage(ce))
1867                        continue;
1868                unmerged = 1;
1869                len = ce_namelen(ce);
1870                size = cache_entry_size(len);
1871                new_ce = xcalloc(1, size);
1872                memcpy(new_ce->name, ce->name, len);
1873                new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
1874                new_ce->ce_namelen = len;
1875                new_ce->ce_mode = ce->ce_mode;
1876                if (add_index_entry(istate, new_ce, 0))
1877                        return error("%s: cannot drop to stage #0",
1878                                     new_ce->name);
1879                i = index_name_pos(istate, new_ce->name, len);
1880        }
1881        return unmerged;
1882}
1883
1884/*
1885 * Returns 1 if the path is an "other" path with respect to
1886 * the index; that is, the path is not mentioned in the index at all,
1887 * either as a file, a directory with some files in the index,
1888 * or as an unmerged entry.
1889 *
1890 * We helpfully remove a trailing "/" from directories so that
1891 * the output of read_directory can be used as-is.
1892 */
1893int index_name_is_other(const struct index_state *istate, const char *name,
1894                int namelen)
1895{
1896        int pos;
1897        if (namelen && name[namelen - 1] == '/')
1898                namelen--;
1899        pos = index_name_pos(istate, name, namelen);
1900        if (0 <= pos)
1901                return 0;       /* exact match */
1902        pos = -pos - 1;
1903        if (pos < istate->cache_nr) {
1904                struct cache_entry *ce = istate->cache[pos];
1905                if (ce_namelen(ce) == namelen &&
1906                    !memcmp(ce->name, name, namelen))
1907                        return 0; /* Yup, this one exists unmerged */
1908        }
1909        return 1;
1910}
1911
1912void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
1913{
1914        int pos, len;
1915        unsigned long sz;
1916        enum object_type type;
1917        void *data;
1918
1919        len = strlen(path);
1920        pos = index_name_pos(istate, path, len);
1921        if (pos < 0) {
1922                /*
1923                 * We might be in the middle of a merge, in which
1924                 * case we would read stage #2 (ours).
1925                 */
1926                int i;
1927                for (i = -pos - 1;
1928                     (pos < 0 && i < istate->cache_nr &&
1929                      !strcmp(istate->cache[i]->name, path));
1930                     i++)
1931                        if (ce_stage(istate->cache[i]) == 2)
1932                                pos = i;
1933        }
1934        if (pos < 0)
1935                return NULL;
1936        data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
1937        if (!data || type != OBJ_BLOB) {
1938                free(data);
1939                return NULL;
1940        }
1941        if (size)
1942                *size = sz;
1943        return data;
1944}
1945
1946void stat_validity_clear(struct stat_validity *sv)
1947{
1948        free(sv->sd);
1949        sv->sd = NULL;
1950}
1951
1952int stat_validity_check(struct stat_validity *sv, const char *path)
1953{
1954        struct stat st;
1955
1956        if (stat(path, &st) < 0)
1957                return sv->sd == NULL;
1958        if (!sv->sd)
1959                return 0;
1960        return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);
1961}
1962
1963void stat_validity_update(struct stat_validity *sv, int fd)
1964{
1965        struct stat st;
1966
1967        if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode))
1968                stat_validity_clear(sv);
1969        else {
1970                if (!sv->sd)
1971                        sv->sd = xcalloc(1, sizeof(struct stat_data));
1972                fill_stat_data(sv->sd, &st);
1973        }
1974}