X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=update-cache.c;h=735d19920d998a3d53dbfd9a68336cc13780ef23;hb=92747a907cba83938def6e7eb3ee1b4d3d9e609f;hp=02c213cfb65a72b3768a5d5d8eb96904d4e74ef6;hpb=c6e007b0942a373bbf87fa3e4e11e2d90907de8c;p=git.git diff --git a/update-cache.c b/update-cache.c index 02c213cf..735d1992 100644 --- a/update-cache.c +++ b/update-cache.c @@ -3,6 +3,7 @@ * * Copyright (C) Linus Torvalds, 2005 */ +#include #include "cache.h" /* @@ -30,57 +31,6 @@ static inline long IS_ERR(const void *ptr) return (unsigned long)ptr > (unsigned long)-1000L; } -static int index_fd(unsigned char *sha1, int fd, struct stat *st) -{ - z_stream stream; - unsigned long size = st->st_size; - int max_out_bytes = size + 200; - void *out = malloc(max_out_bytes); - void *metadata = malloc(200); - int metadata_size; - 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; - - metadata_size = 1+sprintf(metadata, "blob %lu", size); - - SHA1_Init(&c); - SHA1_Update(&c, metadata, metadata_size); - SHA1_Update(&c, in, size); - SHA1_Final(sha1, &c); - - memset(&stream, 0, sizeof(stream)); - deflateInit(&stream, Z_BEST_COMPRESSION); - - /* - * ASCII size + nul byte - */ - stream.next_in = metadata; - stream.avail_in = metadata_size; - stream.next_out = out; - stream.avail_out = max_out_bytes; - while (deflate(&stream, 0) == Z_OK) - /* nothing */; - - /* - * File content - */ - stream.next_in = in; - stream.avail_in = size; - while (deflate(&stream, Z_FINISH) == Z_OK) - /*nothing */; - - deflateEnd(&stream); - - return write_sha1_buffer(sha1, out, stream.total_out); -} - /* * This only updates the "non-critical" parts of the directory * cache, ie the parts that aren't tracked by GIT, and only used @@ -107,31 +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->ce_mode = create_ce_mode(st.st_mode); ce->ce_flags = htons(namelen); - - if (index_fd(ce->sha1, fd, &st) < 0) + 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); } @@ -170,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 @@ -187,7 +177,7 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce) struct cache_entry *updated; int changed, size; - if (stat(ce->name, &st) < 0) + if (lstat(ce->name, &st) < 0) return ERR_PTR(-errno); changed = cache_match_stat(ce, &st); @@ -195,31 +185,43 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce) 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) + if (changed & (MODE_CHANGED | TYPE_CHANGED)) return ERR_PTR(-EINVAL); - if (compare_data(ce, st.st_size)) + 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); 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, *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++; @@ -229,12 +231,16 @@ static void refresh_cache(void) new = refresh_entry(ce); if (IS_ERR(new)) { - if (!(not_new && PTR_ERR(new) == -ENOENT)) + 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; } /* @@ -281,7 +287,7 @@ static int add_cacheinfo(char *arg1, char *arg2, char *arg3) len = strlen(arg3); size = cache_entry_size(len); - ce = malloc(size); + ce = xmalloc(size); memset(ce, 0, size); memcpy(ce->sha1, sha1, 20); @@ -299,9 +305,14 @@ static void remove_lock_file(void) 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(); @@ -312,6 +323,7 @@ int main(int argc, char **argv) if (newfd < 0) die("unable to create new cachefile"); + signal(SIGINT, remove_lock_file_on_signal); atexit(remove_lock_file); lockfile_name = lockfile; @@ -336,7 +348,7 @@ int main(int argc, char **argv) continue; } if (!strcmp(path, "--refresh")) { - refresh_cache(); + has_errors |= refresh_cache(); continue; } if (!strcmp(path, "--cacheinfo")) { @@ -345,6 +357,15 @@ int main(int argc, char **argv) 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; @@ -362,5 +383,5 @@ int main(int argc, char **argv) die("Unable to write new cachefile"); lockfile_name = NULL; - return 0; + return has_errors ? 1 : 0; }