X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=update-cache.c;h=735d19920d998a3d53dbfd9a68336cc13780ef23;hb=8c59926f5e00082a4cbf1d9f31275917c5f7f001;hp=6d37c55a26690dfc10cb2e65e7300b84926fc67f;hpb=5ade862839133563d588627f17cde7d4c4f0f6f2;p=git.git diff --git a/update-cache.c b/update-cache.c index 6d37c55a..735d1992 100644 --- a/update-cache.c +++ b/update-cache.c @@ -3,6 +3,7 @@ * * Copyright (C) Linus Torvalds, 2005 */ +#include #include "cache.h" /* @@ -12,53 +13,22 @@ * like "update-cache *" and suddenly having all the object * files be revision controlled. */ -static int allow_add = 0, allow_remove = 0; +static int allow_add = 0, allow_remove = 0, not_new = 0; -static int index_fd(const char *path, int namelen, struct cache_entry *ce, int fd, struct stat *st) +/* Three functions to allow overloaded pointer return; see linux/err.h */ +static inline void *ERR_PTR(long error) { - z_stream stream; - unsigned long size = st->st_size; - int max_out_bytes = namelen + size + 200; - void *out = malloc(max_out_bytes); - void *metadata = malloc(namelen + 200); - void *in; - SHA_CTX c; - - in = ""; - if (size) - in = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); - close(fd); - if (!out || (int)(long)in == -1) - return -1; - - memset(&stream, 0, sizeof(stream)); - deflateInit(&stream, Z_BEST_COMPRESSION); + return (void *) error; +} - /* - * ASCII size + nul byte - */ - stream.next_in = metadata; - stream.avail_in = 1+sprintf(metadata, "blob %lu", size); - stream.next_out = out; - stream.avail_out = max_out_bytes; - while (deflate(&stream, 0) == Z_OK) - /* nothing */; +static inline long PTR_ERR(const void *ptr) +{ + return (long) ptr; +} - /* - * File content - */ - stream.next_in = in; - stream.avail_in = size; - while (deflate(&stream, Z_FINISH) == Z_OK) - /*nothing */; - - deflateEnd(&stream); - - SHA1_Init(&c); - SHA1_Update(&c, out, stream.total_out); - SHA1_Final(ce->sha1, &c); - - return write_sha1_buffer(ce->sha1, out, stream.total_out); +static inline long IS_ERR(const void *ptr) +{ + return (unsigned long)ptr > (unsigned long)-1000L; } /* @@ -68,18 +38,17 @@ static int index_fd(const char *path, int namelen, struct cache_entry *ce, int f */ static void fill_stat_cache_info(struct cache_entry *ce, struct stat *st) { - ce->ctime.sec = st->st_ctime; -#ifdef NSEC - ce->ctime.nsec = st->st_ctim.tv_nsec; -#endif - ce->mtime.sec = st->st_mtime; + ce->ce_ctime.sec = htonl(st->st_ctime); + ce->ce_mtime.sec = htonl(st->st_mtime); #ifdef NSEC - ce->mtime.nsec = st->st_mtim.tv_nsec; + ce->ce_ctime.nsec = htonl(st->st_ctim.tv_nsec); + ce->ce_mtime.nsec = htonl(st->st_mtim.tv_nsec); #endif - ce->st_dev = st->st_dev; - ce->st_ino = st->st_ino; - ce->st_uid = st->st_uid; - ce->st_gid = st->st_gid; + ce->ce_dev = htonl(st->st_dev); + ce->ce_ino = htonl(st->st_ino); + ce->ce_uid = htonl(st->st_uid); + ce->ce_gid = htonl(st->st_gid); + ce->ce_size = htonl(st->st_size); } static int add_file_to_cache(char *path) @@ -88,32 +57,44 @@ static int add_file_to_cache(char *path) struct cache_entry *ce; struct stat st; int fd; + char *target; - fd = open(path, O_RDONLY); - if (fd < 0) { - if (errno == ENOENT) { + if (lstat(path, &st) < 0) { + if (errno == ENOENT || errno == ENOTDIR) { if (allow_remove) return remove_file_from_cache(path); } return -1; } - if (fstat(fd, &st) < 0) { - close(fd); - return -1; - } namelen = strlen(path); size = cache_entry_size(namelen); - ce = malloc(size); + ce = xmalloc(size); memset(ce, 0, size); memcpy(ce->name, path, namelen); fill_stat_cache_info(ce, &st); - ce->st_mode = st.st_mode; - ce->st_size = st.st_size; - ce->namelen = namelen; - - if (index_fd(path, namelen, ce, fd, &st) < 0) + ce->ce_mode = create_ce_mode(st.st_mode); + ce->ce_flags = htons(namelen); + switch (st.st_mode & S_IFMT) { + case S_IFREG: + fd = open(path, O_RDONLY); + if (fd < 0) + return -1; + if (index_fd(ce->sha1, fd, &st) < 0) + return -1; + break; + case S_IFLNK: + target = xmalloc(st.st_size+1); + if (readlink(path, target, st.st_size+1) != st.st_size) { + free(target); + return -1; + } + if (write_sha1_file(target, st.st_size, "blob", ce->sha1)) + return -1; + free(target); + break; + default: return -1; - + } return add_cache_entry(ce, allow_add); } @@ -152,6 +133,33 @@ static int compare_data(struct cache_entry *ce, unsigned long expected_size) return match; } +static int compare_link(struct cache_entry *ce, unsigned long expected_size) +{ + int match = -1; + char *target; + void *buffer; + unsigned long size; + char type[10]; + int len; + + target = xmalloc(expected_size); + len = readlink(ce->name, target, expected_size); + if (len != expected_size) { + free(target); + return -1; + } + buffer = read_sha1_file(ce->sha1, type, &size); + if (!buffer) { + free(target); + return -1; + } + if (size == expected_size) + match = memcmp(buffer, target, size); + free(buffer); + free(target); + return match; +} + /* * "refresh" does not calculate a new sha1 file or bring the * cache up-to-date for mode/content changes. But what it @@ -169,45 +177,70 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce) struct cache_entry *updated; int changed, size; - if (stat(ce->name, &st) < 0) - return NULL; + if (lstat(ce->name, &st) < 0) + return ERR_PTR(-errno); changed = cache_match_stat(ce, &st); if (!changed) return ce; /* - * If the mode has changed, there's no point in trying + * If the mode or type has changed, there's no point in trying * to refresh the entry - it's not going to match */ - if (changed & MODE_CHANGED) - return NULL; - - if (compare_data(ce, st.st_size)) - return NULL; + if (changed & (MODE_CHANGED | TYPE_CHANGED)) + return ERR_PTR(-EINVAL); + + switch (st.st_mode & S_IFMT) { + case S_IFREG: + if (compare_data(ce, st.st_size)) + return ERR_PTR(-EINVAL); + break; + case S_IFLNK: + if (compare_link(ce, st.st_size)) + return ERR_PTR(-EINVAL); + break; + default: + return ERR_PTR(-EINVAL); + } size = ce_size(ce); - updated = malloc(size); + updated = xmalloc(size); memcpy(updated, ce, size); fill_stat_cache_info(updated, &st); - updated->st_size = st.st_size; return updated; } -static void refresh_cache(void) +static int refresh_cache(void) { int i; + int has_errors = 0; for (i = 0; i < active_nr; i++) { - struct cache_entry *ce = active_cache[i]; - struct cache_entry *new = refresh_entry(ce); + struct cache_entry *ce, *new; + ce = active_cache[i]; + if (ce_stage(ce)) { + printf("%s: needs merge\n", ce->name); + has_errors = 1; + while ((i < active_nr) && + ! strcmp(active_cache[i]->name, ce->name)) + i++; + i--; + continue; + } - if (!new) { - printf("%s: needs update\n", ce->name); + new = refresh_entry(ce); + if (IS_ERR(new)) { + if (!(not_new && PTR_ERR(new) == -ENOENT)) { + printf("%s: needs update\n", ce->name); + has_errors = 1; + } continue; } + active_cache_changed = 1; active_cache[i] = new; } + return has_errors; } /* @@ -238,25 +271,61 @@ inside: } } -static int remove_lock = 0; +static int add_cacheinfo(char *arg1, char *arg2, char *arg3) +{ + int size, len; + unsigned int mode; + unsigned char sha1[20]; + struct cache_entry *ce; + + if (sscanf(arg1, "%o", &mode) != 1) + return -1; + if (get_sha1_hex(arg2, sha1)) + return -1; + if (!verify_path(arg3)) + return -1; + + len = strlen(arg3); + size = cache_entry_size(len); + ce = xmalloc(size); + memset(ce, 0, size); + + memcpy(ce->sha1, sha1, 20); + memcpy(ce->name, arg3, len); + ce->ce_flags = htons(len); + ce->ce_mode = create_ce_mode(mode); + return add_cache_entry(ce, allow_add); +} + +static const char *lockfile_name = NULL; static void remove_lock_file(void) { - if (remove_lock) - unlink(".git/index.lock"); + if (lockfile_name) + unlink(lockfile_name); +} + +static void remove_lock_file_on_signal(int signo) +{ + remove_lock_file(); } int main(int argc, char **argv) { - int i, newfd, entries; + int i, newfd, entries, has_errors = 0; int allow_options = 1; + static char lockfile[MAXPATHLEN+1]; + const char *indexfile = get_index_file(); - newfd = open(".git/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600); + snprintf(lockfile, sizeof(lockfile), "%s.lock", indexfile); + + newfd = open(lockfile, O_RDWR | O_CREAT | O_EXCL, 0600); if (newfd < 0) die("unable to create new cachefile"); + signal(SIGINT, remove_lock_file_on_signal); atexit(remove_lock_file); - remove_lock = 1; + lockfile_name = lockfile; entries = read_cache(); if (entries < 0) @@ -279,7 +348,26 @@ int main(int argc, char **argv) continue; } if (!strcmp(path, "--refresh")) { - refresh_cache(); + has_errors |= refresh_cache(); + continue; + } + if (!strcmp(path, "--cacheinfo")) { + if (i+3 >= argc || add_cacheinfo(argv[i+1], argv[i+2], argv[i+3])) + die("update-cache: --cacheinfo "); + i += 3; + continue; + } + if (!strcmp(path, "--force-remove")) { + if (argc <= i + 1) + die("update-cache: --force-remove "); + if (remove_file_from_cache(argv[i+1])) + die("update-cache: --force-remove cannot remove %s", argv[i+1]); + i++; + continue; + } + + if (!strcmp(path, "--ignore-missing")) { + not_new = 1; continue; } die("unknown option %s", path); @@ -291,10 +379,9 @@ int main(int argc, char **argv) if (add_file_to_cache(path)) die("Unable to add %s to database", path); } - if (write_cache(newfd, active_cache, active_nr) || - rename(".git/index.lock", ".git/index")) + if (write_cache(newfd, active_cache, active_nr) || rename(lockfile, indexfile)) die("Unable to write new cachefile"); - remove_lock = 0; - return 0; + lockfile_name = NULL; + return has_errors ? 1 : 0; }