update-cache.con commit csum-file: fix missing buf pointer update (2700628)
   1/*
   2 * GIT - The information manager from hell
   3 *
   4 * Copyright (C) Linus Torvalds, 2005
   5 */
   6#include "cache.h"
   7
   8/*
   9 * Default to not allowing changes to the list of files. The
  10 * tool doesn't actually care, but this makes it harder to add
  11 * files to the revision control by mistake by doing something
  12 * like "git-update-cache *" and suddenly having all the object
  13 * files be revision controlled.
  14 */
  15static int allow_add = 0, allow_remove = 0, allow_replace = 0, not_new = 0, quiet = 0;
  16static int force_remove;
  17
  18/* Three functions to allow overloaded pointer return; see linux/err.h */
  19static inline void *ERR_PTR(long error)
  20{
  21        return (void *) error;
  22}
  23
  24static inline long PTR_ERR(const void *ptr)
  25{
  26        return (long) ptr;
  27}
  28
  29static inline long IS_ERR(const void *ptr)
  30{
  31        return (unsigned long)ptr > (unsigned long)-1000L;
  32}
  33
  34static int add_file_to_cache(char *path)
  35{
  36        int size, namelen, option, status;
  37        struct cache_entry *ce;
  38        struct stat st;
  39        int fd;
  40        char *target;
  41
  42        status = lstat(path, &st);
  43        if (status < 0 || S_ISDIR(st.st_mode)) {
  44                /* When we used to have "path" and now we want to add
  45                 * "path/file", we need a way to remove "path" before
  46                 * being able to add "path/file".  However,
  47                 * "git-update-cache --remove path" would not work.
  48                 * --force-remove can be used but this is more user
  49                 * friendly, especially since we can do the opposite
  50                 * case just fine without --force-remove.
  51                 */
  52                if (status == 0 || (errno == ENOENT || errno == ENOTDIR)) {
  53                        if (allow_remove)
  54                                return remove_file_from_cache(path);
  55                }
  56                return error("open(\"%s\"): %s", path, strerror(errno));
  57        }
  58        namelen = strlen(path);
  59        size = cache_entry_size(namelen);
  60        ce = xmalloc(size);
  61        memset(ce, 0, size);
  62        memcpy(ce->name, path, namelen);
  63        fill_stat_cache_info(ce, &st);
  64        ce->ce_mode = create_ce_mode(st.st_mode);
  65        ce->ce_flags = htons(namelen);
  66        switch (st.st_mode & S_IFMT) {
  67        case S_IFREG:
  68                fd = open(path, O_RDONLY);
  69                if (fd < 0)
  70                        return -1;
  71                if (index_fd(ce->sha1, fd, &st) < 0)
  72                        return -1;
  73                break;
  74        case S_IFLNK:
  75                target = xmalloc(st.st_size+1);
  76                if (readlink(path, target, st.st_size+1) != st.st_size) {
  77                        free(target);
  78                        return -1;
  79                }
  80                if (write_sha1_file(target, st.st_size, "blob", ce->sha1))
  81                        return -1;
  82                free(target);
  83                break;
  84        default:
  85                return -1;
  86        }
  87        option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
  88        option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
  89        return add_cache_entry(ce, option);
  90}
  91
  92static int match_data(int fd, void *buffer, unsigned long size)
  93{
  94        while (size) {
  95                char compare[1024];
  96                int ret = read(fd, compare, sizeof(compare));
  97
  98                if (ret <= 0 || ret > size || memcmp(buffer, compare, ret))
  99                        return -1;
 100                size -= ret;
 101                buffer += ret;
 102        }
 103        return 0;
 104}
 105
 106static int compare_data(struct cache_entry *ce, unsigned long expected_size)
 107{
 108        int match = -1;
 109        int fd = open(ce->name, O_RDONLY);
 110
 111        if (fd >= 0) {
 112                void *buffer;
 113                unsigned long size;
 114                char type[20];
 115
 116                buffer = read_sha1_file(ce->sha1, type, &size);
 117                if (buffer) {
 118                        if (size == expected_size && !strcmp(type, "blob"))
 119                                match = match_data(fd, buffer, size);
 120                        free(buffer);
 121                }
 122                close(fd);
 123        }
 124        return match;
 125}
 126
 127static int compare_link(struct cache_entry *ce, unsigned long expected_size)
 128{
 129        int match = -1;
 130        char *target;
 131        void *buffer;
 132        unsigned long size;
 133        char type[10];
 134        int len;
 135
 136        target = xmalloc(expected_size);
 137        len = readlink(ce->name, target, expected_size);
 138        if (len != expected_size) {
 139                free(target);
 140                return -1;
 141        }
 142        buffer = read_sha1_file(ce->sha1, type, &size);
 143        if (!buffer) {
 144                free(target);
 145                return -1;
 146        }
 147        if (size == expected_size)
 148                match = memcmp(buffer, target, size);
 149        free(buffer);
 150        free(target);
 151        return match;
 152}
 153
 154/*
 155 * "refresh" does not calculate a new sha1 file or bring the
 156 * cache up-to-date for mode/content changes. But what it
 157 * _does_ do is to "re-match" the stat information of a file
 158 * with the cache, so that you can refresh the cache for a
 159 * file that hasn't been changed but where the stat entry is
 160 * out of date.
 161 *
 162 * For example, you'd want to do this after doing a "git-read-tree",
 163 * to link up the stat cache details with the proper files.
 164 */
 165static struct cache_entry *refresh_entry(struct cache_entry *ce)
 166{
 167        struct stat st;
 168        struct cache_entry *updated;
 169        int changed, size;
 170
 171        if (lstat(ce->name, &st) < 0)
 172                return ERR_PTR(-errno);
 173
 174        changed = ce_match_stat(ce, &st);
 175        if (!changed)
 176                return ce;
 177
 178        /*
 179         * If the mode or type has changed, there's no point in trying
 180         * to refresh the entry - it's not going to match
 181         */
 182        if (changed & (MODE_CHANGED | TYPE_CHANGED))
 183                return ERR_PTR(-EINVAL);
 184
 185        switch (st.st_mode & S_IFMT) {
 186        case S_IFREG:
 187                if (compare_data(ce, st.st_size))
 188                        return ERR_PTR(-EINVAL);
 189                break;
 190        case S_IFLNK:
 191                if (compare_link(ce, st.st_size))
 192                        return ERR_PTR(-EINVAL);
 193                break;
 194        default:
 195                return ERR_PTR(-EINVAL);
 196        }
 197
 198        size = ce_size(ce);
 199        updated = xmalloc(size);
 200        memcpy(updated, ce, size);
 201        fill_stat_cache_info(updated, &st);
 202        return updated;
 203}
 204
 205static int refresh_cache(void)
 206{
 207        int i;
 208        int has_errors = 0;
 209
 210        for (i = 0; i < active_nr; i++) {
 211                struct cache_entry *ce, *new;
 212                ce = active_cache[i];
 213                if (ce_stage(ce)) {
 214                        printf("%s: needs merge\n", ce->name);
 215                        has_errors = 1;
 216                        while ((i < active_nr) &&
 217                               ! strcmp(active_cache[i]->name, ce->name))
 218                                i++;
 219                        i--;
 220                        continue;
 221                }
 222
 223                new = refresh_entry(ce);
 224                if (IS_ERR(new)) {
 225                        if (not_new && PTR_ERR(new) == -ENOENT)
 226                                continue;
 227                        if (quiet)
 228                                continue;
 229                        printf("%s: needs update\n", ce->name);
 230                        has_errors = 1;
 231                        continue;
 232                }
 233                active_cache_changed = 1;
 234                /* You can NOT just free active_cache[i] here, since it
 235                 * might not be necessarily malloc()ed but can also come
 236                 * from mmap(). */
 237                active_cache[i] = new;
 238        }
 239        return has_errors;
 240}
 241
 242/*
 243 * We fundamentally don't like some paths: we don't want
 244 * dot or dot-dot anywhere, and for obvious reasons don't
 245 * want to recurse into ".git" either.
 246 *
 247 * Also, we don't want double slashes or slashes at the
 248 * end that can make pathnames ambiguous.
 249 */
 250static int verify_dotfile(const char *rest)
 251{
 252        /*
 253         * The first character was '.', but that
 254         * has already been discarded, we now test
 255         * the rest.
 256         */
 257        switch (*rest) {
 258        /* "." is not allowed */
 259        case '\0': case '/':
 260                return 0;
 261
 262        /*
 263         * ".git" followed by  NUL or slash is bad. This
 264         * shares the path end test with the ".." case.
 265         */
 266        case 'g':
 267                if (rest[1] != 'i')
 268                        break;
 269                if (rest[2] != 't')
 270                        break;
 271                rest += 2;
 272        /* fallthrough */
 273        case '.':
 274                if (rest[1] == '\0' || rest[1] == '/')
 275                        return 0;
 276        }
 277        return 1;
 278}
 279
 280static int verify_path(char *path)
 281{
 282        char c;
 283
 284        goto inside;
 285        for (;;) {
 286                if (!c)
 287                        return 1;
 288                if (c == '/') {
 289inside:
 290                        c = *path++;
 291                        switch (c) {
 292                        default:
 293                                continue;
 294                        case '/': case '\0':
 295                                break;
 296                        case '.':
 297                                if (verify_dotfile(path))
 298                                        continue;
 299                        }
 300                        return 0;
 301                }
 302                c = *path++;
 303        }
 304}
 305
 306static int add_cacheinfo(char *arg1, char *arg2, char *arg3)
 307{
 308        int size, len, option;
 309        unsigned int mode;
 310        unsigned char sha1[20];
 311        struct cache_entry *ce;
 312
 313        if (sscanf(arg1, "%o", &mode) != 1)
 314                return -1;
 315        if (get_sha1_hex(arg2, sha1))
 316                return -1;
 317        if (!verify_path(arg3))
 318                return -1;
 319
 320        len = strlen(arg3);
 321        size = cache_entry_size(len);
 322        ce = xmalloc(size);
 323        memset(ce, 0, size);
 324
 325        memcpy(ce->sha1, sha1, 20);
 326        memcpy(ce->name, arg3, len);
 327        ce->ce_flags = htons(len);
 328        ce->ce_mode = create_ce_mode(mode);
 329        option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
 330        option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
 331        return add_cache_entry(ce, option);
 332}
 333
 334static struct cache_file cache_file;
 335
 336int main(int argc, char **argv)
 337{
 338        int i, newfd, entries, has_errors = 0;
 339        int allow_options = 1;
 340
 341        newfd = hold_index_file_for_update(&cache_file, get_index_file());
 342        if (newfd < 0)
 343                die("unable to create new cachefile");
 344
 345        entries = read_cache();
 346        if (entries < 0)
 347                die("cache corrupted");
 348
 349        for (i = 1 ; i < argc; i++) {
 350                char *path = argv[i];
 351
 352                if (allow_options && *path == '-') {
 353                        if (!strcmp(path, "--")) {
 354                                allow_options = 0;
 355                                continue;
 356                        }
 357                        if (!strcmp(path, "-q")) {
 358                                quiet = 1;
 359                                continue;
 360                        }
 361                        if (!strcmp(path, "--add")) {
 362                                allow_add = 1;
 363                                continue;
 364                        }
 365                        if (!strcmp(path, "--replace")) {
 366                                allow_replace = 1;
 367                                continue;
 368                        }
 369                        if (!strcmp(path, "--remove")) {
 370                                allow_remove = 1;
 371                                continue;
 372                        }
 373                        if (!strcmp(path, "--refresh")) {
 374                                has_errors |= refresh_cache();
 375                                continue;
 376                        }
 377                        if (!strcmp(path, "--cacheinfo")) {
 378                                if (i+3 >= argc)
 379                                        die("git-update-cache: --cacheinfo <mode> <sha1> <path>");
 380                                if (add_cacheinfo(argv[i+1], argv[i+2], argv[i+3]))
 381                                        die("git-update-cache: --cacheinfo cannot add %s", argv[i+3]);
 382                                i += 3;
 383                                continue;
 384                        }
 385                        if (!strcmp(path, "--force-remove")) {
 386                                force_remove = 1;
 387                                continue;
 388                        }
 389
 390                        if (!strcmp(path, "--ignore-missing")) {
 391                                not_new = 1;
 392                                continue;
 393                        }
 394                        die("unknown option %s", path);
 395                }
 396                if (!verify_path(path)) {
 397                        fprintf(stderr, "Ignoring path %s\n", argv[i]);
 398                        continue;
 399                }
 400                if (force_remove) {
 401                        if (remove_file_from_cache(path))
 402                                die("git-update-cache: --force-remove cannot remove %s", path);
 403                        continue;
 404                }
 405                if (add_file_to_cache(path))
 406                        die("Unable to add %s to database", path);
 407        }
 408        if (write_cache(newfd, active_cache, active_nr) ||
 409            commit_index_file(&cache_file))
 410                die("Unable to write new cachefile");
 411
 412        return has_errors ? 1 : 0;
 413}